diff --git a/msm8996/libc2dcolorconvert/Android.mk b/msm8996/libc2dcolorconvert/Android.mk
index dd26d49..9b8d9a5 100644
--- a/msm8996/libc2dcolorconvert/Android.mk
+++ b/msm8996/libc2dcolorconvert/Android.mk
@@ -13,7 +13,6 @@
 endif
 
 LOCAL_SHARED_LIBRARIES := liblog libdl
-LOCAL_HEADER_LIBRARIES := copybit_headers
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/msm8996/mm-core/Android.mk b/msm8996/mm-core/Android.mk
index 61b687a..b658ca9 100644
--- a/msm8996/mm-core/Android.mk
+++ b/msm8996/mm-core/Android.mk
@@ -53,6 +53,39 @@
 endif
 
 #===============================================================================
+#             Deploy the headers that can be exposed
+#===============================================================================
+
+LOCAL_COPY_HEADERS_TO   := mm-core/omxcore
+LOCAL_COPY_HEADERS      := inc/OMX_Audio.h
+LOCAL_COPY_HEADERS      += inc/OMX_Component.h
+LOCAL_COPY_HEADERS      += inc/OMX_ContentPipe.h
+LOCAL_COPY_HEADERS      += inc/OMX_Core.h
+LOCAL_COPY_HEADERS      += inc/OMX_Image.h
+LOCAL_COPY_HEADERS      += inc/OMX_Index.h
+LOCAL_COPY_HEADERS      += inc/OMX_IVCommon.h
+LOCAL_COPY_HEADERS      += inc/OMX_Other.h
+LOCAL_COPY_HEADERS      += inc/OMX_QCOMExtns.h
+LOCAL_COPY_HEADERS      += inc/OMX_Types.h
+LOCAL_COPY_HEADERS      += inc/OMX_Video.h
+LOCAL_COPY_HEADERS      += inc/qc_omx_common.h
+LOCAL_COPY_HEADERS      += inc/qc_omx_component.h
+LOCAL_COPY_HEADERS      += inc/qc_omx_msg.h
+LOCAL_COPY_HEADERS      += inc/QOMX_AudioExtensions.h
+LOCAL_COPY_HEADERS      += inc/QOMX_AudioIndexExtensions.h
+LOCAL_COPY_HEADERS      += inc/OMX_CoreExt.h
+LOCAL_COPY_HEADERS      += inc/QOMX_CoreExtensions.h
+LOCAL_COPY_HEADERS      += inc/QOMX_FileFormatExtensions.h
+LOCAL_COPY_HEADERS      += inc/QOMX_IVCommonExtensions.h
+LOCAL_COPY_HEADERS      += inc/QOMX_SourceExtensions.h
+LOCAL_COPY_HEADERS      += inc/QOMX_VideoExtensions.h
+LOCAL_COPY_HEADERS      += inc/OMX_IndexExt.h
+LOCAL_COPY_HEADERS      += inc/OMX_VideoExt.h
+LOCAL_COPY_HEADERS      += inc/QOMX_StreamingExtensions.h
+LOCAL_COPY_HEADERS      += inc/QCMediaDefs.h
+LOCAL_COPY_HEADERS      += inc/QCMetaData.h
+
+#===============================================================================
 #             LIBRARY for Android apps
 #===============================================================================
 
diff --git a/msm8996/mm-video-v4l2/vidc/common/Android.mk b/msm8996/mm-video-v4l2/vidc/common/Android.mk
index ef02c01..3bfd614 100644
--- a/msm8996/mm-video-v4l2/vidc/common/Android.mk
+++ b/msm8996/mm-video-v4l2/vidc/common/Android.mk
@@ -39,7 +39,6 @@
 
 LOCAL_PRELINK_MODULE      := false
 LOCAL_SHARED_LIBRARIES    := liblog libutils libcutils libdl
-LOCAL_HEADER_LIBRARIES    := copybit_headers gralloc_headers
 
 LOCAL_SRC_FILES   := src/extra_data_handler.cpp
 LOCAL_SRC_FILES   += src/vidc_color_converter.cpp
diff --git a/msm8996/mm-video-v4l2/vidc/vdec/Android.mk b/msm8996/mm-video-v4l2/vidc/vdec/Android.mk
index 6571980..a1c04ea 100644
--- a/msm8996/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/msm8996/mm-video-v4l2/vidc/vdec/Android.mk
@@ -116,7 +116,6 @@
 LOCAL_SHARED_LIBRARIES  := liblog libutils libbinder libcutils libdl
 
 LOCAL_SHARED_LIBRARIES  += libqdMetaData
-LOCAL_HEADER_LIBRARIES  := copybit_headers gralloc_headers
 
 LOCAL_SRC_FILES         := src/frameparser.cpp
 LOCAL_SRC_FILES         += src/h264_utils.cpp
diff --git a/msm8996/mm-video-v4l2/vidc/venc/Android.mk b/msm8996/mm-video-v4l2/vidc/venc/Android.mk
index dea107e..25e9601 100644
--- a/msm8996/mm-video-v4l2/vidc/venc/Android.mk
+++ b/msm8996/mm-video-v4l2/vidc/venc/Android.mk
@@ -90,7 +90,6 @@
 LOCAL_SHARED_LIBRARIES    := liblog libutils libbinder libcutils \
                              libc2dcolorconvert libdl libgui
 LOCAL_SHARED_LIBRARIES    += libqdMetaData
-LOCAL_HEADER_LIBRARIES    := copybit_headers gralloc_headers
 LOCAL_STATIC_LIBRARIES    := libOmxVidcCommon
 
 LOCAL_SRC_FILES   := src/omx_video_base.cpp