diff --git a/config/sdm845auto.conf b/config/sdm845auto.conf
index f9a7748a3fde..b6d4231ff275 100644
--- a/config/sdm845auto.conf
+++ b/config/sdm845auto.conf
@@ -20,7 +20,6 @@ CONFIG_REGMAP_SWR=y
 CONFIG_MSM_QDSP6_SSR=y
 CONFIG_MSM_QDSP6_PDR=y
 CONFIG_MSM_QDSP6_NOTIFIER=y
-CONFIG_MSM_CDSP_LOADER=y
 CONFIG_SND_SOC_MSM_HOSTLESS_PCM=y
 CONFIG_SND_SOC_MSM_QDSP6V2_INTF=y
 CONFIG_SND_SOC_SDM845=y
@@ -39,3 +38,5 @@ CONFIG_DOLBY_LICENSE=y
 CONFIG_DTS_SRS_TM=y
 CONFIG_SND_SOC_MACHINE_SDM845=y
 CONFIG_SND_SOC_MSM_STUB=y
+CONFIG_WCD_DSP_GLINK=y
+CONFIG_MSM_AVTIMER=y
diff --git a/config/sdm845autoconf.h b/config/sdm845autoconf.h
index 6c3bb330656d..7e9de815db80 100644
--- a/config/sdm845autoconf.h
+++ b/config/sdm845autoconf.h
@@ -34,7 +34,6 @@
 #define CONFIG_MSM_QDSP6_SSR 1
 #define CONFIG_MSM_QDSP6_PDR 1
 #define CONFIG_MSM_QDSP6_NOTIFIER 1
-#define CONFIG_MSM_CDSP_LOADER 1
 #define CONFIG_SND_SOC_MSM_HOSTLESS_PCM 1
 #define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1
 #define CONFIG_SND_SOC_SDM845 1
@@ -53,3 +52,5 @@
 #define CONFIG_DTS_SRS_TM 1
 #define CONFIG_WCD9XXX_CODEC_CORE 1
 #define CONFIG_SND_SOC_MSM_STUB 1
+#define CONFIG_WCD_DSP_GLINK 1
+#define CONFIG_MSM_AVTIMER 1