diff --git a/sys/arch/arm/include/Makefile b/sys/arch/arm/include/Makefile
index 7ed872e1141e..860aeafae8b5 100644
--- a/sys/arch/arm/include/Makefile
+++ b/sys/arch/arm/include/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2001/06/23 13:25:19 bjh21 Exp $
+#	$NetBSD: Makefile,v 1.19 2001/07/14 00:23:09 matt Exp $
 
 KDIR=	/sys/arch/arm/include
 INCSDIR= /usr/include/arm
@@ -18,7 +18,7 @@ INCS=	ansi.h aout_machdep.h armreg.h asm.h \
 	param.h pci_machdep.h pio.h proc.h profile.h profileio.h pte.h \
 	ptrace.h \
 	reg.h \
-	setjmp.h signal.h stdarg.h \
+	setjmp.h signal.h stdarg.h sysarch.h \
 	trap.h types.h \
 	varargs.h
 
diff --git a/sys/arch/arm/include/arm32/Makefile b/sys/arch/arm/include/arm32/Makefile
index 5e44d14571a8..dac18b3cc4c7 100644
--- a/sys/arch/arm/include/arm32/Makefile
+++ b/sys/arch/arm/include/arm32/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.4 2001/06/18 21:37:33 bjh21 Exp $
+#	$NetBSD: Makefile,v 1.5 2001/07/14 00:23:10 matt Exp $
 
 KDIR=	/sys/arch/arm/include/arm32
 INCSDIR= /usr/include/arm/arm32
 
-INCS=	katelib.h pcb.h psl.h sysarch.h frame.h param.h pmap.h rtc.h
+INCS=	frame.h katelib.h param.h pcb.h pmap.h psl.h rtc.h
 
 .include <bsd.kinc.mk>
diff --git a/sys/arch/arm/include/arm32/sysarch.h b/sys/arch/arm/include/sysarch.h
similarity index 93%
rename from sys/arch/arm/include/arm32/sysarch.h
rename to sys/arch/arm/include/sysarch.h
index 12ac1f247294..2fb2c0f15403 100644
--- a/sys/arch/arm/include/arm32/sysarch.h
+++ b/sys/arch/arm/include/sysarch.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysarch.h,v 1.1 2001/02/23 21:23:50 reinoud Exp $	*/
+/*	$NetBSD: sysarch.h,v 1.1 2001/07/14 00:23:09 matt Exp $	*/
 
 /*
  * Copyright (c) 1996-1997 Mark Brinicombe.
@@ -32,8 +32,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _ARM32_SYSARCH_H_
-#define _ARM32_SYSARCH_H_
+#ifndef _ARM_SYSARCH_H_
+#define _ARM_SYSARCH_H_
 
 /*
  * Architecture specific syscalls (arm32)
@@ -53,4 +53,4 @@ int arm32_drain_writebuf	__P((void));
 int sysarch			__P((int, void *));
 #endif
 
-#endif /* !_ARM32_SYSARCH_H_ */
+#endif /* !_ARM_SYSARCH_H_ */
diff --git a/sys/arch/arm32/include/sysarch.h b/sys/arch/arm32/include/sysarch.h
index 334f722df321..385bdaa7b1e3 100644
--- a/sys/arch/arm32/include/sysarch.h
+++ b/sys/arch/arm32/include/sysarch.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sysarch.h,v 1.6 2001/02/23 21:23:51 reinoud Exp $ */
+/* $NetBSD: sysarch.h,v 1.7 2001/07/14 00:23:10 matt Exp $ */
 
-#include <arm/arm32/sysarch.h>
+#include <arm/sysarch.h>
 
diff --git a/sys/arch/cats/include/Makefile b/sys/arch/cats/include/Makefile
index 4fd2ccd3e967..db06573680dc 100644
--- a/sys/arch/cats/include/Makefile
+++ b/sys/arch/cats/include/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2001/06/23 12:20:28 bjh21 Exp $
+#	$NetBSD: Makefile,v 1.5 2001/07/14 00:23:10 matt Exp $
 
 KDIR=	/sys/arch/cats/include
 INCSDIR= /usr/include/arm/cats
