diff --git a/qcom/sdxlemur-cdp.dts b/qcom/sdxlemur-cdp.dts
index 32b5a27c0977..6eb58b96920e 100644
--- a/qcom/sdxlemur-cdp.dts
+++ b/qcom/sdxlemur-cdp.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur.dtsi"
 #include "sdxlemur-cdp.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-cdp-audio-overlay.dtsi"
 #include "sdxlemur-bluetooth.dtsi"
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR CDP";
diff --git a/qcom/sdxlemur-cdp.dtsi b/qcom/sdxlemur-cdp.dtsi
index 4f802df82626..2d64f22dc8a6 100644
--- a/qcom/sdxlemur-cdp.dtsi
+++ b/qcom/sdxlemur-cdp.dtsi
@@ -1,6 +1,5 @@
 #include "sdxlemur-pmic-overlay.dtsi"
 #include "sdxlemur-cnss.dtsi"
-#include "sdxlemur-cdp-audio-overlay.dtsi"
 
 &soc {
 
diff --git a/qcom/sdxlemur-mtp-cpe.dts b/qcom/sdxlemur-mtp-cpe.dts
index 1c89cc28e220..b5417a3ea95c 100644
--- a/qcom/sdxlemur-mtp-cpe.dts
+++ b/qcom/sdxlemur-mtp-cpe.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur.dtsi"
 #include "sdxlemur-mtp-cpe.dtsi"
 #include "sdxlemur-1024mb-cpe.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-mtp-audio-overlay.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP CPE";
diff --git a/qcom/sdxlemur-mtp-cpe.dtsi b/qcom/sdxlemur-mtp-cpe.dtsi
index e63b48f2a73d..ead27a18b95a 100644
--- a/qcom/sdxlemur-mtp-cpe.dtsi
+++ b/qcom/sdxlemur-mtp-cpe.dtsi
@@ -1,5 +1,4 @@
 #include "sdxlemur-mtp.dtsi"
-#include "sdxlemur-mtp-audio-overlay.dtsi"
 
 &soc {
 	ntn3_vreg: ntn3_vreg {
diff --git a/qcom/sdxlemur-mtp-mbb-emmc.dts b/qcom/sdxlemur-mtp-mbb-emmc.dts
index 8b5774a69767..123bbb8ec8ff 100644
--- a/qcom/sdxlemur-mtp-mbb-emmc.dts
+++ b/qcom/sdxlemur-mtp-mbb-emmc.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur.dtsi"
 #include "sdxlemur-mtp-mbb-emmc.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-mtp-audio-overlay.dtsi"
 #include "sdxlemur-bluetooth.dtsi"
 
 / {
diff --git a/qcom/sdxlemur-mtp-mbb-ntn3-pcie.dts b/qcom/sdxlemur-mtp-mbb-ntn3-pcie.dts
index 0f207e33241f..1c391ad94074 100644
--- a/qcom/sdxlemur-mtp-mbb-ntn3-pcie.dts
+++ b/qcom/sdxlemur-mtp-mbb-ntn3-pcie.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur.dtsi"
 #include "sdxlemur-mtp-mbb-ntn3-pcie.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-mtp-audio-overlay.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB NTN3 PCIE";
diff --git a/qcom/sdxlemur-mtp-mbb-pcie-ep.dtsi b/qcom/sdxlemur-mtp-mbb-pcie-ep.dtsi
index 63505538c5bf..20bd6389e01c 100644
--- a/qcom/sdxlemur-mtp-mbb-pcie-ep.dtsi
+++ b/qcom/sdxlemur-mtp-mbb-pcie-ep.dtsi
@@ -1,5 +1,4 @@
 #include "sdxlemur-mtp.dtsi"
-#include "sdxlemur-mtp-audio-overlay.dtsi"
 
 &soc {
 
diff --git a/qcom/sdxlemur-mtp-mbb-pcie-rc-ep.dtsi b/qcom/sdxlemur-mtp-mbb-pcie-rc-ep.dtsi
index 4aab30d9d047..c945092880d4 100644
--- a/qcom/sdxlemur-mtp-mbb-pcie-rc-ep.dtsi
+++ b/qcom/sdxlemur-mtp-mbb-pcie-rc-ep.dtsi
@@ -1,5 +1,4 @@
 #include "sdxlemur-mtp.dtsi"
-#include "sdxlemur-mtp-audio-overlay.dtsi"
 
 &soc {
 	ioss_aqc_eth0_rx: aqc_rx@eth0 {
diff --git a/qcom/sdxlemur-mtp-mbb.dts b/qcom/sdxlemur-mtp-mbb.dts
index 239e0bc30e0a..2068bdaee56f 100644
--- a/qcom/sdxlemur-mtp-mbb.dts
+++ b/qcom/sdxlemur-mtp-mbb.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur.dtsi"
 #include "sdxlemur-mtp-mbb.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-mtp-audio-overlay.dtsi"
 #include "sdxlemur-bluetooth.dtsi"
 
 / {
diff --git a/qcom/sdxlemur-mtp-mbb.dtsi b/qcom/sdxlemur-mtp-mbb.dtsi
index b0249a0ff28d..4127b6f32dc4 100644
--- a/qcom/sdxlemur-mtp-mbb.dtsi
+++ b/qcom/sdxlemur-mtp-mbb.dtsi
@@ -4,7 +4,6 @@
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/spmi/spmi.h>
 #include "sdxlemur-cnss.dtsi"
-#include "sdxlemur-mtp-audio-overlay.dtsi"
 
 &pm7250b_clkdiv {
 	clocks = <&rpmhcc RPMH_CXO_CLK>;
diff --git a/qcom/sdxlemur-mtp.dts b/qcom/sdxlemur-mtp.dts
index 0483238314ac..20da9bce7905 100644
--- a/qcom/sdxlemur-mtp.dts
+++ b/qcom/sdxlemur-mtp.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur.dtsi"
 #include "sdxlemur-mtp.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-mtp-audio-overlay.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP";
diff --git a/qcom/sdxlemur-mtp.dtsi b/qcom/sdxlemur-mtp.dtsi
index 586d9c3fe0dd..7213eb337afb 100644
--- a/qcom/sdxlemur-mtp.dtsi
+++ b/qcom/sdxlemur-mtp.dtsi
@@ -1,5 +1,4 @@
 #include "sdxlemur-pmic-overlay.dtsi"
-#include "sdxlemur-mtp-audio-overlay.dtsi"
 
 &soc {
 
diff --git a/qcom/sdxlemur-rcm-rc.dts b/qcom/sdxlemur-rcm-rc.dts
index cbd8d5c1ee12..0852b7990d0c 100644
--- a/qcom/sdxlemur-rcm-rc.dts
+++ b/qcom/sdxlemur-rcm-rc.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur.dtsi"
 #include "sdxlemur-rcm-rc.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-cdp-audio-overlay.dtsi"
 #include "sdxlemur-bluetooth.dtsi"
 
 / {
diff --git a/qcom/sdxlemur-rumi.dts b/qcom/sdxlemur-rumi.dts
index d0b471e1379f..523d85983874 100644
--- a/qcom/sdxlemur-rumi.dts
+++ b/qcom/sdxlemur-rumi.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur.dtsi"
 #include "sdxlemur-rumi.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-mtp-audio-overlay.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR RUMI";
diff --git a/qcom/sdxlemur-v2-cdp.dts b/qcom/sdxlemur-v2-cdp.dts
index a40de23838ce..56d5029dbfc3 100644
--- a/qcom/sdxlemur-v2-cdp.dts
+++ b/qcom/sdxlemur-v2-cdp.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur-v2.dtsi"
 #include "sdxlemur-cdp.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-cdp-audio-overlay.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR CDP V2";
diff --git a/qcom/sdxlemur-v2-mtp-cpe.dts b/qcom/sdxlemur-v2-mtp-cpe.dts
index cfa97dea9bbf..f8670b646394 100644
--- a/qcom/sdxlemur-v2-mtp-cpe.dts
+++ b/qcom/sdxlemur-v2-mtp-cpe.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur-v2.dtsi"
 #include "sdxlemur-mtp-cpe.dtsi"
 #include "sdxlemur-1024mb-cpe.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-mtp-audio-overlay.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP CPE V2";
diff --git a/qcom/sdxlemur-v2-mtp-mbb-emmc.dts b/qcom/sdxlemur-v2-mtp-mbb-emmc.dts
index 9076ddf8c3d3..9c559e9e1743 100644
--- a/qcom/sdxlemur-v2-mtp-mbb-emmc.dts
+++ b/qcom/sdxlemur-v2-mtp-mbb-emmc.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur-v2.dtsi"
 #include "sdxlemur-mtp-mbb-emmc.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-mtp-audio-overlay.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB eMMC V2";
diff --git a/qcom/sdxlemur-v2-mtp-mbb-ntn3-pcie.dts b/qcom/sdxlemur-v2-mtp-mbb-ntn3-pcie.dts
index 37fd541cd0b2..65630ea06a58 100644
--- a/qcom/sdxlemur-v2-mtp-mbb-ntn3-pcie.dts
+++ b/qcom/sdxlemur-v2-mtp-mbb-ntn3-pcie.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur-v2.dtsi"
 #include "sdxlemur-mtp-mbb-ntn3-pcie.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-mtp-audio-overlay.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB NTN3 PCIE V2";
diff --git a/qcom/sdxlemur-v2-mtp-mbb.dts b/qcom/sdxlemur-v2-mtp-mbb.dts
index 3814ef3e3d07..de0389ed4adc 100644
--- a/qcom/sdxlemur-v2-mtp-mbb.dts
+++ b/qcom/sdxlemur-v2-mtp-mbb.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur-v2.dtsi"
 #include "sdxlemur-mtp-mbb.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-mtp-audio-overlay.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB V2";
diff --git a/qcom/sdxlemur-v2-mtp.dts b/qcom/sdxlemur-v2-mtp.dts
index 40cb9249df97..21a9acca41ee 100644
--- a/qcom/sdxlemur-v2-mtp.dts
+++ b/qcom/sdxlemur-v2-mtp.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur-v2.dtsi"
 #include "sdxlemur-mtp.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-mtp-audio-overlay.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP V2";
diff --git a/qcom/sdxlemur-v2-rcm-rc.dts b/qcom/sdxlemur-v2-rcm-rc.dts
index 385329444730..8bac601d1b38 100644
--- a/qcom/sdxlemur-v2-rcm-rc.dts
+++ b/qcom/sdxlemur-v2-rcm-rc.dts
@@ -3,6 +3,8 @@
 #include "sdxlemur-v2.dtsi"
 #include "sdxlemur-rcm-rc.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-audio.dtsi"
+#include "sdxlemur-cdp-audio-overlay.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR RCM Root Complex V2";
diff --git a/qcom/sdxlemur.dtsi b/qcom/sdxlemur.dtsi
index 68e625c2e099..36b1a9dfc324 100644
--- a/qcom/sdxlemur.dtsi
+++ b/qcom/sdxlemur.dtsi
@@ -1437,5 +1437,4 @@
 #include "sdxlemur-pm.dtsi"
 #include "sdxlemur-pcie.dtsi"
 #include "sdxlemur-blsp.dtsi"
-#include "sdxlemur-audio.dtsi"
 #include "sdxlemur-thermal.dtsi"