diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 25de7507c034..d045c0707421 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -38,7 +38,7 @@ SIZE?=		size
 OBJCOPY?=	objcopy
 
 COPTFLAGS?=-O
-INCLUDES= -nostdinc -I- -I. -I$S
+INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 6489bf311e81..369dd4d87edf 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -38,7 +38,7 @@ SIZE?=		size
 OBJCOPY?=	objcopy
 
 COPTFLAGS?=-O
-INCLUDES= -nostdinc -I- -I. -I$S
+INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index 91c4501f0a3e..ebd1526d1f7f 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -48,7 +48,7 @@ SIZE?=		size
 OBJCOPY?=	objcopy
 
 COPTFLAGS?=-O
-INCLUDES= -nostdinc -I- -I. -I$S
+INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 386a9cb5766c..8b337528c8b1 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -40,7 +40,7 @@ SIZE?=		size
 OBJCOPY?=	objcopy
 
 COPTFLAGS?=-O
-INCLUDES= -nostdinc -I- -I. -I$S
+INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 6489bf311e81..369dd4d87edf 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -38,7 +38,7 @@ SIZE?=		size
 OBJCOPY?=	objcopy
 
 COPTFLAGS?=-O
-INCLUDES= -nostdinc -I- -I. -I$S
+INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index f1d598a9b49f..4d945605482f 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -95,7 +95,7 @@ CFLAGS+=	-DKLD_MODULE
 # such paths after -nostdinc.  It doesn't seem to be possible to
 # add to the front of `make' variable.
 _ICFLAGS:=	${CFLAGS:M-I*}
-CFLAGS+=	-nostdinc -I- ${_ICFLAGS}
+CFLAGS+=	-nostdinc -I- ${INCLMAGIC} ${_ICFLAGS}
 
 # Add -I paths for system headers.  Individual KLD makefiles don't
 # need any -I paths for this.  Similar defaults for .PATH can't be