diff --git a/sys/arch/cobalt/cobalt/console.c b/sys/arch/cobalt/cobalt/console.c
index 676cece10532..91bc07e8aca6 100644
--- a/sys/arch/cobalt/cobalt/console.c
+++ b/sys/arch/cobalt/cobalt/console.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: console.c,v 1.11 2008/03/27 15:21:46 tsutsui Exp $	*/
+/*	$NetBSD: console.c,v 1.12 2011/07/01 20:36:42 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,14 +26,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.11 2008/03/27 15:21:46 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.12 2011/07/01 20:36:42 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/nvram.h>
 #include <machine/bootinfo.h>
 
diff --git a/sys/arch/cobalt/cobalt/interrupt.c b/sys/arch/cobalt/cobalt/interrupt.c
index 9e6c2b654793..bef8afdf1e0b 100644
--- a/sys/arch/cobalt/cobalt/interrupt.c
+++ b/sys/arch/cobalt/cobalt/interrupt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: interrupt.c,v 1.6 2011/02/20 07:54:10 matt Exp $	*/
+/*	$NetBSD: interrupt.c,v 1.7 2011/07/01 20:36:42 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2006 Izumi Tsutsui.  All rights reserved.
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.6 2011/02/20 07:54:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.7 2011/07/01 20:36:42 dyoung Exp $");
 
 #define __INTR_PRIVATE
 
@@ -89,7 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.6 2011/02/20 07:54:10 matt Exp $");
 #include <sys/intr.h>
 
 #include <mips/mips3_clock.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/ic/i8259reg.h>
 #include <dev/isa/isareg.h>
diff --git a/sys/arch/cobalt/dev/com_mainbus.c b/sys/arch/cobalt/dev/com_mainbus.c
index 2a63d08f526c..192daa304792 100644
--- a/sys/arch/cobalt/dev/com_mainbus.c
+++ b/sys/arch/cobalt/dev/com_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_mainbus.c,v 1.17 2008/03/27 15:21:46 tsutsui Exp $	*/
+/*	$NetBSD: com_mainbus.c,v 1.18 2011/07/01 20:36:42 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.17 2008/03/27 15:21:46 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.18 2011/07/01 20:36:42 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.17 2008/03/27 15:21:46 tsutsui Exp
 
 #include <machine/autoconf.h>
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/ic/comreg.h>
 #include <dev/ic/comvar.h>
diff --git a/sys/arch/cobalt/dev/gt.c b/sys/arch/cobalt/dev/gt.c
index 9b612adaeb64..f15125bc7eb5 100644
--- a/sys/arch/cobalt/dev/gt.c
+++ b/sys/arch/cobalt/dev/gt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gt.c,v 1.25 2011/05/17 17:34:48 dyoung Exp $	*/
+/*	$NetBSD: gt.c,v 1.26 2011/07/01 20:36:42 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.25 2011/05/17 17:34:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.26 2011/07/01 20:36:42 dyoung Exp $");
 
 #include "opt_pci.h"
 #include "pci.h"
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.25 2011/05/17 17:34:48 dyoung Exp $");
 #include <sys/extent.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <mips/cache.h>
diff --git a/sys/arch/cobalt/dev/mcclock.c b/sys/arch/cobalt/dev/mcclock.c
index dca4f8086b42..b3dced6a5e36 100644
--- a/sys/arch/cobalt/dev/mcclock.c
+++ b/sys/arch/cobalt/dev/mcclock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mcclock.c,v 1.4 2008/03/29 05:42:45 tsutsui Exp $	*/
+/*	$NetBSD: mcclock.c,v 1.5 2011/07/01 20:36:42 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.4 2008/03/29 05:42:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.5 2011/07/01 20:36:42 dyoung Exp $");
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.4 2008/03/29 05:42:45 tsutsui Exp $");
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/clock_subr.h>
 #include <dev/ic/mc146818reg.h>
diff --git a/sys/arch/cobalt/dev/panel.c b/sys/arch/cobalt/dev/panel.c
index 3ad19098c933..d7769b5cf16c 100644
--- a/sys/arch/cobalt/dev/panel.c
+++ b/sys/arch/cobalt/dev/panel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: panel.c,v 1.21 2011/05/03 09:15:20 tsutsui Exp $ */
+/* $NetBSD: panel.c,v 1.22 2011/07/01 20:36:42 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002 Dennis I. Chernoivanov
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: panel.c,v 1.21 2011/05/03 09:15:20 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: panel.c,v 1.22 2011/07/01 20:36:42 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: panel.c,v 1.21 2011/05/03 09:15:20 tsutsui Exp $");
 #include <sys/select.h>
 #include <sys/reboot.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 
 #include <dev/ic/hd44780reg.h>
diff --git a/sys/arch/cobalt/pci/pchb.c b/sys/arch/cobalt/pci/pchb.c
index 74829f0f7dec..cc0ff5445c53 100644
--- a/sys/arch/cobalt/pci/pchb.c
+++ b/sys/arch/cobalt/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pchb.c,v 1.10 2008/05/09 10:59:55 tsutsui Exp $	*/
+/*	$NetBSD: pchb.c,v 1.11 2011/07/01 20:37:08 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,14 +26,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.10 2008/05/09 10:59:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.11 2011/07/01 20:37:08 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/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/arch/cobalt/pci/pci_machdep.c b/sys/arch/cobalt/pci/pci_machdep.c
index 399205cffc72..79a779fca9b4 100644
--- a/sys/arch/cobalt/pci/pci_machdep.c
+++ b/sys/arch/cobalt/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.30 2011/05/03 09:15:20 tsutsui Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.31 2011/07/01 20:37:08 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.30 2011/05/03 09:15:20 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.31 2011/07/01 20:37:08 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.30 2011/05/03 09:15:20 tsutsui Exp
 #include <sys/extent.h>
 
 #define _COBALT_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/cobalt/pci/pcib.c b/sys/arch/cobalt/pci/pcib.c
index b9efa5f9d07e..8e547c2ac5f2 100644
--- a/sys/arch/cobalt/pci/pcib.c
+++ b/sys/arch/cobalt/pci/pcib.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcib.c,v 1.19 2008/05/09 10:59:55 tsutsui Exp $	*/
+/*	$NetBSD: pcib.c,v 1.20 2011/07/01 20:37:08 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.19 2008/05/09 10:59:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.20 2011/07/01 20:37:08 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.19 2008/05/09 10:59:55 tsutsui Exp $");
 #include <sys/malloc.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/autoconf.h>
 
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/evbarm/adi_brh/becc_mainbus.c b/sys/arch/evbarm/adi_brh/becc_mainbus.c
index 8a31598a64bb..314e207afb70 100644
--- a/sys/arch/evbarm/adi_brh/becc_mainbus.c
+++ b/sys/arch/evbarm/adi_brh/becc_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: becc_mainbus.c,v 1.3 2005/12/11 12:17:06 christos Exp $	*/
+/*	$NetBSD: becc_mainbus.c,v 1.4 2011/07/01 20:38:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -42,14 +42,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: becc_mainbus.c,v 1.3 2005/12/11 12:17:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: becc_mainbus.c,v 1.4 2011/07/01 20:38:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/adi_brh/brhreg.h>
 #include <evbarm/adi_brh/brhvar.h>
diff --git a/sys/arch/evbarm/adi_brh/brh_7seg.c b/sys/arch/evbarm/adi_brh/brh_7seg.c
index 4e6dae5c3124..f30c988543f9 100644
--- a/sys/arch/evbarm/adi_brh/brh_7seg.c
+++ b/sys/arch/evbarm/adi_brh/brh_7seg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: brh_7seg.c,v 1.4 2005/12/24 20:06:59 perry Exp $	*/
+/*	$NetBSD: brh_7seg.c,v 1.5 2011/07/01 20:38:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,12 +40,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brh_7seg.c,v 1.4 2005/12/24 20:06:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_7seg.c,v 1.5 2011/07/01 20:38:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/adi_brh/brhreg.h>
 #include <evbarm/adi_brh/brhvar.h>
diff --git a/sys/arch/evbarm/adi_brh/brh_machdep.c b/sys/arch/evbarm/adi_brh/brh_machdep.c
index d5a17e408392..1a675113ed21 100644
--- a/sys/arch/evbarm/adi_brh/brh_machdep.c
+++ b/sys/arch/evbarm/adi_brh/brh_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: brh_machdep.c,v 1.37 2011/06/30 20:09:22 wiz Exp $	*/
+/*	$NetBSD: brh_machdep.c,v 1.38 2011/07/01 20:38:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.37 2011/06/30 20:09:22 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.38 2011/07/01 20:38:16 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
@@ -98,7 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.37 2011/06/30 20:09:22 wiz Exp $")
 #include <ddb/db_extern.h>
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/adi_brh/com_obio.c b/sys/arch/evbarm/adi_brh/com_obio.c
index 097f6d288c22..8f6e4c5b867b 100644
--- a/sys/arch/evbarm/adi_brh/com_obio.c
+++ b/sys/arch/evbarm/adi_brh/com_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.6 2008/04/28 20:23:16 martin Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.7 2011/07/01 20:38:16 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.6 2008/04/28 20:23:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.7 2011/07/01 20:38:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/beccreg.h>
 #include <arm/xscale/beccvar.h>
diff --git a/sys/arch/evbarm/adi_brh/obio.c b/sys/arch/evbarm/adi_brh/obio.c
index 67f951cf292e..a0370e9c1b11 100644
--- a/sys/arch/evbarm/adi_brh/obio.c
+++ b/sys/arch/evbarm/adi_brh/obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.10 2011/06/06 16:29:15 matt Exp $	*/
+/*	$NetBSD: obio.c,v 1.11 2011/07/01 20:38:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -41,14 +41,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10 2011/06/06 16:29:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.11 2011/07/01 20:38:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/beccreg.h>
 #include <arm/xscale/beccvar.h>
diff --git a/sys/arch/evbarm/adi_brh/obio_space.c b/sys/arch/evbarm/adi_brh/obio_space.c
index bcd4e2cca12d..47eeb32c195f 100644
--- a/sys/arch/evbarm/adi_brh/obio_space.c
+++ b/sys/arch/evbarm/adi_brh/obio_space.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio_space.c,v 1.6 2009/11/07 07:27:42 cegger Exp $	*/
+/*	$NetBSD: obio_space.c,v 1.7 2011/07/01 20:38:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.6 2009/11/07 07:27:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.7 2011/07/01 20:38:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(obio);
diff --git a/sys/arch/evbarm/armadillo/armadillo9_com.c b/sys/arch/evbarm/armadillo/armadillo9_com.c
index 3f6473f626bf..9436b0083085 100644
--- a/sys/arch/evbarm/armadillo/armadillo9_com.c
+++ b/sys/arch/evbarm/armadillo/armadillo9_com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: armadillo9_com.c,v 1.3 2009/10/21 14:15:51 rmind Exp $ */
+/*	$NetBSD: armadillo9_com.c,v 1.4 2011/07/01 20:38:16 dyoung Exp $ */
 /*
  * Copyright (c) 2002
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_com.c,v 1.3 2009/10/21 14:15:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_com.c,v 1.4 2011/07/01 20:38:16 dyoung Exp $");
 
 /* Front-end of epcom */
 
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: armadillo9_com.c,v 1.3 2009/10/21 14:15:51 rmind Exp
 #include <sys/termios.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/ep93xx/epcomreg.h>
 #include <arm/ep93xx/epcomvar.h>
