diff --git a/device-caiman.mk b/device-caiman.mk
index 7b955177..7122948c 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -33,8 +33,8 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
 # display
 DEVICE_PACKAGE_OVERLAYS += device/google/caimito/caiman/overlay
 
-include device/google/zumapro/device-shipping-common.mk
 include device/google/caimito/audio/caiman/audio-tables.mk
+include device/google/zumapro/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/gti/gti.mk
diff --git a/device-komodo.mk b/device-komodo.mk
index be2b11d5..4f4eef34 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -33,8 +33,8 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
 # display
 DEVICE_PACKAGE_OVERLAYS += device/google/caimito/komodo/overlay
 
-include device/google/zumapro/device-shipping-common.mk
 include device/google/caimito/audio/komodo/audio-tables.mk
+include device/google/zumapro/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/gti/gti.mk
diff --git a/device-tokay.mk b/device-tokay.mk
index 6179b1d8..f11490a9 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -26,8 +26,8 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
 # display
 DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay
 
-include device/google/zumapro/device-shipping-common.mk
 include device/google/caimito/audio/tokay/audio-tables.mk
+include device/google/zumapro/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/gti/gti.mk