diff --git a/sys/arch/algor/isa/isadma_bounce.c b/sys/arch/algor/isa/isadma_bounce.c
index 060a182f442e..3f582e91183c 100644
--- a/sys/arch/algor/isa/isadma_bounce.c
+++ b/sys/arch/algor/isa/isadma_bounce.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isadma_bounce.c,v 1.9 2011/02/20 07:51:22 matt Exp $	*/
+/*	$NetBSD: isadma_bounce.c,v 1.10 2011/07/01 18:31:32 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.9 2011/02/20 07:51:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.10 2011/07/01 18:31:32 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.9 2011/02/20 07:51:22 matt Exp $
 #include <mips/cache.h>
 
 #define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 
 #include <dev/isa/isareg.h>
diff --git a/sys/arch/algor/isa/mcclock_isa.c b/sys/arch/algor/isa/mcclock_isa.c
index ea71b0e369a3..7dce1c7be3fa 100644
--- a/sys/arch/algor/isa/mcclock_isa.c
+++ b/sys/arch/algor/isa/mcclock_isa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mcclock_isa.c,v 1.12 2008/03/29 05:42:45 tsutsui Exp $	*/
+/*	$NetBSD: mcclock_isa.c,v 1.13 2011/07/01 18:31:32 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,14 +29,14 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.12 2008/03/29 05:42:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.13 2011/07/01 18:31:32 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/clock_subr.h>
 #include <dev/ic/mc146818reg.h>
diff --git a/sys/arch/algor/pci/pcib.c b/sys/arch/algor/pci/pcib.c
index 957c79960906..63144a3d27ed 100644
--- a/sys/arch/algor/pci/pcib.c
+++ b/sys/arch/algor/pci/pcib.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcib.c,v 1.21 2009/08/19 15:17:00 dyoung Exp $	*/
+/*	$NetBSD: pcib.c,v 1.22 2011/07/01 18:31:32 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.21 2009/08/19 15:17:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.22 2011/07/01 18:31:32 dyoung Exp $");
 
 #include "opt_algor_p5064.h" 
 #include "opt_algor_p6032.h"
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.21 2009/08/19 15:17:00 dyoung Exp $");
 #include <sys/malloc.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
diff --git a/sys/arch/algor/pci/vtpbc.c b/sys/arch/algor/pci/vtpbc.c
index 867d91786c38..21400a920746 100644
--- a/sys/arch/algor/pci/vtpbc.c
+++ b/sys/arch/algor/pci/vtpbc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vtpbc.c,v 1.7 2008/04/28 20:23:10 martin Exp $	*/
+/*	$NetBSD: vtpbc.c,v 1.8 2011/07/01 18:31:32 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,13 +37,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vtpbc.c,v 1.7 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vtpbc.c,v 1.8 2011/07/01 18:31:32 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/locore.h>
 
diff --git a/sys/arch/hp700/dev/asp.c b/sys/arch/hp700/dev/asp.c
index ea8cd94ae0c8..8ed525ca573f 100644
--- a/sys/arch/hp700/dev/asp.c
+++ b/sys/arch/hp700/dev/asp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: asp.c,v 1.18 2011/02/01 18:33:24 skrll Exp $	*/
+/*	$NetBSD: asp.c,v 1.19 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*	$OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $	*/
 
@@ -37,14 +37,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.18 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.19 2011/07/01 18:33:09 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
 #include <machine/cpufunc.h>
diff --git a/sys/arch/hp700/dev/com_dino.c b/sys/arch/hp700/dev/com_dino.c
index 97994ddb0d9a..9037316f1bf1 100644
--- a/sys/arch/hp700/dev/com_dino.c
+++ b/sys/arch/hp700/dev/com_dino.c
@@ -31,7 +31,7 @@
 #include <sys/device.h>
 #include <sys/tty.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
diff --git a/sys/arch/hp700/dev/com_ssio.c b/sys/arch/hp700/dev/com_ssio.c
index 4b5e64099116..ef006e251252 100644
--- a/sys/arch/hp700/dev/com_ssio.c
+++ b/sys/arch/hp700/dev/com_ssio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_ssio.c,v 1.2 2010/03/05 18:41:29 skrll Exp $	*/
+/*	$NetBSD: com_ssio.c,v 1.3 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*	$OpenBSD: com_ssio.c,v 1.2 2007/06/24 16:28:39 kettenis Exp $	*/
 
@@ -23,7 +23,7 @@
 #include <sys/device.h>
 #include <sys/tty.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/iomod.h>
 
 #include <dev/ic/comreg.h>
diff --git a/sys/arch/hp700/dev/gecko.c b/sys/arch/hp700/dev/gecko.c
index 0142be55d089..9cabe9baceec 100644
--- a/sys/arch/hp700/dev/gecko.c
+++ b/sys/arch/hp700/dev/gecko.c
@@ -22,7 +22,7 @@
 #include <sys/systm.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/iomod.h>
 #include <machine/pdc.h>
diff --git a/sys/arch/hp700/dev/lasi.c b/sys/arch/hp700/dev/lasi.c
index 5c2e9eae6123..2840c5057bf0 100644
--- a/sys/arch/hp700/dev/lasi.c
+++ b/sys/arch/hp700/dev/lasi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lasi.c,v 1.20 2011/02/01 18:33:24 skrll Exp $	*/
+/*	$NetBSD: lasi.c,v 1.21 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*	$OpenBSD: lasi.c,v 1.4 2001/06/09 03:57:19 mickey Exp $	*/
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.20 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.21 2011/07/01 18:33:09 dyoung Exp $");
 
 #undef LASIDEBUG
 
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.20 2011/02/01 18:33:24 skrll Exp $");
 #include <sys/device.h>
 #include <sys/reboot.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/hp700/dev/lcd.c b/sys/arch/hp700/dev/lcd.c
index e8e81fc3e2f3..78a39d559fa9 100644
--- a/sys/arch/hp700/dev/lcd.c
+++ b/sys/arch/hp700/dev/lcd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lcd.c,v 1.4 2011/01/04 10:42:33 skrll Exp $	*/
+/*	$NetBSD: lcd.c,v 1.5 2011/07/01 18:33:09 dyoung Exp $	*/
 /*	OpenBSD: lcd.c,v 1.2 2007/07/20 22:13:45 kettenis Exp 	*/
 
 /*
@@ -24,7 +24,7 @@
 #include <sys/callout.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/pdc.h>
 
diff --git a/sys/arch/hp700/dev/lpt_ssio.c b/sys/arch/hp700/dev/lpt_ssio.c
index 63e3160a404c..1808a263b60f 100644
--- a/sys/arch/hp700/dev/lpt_ssio.c
+++ b/sys/arch/hp700/dev/lpt_ssio.c
@@ -20,7 +20,7 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/ic/lptreg.h>
 #include <dev/ic/lptvar.h>
diff --git a/sys/arch/hp700/dev/mongoose.c b/sys/arch/hp700/dev/mongoose.c
index 9db3727d0b35..25fe4386354a 100644
--- a/sys/arch/hp700/dev/mongoose.c
+++ b/sys/arch/hp700/dev/mongoose.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mongoose.c,v 1.21 2011/02/01 18:33:24 skrll Exp $	*/
+/*	$NetBSD: mongoose.c,v 1.22 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*	$OpenBSD: mongoose.c,v 1.19 2010/01/01 20:28:42 kettenis Exp $	*/
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.21 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.22 2011/07/01 18:33:09 dyoung Exp $");
 
 #define MONGOOSE_DEBUG 9
 
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.21 2011/02/01 18:33:24 skrll Exp $");
 #include <sys/device.h>
 #include <sys/reboot.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/hp700/dev/siop_sgc.c b/sys/arch/hp700/dev/siop_sgc.c
index 3cd36a9a18da..98d3a1c746b0 100644
--- a/sys/arch/hp700/dev/siop_sgc.c
+++ b/sys/arch/hp700/dev/siop_sgc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: siop_sgc.c,v 1.7 2011/02/01 18:33:24 skrll Exp $	*/
+/*	$NetBSD: siop_sgc.c,v 1.8 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*	$OpenBSD: siop_sgc.c,v 1.1 2007/08/05 19:09:52 kettenis Exp $	*/
 
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.7 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.8 2011/07/01 18:33:09 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -28,7 +28,7 @@ __KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.7 2011/02/01 18:33:24 skrll Exp $");
 #include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/iomod.h>
 
 #include <dev/scsipi/scsi_all.h>
