diff --git a/sys/arch/prep/isa/paud_isa.c b/sys/arch/prep/isa/paud_isa.c
index dcb3d2b8aed5..99be66accccb 100644
--- a/sys/arch/prep/isa/paud_isa.c
+++ b/sys/arch/prep/isa/paud_isa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: paud_isa.c,v 1.13 2011/06/02 14:12:25 tsutsui Exp $	*/
+/*	$NetBSD: paud_isa.c,v 1.14 2011/07/01 16:57:29 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: paud_isa.c,v 1.13 2011/06/02 14:12:25 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: paud_isa.c,v 1.14 2011/07/01 16:57:29 dyoung Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: paud_isa.c,v 1.13 2011/06/02 14:12:25 tsutsui Exp $"
 #include <sys/device.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <sys/audioio.h>
diff --git a/sys/arch/prep/pci/gten.c b/sys/arch/prep/pci/gten.c
index d4e04f8ad409..74c270f0d19f 100644
--- a/sys/arch/prep/pci/gten.c
+++ b/sys/arch/prep/pci/gten.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gten.c,v 1.19 2011/06/18 08:08:29 matt Exp $	*/
+/*	$NetBSD: gten.c,v 1.20 2011/07/01 16:56:52 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gten.c,v 1.19 2011/06/18 08:08:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gten.c,v 1.20 2011/07/01 16:56:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: gten.c,v 1.19 2011/06/18 08:08:29 matt Exp $");
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/rasops/rasops.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/gtenvar.h>
 
 static	int	gten_match(device_t, cfdata_t, void *);
diff --git a/sys/arch/prep/pci/pceb.c b/sys/arch/prep/pci/pceb.c
index 2ffbbbef3612..96b79cabaee1 100644
--- a/sys/arch/prep/pci/pceb.c
+++ b/sys/arch/prep/pci/pceb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pceb.c,v 1.5 2011/06/18 08:08:29 matt Exp $	*/
+/*	$NetBSD: pceb.c,v 1.6 2011/07/01 16:56:52 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.5 2011/06/18 08:08:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.6 2011/07/01 16:56:52 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/isa/isavar.h>
 #include <dev/eisa/eisavar.h>
diff --git a/sys/arch/prep/pci/pci_machdep.c b/sys/arch/prep/pci/pci_machdep.c
index 008bda38ab3d..325d6ddc4144 100644
--- a/sys/arch/prep/pci/pci_machdep.c
+++ b/sys/arch/prep/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.36 2011/06/30 00:53:00 matt Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.37 2011/07/01 16:56:52 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.36 2011/06/30 00:53:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.37 2011/07/01 16:56:52 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.36 2011/06/30 00:53:00 matt Exp $"
 #include <uvm/uvm_extern.h>
 
 #define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/platform.h>
 #include <machine/pnp.h>
diff --git a/sys/arch/prep/pci/prep_pciconf_direct.c b/sys/arch/prep/pci/prep_pciconf_direct.c
index 1a7029145970..b90441f93ed9 100644
--- a/sys/arch/prep/pci/prep_pciconf_direct.c
+++ b/sys/arch/prep/pci/prep_pciconf_direct.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: prep_pciconf_direct.c,v 1.7 2011/06/18 08:08:29 matt Exp $	*/
+/*	$NetBSD: prep_pciconf_direct.c,v 1.8 2011/07/01 16:56:52 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2002 Klaus J. Klein.  All rights reserved.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: prep_pciconf_direct.c,v 1.7 2011/06/18 08:08:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: prep_pciconf_direct.c,v 1.8 2011/07/01 16:56:52 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: prep_pciconf_direct.c,v 1.7 2011/06/18 08:08:29 matt
 #include <uvm/uvm_extern.h>
 
 #define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/platform.h>
 
diff --git a/sys/arch/prep/pnpbus/fdc_pnpbus.c b/sys/arch/prep/pnpbus/fdc_pnpbus.c
index cec3075afe26..0a418b751ee5 100644
--- a/sys/arch/prep/pnpbus/fdc_pnpbus.c
+++ b/sys/arch/prep/pnpbus/fdc_pnpbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fdc_pnpbus.c,v 1.2 2008/04/29 06:53:02 martin Exp $	*/
+/*	$NetBSD: fdc_pnpbus.c,v 1.3 2011/07/01 16:55:42 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbus.c,v 1.2 2008/04/29 06:53:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbus.c,v 1.3 2011/07/01 16:55:42 dyoung Exp $");
 
 #include "rnd.h"
 
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_pnpbus.c,v 1.2 2008/04/29 06:53:02 martin Exp $"
 #include <sys/rnd.h>
 #endif
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/isa_machdep.h>
 
diff --git a/sys/arch/prep/pnpbus/if_we_pnpbus.c b/sys/arch/prep/pnpbus/if_we_pnpbus.c
index 08d5adccd61d..9134833a86b4 100644
--- a/sys/arch/prep/pnpbus/if_we_pnpbus.c
+++ b/sys/arch/prep/pnpbus/if_we_pnpbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_we_pnpbus.c,v 1.7 2011/06/18 08:08:29 matt Exp $	*/
+/*	$NetBSD: if_we_pnpbus.c,v 1.8 2011/07/01 16:55:42 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_we_pnpbus.c,v 1.7 2011/06/18 08:08:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_we_pnpbus.c,v 1.8 2011/07/01 16:55:42 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_we_pnpbus.c,v 1.7 2011/06/18 08:08:29 matt Exp $"
 
 #include <net/if_ether.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/isa_machdep.h>
 #include <machine/residual.h>
diff --git a/sys/arch/prep/pnpbus/mcclock_pnpbus.c b/sys/arch/prep/pnpbus/mcclock_pnpbus.c
index 05cf89976aec..de367c7e386c 100644
--- a/sys/arch/prep/pnpbus/mcclock_pnpbus.c
+++ b/sys/arch/prep/pnpbus/mcclock_pnpbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_pnpbus.c,v 1.9 2008/04/28 20:23:33 martin Exp $ */
+/* $NetBSD: mcclock_pnpbus.c,v 1.10 2011/07/01 16:55:42 dyoung Exp $ */
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock_pnpbus.c,v 1.9 2008/04/28 20:23:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_pnpbus.c,v 1.10 2011/07/01 16:55:42 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_pnpbus.c,v 1.9 2008/04/28 20:23:33 martin Ex
 #include <sys/device.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/isa_machdep.h>
 #include <machine/residual.h>
