From 421dd6cc28c70d6bd982c89a8826b8d92fb9eca5 Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Mon, 20 Oct 2003 00:12:09 +0000
Subject: [PATCH] Reorganize the way powerpc port install machine specific
 headers. Use <powerpc/oea/bat.h> exclusively and remove <machine/bat.h> and
 <powerpc/bat.h>.  Remove unneeded <machine/cpufunc.h>.  To insure 1:1
 correspondence of <powerpc/FOO.h> to <machine/FOO.h> include
 "../../powerpc/include/Makefile" in "arch/FOO/include/Makefile". Incororpate
 <byte_swap.h> into <bswap.h> and then byte_swap.h

---
 sys/arch/bebox/bebox/machdep.c          |  7 ++---
 sys/arch/bebox/include/Makefile         | 27 +++++--------------
 sys/arch/bebox/include/atomic.h         |  3 +++
 sys/arch/bebox/include/cpufunc.h        |  2 --
 sys/arch/evbppc/include/Makefile        | 25 ++++-------------
 sys/arch/evbppc/include/atomic.h        |  3 +++
 sys/arch/ibmnws/ibmnws/machdep.c        |  5 ++--
 sys/arch/ibmnws/include/Makefile        | 24 ++++-------------
 sys/arch/ibmnws/include/atomic.h        |  3 +++
 sys/arch/ibmnws/include/bat.h           |  3 ---
 sys/arch/ibmnws/include/cpufunc.h       |  1 -
 sys/arch/macppc/dev/ofb.c               |  7 ++---
 sys/arch/macppc/include/Makefile        | 32 +++++++---------------
 sys/arch/macppc/include/atomic.h        |  3 +++
 sys/arch/macppc/macppc/cpu.c            |  6 ++---
 sys/arch/macppc/macppc/machdep.c        |  6 ++---
 sys/arch/macppc/macppc/rbus_machdep.c   |  6 ++---
 sys/arch/macppc/stand/bootxx/bootxx.c   |  4 +--
 sys/arch/mvmeppc/include/Makefile       | 26 +++++-------------
 sys/arch/mvmeppc/include/atomic.h       |  3 +++
 sys/arch/mvmeppc/include/bat.h          |  3 ---
 sys/arch/mvmeppc/mvmeppc/machdep.c      |  7 ++---
 sys/arch/ofppc/firepower/firepower.c    |  6 ++---
 sys/arch/ofppc/include/Makefile         | 25 ++++-------------
 sys/arch/ofppc/include/atomic.h         |  3 +++
 sys/arch/ofppc/include/bat.h            |  3 ---
 sys/arch/ofppc/ofppc/machdep.c          |  8 +++---
 sys/arch/pmppc/include/Makefile         | 25 ++++-------------
 sys/arch/pmppc/include/atomic.h         |  3 +++
 sys/arch/pmppc/include/cpufunc.h        |  2 --
 sys/arch/pmppc/pmppc/machdep.c          |  7 ++---
 sys/arch/powerpc/include/Makefile       | 12 ++++-----
 sys/arch/powerpc/include/bswap.h        | 36 +++++++++++++++++++++++--
 sys/arch/powerpc/include/byte_swap.h    | 35 ------------------------
 sys/arch/powerpc/powerpc/kgdb_machdep.c |  6 ++---
 sys/arch/prep/include/Makefile          | 26 +++++-------------
 sys/arch/prep/include/atomic.h          |  3 +++
 sys/arch/prep/include/bat.h             |  3 ---
 sys/arch/prep/include/cpufunc.h         |  1 -
 sys/arch/prep/prep/machdep.c            |  7 ++---
 sys/arch/sandpoint/include/Makefile     | 21 +++------------
 sys/arch/sandpoint/include/atomic.h     |  3 +++
 sys/arch/sandpoint/sandpoint/machdep.c  |  6 ++---
 43 files changed, 166 insertions(+), 281 deletions(-)
 create mode 100644 sys/arch/bebox/include/atomic.h
 delete mode 100644 sys/arch/bebox/include/cpufunc.h
 create mode 100644 sys/arch/evbppc/include/atomic.h
 create mode 100644 sys/arch/ibmnws/include/atomic.h
 delete mode 100644 sys/arch/ibmnws/include/bat.h
 delete mode 100644 sys/arch/ibmnws/include/cpufunc.h
 create mode 100644 sys/arch/macppc/include/atomic.h
 create mode 100644 sys/arch/mvmeppc/include/atomic.h
 delete mode 100644 sys/arch/mvmeppc/include/bat.h
 create mode 100644 sys/arch/ofppc/include/atomic.h
 delete mode 100644 sys/arch/ofppc/include/bat.h
 create mode 100644 sys/arch/pmppc/include/atomic.h
 delete mode 100644 sys/arch/pmppc/include/cpufunc.h
 delete mode 100644 sys/arch/powerpc/include/byte_swap.h
 create mode 100644 sys/arch/prep/include/atomic.h
 delete mode 100644 sys/arch/prep/include/bat.h
 delete mode 100644 sys/arch/prep/include/cpufunc.h
 create mode 100644 sys/arch/sandpoint/include/atomic.h