diff --git a/sys/arch/evbarm/armadillo/armadillo9_machdep.c b/sys/arch/evbarm/armadillo/armadillo9_machdep.c
index 860cd3270376..ec77e13131e3 100644
--- a/sys/arch/evbarm/armadillo/armadillo9_machdep.c
+++ b/sys/arch/evbarm/armadillo/armadillo9_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: armadillo9_machdep.c,v 1.20 2011/06/30 20:09:22 wiz Exp $	*/
+/*	$NetBSD: armadillo9_machdep.c,v 1.21 2011/07/01 20:38:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,7 +110,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.20 2011/06/30 20:09:22 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.21 2011/07/01 20:38:16 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -141,7 +141,7 @@ __KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.20 2011/06/30 20:09:22 wiz
 #define	DRAM_BLOCKS	4
 #include <machine/bootconfig.h>
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/beagle/beagle_machdep.c b/sys/arch/evbarm/beagle/beagle_machdep.c
index 3f6a92289e90..bbf2a1267b3b 100644
--- a/sys/arch/evbarm/beagle/beagle_machdep.c
+++ b/sys/arch/evbarm/beagle/beagle_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: beagle_machdep.c,v 1.12 2011/06/30 20:09:22 wiz Exp $ */
+/*	$NetBSD: beagle_machdep.c,v 1.13 2011/07/01 20:38:16 dyoung Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.12 2011/06/30 20:09:22 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.13 2011/07/01 20:38:16 dyoung Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -161,7 +161,7 @@ __KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.12 2011/06/30 20:09:22 wiz Exp
 #endif
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/armreg.h>
diff --git a/sys/arch/evbarm/cp3100/cp3100_leds.c b/sys/arch/evbarm/cp3100/cp3100_leds.c
index 19098a2ecb9c..2c5310fb6d30 100644
--- a/sys/arch/evbarm/cp3100/cp3100_leds.c
+++ b/sys/arch/evbarm/cp3100/cp3100_leds.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cp3100_leds.c,v 1.1 2006/11/08 23:49:02 scw Exp $	*/
+/*	$NetBSD: cp3100_leds.c,v 1.2 2011/07/01 20:38:16 dyoung Exp $	*/
 
 /*
  * Copyright 2006 Wasabi Systems, Inc.
@@ -36,12 +36,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cp3100_leds.c,v 1.1 2006/11/08 23:49:02 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cp3100_leds.c,v 1.2 2011/07/01 20:38:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/iq80321/iq80321reg.h>
 #include <evbarm/iq80321/iq80321var.h>
diff --git a/sys/arch/evbarm/cp3100/cp3100_pci.c b/sys/arch/evbarm/cp3100/cp3100_pci.c
index f4003b66d63a..bb2fcd443528 100644
--- a/sys/arch/evbarm/cp3100/cp3100_pci.c
+++ b/sys/arch/evbarm/cp3100/cp3100_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cp3100_pci.c,v 1.2 2011/04/04 20:37:47 dyoung Exp $	*/
+/*	$NetBSD: cp3100_pci.c,v 1.3 2011/07/01 20:38:16 dyoung Exp $	*/
 
 /*
  * Copyright 2006 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cp3100_pci.c,v 1.2 2011/04/04 20:37:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cp3100_pci.c,v 1.3 2011/07/01 20:38:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/iq80321/iq80321reg.h>
 #include <evbarm/iq80321/iq80321var.h>
diff --git a/sys/arch/evbarm/devkit8000/if_dme_gpmc.c b/sys/arch/evbarm/devkit8000/if_dme_gpmc.c
index aeace4298efc..04896b39ff52 100644
--- a/sys/arch/evbarm/devkit8000/if_dme_gpmc.c
+++ b/sys/arch/evbarm/devkit8000/if_dme_gpmc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_dme_gpmc.c,v 1.1 2010/09/08 22:49:49 ahoka Exp $	*/
+/*	$NetBSD: if_dme_gpmc.c,v 1.2 2011/07/01 20:38:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2010 Adam Hoka
@@ -65,7 +65,7 @@
 #include <net/if_ether.h>
 #include <net/if_media.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arch/arm/omap/omap2_gpmcvar.h>
diff --git a/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c b/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c
index 8a29cd8009ac..da20a583f311 100644
--- a/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c
+++ b/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_kmkbd.c,v 1.11 2010/03/13 11:26:42 bsh Exp $ */
+/* $NetBSD: g42xxeb_kmkbd.c,v 1.12 2011/07/01 20:38:17 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2002, 2003, 2005 Genetec corp.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: g42xxeb_kmkbd.c,v 1.11 2010/03/13 11:26:42 bsh Exp $" );
+__KERNEL_RCSID(0, "$NetBSD: g42xxeb_kmkbd.c,v 1.12 2011/07/01 20:38:17 dyoung Exp $" );
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: g42xxeb_kmkbd.c,v 1.11 2010/03/13 11:26:42 bsh Exp $
 #include <sys/callout.h>
 #include <sys/kernel.h>			/* for hz */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wskbdvar.h>
diff --git a/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c b/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c
index 7d1f08a3fa0e..92ab2d031144 100644
--- a/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c
+++ b/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_lcd.c,v 1.13 2010/03/13 11:15:52 bsh Exp $ */
+/* $NetBSD: g42xxeb_lcd.c,v 1.14 2011/07/01 20:38:17 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2001, 2002, 2005 Genetec corp.
@@ -44,7 +44,7 @@
 #include <dev/wscons/wsdisplayvar.h> 
 #include <dev/wscons/wscons_callbacks.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <arm/sa11x0/sa11x0_var.h>
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0reg.h>
diff --git a/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c b/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
index f506cbbfab23..85835f4e813f 100644
--- a/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
+++ b/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: g42xxeb_machdep.c,v 1.23 2011/06/30 20:09:24 wiz Exp $ */
+/*	$NetBSD: g42xxeb_machdep.c,v 1.24 2011/07/01 20:38:17 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004, 2005  Genetec Corporation.  
@@ -139,7 +139,7 @@
 #endif
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/g42xxeb/g42xxeb_var.h b/sys/arch/evbarm/g42xxeb/g42xxeb_var.h
index f1547f5c43b3..88daabd211cb 100644
--- a/sys/arch/evbarm/g42xxeb/g42xxeb_var.h
+++ b/sys/arch/evbarm/g42xxeb/g42xxeb_var.h
@@ -35,7 +35,7 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <evbarm/g42xxeb/g42xxeb_reg.h>
 
 
diff --git a/sys/arch/evbarm/g42xxeb/gb225.c b/sys/arch/evbarm/g42xxeb/gb225.c
index 800cd5cd7c5e..564a462308c9 100644
--- a/sys/arch/evbarm/g42xxeb/gb225.c
+++ b/sys/arch/evbarm/g42xxeb/gb225.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gb225.c,v 1.9 2010/06/07 15:17:24 bsh Exp $ */
+/*	$NetBSD: gb225.c,v 1.10 2011/07/01 20:38:17 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003  Genetec corp.  All rights reserved.
@@ -37,7 +37,7 @@
 #include <sys/reboot.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <arm/cpufunc.h>
 
diff --git a/sys/arch/evbarm/g42xxeb/gb225_pcic.c b/sys/arch/evbarm/g42xxeb/gb225_pcic.c
index 22df7ddc530d..87942db91d23 100644
--- a/sys/arch/evbarm/g42xxeb/gb225_pcic.c
+++ b/sys/arch/evbarm/g42xxeb/gb225_pcic.c
@@ -39,7 +39,7 @@
 #include <sys/malloc.h>
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/pcmcia/pcmciareg.h>
diff --git a/sys/arch/evbarm/g42xxeb/gb225_slhci.c b/sys/arch/evbarm/g42xxeb/gb225_slhci.c
index 388f525d2224..790ac3c940ad 100644
--- a/sys/arch/evbarm/g42xxeb/gb225_slhci.c
+++ b/sys/arch/evbarm/g42xxeb/gb225_slhci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gb225_slhci.c,v 1.5 2010/06/07 15:17:24 bsh Exp $ */
+/*	$NetBSD: gb225_slhci.c,v 1.6 2011/07/01 20:38:17 dyoung Exp $ */
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 
 #include <dev/usb/usb.h>
