diff --git a/msm8994/include/IQClient.h b/msm8994/include/IQClient.h
deleted file mode 120000
index 99b53f3..0000000
--- a/msm8994/include/IQClient.h
+++ /dev/null
@@ -1 +0,0 @@
-../libqservice/IQClient.h
\ No newline at end of file
diff --git a/msm8994/include/IQService.h b/msm8994/include/IQService.h
deleted file mode 120000
index 958a476..0000000
--- a/msm8994/include/IQService.h
+++ /dev/null
@@ -1 +0,0 @@
-../libqservice/IQService.h
\ No newline at end of file
diff --git a/msm8994/include/alloc_controller.h b/msm8994/include/alloc_controller.h
deleted file mode 120000
index 996a8ed..0000000
--- a/msm8994/include/alloc_controller.h
+++ /dev/null
@@ -1 +0,0 @@
-../libgralloc/alloc_controller.h
\ No newline at end of file
diff --git a/msm8994/include/c2d2.h b/msm8994/include/c2d2.h
deleted file mode 120000
index fda98b1..0000000
--- a/msm8994/include/c2d2.h
+++ /dev/null
@@ -1 +0,0 @@
-../libcopybit/c2d2.h
\ No newline at end of file
diff --git a/msm8994/include/copybit.h b/msm8994/include/copybit.h
deleted file mode 120000
index 76a19df..0000000
--- a/msm8994/include/copybit.h
+++ /dev/null
@@ -1 +0,0 @@
-../libcopybit/copybit.h
\ No newline at end of file
diff --git a/msm8994/include/copybit_priv.h b/msm8994/include/copybit_priv.h
deleted file mode 120000
index d1bbafd..0000000
--- a/msm8994/include/copybit_priv.h
+++ /dev/null
@@ -1 +0,0 @@
-../libcopybit/copybit_priv.h
\ No newline at end of file
diff --git a/msm8994/include/display_config.h b/msm8994/include/display_config.h
deleted file mode 120000
index 369c292..0000000
--- a/msm8994/include/display_config.h
+++ /dev/null
@@ -1 +0,0 @@
-../libqdutils/display_config.h
\ No newline at end of file
diff --git a/msm8994/include/gr.h b/msm8994/include/gr.h
deleted file mode 120000
index b6a54b4..0000000
--- a/msm8994/include/gr.h
+++ /dev/null
@@ -1 +0,0 @@
-../libgralloc/gr.h
\ No newline at end of file
diff --git a/msm8994/include/gralloc_priv.h b/msm8994/include/gralloc_priv.h
deleted file mode 120000
index cb417e8..0000000
--- a/msm8994/include/gralloc_priv.h
+++ /dev/null
@@ -1 +0,0 @@
-../libgralloc/gralloc_priv.h
\ No newline at end of file
diff --git a/msm8994/include/mdp_version.h b/msm8994/include/mdp_version.h
deleted file mode 120000
index dd12b5a..0000000
--- a/msm8994/include/mdp_version.h
+++ /dev/null
@@ -1 +0,0 @@
-../libqdutils/mdp_version.h
\ No newline at end of file
diff --git a/msm8994/include/memalloc.h b/msm8994/include/memalloc.h
deleted file mode 120000
index b166a0b..0000000
--- a/msm8994/include/memalloc.h
+++ /dev/null
@@ -1 +0,0 @@
-../libgralloc/memalloc.h
\ No newline at end of file
diff --git a/msm8994/include/qdMetaData.h b/msm8994/include/qdMetaData.h
deleted file mode 120000
index e92cd6b..0000000
--- a/msm8994/include/qdMetaData.h
+++ /dev/null
@@ -1 +0,0 @@
-../libqdutils/qdMetaData.h
\ No newline at end of file
diff --git a/msm8994/libcopybit/Android.mk b/msm8994/libcopybit/Android.mk
index 9f92329..8a1c612 100644
--- a/msm8994/libcopybit/Android.mk
+++ b/msm8994/libcopybit/Android.mk
@@ -16,6 +16,11 @@
 include $(LOCAL_PATH)/../common.mk
 
 include $(CLEAR_VARS)