diff --git a/sys/arch/hp700/dev/ssio.c b/sys/arch/hp700/dev/ssio.c
index 530f6cb5008a..beebfa84e24f 100644
--- a/sys/arch/hp700/dev/ssio.c
+++ b/sys/arch/hp700/dev/ssio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssio.c,v 1.1 2009/05/28 08:41:29 skrll Exp $	*/
+/*	$NetBSD: ssio.c,v 1.2 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*	$OpenBSD: ssio.c,v 1.7 2009/03/08 22:19:04 miod Exp $	*/
 
@@ -26,7 +26,7 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/iomod.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/arch/hp700/dev/sti_sgc.c b/sys/arch/hp700/dev/sti_sgc.c
index bb8b125eceae..c2e0da8a0cad 100644
--- a/sys/arch/hp700/dev/sti_sgc.c
+++ b/sys/arch/hp700/dev/sti_sgc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sti_sgc.c,v 1.20 2010/11/09 12:24:47 skrll Exp $	*/
+/*	$NetBSD: sti_sgc.c,v 1.21 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*	$OpenBSD: sti_sgc.c,v 1.38 2009/02/06 22:51:04 miod Exp $	*/
 
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.20 2010/11/09 12:24:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.21 2011/07/01 18:33:09 dyoung Exp $");
 
 #include "opt_cputype.h"
 
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.20 2010/11/09 12:24:47 skrll Exp $");
 
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
diff --git a/sys/arch/hp700/dev/uturn.c b/sys/arch/hp700/dev/uturn.c
index c2b4c5b18c11..4672951a31c7 100644
--- a/sys/arch/hp700/dev/uturn.c
+++ b/sys/arch/hp700/dev/uturn.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uturn.c,v 1.15 2011/01/13 21:44:13 skrll Exp $	*/
+/*	$NetBSD: uturn.c,v 1.16 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*	$OpenBSD: uturn.c,v 1.6 2007/12/29 01:26:14 kettenis Exp $	*/
 
@@ -40,7 +40,7 @@
 
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/hp700/gsc/com_gsc.c b/sys/arch/hp700/gsc/com_gsc.c
index 55114db53984..56be6182d9a5 100644
--- a/sys/arch/hp700/gsc/com_gsc.c
+++ b/sys/arch/hp700/gsc/com_gsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_gsc.c,v 1.16 2011/02/01 18:33:24 skrll Exp $	*/
+/*	$NetBSD: com_gsc.c,v 1.17 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*	$OpenBSD: com_gsc.c,v 1.8 2000/03/13 14:39:59 mickey Exp $	*/
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v 1.16 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v 1.17 2011/07/01 18:33:09 dyoung Exp $");
 
 #include "opt_kgdb.h"
 
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v 1.16 2011/02/01 18:33:24 skrll Exp $");
 #include <sys/kgdb.h>
 #endif
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
diff --git a/sys/arch/hp700/gsc/fdc_gsc.c b/sys/arch/hp700/gsc/fdc_gsc.c
index ba71bd9e54d5..6579be8c9787 100644
--- a/sys/arch/hp700/gsc/fdc_gsc.c
+++ b/sys/arch/hp700/gsc/fdc_gsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fdc_gsc.c,v 1.9 2010/12/11 19:32:06 skrll Exp $	*/
+/*	$NetBSD: fdc_gsc.c,v 1.10 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*	$OpenBSD: fdc_gsc.c,v 1.1 1998/09/30 04:45:46 mickey Exp $	*/
 
@@ -29,14 +29,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_gsc.c,v 1.9 2010/12/11 19:32:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_gsc.c,v 1.10 2011/07/01 18:33:09 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <machine/iomod.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/hp700/gsc/gsckbc.c b/sys/arch/hp700/gsc/gsckbc.c
index e77e550f0bea..5f560bba9a8c 100644
--- a/sys/arch/hp700/gsc/gsckbc.c
+++ b/sys/arch/hp700/gsc/gsckbc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gsckbc.c,v 1.7 2011/02/01 18:33:24 skrll Exp $ */
+/* $NetBSD: gsckbc.c,v 1.8 2011/07/01 18:33:09 dyoung Exp $ */
 /*
  * Copyright (c) 2004 Jochen Kunz.
  * All rights reserved.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gsckbc.c,v 1.7 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gsckbc.c,v 1.8 2011/07/01 18:33:09 dyoung Exp $");
 
 /* autoconfig and device stuff */
 #include <sys/param.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: gsckbc.c,v 1.7 2011/02/01 18:33:24 skrll Exp $");
 #include "ioconf.h"
 
 /* bus_space / bus_dma etc. */
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 /* general system data and functions */
diff --git a/sys/arch/hp700/gsc/harmony.c b/sys/arch/hp700/gsc/harmony.c
index ba077edf0656..ff4b2234fe19 100644
--- a/sys/arch/hp700/gsc/harmony.c
+++ b/sys/arch/hp700/gsc/harmony.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: harmony.c,v 1.22 2011/02/04 11:00:30 skrll Exp $	*/
+/*	$NetBSD: harmony.c,v 1.23 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*	$OpenBSD: harmony.c,v 1.23 2004/02/13 21:28:19 mickey Exp $	*/
 
@@ -85,7 +85,7 @@
 #include <machine/intr.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <hp700/dev/cpudevs.h>
 #include <hp700/gsc/gscbusvar.h>
diff --git a/sys/arch/hp700/gsc/if_ie_gsc.c b/sys/arch/hp700/gsc/if_ie_gsc.c
index 525a987bd756..340405ec9b7e 100644
--- a/sys/arch/hp700/gsc/if_ie_gsc.c
+++ b/sys/arch/hp700/gsc/if_ie_gsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ie_gsc.c,v 1.24 2011/06/03 16:28:40 tsutsui Exp $	*/
+/*	$NetBSD: if_ie_gsc.c,v 1.25 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*	$OpenBSD: if_ie_gsc.c,v 1.6 2001/01/12 22:57:04 mickey Exp $	*/
 
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_gsc.c,v 1.24 2011/06/03 16:28:40 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_gsc.c,v 1.25 2011/07/01 18:33:09 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie_gsc.c,v 1.24 2011/06/03 16:28:40 tsutsui Exp $
 
 #include <netinet/in.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
diff --git a/sys/arch/hp700/gsc/if_iee_gsc.c b/sys/arch/hp700/gsc/if_iee_gsc.c
index 171f81bf471b..6bf51bead6e7 100644
--- a/sys/arch/hp700/gsc/if_iee_gsc.c
+++ b/sys/arch/hp700/gsc/if_iee_gsc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iee_gsc.c,v 1.19 2011/02/01 18:33:24 skrll Exp $ */
+/* $NetBSD: if_iee_gsc.c,v 1.20 2011/07/01 18:33:09 dyoung Exp $ */
 
 /*
  * Copyright (c) 2003 Jochen Kunz.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iee_gsc.c,v 1.19 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iee_gsc.c,v 1.20 2011/07/01 18:33:09 dyoung Exp $");
 
 /* autoconfig and device stuff */
 #include <sys/param.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_iee_gsc.c,v 1.19 2011/02/01 18:33:24 skrll Exp $"
 #include "ioconf.h"
 
 /* bus_space / bus_dma etc. */
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 /* general system data and functions */
diff --git a/sys/arch/hp700/gsc/lpt_gsc.c b/sys/arch/hp700/gsc/lpt_gsc.c
index f6c2c0ccbe2f..c530789a6ffb 100644
--- a/sys/arch/hp700/gsc/lpt_gsc.c
+++ b/sys/arch/hp700/gsc/lpt_gsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpt_gsc.c,v 1.13 2011/02/01 18:33:24 skrll Exp $	*/
+/*	$NetBSD: lpt_gsc.c,v 1.14 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*	$OpenBSD: lpt_gsc.c,v 1.6 2000/07/21 17:41:06 mickey Exp $	*/
 
