diff --git a/sound/soc/msm/qdsp6v2/audio_cal_utils.h b/include/sound/audio_cal_utils.h
similarity index 100%
rename from sound/soc/msm/qdsp6v2/audio_cal_utils.h
rename to include/sound/audio_cal_utils.h
diff --git a/sound/soc/msm/qdsp6v2/audio_calibration.h b/include/sound/audio_calibration.h
similarity index 100%
rename from sound/soc/msm/qdsp6v2/audio_calibration.h
rename to include/sound/audio_calibration.h
diff --git a/sound/soc/msm/qdsp6v2/audio_cal_utils.c b/sound/soc/msm/qdsp6v2/audio_cal_utils.c
index 7f1db664684d..1e3927d5561d 100644
--- a/sound/soc/msm/qdsp6v2/audio_cal_utils.c
+++ b/sound/soc/msm/qdsp6v2/audio_cal_utils.c
@@ -16,7 +16,7 @@
 #include <linux/miscdevice.h>
 #include <linux/uaccess.h>
 #include <linux/mutex.h>
-#include "audio_cal_utils.h"
+#include <sound/audio_cal_utils.h>
 
 
 size_t get_cal_info_size(int32_t cal_type)
diff --git a/sound/soc/msm/qdsp6v2/audio_calibration.c b/sound/soc/msm/qdsp6v2/audio_calibration.c
index 8e670d27a680..3e1af454de14 100644
--- a/sound/soc/msm/qdsp6v2/audio_calibration.c
+++ b/sound/soc/msm/qdsp6v2/audio_calibration.c
@@ -18,8 +18,8 @@
 #include <linux/mutex.h>
 #include <linux/msm_ion.h>
 #include <linux/msm_audio_ion.h>
-#include "audio_calibration.h"
-#include "audio_cal_utils.h"
+#include <sound/audio_calibration.h>
+#include <sound/audio_cal_utils.h>
 
 struct audio_cal_client_info {
 	struct list_head		list;
diff --git a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
index 08243d74e9ba..a0f02b0c749d 100644
--- a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
+++ b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
@@ -39,7 +39,7 @@
 #include "msm-dolby-dap-config.h"
 #include "q6voice.h"
 #include "sound/q6lsm.h"
-#include "audio_cal_utils.h"
+#include <sound/audio_cal_utils.h>
 #include "msm-dts-eagle.h"
 
 static int get_cal_path(int path_type);
diff --git a/sound/soc/msm/qdsp6v2/q6adm.c b/sound/soc/msm/qdsp6v2/q6adm.c
index 0fb7871355b4..a46049367c0f 100644
--- a/sound/soc/msm/qdsp6v2/q6adm.c
+++ b/sound/soc/msm/qdsp6v2/q6adm.c
@@ -22,7 +22,7 @@
 #include <sound/q6adm-v2.h>
 #include <sound/q6audio-v2.h>
 #include <sound/q6afe-v2.h>
-#include "audio_cal_utils.h"
+#include <sound/audio_cal_utils.h>
 
 #include <sound/asound.h>
 #include "msm-dts-eagle.h"
diff --git a/sound/soc/msm/qdsp6v2/q6afe.c b/sound/soc/msm/qdsp6v2/q6afe.c
index 8cb1f6ce7d86..b3865632c163 100644
--- a/sound/soc/msm/qdsp6v2/q6afe.c
+++ b/sound/soc/msm/qdsp6v2/q6afe.c
@@ -22,7 +22,7 @@
 #include <sound/q6afe-v2.h>
 #include <sound/q6audio-v2.h>
 #include "msm-pcm-routing-v2.h"
-#include "audio_cal_utils.h"
+#include <sound/audio_cal_utils.h>
 
 enum {
 	AFE_COMMON_RX_CAL = 0,
diff --git a/sound/soc/msm/qdsp6v2/q6asm.c b/sound/soc/msm/qdsp6v2/q6asm.c
index 8ea040ee9573..bdce7ccdefa6 100644
--- a/sound/soc/msm/qdsp6v2/q6asm.c
+++ b/sound/soc/msm/qdsp6v2/q6asm.c
@@ -38,7 +38,7 @@
 #include <sound/apr_audio-v2.h>
 #include <sound/q6asm-v2.h>
 #include <sound/q6audio-v2.h>
-#include "audio_cal_utils.h"
+#include <sound/audio_cal_utils.h>
 
 #define TRUE        0x01
 #define FALSE       0x00
diff --git a/sound/soc/msm/qdsp6v2/q6lsm.c b/sound/soc/msm/qdsp6v2/q6lsm.c
index 8a361d45acf9..32dae554fbb6 100644
--- a/sound/soc/msm/qdsp6v2/q6lsm.c
+++ b/sound/soc/msm/qdsp6v2/q6lsm.c
@@ -31,7 +31,7 @@
 #include <linux/memory.h>
 #include <linux/msm_audio_ion.h>
 #include <sound/q6afe-v2.h>
-#include "audio_cal_utils.h"
+#include <sound/audio_cal_utils.h>
 
 #define APR_TIMEOUT	(5 * HZ)
 #define LSM_ALIGN_BOUNDARY 512
diff --git a/sound/soc/msm/qdsp6v2/q6voice.c b/sound/soc/msm/qdsp6v2/q6voice.c
index 1daee27c1a8a..9b45229c9e69 100644
--- a/sound/soc/msm/qdsp6v2/q6voice.c
+++ b/sound/soc/msm/qdsp6v2/q6voice.c
@@ -24,7 +24,7 @@
 #include "sound/q6audio-v2.h"
 #include "sound/apr_audio-v2.h"
 #include "sound/q6afe-v2.h"
-#include "audio_cal_utils.h"
+#include <sound/audio_cal_utils.h>
 #include "q6voice.h"
 
 #define TIMEOUT_MS 300