diff --git a/asoc/codecs/aqt1000/aqt1000-core.c b/asoc/codecs/aqt1000/aqt1000-core.c
index e5562a4d30..7b4efa1a00 100644
--- a/asoc/codecs/aqt1000/aqt1000-core.c
+++ b/asoc/codecs/aqt1000/aqt1000-core.c
@@ -19,8 +19,8 @@
 #include <linux/of_gpio.h>
 #include <linux/pm_runtime.h>
 #include <sound/soc.h>
-#include "../msm-cdc-pinctrl.h"
-#include "../msm-cdc-supply.h"
+#include <asoc/msm-cdc-pinctrl.h>
+#include <asoc/msm-cdc-supply.h>
 #include "aqt1000-registers.h"
 #include "aqt1000-internal.h"
 #include "aqt1000.h"
diff --git a/asoc/codecs/aqt1000/aqt1000-mbhc.c b/asoc/codecs/aqt1000/aqt1000-mbhc.c
index 66449b2db3..33a7c974cd 100644
--- a/asoc/codecs/aqt1000/aqt1000-mbhc.c
+++ b/asoc/codecs/aqt1000/aqt1000-mbhc.c
@@ -21,8 +21,8 @@
 #include "aqt1000-registers.h"
 #include "aqt1000-irq.h"
 #include "pdata.h"
-#include "../wcdcal-hwdep.h"
-#include "../wcd-mbhc-v2-api.h"
+#include <asoc/wcdcal-hwdep.h>
+#include <asoc/wcd-mbhc-v2-api.h>
 
 #define AQT_ZDET_SUPPORTED          true
 /* Z value defined in milliohm */
diff --git a/asoc/codecs/aqt1000/aqt1000-mbhc.h b/asoc/codecs/aqt1000/aqt1000-mbhc.h
index b6ce875155..770472c328 100644
--- a/asoc/codecs/aqt1000/aqt1000-mbhc.h
+++ b/asoc/codecs/aqt1000/aqt1000-mbhc.h
@@ -3,7 +3,7 @@
  */
 #ifndef __AQT1000_MBHC_H__
 #define __AQT1000_MBHC_H__
