diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile
index 728c29648f6..9b17c47e926 100644
--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@@ -52,6 +52,9 @@ else                                    # ARM9, ARM7TDMI
 ARCH_SUBDIR = arm
 endif
 
+KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
+CFLAGS += $(KDEFINE)
+
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCH_SRCDIR = $(TOPDIR)\arch\$(CONFIG_ARCH)\src
   NUTTX = "$(TOPDIR)\nuttx$(EXEEXT)"
diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile
index a3f288efb61..c18262032f9 100644
--- a/arch/avr/src/Makefile
+++ b/arch/avr/src/Makefile
@@ -71,6 +71,9 @@ CFLAGS += $(INCLUDES)
 CXXFLAGS += $(INCLUDES)
 AFLAGS += $(INCLUDES)
 
+KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
+CFLAGS += $(KDEFINE)
+
 HEAD_OBJ = $(HEAD_ASRC:.S=$(OBJEXT))
 STARTUP_OBJS ?= $(HEAD_OBJ)
 
diff --git a/arch/hc/src/Makefile b/arch/hc/src/Makefile
index eaccee17463..07132303f2a 100644
--- a/arch/hc/src/Makefile
+++ b/arch/hc/src/Makefile
@@ -43,6 +43,9 @@ ifeq ($(CONFIG_ARCH_HCS12),y)
 ARCH_SUBDIR = hcs12
 endif
 
+KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
+CFLAGS += $(KDEFINE)
+
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCH_SRCDIR = $(TOPDIR)\arch\$(CONFIG_ARCH)\src
   NUTTX = "$(TOPDIR)\nuttx$(EXEEXT)"
diff --git a/arch/mips/src/Makefile b/arch/mips/src/Makefile
index aeb3238a0f0..0af6d9002a8 100644
--- a/arch/mips/src/Makefile
+++ b/arch/mips/src/Makefile
@@ -40,6 +40,9 @@ ifeq ($(CONFIG_ARCH_MIPS),y)
 ARCH_SUBDIR = mips32
 endif
 
+KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
+CFLAGS += $(KDEFINE)
+
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCH_SRCDIR = $(TOPDIR)\arch\$(CONFIG_ARCH)\src
   NUTTX = $(TOPDIR)\nuttx$(EXEEXT)
diff --git a/arch/sh/src/Makefile b/arch/sh/src/Makefile
index 280b843a1a4..767d2d24e19 100644
--- a/arch/sh/src/Makefile
+++ b/arch/sh/src/Makefile
@@ -36,6 +36,9 @@
 -include $(TOPDIR)/Make.defs
 -include chip/Make.defs
 
+KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
+CFLAGS += $(KDEFINE)
+
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCH_SRCDIR = $(TOPDIR)\arch\$(CONFIG_ARCH)\src
   NUTTX = $(TOPDIR)\nuttx$(EXEEXT)
diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index 1ccca15bdf8..6651e97a7a6 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -35,7 +35,7 @@
 
 -include $(TOPDIR)/Make.defs
 
-CFLAGS += -I$(TOPDIR)/sched  -D__KERNEL__
+CFLAGS += -I$(TOPDIR)/sched -D__KERNEL__
 
 ASRCS =
 
diff --git a/arch/x86/src/Makefile b/arch/x86/src/Makefile
index 0de6b7c0829..e58f592a4ca 100644
--- a/arch/x86/src/Makefile
+++ b/arch/x86/src/Makefile
@@ -40,6 +40,9 @@ ifeq ($(CONFIG_ARCH_I486),y)
 ARCH_SUBDIR = i486
 endif
 
+KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
+CFLAGS += $(KDEFINE)
+
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCH_SRCDIR = $(TOPDIR)\arch\$(CONFIG_ARCH)\src
   NUTTX = $(TOPDIR)\nuttx$(EXEEXT)