diff --git a/sys/arch/prep/pnpbus/mkclock_pnpbus.c b/sys/arch/prep/pnpbus/mkclock_pnpbus.c
index c9f81f700e92..7bc794f847a5 100644
--- a/sys/arch/prep/pnpbus/mkclock_pnpbus.c
+++ b/sys/arch/prep/pnpbus/mkclock_pnpbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkclock_pnpbus.c,v 1.5 2008/04/28 20:23:33 martin Exp $ */
+/* $NetBSD: mkclock_pnpbus.c,v 1.6 2011/07/01 16:55:42 dyoung Exp $ */
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -42,14 +42,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mkclock_pnpbus.c,v 1.5 2008/04/28 20:23:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mkclock_pnpbus.c,v 1.6 2011/07/01 16:55:42 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/residual.h>
 #include <machine/chpidpnp.h>
 
diff --git a/sys/arch/prep/pnpbus/pnpbus.c b/sys/arch/prep/pnpbus/pnpbus.c
index 4df520f2f5b2..637324775274 100644
--- a/sys/arch/prep/pnpbus/pnpbus.c
+++ b/sys/arch/prep/pnpbus/pnpbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pnpbus.c,v 1.10 2011/06/18 08:08:30 matt Exp $	*/
+/*	$NetBSD: pnpbus.c,v 1.11 2011/07/01 16:55:42 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnpbus.c,v 1.10 2011/06/18 08:08:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnpbus.c,v 1.11 2011/07/01 16:55:42 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: pnpbus.c,v 1.10 2011/06/18 08:08:30 matt Exp $");
 #include <sys/extent.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/pio.h>
 #include <machine/intr.h>
 #include <machine/platform.h>
diff --git a/sys/arch/prep/pnpbus/pnpbusvar.h b/sys/arch/prep/pnpbus/pnpbusvar.h
index 1e50abd1415c..1703c9e5c2e4 100644
--- a/sys/arch/prep/pnpbus/pnpbusvar.h
+++ b/sys/arch/prep/pnpbus/pnpbusvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pnpbusvar.h,v 1.7 2011/06/18 08:08:30 matt Exp $	*/
+/*	$NetBSD: pnpbusvar.h,v 1.8 2011/07/01 16:55:42 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #define _PREP_PNPBUSVAR_H_
 
 #include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/residual.h>
 
 struct pnpbus_mem {
diff --git a/sys/arch/prep/pnpbus/wdc_pnpbus.c b/sys/arch/prep/pnpbus/wdc_pnpbus.c
index aa305271850d..cb724bec2fb0 100644
--- a/sys/arch/prep/pnpbus/wdc_pnpbus.c
+++ b/sys/arch/prep/pnpbus/wdc_pnpbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_pnpbus.c,v 1.9 2008/04/28 20:23:33 martin Exp $	*/
+/*	$NetBSD: wdc_pnpbus.c,v 1.10 2011/07/01 16:55:42 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_pnpbus.c,v 1.9 2008/04/28 20:23:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pnpbus.c,v 1.10 2011/07/01 16:55:42 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: wdc_pnpbus.c,v 1.9 2008/04/28 20:23:33 martin Exp $"
 #include <sys/device.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/isa_machdep.h>
 #include <machine/residual.h>