diff --git a/Android.mk b/Android.mk
index b0646f1..9b58a69 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,23 +3,11 @@
 LOCAL_MODULE := libjson
 LOCAL_PATH := $(LIBJSON_ROOT)
 LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter
+ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+endif
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-LOCAL_COPY_HEADERS_TO := libjson/inc
-LOCAL_COPY_HEADERS := bits.h \
-		config.h \
-		debug.h \
-		linkhash.h \
-		arraylist.h \
-		json.h \
-		json_config.h \
-		json_inttypes.h \
-		json_util.h \
-		json_object.h \
-		json_tokener.h \
-		json_object_iterator.h \
-		json_c_version.h
 LOCAL_SRC_FILES := arraylist.c \
 		debug.c \
 		json_c_version.c \