diff --git a/device-common.mk b/device-common.mk
index 6da00f8..473d570 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -185,20 +185,6 @@
 PRODUCT_PACKAGES += \
     android.hardware.vibrator@1.1-service.ff
 
-# Build generic Audio HAL
-PRODUCT_PACKAGES := audio.primary.sdm845
-
-# Build generic lights HAL
-PRODUCT_PACKAGES += lights.sdm845
-
-PRODUCT_PACKAGES += \
-    pd-mapper \
-    qrtr-ns \
-    qrtr-cfg \
-    qrtr-lookup \
-    rmtfs \
-    tqftpserv
-
 # Copy standard platform config files
 PRODUCT_COPY_FILES +=  \
     $(LOCAL_PATH)/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
diff --git a/sdm845/device.mk b/sdm845/device.mk
index 89355e0..3349e9d 100644
--- a/sdm845/device.mk
+++ b/sdm845/device.mk
@@ -29,5 +29,19 @@
     device/generic/sdm845/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.sdm845.usb.rc \
     device/generic/sdm845/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/sdm845.kl
 
+# Build generic Audio HAL
+PRODUCT_PACKAGES := audio.primary.sdm845
+
+# Build generic lights HAL
+PRODUCT_PACKAGES += lights.sdm845
+
+PRODUCT_PACKAGES += \
+    pd-mapper \
+    qrtr-ns \
+    qrtr-cfg \
+    qrtr-lookup \
+    rmtfs \
+    tqftpserv
+
 PRODUCT_COPY_FILES += \
     device/generic/sdm845/qcom/init.qcom.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qcom.rc