diff --git a/sys/arch/bebox/bebox/machdep.c b/sys/arch/bebox/bebox/machdep.c
index 06dc20249550..361911b4e514 100644
--- a/sys/arch/bebox/bebox/machdep.c
+++ b/sys/arch/bebox/bebox/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.82 2003/07/15 01:26:30 lukem Exp $	*/
+/*	$NetBSD: machdep.c,v 1.83 2003/10/20 00:12:09 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.82 2003/07/15 01:26:30 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.83 2003/10/20 00:12:09 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -67,7 +67,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.82 2003/07/15 01:26:30 lukem Exp $");
 
 #include <net/netisr.h>
 
-#include <powerpc/bat.h>
 #include <machine/bootinfo.h>
 #include <machine/autoconf.h>
 #define _POWERPC_BUS_DMA_PRIVATE
@@ -77,6 +76,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.82 2003/07/15 01:26:30 lukem Exp $");
 #include <machine/powerpc.h>
 #include <machine/trap.h>
 
+#include <powerpc/oea/bat.h>
+
 #include <dev/cons.h>
 
 #include "pfb.h"
diff --git a/sys/arch/bebox/include/Makefile b/sys/arch/bebox/include/Makefile
index e5df5c7676b4..6441a0f99cb3 100644
--- a/sys/arch/bebox/include/Makefile
+++ b/sys/arch/bebox/include/Makefile
@@ -1,24 +1,11 @@
-#	$NetBSD: Makefile,v 1.19 2003/01/17 22:36:32 thorpej Exp $
+#	$NetBSD: Makefile,v 1.20 2003/10/20 00:12:09 matt Exp $
 
 INCSDIR= /usr/include/bebox
 
-INCS=   ansi.h aout_machdep.h asm.h \
-	bootinfo.h bswap.h bus.h \
-	cdefs.h cpu.h cpufunc.h \
-	db_machdep.h disklabel.h \
-	elf_machdep.h endian.h endian_machdep.h \
-	float.h fpu.h frame.h \
-	ieee.h ieeefp.h \
-	int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
-	intr.h ipkdb.h \
-	kcore.h kgdb.h \
-	limits.h lock.h \
-	math.h mcontext.h mouse.h \
-	param.h pcb.h pccons.h pio.h pmap.h pmc.h powerpc.h proc.h profile.h \
-	psl.h ptrace.h \
-	reg.h reloc.h \
-	setjmp.h signal.h spkr.h stdarg.h \
-	trap.h types.h \
-	varargs.h vmparam.h
+INCS=   bootinfo.h
+	disklabel.h \
+	intr.h \
+	pccons.h \
+	vmparam.h
 
-.include <bsd.kinc.mk>
+.include "../../powerpc/include/Makefile"
diff --git a/sys/arch/bebox/include/atomic.h b/sys/arch/bebox/include/atomic.h
new file mode 100644
index 000000000000..06a5fd48e6d6
--- /dev/null
+++ b/sys/arch/bebox/include/atomic.h
@@ -0,0 +1,3 @@
+/*	$NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $	*/
+
+#include <powerpc/atomic.h>
diff --git a/sys/arch/bebox/include/cpufunc.h b/sys/arch/bebox/include/cpufunc.h
deleted file mode 100644
index 6bd5aded8270..000000000000
--- a/sys/arch/bebox/include/cpufunc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/*	$NetBSD: cpufunc.h,v 1.2 1998/01/05 07:02:53 perry Exp $	*/
-
diff --git a/sys/arch/evbppc/include/Makefile b/sys/arch/evbppc/include/Makefile
index 3688f552fa03..775c8f224d47 100644
--- a/sys/arch/evbppc/include/Makefile
+++ b/sys/arch/evbppc/include/Makefile
@@ -1,24 +1,9 @@
-#	$NetBSD: Makefile,v 1.3 2003/01/17 22:48:43 thorpej Exp $
+#	$NetBSD: Makefile,v 1.4 2003/10/20 00:12:10 matt Exp $
 
-KDIR=	/sys/arch/evbppc/include
 INCSDIR= /usr/include/evbppc
 
-INCS=	ansi.h aout_machdep.h asm.h \
-	bswap.h bus.h \
-	cdefs.h cpu.h \
-	db_machdep.h disklabel.h \
-	elf_machdep.h endian.h endian_machdep.h \
-	float.h fpu.h frame.h \
-	ieee.h ieeefp.h int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h \
-	int_types.h intr.h ipkdb.h \
-	kcore.h \
-	limits.h lock.h \
-	math.h mcontext.h \
-	param.h pcb.h pio.h pmap.h pmc.h powerpc.h proc.h profile.h \
-	psl.h pte.h ptrace.h \
-	reg.h reloc.h \
-	setjmp.h signal.h stdarg.h \
-	tlb.h trap.h types.h \
-	varargs.h vmparam.h 
+INCS=	disklabel.h \
+	intr.h \
+	vmparam.h 
 
-.include <bsd.kinc.mk>
+.include "../../powerpc/include/Makefile"
diff --git a/sys/arch/evbppc/include/atomic.h b/sys/arch/evbppc/include/atomic.h
new file mode 100644
index 000000000000..06a5fd48e6d6
--- /dev/null
+++ b/sys/arch/evbppc/include/atomic.h
@@ -0,0 +1,3 @@
+/*	$NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $	*/
+
+#include <powerpc/atomic.h>
diff --git a/sys/arch/ibmnws/ibmnws/machdep.c b/sys/arch/ibmnws/ibmnws/machdep.c
index d07d70c172a7..b84df9cca43d 100644
--- a/sys/arch/ibmnws/ibmnws/machdep.c
+++ b/sys/arch/ibmnws/ibmnws/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.1 2003/10/19 03:33:50 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.2 2003/10/20 00:12:10 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -60,13 +60,14 @@
 #include <net/netisr.h>
 
 #include <machine/autoconf.h>
