diff --git a/Makefile b/Makefile
index fe3f0faaae..f59920d2c2 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ USERINCLUDE     += \
 # Use LINUXINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
 LINUXINCLUDE    += \
+                -I$(srctree)/techpack/audio/include/uapi \
                 -I$(srctree)/techpack/audio/include/uapi/audio \
                 -I$(srctree)/techpack/audio/include
 
diff --git a/asoc/codecs/wcd9335.c b/asoc/codecs/wcd9335.c
index fe5cca1aa5..054a56dc3c 100644
--- a/asoc/codecs/wcd9335.c
+++ b/asoc/codecs/wcd9335.c
@@ -20,7 +20,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <soc/swr-wcd.h>
 #include <soc/snd_event.h>
 #include <sound/pcm.h>
diff --git a/asoc/codecs/wcd934x/wcd934x-mbhc.c b/asoc/codecs/wcd934x/wcd934x-mbhc.c
index d777d8d564..f8bb7de84b 100644
--- a/asoc/codecs/wcd934x/wcd934x-mbhc.c
+++ b/asoc/codecs/wcd934x/wcd934x-mbhc.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
  */
 #include <linux/module.h>
 #include <linux/init.h>
@@ -12,7 +12,7 @@
 #include <linux/gpio.h>
 #include <linux/delay.h>
 #include <linux/regmap.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
diff --git a/asoc/codecs/wcd934x/wcd934x.c b/asoc/codecs/wcd934x/wcd934x.c
index c23e3fd887..4fa5c3414c 100644
--- a/asoc/codecs/wcd934x/wcd934x.c
+++ b/asoc/codecs/wcd934x/wcd934x.c
@@ -20,7 +20,7 @@
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
 #include <linux/regulator/consumer.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <soc/swr-wcd.h>
 #include <soc/snd_event.h>
 #include <sound/pcm.h>
diff --git a/asoc/codecs/wcd9xxx-common-v2.c b/asoc/codecs/wcd9xxx-common-v2.c
index 17f0fb7303..623f06adb8 100644
--- a/asoc/codecs/wcd9xxx-common-v2.c
+++ b/asoc/codecs/wcd9xxx-common-v2.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2018, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -8,7 +8,7 @@
 #include <sound/soc.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <asoc/core.h>
 #include <asoc/wcd9xxx-common-v2.h>
 
diff --git a/asoc/codecs/wcd9xxx-core.c b/asoc/codecs/wcd9xxx-core.c
index 9736c43c36..40d9c8e5a5 100644
--- a/asoc/codecs/wcd9xxx-core.c
+++ b/asoc/codecs/wcd9xxx-core.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/kernel.h>
@@ -13,7 +13,7 @@
 #include <linux/debugfs.h>
 #include <linux/i2c.h>
 #include <linux/regmap.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <sound/soc.h>
 #include <asoc/core.h>
 #include <asoc/pdata.h>
diff --git a/asoc/codecs/wcd9xxx-irq.c b/asoc/codecs/wcd9xxx-irq.c
index c1efba4c69..6e27ad511d 100644
--- a/asoc/codecs/wcd9xxx-irq.c
+++ b/asoc/codecs/wcd9xxx-irq.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.
  */
 #include <linux/bitops.h>
 #include <linux/kernel.h>
@@ -18,7 +18,7 @@
 #include <soc/qcom/pm.h>
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <asoc/core.h>
 #include <asoc/wcd9xxx-irq.h>
 