+LOCAL_COPY_HEADERS_TO         := $(common_header_export_path)
+LOCAL_COPY_HEADERS            := copybit.h copybit_priv.h c2d2.h
+include $(BUILD_COPY_HEADERS)
+
+include $(CLEAR_VARS)
 # b/24171136 many files not compiling with clang/llvm yet
 LOCAL_CLANG := false
 
@@ -26,7 +31,6 @@
 LOCAL_SHARED_LIBRARIES        := $(common_libs) libdl libmemalloc
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"qdcopybit\"
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
-LOCAL_EXPORT_C_INCLUDE_DIRS   := $(LOCAL_PATH)/../include
 
 ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
     LOCAL_CFLAGS += -DCOPYBIT_Z180=1 -DC2D_SUPPORT_DISPLAY=1
diff --git a/msm8994/libgralloc/Android.mk b/msm8994/libgralloc/Android.mk
index dd38d9d..22b8364 100644
--- a/msm8994/libgralloc/Android.mk
+++ b/msm8994/libgralloc/Android.mk
@@ -29,7 +29,8 @@
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"qdgralloc\"
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
 LOCAL_SRC_FILES               := gpu.cpp gralloc.cpp framebuffer.cpp mapper.cpp
-LOCAL_EXPORT_C_INCLUDE_DIRS   := $(LOCAL_PATH)/../include
+LOCAL_COPY_HEADERS_TO         := $(common_header_export_path)
+LOCAL_COPY_HEADERS            := gralloc_priv.h gr.h
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -46,6 +47,6 @@
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"qdmemalloc\"
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
 LOCAL_SRC_FILES               := ionalloc.cpp alloc_controller.cpp
-LOCAL_C_EXPORT_INCLUDE_DIRS   := $(LOCAL_PATH)/../include
+LOCAL_COPY_HEADERS            := alloc_controller.h memalloc.h
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/msm8994/libqdutils/Android.mk b/msm8994/libqdutils/Android.mk
index 085d874..e9861a0 100644
--- a/msm8994/libqdutils/Android.mk
+++ b/msm8994/libqdutils/Android.mk
@@ -11,7 +11,8 @@
 LOCAL_C_INCLUDES              := $(common_includes) $(kernel_includes)
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"qdutils\"
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
-LOCAL_EXPORT_C_INCLUDE_DIRS   := $(LOCAL_PATH)/../include
+LOCAL_COPY_HEADERS_TO         := $(common_header_export_path)
+LOCAL_COPY_HEADERS            := display_config.h mdp_version.h
 LOCAL_SRC_FILES               := profiler.cpp mdp_version.cpp \
                                  idle_invalidator.cpp \
                                  comptype.cpp qd_utils.cpp \
@@ -24,7 +25,8 @@
 # b/24171136 many files not compiling with clang/llvm yet
 LOCAL_CLANG := false
 
-LOCAL_EXPORT_C_INCLUDE_DIRS     := $(LOCAL_PATH)/../include
+LOCAL_COPY_HEADERS_TO           := $(common_header_export_path)
+LOCAL_COPY_HEADERS              := qdMetaData.h
 LOCAL_SHARED_LIBRARIES          := liblog libcutils
 LOCAL_C_INCLUDES                := $(common_includes)
 LOCAL_ADDITIONAL_DEPENDENCIES   := $(common_deps)
diff --git a/msm8994/libqservice/Android.mk b/msm8994/libqservice/Android.mk
index 13f159f..924791d 100644
--- a/msm8994/libqservice/Android.mk
+++ b/msm8994/libqservice/Android.mk
@@ -14,6 +14,9 @@
 LOCAL_SRC_FILES               := QService.cpp \
                                  IQService.cpp \
                                  IQClient.cpp
-LOCAL_EXPORT_C_INCLUDE_DIRS   := $(LOCAL_PATH)/../include
+LOCAL_COPY_HEADERS_TO         := $(common_header_export_path)
+LOCAL_COPY_HEADERS            := IQService.h \
+                                 IQClient.h
+
 
 include $(BUILD_SHARED_LIBRARY)