diff --git a/Android.mk b/Android.mk
index a283a73..c5af1e9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -43,16 +43,6 @@
        DLKM_DIR := build/dlkm
 endif
 
-# Some kernel include files are being moved.  Check to see if
-# the old version of the files are present
-INCLUDE_SELECT :=
-ifneq ($(wildcard $(TOP)/kernel//arch/arm/mach-msm/include/mach/msm_smd.h),)
-        INCLUDE_SELECT += EXISTS_MSM_SMD=1
-endif
-
-ifneq ($(wildcard $(TOP)/kernel//arch/arm/mach-msm/include/mach/msm_smsm.h),)
-        INCLUDE_SELECT += EXISTS_MSM_SMSM=1
-endif
 
 ifeq ($(WLAN_PROPRIETARY),1)
 # For the proprietary driver the firmware files are handled here
@@ -94,7 +84,6 @@
 KBUILD_OPTIONS += MODNAME=wlan
 KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
 KBUILD_OPTIONS += $(WLAN_SELECT)
-KBUILD_OPTIONS += $(INCLUDE_SELECT)
 
 
 VERSION=$(shell grep -w "VERSION =" $(TOP)/kernel/Makefile | sed 's/^VERSION = //' )
diff --git a/Kbuild b/Kbuild
index 749a6e8..113e831 100644
--- a/Kbuild
+++ b/Kbuild
@@ -645,11 +645,14 @@
 
 CDEFINES += -DFEATURE_WLAN_CH_AVOID
 
-ifeq ($(EXISTS_MSM_SMD),1)
+# Some kernel include files are being moved.  Check to see if
+# the old version of the files are present
+
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/mach-msm/include/mach/msm_smd.h),)
 CDEFINES += -DEXISTS_MSM_SMD
 endif
 
-ifeq ($(EXISTS_MSM_SMSM),1)
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/mach-msm/include/mach/msm_smsm.h),)
 CDEFINES += -DEXISTS_MSM_SMSM
 endif