diff --git a/msm8909/audiod/Android.mk b/msm8909/audiod/Android.mk
index 9105787..d45ec1e 100644
--- a/msm8909/audiod/Android.mk
+++ b/msm8909/audiod/Android.mk
@@ -14,6 +14,8 @@
 	libbinder \
 	libmedia
 
+LOCAL_ADDITIONAL_DEPENDENCIES := $(BOARD_KERNEL_HEADER_DEPENDENCIES)
+
 LOCAL_MODULE:= audiod
 
 include $(BUILD_EXECUTABLE)
diff --git a/msm8909/hal/Android.mk b/msm8909/hal/Android.mk
index 2f85a31..848ee4e 100644
--- a/msm8909/hal/Android.mk
+++ b/msm8909/hal/Android.mk
@@ -44,6 +44,9 @@
 LOCAL_SRC_FILES += audio_extn/audio_extn.c \
                    audio_extn/utils.c
 
+LOCAL_C_INCLUDES += $(BOARD_KERNEL_HEADER_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_KERNEL_HEADER_DEPENDENCIES)
+
 ifeq ($(strip $(AUDIO_FEATURE_ENABLED_ASM_LOOPBACK_RX)),true)
   LOCAL_CFLAGS += -DASM_LOOPBACK_RX_ENABLED
 endif
diff --git a/msm8909/mm-audio/aenc-aac/qdsp6/Android.mk b/msm8909/mm-audio/aenc-aac/qdsp6/Android.mk
index 1306cee..688f0d4 100644
--- a/msm8909/mm-audio/aenc-aac/qdsp6/Android.mk
+++ b/msm8909/mm-audio/aenc-aac/qdsp6/Android.mk
@@ -35,6 +35,9 @@
 LOCAL_SRC_FILES         := src/aenc_svr.c
 LOCAL_SRC_FILES         += src/omx_aac_aenc.cpp
 
+LOCAL_C_INCLUDES += $(BOARD_KERNEL_HEADER_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_KERNEL_HEADER_DEPENDENCIES)
+
 include $(BUILD_SHARED_LIBRARY)
 
 # ---------------------------------------------------------------------------------
diff --git a/msm8909/mm-audio/aenc-amrnb/qdsp6/Android.mk b/msm8909/mm-audio/aenc-amrnb/qdsp6/Android.mk
index 2bd71b9..4034ad6 100644
--- a/msm8909/mm-audio/aenc-amrnb/qdsp6/Android.mk
+++ b/msm8909/mm-audio/aenc-amrnb/qdsp6/Android.mk
@@ -35,6 +35,10 @@
 LOCAL_SRC_FILES         := src/aenc_svr.c
 LOCAL_SRC_FILES         += src/omx_amr_aenc.cpp
 
+LOCAL_C_INCLUDES += $(BOARD_KERNEL_HEADER_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_KERNEL_HEADER_DEPENDENCIES)
+
+
 include $(BUILD_SHARED_LIBRARY)
 
 # ---------------------------------------------------------------------------------
diff --git a/msm8909/mm-audio/aenc-evrc/qdsp6/Android.mk b/msm8909/mm-audio/aenc-evrc/qdsp6/Android.mk
index a9f556d..7c751fc 100644
--- a/msm8909/mm-audio/aenc-evrc/qdsp6/Android.mk
+++ b/msm8909/mm-audio/aenc-evrc/qdsp6/Android.mk
@@ -35,6 +35,9 @@
 LOCAL_SRC_FILES         := src/aenc_svr.c
 LOCAL_SRC_FILES         += src/omx_evrc_aenc.cpp
 
+LOCAL_C_INCLUDES += $(BOARD_KERNEL_HEADER_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_KERNEL_HEADER_DEPENDENCIES)
+
 include $(BUILD_SHARED_LIBRARY)
 
 # ---------------------------------------------------------------------------------
diff --git a/msm8909/mm-audio/aenc-qcelp13/qdsp6/Android.mk b/msm8909/mm-audio/aenc-qcelp13/qdsp6/Android.mk
index 006a275..f5941ce 100644
--- a/msm8909/mm-audio/aenc-qcelp13/qdsp6/Android.mk
+++ b/msm8909/mm-audio/aenc-qcelp13/qdsp6/Android.mk
@@ -35,6 +35,9 @@
 LOCAL_SRC_FILES         := src/aenc_svr.c
 LOCAL_SRC_FILES         += src/omx_qcelp13_aenc.cpp
 
+LOCAL_C_INCLUDES += $(BOARD_KERNEL_HEADER_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_KERNEL_HEADER_DEPENDENCIES)
+
 include $(BUILD_SHARED_LIBRARY)
 
 
diff --git a/msm8909/post_proc/Android.mk b/msm8909/post_proc/Android.mk
index 50f33e9..5de115c 100644
--- a/msm8909/post_proc/Android.mk
+++ b/msm8909/post_proc/Android.mk
@@ -30,6 +30,7 @@
 
 LOCAL_C_INCLUDES := \
 	external/tinyalsa/include \
+	$(BOARD_KERNEL_HEADER_DIR) \
 	$(call include-path-for, audio-effects)
 
 include $(BUILD_SHARED_LIBRARY)