-#include <machine/bat.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 #include <machine/pmap.h>
 #include <machine/powerpc.h>
 #include <machine/trap.h>
 
+#include <powerpc/oea/bat.h>
+
 #include <dev/cons.h>
 
 #include "com.h"
diff --git a/sys/arch/ibmnws/include/Makefile b/sys/arch/ibmnws/include/Makefile
index e64c5a38ac4f..982adfbd7b33 100644
--- a/sys/arch/ibmnws/include/Makefile
+++ b/sys/arch/ibmnws/include/Makefile
@@ -1,24 +1,10 @@
-#	$NetBSD: Makefile,v 1.1 2003/10/19 03:33:50 matt Exp $
+#	$NetBSD: Makefile,v 1.2 2003/10/20 00:12:10 matt Exp $
 
 INCSDIR= /usr/include/ibmnws
 
-INCS=   ansi.h aout_machdep.h asm.h \
-	bat.h bswap.h bus.h \
-	cdefs.h cpu.h \
-	db_machdep.h disklabel.h \
-	elf_machdep.h endian.h endian_machdep.h \
-	float.h fpu.h frame.h \
-	ieee.h ieeefp.h \
-	int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
+INCS=   bus.h \
+	disklabel.h \
 	intr.h \
-	kcore.h \
-	limits.h lock.h \
-	math.h mcontext.h \
-	param.h pcb.h pmap.h pmc.h powerpc.h proc.h profile.h \
-	psl.h pte.h ptrace.h \
-	reg.h reloc.h \
-	setjmp.h signal.h stdarg.h \
-	trap.h types.h \
-	varargs.h vmparam.h
+	vmparam.h
 
