Index: sys/arch/evbarm/conf/std.bcm53xx
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/std.bcm53xx,v
retrieving revision 1.12
diff -u -p -r1.12 std.bcm53xx
--- sys/arch/evbarm/conf/std.bcm53xx	28 Oct 2013 22:35:07 -0000	1.12
+++ sys/arch/evbarm/conf/std.bcm53xx	1 Nov 2013 18:09:13 -0000
@@ -30,7 +30,6 @@ makeoptions	KERNEL_BASE_PHYS="0x60100000
 makeoptions	KERNEL_BASE_VIRT="0x80100000"
 makeoptions	LOADADDRESS="0x00100000"
 makeoptions	BOARDMKFRAG="${THISARM}/conf/mk.bcm53xx"
-makeoptions	CPPFLAGS+="-I$S/../../../include"
 
 options 	ARM_INTR_IMPL="<arch/arm/broadcom/bcm53xx_intr.h>"
 options		ARM_GENERIC_TODR
Index: sys/arch/evbarm/conf/std.beagle
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/std.beagle,v
retrieving revision 1.11
diff -u -p -r1.11 std.beagle
--- sys/arch/evbarm/conf/std.beagle	18 Aug 2013 05:20:47 -0000	1.11
+++ sys/arch/evbarm/conf/std.beagle	1 Nov 2013 18:09:13 -0000
@@ -22,7 +22,6 @@ options 	FPU_VFP
 makeoptions	LOADADDRESS="0x80300000"
 makeoptions	BOARDTYPE="beagle"
 makeoptions	BOARDMKFRAG="${THISARM}/conf/mk.beagle"
-makeoptions	CPPFLAGS+="-I$S/../../../include"
 
 options 	ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
 options		ARM_GENERIC_TODR
Index: sys/arch/evbarm/conf/std.cubie
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/std.cubie,v
retrieving revision 1.1
diff -u -p -r1.1 std.cubie
--- sys/arch/evbarm/conf/std.cubie	3 Sep 2013 06:12:00 -0000	1.1
+++ sys/arch/evbarm/conf/std.cubie	1 Nov 2013 18:09:13 -0000
@@ -23,7 +23,6 @@ makeoptions	KERNEL_BASE_PHYS="0x40007800
 makeoptions	KERNEL_BASE_VIRT="0x80007800"
 makeoptions	BOARDTYPE="cubie"
 makeoptions	BOARDMKFRAG="${THISARM}/conf/mk.cubie"
-makeoptions	CPPFLAGS+="-I$S/../../../include"
 
 options 	ARM_INTR_IMPL="<arch/arm/allwinner/awin_intr.h>"
 options		ARM_GENERIC_TODR
Index: sys/arch/evbarm/conf/std.gemini
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/std.gemini,v
retrieving revision 1.7
diff -u -p -r1.7 std.gemini
--- sys/arch/evbarm/conf/std.gemini	16 Dec 2012 23:47:56 -0000	1.7
+++ sys/arch/evbarm/conf/std.gemini	1 Nov 2013 18:09:13 -0000
@@ -18,7 +18,6 @@ makeoptions	KERNEL_BASE_VIRT="0x80200000
 makeoptions	LOADADDRESS="0x00200000"
 makeoptions	BOARDTYPE="gemini"
 makeoptions	BOARDMKFRAG="${THISARM}/conf/mk.gemini"
-makeoptions	CPPFLAGS+="-I$S/../../../include"
 
 options		EVBARM_BOARDTYPE=gemini
 options 	ARM_INTR_IMPL="<arch/arm/gemini/gemini_intr.h>"
Index: sys/arch/evbarm/conf/std.goldengate
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/std.goldengate,v
retrieving revision 1.1
diff -u -p -r1.1 std.goldengate
--- sys/arch/evbarm/conf/std.goldengate	19 Feb 2013 16:12:36 -0000	1.1
+++ sys/arch/evbarm/conf/std.goldengate	1 Nov 2013 18:09:13 -0000
@@ -25,7 +25,6 @@ options 	EVBARM_BOARDTYPE="goldengate"
 makeoptions	LOADADDRESS_VIRT="0x80008000"
 makeoptions	LOADADDRESS="0x8000"
 makeoptions	BOARDMKFRAG="${THISARM}/conf/mk.goldengate"
-makeoptions	CPPFLAGS+="-I$S/../../../include"
 
 options 	ARM_INTR_IMPL="<arch/arm/cortina/g2_intr.h>"
 options		ARM_GENERIC_TODR
Index: sys/arch/evbarm/conf/std.igepv2
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/std.igepv2,v
retrieving revision 1.5
diff -u -p -r1.5 std.igepv2
--- sys/arch/evbarm/conf/std.igepv2	16 Dec 2012 23:47:56 -0000	1.5
+++ sys/arch/evbarm/conf/std.igepv2	1 Nov 2013 18:09:13 -0000
@@ -18,7 +18,6 @@ options 	KERNEL_BASE_EXT=0x80000000
 makeoptions	LOADADDRESS="0x80300000"
 makeoptions	BOARDTYPE="igepv2"
 makeoptions	BOARDMKFRAG="${THISARM}/conf/mk.beagle"