diff --git a/sys/arch/evbarm/g42xxeb/if_ne_obio.c b/sys/arch/evbarm/g42xxeb/if_ne_obio.c
index bf2c6a29fe26..969baa4f0fb1 100644
--- a/sys/arch/evbarm/g42xxeb/if_ne_obio.c
+++ b/sys/arch/evbarm/g42xxeb/if_ne_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ne_obio.c,v 1.6 2008/03/16 16:08:57 he Exp $ */
+/*	$NetBSD: if_ne_obio.c,v 1.7 2011/07/01 20:38:17 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003  Genetec corp.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_obio.c,v 1.6 2008/03/16 16:08:57 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_obio.c,v 1.7 2011/07/01 20:38:17 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_obio.c,v 1.6 2008/03/16 16:08:57 he Exp $");
 #include <net/if_media.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/arch/evbarm/g42xxeb/obio.c b/sys/arch/evbarm/g42xxeb/obio.c
index 7fefe0e16cb9..895b4b15dbf6 100644
--- a/sys/arch/evbarm/g42xxeb/obio.c
+++ b/sys/arch/evbarm/g42xxeb/obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.9 2010/06/07 15:17:24 bsh Exp $ */
+/*	$NetBSD: obio.c,v 1.10 2011/07/01 20:38:17 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec corp.  All rights reserved.
@@ -37,7 +37,7 @@
 #include <sys/reboot.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <arm/cpufunc.h>
 
diff --git a/sys/arch/evbarm/gemini/gemini_machdep.c b/sys/arch/evbarm/gemini/gemini_machdep.c
index 1990bc176a37..1a9d8112e296 100644
--- a/sys/arch/evbarm/gemini/gemini_machdep.c
+++ b/sys/arch/evbarm/gemini/gemini_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gemini_machdep.c,v 1.17 2011/06/30 20:09:24 wiz Exp $	*/
+/*	$NetBSD: gemini_machdep.c,v 1.18 2011/07/01 20:39:34 dyoung Exp $	*/
 
 /* adapted from:
  *	NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -129,7 +129,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.17 2011/06/30 20:09:24 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.18 2011/07/01 20:39:34 dyoung Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -166,7 +166,7 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.17 2011/06/30 20:09:24 wiz Exp
 #endif
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/armreg.h>
diff --git a/sys/arch/evbarm/gumstix/gumstix_machdep.c b/sys/arch/evbarm/gumstix/gumstix_machdep.c
index 94ef30c7b75e..6e65c902442d 100644
--- a/sys/arch/evbarm/gumstix/gumstix_machdep.c
+++ b/sys/arch/evbarm/gumstix/gumstix_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gumstix_machdep.c,v 1.36 2011/06/30 20:09:24 wiz Exp $ */
+/*	$NetBSD: gumstix_machdep.c,v 1.37 2011/07/01 20:39:34 dyoung Exp $ */
 /*
  * Copyright (C) 2005, 2006, 2007  WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -165,7 +165,7 @@
 
 #include <machine/autoconf.h>
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/db_machdep.h>
 #include <machine/frame.h>
diff --git a/sys/arch/evbarm/gumstix/gumstixvar.h b/sys/arch/evbarm/gumstix/gumstixvar.h
index a078691721c8..67514c538d64 100644
--- a/sys/arch/evbarm/gumstix/gumstixvar.h
+++ b/sys/arch/evbarm/gumstix/gumstixvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: gumstixvar.h,v 1.5 2009/11/22 12:05:14 kiyohara Exp $ */
+/*	$NetBSD: gumstixvar.h,v 1.6 2011/07/01 20:39:34 dyoung Exp $ */
 /*
  * Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -36,7 +36,7 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <arm/xscale/pxa2x0_gpio.h>
 #include <evbarm/gumstix/gumstixreg.h>
 
diff --git a/sys/arch/evbarm/gumstix/gxlcd.c b/sys/arch/evbarm/gumstix/gxlcd.c
index 68b3253c404f..732892c6a314 100644
--- a/sys/arch/evbarm/gumstix/gxlcd.c
+++ b/sys/arch/evbarm/gumstix/gxlcd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gxlcd.c,v 1.2 2009/11/21 08:33:50 kiyohara Exp $	*/
+/*	$NetBSD: gxlcd.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003  Genetec Corporation.  All rights reserved.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gxlcd.c,v 1.2 2009/11/21 08:33:50 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gxlcd.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: gxlcd.c,v 1.2 2009/11/21 08:33:50 kiyohara Exp $");
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wscons_callbacks.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0reg.h>
diff --git a/sys/arch/evbarm/gumstix/gxmci.c b/sys/arch/evbarm/gumstix/gxmci.c
index e14a30e36da2..84cec1396340 100644
--- a/sys/arch/evbarm/gumstix/gxmci.c
+++ b/sys/arch/evbarm/gumstix/gxmci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gxmci.c,v 1.2 2009/08/09 06:12:34 kiyohara Exp $	*/
+/*	$NetBSD: gxmci.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2007 NONAKA Kimihiro <nonaka@netbsd.org>
@@ -27,13 +27,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gxmci.c,v 1.2 2009/08/09 06:12:34 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gxmci.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/xscale/pxa2x0cpu.h>
diff --git a/sys/arch/evbarm/gumstix/gxpcic.c b/sys/arch/evbarm/gumstix/gxpcic.c
index 9d9eb3d5410f..89df7c6e1e1d 100644
--- a/sys/arch/evbarm/gumstix/gxpcic.c
+++ b/sys/arch/evbarm/gumstix/gxpcic.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gxpcic.c,v 1.11 2009/08/09 07:10:13 kiyohara Exp $ */
+/*	$NetBSD: gxpcic.c,v 1.12 2011/07/01 20:39:34 dyoung Exp $ */
 /*
  * Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -71,7 +71,7 @@
 #include <sys/malloc.h>
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/pcmcia/pcmciareg.h>
diff --git a/sys/arch/evbarm/gumstix/if_sm_gxio.c b/sys/arch/evbarm/gumstix/if_sm_gxio.c
index 3f5932498fc3..5be9529fc581 100644
--- a/sys/arch/evbarm/gumstix/if_sm_gxio.c
+++ b/sys/arch/evbarm/gumstix/if_sm_gxio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sm_gxio.c,v 1.9 2010/08/28 04:33:00 kiyohara Exp $ */
+/*	$NetBSD: if_sm_gxio.c,v 1.10 2011/07/01 20:39:34 dyoung Exp $ */
 /*
  * Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_gxio.c,v 1.9 2010/08/28 04:33:00 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_gxio.c,v 1.10 2011/07/01 20:39:34 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_gxio.c,v 1.9 2010/08/28 04:33:00 kiyohara Exp
 #include <net/if_media.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/arch/evbarm/hdl_g/btn_obio.c b/sys/arch/evbarm/hdl_g/btn_obio.c
index 35f4fa69fa53..58bb06a6f6d6 100644
--- a/sys/arch/evbarm/hdl_g/btn_obio.c
+++ b/sys/arch/evbarm/hdl_g/btn_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: btn_obio.c,v 1.1 2006/04/16 02:22:33 nonaka Exp $	*/
+/*	$NetBSD: btn_obio.c,v 1.2 2011/07/01 20:39:34 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006 NONAKA Kimihiro
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btn_obio.c,v 1.1 2006/04/16 02:22:33 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btn_obio.c,v 1.2 2011/07/01 20:39:34 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: btn_obio.c,v 1.1 2006/04/16 02:22:33 nonaka Exp $");
 
 #include <arm/xscale/i80321var.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/sysmon/sysmonvar.h>
diff --git a/sys/arch/evbarm/hdl_g/com_obio.c b/sys/arch/evbarm/hdl_g/com_obio.c
index 6dde122f7ae1..887ffce705dd 100644
--- a/sys/arch/evbarm/hdl_g/com_obio.c
+++ b/sys/arch/evbarm/hdl_g/com_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.4 2008/04/28 20:23:16 martin Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.5 2011/07/01 20:39:34 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.4 2008/04/28 20:23:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.5 2011/07/01 20:39:34 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/i80321var.h>
 
diff --git a/sys/arch/evbarm/hdl_g/hdlg_machdep.c b/sys/arch/evbarm/hdl_g/hdlg_machdep.c
index 4d2489f27890..0e269ee719db 100644
--- a/sys/arch/evbarm/hdl_g/hdlg_machdep.c
+++ b/sys/arch/evbarm/hdl_g/hdlg_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hdlg_machdep.c,v 1.15 2011/06/30 20:09:24 wiz Exp $	*/
+/*	$NetBSD: hdlg_machdep.c,v 1.16 2011/07/01 20:39:34 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.15 2011/06/30 20:09:24 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.16 2011/07/01 20:39:34 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -99,7 +99,7 @@ __KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.15 2011/06/30 20:09:24 wiz Exp $"
 #include <ddb/db_extern.h>
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/hdl_g/hdlg_pci.c b/sys/arch/evbarm/hdl_g/hdlg_pci.c
index 67c8379e87fb..76dd54babb98 100644
--- a/sys/arch/evbarm/hdl_g/hdlg_pci.c
+++ b/sys/arch/evbarm/hdl_g/hdlg_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hdlg_pci.c,v 1.2 2011/04/04 20:37:47 dyoung Exp $	*/
+/*	$NetBSD: hdlg_pci.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -36,14 +36,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdlg_pci.c,v 1.2 2011/04/04 20:37:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdlg_pci.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/hdl_g/hdlgreg.h>
 #include <evbarm/hdl_g/hdlgvar.h>
diff --git a/sys/arch/evbarm/hdl_g/i80321_mainbus.c b/sys/arch/evbarm/hdl_g/i80321_mainbus.c
index ebd855054df3..eb76119ea89b 100644
--- a/sys/arch/evbarm/hdl_g/i80321_mainbus.c
+++ b/sys/arch/evbarm/hdl_g/i80321_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: i80321_mainbus.c,v 1.1 2006/04/16 02:22:33 nonaka Exp $	*/
+/*	$NetBSD: i80321_mainbus.c,v 1.2 2011/07/01 20:39:34 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -36,14 +36,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80321_mainbus.c,v 1.1 2006/04/16 02:22:33 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80321_mainbus.c,v 1.2 2011/07/01 20:39:34 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/hdl_g/hdlgreg.h>
 #include <evbarm/hdl_g/hdlgvar.h>
diff --git a/sys/arch/evbarm/hdl_g/obio.c b/sys/arch/evbarm/hdl_g/obio.c
index 22a1f13b4784..fd723474c40f 100644
--- a/sys/arch/evbarm/hdl_g/obio.c
+++ b/sys/arch/evbarm/hdl_g/obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.2 2011/06/06 16:29:15 matt Exp $	*/
+/*	$NetBSD: obio.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -36,14 +36,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.2 2011/06/06 16:29:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/i80321reg.h>
 
diff --git a/sys/arch/evbarm/hdl_g/obio_space.c b/sys/arch/evbarm/hdl_g/obio_space.c
index 8ba0c8428ee6..054004844f7f 100644
--- a/sys/arch/evbarm/hdl_g/obio_space.c
+++ b/sys/arch/evbarm/hdl_g/obio_space.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio_space.c,v 1.2 2009/11/07 07:27:42 cegger Exp $	*/
+/*	$NetBSD: obio_space.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.2 2009/11/07 07:27:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(obio);
diff --git a/sys/arch/evbarm/ifpga/ifpga_io.c b/sys/arch/evbarm/ifpga/ifpga_io.c
index b2889dafd012..2e7f3cbf88ef 100644
--- a/sys/arch/evbarm/ifpga/ifpga_io.c
+++ b/sys/arch/evbarm/ifpga/ifpga_io.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ifpga_io.c,v 1.9 2009/03/14 21:04:08 dsl Exp $ */
+/*	$NetBSD: ifpga_io.c,v 1.10 2011/07/01 20:39:34 dyoung Exp $ */
 
 /*
  * Copyright (c) 1997 Causality Limited
@@ -41,11 +41,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpga_io.c,v 1.9 2009/03/14 21:04:08 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpga_io.c,v 1.10 2011/07/01 20:39:34 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <uvm/uvm_extern.h>
 
 #include <evbarm/ifpga/ifpgavar.h>
diff --git a/sys/arch/evbarm/ifpga/ifpgavar.h b/sys/arch/evbarm/ifpga/ifpgavar.h
index 4ea1abfe7a0c..147018fa7813 100644
--- a/sys/arch/evbarm/ifpga/ifpgavar.h
+++ b/sys/arch/evbarm/ifpga/ifpgavar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ifpgavar.h,v 1.5 2009/07/21 16:04:16 dyoung Exp $ */
+/*	$NetBSD: ifpgavar.h,v 1.6 2011/07/01 20:39:34 dyoung Exp $ */
 
 /*
  * Copyright (c) 2001 ARM Ltd
@@ -32,7 +32,7 @@
 #ifndef _IFPGAVAR_H_
 #define _IFPGAVAR_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* We statically map the UARTS at boot so that we can access the console
    before we've probed for the IFPGA. */
