Shuffle the order in which we look for header files, when doing

kernel builds locally this doesnt change much but over NFS this
cuts about 12% of the build time on my setup (i386).

OK miod@, deraadt@.

21 files changed, 42 insertions, 42 deletions

diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index 301aa499843..8965a2d5695 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.alpha,v 1.38 2006/07/27 05:58:09 miod Exp $
+#	$OpenBSD: Makefile.alpha,v 1.39 2007/07/30 16:23:33 thib Exp $
 #	$NetBSD: Makefile.alpha,v 1.27 1996/12/01 06:12:25 jonathan Exp $
 
 # Makefile for OpenBSD
@@ -28,7 +28,7 @@ S!=	cd ../../../..; pwd
 .endif
 ALPHA=	$S/arch/alpha
 
-INCLUDES=	-I. -I$S/arch -I$S -nostdinc
+INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dalpha
 
 CDIAGFLAGS?=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index 584bbc28800..4c3c5203bcf 100644
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.armish,v 1.4 2006/07/27 05:58:11 miod Exp $
+#	$OpenBSD: Makefile.armish,v 1.5 2007/07/30 16:23:33 thib Exp $
 #	$NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $
 
 # Makefile for OpenBSD
@@ -35,7 +35,7 @@ S!=	cd ../../../..; pwd
 THISARM=	$S/arch/armish
 ARM=	$S/arch/arm
 
-INCLUDES=	-nostdinc -I. -I$S/arch -I$S
+INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D__armish__
 CDIAGFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
 		-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion
index 23cbbeefaa9..ddbcd56313b 100644
--- a/sys/arch/aviion/conf/Makefile.aviion
+++ b/sys/arch/aviion/conf/Makefile.aviion
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.aviion,v 1.2 2006/07/27 05:58:11 miod Exp $
+#	$OpenBSD: Makefile.aviion,v 1.3 2007/07/30 16:23:33 thib Exp $
 #
 # Makefile for OpenBSD
 #
@@ -34,7 +34,7 @@ S!=	cd ../../../..; pwd
 AVIION=	$S/arch/aviion
 M88K=	$S/arch/m88k
 
-INCLUDES=	-nostdinc -I. -I$S/arch -I$S
+INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Daviion -Dm88k
 CWARNFLAGS=	-Wall -Werror -Wmissing-prototypes \
 		-Wno-uninitialized -Wno-format -Wno-main -Wstrict-prototypes \
diff --git a/sys/arch/cats/conf/Makefile.cats b/sys/arch/cats/conf/Makefile.cats
index cf87b9ffdc0..53eb6dca6f7 100644
--- a/sys/arch/cats/conf/Makefile.cats
+++ b/sys/arch/cats/conf/Makefile.cats
@@ -1,5 +1,5 @@
-#	$OpenBSD: Makefile.cats,v 1.6 2006/07/27 05:58:11 miod Exp $
-#	$OpenBSD: Makefile.cats,v 1.6 2006/07/27 05:58:11 miod Exp $
+#	$OpenBSD: Makefile.cats,v 1.7 2007/07/30 16:23:33 thib Exp $
+#	$OpenBSD: Makefile.cats,v 1.7 2007/07/30 16:23:33 thib Exp $
 #	$NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $
 
 # Makefile for OpenBSD
@@ -36,7 +36,7 @@ S!=	cd ../../../..; pwd
 CATS=	$S/arch/cats
 ARM=	$S/arch/arm
 
-INCLUDES=	-nostdinc -I. -I$S/arch -I$S
+INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D__cats__
 CDIAGFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
 		-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index f4d2ad6f451..1154d21e8d4 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hp300,v 1.39 2006/07/27 05:58:11 miod Exp $
+#	$OpenBSD: Makefile.hp300,v 1.40 2007/07/30 16:23:33 thib Exp $
 #	$NetBSD: Makefile.hp300,v 1.54 1997/04/01 23:16:41 scottr Exp $
 
 # Makefile for OpenBSD
@@ -35,7 +35,7 @@ S!=	cd ../../../..; pwd
 HP300=	$S/arch/hp300
 M68K=	$S/arch/m68k
 
-INCLUDES=	-I. -I$S/arch -I$S -nostdinc
+INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
 		-Dmc68020 -Dhp300
 CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index b49726e2c1b..f5219054fa8 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa,v 1.27 2006/07/27 05:58:11 miod Exp $
+#	$OpenBSD: Makefile.hppa,v 1.28 2007/07/30 16:23:33 thib Exp $
 
 # Makefile for OpenBSD
 #
@@ -33,7 +33,7 @@ S!=	cd ../../../..; pwd
 .endif
 HPPA=	$S/arch/hppa
 
-INCLUDES=	-I. -I$S/arch -I$S -nostdinc
+INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
 		-Dhppa
 CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wno-uninitialized \
diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64
index c7876d11dcc..9d912b223f1 100644
--- a/sys/arch/hppa64/conf/Makefile.hppa64
+++ b/sys/arch/hppa64/conf/Makefile.hppa64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa64,v 1.3 2006/07/27 05:58:11 miod Exp $
+#	$OpenBSD: Makefile.hppa64,v 1.4 2007/07/30 16:23:33 thib Exp $
 
 # Makefile for OpenBSD
 #
@@ -33,7 +33,7 @@ S!=	cd ../../../..; pwd
 .endif
 HPPA=	$S/arch/hppa64
 
-INCLUDES=	-I. -I$S/arch -I$S -nostdinc
+INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
 		-Dhppa64
 CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wno-uninitialized \
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index a5058be4b16..0a163942930 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.46 2007/05/29 18:18:19 tom Exp $
+#	$OpenBSD: Makefile.i386,v 1.47 2007/07/30 16:23:33 thib Exp $
 
 # Makefile for OpenBSD
 #
@@ -33,7 +33,7 @@ S!=	cd ../../../..; pwd
 .endif
 I386=	$S/arch/i386
 
-INCLUDES=	-nostdinc -I. -I$S/arch -I$S
+INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Di386
 CDIAGFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
 		-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index b562b075f2d..dfaf4f0fc11 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.landisk,v 1.3 2006/10/06 22:26:10 miod Exp $
+#	$OpenBSD: Makefile.landisk,v 1.4 2007/07/30 16:23:33 thib Exp $
 #
 # Makefile for OpenBSD/landisk
 #
@@ -36,7 +36,7 @@ S!=	cd ../../../..; pwd
 LANDISK=	$S/arch/landisk
 SH=		$S/arch/sh
 
-INCLUDES=	-I. -I$S/arch -I$S -nostdinc
+INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dlandisk
 CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
 		-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index c025de6f948..4863c797786 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.luna88k,v 1.8 2006/07/27 05:58:11 miod Exp $
+#	$OpenBSD: Makefile.luna88k,v 1.9 2007/07/30 16:23:33 thib Exp $
 #
 # Makefile for OpenBSD
 #
@@ -34,7 +34,7 @@ S!=	cd ../../../..; pwd
 LUNA88K=	$S/arch/luna88k
 M88K=		$S/arch/m88k
 
-INCLUDES=	-nostdinc -I. -I$S/arch -I$S
+INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dluna88k -Dm88k
 CWARNFLAGS=	-Wall -Werror -Wmissing-prototypes \
 		-Wno-uninitialized -Wno-format -Wno-main -Wstrict-prototypes \
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
index 21dc6268e3d..24896a3e666 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mac68k,v 1.35 2006/07/27 05:58:11 miod Exp $
+#	$OpenBSD: Makefile.mac68k,v 1.36 2007/07/30 16:23:33 thib Exp $
 #	$NetBSD: Makefile.mac68k,v 1.53 1997/04/15 06:11:38 scottr Exp $
 
 # Makefile for OpenBSD
@@ -35,7 +35,7 @@ S!=	cd ../../../..; pwd
 MAC68K=	$S/arch/mac68k
 M68K=	$S/arch/m68k
 
-INCLUDES=	-I. -I$S/arch -I$S -nostdinc
+INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
 		-Dmc68020 -Dmac68k
 CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 1c76adbab24..18c2369380e 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.macppc,v 1.24 2006/07/27 05:58:11 miod Exp $
+#	$OpenBSD: Makefile.macppc,v 1.25 2007/07/30 16:23:33 thib Exp $
 #
 # Makefile for OpenBSD PowerPC
 #
@@ -35,7 +35,7 @@ S!=	cd ../../../..; pwd
 .endif
 MACPPC=	$S/arch/macppc
 
-INCLUDES=	-I. -I$S/arch -I$S -nostdinc
+INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL \
 		-D__macppc__
 CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index 59d376cac3b..2b158ce6600 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme68k,v 1.27 2006/07/27 05:58:11 miod Exp $
+#	$OpenBSD: Makefile.mvme68k,v 1.28 2007/07/30 16:23:33 thib Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -32,7 +32,7 @@ S!=	cd ../../../..; pwd
 MVME68K=$S/arch/mvme68k
 M68K=	$S/arch/m68k
 
-INCLUDES=	 -I. -I$S/arch -I$S -nostdinc
+INCLUDES=	 -I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
 		-Dmc68020 -Dmvme68k
 CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index 0a3d7b525a4..5d2939594d1 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme88k,v 1.39 2006/07/27 05:58:11 miod Exp $
+#	$OpenBSD: Makefile.mvme88k,v 1.40 2007/07/30 16:23:33 thib Exp $
 #
 # Makefile for OpenBSD
 #
@@ -34,7 +34,7 @@ S!=	cd ../../../..; pwd
 MVME88K=	$S/arch/mvme88k
 M88K=		$S/arch/m88k
 