@@ -53,13 +53,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_gsc.c,v 1.13 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_gsc.c,v 1.14 2011/07/01 18:33:09 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
diff --git a/sys/arch/hp700/gsc/oosiop_gsc.c b/sys/arch/hp700/gsc/oosiop_gsc.c
index 2faad0e25dfc..174d184ae137 100644
--- a/sys/arch/hp700/gsc/oosiop_gsc.c
+++ b/sys/arch/hp700/gsc/oosiop_gsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: oosiop_gsc.c,v 1.12 2011/02/01 18:33:24 skrll Exp $	*/
+/*	$NetBSD: oosiop_gsc.c,v 1.13 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001 Matt Fredette.  All rights reserved.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oosiop_gsc.c,v 1.12 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oosiop_gsc.c,v 1.13 2011/07/01 18:33:09 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -96,7 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: oosiop_gsc.c,v 1.12 2011/02/01 18:33:24 skrll Exp $"
 #include <machine/intr.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/ic/oosiopreg.h>
 #include <dev/ic/oosiopvar.h>
diff --git a/sys/arch/hp700/gsc/osiop_gsc.c b/sys/arch/hp700/gsc/osiop_gsc.c
index edde6e6e3767..711dc8a0f57b 100644
--- a/sys/arch/hp700/gsc/osiop_gsc.c
+++ b/sys/arch/hp700/gsc/osiop_gsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: osiop_gsc.c,v 1.19 2011/02/01 18:33:24 skrll Exp $	*/
+/*	$NetBSD: osiop_gsc.c,v 1.20 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001 Matt Fredette.  All rights reserved.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osiop_gsc.c,v 1.19 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osiop_gsc.c,v 1.20 2011/07/01 18:33:09 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -96,7 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: osiop_gsc.c,v 1.19 2011/02/01 18:33:24 skrll Exp $")
 #include <machine/intr.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/ic/osiopreg.h>
 #include <dev/ic/osiopvar.h>
diff --git a/sys/arch/hp700/gsc/siop_gsc.c b/sys/arch/hp700/gsc/siop_gsc.c
index 73c458a1d657..8d188f2cea33 100644
--- a/sys/arch/hp700/gsc/siop_gsc.c
+++ b/sys/arch/hp700/gsc/siop_gsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: siop_gsc.c,v 1.13 2011/02/01 18:33:24 skrll Exp $	*/
+/*	$NetBSD: siop_gsc.c,v 1.14 2011/07/01 18:33:09 dyoung Exp $	*/
 
 /*	$OpenBSD: siop_gsc.c,v 1.4 2007/08/23 21:01:22 kettenis Exp $	*/
 
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_gsc.c,v 1.13 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_gsc.c,v 1.14 2011/07/01 18:33:09 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -28,7 +28,7 @@ __KERNEL_RCSID(0, "$NetBSD: siop_gsc.c,v 1.13 2011/02/01 18:33:24 skrll Exp $");
 #include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/iomod.h>
 
 #include <dev/scsipi/scsi_all.h>
diff --git a/sys/arch/mips/adm5120/adm5120_cfio.c b/sys/arch/mips/adm5120/adm5120_cfio.c
index 2e48b6dddea4..45fda78a54ef 100644
--- a/sys/arch/mips/adm5120/adm5120_cfio.c
+++ b/sys/arch/mips/adm5120/adm5120_cfio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_cfio.c,v 1.1 2007/03/20 08:52:04 dyoung Exp $ */
+/* $NetBSD: adm5120_cfio.c,v 1.2 2011/07/01 18:38:48 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 David Young.  All rights reserved.
@@ -30,13 +30,13 @@
  * OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_cfio.c,v 1.1 2007/03/20 08:52:04 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_cfio.c,v 1.2 2011/07/01 18:38:48 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <mips/cache.h>
 #include <mips/cpuregs.h>
diff --git a/sys/arch/mips/adm5120/adm5120_extio.c b/sys/arch/mips/adm5120/adm5120_extio.c
index d60a5de52097..d8285d3d9d07 100644
--- a/sys/arch/mips/adm5120/adm5120_extio.c
+++ b/sys/arch/mips/adm5120/adm5120_extio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_extio.c,v 1.4 2011/02/20 07:48:35 matt Exp $ */
+/* $NetBSD: adm5120_extio.c,v 1.5 2011/07/01 18:38:48 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 David Young.  All rights reserved.
@@ -65,13 +65,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_extio.c,v 1.4 2011/02/20 07:48:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_extio.c,v 1.5 2011/07/01 18:38:48 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <mips/cache.h>
 #include <mips/cpuregs.h>
diff --git a/sys/arch/mips/adm5120/adm5120_extio_space.c b/sys/arch/mips/adm5120/adm5120_extio_space.c
index 3cf77d651d40..8a96d5c20c37 100644
--- a/sys/arch/mips/adm5120/adm5120_extio_space.c
+++ b/sys/arch/mips/adm5120/adm5120_extio_space.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_extio_space.c,v 1.3 2009/10/19 23:19:38 rmind Exp $ */
+/* $NetBSD: adm5120_extio_space.c,v 1.4 2011/07/01 18:38:48 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 David Young.  All rights reserved.
@@ -60,11 +60,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_extio_space.c,v 1.3 2009/10/19 23:19:38 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_extio_space.c,v 1.4 2011/07/01 18:38:48 dyoung Exp $");
 
 #include <sys/param.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <mips/adm5120/include/adm5120reg.h>
 #include <mips/adm5120/include/adm5120_extiovar.h>
 
diff --git a/sys/arch/mips/adm5120/adm5120_intr.c b/sys/arch/mips/adm5120/adm5120_intr.c
index e927020b6a7a..42dde73927de 100644
--- a/sys/arch/mips/adm5120/adm5120_intr.c
+++ b/sys/arch/mips/adm5120/adm5120_intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: adm5120_intr.c,v 1.4 2011/02/20 07:48:35 matt Exp $	*/
+/*	$NetBSD: adm5120_intr.c,v 1.5 2011/07/01 18:38:48 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_intr.c,v 1.4 2011/02/20 07:48:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_intr.c,v 1.5 2011/07/01 18:38:48 dyoung Exp $");
 
 #include "opt_ddb.h"
 #define __INTR_PRIVATE
@@ -79,7 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: adm5120_intr.c,v 1.4 2011/02/20 07:48:35 matt Exp $"
 #include <sys/device.h>
 #include <sys/kernel.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <mips/locore.h>
diff --git a/sys/arch/mips/adm5120/adm5120_obio.c b/sys/arch/mips/adm5120/adm5120_obio.c
index 50a7a98121cd..7fbf094b5412 100644
--- a/sys/arch/mips/adm5120/adm5120_obio.c
+++ b/sys/arch/mips/adm5120/adm5120_obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_obio.c,v 1.3 2011/02/20 07:48:35 matt Exp $ */
+/* $NetBSD: adm5120_obio.c,v 1.4 2011/07/01 18:38:48 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -66,13 +66,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_obio.c,v 1.3 2011/02/20 07:48:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_obio.c,v 1.4 2011/07/01 18:38:48 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <mips/cache.h>
 #include <mips/cpuregs.h>
diff --git a/sys/arch/mips/adm5120/adm5120_obio_dma.c b/sys/arch/mips/adm5120/adm5120_obio_dma.c
index 3fa624f0ac27..d2f043153d94 100644
--- a/sys/arch/mips/adm5120/adm5120_obio_dma.c
+++ b/sys/arch/mips/adm5120/adm5120_obio_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: adm5120_obio_dma.c,v 1.3 2011/02/20 07:48:35 matt Exp $	*/
+/*	$NetBSD: adm5120_obio_dma.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,12 +64,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_dma.c,v 1.3 2011/02/20 07:48:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_dma.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $");
 
 #include <sys/param.h>
 
 #define	_MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <mips/adm5120/include/adm5120_obiovar.h>
 
diff --git a/sys/arch/mips/adm5120/adm5120_obio_space.c b/sys/arch/mips/adm5120/adm5120_obio_space.c
index 96037f03085a..7572ae4da72d 100644
--- a/sys/arch/mips/adm5120/adm5120_obio_space.c
+++ b/sys/arch/mips/adm5120/adm5120_obio_space.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_obio_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: adm5120_obio_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,11 +64,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
 
 #include <sys/param.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <mips/adm5120/include/adm5120_obiovar.h>
 
 #define	CHIP			obio
diff --git a/sys/arch/mips/adm5120/adm5120_pciio_space.c b/sys/arch/mips/adm5120/adm5120_pciio_space.c
index ab0aa732b669..a9e5c1a8cca4 100644
--- a/sys/arch/mips/adm5120/adm5120_pciio_space.c
+++ b/sys/arch/mips/adm5120/adm5120_pciio_space.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_pciio_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: adm5120_pciio_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,11 +34,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_pciio_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_pciio_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
 
 #include <sys/param.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <mips/adm5120/include/adm5120reg.h>
 #include <mips/adm5120/include/adm5120_pcivar.h>
 
diff --git a/sys/arch/mips/adm5120/adm5120_pcimem_space.c b/sys/arch/mips/adm5120/adm5120_pcimem_space.c
index 2b5ebbdb79dd..1b57b32d3b74 100644
--- a/sys/arch/mips/adm5120/adm5120_pcimem_space.c
+++ b/sys/arch/mips/adm5120/adm5120_pcimem_space.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_pcimem_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: adm5120_pcimem_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,11 +34,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_pcimem_space.c,v 1.2 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_pcimem_space.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
 
 #include <sys/param.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <mips/adm5120/include/adm5120reg.h>
 #include <mips/adm5120/include/adm5120_pcivar.h>
 
diff --git a/sys/arch/mips/adm5120/dev/admgpio.c b/sys/arch/mips/adm5120/dev/admgpio.c
index bdd2c0309038..e23cb7b2b80d 100644
--- a/sys/arch/mips/adm5120/dev/admgpio.c
+++ b/sys/arch/mips/adm5120/dev/admgpio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: admgpio.c,v 1.3 2011/02/20 07:48:35 matt Exp $ */
+/* $NetBSD: admgpio.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 David Young.  All rights reserved.
@@ -28,7 +28,7 @@
  */
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: admgpio.c,v 1.3 2011/02/20 07:48:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: admgpio.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: admgpio.c,v 1.3 2011/02/20 07:48:35 matt Exp $");
 #include <sys/gpio.h>
 #include <sys/kernel.h>	/* for hz */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/gpio/gpiovar.h>
 