diff --git a/sys/arch/evbarm/ifpga/plcom_ifpga.c b/sys/arch/evbarm/ifpga/plcom_ifpga.c
index e3d2d795511e..77d1355eaf4a 100644
--- a/sys/arch/evbarm/ifpga/plcom_ifpga.c
+++ b/sys/arch/evbarm/ifpga/plcom_ifpga.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: plcom_ifpga.c,v 1.10 2006/03/28 17:38:24 thorpej Exp $ */
+/*      $NetBSD: plcom_ifpga.c,v 1.11 2011/07/01 20:39:34 dyoung Exp $ */
 
 /*
  * Copyright (c) 2001 ARM Ltd
@@ -32,7 +32,7 @@
 /* Interface to plcom (PL010) serial driver. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plcom_ifpga.c,v 1.10 2006/03/28 17:38:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom_ifpga.c,v 1.11 2011/07/01 20:39:34 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/device.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: plcom_ifpga.c,v 1.10 2006/03/28 17:38:24 thorpej Exp
 #include <sys/termios.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/dev/plcomreg.h>
 #include <evbarm/dev/plcomvar.h>
diff --git a/sys/arch/evbarm/imx31/imx31lk_machdep.c b/sys/arch/evbarm/imx31/imx31lk_machdep.c
index c8b7c9f8aa86..d87a8dd15e12 100644
--- a/sys/arch/evbarm/imx31/imx31lk_machdep.c
+++ b/sys/arch/evbarm/imx31/imx31lk_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31lk_machdep.c,v 1.12 2011/06/30 20:09:24 wiz Exp $ */
+/* $NetBSD: imx31lk_machdep.c,v 1.13 2011/07/01 20:41:16 dyoung Exp $ */
 
 /*
  * Startup routines for the ZOOM iMX31 LITEKIT.
@@ -110,7 +110,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.12 2011/06/30 20:09:24 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.13 2011/07/01 20:41:16 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -144,7 +144,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.12 2011/06/30 20:09:24 wiz Exp
 #endif
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/imx31/imx31lk_pcic.c b/sys/arch/evbarm/imx31/imx31lk_pcic.c
index 016a711fc111..be8c9fcb834e 100644
--- a/sys/arch/evbarm/imx31/imx31lk_pcic.c
+++ b/sys/arch/evbarm/imx31/imx31lk_pcic.c
@@ -1,5 +1,5 @@
-/*	$Id: imx31lk_pcic.c,v 1.3 2008/06/30 00:49:31 perry Exp $	*/
-/*	$NetBSD: imx31lk_pcic.c,v 1.3 2008/06/30 00:49:31 perry Exp $	*/
+/*	$Id: imx31lk_pcic.c,v 1.4 2011/07/01 20:41:16 dyoung Exp $	*/
+/*	$NetBSD: imx31lk_pcic.c,v 1.4 2011/07/01 20:41:16 dyoung Exp $	*/
 /*	$OpenBSD: pxapcic.c,v 1.1 2005/07/01 23:51:55 uwe Exp $	*/
 
 /*
@@ -19,14 +19,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Id: imx31lk_pcic.c,v 1.3 2008/06/30 00:49:31 perry Exp $");
+__KERNEL_RCSID(0, "$Id: imx31lk_pcic.c,v 1.4 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm.h>
 
diff --git a/sys/arch/evbarm/integrator/int_bus_dma.h b/sys/arch/evbarm/integrator/int_bus_dma.h
index a891b2a38d67..e5b1504a6eb2 100644
--- a/sys/arch/evbarm/integrator/int_bus_dma.h
+++ b/sys/arch/evbarm/integrator/int_bus_dma.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: int_bus_dma.h,v 1.2 2002/07/31 17:34:26 thorpej Exp $ */
+/*	$NetBSD: int_bus_dma.h,v 1.3 2011/07/01 20:39:34 dyoung Exp $ */
 
 /*
  * Copyright (c) 2001 ARM Ltd
@@ -32,7 +32,7 @@
 #ifndef _INT_BUS_DMA_H
 #define _INT_BUS_DMA_H
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #define CM_ALIAS_TO_LOCAL(addr) (addr & 0x0fffffff)
 #define LOCAL_TO_CM_ALIAS(addr)	(addr | 0x80000000)
diff --git a/sys/arch/evbarm/integrator/integrator_machdep.c b/sys/arch/evbarm/integrator/integrator_machdep.c
index 79c0801f137d..76ed6ff95ea7 100644
--- a/sys/arch/evbarm/integrator/integrator_machdep.c
+++ b/sys/arch/evbarm/integrator/integrator_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: integrator_machdep.c,v 1.67 2011/06/30 20:09:24 wiz Exp $	*/
+/*	$NetBSD: integrator_machdep.c,v 1.68 2011/07/01 20:39:34 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001,2002 ARM Ltd
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.67 2011/06/30 20:09:24 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.68 2011/07/01 20:39:34 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
@@ -93,7 +93,7 @@ __KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.67 2011/06/30 20:09:24 wiz
 #include <ddb/db_extern.h>
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <machine/intr.h>
diff --git a/sys/arch/evbarm/iq31244/iq31244_7seg.c b/sys/arch/evbarm/iq31244/iq31244_7seg.c
index e2bca9651dbe..43808bbaeb87 100644
--- a/sys/arch/evbarm/iq31244/iq31244_7seg.c
+++ b/sys/arch/evbarm/iq31244/iq31244_7seg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq31244_7seg.c,v 1.4 2005/12/24 20:06:59 perry Exp $	*/
+/*	$NetBSD: iq31244_7seg.c,v 1.5 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,12 +40,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq31244_7seg.c,v 1.4 2005/12/24 20:06:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq31244_7seg.c,v 1.5 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/iq80321/iq80321reg.h>
 #include <evbarm/iq80321/iq80321var.h>
diff --git a/sys/arch/evbarm/iq31244/iq31244_pci.c b/sys/arch/evbarm/iq31244/iq31244_pci.c
index 7f0de1df6e01..da0dbbefaf68 100644
--- a/sys/arch/evbarm/iq31244/iq31244_pci.c
+++ b/sys/arch/evbarm/iq31244/iq31244_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq31244_pci.c,v 1.4 2011/04/04 20:37:48 dyoung Exp $	*/
+/*	$NetBSD: iq31244_pci.c,v 1.5 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq31244_pci.c,v 1.4 2011/04/04 20:37:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq31244_pci.c,v 1.5 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/iq80321/iq80321reg.h>
 #include <evbarm/iq80321/iq80321var.h>
diff --git a/sys/arch/evbarm/iq31244/wdc_obio.c b/sys/arch/evbarm/iq31244/wdc_obio.c
index 8434028e3ddd..64c5e5abdc71 100644
--- a/sys/arch/evbarm/iq31244/wdc_obio.c
+++ b/sys/arch/evbarm/iq31244/wdc_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_obio.c,v 1.5 2008/04/28 20:23:16 martin Exp $ */
+/*	$NetBSD: wdc_obio.c,v 1.6 2011/07/01 20:41:16 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1998, 2003, 2005 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.5 2008/04/28 20:23:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.6 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/xscale/i80321var.h>
diff --git a/sys/arch/evbarm/iq80310/com_obio.c b/sys/arch/evbarm/iq80310/com_obio.c
index a07a811dd8f2..1700daa3e214 100644
--- a/sys/arch/evbarm/iq80310/com_obio.c
+++ b/sys/arch/evbarm/iq80310/com_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.13 2008/04/28 20:23:16 martin Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.13 2008/04/28 20:23:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/iq80310/iq80310var.h>
 #include <evbarm/iq80310/obiovar.h>
diff --git a/sys/arch/evbarm/iq80310/i80312_mainbus.c b/sys/arch/evbarm/iq80310/i80312_mainbus.c
index 76ee14652973..170318eea3bb 100644
--- a/sys/arch/evbarm/iq80310/i80312_mainbus.c
+++ b/sys/arch/evbarm/iq80310/i80312_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: i80312_mainbus.c,v 1.13 2005/12/11 12:17:09 christos Exp $	*/
+/*	$NetBSD: i80312_mainbus.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -42,14 +42,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80312_mainbus.c,v 1.13 2005/12/11 12:17:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80312_mainbus.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/iq80310/iq80310reg.h>
 #include <evbarm/iq80310/iq80310var.h>
diff --git a/sys/arch/evbarm/iq80310/iq80310_7seg.c b/sys/arch/evbarm/iq80310/iq80310_7seg.c
index 2d81725497b3..51e5c9e6b036 100644
--- a/sys/arch/evbarm/iq80310/iq80310_7seg.c
+++ b/sys/arch/evbarm/iq80310/iq80310_7seg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80310_7seg.c,v 1.9 2005/12/11 12:17:09 christos Exp $	*/
+/*	$NetBSD: iq80310_7seg.c,v 1.10 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,12 +40,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_7seg.c,v 1.9 2005/12/11 12:17:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_7seg.c,v 1.10 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/iq80310/iq80310reg.h>
 #include <evbarm/iq80310/iq80310var.h>
diff --git a/sys/arch/evbarm/iq80310/iq80310_intr.c b/sys/arch/evbarm/iq80310/iq80310_intr.c
index 4199d931d4e9..da9e41c21b41 100644
--- a/sys/arch/evbarm/iq80310/iq80310_intr.c
+++ b/sys/arch/evbarm/iq80310/iq80310_intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80310_intr.c,v 1.28 2011/01/31 23:56:14 jakllsch Exp $	*/
+/*	$NetBSD: iq80310_intr.c,v 1.29 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.28 2011/01/31 23:56:14 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.29 2011/07/01 20:41:16 dyoung Exp $");
 
 #ifndef EVBARM_SPL_NOINLINE
 #define	EVBARM_SPL_NOINLINE
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.28 2011/01/31 23:56:14 jakllsch E
 #include <sys/systm.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arm/cpufunc.h>
diff --git a/sys/arch/evbarm/iq80310/iq80310_machdep.c b/sys/arch/evbarm/iq80310/iq80310_machdep.c
index a252d5be64e5..dad77954ed26 100644
--- a/sys/arch/evbarm/iq80310/iq80310_machdep.c
+++ b/sys/arch/evbarm/iq80310/iq80310_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80310_machdep.c,v 1.79 2011/06/30 20:09:25 wiz Exp $	*/
+/*	$NetBSD: iq80310_machdep.c,v 1.80 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.79 2011/06/30 20:09:25 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.80 2011/07/01 20:41:16 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
@@ -98,7 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.79 2011/06/30 20:09:25 wiz Exp
 #include <ddb/db_extern.h>
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/iq80310/iq80310_pci.c b/sys/arch/evbarm/iq80310/iq80310_pci.c
index 46115e6a523c..7a1facbd9451 100644
--- a/sys/arch/evbarm/iq80310/iq80310_pci.c
+++ b/sys/arch/evbarm/iq80310/iq80310_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80310_pci.c,v 1.10 2011/04/04 20:37:48 dyoung Exp $	*/
+/*	$NetBSD: iq80310_pci.c,v 1.11 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_pci.c,v 1.10 2011/04/04 20:37:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_pci.c,v 1.11 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/iq80310/iq80310reg.h>
 #include <evbarm/iq80310/iq80310var.h>
diff --git a/sys/arch/evbarm/iq80310/iq80310_timer.c b/sys/arch/evbarm/iq80310/iq80310_timer.c
index f98b264fa2db..8e72d1312083 100644
--- a/sys/arch/evbarm/iq80310/iq80310_timer.c
+++ b/sys/arch/evbarm/iq80310/iq80310_timer.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80310_timer.c,v 1.21 2008/01/20 16:28:24 joerg Exp $	*/
+/*	$NetBSD: iq80310_timer.c,v 1.22 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_timer.c,v 1.21 2008/01/20 16:28:24 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_timer.c,v 1.22 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq80310_timer.c,v 1.21 2008/01/20 16:28:24 joerg Exp
 
 #include <dev/clock_subr.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <arm/cpufunc.h>
 
 #include <evbarm/iq80310/iq80310reg.h>
diff --git a/sys/arch/evbarm/iq80310/obio.c b/sys/arch/evbarm/iq80310/obio.c
index 652008e60c61..79dd9251371a 100644
--- a/sys/arch/evbarm/iq80310/obio.c
+++ b/sys/arch/evbarm/iq80310/obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.19 2011/06/06 16:29:15 matt Exp $	*/
+/*	$NetBSD: obio.c,v 1.20 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003  Wasabi Systems, Inc.
@@ -44,14 +44,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.19 2011/06/06 16:29:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.20 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/iq80310/iq80310reg.h>
 #include <evbarm/iq80310/iq80310var.h>
diff --git a/sys/arch/evbarm/iq80310/obio_space.c b/sys/arch/evbarm/iq80310/obio_space.c
index 6d1f23263319..62a0033eaf63 100644
--- a/sys/arch/evbarm/iq80310/obio_space.c
+++ b/sys/arch/evbarm/iq80310/obio_space.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio_space.c,v 1.13 2009/11/07 07:27:42 cegger Exp $	*/
+/*	$NetBSD: obio_space.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.13 2009/11/07 07:27:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(obio);
diff --git a/sys/arch/evbarm/iq80321/com_obio.c b/sys/arch/evbarm/iq80321/com_obio.c
index ea367516bb72..db471a88d716 100644
--- a/sys/arch/evbarm/iq80321/com_obio.c
+++ b/sys/arch/evbarm/iq80321/com_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.12 2008/04/28 20:23:17 martin Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.13 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.12 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.13 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/i80321var.h>
 
diff --git a/sys/arch/evbarm/iq80321/i80321_mainbus.c b/sys/arch/evbarm/iq80321/i80321_mainbus.c
index d0a8c35be878..29a763a9c50a 100644
--- a/sys/arch/evbarm/iq80321/i80321_mainbus.c
+++ b/sys/arch/evbarm/iq80321/i80321_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: i80321_mainbus.c,v 1.16 2005/12/15 01:44:00 briggs Exp $	*/
+/*	$NetBSD: i80321_mainbus.c,v 1.17 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -42,14 +42,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80321_mainbus.c,v 1.16 2005/12/15 01:44:00 briggs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80321_mainbus.c,v 1.17 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/iq80321/iq80321reg.h>
 #include <evbarm/iq80321/iq80321var.h>
diff --git a/sys/arch/evbarm/iq80321/iq80321_7seg.c b/sys/arch/evbarm/iq80321/iq80321_7seg.c
index 7a9566db99f4..4d308673b04c 100644
--- a/sys/arch/evbarm/iq80321/iq80321_7seg.c
+++ b/sys/arch/evbarm/iq80321/iq80321_7seg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80321_7seg.c,v 1.6 2005/12/24 20:06:59 perry Exp $	*/
+/*	$NetBSD: iq80321_7seg.c,v 1.7 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,12 +40,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80321_7seg.c,v 1.6 2005/12/24 20:06:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_7seg.c,v 1.7 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/iq80321/iq80321reg.h>
 #include <evbarm/iq80321/iq80321var.h>
diff --git a/sys/arch/evbarm/iq80321/iq80321_machdep.c b/sys/arch/evbarm/iq80321/iq80321_machdep.c
index 4802a5fe4e29..f6c6e08dedad 100644
--- a/sys/arch/evbarm/iq80321/iq80321_machdep.c
+++ b/sys/arch/evbarm/iq80321/iq80321_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80321_machdep.c,v 1.49 2011/06/30 20:09:25 wiz Exp $	*/
+/*	$NetBSD: iq80321_machdep.c,v 1.50 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.49 2011/06/30 20:09:25 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.50 2011/07/01 20:41:16 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -99,7 +99,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.49 2011/06/30 20:09:25 wiz Exp
 #include <ddb/db_extern.h>
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/iq80321/iq80321_pci.c b/sys/arch/evbarm/iq80321/iq80321_pci.c
index 237d3f519746..2300282bf09e 100644
--- a/sys/arch/evbarm/iq80321/iq80321_pci.c
+++ b/sys/arch/evbarm/iq80321/iq80321_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80321_pci.c,v 1.6 2011/04/04 20:37:48 dyoung Exp $	*/
+/*	$NetBSD: iq80321_pci.c,v 1.7 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80321_pci.c,v 1.6 2011/04/04 20:37:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_pci.c,v 1.7 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/iq80321/iq80321reg.h>
 #include <evbarm/iq80321/iq80321var.h>
diff --git a/sys/arch/evbarm/iq80321/obio.c b/sys/arch/evbarm/iq80321/obio.c
index 3e7fa65e3e13..63cbfa1312af 100644
--- a/sys/arch/evbarm/iq80321/obio.c
+++ b/sys/arch/evbarm/iq80321/obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.15 2011/06/06 16:29:15 matt Exp $	*/
+/*	$NetBSD: obio.c,v 1.16 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -41,14 +41,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.15 2011/06/06 16:29:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.16 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/i80321reg.h>
 
diff --git a/sys/arch/evbarm/iq80321/obio_space.c b/sys/arch/evbarm/iq80321/obio_space.c
index 5bc071cd3f8f..a087759fe761 100644
--- a/sys/arch/evbarm/iq80321/obio_space.c
+++ b/sys/arch/evbarm/iq80321/obio_space.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio_space.c,v 1.10 2009/11/07 07:27:42 cegger Exp $	*/
+/*	$NetBSD: obio_space.c,v 1.11 2011/07/01 20:41:16 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.10 2009/11/07 07:27:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.11 2011/07/01 20:41:16 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(obio);
diff --git a/sys/arch/evbarm/ixdp425/ixdp425_led.c b/sys/arch/evbarm/ixdp425/ixdp425_led.c
index 2992474c55bf..94fdf3010b26 100644
--- a/sys/arch/evbarm/ixdp425/ixdp425_led.c
+++ b/sys/arch/evbarm/ixdp425/ixdp425_led.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixdp425_led.c,v 1.4 2009/10/21 14:15:51 rmind Exp $ */
+/*	$NetBSD: ixdp425_led.c,v 1.5 2011/07/01 20:42:36 dyoung Exp $ */
 /*
  * Copyright (c) 2003
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_led.c,v 1.4 2009/10/21 14:15:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_led.c,v 1.5 2011/07/01 20:42:36 dyoung Exp $");
 
 /*
  * LED support for IXDP425
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixdp425_led.c,v 1.4 2009/10/21 14:15:51 rmind Exp $"
 #include <sys/kernel.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/ixp425_sipvar.h>
 #include <arm/xscale/ixp425var.h>
diff --git a/sys/arch/evbarm/ixdp425/ixdp425_machdep.c b/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
index 20cd2fb868d7..198e1932fa63 100644
--- a/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
+++ b/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixdp425_machdep.c,v 1.28 2011/06/30 20:09:25 wiz Exp $ */
+/*	$NetBSD: ixdp425_machdep.c,v 1.29 2011/07/01 20:42:36 dyoung Exp $ */
 /*
  * Copyright (c) 2003
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.28 2011/06/30 20:09:25 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.29 2011/07/01 20:42:36 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -90,7 +90,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.28 2011/06/30 20:09:25 wiz Exp
 #include <ddb/db_extern.h>
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c b/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c
index 0f77bd0a3d1e..1b3d3419e7c8 100644
--- a/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c
+++ b/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixdp425_mainbus.c,v 1.6 2009/10/21 14:15:51 rmind Exp $ */
+/*	$NetBSD: ixdp425_mainbus.c,v 1.7 2011/07/01 20:42:36 dyoung Exp $ */
 
 /*
  * Copyright (c) 2003
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_mainbus.c,v 1.6 2009/10/21 14:15:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_mainbus.c,v 1.7 2011/07/01 20:42:36 dyoung Exp $");
 
 /*
  * front-end for the ixp425 NetworkProcessor.
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixdp425_mainbus.c,v 1.6 2009/10/21 14:15:51 rmind Ex
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/ixp425reg.h>
 #include <arm/xscale/ixp425var.h>
diff --git a/sys/arch/evbarm/ixdp425/ixdp425_pci.c b/sys/arch/evbarm/ixdp425/ixdp425_pci.c
index 2b666b745c8c..846ca673614d 100644
--- a/sys/arch/evbarm/ixdp425/ixdp425_pci.c
+++ b/sys/arch/evbarm/ixdp425/ixdp425_pci.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: ixdp425_pci.c,v 1.7 2011/04/04 20:37:48 dyoung Exp $ */
+/*      $NetBSD: ixdp425_pci.c,v 1.8 2011/07/01 20:42:36 dyoung Exp $ */
 #define PCI_DEBUG
 /*
  * Copyright (c) 2003
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_pci.c,v 1.7 2011/04/04 20:37:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_pci.c,v 1.8 2011/07/01 20:42:36 dyoung Exp $");
 
 /*
  * IXDP425 PCI interrupt support.
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixdp425_pci.c,v 1.7 2011/04/04 20:37:48 dyoung Exp $
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/ixdp425/ixdp425reg.h>
 #include <evbarm/ixdp425/ixdp425var.h>
diff --git a/sys/arch/evbarm/ixm1200/ixm1200_machdep.c b/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
index a4a4212e8546..d65704a88bfe 100644
--- a/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
+++ b/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixm1200_machdep.c,v 1.48 2011/06/30 20:09:25 wiz Exp $ */
+/*	$NetBSD: ixm1200_machdep.c,v 1.49 2011/07/01 20:42:37 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.48 2011/06/30 20:09:25 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.49 2011/07/01 20:42:37 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_modular.h"
@@ -96,7 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.48 2011/06/30 20:09:25 wiz Exp
 #endif
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/ixm1200/ixm1200_pci.c b/sys/arch/evbarm/ixm1200/ixm1200_pci.c
index 3aa36e22af37..d13287605b1a 100644
--- a/sys/arch/evbarm/ixm1200/ixm1200_pci.c
+++ b/sys/arch/evbarm/ixm1200/ixm1200_pci.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: ixm1200_pci.c,v 1.8 2011/04/04 20:37:48 dyoung Exp $ */
+/*      $NetBSD: ixm1200_pci.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $ */
 #define PCI_DEBUG
 /*
  * Copyright (c) 2002, 2003
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_pci.c,v 1.8 2011/04/04 20:37:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_pci.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $");
 
 /*
  * IXM1200 PCI interrupt support.
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixm1200_pci.c,v 1.8 2011/04/04 20:37:48 dyoung Exp $
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/ixm1200/ixm1200reg.h>
 #include <evbarm/ixm1200/ixm1200var.h>
diff --git a/sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c b/sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c
index 89ed61b7934c..ac6ed4b03aa6 100644
--- a/sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c
+++ b/sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp12x0_mainbus.c,v 1.8 2009/10/21 14:15:51 rmind Exp $ */
+/*	$NetBSD: ixp12x0_mainbus.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $ */
 /*
  * Copyright (c) 2002
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_mainbus.c,v 1.8 2009/10/21 14:15:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_mainbus.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $");
 
 /*
  * front-end for the ixp12x0 I/O Processor.
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_mainbus.c,v 1.8 2009/10/21 14:15:51 rmind Ex
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/ixm1200/ixm1200reg.h>
 #include <evbarm/ixm1200/ixm1200var.h>
diff --git a/sys/arch/evbarm/ixm1200/ixpcom_ixm.c b/sys/arch/evbarm/ixm1200/ixpcom_ixm.c
index 11068076e1c6..87087663d0aa 100644
--- a/sys/arch/evbarm/ixm1200/ixpcom_ixm.c
+++ b/sys/arch/evbarm/ixm1200/ixpcom_ixm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixpcom_ixm.c,v 1.8 2009/10/21 14:15:51 rmind Exp $ */
+/*	$NetBSD: ixpcom_ixm.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $ */
 /*
  * Copyright (c) 2002
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixpcom_ixm.c,v 1.8 2009/10/21 14:15:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixpcom_ixm.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $");
 
 /* Front-end of ixpcom */
 
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixpcom_ixm.c,v 1.8 2009/10/21 14:15:51 rmind Exp $")
 #include <sys/termios.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/ixp12x0/ixp12x0_comreg.h>
 #include <arm/ixp12x0/ixp12x0_comvar.h>