-makeoptions	CPPFLAGS+="-I$S/../../../include"
 
 options 	ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
 options		ARM_GENERIC_TODR
Index: sys/arch/evbarm/conf/std.imx31
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/std.imx31,v
retrieving revision 1.7
diff -u -p -r1.7 std.imx31
--- sys/arch/evbarm/conf/std.imx31	16 Dec 2012 23:47:56 -0000	1.7
+++ sys/arch/evbarm/conf/std.imx31	1 Nov 2013 18:09:13 -0000
@@ -17,7 +17,6 @@ options 	ARM11_CACHE_WRITE_THROUGH
 makeoptions	LOADADDRESS="0x80100000"
 makeoptions	BOARDTYPE="imx31"
 makeoptions	BOARDMKFRAG="${THISARM}/conf/mk.imx31"
-makeoptions	CPPFLAGS+="-I$S/../../../include"
 
 options 	ARM_INTR_IMPL="<arch/arm/imx/imx31_intr.h>"
 options		ARM_GENERIC_TODR
Index: sys/arch/evbarm/conf/std.n900
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/std.n900,v
retrieving revision 1.3
diff -u -p -r1.3 std.n900
--- sys/arch/evbarm/conf/std.n900	14 Apr 2013 18:57:32 -0000	1.3
+++ sys/arch/evbarm/conf/std.n900	1 Nov 2013 18:09:13 -0000
@@ -19,7 +19,6 @@ options 	FPU_VFP
 makeoptions	LOADADDRESS="0x80300000"
 makeoptions	BOARDTYPE="n900"
 makeoptions	BOARDMKFRAG="${THISARM}/conf/mk.beagle"
-makeoptions	CPPFLAGS+="-I$S/../../../include"
 
 options 	ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
 options		ARM_GENERIC_TODR
Index: sys/arch/evbarm/conf/std.netwalker
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/std.netwalker,v
retrieving revision 1.6
diff -u -p -r1.6 std.netwalker
--- sys/arch/evbarm/conf/std.netwalker	16 Dec 2012 23:47:56 -0000	1.6
+++ sys/arch/evbarm/conf/std.netwalker	1 Nov 2013 18:09:13 -0000
@@ -20,7 +20,6 @@ options 	CORTEX_PMC_CCNT_HZ=800000000
 makeoptions	LOADADDRESS="0x90100000"
 makeoptions	BOARDTYPE="netwalker"
 makeoptions	BOARDMKFRAG="${THISARM}/conf/mk.netwalker"
-makeoptions	CPPFLAGS+="-I$S/../../../include"
 
 options 	ARM_INTR_IMPL="<arch/arm/imx/imx51_intr.h>"
 options		ARM_GENERIC_TODR
Index: sys/arch/evbarm/conf/std.overo
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/std.overo,v
retrieving revision 1.5
diff -u -p -r1.5 std.overo
--- sys/arch/evbarm/conf/std.overo	16 Dec 2012 23:47:56 -0000	1.5
+++ sys/arch/evbarm/conf/std.overo	1 Nov 2013 18:09:13 -0000
@@ -16,7 +16,6 @@ makeoptions	LOADADDRESS="0x80200000"
 makeoptions	BOARDTYPE="overo"
 options 	EVBARM_BOARDTYPE=overo
 makeoptions	BOARDMKFRAG="${THISARM}/conf/mk.gumstix"
-makeoptions	CPPFLAGS+="-I$S/../../../include"
 
 options 	ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
 options		ARM_GENERIC_TODR
Index: sys/arch/evbarm/conf/std.rpi
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/std.rpi,v
retrieving revision 1.11
diff -u -p -r1.11 std.rpi
--- sys/arch/evbarm/conf/std.rpi	15 Oct 2013 09:07:48 -0000	1.11
+++ sys/arch/evbarm/conf/std.rpi	1 Nov 2013 18:09:13 -0000
@@ -18,7 +18,6 @@ options 	KERNEL_BASE_EXT=0xc0000000
 
 options 	EVBARM_BOARDTYPE="rpi"
 makeoptions	BOARDMKFRAG="${THISARM}/conf/mk.rpi"
-makeoptions	CPPFLAGS+="-I$S/../../../include"
 makeoptions	LOADADDRESS="0xc0008000"
 
 options 	ARM_INTR_IMPL="<arch/arm/broadcom/bcm2835_intr.h>"
Index: sys/arch/evbarm/conf/std.tisdp24xx
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/std.tisdp24xx,v
retrieving revision 1.8
diff -u -p -r1.8 std.tisdp24xx
--- sys/arch/evbarm/conf/std.tisdp24xx	16 Dec 2012 23:47:57 -0000	1.8
+++ sys/arch/evbarm/conf/std.tisdp24xx	1 Nov 2013 18:09:13 -0000
@@ -19,7 +19,6 @@ makeoptions	LOADADDRESS="0x80300000"
 #makeoptions	LOADADDRESS="0xc0000000"
 makeoptions	BOARDTYPE="sdp2430"
 makeoptions	BOARDMKFRAG="${THISARM}/conf/mk.tisdp24xx"
-makeoptions	CPPFLAGS+="-I$S/../../../include"
 
 options 	ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
 options		ARM_GENERIC_TODR