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