diff --git a/asoc/codecs/wcd9xxx-slimslave.c b/asoc/codecs/wcd9xxx-slimslave.c
index 502bbf55e5..dc16277a31 100644
--- a/asoc/codecs/wcd9xxx-slimslave.c
+++ b/asoc/codecs/wcd9xxx-slimslave.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2018, 2020 The Linux Foundation. All rights reserved.
  */
 #include <linux/slab.h>
 #include <linux/mutex.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <asoc/wcd9xxx-slimslave.h>
 
 struct wcd9xxx_slim_sch {
diff --git a/asoc/codecs/wcd_cpe_core.c b/asoc/codecs/wcd_cpe_core.c
index 5b5291f8a6..fa6d0f0e39 100644
--- a/asoc/codecs/wcd_cpe_core.c
+++ b/asoc/codecs/wcd_cpe_core.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -14,7 +14,7 @@
 #include <linux/dma-mapping.h>
 #include <sound/soc.h>
 #include <sound/info.h>
-#include <sound/lsm_params.h>
+#include <audio/sound/lsm_params.h>
 #include <soc/qcom/pm.h>
 #include <dsp/audio_cal_utils.h>
 #include <asoc/core.h>
diff --git a/asoc/codecs/wcdcal-hwdep.c b/asoc/codecs/wcdcal-hwdep.c
index 54338217b0..7e2b984a93 100644
--- a/asoc/codecs/wcdcal-hwdep.c
+++ b/asoc/codecs/wcdcal-hwdep.c
@@ -9,7 +9,7 @@
 #include <linux/ioctl.h>
 #include <linux/bitops.h>
 #include <sound/hwdep.h>
-#include <sound/msmcal-hwdep.h>
+#include <audio/sound/msmcal-hwdep.h>
 #include <sound/soc.h>
 #include <asoc/wcdcal-hwdep.h>
 
diff --git a/asoc/msm-audio-effects-q6-v2.c b/asoc/msm-audio-effects-q6-v2.c
index db3bd87ebc..c25791ed4b 100644
--- a/asoc/msm-audio-effects-q6-v2.c
+++ b/asoc/msm-audio-effects-q6-v2.c
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/slab.h>
 #include <linux/ratelimit.h>
 #include <sound/compress_params.h>
-#include <sound/devdep_params.h>
+#include <audio/sound/devdep_params.h>
 #include <dsp/apr_audio-v2.h>
 #include <dsp/q6asm-v2.h>
 #include <dsp/msm-audio-effects-q6-v2.h>
diff --git a/asoc/msm-compress-q6-v2.c b/asoc/msm-compress-q6-v2.c
index fccb360de0..22af34f587 100644
--- a/asoc/msm-compress-q6-v2.c
+++ b/asoc/msm-compress-q6-v2.c
@@ -20,10 +20,10 @@
 #include <sound/initval.h>
 #include <sound/control.h>
 #include <sound/pcm_params.h>
-#include <sound/audio_effects.h>
+#include <audio/sound/audio_effects.h>
 #include <asm/dma.h>
 #include <linux/dma-mapping.h>
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 
 #include <sound/timer.h>
 #include <sound/tlv.h>
diff --git a/asoc/msm-cpe-lsm.c b/asoc/msm-cpe-lsm.c
index 28219dce77..222912a1d2 100644
--- a/asoc/msm-cpe-lsm.c
+++ b/asoc/msm-cpe-lsm.c
@@ -15,7 +15,7 @@
 #include <linux/sched.h>
 #include <linux/freezer.h>
 #include <sound/soc.h>
-#include <sound/lsm_params.h>
+#include <audio/sound/lsm_params.h>
 #include <sound/pcm_params.h>
 #include "msm-slim-dma.h"
 #include "codecs/cpe_core.h"
diff --git a/asoc/msm-lsm-client.c b/asoc/msm-lsm-client.c
index 69cae39b44..96fbee5bde 100644
--- a/asoc/msm-lsm-client.c
+++ b/asoc/msm-lsm-client.c
@@ -19,7 +19,7 @@
 #include <sound/timer.h>
 #include <sound/initval.h>
 #include <sound/control.h>
-#include <sound/lsm_params.h>
+#include <audio/sound/lsm_params.h>
 #include <sound/pcm_params.h>
 #include <dsp/msm_audio_ion.h>
 #include <dsp/q6lsm.h>
diff --git a/asoc/msm-pcm-q6-noirq.c b/asoc/msm-pcm-q6-noirq.c
index 9c0cc4bd24..47b48a2c34 100644
--- a/asoc/msm-pcm-q6-noirq.c
+++ b/asoc/msm-pcm-q6-noirq.c
@@ -27,7 +27,7 @@
 #include <asm/dma.h>
 #include <sound/tlv.h>
 #include <sound/pcm_params.h>
-#include <sound/devdep_params.h>
+#include <audio/sound/devdep_params.h>
 #include <dsp/msm_audio_ion.h>
 #include <dsp/q6audio-v2.h>
 
diff --git a/asoc/msm-pcm-q6-v2.c b/asoc/msm-pcm-q6-v2.c
index 352c0a32fb..37369f6737 100644
--- a/asoc/msm-pcm-q6-v2.c
+++ b/asoc/msm-pcm-q6-v2.c
@@ -21,12 +21,12 @@
 #include <sound/timer.h>
 #include <asm/dma.h>
 #include <linux/dma-mapping.h>
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 
 #include <linux/of_device.h>
 #include <sound/tlv.h>
 #include <sound/pcm_params.h>
-#include <sound/devdep_params.h>
+#include <audio/sound/devdep_params.h>
 #include <dsp/msm_audio_ion.h>
 #include <dsp/q6audio-v2.h>
 #include <dsp/q6core.h>
diff --git a/asoc/msm-pcm-routing-devdep.c b/asoc/msm-pcm-routing-devdep.c
index c214c2a572..ef8be24542 100644
--- a/asoc/msm-pcm-routing-devdep.c
+++ b/asoc/msm-pcm-routing-devdep.c
@@ -7,7 +7,7 @@
 #include <linux/err.h>
 #include <linux/module.h>
 #include <sound/hwdep.h>
-#include <sound/devdep_params.h>
+#include <audio/sound/devdep_params.h>
 #include "msm-pcm-routing-devdep.h"
 #include "msm-ds2-dap-config.h"
 
diff --git a/asoc/msm-pcm-routing-v2.c b/asoc/msm-pcm-routing-v2.c
index a49a48cd88..1a9218194c 100644
--- a/asoc/msm-pcm-routing-v2.c
+++ b/asoc/msm-pcm-routing-v2.c
@@ -21,7 +21,7 @@
 #include <sound/asound.h>
 #include <sound/pcm_params.h>
 #include <sound/hwdep.h>
-#include <sound/audio_effects.h>
+#include <audio/sound/audio_effects.h>
 #include <dsp/msm-dts-srs-tm-config.h>
 #include <dsp/q6voice.h>
 #include <dsp/q6adm-v2.h>
diff --git a/asoc/msm-transcode-loopback-q6-v2.c b/asoc/msm-transcode-loopback-q6-v2.c
index 71bc60db59..d83249b20f 100644
--- a/asoc/msm-transcode-loopback-q6-v2.c
+++ b/asoc/msm-transcode-loopback-q6-v2.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/init.h>
@@ -17,7 +17,7 @@
 #include <sound/pcm.h>
 #include <sound/initval.h>
 #include <sound/control.h>
-#include <sound/audio_effects.h>
+#include <audio/sound/audio_effects.h>
 #include <sound/pcm_params.h>
 #include <sound/timer.h>
 #include <sound/tlv.h>
diff --git a/dsp/audio_slimslave.c b/dsp/audio_slimslave.c
index b09506a05f..b81c85d461 100644
--- a/dsp/audio_slimslave.c
+++ b/dsp/audio_slimslave.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2013-2014, 2017-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014, 2017-2018, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/init.h>
@@ -9,7 +9,7 @@
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/miscdevice.h>
-#include <sound/audio_slimslave.h>
+#include <audio/sound/audio_slimslave.h>
 #include <linux/slimbus/slimbus.h>
 #include <linux/pm_runtime.h>
 
diff --git a/dsp/avtimer.c b/dsp/avtimer.c
index e1d032d536..5655a0b9bd 100644
--- a/dsp/avtimer.c
+++ b/dsp/avtimer.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2012-2015, 2017-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015, 2017-2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/kernel.h>
@@ -12,7 +12,7 @@
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
-#include <linux/avtimer.h>
+#include <audio/linux/avtimer.h>
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/wait.h>
diff --git a/dsp/codecs/aac_in.c b/dsp/codecs/aac_in.c
index 04f69876ab..bb698da2f8 100644
--- a/dsp/codecs/aac_in.c
+++ b/dsp/codecs/aac_in.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
  */
 #include <linux/module.h>
 #include <linux/fs.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_aac.h>
+#include <audio/linux/msm_audio_aac.h>
 #include <linux/compat.h>
 #include <linux/atomic.h>
 #include <asm/ioctls.h>
diff --git a/dsp/codecs/amrnb_in.c b/dsp/codecs/amrnb_in.c
index 924ac5c7f5..cefd4cb154 100644
--- a/dsp/codecs/amrnb_in.c
+++ b/dsp/codecs/amrnb_in.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2010-2012, 2014, 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2012, 2014, 2016-2017, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -11,7 +11,7 @@
 #include <linux/slab.h>
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
-#include <linux/msm_audio_amrnb.h>
+#include <audio/linux/msm_audio_amrnb.h>
 #include <linux/compat.h>
 #include <linux/atomic.h>
 #include <asm/ioctls.h>
diff --git a/dsp/codecs/amrwb_in.c b/dsp/codecs/amrwb_in.c
index 9a9b4a0ae9..a6b9b89292 100644
--- a/dsp/codecs/amrwb_in.c
+++ b/dsp/codecs/amrwb_in.c
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2011-2012, 2014, 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2012, 2014, 2016-2017, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/dma-mapping.h>
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/miscdevice.h>
-#include <linux/msm_audio_amrwb.h>
+#include <audio/linux/msm_audio_amrwb.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
diff --git a/dsp/codecs/audio_aac.c b/dsp/codecs/audio_aac.c
index 32106e5854..80cf13e342 100644
--- a/dsp/codecs/audio_aac.c
+++ b/dsp/codecs/audio_aac.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 Google, Inc.
  * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2010-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2020, The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -16,7 +16,7 @@
  *
  */
 
-#include <linux/msm_audio_aac.h>
+#include <audio/linux/msm_audio_aac.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 
diff --git a/dsp/codecs/audio_alac.c b/dsp/codecs/audio_alac.c
index 34cd4527f1..597ea748e3 100644
--- a/dsp/codecs/audio_alac.c
+++ b/dsp/codecs/audio_alac.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/types.h>
-#include <linux/msm_audio_alac.h>
+#include <audio/linux/msm_audio_alac.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 
diff --git a/dsp/codecs/audio_amrwbplus.c b/dsp/codecs/audio_amrwbplus.c
index 6cadab722a..534a2e750e 100644
--- a/dsp/codecs/audio_amrwbplus.c
+++ b/dsp/codecs/audio_amrwbplus.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 Google, Inc.
  * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2010-2017, 2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2017, 2019-2020 The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  */
-#include <linux/msm_audio_amrwbplus.h>
+#include <audio/linux/msm_audio_amrwbplus.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 
diff --git a/dsp/codecs/audio_ape.c b/dsp/codecs/audio_ape.c
index 8410a6addd..250c7e2107 100644
--- a/dsp/codecs/audio_ape.c
+++ b/dsp/codecs/audio_ape.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/types.h>
-#include <linux/msm_audio_ape.h>
+#include <audio/linux/msm_audio_ape.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 
diff --git a/dsp/codecs/audio_g711alaw.c b/dsp/codecs/audio_g711alaw.c
index 8171156a4f..0ee7d1f16c 100644
--- a/dsp/codecs/audio_g711alaw.c
+++ b/dsp/codecs/audio_g711alaw.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, 2019-2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/types.h>
-#include <linux/msm_audio_g711_dec.h>
+#include <audio/linux/msm_audio_g711_dec.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 
diff --git a/dsp/codecs/audio_g711mlaw.c b/dsp/codecs/audio_g711mlaw.c
index 296783d637..dcfd4fca12 100644
--- a/dsp/codecs/audio_g711mlaw.c
+++ b/dsp/codecs/audio_g711mlaw.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, 2019-2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/types.h>
-#include <linux/msm_audio_g711_dec.h>
+#include <audio/linux/msm_audio_g711_dec.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 
diff --git a/dsp/codecs/audio_hwacc_effects.c b/dsp/codecs/audio_hwacc_effects.c
index d0717d792c..274de1d267 100644
--- a/dsp/codecs/audio_hwacc_effects.c
+++ b/dsp/codecs/audio_hwacc_effects.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2017, 2020 The Linux Foundation. All rights reserved.
  */
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/compat.h>
 #include "q6audio_common.h"
 #include <dsp/msm-audio-effects-q6-v2.h>
diff --git a/dsp/codecs/audio_multi_aac.c b/dsp/codecs/audio_multi_aac.c
index 2c88ebf476..72a2d5b8b5 100644
--- a/dsp/codecs/audio_multi_aac.c
+++ b/dsp/codecs/audio_multi_aac.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 Google, Inc.
  * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -16,7 +16,7 @@
  *
  */
 
-#include <linux/msm_audio_aac.h>
+#include <audio/linux/msm_audio_aac.h>
 #include <linux/compat.h>
 #include <soc/qcom/socinfo.h>
 #include "audio_utils_aio.h"
diff --git a/dsp/codecs/audio_utils.h b/dsp/codecs/audio_utils.h
index 5116a464f8..bddf95a3b2 100644
--- a/dsp/codecs/audio_utils.h
+++ b/dsp/codecs/audio_utils.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
-/* Copyright (c) 2010-2015, 2017 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2015, 2017, 2020 The Linux Foundation. All rights reserved.
  */
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/compat.h>
 #include "q6audio_common.h"
 
diff --git a/dsp/codecs/audio_utils_aio.h b/dsp/codecs/audio_utils_aio.h
index 901afffed1..c7365a1716 100644
--- a/dsp/codecs/audio_utils_aio.h
+++ b/dsp/codecs/audio_utils_aio.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* Copyright (C) 2008 Google, Inc.
  * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2009-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-2018, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/fs.h>
@@ -11,7 +11,7 @@
 #include <linux/sched.h>
 #include <linux/uaccess.h>
 #include <linux/wait.h>
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/debugfs.h>
 #include <linux/list.h>
 #include <linux/slab.h>
diff --git a/dsp/codecs/audio_wma.c b/dsp/codecs/audio_wma.c
index 66c818d5cb..00809414b2 100644
--- a/dsp/codecs/audio_wma.c
+++ b/dsp/codecs/audio_wma.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 Google, Inc.
  * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2009-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-2020, The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -17,7 +17,7 @@
  */
 
 #include <linux/types.h>
-#include <linux/msm_audio_wma.h>
+#include <audio/linux/msm_audio_wma.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 
diff --git a/dsp/codecs/audio_wmapro.c b/dsp/codecs/audio_wmapro.c
index 4fc3312395..aa75efb25c 100644
--- a/dsp/codecs/audio_wmapro.c
+++ b/dsp/codecs/audio_wmapro.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 Google, Inc.
  * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2009-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-2020, The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -17,7 +17,7 @@
  */
 
 #include <linux/types.h>
-#include <linux/msm_audio_wmapro.h>
+#include <audio/linux/msm_audio_wmapro.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 
diff --git a/dsp/codecs/evrc_in.c b/dsp/codecs/evrc_in.c
index dae6fc8e62..4a946d4726 100644
--- a/dsp/codecs/evrc_in.c
+++ b/dsp/codecs/evrc_in.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_qcp.h>
+#include <audio/linux/msm_audio_qcp.h>
 #include <linux/atomic.h>
 #include <linux/compat.h>
 #include <asm/ioctls.h>
diff --git a/dsp/codecs/g711alaw_in.c b/dsp/codecs/g711alaw_in.c
index 013007ecd0..495ba29e48 100644
--- a/dsp/codecs/g711alaw_in.c
+++ b/dsp/codecs/g711alaw_in.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_g711.h>
+#include <audio/linux/msm_audio_g711.h>
 #include <linux/atomic.h>
 #include <linux/compat.h>
 #include <asm/ioctls.h>
diff --git a/dsp/codecs/g711mlaw_in.c b/dsp/codecs/g711mlaw_in.c
index 3d3175415c..de259b375c 100644
--- a/dsp/codecs/g711mlaw_in.c
+++ b/dsp/codecs/g711mlaw_in.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_g711.h>
+#include <audio/linux/msm_audio_g711.h>
 #include <linux/atomic.h>
 #include <linux/compat.h>
 #include <asm/ioctls.h>
diff --git a/dsp/codecs/qcelp_in.c b/dsp/codecs/qcelp_in.c
index 806f8b233f..133b87f6b5 100644
--- a/dsp/codecs/qcelp_in.c
+++ b/dsp/codecs/qcelp_in.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_qcp.h>
+#include <audio/linux/msm_audio_qcp.h>
 #include <linux/atomic.h>
 #include <linux/compat.h>
 #include <asm/ioctls.h>
diff --git a/dsp/q6afecal-hwdep.c b/dsp/q6afecal-hwdep.c
index 810634f57b..ef194ff6ac 100644
--- a/dsp/q6afecal-hwdep.c
+++ b/dsp/q6afecal-hwdep.c
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2015, 2017 - 2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015, 2017 - 2018, 2020 The Linux Foundation. All rights reserved.
  */
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/ioctl.h>
 #include <sound/hwdep.h>
-#include <sound/msmcal-hwdep.h>
+#include <audio/sound/msmcal-hwdep.h>
 #include <sound/soc.h>
 #include "q6afecal-hwdep.h"
 
diff --git a/dsp/q6afecal-hwdep.h b/dsp/q6afecal-hwdep.h
index 4004170751..cc7a6b3cbf 100644
--- a/dsp/q6afecal-hwdep.h
+++ b/dsp/q6afecal-hwdep.h
@@ -4,7 +4,7 @@
  */
 #ifndef __Q6AFECAL_HWDEP_H__
 #define __Q6AFECAL_HWDEP_H__
-#include <sound/msmcal-hwdep.h>
+#include <audio/sound/msmcal-hwdep.h>
 
 enum q6afe_cal_states {
 	Q6AFECAL_UNINITIALISED,
diff --git a/dsp/q6lsm.c b/dsp/q6lsm.c
index 0dcc291e86..4332629d9b 100644
--- a/dsp/q6lsm.c
+++ b/dsp/q6lsm.c
@@ -15,7 +15,7 @@
 #include <linux/debugfs.h>
 #include <linux/time.h>
 #include <linux/atomic.h>
-#include <sound/lsm_params.h>
+#include <audio/sound/lsm_params.h>
 #include <asm/ioctls.h>
 #include <linux/memory.h>
 #include <dsp/msm_audio_ion.h>
diff --git a/dsp/rtac.c b/dsp/rtac.c
index 7c7137e58c..6b59b9b7c4 100644
--- a/dsp/rtac.c
+++ b/dsp/rtac.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/fs.h>
@@ -10,7 +10,7 @@
 #include <linux/uaccess.h>
 #include <linux/mutex.h>
 #include <linux/sched.h>
-#include <linux/msm_audio_calibration.h>
+#include <audio/linux/msm_audio_calibration.h>
 #include <linux/atomic.h>
 #include <linux/compat.h>
 #include <dsp/msm_audio_ion.h>
diff --git a/dsp/sp_params.c b/dsp/sp_params.c
index c84f8c79da..f46ae5a5e9 100644
--- a/dsp/sp_params.c
+++ b/dsp/sp_params.c
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <dsp/q6audio-v2.h>
 #include <dsp/q6afe-v2.h>
-#include <linux/msm_audio_calibration.h>
+#include <audio/linux/msm_audio_calibration.h>
 #include <dsp/sp_params.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/include/asoc/cpe_core.h b/include/asoc/cpe_core.h
index 86f1c57593..399cec33cc 100644
--- a/include/asoc/cpe_core.h
+++ b/include/asoc/cpe_core.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2018, 2020 The Linux Foundation. All rights reserved.
  */
 
 #ifndef __CPE_CORE_H__
@@ -9,7 +9,7 @@
 #include <linux/types.h>
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
-#include <sound/lsm_params.h>
+#include <audio/sound/lsm_params.h>
 
 enum {
 	CMD_INIT_STATE = 0,
diff --git a/include/asoc/wcd9xxx-resmgr-v2.h b/include/asoc/wcd9xxx-resmgr-v2.h
index a4b919f969..dcdf7cda12 100644
--- a/include/asoc/wcd9xxx-resmgr-v2.h
+++ b/include/asoc/wcd9xxx-resmgr-v2.h
@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2018, 2020 The Linux Foundation. All rights reserved.
  */
 #ifndef __WCD9XXX_COMMON_V2_H__
 #define __WCD9XXX_COMMON_V2_H__
 
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include "core.h"
 
 enum wcd_clock_type {
diff --git a/include/asoc/wcdcal-hwdep.h b/include/asoc/wcdcal-hwdep.h
index ddd5856a3b..77373eab47 100644
--- a/include/asoc/wcdcal-hwdep.h
+++ b/include/asoc/wcdcal-hwdep.h
@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2014, 2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014, 2018, 2020 The Linux Foundation. All rights reserved.
  */
 #ifndef __WCD9XXX_HWDEP_H__
 #define __WCD9XXX_HWDEP_H__
-#include <sound/msmcal-hwdep.h>
+#include <audio/sound/msmcal-hwdep.h>
 
 enum wcd_cal_states {
 	WCDCAL_UNINITIALISED,
diff --git a/include/dsp/apr_audio-v2.h b/include/dsp/apr_audio-v2.h
index fe9842643a..5416633860 100644
--- a/include/dsp/apr_audio-v2.h
+++ b/include/dsp/apr_audio-v2.h
@@ -8,7 +8,7 @@
 #define _APR_AUDIO_V2_H_
 
 #include <ipc/apr.h>
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 
 /* size of header needed for passing data out of band */
 #define APR_CMD_OB_HDR_SZ  12
diff --git a/include/dsp/audio_cal_utils.h b/include/dsp/audio_cal_utils.h
index 0607815037..71981d11c8 100644
--- a/include/dsp/audio_cal_utils.h
+++ b/include/dsp/audio_cal_utils.h
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2014, 2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014, 2018, 2020 The Linux Foundation. All rights reserved.
  */
 #ifndef _AUDIO_CAL_UTILS_H
 #define _AUDIO_CAL_UTILS_H
 
 #include <linux/msm_ion.h>
-#include <linux/msm_audio_calibration.h>
+#include <audio/linux/msm_audio_calibration.h>
 #include <dsp/msm_audio_ion.h>
 #include <dsp/audio_calibration.h>
 
diff --git a/include/dsp/audio_calibration.h b/include/dsp/audio_calibration.h
index a68c768cb8..e4f4e6e65c 100644
--- a/include/dsp/audio_calibration.h
+++ b/include/dsp/audio_calibration.h
@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2014, 2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014, 2017, 2020 The Linux Foundation. All rights reserved.
  */
 #ifndef _AUDIO_CALIBRATION_H
 #define _AUDIO_CALIBRATION_H
 
-#include <linux/msm_audio_calibration.h>
+#include <audio/linux/msm_audio_calibration.h>
 
 /* Used by driver in buffer_number field to notify client
  * To update all blocks, for example: freeing all memory
diff --git a/include/dsp/msm-audio-effects-q6-v2.h b/include/dsp/msm-audio-effects-q6-v2.h
index b1fad6d6a6..ac74f47f88 100644
--- a/include/dsp/msm-audio-effects-q6-v2.h
+++ b/include/dsp/msm-audio-effects-q6-v2.h
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016, 2020 The Linux Foundation. All rights reserved.
  */
 
 #ifndef _MSM_AUDIO_EFFECTS_H
 #define _MSM_AUDIO_EFFECTS_H
 
-#include <sound/audio_effects.h>
+#include <audio/sound/audio_effects.h>
 
 #define MAX_PP_PARAMS_SZ   128
 
diff --git a/include/dsp/q6lsm.h b/include/dsp/q6lsm.h
index 02897d98e0..1eaeb3e586 100644
--- a/include/dsp/q6lsm.h
+++ b/include/dsp/q6lsm.h
@@ -8,7 +8,7 @@
 #include <linux/list.h>
 #include <linux/msm_ion.h>
 #include <dsp/apr_audio-v2.h>
-#include <sound/lsm_params.h>
+#include <audio/sound/lsm_params.h>
 #include <ipc/apr.h>
 
 #define MAX_NUM_CONFIDENCE 20
diff --git a/include/dsp/q6voice.h b/include/dsp/q6voice.h
index 35ace4eed3..9ada57a5ad 100644
--- a/include/dsp/q6voice.h
+++ b/include/dsp/q6voice.h
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
  */
 #ifndef __QDSP6VOICE_H__
 #define __QDSP6VOICE_H__
 
 #include <linux/msm_ion.h>
-#include <sound/voice_params.h>
+#include <audio/sound/voice_params.h>
 #include <dsp/rtac.h>
 #include <dsp/q6core.h>
 #include <ipc/apr.h>
diff --git a/include/uapi/audio/linux/mfd/wcd9xxx/wcd9320_registers.h b/include/uapi/audio/linux/mfd/wcd9xxx/wcd9320_registers.h
index 63ab624195..facbd579ba 100644
--- a/include/uapi/audio/linux/mfd/wcd9xxx/wcd9320_registers.h
+++ b/include/uapi/audio/linux/mfd/wcd9xxx/wcd9320_registers.h
@@ -1,7 +1,7 @@
 #ifndef WCD9320_REGISTERS_H
 #define WCD9320_REGISTERS_H
 
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 
 #define TAIKO_A_CHIP_CTL			WCD9XXX_A_CHIP_CTL
 #define TAIKO_A_CHIP_CTL__POR			WCD9XXX_A_CHIP_CTL__POR
diff --git a/include/uapi/audio/linux/msm_audio_aac.h b/include/uapi/audio/linux/msm_audio_aac.h
index d1eb84bf3f..9c8add5727 100644
--- a/include/uapi/audio/linux/msm_audio_aac.h
+++ b/include/uapi/audio/linux/msm_audio_aac.h
@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_AAC_H
 #define _UAPI_MSM_AUDIO_AAC_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 #define AUDIO_SET_AAC_CONFIG  _IOW(AUDIO_IOCTL_MAGIC, \
diff --git a/include/uapi/audio/linux/msm_audio_ac3.h b/include/uapi/audio/linux/msm_audio_ac3.h
index 1df6e6949c..f53571ad45 100644
--- a/include/uapi/audio/linux/msm_audio_ac3.h
+++ b/include/uapi/audio/linux/msm_audio_ac3.h
@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_AC3_H
 #define _UAPI_MSM_AUDIO_AC3_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 
 #define AUDIO_SET_AC3_CONFIG  _IOW(AUDIO_IOCTL_MAGIC, \
 	(AUDIO_MAX_COMMON_IOCTL_NUM+0), unsigned int)
diff --git a/include/uapi/audio/linux/msm_audio_amrnb.h b/include/uapi/audio/linux/msm_audio_amrnb.h
index c903983ab9..12fed67334 100644
--- a/include/uapi/audio/linux/msm_audio_amrnb.h
+++ b/include/uapi/audio/linux/msm_audio_amrnb.h
@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_AMRNB_H
 #define _UAPI_MSM_AUDIO_AMRNB_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 #define AUDIO_GET_AMRNB_ENC_CONFIG  _IOW(AUDIO_IOCTL_MAGIC, \
diff --git a/include/uapi/audio/linux/msm_audio_amrwb.h b/include/uapi/audio/linux/msm_audio_amrwb.h
index 416760ee50..92869df47f 100644
--- a/include/uapi/audio/linux/msm_audio_amrwb.h
+++ b/include/uapi/audio/linux/msm_audio_amrwb.h
@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_AMRWB_H
 #define _UAPI_MSM_AUDIO_AMRWB_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 #define AUDIO_GET_AMRWB_ENC_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \
diff --git a/include/uapi/audio/linux/msm_audio_g711.h b/include/uapi/audio/linux/msm_audio_g711.h
index 3cfe5460e4..9827987a5c 100644
--- a/include/uapi/audio/linux/msm_audio_g711.h
+++ b/include/uapi/audio/linux/msm_audio_g711.h
@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_G711_H
 #define _UAPI_MSM_AUDIO_G711_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 struct msm_audio_g711_enc_config {
diff --git a/include/uapi/audio/linux/msm_audio_g711_dec.h b/include/uapi/audio/linux/msm_audio_g711_dec.h
index 3f17870c94..89e29198b1 100644
--- a/include/uapi/audio/linux/msm_audio_g711_dec.h
+++ b/include/uapi/audio/linux/msm_audio_g711_dec.h
@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_G711_H
 #define _UAPI_MSM_AUDIO_G711_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 struct msm_audio_g711_dec_config {
diff --git a/include/uapi/audio/linux/msm_audio_mvs.h b/include/uapi/audio/linux/msm_audio_mvs.h
index 348cfaf683..295348b41b 100644
--- a/include/uapi/audio/linux/msm_audio_mvs.h
+++ b/include/uapi/audio/linux/msm_audio_mvs.h
@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_MVS_H
 #define _UAPI_MSM_AUDIO_MVS_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 #define AUDIO_GET_MVS_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \
diff --git a/include/uapi/audio/linux/msm_audio_qcp.h b/include/uapi/audio/linux/msm_audio_qcp.h
index 3bfd229acd..fe21181325 100644
--- a/include/uapi/audio/linux/msm_audio_qcp.h
+++ b/include/uapi/audio/linux/msm_audio_qcp.h
@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_QCP_H
 #define _UAPI_MSM_AUDIO_QCP_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 #define AUDIO_SET_QCELP_ENC_CONFIG  _IOW(AUDIO_IOCTL_MAGIC, \
diff --git a/include/uapi/audio/linux/msm_audio_sbc.h b/include/uapi/audio/linux/msm_audio_sbc.h
index c004d6c53a..b364aab7f8 100644
--- a/include/uapi/audio/linux/msm_audio_sbc.h
+++ b/include/uapi/audio/linux/msm_audio_sbc.h
@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_SBC_H
 #define _UAPI_MSM_AUDIO_SBC_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 #define AUDIO_SET_SBC_ENC_CONFIG  _IOW(AUDIO_IOCTL_MAGIC, \
diff --git a/include/uapi/audio/linux/msm_audio_voicememo.h b/include/uapi/audio/linux/msm_audio_voicememo.h
index 34d2913177..e0c4f621ad 100644
--- a/include/uapi/audio/linux/msm_audio_voicememo.h
+++ b/include/uapi/audio/linux/msm_audio_voicememo.h
@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_VOICEMEMO_H
 #define _UAPI_MSM_AUDIO_VOICEMEMO_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 #define AUDIO_GET_VOICEMEMO_CONFIG  _IOW(AUDIO_IOCTL_MAGIC, \
diff --git a/ipc/wcd-dsp-glink.c b/ipc/wcd-dsp-glink.c
index a6eb044ff2..ffbd630f46 100644
--- a/ipc/wcd-dsp-glink.c
+++ b/ipc/wcd-dsp-glink.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/init.h>
@@ -16,7 +16,7 @@
 #include <linux/of_device.h>
 #include <linux/vmalloc.h>
 #include <linux/rpmsg.h>
-#include "sound/wcd-dsp-glink.h"
+#include "audio/sound/wcd-dsp-glink.h"
 
 #define WDSP_GLINK_DRIVER_NAME "wcd-dsp-glink"
 #define WDSP_MAX_WRITE_SIZE (256 * 1024)
diff --git a/soc/wcd-spi-ac.c b/soc/wcd-spi-ac.c
index 2a822b2b1b..f70cab756e 100644
--- a/soc/wcd-spi-ac.c
+++ b/soc/wcd-spi-ac.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/init.h>
@@ -11,7 +11,7 @@
 #include <linux/poll.h>
 #include <linux/slab.h>
 #include <linux/notifier.h>
-#include <linux/wcd-spi-ac-params.h>
+#include <audio/linux/wcd-spi-ac-params.h>
 #include <soc/wcd-spi-ac.h>
 #include <soc/qcom/msm_qmi_interface.h>