diff --git a/Android.mk b/Android.mk
index 16d3a1a..a204c96 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,6 @@
 #Enables the listed display HAL modules
 
-ifeq ($(call is-board-platform-in-list,$(MSM7K_BOARD_PLATFORMS)),true)
+ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
 	display-hals := libhwcomposer liboverlay libgralloc libcopybit
 	include $(call all-named-subdir-makefiles,$(display-hals))
 endif
diff --git a/libcopybit/Android.mk b/libcopybit/Android.mk
index c23ecd8..bba5679 100644
--- a/libcopybit/Android.mk
+++ b/libcopybit/Android.mk
@@ -24,25 +24,22 @@ ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
     LOCAL_SHARED_LIBRARIES := liblog libdl
     LOCAL_SRC_FILES := copybit_c2d.cpp
     LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM)
-    LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-    LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
     LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
     LOCAL_CFLAGS += -DCOPYBIT_Z180=1 -DC2D_SUPPORT_DISPLAY=1
     LOCAL_MODULE_TAGS := optional
     include $(BUILD_SHARED_LIBRARY)
 else
-    ifneq ($(call is-chipset-in-board-platform,msm7630),true)
-        ifeq ($(call is-board-platform-in-list,$(MSM7K_BOARD_PLATFORMS)),true)
+    ifneq ($(TARGET_BOARD_PLATFORM),msm7x30)
             include $(CLEAR_VARS)
             ifeq ($(ARCH_ARM_HAVE_NEON),true)
                 LOCAL_CFLAGS += -D__ARM_HAVE_NEON
             endif
-            ifeq ($(call is-board-platform,msm7627a),true)
+            ifeq ($(call is-board-platform,msm7x27a),true)
                 LOCAL_CFLAGS += -DTARGET_7x27A
             endif
             ifeq ($(TARGET_GRALLOC_USES_ASHMEM),true)
                 LOCAL_CFLAGS += -DUSE_ASHMEM
-                ifeq ($(call is-chipset-prefix-in-board-platform,msm7627),true)
+                ifeq ($(call is-chipset-prefix-in-board-platform,msm7x27),true)
                    LOCAL_CFLAGS += -DTARGET_7x27
                 endif
             endif
@@ -53,11 +50,8 @@ else
             LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
             LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM)
             LOCAL_MODULE_TAGS := optional
-            LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-            LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
             LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
             LOCAL_CFLAGS += -DCOPYBIT_MSM7K=1
             include $(BUILD_SHARED_LIBRARY)
         endif
-    endif
 endif
diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk
index 545c1d3..6456ff5 100644
--- a/libgralloc/Android.mk
+++ b/libgralloc/Android.mk
@@ -22,8 +22,6 @@ LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 LOCAL_SHARED_LIBRARIES := liblog libcutils libGLESv1_CM libutils libmemalloc
 
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 LOCAL_SRC_FILES :=  framebuffer.cpp \
                     gpu.cpp         \
                     gralloc.cpp     \
@@ -33,7 +31,7 @@ LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM)
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS:= -DLOG_TAG=\"$(TARGET_BOARD_PLATFORM).gralloc\" -DHOST -DDEBUG_CALC_FPS
 
-ifeq ($(call is-board-platform,msm7627_surf msm7627_6x),true)
+ifeq ($(call is-board-platform,msm7x27),true)
     LOCAL_CFLAGS += -DTARGET_MSM7x27
 endif
 
@@ -57,8 +55,6 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 LOCAL_SHARED_LIBRARIES := liblog libcutils libutils
 LOCAL_SRC_FILES :=  ionalloc.cpp \
                     ashmemalloc.cpp \
diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk
index 7c5e98f..9a84146 100644
--- a/libhwcomposer/Android.mk
+++ b/libhwcomposer/Android.mk
@@ -15,8 +15,6 @@ LOCAL_CFLAGS:= -DLOG_TAG=\"$(TARGET_BOARD_PLATFORM).hwcomposer\"
 LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
 LOCAL_C_INCLUDES += hardware/qcom/display/liboverlay
 LOCAL_C_INCLUDES += hardware/qcom/display/libcopybit
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 ifeq ($(TARGET_HAVE_HDMI_OUT),true)
 LOCAL_CFLAGS += -DHDMI_DUAL_DISPLAY
 endif
diff --git a/liboverlay/Android.mk b/liboverlay/Android.mk
index c90b8f3..8434fdd 100755
--- a/liboverlay/Android.mk
+++ b/liboverlay/Android.mk
@@ -19,8 +19,6 @@ include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
 LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libmemalloc
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
 LOCAL_SRC_FILES := \
     overlayLib.cpp \