9 files changed, 3 insertions, 16 deletions
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index f7ae3b5866cb..850e2e80063a 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -87,6 +87,4 @@ __reml.S: $S/$M/$M/divrem.m4
 
 %RULES
 
-CFLAGS+=-I/sys/dev/twa
-
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index b7e9d4d88d15..ce37f7e69b4b 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -52,6 +52,4 @@ MKMODULESENV+= MACHINE=amd64
 
 %RULES
 
-CFLAGS+=-I/sys/dev/twa
-
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 09cf6c34678f..e2ee825e7da9 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -58,6 +58,4 @@ ldscript.$M: $S/conf/ldscript.$M
 	  sed s/KERNVIRTADDR/${KERNVIRTADDR}/g > ldscript.$M
 %RULES
 	
-CFLAGS+=-I/sys/dev/twa
-
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 42570c0a8588..9f10876ab666 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -46,6 +46,4 @@ MKMODULESENV+= MACHINE=i386
 
 %RULES
 
-CFLAGS+=-I/sys/dev/twa
-
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index 2c9aa78027e7..671d01c4c7e2 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -52,6 +52,4 @@ ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
 
 %RULES
 
-CFLAGS+=-I/sys/dev/twa
-
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 337b9b749485..32bb6f0df136 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -46,6 +46,4 @@ MKMODULESENV+=	MACHINE=pc98
 
 %RULES
 
-CFLAGS+=-I/sys/dev/twa
-
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 093e21c986a4..7b44dcd6f57b 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -51,6 +51,4 @@ CFLAGS+=	-fno-omit-frame-pointer
 
 %RULES
 
-CFLAGS+=-I/sys/dev/twa
-
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index 82d980ded0d6..4f6888e0bc52 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -46,6 +46,4 @@ MDOBJS=	exception.o interrupt.o
 
 %RULES
 
-CFLAGS+=-I/sys/dev/twa
-
 .include "$S/conf/kern.post.mk"
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index affda42c7d6b..a34da8a19b26 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -67,6 +67,9 @@ INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd
 # ... and the same for the NgATM stuff
 INCLUDES+= -I$S/contrib/ngatm
 
+# .. and the same for twa
+INCLUDES+= -I$S/dev/twa
+
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG}
 CFLAGS+= ${INCLUDES} -D_KERNEL -include opt_global.h
 .if ${CC} != "icc"