-INCLUDES=	-nostdinc -I. -I$S/arch -I$S
+INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dmvme88k -Dm88k
 CWARNFLAGS=	-Wall -Werror -Wmissing-prototypes \
 		-Wno-uninitialized -Wno-format -Wno-main -Wstrict-prototypes \
diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc
index e2749713aee..e8278e3ca89 100644
--- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc
+++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvmeppc,v 1.22 2006/07/27 05:58:11 miod Exp $
+#	$OpenBSD: Makefile.mvmeppc,v 1.23 2007/07/30 16:23:33 thib Exp $
 #
 # Makefile for OpenBSD PowerPC
 #
@@ -35,7 +35,7 @@ S!=	cd ../../../..; pwd
 .endif
 MVMEPPC=	$S/arch/mvmeppc
 
-INCLUDES=	-I. -I$S/arch -I$S -nostdinc
+INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL \
 		-D__mvmeppc__
 CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index 50176afea68..edf33468247 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sgi,v 1.15 2007/04/21 20:07:24 deraadt Exp $
+#	$OpenBSD: Makefile.sgi,v 1.16 2007/07/30 16:23:33 thib Exp $
 
 # Makefile for OpenBSD
 #
@@ -45,7 +45,7 @@ S!=	cd ../../../..; pwd
 SGI=$S/arch/sgi
 MIPS64=	$S/arch/mips64
 
-INCLUDES=	-I. -I$S/arch -I$S -nostdinc
+INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D__sgi__
 CDIAGFLAGS=	-Werror -Wall -Wmissing-prototypes -Wstrict-prototypes \
 		-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/solbourne/conf/Makefile.solbourne b/sys/arch/solbourne/conf/Makefile.solbourne
index de7090d3fe3..fb196a39fd3 100644
--- a/sys/arch/solbourne/conf/Makefile.solbourne
+++ b/sys/arch/solbourne/conf/Makefile.solbourne
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.solbourne,v 1.3 2006/07/27 05:58:12 miod Exp $
+#	$OpenBSD: Makefile.solbourne,v 1.4 2007/07/30 16:23:33 thib Exp $
 
 # Makefile for OpenBSD
 #
@@ -33,7 +33,7 @@ S!=	cd ../../../..; pwd
 .endif
 SOLBOURNE=	$S/arch/solbourne
 
-INCLUDES=	-nostdinc -I. -I$S/arch -I$S
+INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dsparc -Dsolbourne
 
 CDIAGFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index 50a26cce680..c0afee4baa6 100644
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc,v 1.38 2007/05/08 11:33:31 art Exp $
+#	$OpenBSD: Makefile.sparc,v 1.39 2007/07/30 16:23:33 thib Exp $
 # 	$NetBSD: Makefile.sparc,v 1.32.4.1 1996/06/12 20:26:32 pk Exp $
 
 # Makefile for OpenBSD
@@ -34,7 +34,7 @@ S!=	cd ../../../..; pwd
 .endif
 SPARC=	$S/arch/sparc
 
-INCLUDES=	-nostdinc -I. -I$S/arch -I$S
+INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dsparc
 
 CDIAGFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index 75d7707351f..6a4a9bf8da6 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -12,7 +12,7 @@ S!=	cd ../../../..; pwd
 .endif
 SPARC64=	$S/arch/sparc64
 
-INCLUDES=	-nostdinc -I. -I$S/arch -I$S
+INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL
 
 CDIAGFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index 2c8221cdc93..c3f94bb4166 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.vax,v 1.27 2006/07/27 05:58:12 miod Exp $
+#	$OpenBSD: Makefile.vax,v 1.28 2007/07/30 16:23:33 thib Exp $
 #	$NetBSD: Makefile.vax,v 1.49 1999/07/26 05:20:49 cgd Exp $
 
 # Makefile for OpenBSD/vax
@@ -62,7 +62,7 @@ S!=	cd ../../../..; pwd
 .endif
 VAX=	$S/arch/vax
 
-INCLUDES=	-I. -I$S/arch -I$S -nostdinc
+INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
 		-D_VAX_INLINE_
 CWARNFLAGS?=	-Werror -Wall -Wmissing-prototypes -Wstrict-prototypes \
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus
index 6360f3a6efa..465b32646eb 100644
--- a/sys/arch/zaurus/conf/Makefile.zaurus
+++ b/sys/arch/zaurus/conf/Makefile.zaurus
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.zaurus,v 1.7 2006/07/27 05:58:12 miod Exp $
+#	$OpenBSD: Makefile.zaurus,v 1.8 2007/07/30 16:23:33 thib Exp $
 #	$NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $
 
 # Makefile for OpenBSD
@@ -35,7 +35,7 @@ S!=	cd ../../../..; pwd
 THISARM=	$S/arch/zaurus
 ARM=	$S/arch/arm
 
-INCLUDES=	-nostdinc -I. -I$S/arch -I$S
+INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D__zaurus__
 CDIAGFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
 		-Wno-uninitialized -Wno-format -Wno-main \