-#include "../wcd-mbhc-v2.h"
+#include <asoc/wcd-mbhc-v2.h>
 
 struct aqt1000_mbhc {
 	struct wcd_mbhc wcd_mbhc;
diff --git a/asoc/codecs/aqt1000/aqt1000.c b/asoc/codecs/aqt1000/aqt1000.c
index 1ba5605b62..a92a1541c4 100644
--- a/asoc/codecs/aqt1000/aqt1000.c
+++ b/asoc/codecs/aqt1000/aqt1000.c
@@ -25,12 +25,12 @@
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
 #include <sound/info.h>
+#include <asoc/wcdcal-hwdep.h>
 #include "aqt1000-registers.h"
 #include "aqt1000.h"
 #include "aqt1000-api.h"
 #include "aqt1000-mbhc.h"
 #include "aqt1000-routing.h"
-#include "../wcdcal-hwdep.h"
 #include "aqt1000-internal.h"
 
 #define DRV_NAME "aqt_codec"
diff --git a/asoc/codecs/aqt1000/pdata.h b/asoc/codecs/aqt1000/pdata.h
index c490b56d1d..ba9e68f79f 100644
--- a/asoc/codecs/aqt1000/pdata.h
+++ b/asoc/codecs/aqt1000/pdata.h
@@ -8,7 +8,7 @@
 
 #include <linux/kernel.h>
 #include <linux/device.h>
-#include "../msm-cdc-supply.h"
+#include <asoc/msm-cdc-supply.h>
 
 struct aqt1000_micbias_setting {
 	u8 ldoh_v;
diff --git a/asoc/codecs/bolero/rx-macro.c b/asoc/codecs/bolero/rx-macro.c
index ff8684f717..6b700a68a5 100644
--- a/asoc/codecs/bolero/rx-macro.c
+++ b/asoc/codecs/bolero/rx-macro.c
@@ -14,9 +14,9 @@
 #include <sound/tlv.h>
 #include <soc/swr-wcd.h>
 
+#include <asoc/msm-cdc-pinctrl.h>
 #include "bolero-cdc.h"
 #include "bolero-cdc-registers.h"
-#include "../msm-cdc-pinctrl.h"
 
 #define RX_MACRO_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
 			SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\
diff --git a/asoc/codecs/bolero/tx-macro.c b/asoc/codecs/bolero/tx-macro.c
index c33a857acb..3c51c3fb3e 100644
--- a/asoc/codecs/bolero/tx-macro.c
+++ b/asoc/codecs/bolero/tx-macro.c
@@ -12,9 +12,9 @@
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
 #include <soc/swr-wcd.h>
+#include <asoc/msm-cdc-pinctrl.h>
 #include "bolero-cdc.h"
 #include "bolero-cdc-registers.h"
-#include "../msm-cdc-pinctrl.h"
 
 #define TX_MACRO_MAX_OFFSET 0x1000
 
diff --git a/asoc/codecs/bolero/wsa-macro.c b/asoc/codecs/bolero/wsa-macro.c
index 48a42ac465..9b2c3240b8 100644
--- a/asoc/codecs/bolero/wsa-macro.c
+++ b/asoc/codecs/bolero/wsa-macro.c
@@ -12,10 +12,10 @@
 #include <sound/tlv.h>
 #include <soc/swr-wcd.h>
 
+#include <asoc/msm-cdc-pinctrl.h>
 #include "bolero-cdc.h"
 #include "bolero-cdc-registers.h"
 #include "wsa-macro.h"
-#include "../msm-cdc-pinctrl.h"
 
 #define WSA_MACRO_MAX_OFFSET 0x1000
 
diff --git a/asoc/codecs/msm-cdc-pinctrl.c b/asoc/codecs/msm-cdc-pinctrl.c
index 142e73d27e..b626e5721d 100644
--- a/asoc/codecs/msm-cdc-pinctrl.c
+++ b/asoc/codecs/msm-cdc-pinctrl.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/kernel.h>
@@ -11,7 +11,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
-#include "msm-cdc-pinctrl.h"
+#include <asoc/msm-cdc-pinctrl.h>
 
 struct msm_cdc_pinctrl_info {
 	struct pinctrl *pinctrl;
diff --git a/asoc/codecs/msm-cdc-supply.c b/asoc/codecs/msm-cdc-supply.c
index 16dfebbf1f..04fd2de138 100644
--- a/asoc/codecs/msm-cdc-supply.c
+++ b/asoc/codecs/msm-cdc-supply.c
@@ -8,8 +8,8 @@
 #include <linux/of_irq.h>
 #include <linux/of_device.h>
 #include <linux/slab.h>
-#include "msm-cdc-supply.h"
 #include <linux/regulator/consumer.h>
+#include <asoc/msm-cdc-supply.h>
 
 #define CODEC_DT_MAX_PROP_SIZE 40
 
diff --git a/asoc/codecs/wcd-clsh.c b/asoc/codecs/wcd-clsh.c
index 834454afab..3cd76f709f 100644
--- a/asoc/codecs/wcd-clsh.c
+++ b/asoc/codecs/wcd-clsh.c
@@ -9,7 +9,7 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <asoc/wcd9xxx_registers.h>
-#include "wcd-clsh.h"
+#include <asoc/wcd-clsh.h>
 
 #define WCD_USLEEP_RANGE 50
 
diff --git a/asoc/codecs/wcd-mbhc-adc.c b/asoc/codecs/wcd-mbhc-adc.c
index 2b596c3ac2..d63c67ced2 100644
--- a/asoc/codecs/wcd-mbhc-adc.c
+++ b/asoc/codecs/wcd-mbhc-adc.c
@@ -20,8 +20,8 @@
 #include <sound/soc.h>
 #include <sound/jack.h>
 #include "wcd-mbhc-adc.h"
-#include "wcd-mbhc-v2.h"
-#include "pdata.h"
+#include <asoc/wcd-mbhc-v2.h>
+#include <asoc/pdata.h>
 
 #define WCD_MBHC_ADC_HS_THRESHOLD_MV    1700
 #define WCD_MBHC_ADC_HPH_THRESHOLD_MV   75
diff --git a/asoc/codecs/wcd-mbhc-adc.h b/asoc/codecs/wcd-mbhc-adc.h
index 95e0ff2f15..97fd12d8a0 100644
--- a/asoc/codecs/wcd-mbhc-adc.h
+++ b/asoc/codecs/wcd-mbhc-adc.h
@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
-/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
  */
 #ifndef __WCD_MBHC_ADC_H__
 #define __WCD_MBHC_ADC_H__
 
-#include "wcd-mbhc-v2.h"
+#include <asoc/wcd-mbhc-v2.h>
 
 enum wcd_mbhc_adc_mux_ctl {
 	MUX_CTL_AUTO = 0,
diff --git a/asoc/codecs/wcd-mbhc-legacy.c b/asoc/codecs/wcd-mbhc-legacy.c
index 94c4560bf4..b266da699b 100644
--- a/asoc/codecs/wcd-mbhc-legacy.c
+++ b/asoc/codecs/wcd-mbhc-legacy.c
@@ -20,7 +20,7 @@
 #include <sound/soc.h>
 #include <sound/jack.h>
 #include "wcd-mbhc-legacy.h"
-#include "wcd-mbhc-v2.h"
+#include <asoc/wcd-mbhc-v2.h>
 
 static int det_extn_cable_en;
 module_param(det_extn_cable_en, int, 0664);
diff --git a/asoc/codecs/wcd-mbhc-legacy.h b/asoc/codecs/wcd-mbhc-legacy.h
index c7835c5963..314bb1332c 100644
--- a/asoc/codecs/wcd-mbhc-legacy.h
+++ b/asoc/codecs/wcd-mbhc-legacy.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-2018, The Linux Foundation. All rights reserved.
  */
 #ifndef __WCD_MBHC_LEGACY_H__
 #define __WCD_MBHC_LEGACY_H__
 
-#include "wcdcal-hwdep.h"
-#include "wcd-mbhc-v2.h"
+#include <asoc/wcdcal-hwdep.h>
+#include <asoc/wcd-mbhc-v2.h>
 
 #if IS_ENABLED(CONFIG_SND_SOC_WCD_MBHC_LEGACY)
 void wcd_mbhc_legacy_init(struct wcd_mbhc *mbhc);
diff --git a/asoc/codecs/wcd-mbhc-v2.c b/asoc/codecs/wcd-mbhc-v2.c
index 162ccde7e0..6839203bd9 100644
--- a/asoc/codecs/wcd-mbhc-v2.c
+++ b/asoc/codecs/wcd-mbhc-v2.c
@@ -20,11 +20,11 @@
 #include <linux/soc/qcom/fsa4480-i2c.h>
 #include <sound/soc.h>
 #include <sound/jack.h>
-#include "msm-cdc-pinctrl.h"
-#include "wcdcal-hwdep.h"
+#include <asoc/msm-cdc-pinctrl.h>
+#include <asoc/wcdcal-hwdep.h>
 #include "wcd-mbhc-legacy.h"
 #include "wcd-mbhc-adc.h"
-#include "wcd-mbhc-v2-api.h"
+#include <asoc/wcd-mbhc-v2-api.h>
 
 void wcd_mbhc_jack_report(struct wcd_mbhc *mbhc,
 			  struct snd_soc_jack *jack, int status, int mask)
diff --git a/asoc/codecs/wcd9335-regmap.c b/asoc/codecs/wcd9335-regmap.c
index 0a83fd582c..7b3363f08f 100644
--- a/asoc/codecs/wcd9335-regmap.c
+++ b/asoc/codecs/wcd9335-regmap.c
@@ -5,9 +5,9 @@
 
 #include <linux/regmap.h>
 #include <linux/device.h>
-#include "core.h"
-#include "wcd9xxx-regmap.h"
-#include "wcd9335_registers.h"
+#include <asoc/core.h>
+#include <asoc/wcd9xxx-regmap.h>
+#include <asoc/wcd9335_registers.h>
 
 static const struct reg_sequence wcd9335_1_x_defaults[] = {
 	{ WCD9335_CODEC_RPM_CLK_GATE,                     0x03,  0x00 },
diff --git a/asoc/codecs/wcd9335.c b/asoc/codecs/wcd9335.c
index 2372e20b7b..22bc0e6aba 100644
--- a/asoc/codecs/wcd9335.c
+++ b/asoc/codecs/wcd9335.c
@@ -28,18 +28,18 @@
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
 #include <sound/info.h>
-#include "core.h"
-#include "pdata.h"
+#include <asoc/core.h>
+#include <asoc/pdata.h>
 #include "wcd9335.h"
-#include "wcd-mbhc-v2.h"
-#include "wcd9xxx-common-v2.h"
-#include "wcd9xxx-resmgr-v2.h"
-#include "wcd9xxx-irq.h"
+#include <asoc/wcd-mbhc-v2.h>
+#include <asoc/wcd9xxx-common-v2.h>
+#include <asoc/wcd9xxx-resmgr-v2.h>
+#include <asoc/wcd9xxx-irq.h>
 #include "wcd9335_registers.h"
 #include "wcd9335_irq.h"
 #include "wcd_cpe_core.h"
-#include "wcdcal-hwdep.h"
-#include "wcd-mbhc-v2-api.h"
+#include <asoc/wcdcal-hwdep.h>
+#include <asoc/wcd-mbhc-v2-api.h>
 
 #define DRV_NAME "tasha_codec"
 
diff --git a/asoc/codecs/wcd9335.h b/asoc/codecs/wcd9335.h
index 261ea407a6..969ac67093 100644
--- a/asoc/codecs/wcd9335.h
+++ b/asoc/codecs/wcd9335.h
@@ -8,8 +8,8 @@
 #include <sound/soc.h>
 #include <sound/jack.h>
 #include <dsp/apr_audio-v2.h>
-#include "wcd9xxx-slimslave.h"
-#include "wcd-mbhc-v2.h"
+#include <asoc/wcd9xxx-slimslave.h>
+#include <asoc/wcd-mbhc-v2.h>
 
 #define TASHA_REG_VAL(reg, val)      {reg, 0, val}
 
diff --git a/asoc/codecs/wcd934x/wcd934x-dsp-cntl.c b/asoc/codecs/wcd934x/wcd934x-dsp-cntl.c
index 0c6c6f0332..a7c9ea6e98 100644
--- a/asoc/codecs/wcd934x/wcd934x-dsp-cntl.c
+++ b/asoc/codecs/wcd934x/wcd934x-dsp-cntl.c
@@ -12,8 +12,8 @@
 #include <asoc/wcd934x_registers.h>
 #include "wcd934x.h"
 #include "wcd934x-dsp-cntl.h"
-#include "../wcd9xxx-irq.h"
-#include "../core.h"
+#include <asoc/wcd9xxx-irq.h>
+#include <asoc/core.h>
 
 #define WCD_CNTL_DIR_NAME_LEN_MAX 32
 #define WCD_CPE_FLL_MAX_RETRIES 5
diff --git a/asoc/codecs/wcd934x/wcd934x-mbhc.c b/asoc/codecs/wcd934x/wcd934x-mbhc.c
index 5801f31138..f00e4c0a98 100644
--- a/asoc/codecs/wcd934x/wcd934x-mbhc.c
+++ b/asoc/codecs/wcd934x/wcd934x-mbhc.c
@@ -21,11 +21,11 @@
 #include "wcd934x-mbhc.h"
 #include <asoc/wcd934x_registers.h>
 #include "wcd934x_irq.h"
-#include "../core.h"
-#include "../pdata.h"
-#include "../wcd9xxx-irq.h"
-#include "../wcdcal-hwdep.h"
-#include "../wcd-mbhc-v2-api.h"
+#include <asoc/core.h>
+#include <asoc/pdata.h>
+#include <asoc/wcd9xxx-irq.h>
+#include <asoc/wcdcal-hwdep.h>
+#include <asoc/wcd-mbhc-v2-api.h>
 
 #define TAVIL_ZDET_SUPPORTED          true
 /* Z value defined in milliohm */
diff --git a/asoc/codecs/wcd934x/wcd934x-mbhc.h b/asoc/codecs/wcd934x/wcd934x-mbhc.h
index a0bd05a2aa..d474f6338b 100644
--- a/asoc/codecs/wcd934x/wcd934x-mbhc.h
+++ b/asoc/codecs/wcd934x/wcd934x-mbhc.h
@@ -4,7 +4,7 @@
  */
 #ifndef __WCD934X_MBHC_H__
 #define __WCD934X_MBHC_H__
-#include "../wcd-mbhc-v2.h"
+#include <asoc/wcd-mbhc-v2.h>
 
 enum wcd934x_on_demand_supply_name {
 	WCD934X_ON_DEMAND_MICBIAS = 0,
diff --git a/asoc/codecs/wcd934x/wcd934x-regmap.c b/asoc/codecs/wcd934x/wcd934x-regmap.c
index 2a2187f953..a9642091a6 100644
--- a/asoc/codecs/wcd934x/wcd934x-regmap.c
+++ b/asoc/codecs/wcd934x/wcd934x-regmap.c
@@ -6,8 +6,8 @@
 #include <linux/regmap.h>
 #include <linux/device.h>
 #include <asoc/wcd934x_registers.h>
-#include "../core.h"
-#include "../wcd9xxx-regmap.h"
+#include <asoc/core.h>
+#include <asoc/wcd9xxx-regmap.h>
 
 
 static const struct reg_sequence wcd934x_1_1_defaults[] = {
diff --git a/asoc/codecs/wcd934x/wcd934x.c b/asoc/codecs/wcd934x/wcd934x.c
index becf7ee758..07bbcb39b7 100644
--- a/asoc/codecs/wcd934x/wcd934x.c
+++ b/asoc/codecs/wcd934x/wcd934x.c
@@ -35,12 +35,12 @@
 #include "wcd934x-routing.h"
 #include "wcd934x-dsp-cntl.h"
 #include "wcd934x_irq.h"
-#include "../core.h"
-#include "../pdata.h"
-#include "../wcd9xxx-irq.h"
-#include "../wcd9xxx-common-v2.h"
-#include "../wcd9xxx-resmgr-v2.h"
-#include "../wcdcal-hwdep.h"
+#include <asoc/core.h>
+#include <asoc/pdata.h>
+#include <asoc/wcd9xxx-irq.h>
+#include <asoc/wcd9xxx-common-v2.h>
+#include <asoc/wcd9xxx-resmgr-v2.h>
+#include <asoc/wcdcal-hwdep.h>
 #include "wcd934x-dsd.h"
 
 #define DRV_NAME "tavil_codec"
diff --git a/asoc/codecs/wcd934x/wcd934x.h b/asoc/codecs/wcd934x/wcd934x.h
index 8d5aec5002..7cc0ec171b 100644
--- a/asoc/codecs/wcd934x/wcd934x.h
+++ b/asoc/codecs/wcd934x/wcd934x.h
@@ -7,9 +7,9 @@
 
 #include <dsp/apr_audio-v2.h>
 #include "wcd934x-dsp-cntl.h"
-#include "../wcd9xxx-slimslave.h"
-#include "../wcd9xxx-common-v2.h"
-#include "../wcd-mbhc-v2.h"
+#include <asoc/wcd9xxx-slimslave.h>
+#include <asoc/wcd9xxx-common-v2.h>
+#include <asoc/wcd-mbhc-v2.h>
 
 #define WCD934X_REGISTER_START_OFFSET  0x800
 #define WCD934X_SB_PGD_PORT_RX_BASE   0x40
diff --git a/asoc/codecs/wcd937x/internal.h b/asoc/codecs/wcd937x/internal.h
index ca401b43f2..eaf6860d42 100644
--- a/asoc/codecs/wcd937x/internal.h
+++ b/asoc/codecs/wcd937x/internal.h
@@ -5,9 +5,9 @@
 #ifndef _WCD937X_INTERNAL_H
 #define _WCD937X_INTERNAL_H
 
-#include "../wcd-clsh.h"
-#include "../wcd-mbhc-v2.h"
-#include "asoc/wcd-irq.h"
+#include <asoc/wcd-clsh.h>
+#include <asoc/wcd-mbhc-v2.h>
+#include <asoc/wcd-irq.h>
 #include "wcd937x-mbhc.h"
 
 #define WCD937X_MAX_MICBIAS 3
diff --git a/asoc/codecs/wcd937x/wcd937x-mbhc.c b/asoc/codecs/wcd937x/wcd937x-mbhc.c
index 0703017a0d..54d9f45954 100644
--- a/asoc/codecs/wcd937x/wcd937x-mbhc.c
+++ b/asoc/codecs/wcd937x/wcd937x-mbhc.c
@@ -16,8 +16,8 @@
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include "wcd937x-registers.h"
-#include "../wcdcal-hwdep.h"
-#include "../wcd-mbhc-v2-api.h"
+#include <asoc/wcdcal-hwdep.h>
+#include <asoc/wcd-mbhc-v2-api.h>
 #include "internal.h"
 
 #define WCD937X_ZDET_SUPPORTED          true
diff --git a/asoc/codecs/wcd937x/wcd937x-mbhc.h b/asoc/codecs/wcd937x/wcd937x-mbhc.h
index 3ac42ef5ad..3c74951659 100644
--- a/asoc/codecs/wcd937x/wcd937x-mbhc.h
+++ b/asoc/codecs/wcd937x/wcd937x-mbhc.h
@@ -3,7 +3,7 @@
  */
 #ifndef __WCD937X_MBHC_H__
 #define __WCD937X_MBHC_H__
-#include "../wcd-mbhc-v2.h"
+#include <asoc/wcd-mbhc-v2.h>
 
 struct wcd937x_mbhc {
 	struct wcd_mbhc wcd_mbhc;
diff --git a/asoc/codecs/wcd937x/wcd937x.c b/asoc/codecs/wcd937x/wcd937x.c
index 45c990e1c3..004ce796c9 100644
--- a/asoc/codecs/wcd937x/wcd937x.c
+++ b/asoc/codecs/wcd937x/wcd937x.c
@@ -19,11 +19,11 @@
 #include <sound/soc-dapm.h>
 #include "internal.h"
 #include "wcd937x.h"
-#include "../wcdcal-hwdep.h"
+#include <asoc/wcdcal-hwdep.h>
 #include "wcd937x-registers.h"
-#include "../msm-cdc-pinctrl.h"
+#include <asoc/msm-cdc-pinctrl.h>
 #include <dt-bindings/sound/audio-codec-port-types.h>
-#include "../msm-cdc-supply.h"
+#include <asoc/msm-cdc-supply.h>
 
 #define DRV_NAME "wcd937x_codec"
 
diff --git a/asoc/codecs/wcd9xxx-common-v2.c b/asoc/codecs/wcd9xxx-common-v2.c
index 56a3fa59e9..17f0fb7303 100644
--- a/asoc/codecs/wcd9xxx-common-v2.c
+++ b/asoc/codecs/wcd9xxx-common-v2.c
@@ -9,8 +9,8 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
-#include "core.h"
-#include "wcd9xxx-common-v2.h"
+#include <asoc/core.h>
+#include <asoc/wcd9xxx-common-v2.h>
 
 #define WCD_USLEEP_RANGE 50
 #define MAX_IMPED_PARAMS 6
diff --git a/asoc/codecs/wcd9xxx-core-init.c b/asoc/codecs/wcd9xxx-core-init.c
index bb865a9824..cd35a9e24b 100644
--- a/asoc/codecs/wcd9xxx-core-init.c
+++ b/asoc/codecs/wcd9xxx-core-init.c
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
-#include "msm-cdc-pinctrl.h"
-#include "wcd9xxx-irq.h"
-#include "core.h"
+#include <asoc/msm-cdc-pinctrl.h>
+#include <asoc/wcd9xxx-irq.h>
+#include <asoc/core.h>
 
 #define NUM_DRIVERS_REG_RET 3
 
diff --git a/asoc/codecs/wcd9xxx-core.c b/asoc/codecs/wcd9xxx-core.c
index 5794ef2141..b0cb9c72e4 100644
--- a/asoc/codecs/wcd9xxx-core.c
+++ b/asoc/codecs/wcd9xxx-core.c
@@ -15,14 +15,14 @@
 #include <linux/regmap.h>
 #include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <sound/soc.h>
-#include "core.h"
-#include "pdata.h"
-#include "msm-cdc-pinctrl.h"
-#include "msm-cdc-supply.h"
-#include "wcd9xxx-irq.h"
+#include <asoc/core.h>
+#include <asoc/pdata.h>
+#include <asoc/msm-cdc-pinctrl.h>
+#include <asoc/msm-cdc-supply.h>
+#include <asoc/wcd9xxx-irq.h>
 #include "wcd9xxx-utils.h"
-#include "wcd9xxx-regmap.h"
-#include "wcd9xxx-slimslave.h"
+#include <asoc/wcd9xxx-regmap.h>
+#include <asoc/wcd9xxx-slimslave.h>
 
 #define WCD9XXX_REGISTER_START_OFFSET 0x800
 #define WCD9XXX_SLIM_RW_MAX_TRIES 3
diff --git a/asoc/codecs/wcd9xxx-irq.c b/asoc/codecs/wcd9xxx-irq.c
index 06dbf75d61..b748bb2e91 100644
--- a/asoc/codecs/wcd9xxx-irq.c
+++ b/asoc/codecs/wcd9xxx-irq.c
@@ -19,8 +19,8 @@
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
 #include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
-#include "core.h"
-#include "wcd9xxx-irq.h"
+#include <asoc/core.h>
+#include <asoc/wcd9xxx-irq.h>
 
 #define BYTE_BIT_MASK(nr)		(1UL << ((nr) % BITS_PER_BYTE))
 #define BIT_BYTE(nr)			((nr) / BITS_PER_BYTE)
diff --git a/asoc/codecs/wcd9xxx-resmgr-v2.c b/asoc/codecs/wcd9xxx-resmgr-v2.c
index f280fcc1eb..fcb82f96e1 100644
--- a/asoc/codecs/wcd9xxx-resmgr-v2.c
+++ b/asoc/codecs/wcd9xxx-resmgr-v2.c
@@ -7,8 +7,8 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <sound/soc.h>
-#include "wcd9xxx-resmgr-v2.h"
-#include "core.h"
+#include <asoc/wcd9xxx-resmgr-v2.h>
+#include <asoc/core.h>
 
 #define WCD9XXX_RCO_CALIBRATION_DELAY_INC_US 5000
 /* This register is valid only for WCD9335 */
diff --git a/asoc/codecs/wcd9xxx-rst.c b/asoc/codecs/wcd9xxx-rst.c
index 4a729a0a54..4171a713f6 100644
--- a/asoc/codecs/wcd9xxx-rst.c
+++ b/asoc/codecs/wcd9xxx-rst.c
@@ -7,8 +7,8 @@
 #include <linux/device.h>
 #include <linux/regmap.h>
 #include <linux/delay.h>
-#include "core.h"
-#include "pdata.h"
+#include <asoc/core.h>
+#include <asoc/pdata.h>
 #include "wcd9xxx-utils.h"
 #include "wcd9335_registers.h"
 #include "wcd9335_irq.h"
diff --git a/asoc/codecs/wcd9xxx-slimslave.c b/asoc/codecs/wcd9xxx-slimslave.c
index a4f07ef0f8..502bbf55e5 100644
--- a/asoc/codecs/wcd9xxx-slimslave.c
+++ b/asoc/codecs/wcd9xxx-slimslave.c
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
  */
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
-#include "wcd9xxx-slimslave.h"
+#include <asoc/wcd9xxx-slimslave.h>
 
 struct wcd9xxx_slim_sch {
 	u16 rx_port_ch_reg_base;
diff --git a/asoc/codecs/wcd9xxx-utils.c b/asoc/codecs/wcd9xxx-utils.c
index bcc909b8fc..06968dca4b 100644
--- a/asoc/codecs/wcd9xxx-utils.c
+++ b/asoc/codecs/wcd9xxx-utils.c
@@ -12,11 +12,11 @@
 #include <linux/delay.h>
 #include <linux/sched.h>
 #include <linux/mfd/core.h>
-#include "core.h"
-#include "msm-cdc-supply.h"
-#include "msm-cdc-pinctrl.h"
-#include "pdata.h"
-#include "wcd9xxx-irq.h"
+#include <asoc/core.h>
+#include <asoc/msm-cdc-supply.h>
+#include <asoc/msm-cdc-pinctrl.h>
+#include <asoc/pdata.h>
+#include <asoc/wcd9xxx-irq.h>
 #include "wcd9xxx-utils.h"
 
 #define REG_BYTES 2
diff --git a/asoc/codecs/wcd_cpe_core.c b/asoc/codecs/wcd_cpe_core.c
index 629b803d7d..2ef4ae61e1 100644
--- a/asoc/codecs/wcd_cpe_core.c
+++ b/asoc/codecs/wcd_cpe_core.c
@@ -17,14 +17,14 @@
 #include <sound/lsm_params.h>
 #include <soc/qcom/pm.h>
 #include <dsp/audio_cal_utils.h>
-#include "core.h"
+#include <asoc/core.h>
 #include "cpe_core.h"
 #include "cpe_err.h"
 #include "cpe_cmi.h"
 #include "wcd_cpe_core.h"
 #include "wcd_cpe_services.h"
 #include "wcd_cmi_api.h"
-#include "wcd9xxx-irq.h"
+#include <asoc/wcd9xxx-irq.h>
 
 #define CMI_CMD_TIMEOUT (10 * HZ)
 #define WCD_CPE_LSM_MAX_SESSIONS 2
diff --git a/asoc/codecs/wcd_cpe_services.c b/asoc/codecs/wcd_cpe_services.c
index fd8e8090d2..96e2bb1945 100644
--- a/asoc/codecs/wcd_cpe_services.c
+++ b/asoc/codecs/wcd_cpe_services.c
@@ -11,7 +11,7 @@
 #include <linux/delay.h>
 #include <sound/soc.h>
 #include "wcd9335_registers.h"
-#include "core.h"
+#include <asoc/core.h>
 #include "cpe_cmi.h"
 #include "wcd_cpe_services.h"
 #include "wcd_cmi_api.h"
diff --git a/asoc/codecs/wcdcal-hwdep.c b/asoc/codecs/wcdcal-hwdep.c
index e826eae3b8..f9097e339b 100644
--- a/asoc/codecs/wcdcal-hwdep.c
+++ b/asoc/codecs/wcdcal-hwdep.c
@@ -11,7 +11,7 @@
 #include <sound/hwdep.h>
 #include <sound/msmcal-hwdep.h>
 #include <sound/soc.h>
-#include "wcdcal-hwdep.h"
+#include <asoc/wcdcal-hwdep.h>
 
 const int cal_size_info[WCD9XXX_MAX_CAL] = {
 	[WCD9XXX_ANC_CAL] = 16384,
diff --git a/asoc/codecs/wsa881x.c b/asoc/codecs/wsa881x.c
index 4dceb0449c..f98de2e193 100644
--- a/asoc/codecs/wsa881x.c
+++ b/asoc/codecs/wsa881x.c
@@ -24,7 +24,7 @@
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
-#include "msm-cdc-pinctrl.h"
+#include <asoc/msm-cdc-pinctrl.h>
 #include "wsa881x.h"
 #include "wsa881x-temp-sensor.h"
 
diff --git a/asoc/msm-dai-q6-v2.c b/asoc/msm-dai-q6-v2.c
index 8cdeff71ff..02e454e393 100644
--- a/asoc/msm-dai-q6-v2.c
+++ b/asoc/msm-dai-q6-v2.c
@@ -18,7 +18,7 @@
 #include <dsp/q6afe-v2.h>
 #include <dsp/q6core.h>
 #include "msm-dai-q6-v2.h"
-#include "codecs/core.h"
+#include <asoc/core.h>
 
 #define MSM_DAI_PRI_AUXPCM_DT_DEV_ID 1
 #define MSM_DAI_SEC_AUXPCM_DT_DEV_ID 2
diff --git a/asoc/qcs405.c b/asoc/qcs405.c
index e5310ab695..6e4596fdad 100644
--- a/asoc/qcs405.c
+++ b/asoc/qcs405.c
@@ -26,7 +26,7 @@
 #include <dsp/msm_mdf.h>
 #include "device_event.h"
 #include "msm-pcm-routing-v2.h"
-#include "codecs/msm-cdc-pinctrl.h"
+#include <asoc/msm-cdc-pinctrl.h>
 #include "codecs/wcd9335.h"
 #include "codecs/wsa881x.h"
 #include "codecs/csra66x0/csra66x0.h"
diff --git a/asoc/sm6150.c b/asoc/sm6150.c
index a13eb06538..02f8fc5eae 100644
--- a/asoc/sm6150.c
+++ b/asoc/sm6150.c
@@ -27,7 +27,7 @@
 #include <dsp/q6core.h>
 #include "device_event.h"
 #include "msm-pcm-routing-v2.h"
-#include "codecs/msm-cdc-pinctrl.h"
+#include <asoc/msm-cdc-pinctrl.h>
 #include "codecs/wcd934x/wcd934x.h"
 #include "codecs/wcd934x/wcd934x-mbhc.h"
 #include "codecs/wcd937x/wcd937x-mbhc.h"
diff --git a/asoc/sm8150.c b/asoc/sm8150.c
index 7f73dae75b..aad4765759 100644
--- a/asoc/sm8150.c
+++ b/asoc/sm8150.c
@@ -25,11 +25,11 @@
 #include <dsp/q6core.h>
 #include "device_event.h"
 #include "msm-pcm-routing-v2.h"
-#include "codecs/msm-cdc-pinctrl.h"
+#include <asoc/msm-cdc-pinctrl.h>
 #include "codecs/wcd934x/wcd934x.h"
 #include "codecs/wcd934x/wcd934x-mbhc.h"
 #include "codecs/wsa881x.h"
-#include "codecs/wcd-mbhc-v2.h"
+#include <asoc/wcd-mbhc-v2.h>
 
 #define DRV_NAME "sm8150-asoc-snd"
 
diff --git a/asoc/codecs/core.h b/include/asoc/core.h
similarity index 100%
rename from asoc/codecs/core.h
rename to include/asoc/core.h
diff --git a/asoc/codecs/cpe_core.h b/include/asoc/cpe_core.h
similarity index 100%
rename from asoc/codecs/cpe_core.h
rename to include/asoc/cpe_core.h
diff --git a/asoc/codecs/msm-cdc-pinctrl.h b/include/asoc/msm-cdc-pinctrl.h
similarity index 100%
rename from asoc/codecs/msm-cdc-pinctrl.h
rename to include/asoc/msm-cdc-pinctrl.h
diff --git a/asoc/codecs/msm-cdc-supply.h b/include/asoc/msm-cdc-supply.h
similarity index 100%
rename from asoc/codecs/msm-cdc-supply.h
rename to include/asoc/msm-cdc-supply.h
diff --git a/asoc/codecs/pdata.h b/include/asoc/pdata.h
similarity index 100%
rename from asoc/codecs/pdata.h
rename to include/asoc/pdata.h
diff --git a/asoc/codecs/wcd-clsh.h b/include/asoc/wcd-clsh.h
similarity index 100%
rename from asoc/codecs/wcd-clsh.h
rename to include/asoc/wcd-clsh.h
diff --git a/asoc/codecs/wcd-mbhc-v2-api.h b/include/asoc/wcd-mbhc-v2-api.h
similarity index 100%
rename from asoc/codecs/wcd-mbhc-v2-api.h
rename to include/asoc/wcd-mbhc-v2-api.h
diff --git a/asoc/codecs/wcd-mbhc-v2.h b/include/asoc/wcd-mbhc-v2.h
similarity index 100%
rename from asoc/codecs/wcd-mbhc-v2.h
rename to include/asoc/wcd-mbhc-v2.h
diff --git a/asoc/codecs/wcd9xxx-common-v2.h b/include/asoc/wcd9xxx-common-v2.h
similarity index 100%
rename from asoc/codecs/wcd9xxx-common-v2.h
rename to include/asoc/wcd9xxx-common-v2.h
diff --git a/asoc/codecs/wcd9xxx-irq.h b/include/asoc/wcd9xxx-irq.h
similarity index 100%
rename from asoc/codecs/wcd9xxx-irq.h
rename to include/asoc/wcd9xxx-irq.h
diff --git a/asoc/codecs/wcd9xxx-regmap.h b/include/asoc/wcd9xxx-regmap.h
similarity index 100%
rename from asoc/codecs/wcd9xxx-regmap.h
rename to include/asoc/wcd9xxx-regmap.h
diff --git a/asoc/codecs/wcd9xxx-resmgr-v2.h b/include/asoc/wcd9xxx-resmgr-v2.h
similarity index 100%
rename from asoc/codecs/wcd9xxx-resmgr-v2.h
rename to include/asoc/wcd9xxx-resmgr-v2.h
diff --git a/asoc/codecs/wcd9xxx-slimslave.h b/include/asoc/wcd9xxx-slimslave.h
similarity index 100%
rename from asoc/codecs/wcd9xxx-slimslave.h
rename to include/asoc/wcd9xxx-slimslave.h
diff --git a/asoc/codecs/wcdcal-hwdep.h b/include/asoc/wcdcal-hwdep.h
similarity index 100%
rename from asoc/codecs/wcdcal-hwdep.h
rename to include/asoc/wcdcal-hwdep.h