-.include <bsd.kinc.mk>
+.include "../../powerpc/include/Makefile"
diff --git a/sys/arch/ibmnws/include/atomic.h b/sys/arch/ibmnws/include/atomic.h
new file mode 100644
index 000000000000..06a5fd48e6d6
--- /dev/null
+++ b/sys/arch/ibmnws/include/atomic.h
@@ -0,0 +1,3 @@
+/*	$NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $	*/
+
+#include <powerpc/atomic.h>
diff --git a/sys/arch/ibmnws/include/bat.h b/sys/arch/ibmnws/include/bat.h
deleted file mode 100644
index 2d021d52ebce..000000000000
--- a/sys/arch/ibmnws/include/bat.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: bat.h,v 1.1 2003/10/19 03:33:50 matt Exp $	*/
-
-#include <powerpc/bat.h>
diff --git a/sys/arch/ibmnws/include/cpufunc.h b/sys/arch/ibmnws/include/cpufunc.h
deleted file mode 100644
index 6f81dff47254..000000000000
--- a/sys/arch/ibmnws/include/cpufunc.h
+++ /dev/null
@@ -1 +0,0 @@
-/*	$NetBSD: cpufunc.h,v 1.1 2003/10/19 03:33:50 matt Exp $	*/
diff --git a/sys/arch/macppc/dev/ofb.c b/sys/arch/macppc/dev/ofb.c
index b10d466526c2..d7121cccde54 100644
--- a/sys/arch/macppc/dev/ofb.c
+++ b/sys/arch/macppc/dev/ofb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofb.c,v 1.36 2003/07/15 02:43:30 lukem Exp $	*/
+/*	$NetBSD: ofb.c,v 1.37 2003/10/20 00:12:10 matt Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.36 2003/07/15 02:43:30 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.37 2003/10/20 00:12:10 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -53,11 +53,12 @@ __KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.36 2003/07/15 02:43:30 lukem Exp $");
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_pci.h>
 
-#include <machine/bat.h>
 #include <machine/bus.h>
 #include <machine/autoconf.h>
 #include <machine/grfioctl.h>
 
+#include <powerpc/oea/bat.h>
+
 #include <macppc/dev/ofbvar.h>
 
 #if OFB_ENABLE_CACHE
diff --git a/sys/arch/macppc/include/Makefile b/sys/arch/macppc/include/Makefile
index b53037b9020f..8609c577f598 100644
--- a/sys/arch/macppc/include/Makefile
+++ b/sys/arch/macppc/include/Makefile
@@ -1,26 +1,14 @@
-#	$NetBSD: Makefile,v 1.17 2003/01/17 23:23:08 thorpej Exp $
+#	$NetBSD: Makefile,v 1.18 2003/10/20 00:12:10 matt Exp $
 
 INCSDIR= /usr/include/macppc
 
-INCS=	adbsys.h ansi.h aout_machdep.h apmvar.h asm.h autoconf.h \
-	bat.h bswap.h bus.h \
-	cdefs.h cpu.h \
-	db_machdep.h disklabel.h \
-	elf_machdep.h endian.h endian_machdep.h \
-	float.h fpu.h frame.h \
-	grfioctl.h \
-	ieee.h ieeefp.h \
-	int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
-	intr.h ipkdb.h \
-	kcore.h keyboard.h \
-	limits.h lock.h \
-	math.h mcontext.h \
-	param.h pcb.h pio.h pmap.h pmc.h powerpc.h proc.h profile.h psl.h \
-	pte.h ptrace.h \
-	reg.h reloc.h \
-	setjmp.h signal.h stdarg.h \
-	trap.h types.h \
-	varargs.h vmparam.h \
-	z8530var.h
+# Add the macppc specific includes.
 
-.include <bsd.kinc.mk>
+INCS=	adbsys.h apmvar.h autoconf.h \
+	disklabel.h \
+	grfioctl.h \
+	intr.h \
+	keyboard.h \
+	vmparam.h
+
+.include "../../powerpc/include/Makefile"
diff --git a/sys/arch/macppc/include/atomic.h b/sys/arch/macppc/include/atomic.h
new file mode 100644
index 000000000000..06a5fd48e6d6
--- /dev/null
+++ b/sys/arch/macppc/include/atomic.h
@@ -0,0 +1,3 @@
+/*	$NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $	*/
+
+#include <powerpc/atomic.h>
diff --git a/sys/arch/macppc/macppc/cpu.c b/sys/arch/macppc/macppc/cpu.c
index 9723f42d834f..c22ac6a04414 100644
--- a/sys/arch/macppc/macppc/cpu.c
+++ b/sys/arch/macppc/macppc/cpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.36 2003/08/17 18:12:34 chs Exp $	*/
+/*	$NetBSD: cpu.c,v 1.37 2003/10/20 00:12:10 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001 Tsubai Masanari.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.36 2003/08/17 18:12:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.37 2003/10/20 00:12:10 matt Exp $");
 
 #include "opt_ppcparam.h"
 #include "opt_multiprocessor.h"
@@ -46,6 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.36 2003/08/17 18:12:34 chs Exp $");
 #include <uvm/uvm_extern.h>
 #include <dev/ofw/openfirm.h>
 #include <powerpc/oea/hid.h>
+#include <powerpc/oea/bat.h>
 #include <powerpc/openpic.h>
 #include <powerpc/atomic.h>
 #include <powerpc/spr.h>
@@ -54,7 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.36 2003/08/17 18:12:34 chs Exp $");
 #endif
 
 #include <machine/autoconf.h>
-#include <machine/bat.h>
 #include <machine/fpu.h>
 #include <machine/pcb.h>
 #include <machine/pio.h>
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index 005b64cfd827..8c29fc1f1ef4 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.128 2003/07/15 02:43:32 lukem Exp $	*/
+/*	$NetBSD: machdep.c,v 1.129 2003/10/20 00:12:10 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.128 2003/07/15 02:43:32 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.129 2003/10/20 00:12:10 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -79,11 +79,11 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.128 2003/07/15 02:43:32 lukem Exp $");
 #endif
 
 #include <machine/autoconf.h>
-#include <machine/bat.h>
 #include <machine/powerpc.h>
 #include <machine/trap.h>
 #include <machine/bus.h>
 #include <machine/fpu.h>
+#include <powerpc/oea/bat.h>
 #ifdef ALTIVEC
 #include <powerpc/altivec.h>
 #endif
diff --git a/sys/arch/macppc/macppc/rbus_machdep.c b/sys/arch/macppc/macppc/rbus_machdep.c
index 2d1ae5f2105c..ada218542f28 100644
--- a/sys/arch/macppc/macppc/rbus_machdep.c
+++ b/sys/arch/macppc/macppc/rbus_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbus_machdep.c,v 1.11 2003/07/15 02:43:33 lukem Exp $	*/
+/*	$NetBSD: rbus_machdep.c,v 1.12 2003/10/20 00:12:10 matt Exp $	*/
 
 /*
  * Copyright (c) 1999
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.11 2003/07/15 02:43:33 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.12 2003/10/20 00:12:10 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.11 2003/07/15 02:43:33 lukem Exp
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bat.h>
+#include <powerpc/oea/bat.h>
 #include <machine/bus.h>
 
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/macppc/stand/bootxx/bootxx.c b/sys/arch/macppc/stand/bootxx/bootxx.c
index 7fac59d10e11..03cfcd620991 100644
--- a/sys/arch/macppc/stand/bootxx/bootxx.c
+++ b/sys/arch/macppc/stand/bootxx/bootxx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootxx.c,v 1.11 2003/02/28 05:24:56 matt Exp $	*/
+/*	$NetBSD: bootxx.c,v 1.12 2003/10/20 00:12:10 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/types.h>
-#include <machine/bat.h>
+#include <powerpc/oea/bat.h>
 
 #include <sys/bootblock.h>
 
diff --git a/sys/arch/mvmeppc/include/Makefile b/sys/arch/mvmeppc/include/Makefile
index c774f9d00417..f1e021cc6060 100644
--- a/sys/arch/mvmeppc/include/Makefile
+++ b/sys/arch/mvmeppc/include/Makefile
@@ -1,24 +1,10 @@
-#	$NetBSD: Makefile,v 1.5 2003/01/17 23:46:29 thorpej Exp $
+#	$NetBSD: Makefile,v 1.6 2003/10/20 00:12:10 matt Exp $
 
 INCSDIR= /usr/include/mvmeppc
 
-INCS=   ansi.h aout_machdep.h asm.h \
-	bat.h bootinfo.h bswap.h bus.h \
-	cdefs.h cpu.h \
-	db_machdep.h disklabel.h \
-	elf_machdep.h endian.h endian_machdep.h \
-	float.h fpu.h frame.h \
-	ieee.h ieeefp.h \
-	int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
-	intr.h ipkdb.h \
-	kcore.h kgdb.h \
-	limits.h lock.h \
-	math.h mcontext.h \
-	param.h pcb.h pio.h pmap.h pmc.h powerpc.h \
-	proc.h profile.h psl.h pte.h ptrace.h \
-	reg.h reloc.h \
-	setjmp.h signal.h stdarg.h \
-	trap.h types.h \
-	varargs.h vmparam.h
+INCS=   bootinfo.h \
+	disklabel.h \
+	intr.h \
+	vmparam.h
 
-.include <bsd.kinc.mk>
+.include "../../powerpc/include/Makefile"
diff --git a/sys/arch/mvmeppc/include/atomic.h b/sys/arch/mvmeppc/include/atomic.h
new file mode 100644
index 000000000000..06a5fd48e6d6
--- /dev/null
+++ b/sys/arch/mvmeppc/include/atomic.h
@@ -0,0 +1,3 @@
+/*	$NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $	*/
+
+#include <powerpc/atomic.h>
diff --git a/sys/arch/mvmeppc/include/bat.h b/sys/arch/mvmeppc/include/bat.h
deleted file mode 100644
index 4880440ab8d2..000000000000
--- a/sys/arch/mvmeppc/include/bat.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: bat.h,v 1.1 2002/02/27 21:02:14 scw Exp $	*/
-
-#include <powerpc/bat.h>
diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c
index ae94de5105e7..592e42653f8c 100644
--- a/sys/arch/mvmeppc/mvmeppc/machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.18 2003/09/06 21:07:00 kleink Exp $	*/
+/*	$NetBSD: machdep.c,v 1.19 2003/10/20 00:12:10 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.18 2003/09/06 21:07:00 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.19 2003/10/20 00:12:10 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_mvmetype.h"
@@ -65,7 +65,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.18 2003/09/06 21:07:00 kleink Exp $");
 #include <net/netisr.h>
 
 #include <machine/autoconf.h>
-#include <machine/bat.h>
 #include <machine/bootinfo.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
@@ -74,6 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.18 2003/09/06 21:07:00 kleink Exp $");
 #include <machine/powerpc.h>
 #include <machine/trap.h>
 
+#include <powerpc/oea/bat.h>
+
 #include <dev/cons.h>
 
 #if 0
diff --git a/sys/arch/ofppc/firepower/firepower.c b/sys/arch/ofppc/firepower/firepower.c
index 94e8ec1e37d8..90680c789ca8 100644
--- a/sys/arch/ofppc/firepower/firepower.c
+++ b/sys/arch/ofppc/firepower/firepower.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: firepower.c,v 1.10 2003/07/15 02:46:30 lukem Exp $	*/
+/*	$NetBSD: firepower.c,v 1.11 2003/10/20 00:12:10 matt Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: firepower.c,v 1.10 2003/07/15 02:46:30 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: firepower.c,v 1.11 2003/10/20 00:12:10 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -60,10 +60,10 @@ __KERNEL_RCSID(0, "$NetBSD: firepower.c,v 1.10 2003/07/15 02:46:30 lukem Exp $")
 #include <dev/ic/wdcvar.h>
 
 #include <machine/autoconf.h>
-#include <machine/bat.h>
 #include <machine/intr.h>
 #include <machine/platform.h>
 
+#include <powerpc/oea/bat.h>
 #include <powerpc/pio.h>
 
 #include <ofppc/firepower/firepowerreg.h>
diff --git a/sys/arch/ofppc/include/Makefile b/sys/arch/ofppc/include/Makefile
index 26ae4d139cd0..4cf10f0f640f 100644
--- a/sys/arch/ofppc/include/Makefile
+++ b/sys/arch/ofppc/include/Makefile
@@ -1,24 +1,9 @@
-#	$NetBSD: Makefile,v 1.17 2003/01/18 06:11:50 thorpej Exp $
+#	$NetBSD: Makefile,v 1.18 2003/10/20 00:12:10 matt Exp $
 
 INCSDIR= /usr/include/ofppc
 
-INCS=	ansi.h aout_machdep.h asm.h \
-	bat.h bswap.h \
-	cdefs.h cpu.h \
-	db_machdep.h disklabel.h \
-	elf_machdep.h endian.h endian_machdep.h \
-	float.h fpu.h frame.h \
-	ieee.h ieeefp.h \
-	int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
-	intr.h ipkdb.h \
-	kcore.h \
-	limits.h lock.h \
-	math.h mcontext.h \
-	param.h pcb.h pmap.h pmc.h \
-	proc.h profile.h psl.h pte.h ptrace.h \
-	reg.h reloc.h \
-	setjmp.h signal.h stdarg.h \
-	trap.h types.h \
-	varargs.h vmparam.h
+INCS=	disklabel.h \
+	intr.h \
+	vmparam.h
 
-.include <bsd.kinc.mk>
+.include "../../powerpc/include/Makefile"
diff --git a/sys/arch/ofppc/include/atomic.h b/sys/arch/ofppc/include/atomic.h
new file mode 100644
index 000000000000..06a5fd48e6d6
--- /dev/null
+++ b/sys/arch/ofppc/include/atomic.h
@@ -0,0 +1,3 @@
+/*	$NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $	*/
+
+#include <powerpc/atomic.h>
diff --git a/sys/arch/ofppc/include/bat.h b/sys/arch/ofppc/include/bat.h
deleted file mode 100644
index 614806b93041..000000000000
--- a/sys/arch/ofppc/include/bat.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: bat.h,v 1.1 1998/05/28 08:12:14 sakamoto Exp $	*/
-
-#include <powerpc/bat.h>
diff --git a/sys/arch/ofppc/ofppc/machdep.c b/sys/arch/ofppc/ofppc/machdep.c
index 2a9c2a080bdf..4bbeac1f5d4a 100644
--- a/sys/arch/ofppc/ofppc/machdep.c
+++ b/sys/arch/ofppc/ofppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.86 2003/07/15 02:46:32 lukem Exp $	*/
+/*	$NetBSD: machdep.c,v 1.87 2003/10/20 00:12:10 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.86 2003/07/15 02:46:32 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.87 2003/10/20 00:12:10 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -65,13 +65,13 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.86 2003/07/15 02:46:32 lukem Exp $");
 #include <dev/ofw/openfirm.h>
 
 #include <machine/autoconf.h>
-#include <machine/bat.h>
 #include <machine/pmap.h>
 #include <machine/powerpc.h>
 #include <machine/trap.h>
-
 #include <machine/platform.h>
 
+#include <powerpc/oea/bat.h>
+
 #include <dev/cons.h>
 
 #include "ksyms.h"
diff --git a/sys/arch/pmppc/include/Makefile b/sys/arch/pmppc/include/Makefile
index e00d2e87e3f7..995bafd6d4de 100644
--- a/sys/arch/pmppc/include/Makefile
+++ b/sys/arch/pmppc/include/Makefile
@@ -1,24 +1,9 @@
-#	$NetBSD: Makefile,v 1.5 2003/01/18 18:17:23 augustss Exp $
+#	$NetBSD: Makefile,v 1.6 2003/10/20 00:12:10 matt Exp $
 
 INCSDIR= /usr/include/pmppc
 
-INCS=   ansi.h aout_machdep.h asm.h \
-	bswap.h bus.h \
-	cdefs.h cpu.h cpufunc.h \
-	db_machdep.h disklabel.h \
-	elf_machdep.h endian.h endian_machdep.h \
-	float.h fpu.h frame.h \
-	ieee.h ieeefp.h \
-	int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
-	intr.h ipkdb.h \
-	kcore.h kgdb.h \
-	limits.h lock.h \
-	math.h mcontext.h \
-	param.h pcb.h pio.h pmap.h pmc.h powerpc.h proc.h profile.h psl.h \
-	ptrace.h \
-	reg.h reloc.h \
-	setjmp.h signal.h stdarg.h \
-	trap.h types.h \
-	varargs.h vmparam.h
+INCS=   disklabel.h \
+	intr.h \
+	vmparam.h
 
-.include <bsd.kinc.mk>
+.include "../../powerpc/include/Makefile"
diff --git a/sys/arch/pmppc/include/atomic.h b/sys/arch/pmppc/include/atomic.h
new file mode 100644
index 000000000000..06a5fd48e6d6
--- /dev/null
+++ b/sys/arch/pmppc/include/atomic.h
@@ -0,0 +1,3 @@
+/*	$NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $	*/
+
+#include <powerpc/atomic.h>
diff --git a/sys/arch/pmppc/include/cpufunc.h b/sys/arch/pmppc/include/cpufunc.h
deleted file mode 100644
index 771976f614f1..000000000000
--- a/sys/arch/pmppc/include/cpufunc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/*	$NetBSD: cpufunc.h,v 1.1 2002/05/30 08:51:16 augustss Exp $	*/
-
diff --git a/sys/arch/pmppc/pmppc/machdep.c b/sys/arch/pmppc/pmppc/machdep.c
index 93bf5b01d22d..f6ec3afe0ff6 100644
--- a/sys/arch/pmppc/pmppc/machdep.c
+++ b/sys/arch/pmppc/pmppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.16 2003/07/15 02:54:42 lukem Exp $	*/
+/*	$NetBSD: machdep.c,v 1.17 2003/10/20 00:12:10 matt Exp $	*/
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2003/07/15 02:54:42 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.17 2003/10/20 00:12:10 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -105,7 +105,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2003/07/15 02:54:42 lukem Exp $");
 
 #include <net/netisr.h>
 