diff --git a/sys/arch/evbarm/ixm1200/nappi_nppb.c b/sys/arch/evbarm/ixm1200/nappi_nppb.c
index 4d6c13198e44..5999fe518d7d 100644
--- a/sys/arch/evbarm/ixm1200/nappi_nppb.c
+++ b/sys/arch/evbarm/ixm1200/nappi_nppb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nappi_nppb.c,v 1.8 2011/06/06 16:29:15 matt Exp $ */
+/*	$NetBSD: nappi_nppb.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $ */
 /*
  * Copyright (c) 2002, 2003
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nappi_nppb.c,v 1.8 2011/06/06 16:29:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nappi_nppb.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $");
 
 #include "pci.h"
 #include "opt_pci.h"
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: nappi_nppb.c,v 1.8 2011/06/06 16:29:15 matt Exp $");
 #include <sys/extent.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/arch/evbarm/ixm1200/nappi_nr.c b/sys/arch/evbarm/ixm1200/nappi_nr.c
index 3e814be7d129..b6e3060d7c3a 100644
--- a/sys/arch/evbarm/ixm1200/nappi_nr.c
+++ b/sys/arch/evbarm/ixm1200/nappi_nr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nappi_nr.c,v 1.8 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: nappi_nr.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nappi_nr.c,v 1.8 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nappi_nr.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $");
 
 /*
  * LED support for NAPPI.
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: nappi_nr.c,v 1.8 2008/04/28 20:23:17 martin Exp $");
 #include <sys/kernel.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/ixp12x0/ixpsipvar.h>
 
diff --git a/sys/arch/evbarm/lubbock/if_sm_obio.c b/sys/arch/evbarm/lubbock/if_sm_obio.c
index 7fb6a2ebe451..ecadd107bf4f 100644
--- a/sys/arch/evbarm/lubbock/if_sm_obio.c
+++ b/sys/arch/evbarm/lubbock/if_sm_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sm_obio.c,v 1.3 2009/05/29 14:15:44 rjs Exp $ */
+/*	$NetBSD: if_sm_obio.c,v 1.4 2011/07/01 20:42:37 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003  Genetec Corporation.  All rights reserved.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_obio.c,v 1.3 2009/05/29 14:15:44 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_obio.c,v 1.4 2011/07/01 20:42:37 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -82,7 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_obio.c,v 1.3 2009/05/29 14:15:44 rjs Exp $");
 #include <net/if_media.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/arch/evbarm/lubbock/lubbock_lcd.c b/sys/arch/evbarm/lubbock/lubbock_lcd.c
index 8585ab7b336e..3522e557ee8d 100644
--- a/sys/arch/evbarm/lubbock/lubbock_lcd.c
+++ b/sys/arch/evbarm/lubbock/lubbock_lcd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_lcd.c,v 1.11 2010/03/13 11:15:52 bsh Exp $ */
+/* $NetBSD: lubbock_lcd.c,v 1.12 2011/07/01 20:42:37 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003  Genetec Corporation.  All rights reserved.
@@ -40,7 +40,7 @@
  *   LCD panel geometry
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_lcd.c,v 1.11 2010/03/13 11:15:52 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_lcd.c,v 1.12 2011/07/01 20:42:37 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: lubbock_lcd.c,v 1.11 2010/03/13 11:15:52 bsh Exp $")
 #include <dev/wscons/wsdisplayvar.h> 
 #include <dev/wscons/wscons_callbacks.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0reg.h>
 #include <arm/xscale/pxa2x0_lcd.h>
diff --git a/sys/arch/evbarm/lubbock/lubbock_machdep.c b/sys/arch/evbarm/lubbock/lubbock_machdep.c
index d519f6cebed2..2ffa28813604 100644
--- a/sys/arch/evbarm/lubbock/lubbock_machdep.c
+++ b/sys/arch/evbarm/lubbock/lubbock_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lubbock_machdep.c,v 1.27 2011/06/30 20:09:25 wiz Exp $ */
+/*	$NetBSD: lubbock_machdep.c,v 1.28 2011/07/01 20:42:37 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
@@ -112,7 +112,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.27 2011/06/30 20:09:25 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.28 2011/07/01 20:42:37 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -147,7 +147,7 @@ __KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.27 2011/06/30 20:09:25 wiz Exp
 #endif
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/lubbock/lubbock_pcic.c b/sys/arch/evbarm/lubbock/lubbock_pcic.c
index fc29bdb15ef8..5a893c9b27da 100644
--- a/sys/arch/evbarm/lubbock/lubbock_pcic.c
+++ b/sys/arch/evbarm/lubbock/lubbock_pcic.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: lubbock_pcic.c,v 1.6 2010/03/13 11:13:31 bsh Exp $	*/
+/*      $NetBSD: lubbock_pcic.c,v 1.7 2011/07/01 20:42:37 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_pcic.c,v 1.6 2010/03/13 11:13:31 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_pcic.c,v 1.7 2011/07/01 20:42:37 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: lubbock_pcic.c,v 1.6 2010/03/13 11:13:31 bsh Exp $")
 #include <sys/kthread.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pcmcia/pcmciachip.h>
 #include <dev/pcmcia/pcmciavar.h>
diff --git a/sys/arch/evbarm/lubbock/lubbock_var.h b/sys/arch/evbarm/lubbock/lubbock_var.h
index 12352c44c322..bb56c0c71de3 100644
--- a/sys/arch/evbarm/lubbock/lubbock_var.h
+++ b/sys/arch/evbarm/lubbock/lubbock_var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: lubbock_var.h,v 1.2 2009/05/29 14:15:44 rjs Exp $ */
+/*	$NetBSD: lubbock_var.h,v 1.3 2011/07/01 20:42:37 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003  Genetec Corporation.  All rights reserved.
@@ -35,7 +35,7 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <evbarm/lubbock/lubbock_reg.h>
 
 
diff --git a/sys/arch/evbarm/lubbock/obio.c b/sys/arch/evbarm/lubbock/obio.c
index 97db0a1c9b7c..5cbff15bd99c 100644
--- a/sys/arch/evbarm/lubbock/obio.c
+++ b/sys/arch/evbarm/lubbock/obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.9 2009/05/29 14:15:44 rjs Exp $ */
+/*	$NetBSD: obio.c,v 1.10 2011/07/01 20:42:37 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003  Genetec Corporation.  All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.9 2009/05/29 14:15:44 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10 2011/07/01 20:42:37 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.9 2009/05/29 14:15:44 rjs Exp $");
 #include <sys/reboot.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <arm/cpufunc.h>
 
diff --git a/sys/arch/evbarm/lubbock/sacc_obio.c b/sys/arch/evbarm/lubbock/sacc_obio.c
index 62352eb3605e..eca7f9743146 100644
--- a/sys/arch/evbarm/lubbock/sacc_obio.c
+++ b/sys/arch/evbarm/lubbock/sacc_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sacc_obio.c,v 1.11 2010/03/13 10:55:09 bsh Exp $ */
+/*	$NetBSD: sacc_obio.c,v 1.12 2011/07/01 20:42:37 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sacc_obio.c,v 1.11 2010/03/13 10:55:09 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sacc_obio.c,v 1.12 2011/07/01 20:42:37 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: sacc_obio.c,v 1.11 2010/03/13 10:55:09 bsh Exp $");
 #include <net/if_media.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/sa11x0/sa1111_reg.h>
 #include <arm/sa11x0/sa1111_var.h>
diff --git a/sys/arch/evbarm/lubbock/sm_obio_space.c b/sys/arch/evbarm/lubbock/sm_obio_space.c
index ca80944c0a38..e6f9c503c893 100644
--- a/sys/arch/evbarm/lubbock/sm_obio_space.c
+++ b/sys/arch/evbarm/lubbock/sm_obio_space.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sm_obio_space.c,v 1.3 2005/12/11 12:17:09 christos Exp $ */
+/*	$NetBSD: sm_obio_space.c,v 1.4 2011/07/01 20:42:37 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003  Genetec Corporation.  All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sm_obio_space.c,v 1.3 2005/12/11 12:17:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sm_obio_space.c,v 1.4 2011/07/01 20:42:37 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: sm_obio_space.c,v 1.3 2005/12/11 12:17:09 christos E
 
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/pmap.h>
 
 /* Proto types for all the bus_space structure functions */