diff --git a/sys/arch/mips/adm5120/dev/admpci.c b/sys/arch/mips/adm5120/dev/admpci.c
index 55a1671cf4d5..9b91809cc87c 100644
--- a/sys/arch/mips/adm5120/dev/admpci.c
+++ b/sys/arch/mips/adm5120/dev/admpci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: admpci.c,v 1.6 2011/05/17 17:34:50 dyoung Exp $ */
+/* $NetBSD: admpci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 David Young.  All rights reserved.
@@ -61,7 +61,7 @@
 #include "pci.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.6 2011/05/17 17:34:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1.6 2011/05/17 17:34:50 dyoung Exp $");
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/pte.h>
 
diff --git a/sys/arch/mips/adm5120/dev/admwdog.c b/sys/arch/mips/adm5120/dev/admwdog.c
index 82b26f15aa83..61cfd87c78d7 100644
--- a/sys/arch/mips/adm5120/dev/admwdog.c
+++ b/sys/arch/mips/adm5120/dev/admwdog.c
@@ -1,4 +1,4 @@
-/* $NetBSD: admwdog.c,v 1.2 2009/10/19 23:19:38 rmind Exp $ */
+/* $NetBSD: admwdog.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 David Young.  All rights reserved.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: admwdog.c,v 1.2 2009/10/19 23:19:38 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: admwdog.c,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: admwdog.c,v 1.2 2009/10/19 23:19:38 rmind Exp $");
 #include <sys/wdog.h>
 #include <sys/kernel.h>	/* for hz */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/sysmon/sysmonvar.h>
 