-#include <powerpc/bat.h>
 #include <machine/bus.h>
 #include <machine/db_machdep.h>
 #include <machine/intr.h>
@@ -115,6 +114,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2003/07/15 02:54:42 lukem Exp $");
 #include <machine/trap.h>
 #include <machine/pmppc.h>
 
+#include <powerpc/oea/bat.h>
+
 #include <ddb/db_extern.h>
 
 #include <dev/cons.h>
diff --git a/sys/arch/powerpc/include/Makefile b/sys/arch/powerpc/include/Makefile
index 6cf9dba624db..fe593d339e4d 100644
--- a/sys/arch/powerpc/include/Makefile
+++ b/sys/arch/powerpc/include/Makefile
@@ -1,20 +1,18 @@
-#	$NetBSD: Makefile,v 1.29 2003/01/18 06:23:29 thorpej Exp $
+#	$NetBSD: Makefile,v 1.30 2003/10/20 00:12:10 matt Exp $
 
-INCSDIR= /usr/include/powerpc
+INCSDIR?= /usr/include/powerpc
 
-INCS=	ansi.h aout_machdep.h asm.h atomic.h \
-	bat.h bswap.h byte_swap.h \
+INCS+=	ansi.h aout_machdep.h asm.h atomic.h \
+	bswap.h \
 	cdefs.h cpu.h \