diff --git a/sys/arch/evbarm/mpcsa/mpcsa_machdep.c b/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
index 9f0ba4ed55cc..f8be3493a072 100644
--- a/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
+++ b/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
@@ -1,5 +1,5 @@
-/*	$Id: mpcsa_machdep.c,v 1.5 2011/06/30 20:09:26 wiz Exp $	*/
-/*	$NetBSD: mpcsa_machdep.c,v 1.5 2011/06/30 20:09:26 wiz Exp $	*/
+/*	$Id: mpcsa_machdep.c,v 1.6 2011/07/01 20:44:20 dyoung Exp $	*/
+/*	$NetBSD: mpcsa_machdep.c,v 1.6 2011/07/01 20:44:20 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2007 Embedtronics Oy
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.5 2011/06/30 20:09:26 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.6 2011/07/01 20:44:20 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -104,7 +104,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.5 2011/06/30 20:09:26 wiz Exp $"
 
 #define	DRAM_BLOCKS	1
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/netwalker/netwalker_machdep.c b/sys/arch/evbarm/netwalker/netwalker_machdep.c
index fd782171ca01..2fe918be6006 100644
--- a/sys/arch/evbarm/netwalker/netwalker_machdep.c
+++ b/sys/arch/evbarm/netwalker/netwalker_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netwalker_machdep.c,v 1.4 2011/06/30 20:09:26 wiz Exp $	*/
+/*	$NetBSD: netwalker_machdep.c,v 1.5 2011/07/01 20:42:37 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003, 2005, 2010  Genetec Corporation. 
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.4 2011/06/30 20:09:26 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.5 2011/07/01 20:42:37 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -139,7 +139,7 @@ __KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.4 2011/06/30 20:09:26 wiz Ex
 #endif
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/npwr_fc/com_obio.c b/sys/arch/evbarm/npwr_fc/com_obio.c
index 15200c52861f..a865029d383e 100644
--- a/sys/arch/evbarm/npwr_fc/com_obio.c
+++ b/sys/arch/evbarm/npwr_fc/com_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.4 2008/04/28 20:23:17 martin Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.5 2011/07/01 20:44:20 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.4 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.5 2011/07/01 20:44:20 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/i80321var.h>
 
diff --git a/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c b/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
index 40cdb0e169d8..9bfa0e2aec01 100644
--- a/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
+++ b/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: npwr_fc_machdep.c,v 1.15 2011/06/30 20:09:27 wiz Exp $	*/
+/*	$NetBSD: npwr_fc_machdep.c,v 1.16 2011/07/01 20:44:20 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.15 2011/06/30 20:09:27 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.16 2011/07/01 20:44:20 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -99,7 +99,7 @@ __KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.15 2011/06/30 20:09:27 wiz Exp
 #include <ddb/db_extern.h>
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c b/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c
index 12acae29d205..f91a5eb087a1 100644
--- a/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c
+++ b/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: npwr_fc_pci.c,v 1.2 2011/04/04 20:37:49 dyoung Exp $	*/
+/*	$NetBSD: npwr_fc_pci.c,v 1.3 2011/07/01 20:44:20 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npwr_fc_pci.c,v 1.2 2011/04/04 20:37:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_pci.c,v 1.3 2011/07/01 20:44:20 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbarm/iq80321/iq80321reg.h>
 #include <evbarm/iq80321/iq80321var.h>
diff --git a/sys/arch/evbarm/nslu2/nslu2_machdep.c b/sys/arch/evbarm/nslu2/nslu2_machdep.c
index 0bdcece30a71..e54f4539d0d3 100644
--- a/sys/arch/evbarm/nslu2/nslu2_machdep.c
+++ b/sys/arch/evbarm/nslu2/nslu2_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nslu2_machdep.c,v 1.18 2011/06/30 20:09:28 wiz Exp $	*/
+/*	$NetBSD: nslu2_machdep.c,v 1.19 2011/07/01 20:44:20 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.18 2011/06/30 20:09:28 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.19 2011/07/01 20:44:20 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -120,7 +120,7 @@ __KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.18 2011/06/30 20:09:28 wiz Exp $
 #include <ddb/db_extern.h>
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/osk5912/if_sm_emifs.c b/sys/arch/evbarm/osk5912/if_sm_emifs.c
index 20eb78cc0466..271f44e4ebfe 100644
--- a/sys/arch/evbarm/osk5912/if_sm_emifs.c
+++ b/sys/arch/evbarm/osk5912/if_sm_emifs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sm_emifs.c,v 1.3 2007/10/17 19:54:13 garbled Exp $	*/
+/*	$NetBSD: if_sm_emifs.c,v 1.4 2011/07/01 20:44:21 dyoung Exp $	*/
 
 /*
  * OSK5912 SMC91Cxx wrapper, based on sys/arch/evbarm/viper/if_sm_pxaip.c
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_emifs.c,v 1.3 2007/10/17 19:54:13 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_emifs.c,v 1.4 2011/07/01 20:44:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_emifs.c,v 1.3 2007/10/17 19:54:13 garbled Exp
 #include <net/if_media.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/arch/evbarm/osk5912/osk5912_machdep.c b/sys/arch/evbarm/osk5912/osk5912_machdep.c
index 3bbeafe4900b..1a076c40e73a 100644
--- a/sys/arch/evbarm/osk5912/osk5912_machdep.c
+++ b/sys/arch/evbarm/osk5912/osk5912_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: osk5912_machdep.c,v 1.10 2011/06/30 20:09:28 wiz Exp $ */
+/*	$NetBSD: osk5912_machdep.c,v 1.11 2011/07/01 20:44:21 dyoung Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.10 2011/06/30 20:09:28 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.11 2011/07/01 20:44:21 dyoung Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -132,7 +132,7 @@ __KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.10 2011/06/30 20:09:28 wiz Exp
 #endif
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c b/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c
index 2e385b49fe28..1547a5fb0132 100644
--- a/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c
+++ b/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cs_smdk24x0.c,v 1.3 2009/09/22 14:55:19 tsutsui Exp $ */
+/*	$NetBSD: if_cs_smdk24x0.c,v 1.4 2011/07/01 20:44:21 dyoung Exp $ */
 
 /*
  * Copyright (c) 2003  Genetec corporation.  All rights reserved.
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_smdk24x0.c,v 1.3 2009/09/22 14:55:19 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_smdk24x0.c,v 1.4 2011/07/01 20:44:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -88,7 +88,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_smdk24x0.c,v 1.3 2009/09/22 14:55:19 tsutsui E
 #include <net/if_ether.h>
 #include <net/if_media.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <arch/arm/s3c2xx0/s3c2410reg.h>
diff --git a/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c b/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c
index 1b93e551bd84..ece9d35ee544 100644
--- a/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c
+++ b/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2410_kbd.c,v 1.6 2010/06/07 15:17:24 bsh Exp $ */
+/* $NetBSD: smdk2410_kbd.c,v 1.7 2011/07/01 20:44:21 dyoung Exp $ */
 
 /*
  * Copyright (c) 2004  Genetec Corporation.  All rights reserved.
@@ -40,13 +40,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_kbd.c,v 1.6 2010/06/07 15:17:24 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_kbd.c,v 1.7 2011/07/01 20:44:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 
 #include <dev/wscons/wsconsio.h>
diff --git a/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c b/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c
index 4a59fb3e92d1..8ffb38610237 100644
--- a/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c
+++ b/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smdk2410_lcd.c,v 1.5 2010/02/05 21:10:58 snj Exp $ */
+/*	$NetBSD: smdk2410_lcd.c,v 1.6 2011/07/01 20:44:21 dyoung Exp $ */
 
 /*
  * Copyright (c) 2004  Genetec Corporation.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_lcd.c,v 1.5 2010/02/05 21:10:58 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_lcd.c,v 1.6 2011/07/01 20:44:21 dyoung Exp $");
 
 /*
  * LCD driver for Samsung SMDK2410.
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: smdk2410_lcd.c,v 1.5 2010/02/05 21:10:58 snj Exp $")
 #include <dev/wscons/wsdisplayvar.h> 
 #include <dev/wscons/wscons_callbacks.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <arm/s3c2xx0/s3c24x0var.h>
 #include <arm/s3c2xx0/s3c24x0reg.h>
 #include <arm/s3c2xx0/s3c2410reg.h>
diff --git a/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c b/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
index 7e26e4aac672..aa1fbf0d7d23 100644
--- a/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
+++ b/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smdk2410_machdep.c,v 1.28 2011/06/30 20:09:28 wiz Exp $ */
+/*	$NetBSD: smdk2410_machdep.c,v 1.29 2011/07/01 20:44:21 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -105,7 +105,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.28 2011/06/30 20:09:28 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.29 2011/07/01 20:44:21 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -136,7 +136,7 @@ __KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.28 2011/06/30 20:09:28 wiz Ex
 #endif
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <machine/intr.h>
diff --git a/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c b/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
index 9b004be2be3e..da4154bdd6a2 100644
--- a/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
+++ b/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smdk2800_machdep.c,v 1.36 2011/06/30 20:09:28 wiz Exp $ */
+/*	$NetBSD: smdk2800_machdep.c,v 1.37 2011/07/01 20:44:21 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2005 Fujitsu Component Limited
@@ -106,7 +106,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.36 2011/06/30 20:09:28 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.37 2011/07/01 20:44:21 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -138,7 +138,7 @@ __KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.36 2011/06/30 20:09:28 wiz Ex
 #endif
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <machine/intr.h>
diff --git a/sys/arch/evbarm/smdk2xx0/smdk2800_pci.c b/sys/arch/evbarm/smdk2xx0/smdk2800_pci.c
index fca63dbead31..526a696ce8d7 100644
--- a/sys/arch/evbarm/smdk2xx0/smdk2800_pci.c
+++ b/sys/arch/evbarm/smdk2xx0/smdk2800_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smdk2800_pci.c,v 1.4 2005/12/11 12:17:09 christos Exp $ */
+/*	$NetBSD: smdk2800_pci.c,v 1.5 2011/07/01 20:44:21 dyoung Exp $ */
 
 /*
  * Copyright (c) 2002 Fujitsu Component Limited
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2800_pci.c,v 1.4 2005/12/11 12:17:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2800_pci.c,v 1.5 2011/07/01 20:44:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: smdk2800_pci.c,v 1.4 2005/12/11 12:17:09 christos Ex
 #include <sys/extent.h>
 
 #define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
diff --git a/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c b/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c
index 4f551a1bc9bd..53a205862ed4 100644
--- a/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c
+++ b/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_gpmc.c,v 1.3 2008/08/27 11:03:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_gpmc.c,v 1.4 2011/07/01 20:45:45 dyoung Exp $");
 
 #include "locators.h"
 
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_gpmc.c,v 1.3 2008/08/27 11:03:10 matt Exp $");
 #include <net/if_media.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c b/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
index a4e4ce9a6553..ea8b6c02f9d4 100644
--- a/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
+++ b/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdp24xx_machdep.c,v 1.11 2011/06/30 20:09:28 wiz Exp $ */
+/*	$NetBSD: sdp24xx_machdep.c,v 1.12 2011/07/01 20:45:45 dyoung Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.11 2011/06/30 20:09:28 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.12 2011/07/01 20:45:45 dyoung Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -160,7 +160,7 @@ __KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.11 2011/06/30 20:09:28 wiz Exp
 #endif
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/armreg.h>
diff --git a/sys/arch/evbarm/viper/if_sm_pxaip.c b/sys/arch/evbarm/viper/if_sm_pxaip.c
index 014366007dd2..9f884dfa7c7f 100644
--- a/sys/arch/evbarm/viper/if_sm_pxaip.c
+++ b/sys/arch/evbarm/viper/if_sm_pxaip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sm_pxaip.c,v 1.4 2007/10/17 19:54:13 garbled Exp $	*/
+/*	$NetBSD: if_sm_pxaip.c,v 1.5 2011/07/01 20:45:45 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2005 Antti Kantee.  All Rights Reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_pxaip.c,v 1.4 2007/10/17 19:54:13 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_pxaip.c,v 1.5 2011/07/01 20:45:45 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_pxaip.c,v 1.4 2007/10/17 19:54:13 garbled Exp
 #include <net/if_media.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/arch/evbarm/viper/viper_machdep.c b/sys/arch/evbarm/viper/viper_machdep.c
index eadc08c85852..f9295c5e3932 100644
--- a/sys/arch/evbarm/viper/viper_machdep.c
+++ b/sys/arch/evbarm/viper/viper_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: viper_machdep.c,v 1.18 2011/06/30 20:09:28 wiz Exp $ */
+/*	$NetBSD: viper_machdep.c,v 1.19 2011/07/01 20:45:45 dyoung Exp $ */
 
 /*
  * Startup routines for the Arcom Viper.  Below you can trace the
@@ -112,7 +112,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.18 2011/06/30 20:09:28 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.19 2011/07/01 20:45:45 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -147,7 +147,7 @@ __KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.18 2011/06/30 20:09:28 wiz Exp $
 #endif
 
 #include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arm/undefined.h>
diff --git a/sys/arch/evbppc/ev64260/com_obio.c b/sys/arch/evbppc/ev64260/com_obio.c
index 795703f29f62..115737a9c369 100644
--- a/sys/arch/evbppc/ev64260/com_obio.c
+++ b/sys/arch/evbppc/ev64260/com_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_obio.c,v 1.10 2010/04/28 13:51:55 kiyohara Exp $	*/
+/*	$NetBSD: com_obio.c,v 1.11 2011/07/01 20:46:39 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.10 2010/04/28 13:51:55 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.11 2011/07/01 20:46:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -78,7 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_obio.c,v 1.10 2010/04/28 13:51:55 kiyohara Exp $
 #include <sys/device.h>
 #include <sys/termios.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/ic/comreg.h>
diff --git a/sys/arch/evbppc/ev64260/gt_mainbus.c b/sys/arch/evbppc/ev64260/gt_mainbus.c
index f04d420e90a0..ab5854106cc9 100644
--- a/sys/arch/evbppc/ev64260/gt_mainbus.c
+++ b/sys/arch/evbppc/ev64260/gt_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gt_mainbus.c,v 1.16 2010/06/02 06:44:33 kiyohara Exp $	*/
+/*	$NetBSD: gt_mainbus.c,v 1.17 2011/07/01 20:46:39 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c,v 1.16 2010/06/02 06:44:33 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c,v 1.17 2011/07/01 20:46:39 dyoung Exp $");
 
 #include "opt_ev64260.h"
 #include "opt_pci.h"
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c,v 1.16 2010/06/02 06:44:33 kiyohara Exp
 #include <sys/extent.h>
 
 #define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include "opt_pci.h"
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/evbppc/evbppc/evbppc_machdep.c b/sys/arch/evbppc/evbppc/evbppc_machdep.c
index 22891e9f749b..59f863dea9d3 100644
--- a/sys/arch/evbppc/evbppc/evbppc_machdep.c
+++ b/sys/arch/evbppc/evbppc/evbppc_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: evbppc_machdep.c,v 1.12 2011/06/30 00:52:56 matt Exp $	*/
+/*	$NetBSD: evbppc_machdep.c,v 1.13 2011/07/01 20:46:39 dyoung Exp $	*/
 
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.12 2011/06/30 00:52:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.13 2011/07/01 20:46:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.12 2011/06/30 00:52:56 matt Exp
 #include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/pmap.h>
 
 /*