@@ -11,7 +11,6 @@ INCS=	bootconfig.h \
 	katelib.h kerndebug.h \
 	param.h pcb.h pci_machdep.h pmap.h psl.h \
 	rtc.h \
-	sysarch.h \
 	types.h \
 	vmparam.h
 
diff --git a/sys/arch/cats/include/sysarch.h b/sys/arch/cats/include/sysarch.h
deleted file mode 100644
index 656f7109830a..000000000000
--- a/sys/arch/cats/include/sysarch.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: sysarch.h,v 1.1 2001/06/08 22:23:03 chris Exp $ */
-
-#include <arm/arm32/sysarch.h>
-
diff --git a/sys/arch/dnard/include/Makefile b/sys/arch/dnard/include/Makefile
index e8689f1517ff..c85e6e305403 100644
--- a/sys/arch/dnard/include/Makefile
+++ b/sys/arch/dnard/include/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2001/06/23 12:20:29 bjh21 Exp $
+#	$NetBSD: Makefile,v 1.5 2001/07/14 00:23:10 matt Exp $
 
 KDIR=	/sys/arch/dnard/include
 INCSDIR= /usr/include/arm/dnard
@@ -12,7 +12,7 @@ INCS=	bootconfig.h \
 	katelib.h kerndebug.h \
 	ofisa_machdep.h \
 	param.h pcb.h pmap.h psl.h \
-	scrio.h sysarch.h \
+	scrio.h \
 	types.h \
 	vmparam.h
 
diff --git a/sys/arch/dnard/include/sysarch.h b/sys/arch/dnard/include/sysarch.h
deleted file mode 100644
index 32e3a867fd1a..000000000000
--- a/sys/arch/dnard/include/sysarch.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: sysarch.h,v 1.1 2001/03/04 03:33:50 matt Exp $ */
-
-#include <arm/arm32/sysarch.h>
-
diff --git a/sys/arch/hpcarm/include/sysarch.h b/sys/arch/hpcarm/include/sysarch.h
index e9aa3a2c01d8..a5743b6ec1f4 100644
--- a/sys/arch/hpcarm/include/sysarch.h
+++ b/sys/arch/hpcarm/include/sysarch.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sysarch.h,v 1.2 2001/02/23 21:23:53 reinoud Exp $ */
+/* $NetBSD: sysarch.h,v 1.3 2001/07/14 00:23:11 matt Exp $ */
 
-#include <arm/arm32/sysarch.h>
+#include <arm/sysarch.h>
 
diff --git a/sys/arch/netwinder/include/Makefile b/sys/arch/netwinder/include/Makefile
index bb0a6c7ffb4e..a1d247bde303 100644
--- a/sys/arch/netwinder/include/Makefile
+++ b/sys/arch/netwinder/include/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2001/06/23 12:20:29 bjh21 Exp $
+#	$NetBSD: Makefile,v 1.6 2001/07/14 00:23:11 matt Exp $
 
 KDIR=	/sys/arch/netwinder/include
 INCSDIR= /usr/include/arm/netwinder
@@ -12,7 +12,6 @@ INCS=	bootconfig.h \
 	netwinder_boot.h \
 	param.h pcb.h pci_machdep.h pmap.h psl.h \
 	rtc.h \
-	sysarch.h \
 	types.h \
 	vmparam.h
 
diff --git a/sys/arch/netwinder/include/sysarch.h b/sys/arch/netwinder/include/sysarch.h
deleted file mode 100644
index 6ddb013dbf4d..000000000000
--- a/sys/arch/netwinder/include/sysarch.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: sysarch.h,v 1.1 2001/04/19 07:11:04 matt Exp $ */
-
-#include <arm/arm32/sysarch.h>
-