-	db_machdep.h \
 	elf_machdep.h endian.h endian_machdep.h \
 	float.h fpu.h frame.h \
 	ieee.h ieeefp.h \
 	int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
-	ipkdb.h \
 	kcore.h \
 	limits.h lock.h \
 	math.h mcontext.h \
-	param.h pcb.h pio.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
+	param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
 	reg.h reloc.h \
 	setjmp.h signal.h stdarg.h \
 	trap.h types.h \
diff --git a/sys/arch/powerpc/include/bswap.h b/sys/arch/powerpc/include/bswap.h
index 6cb7a0c0d8a7..6d18d8c1bd9c 100644
--- a/sys/arch/powerpc/include/bswap.h
+++ b/sys/arch/powerpc/include/bswap.h
@@ -1,4 +1,30 @@
-/*	$NetBSD: bswap.h,v 1.3 2001/05/30 13:08:34 tsubai Exp $	*/
+/*	$NetBSD: bswap.h,v 1.4 2003/10/20 00:12:10 matt Exp $	*/
+
+/*-
+ * Copyright (c) 2001 Tsubai Masanari.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #ifndef _POWERPC_BSWAP_H_
 #define _POWERPC_BSWAP_H_
@@ -6,8 +32,14 @@
 #include <sys/bswap.h>
 
 #ifdef __GNUC__
-#include <powerpc/byte_swap.h>
+#define __bswap16_const(x) ((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
+#define __bswap16(x) (__builtin_constant_p(x) ? __bswap16_const(x) : bswap16(x))
 #define bswap16(x) __bswap16(x)
+
+#define __bswap32_const(x) \
+	((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
+	 (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
+#define __bswap32(x) (__builtin_constant_p(x) ? __bswap32_const(x) : bswap32(x))
 #define bswap32(x) __bswap32(x)
 #endif
 
diff --git a/sys/arch/powerpc/include/byte_swap.h b/sys/arch/powerpc/include/byte_swap.h
deleted file mode 100644
index 620acf20959d..000000000000
--- a/sys/arch/powerpc/include/byte_swap.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: byte_swap.h,v 1.1 2001/05/30 13:08:34 tsubai Exp $	*/
-
-/*-
- * Copyright (c) 2001 Tsubai Masanari.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#define __bswap16_const(x) ((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
-#define __bswap16(x) (__builtin_constant_p(x) ? __bswap16_const(x) : bswap16(x))
-
-#define __bswap32_const(x) \
-	((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
-	 (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
-#define __bswap32(x) (__builtin_constant_p(x) ? __bswap32_const(x) : bswap32(x))
diff --git a/sys/arch/powerpc/powerpc/kgdb_machdep.c b/sys/arch/powerpc/powerpc/kgdb_machdep.c
index 8e674d40631b..34fc3c83c81f 100644
--- a/sys/arch/powerpc/powerpc/kgdb_machdep.c
+++ b/sys/arch/powerpc/powerpc/kgdb_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kgdb_machdep.c,v 1.8 2003/09/27 04:44:42 matt Exp $	*/
+/*	$NetBSD: kgdb_machdep.c,v 1.9 2003/10/20 00:12:10 matt Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.8 2003/09/27 04:44:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.9 2003/10/20 00:12:10 matt Exp $");
 
 #include "opt_ddb.h"
 
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.8 2003/09/27 04:44:42 matt Exp $"
 #include <machine/trap.h>
 #include <machine/pmap.h>
 
-#include <powerpc/bat.h>
+#include <powerpc/oea/bat.h>
 
 /*
  * Determine if the memory at va..(va+len) is valid.
diff --git a/sys/arch/prep/include/Makefile b/sys/arch/prep/include/Makefile
index 161bdda58615..a5533e314d36 100644
--- a/sys/arch/prep/include/Makefile
+++ b/sys/arch/prep/include/Makefile
@@ -1,24 +1,10 @@
-#	$NetBSD: Makefile,v 1.15 2003/05/15 18:51:18 wiz Exp $
+#	$NetBSD: Makefile,v 1.16 2003/10/20 00:12:10 matt Exp $
 
 INCSDIR= /usr/include/prep
 
-INCS=   ansi.h aout_machdep.h asm.h \
-	bat.h bootinfo.h bswap.h bus.h \
-	cdefs.h cpu.h cpufunc.h \
-	db_machdep.h disklabel.h \
-	elf_machdep.h endian.h endian_machdep.h \
-	float.h fpu.h frame.h \
-	ieee.h ieeefp.h \
-	int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
-	intr.h ipkdb.h \
-	kcore.h kgdb.h \
-	limits.h lock.h \
-	math.h mcontext.h \
-	param.h pcb.h pio.h pmap.h pmc.h powerpc.h proc.h profile.h \
-	psl.h pte.h ptrace.h \
-	reg.h reloc.h \
-	setjmp.h signal.h spkr.h stdarg.h \
-	trap.h types.h \
-	varargs.h vmparam.h
+INCS=   bootinfo.h \
+	disklabel.h \
+	intr.h \
+	vmparam.h
 
-.include <bsd.kinc.mk>
+.include "../../powerpc/include/Makefile"
diff --git a/sys/arch/prep/include/atomic.h b/sys/arch/prep/include/atomic.h
new file mode 100644
index 000000000000..06a5fd48e6d6
--- /dev/null
+++ b/sys/arch/prep/include/atomic.h
@@ -0,0 +1,3 @@
+/*	$NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $	*/
+
+#include <powerpc/atomic.h>
diff --git a/sys/arch/prep/include/bat.h b/sys/arch/prep/include/bat.h
deleted file mode 100644
index de41d6d9d298..000000000000
--- a/sys/arch/prep/include/bat.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: bat.h,v 1.1 2000/02/29 15:21:26 nonaka Exp $	*/
-
-#include <powerpc/bat.h>
diff --git a/sys/arch/prep/include/cpufunc.h b/sys/arch/prep/include/cpufunc.h
deleted file mode 100644
index 756bd7bec385..000000000000
--- a/sys/arch/prep/include/cpufunc.h
+++ /dev/null
@@ -1 +0,0 @@
-/*	$NetBSD: cpufunc.h,v 1.1 2000/02/29 15:21:27 nonaka Exp $	*/
diff --git a/sys/arch/prep/prep/machdep.c b/sys/arch/prep/prep/machdep.c
index 7842be66611c..d73912240b26 100644
--- a/sys/arch/prep/prep/machdep.c
+++ b/sys/arch/prep/prep/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.50 2003/08/10 11:41:36 tsutsui Exp $	*/
+/*	$NetBSD: machdep.c,v 1.51 2003/10/20 00:12:10 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2003/08/10 11:41:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.51 2003/10/20 00:12:10 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -64,7 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2003/08/10 11:41:36 tsutsui Exp $")
 #include <net/netisr.h>
 
 #include <machine/autoconf.h>
-#include <machine/bat.h>
 #include <machine/bootinfo.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
@@ -74,6 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2003/08/10 11:41:36 tsutsui Exp $")
 #include <machine/residual.h>
 #include <machine/trap.h>
 
+#include <powerpc/oea/bat.h>
+
 #include <dev/cons.h>
 
 #include "com.h"
diff --git a/sys/arch/sandpoint/include/Makefile b/sys/arch/sandpoint/include/Makefile
index 0aa8c31477df..84e9d0f18b39 100644
--- a/sys/arch/sandpoint/include/Makefile
+++ b/sys/arch/sandpoint/include/Makefile
@@ -1,23 +1,10 @@
-#	$NetBSD: Makefile,v 1.15 2003/10/19 18:56:39 matt Exp $
+#	$NetBSD: Makefile,v 1.16 2003/10/20 00:12:10 matt Exp $
 
 INCSDIR= /usr/include/sandpoint
 
-INCS=   ansi.h aout_machdep.h asm.h \
-	bootinfo.h bswap.h bus.h \
-	cdefs.h cpu.h \
+INCS=	bootinfo.h \
 	disklabel.h \
-	elf_machdep.h endian.h endian_machdep.h \
-	float.h fpu.h frame.h \
-	ieee.h ieeefp.h \
-	int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
 	intr.h \
-	kcore.h \
-	limits.h lock.h \
-	math.h mcontext.h \
-	param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h ptrace.h \
-	reg.h reloc.h \
-	setjmp.h signal.h stdarg.h \
-	trap.h types.h \
-	varargs.h vmparam.h
+	vmparam.h
 
-.include <bsd.kinc.mk>
+.include "../../powerpc/include/Makefile"
diff --git a/sys/arch/sandpoint/include/atomic.h b/sys/arch/sandpoint/include/atomic.h
new file mode 100644
index 000000000000..06a5fd48e6d6
--- /dev/null
+++ b/sys/arch/sandpoint/include/atomic.h
@@ -0,0 +1,3 @@
+/*	$NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $	*/
+
+#include <powerpc/atomic.h>
diff --git a/sys/arch/sandpoint/sandpoint/machdep.c b/sys/arch/sandpoint/sandpoint/machdep.c
index 22020d896168..18dfb1452a64 100644
--- a/sys/arch/sandpoint/sandpoint/machdep.c
+++ b/sys/arch/sandpoint/sandpoint/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.28 2003/07/15 03:35:50 lukem Exp $	*/
+/*	$NetBSD: machdep.c,v 1.29 2003/10/20 00:12:11 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2003/07/15 03:35:50 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2003/10/20 00:12:11 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -68,7 +68,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2003/07/15 03:35:50 lukem Exp $");
 
 #include <net/netisr.h>
 
-#include <powerpc/bat.h>
 #include <machine/bus.h>
 #include <machine/db_machdep.h>
 #include <machine/intr.h>
@@ -76,6 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2003/07/15 03:35:50 lukem Exp $");
 #include <machine/powerpc.h>
 #include <machine/trap.h>
 
+#include <powerpc/oea/bat.h>
 #include <powerpc/openpic.h>
 
 #include <ddb/db_extern.h>