diff --git a/sys/arch/mips/adm5120/dev/ahci.c b/sys/arch/mips/adm5120/dev/ahci.c
index d84ce7c1367f..68d0703d51d9 100644
--- a/sys/arch/mips/adm5120/dev/ahci.c
+++ b/sys/arch/mips/adm5120/dev/ahci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahci.c,v 1.6 2011/04/04 19:58:56 dyoung Exp $	*/
+/*	$NetBSD: ahci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.6 2011/04/04 19:58:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.7 2011/07/01 18:38:49 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.6 2011/04/04 19:58:56 dyoung Exp $");
 #include <sys/device.h>
 #include <sys/malloc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 
 #include <dev/usb/usb.h>
diff --git a/sys/arch/mips/adm5120/dev/if_admsw.c b/sys/arch/mips/adm5120/dev/if_admsw.c
index b04c23322b18..2acda4b676a4 100644
--- a/sys/arch/mips/adm5120/dev/if_admsw.c
+++ b/sys/arch/mips/adm5120/dev/if_admsw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_admsw.c,v 1.8 2010/04/05 07:19:30 joerg Exp $ */
+/* $NetBSD: if_admsw.c,v 1.9 2011/07/01 18:38:49 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.8 2010/04/05 07:19:30 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.9 2011/07/01 18:38:49 dyoung Exp $");
 
 
 #include <sys/param.h>
@@ -102,7 +102,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.8 2010/04/05 07:19:30 joerg Exp $");
 
 #include <net/bpf.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/endian.h>
 
diff --git a/sys/arch/mips/adm5120/dev/if_admswvar.h b/sys/arch/mips/adm5120/dev/if_admswvar.h
index 3ede25d1a5a4..c0418a396aab 100644
--- a/sys/arch/mips/adm5120/dev/if_admswvar.h
+++ b/sys/arch/mips/adm5120/dev/if_admswvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_admswvar.h,v 1.2 2010/01/19 22:06:21 pooka Exp $ */
+/* $NetBSD: if_admswvar.h,v 1.3 2011/07/01 18:38:49 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -34,7 +34,7 @@
 #define	_IF_ADMSWVAR_H_
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_admswvar.h,v 1.2 2010/01/19 22:06:21 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_admswvar.h,v 1.3 2011/07/01 18:38:49 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_admswvar.h,v 1.2 2010/01/19 22:06:21 pooka Exp $"
 #include <net/if_media.h>
 #include <net/if_ether.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/endian.h>
 
diff --git a/sys/arch/mips/adm5120/dev/uart.c b/sys/arch/mips/adm5120/dev/uart.c
index f47782bd232d..225edbf17e47 100644
--- a/sys/arch/mips/adm5120/dev/uart.c
+++ b/sys/arch/mips/adm5120/dev/uart.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uart.c,v 1.7 2011/04/24 16:26:56 rmind Exp $ */
+/* $NetBSD: uart.c,v 1.8 2011/07/01 18:38:49 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uart.c,v 1.7 2011/04/24 16:26:56 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uart.c,v 1.8 2011/07/01 18:38:49 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: uart.c,v 1.7 2011/04/24 16:26:56 rmind Exp $");
 #include <sys/vnode.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <mips/adm5120/include/adm5120var.h>
 #include <mips/adm5120/include/adm5120_obiovar.h>
diff --git a/sys/arch/mips/adm5120/dev/wdc_extio.c b/sys/arch/mips/adm5120/dev/wdc_extio.c
index a74df2eece94..ddf8ddfb3bc5 100644
--- a/sys/arch/mips/adm5120/dev/wdc_extio.c
+++ b/sys/arch/mips/adm5120/dev/wdc_extio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_extio.c,v 1.3 2009/10/19 23:19:38 rmind Exp $ */
+/*	$NetBSD: wdc_extio.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 David Young.  All rights reserved.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_extio.c,v 1.3 2009/10/19 23:19:38 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_extio.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: wdc_extio.c,v 1.3 2009/10/19 23:19:38 rmind Exp $");
 #include <sys/kernel.h>
 #include <sys/callout.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/cpu.h>
 
diff --git a/sys/arch/mips/adm5120/include/adm5120var.h b/sys/arch/mips/adm5120/include/adm5120var.h
index 57051f1bf20f..7f419235e7c7 100644
--- a/sys/arch/mips/adm5120/include/adm5120var.h
+++ b/sys/arch/mips/adm5120/include/adm5120var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: adm5120var.h,v 1.2 2008/04/28 20:23:27 martin Exp $	*/
+/*	$NetBSD: adm5120var.h,v 1.3 2011/07/01 18:38:49 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -62,7 +62,7 @@
 #ifndef	_ADM5120VAR_H_
 #define	_ADM5120VAR_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #if 0
 #include <sys/socket.h>
diff --git a/sys/arch/mips/alchemy/au1000.c b/sys/arch/mips/alchemy/au1000.c
index 961b4e8b9dbf..8ab61629820e 100644
--- a/sys/arch/mips/alchemy/au1000.c
+++ b/sys/arch/mips/alchemy/au1000.c
@@ -1,4 +1,4 @@
-/* $NetBSD: au1000.c,v 1.8 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: au1000.c,v 1.9 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -100,7 +100,7 @@
 __KERNEL_RCSID(0, "$NetBSD");
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/auvar.h>
diff --git a/sys/arch/mips/alchemy/au1100.c b/sys/arch/mips/alchemy/au1100.c
index 78d02aed0e23..02b81eeae642 100644
--- a/sys/arch/mips/alchemy/au1100.c
+++ b/sys/arch/mips/alchemy/au1100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: au1100.c,v 1.8 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: au1100.c,v 1.9 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -97,10 +97,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1100.c,v 1.8 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1100.c,v 1.9 2011/07/01 18:39:29 dyoung Exp $");
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/auvar.h>
diff --git a/sys/arch/mips/alchemy/au1500.c b/sys/arch/mips/alchemy/au1500.c
index 11699910f0ce..61dd55c74186 100644
--- a/sys/arch/mips/alchemy/au1500.c
+++ b/sys/arch/mips/alchemy/au1500.c
@@ -1,4 +1,4 @@
-/* $NetBSD: au1500.c,v 1.9 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: au1500.c,v 1.10 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -97,10 +97,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1500.c,v 1.9 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1500.c,v 1.10 2011/07/01 18:39:29 dyoung Exp $");
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/auvar.h>
diff --git a/sys/arch/mips/alchemy/au1550.c b/sys/arch/mips/alchemy/au1550.c
index 9d00225d2c7e..3eccc3b454fa 100644
--- a/sys/arch/mips/alchemy/au1550.c
+++ b/sys/arch/mips/alchemy/au1550.c
@@ -1,4 +1,4 @@
-/* $NetBSD: au1550.c,v 1.12 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: au1550.c,v 1.13 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -97,10 +97,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1550.c,v 1.12 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1550.c,v 1.13 2011/07/01 18:39:29 dyoung Exp $");
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/auvar.h>
diff --git a/sys/arch/mips/alchemy/au_chipdep.c b/sys/arch/mips/alchemy/au_chipdep.c
index 1ff7d525db07..1362a6d4a5cd 100644
--- a/sys/arch/mips/alchemy/au_chipdep.c
+++ b/sys/arch/mips/alchemy/au_chipdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: au_chipdep.c,v 1.2 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: au_chipdep.c,v 1.3 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,10 +32,10 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_chipdep.c,v 1.2 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_chipdep.c,v 1.3 2011/07/01 18:39:29 dyoung Exp $");
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/auvar.h>
diff --git a/sys/arch/mips/alchemy/au_cpureg_mem.c b/sys/arch/mips/alchemy/au_cpureg_mem.c
index a43fc285c9d2..6381d9c15b0a 100644
--- a/sys/arch/mips/alchemy/au_cpureg_mem.c
+++ b/sys/arch/mips/alchemy/au_cpureg_mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: au_cpureg_mem.c,v 1.5 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: au_cpureg_mem.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,11 +34,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_cpureg_mem.c,v 1.5 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_cpureg_mem.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $");
 
 #include <sys/param.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <mips/alchemy/include/auvar.h>
 #include <mips/alchemy/include/aubusvar.h>
 
diff --git a/sys/arch/mips/alchemy/au_himem_space.c b/sys/arch/mips/alchemy/au_himem_space.c
index 32a5581649ce..f930012cc244 100644
--- a/sys/arch/mips/alchemy/au_himem_space.c
+++ b/sys/arch/mips/alchemy/au_himem_space.c
@@ -1,4 +1,4 @@
-/* $NetBSD: au_himem_space.c,v 1.11 2010/06/07 13:33:33 martin Exp $ */
+/* $NetBSD: au_himem_space.c,v 1.12 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_himem_space.c,v 1.11 2010/06/07 13:33:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_himem_space.c,v 1.12 2011/07/01 18:39:29 dyoung Exp $");
 
 /*
  * This provides mappings for the upper I/O regions used on some
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: au_himem_space.c,v 1.11 2010/06/07 13:33:33 martin E
 #include <sys/endian.h>
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <mips/alchemy/include/au_himem_space.h>
 
diff --git a/sys/arch/mips/alchemy/au_icu.c b/sys/arch/mips/alchemy/au_icu.c
index 28a6664611a3..9c680cf8abdb 100644
--- a/sys/arch/mips/alchemy/au_icu.c
+++ b/sys/arch/mips/alchemy/au_icu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: au_icu.c,v 1.26 2011/02/20 07:48:36 matt Exp $	*/
+/*	$NetBSD: au_icu.c,v 1.27 2011/07/01 18:39:29 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_icu.c,v 1.26 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_icu.c,v 1.27 2011/07/01 18:39:29 dyoung Exp $");
 
 #include "opt_ddb.h"
 #define __INTR_PRIVATE
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: au_icu.c,v 1.26 2011/02/20 07:48:36 matt Exp $");
 #include <sys/device.h>
 #include <sys/kernel.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <mips/locore.h>
diff --git a/sys/arch/mips/alchemy/au_timer.c b/sys/arch/mips/alchemy/au_timer.c
index 0cdc18e8f7de..dd182183368f 100644
--- a/sys/arch/mips/alchemy/au_timer.c
+++ b/sys/arch/mips/alchemy/au_timer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: au_timer.c,v 1.10 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: au_timer.c,v 1.11 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,14 +36,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_timer.c,v 1.10 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_timer.c,v 1.11 2011/07/01 18:39:29 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/lwp.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <mips/locore.h>
 
 #include <mips/alchemy/include/aureg.h>
diff --git a/sys/arch/mips/alchemy/au_wired_space.c b/sys/arch/mips/alchemy/au_wired_space.c
index c5edc5f68de5..35b353f7e84b 100644
--- a/sys/arch/mips/alchemy/au_wired_space.c
+++ b/sys/arch/mips/alchemy/au_wired_space.c
@@ -1,4 +1,4 @@
-/* $NetBSD: au_wired_space.c,v 1.6 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: au_wired_space.c,v 1.7 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_wired_space.c,v 1.6 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_wired_space.c,v 1.7 2011/07/01 18:39:29 dyoung Exp $");
 
 /*
  * This provides mappings for the upper I/O regions used on some
@@ -75,7 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: au_wired_space.c,v 1.6 2008/04/28 20:23:27 martin Ex
 #include <sys/malloc.h>
 #include <sys/endian.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <machine/wired_map.h>
 #include <mips/alchemy/include/au_wired_space.h>
diff --git a/sys/arch/mips/alchemy/aubus.c b/sys/arch/mips/alchemy/aubus.c
index def975897c68..fa3aca7bf8ff 100644
--- a/sys/arch/mips/alchemy/aubus.c
+++ b/sys/arch/mips/alchemy/aubus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aubus.c,v 1.21 2011/02/20 07:48:36 matt Exp $ */
+/* $NetBSD: aubus.c,v 1.22 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aubus.c,v 1.21 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aubus.c,v 1.22 2011/07/01 18:39:29 dyoung Exp $");
 
 #include "locators.h"
 
@@ -108,7 +108,7 @@ __KERNEL_RCSID(0, "$NetBSD: aubus.c,v 1.21 2011/02/20 07:48:36 matt Exp $");
 #include <sys/malloc.h>
 
 #define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/auvar.h>
diff --git a/sys/arch/mips/alchemy/dev/augpio.c b/sys/arch/mips/alchemy/dev/augpio.c
index f06ac8c3e654..6b8f401ef4b6 100644
--- a/sys/arch/mips/alchemy/dev/augpio.c
+++ b/sys/arch/mips/alchemy/dev/augpio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: augpio.c,v 1.5 2006/03/24 18:22:42 gdamore Exp $ */
+/* $NetBSD: augpio.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: augpio.c,v 1.5 2006/03/24 18:22:42 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: augpio.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: augpio.c,v 1.5 2006/03/24 18:22:42 gdamore Exp $");
 
 #include <dev/gpio/gpiovar.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 
 #include <mips/alchemy/include/aubusvar.h>
diff --git a/sys/arch/mips/alchemy/dev/aupci.c b/sys/arch/mips/alchemy/dev/aupci.c
index 3271da698fea..9dd16fffc9ac 100644
--- a/sys/arch/mips/alchemy/dev/aupci.c
+++ b/sys/arch/mips/alchemy/dev/aupci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aupci.c,v 1.10 2011/05/17 17:34:51 dyoung Exp $ */
+/* $NetBSD: aupci.c,v 1.11 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -35,7 +35,7 @@
 #include "pci.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aupci.c,v 1.10 2011/05/17 17:34:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aupci.c,v 1.11 2011/07/01 18:39:29 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: aupci.c,v 1.10 2011/05/17 17:34:51 dyoung Exp $");
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/pte.h>
 
diff --git a/sys/arch/mips/alchemy/dev/aupsc.c b/sys/arch/mips/alchemy/dev/aupsc.c
index a5983c6f0bc9..7730a76fee49 100644
--- a/sys/arch/mips/alchemy/dev/aupsc.c
+++ b/sys/arch/mips/alchemy/dev/aupsc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aupsc.c,v 1.5 2006/10/02 07:32:16 gdamore Exp $ */
+/* $NetBSD: aupsc.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aupsc.c,v 1.5 2006/10/02 07:32:16 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aupsc.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $");
 
 #include "locators.h"
 
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: aupsc.c,v 1.5 2006/10/02 07:32:16 gdamore Exp $");
 #include <sys/device.h>
 #include <sys/errno.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 
 #include <mips/alchemy/include/aubusvar.h>
diff --git a/sys/arch/mips/alchemy/dev/aurtc.c b/sys/arch/mips/alchemy/dev/aurtc.c
index f7c8b5ff30eb..8b7d17dbba62 100644
--- a/sys/arch/mips/alchemy/dev/aurtc.c
+++ b/sys/arch/mips/alchemy/dev/aurtc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aurtc.c,v 1.12 2009/12/12 14:44:09 tsutsui Exp $ */
+/* $NetBSD: aurtc.c,v 1.13 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -68,7 +68,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aurtc.c,v 1.12 2009/12/12 14:44:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aurtc.c,v 1.13 2011/07/01 18:39:29 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -78,7 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: aurtc.c,v 1.12 2009/12/12 14:44:09 tsutsui Exp $");
 
 #include <dev/clock_subr.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/auvar.h>
diff --git a/sys/arch/mips/alchemy/dev/ausmbus_psc.c b/sys/arch/mips/alchemy/dev/ausmbus_psc.c
index 2d85658b4fde..c35a26ca6b35 100644
--- a/sys/arch/mips/alchemy/dev/ausmbus_psc.c
+++ b/sys/arch/mips/alchemy/dev/ausmbus_psc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ausmbus_psc.c,v 1.9 2009/04/20 12:11:50 pgoyette Exp $ */
+/* $NetBSD: ausmbus_psc.c,v 1.10 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ausmbus_psc.c,v 1.9 2009/04/20 12:11:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ausmbus_psc.c,v 1.10 2011/07/01 18:39:29 dyoung Exp $");
 
 #include "locators.h"
 
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: ausmbus_psc.c,v 1.9 2009/04/20 12:11:50 pgoyette Exp
 #include <sys/device.h>
 #include <sys/errno.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 
 #include <mips/alchemy/dev/aupscreg.h>
diff --git a/sys/arch/mips/alchemy/dev/auspi.c b/sys/arch/mips/alchemy/dev/auspi.c
index ef98d16f401b..44749a6957fa 100644
--- a/sys/arch/mips/alchemy/dev/auspi.c
+++ b/sys/arch/mips/alchemy/dev/auspi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auspi.c,v 1.4 2011/06/08 23:05:48 rmind Exp $ */
+/* $NetBSD: auspi.c,v 1.5 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.4 2011/06/08 23:05:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.5 2011/07/01 18:39:29 dyoung Exp $");
 
 #include "locators.h"
 
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.4 2011/06/08 23:05:48 rmind Exp $");
 #include <sys/errno.h>
 #include <sys/proc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 
 #include <mips/alchemy/include/aubusvar.h>
diff --git a/sys/arch/mips/alchemy/dev/com_aubus.c b/sys/arch/mips/alchemy/dev/com_aubus.c
index be84b40af3ea..2c04126be86e 100644
--- a/sys/arch/mips/alchemy/dev/com_aubus.c
+++ b/sys/arch/mips/alchemy/dev/com_aubus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_aubus.c,v 1.5 2008/03/14 15:09:10 cube Exp $ */
+/* $NetBSD: com_aubus.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_aubus.c,v 1.5 2008/03/14 15:09:10 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_aubus.c,v 1.6 2011/07/01 18:39:29 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_aubus.c,v 1.5 2008/03/14 15:09:10 cube Exp $");
 #include <sys/systm.h>
 #include <sys/tty.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/ic/comvar.h>
 
 #include <mips/alchemy/include/aureg.h>
diff --git a/sys/arch/mips/alchemy/dev/if_aumac.c b/sys/arch/mips/alchemy/dev/if_aumac.c
index ea8f9879f248..0f21e173c01c 100644
--- a/sys/arch/mips/alchemy/dev/if_aumac.c
+++ b/sys/arch/mips/alchemy/dev/if_aumac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aumac.c,v 1.29 2010/11/12 13:40:10 uebayasi Exp $ */
+/* $NetBSD: if_aumac.c,v 1.30 2011/07/01 18:39:29 dyoung Exp $ */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.29 2010/11/12 13:40:10 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.30 2011/07/01 18:39:29 dyoung Exp $");
 
 #include "rnd.h"
 
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.29 2010/11/12 13:40:10 uebayasi Exp $
 #include <sys/rnd.h>
 #endif
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/endian.h>
 
