diff --git a/device-cheetah.mk b/device-cheetah.mk
index 2a80583..f138621 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -24,8 +24,8 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/cheet
 
 DEVICE_PACKAGE_OVERLAYS += device/google/pantah/cheetah/overlay
 
-include device/google/gs201/device-shipping-common.mk
 include device/google/pantah/audio/cheetah/audio-tables.mk
+include device/google/gs201/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs101/bluetooth/bluetooth.mk
 include device/google/gs201/uwb/uwb.mk
diff --git a/device-panther.mk b/device-panther.mk
index db3641a..f191289 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -24,8 +24,8 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/panth
 
 DEVICE_PACKAGE_OVERLAYS += device/google/pantah/panther/overlay
 
-include device/google/gs201/device-shipping-common.mk
 include device/google/pantah/audio/panther/audio-tables.mk
+include device/google/gs201/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs101/bluetooth/bluetooth.mk