diff --git a/mm-core/Android.mk b/mm-core/Android.mk
index c58f025..c14e870 100755
--- a/mm-core/Android.mk
+++ b/mm-core/Android.mk
@@ -63,10 +63,12 @@
 #===============================================================================
 
 LOCAL_C_INCLUDES        := $(LOCAL_PATH)/src/common
-LOCAL_C_INCLUDES        += $(LOCAL_PATH)/inc
 
 LOCAL_HEADER_LIBRARIES := \
-        libutils_headers
+        libutils_headers \
+        libomxcore_headers
+
+LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := libomxcore_headers
 
 LOCAL_PRELINK_MODULE    := false
 LOCAL_MODULE            := libOmxCore
@@ -98,10 +100,12 @@
 include $(CLEAR_VARS)
 
 LOCAL_C_INCLUDES        := $(LOCAL_PATH)/src/common
-LOCAL_C_INCLUDES        += $(LOCAL_PATH)/inc
 
 LOCAL_HEADER_LIBRARIES := \
-        libutils_headers
+        libutils_headers \
+        libomxcore_headers
+
+LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := libomxcore_headers
 
 LOCAL_PRELINK_MODULE    := false
 LOCAL_MODULE            := libmm-omxcore
@@ -126,4 +130,12 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libomxcore_headers
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc
+LOCAL_PROPRIETARY_MODULE := true
+
+include $(BUILD_HEADER_LIBRARY)
+
 endif #BUILD_TINY_ANDROID