diff --git a/sys/arch/mips/alchemy/dev/ohci_aubus.c b/sys/arch/mips/alchemy/dev/ohci_aubus.c
index cb2a9d3dce6b..f5c15c907005 100644
--- a/sys/arch/mips/alchemy/dev/ohci_aubus.c
+++ b/sys/arch/mips/alchemy/dev/ohci_aubus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ohci_aubus.c,v 1.14 2008/04/28 20:23:27 martin Exp $	*/
+/*	$NetBSD: ohci_aubus.c,v 1.15 2011/07/01 18:39:29 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_aubus.c,v 1.14 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_aubus.c,v 1.15 2011/07/01 18:39:29 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/auvar.h>
diff --git a/sys/arch/mips/alchemy/include/aubusvar.h b/sys/arch/mips/alchemy/include/aubusvar.h
index d2b8708b1d7c..b59f0c7b4435 100644
--- a/sys/arch/mips/alchemy/include/aubusvar.h
+++ b/sys/arch/mips/alchemy/include/aubusvar.h
@@ -1,9 +1,9 @@
-/* $NetBSD: aubusvar.h,v 1.4 2006/07/13 22:56:01 gdamore Exp $ */
+/* $NetBSD: aubusvar.h,v 1.5 2011/07/01 18:39:30 dyoung Exp $ */
 
 #ifndef _MIPS_ALCHEMY_DEV_AUBUSVAR_H_
 #define	_MIPS_ALCHEMY_DEV_AUBUSVAR_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /*
  * Machine-dependent structures for autoconfiguration
diff --git a/sys/arch/mips/atheros/ar5312_board.c b/sys/arch/mips/atheros/ar5312_board.c
index a9ad7e237f6d..0dc20563d551 100644
--- a/sys/arch/mips/atheros/ar5312_board.c
+++ b/sys/arch/mips/atheros/ar5312_board.c
@@ -1,4 +1,4 @@
-/* $Id: ar5312_board.c,v 1.2 2009/07/06 00:43:22 alc Exp $ */
+/* $Id: ar5312_board.c,v 1.3 2011/07/01 18:40:00 dyoung Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -40,13 +40,13 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.2 2009/07/06 00:43:22 alc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.3 2011/07/01 18:40:00 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <mips/atheros/include/ar5312reg.h>
 #include <mips/atheros/include/ar531xvar.h>
 
diff --git a/sys/arch/mips/atheros/ar5312_intr.c b/sys/arch/mips/atheros/ar5312_intr.c
index 2311114971b7..ed1544933110 100644
--- a/sys/arch/mips/atheros/ar5312_intr.c
+++ b/sys/arch/mips/atheros/ar5312_intr.c
@@ -1,4 +1,4 @@
-/* $Id: ar5312_intr.c,v 1.7 2011/02/20 07:48:36 matt Exp $ */
+/* $Id: ar5312_intr.c,v 1.8 2011/07/01 18:40:00 dyoung Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5312_intr.c,v 1.7 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5312_intr.c,v 1.8 2011/07/01 18:40:00 dyoung Exp $");
 
 #define __INTR_PRIVATE
 
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: ar5312_intr.c,v 1.7 2011/02/20 07:48:36 matt Exp $")
 #include <sys/device.h>
 #include <sys/kernel.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <mips/locore.h>
diff --git a/sys/arch/mips/atheros/ar5315_intr.c b/sys/arch/mips/atheros/ar5315_intr.c
index 46da4c67cd83..ffe6066ef8b8 100644
--- a/sys/arch/mips/atheros/ar5315_intr.c
+++ b/sys/arch/mips/atheros/ar5315_intr.c
@@ -1,4 +1,4 @@
-/* $Id: ar5315_intr.c,v 1.6 2011/02/20 07:48:36 matt Exp $ */
+/* $Id: ar5315_intr.c,v 1.7 2011/07/01 18:40:00 dyoung Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5315_intr.c,v 1.6 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5315_intr.c,v 1.7 2011/07/01 18:40:00 dyoung Exp $");
 
 #define __INTR_PRIVATE
 
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: ar5315_intr.c,v 1.6 2011/02/20 07:48:36 matt Exp $")
 #include <sys/device.h>
 #include <sys/kernel.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <mips/locore.h>
diff --git a/sys/arch/mips/atheros/arbus.c b/sys/arch/mips/atheros/arbus.c
index f1dc9df261fb..a23ac9b99fd6 100644
--- a/sys/arch/mips/atheros/arbus.c
+++ b/sys/arch/mips/atheros/arbus.c
@@ -1,4 +1,4 @@
-/* $Id: arbus.c,v 1.12 2011/02/20 07:48:36 matt Exp $ */
+/* $Id: arbus.c,v 1.13 2011/07/01 18:40:00 dyoung Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arbus.c,v 1.12 2011/02/20 07:48:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arbus.c,v 1.13 2011/07/01 18:40:00 dyoung Exp $");
 
 #include "locators.h"
 #include <sys/param.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: arbus.c,v 1.12 2011/02/20 07:48:36 matt Exp $");
 #include <sys/malloc.h>
 
 #define	_MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <mips/atheros/include/ar5312reg.h>
 #include <mips/atheros/include/ar531xvar.h>
 #include <mips/atheros/include/arbusvar.h>
diff --git a/sys/arch/mips/atheros/dev/argpio.c b/sys/arch/mips/atheros/dev/argpio.c
index 656d1bea88e7..ba7f0522739c 100644
--- a/sys/arch/mips/atheros/dev/argpio.c
+++ b/sys/arch/mips/atheros/dev/argpio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: argpio.c,v 1.3 2006/09/04 05:17:26 gdamore Exp $ */
+/* $NetBSD: argpio.c,v 1.4 2011/07/01 18:40:00 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Garrett D'Amore
@@ -32,7 +32,7 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: argpio.c,v 1.3 2006/09/04 05:17:26 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: argpio.c,v 1.4 2011/07/01 18:40:00 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: argpio.c,v 1.3 2006/09/04 05:17:26 gdamore Exp $");
 #include <sys/device.h>
 #include <sys/gpio.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <mips/atheros/include/arbusvar.h>
diff --git a/sys/arch/mips/atheros/dev/arspi.c b/sys/arch/mips/atheros/dev/arspi.c
index 9fe61bd58bcc..037904ec6315 100644
--- a/sys/arch/mips/atheros/dev/arspi.c
+++ b/sys/arch/mips/atheros/dev/arspi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: arspi.c,v 1.6 2011/06/08 23:05:48 rmind Exp $ */
+/* $NetBSD: arspi.c,v 1.7 2011/07/01 18:40:00 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arspi.c,v 1.6 2011/06/08 23:05:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arspi.c,v 1.7 2011/07/01 18:40:00 dyoung Exp $");
 
 #include "locators.h"
 
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: arspi.c,v 1.6 2011/06/08 23:05:48 rmind Exp $");
 #include <sys/proc.h>
 #include <sys/queue.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 
 #include <mips/atheros/include/ar5315reg.h>
diff --git a/sys/arch/mips/atheros/dev/athflash.c b/sys/arch/mips/atheros/dev/athflash.c
index 72b165f786ee..e6938a3edad8 100644
--- a/sys/arch/mips/atheros/dev/athflash.c
+++ b/sys/arch/mips/atheros/dev/athflash.c
@@ -1,4 +1,4 @@
-/* $NetBSD: athflash.c,v 1.3 2008/06/11 23:55:20 cegger Exp $ */
+/* $NetBSD: athflash.c,v 1.4 2011/07/01 18:40:00 dyoung Exp $ */
 
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: athflash.c,v 1.3 2008/06/11 23:55:20 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athflash.c,v 1.4 2011/07/01 18:40:00 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -92,7 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: athflash.c,v 1.3 2008/06/11 23:55:20 cegger Exp $");
 #include <sys/proc.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <mips/atheros/include/arbusvar.h>
 
diff --git a/sys/arch/mips/atheros/dev/com_arbus.c b/sys/arch/mips/atheros/dev/com_arbus.c
index b344e857d80a..4f2b56b63442 100644
--- a/sys/arch/mips/atheros/dev/com_arbus.c
+++ b/sys/arch/mips/atheros/dev/com_arbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_arbus.c,v 1.8 2011/02/09 22:01:44 matt Exp $ */
+/* $NetBSD: com_arbus.c,v 1.9 2011/07/01 18:40:00 dyoung Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -101,7 +101,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_arbus.c,v 1.8 2011/02/09 22:01:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_arbus.c,v 1.9 2011/07/01 18:40:00 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -111,7 +111,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_arbus.c,v 1.8 2011/02/09 22:01:44 matt Exp $");
 #include <sys/ttydefaults.h>
 #include <sys/types.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/cons.h>
 #include <dev/ic/comreg.h>
diff --git a/sys/arch/mips/atheros/dev/if_ae.c b/sys/arch/mips/atheros/dev/if_ae.c
index 6554d6d704d8..061a42a9b7b5 100644
--- a/sys/arch/mips/atheros/dev/if_ae.c
+++ b/sys/arch/mips/atheros/dev/if_ae.c
@@ -1,4 +1,4 @@
-/* $Id: if_ae.c,v 1.19 2010/04/05 07:19:31 joerg Exp $ */
+/* $Id: if_ae.c,v 1.20 2011/07/01 18:40:00 dyoung Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.19 2010/04/05 07:19:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.20 2011/07/01 18:40:00 dyoung Exp $");
 
 
 #include <sys/param.h>
@@ -123,7 +123,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.19 2010/04/05 07:19:31 joerg Exp $");
 
 #include <net/bpf.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/mii/mii.h>
diff --git a/sys/arch/mips/atheros/dev/if_ath_arbus.c b/sys/arch/mips/atheros/dev/if_ath_arbus.c
index 7514b1618657..817a6b80d3bb 100644
--- a/sys/arch/mips/atheros/dev/if_ath_arbus.c
+++ b/sys/arch/mips/atheros/dev/if_ath_arbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_arbus.c,v 1.18 2010/02/24 22:37:55 dyoung Exp $ */
+/* $NetBSD: if_ath_arbus.c,v 1.19 2011/07/01 18:40:01 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Jared D. McNeill <jmcneill@invisible.ca>
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.18 2010/02/24 22:37:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.19 2011/07/01 18:40:01 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.18 2010/02/24 22:37:55 dyoung Exp
 #include <sys/kernel.h>
 #include <sys/errno.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <net/if.h>
diff --git a/sys/arch/mips/atheros/include/ar531xvar.h b/sys/arch/mips/atheros/include/ar531xvar.h
index e7765f686609..159a40445b2b 100644
--- a/sys/arch/mips/atheros/include/ar531xvar.h
+++ b/sys/arch/mips/atheros/include/ar531xvar.h
@@ -1,4 +1,4 @@
-/* $Id: ar531xvar.h,v 1.6 2011/02/20 07:48:36 matt Exp $ */
+/* $Id: ar531xvar.h,v 1.7 2011/07/01 18:40:01 dyoung Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -44,7 +44,7 @@
 #define	_MIPS_ATHEROS_AR531XVAR_H_
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 struct ar531x_device {
 	const char	*name;
diff --git a/sys/arch/mips/atheros/include/arbusvar.h b/sys/arch/mips/atheros/include/arbusvar.h
index 75d2833787a6..d5410e6411a5 100644
--- a/sys/arch/mips/atheros/include/arbusvar.h
+++ b/sys/arch/mips/atheros/include/arbusvar.h
@@ -1,4 +1,4 @@
-/* $Id: arbusvar.h,v 1.2 2006/09/04 05:17:26 gdamore Exp $ */
+/* $Id: arbusvar.h,v 1.3 2011/07/01 18:40:01 dyoung Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -43,7 +43,7 @@
 #ifndef	_MIPS_ATHEROS_ARBUSVAR_H_
 #define	_MIPS_ATHEROS_ARBUSVAR_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 struct arbus_attach_args {
 	const char	*aa_name;
diff --git a/sys/arch/xen/i386/npx_hv.c b/sys/arch/xen/i386/npx_hv.c
index 627b1638e73e..ef102345742a 100644
--- a/sys/arch/xen/i386/npx_hv.c
+++ b/sys/arch/xen/i386/npx_hv.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: npx_hv.c,v 1.8 2009/10/23 02:32:33 snj Exp $	*/
+/*	$NetBSD: npx_hv.c,v 1.9 2011/07/01 18:37:36 dyoung Exp $	*/
 
 /*
  *
@@ -28,13 +28,13 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npx_hv.c,v 1.8 2009/10/23 02:32:33 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npx_hv.c,v 1.9 2011/07/01 18:37:36 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/stdarg.h>
 
 #include <xen/xen.h>
diff --git a/sys/arch/xen/x86/consinit.c b/sys/arch/xen/x86/consinit.c
index 66bb687bc0a8..7d2dc4de9848 100644
--- a/sys/arch/xen/x86/consinit.c
+++ b/sys/arch/xen/x86/consinit.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: consinit.c,v 1.14 2010/04/28 19:17:04 dyoung Exp $	*/
+/*	$NetBSD: consinit.c,v 1.15 2011/07/01 18:37:08 dyoung Exp $	*/
 /*	NetBSD: consinit.c,v 1.4 2004/03/13 17:31:34 bjh21 Exp 	*/
 
 /*
@@ -28,14 +28,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.14 2010/04/28 19:17:04 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.15 2011/07/01 18:37:08 dyoung Exp $");
 
 #include "opt_kgdb.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/bootinfo.h>
 
 #include "xencons.h"
diff --git a/sys/arch/xen/x86/mainbus.c b/sys/arch/xen/x86/mainbus.c
index 1ed31ab3baf3..4aaea5ec35b7 100644
--- a/sys/arch/xen/x86/mainbus.c
+++ b/sys/arch/xen/x86/mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.13 2010/11/12 02:07:27 dholland Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.14 2011/07/01 18:37:08 dyoung Exp $	*/
 /*	NetBSD: mainbus.c,v 1.53 2003/10/27 14:11:47 junyoung Exp 	*/
 
 /*
@@ -32,13 +32,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.13 2010/11/12 02:07:27 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.14 2011/07/01 18:37:08 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include "hypervisor.h"
 #include "pci.h"
diff --git a/sys/arch/xen/x86/xen_bus_dma.c b/sys/arch/xen/x86/xen_bus_dma.c
index 20d857e99448..efc838e1144a 100644
--- a/sys/arch/xen/x86/xen_bus_dma.c
+++ b/sys/arch/xen/x86/xen_bus_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: xen_bus_dma.c,v 1.22 2010/11/12 10:51:14 njoly Exp $	*/
+/*	$NetBSD: xen_bus_dma.c,v 1.23 2011/07/01 18:37:08 dyoung Exp $	*/
 /*	NetBSD bus_dma.c,v 1.21 2005/04/16 07:53:35 yamt Exp */
 
 /*-
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_bus_dma.c,v 1.22 2010/11/12 10:51:14 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_bus_dma.c,v 1.23 2011/07/01 18:37:08 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: xen_bus_dma.c,v 1.22 2010/11/12 10:51:14 njoly Exp $
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/bus_private.h>
 
 #include <uvm/uvm.h>
diff --git a/sys/arch/xen/xen/isa_machdep.c b/sys/arch/xen/xen/isa_machdep.c
index 1def792c483c..3ed364fd9484 100644
--- a/sys/arch/xen/xen/isa_machdep.c
+++ b/sys/arch/xen/xen/isa_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.c,v 1.23 2010/02/06 17:48:54 bouyer Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.24 2011/07/01 18:36:45 dyoung Exp $	*/
 /*	NetBSD isa_machdep.c,v 1.11 2004/06/20 18:04:08 thorpej Exp 	*/
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.23 2010/02/06 17:48:54 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.24 2011/07/01 18:36:45 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.23 2010/02/06 17:48:54 bouyer Exp
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/bus_private.h>
 
 #include <machine/pio.h>
diff --git a/sys/arch/xen/xen/pci_intr_machdep.c b/sys/arch/xen/xen/pci_intr_machdep.c
index bf11c52648bb..35bfe182abfd 100644
--- a/sys/arch/xen/xen/pci_intr_machdep.c
+++ b/sys/arch/xen/xen/pci_intr_machdep.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: pci_intr_machdep.c,v 1.14 2011/04/04 20:37:55 dyoung Exp $      */
+/*      $NetBSD: pci_intr_machdep.c,v 1.15 2011/07/01 18:36:45 dyoung Exp $      */
 
 /*
  * Copyright (c) 2005 Manuel Bouyer.
@@ -26,13 +26,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.14 2011/04/04 20:37:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.15 2011/07/01 18:36:45 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/bus_private.h>
 
 #include <dev/pci/pcivar.h>
diff --git a/sys/external/bsd/drm/dist/bsd-core/drmP.h b/sys/external/bsd/drm/dist/bsd-core/drmP.h
index b07037fcee2a..0c04ad190a72 100644
--- a/sys/external/bsd/drm/dist/bsd-core/drmP.h
+++ b/sys/external/bsd/drm/dist/bsd-core/drmP.h
@@ -74,7 +74,7 @@ struct drm_file;
 #include <machine/param.h>
 #endif
 #include <machine/pmap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #if defined(__i386__) || defined(__x86_64__)
 #include <machine/specialreg.h>
 #include <machine/sysarch.h>