diff --git a/distrib/sets/lists/comp/md.hpcarm b/distrib/sets/lists/comp/md.hpcarm
index 1199946524c3..53a27f4f4e56 100644
--- a/distrib/sets/lists/comp/md.hpcarm
+++ b/distrib/sets/lists/comp/md.hpcarm
@@ -1,11 +1,11 @@
-# $NetBSD: md.hpcarm,v 1.16 2011/07/18 17:39:05 dyoung Exp $
+# $NetBSD: md.hpcarm,v 1.17 2011/07/19 15:37:38 dyoung Exp $
 ./usr/include/hpcarm				comp-c-include
 ./usr/include/hpcarm/ansi.h			comp-c-include
 ./usr/include/hpcarm/aout_machdep.h		comp-c-include
 ./usr/include/hpcarm/apmvar.h			comp-c-include
 ./usr/include/hpcarm/asm.h			comp-c-include
 ./usr/include/hpcarm/bswap.h			comp-c-include
-./usr/include/hpcarm/bus.h			comp-c-include
+./usr/include/hpcarm/bus.h			comp-obsolete		obsolete
 ./usr/include/hpcarm/cdefs.h			comp-c-include
 ./usr/include/hpcarm/cpu.h			comp-c-include
 ./usr/include/hpcarm/db_machdep.h		comp-obsolete		obsolete
diff --git a/sys/arch/hpcarm/dev/ipaq_atmelgpio.c b/sys/arch/hpcarm/dev/ipaq_atmelgpio.c
index 6acea6362306..4a30a4645219 100644
--- a/sys/arch/hpcarm/dev/ipaq_atmelgpio.c
+++ b/sys/arch/hpcarm/dev/ipaq_atmelgpio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipaq_atmelgpio.c,v 1.15 2009/05/29 14:15:44 rjs Exp $	*/
+/*	$NetBSD: ipaq_atmelgpio.c,v 1.16 2011/07/19 15:37:38 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.  All rights reserved.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipaq_atmelgpio.c,v 1.15 2009/05/29 14:15:44 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipaq_atmelgpio.c,v 1.16 2011/07/19 15:37:38 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -44,8 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: ipaq_atmelgpio.c,v 1.15 2009/05/29 14:15:44 rjs Exp
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <hpcarm/dev/ipaq_saipvar.h>
 #include <hpcarm/dev/ipaq_gpioreg.h>
diff --git a/sys/arch/hpcarm/dev/ipaq_lcd.c b/sys/arch/hpcarm/dev/ipaq_lcd.c
index 5a85dd37ae82..9e9905cf768a 100644
--- a/sys/arch/hpcarm/dev/ipaq_lcd.c
+++ b/sys/arch/hpcarm/dev/ipaq_lcd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipaq_lcd.c,v 1.18 2009/05/29 14:15:44 rjs Exp $	*/
+/*	$NetBSD: ipaq_lcd.c,v 1.19 2011/07/19 15:37:38 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipaq_lcd.c,v 1.18 2009/05/29 14:15:44 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipaq_lcd.c,v 1.19 2011/07/19 15:37:38 dyoung Exp $");
 
 #define IPAQ_LCD_DEBUG
 
@@ -40,13 +40,13 @@ __KERNEL_RCSID(0, "$NetBSD: ipaq_lcd.c,v 1.18 2009/05/29 14:15:44 rjs Exp $");
 #include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/device.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 
 #include <dev/wscons/wsconsio.h>
 
 #include <machine/bootinfo.h>
-#include <machine/bus.h>
 #include <machine/intr.h>
 #include <arm/cpufunc.h>
 #include <arm/arm32/katelib.h>
diff --git a/sys/arch/hpcarm/dev/ipaq_lcdvar.h b/sys/arch/hpcarm/dev/ipaq_lcdvar.h
index 7dfba33ed60a..be3a79f10c93 100644
--- a/sys/arch/hpcarm/dev/ipaq_lcdvar.h
+++ b/sys/arch/hpcarm/dev/ipaq_lcdvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipaq_lcdvar.h,v 1.3 2009/05/29 14:15:44 rjs Exp $ */
+/*	$NetBSD: ipaq_lcdvar.h,v 1.4 2011/07/19 15:37:38 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/rasops/rasops.h>
 
diff --git a/sys/arch/hpcarm/dev/ipaq_pcic.c b/sys/arch/hpcarm/dev/ipaq_pcic.c
index 0e0b758c4119..e3ac7eb8c23f 100644
--- a/sys/arch/hpcarm/dev/ipaq_pcic.c
+++ b/sys/arch/hpcarm/dev/ipaq_pcic.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: ipaq_pcic.c,v 1.19 2009/05/29 14:15:45 rjs Exp $        */
+/*      $NetBSD: ipaq_pcic.c,v 1.20 2011/07/19 15:37:38 dyoung Exp $        */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipaq_pcic.c,v 1.19 2009/05/29 14:15:45 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipaq_pcic.c,v 1.20 2011/07/19 15:37:38 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,8 +41,8 @@ __KERNEL_RCSID(0, "$NetBSD: ipaq_pcic.c,v 1.19 2009/05/29 14:15:45 rjs Exp $");
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <dev/pcmcia/pcmciachip.h>
 #include <dev/pcmcia/pcmciavar.h>
 
diff --git a/sys/arch/hpcarm/dev/ipaq_saip.c b/sys/arch/hpcarm/dev/ipaq_saip.c
index b2e77cbd1de7..99763e26dc8e 100644
--- a/sys/arch/hpcarm/dev/ipaq_saip.c
+++ b/sys/arch/hpcarm/dev/ipaq_saip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipaq_saip.c,v 1.22 2009/05/29 14:15:45 rjs Exp $	*/
+/*	$NetBSD: ipaq_saip.c,v 1.23 2011/07/19 15:37:38 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001, The NetBSD Foundation, Inc.  All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipaq_saip.c,v 1.22 2009/05/29 14:15:45 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipaq_saip.c,v 1.23 2011/07/19 15:37:38 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,9 +39,9 @@ __KERNEL_RCSID(0, "$NetBSD: ipaq_saip.c,v 1.22 2009/05/29 14:15:45 rjs Exp $");
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/uio.h>
+#include <sys/bus.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
 
 #include <arm/sa11x0/sa11x0_var.h>
 #include <arm/sa11x0/sa11x0_reg.h>
diff --git a/sys/arch/hpcarm/dev/j720pcic.c b/sys/arch/hpcarm/dev/j720pcic.c
index 9d959f01e71b..34bc35df27aa 100644
--- a/sys/arch/hpcarm/dev/j720pcic.c
+++ b/sys/arch/hpcarm/dev/j720pcic.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: j720pcic.c,v 1.7 2010/08/19 15:17:53 tsutsui Exp $        */
+/*      $NetBSD: j720pcic.c,v 1.8 2011/07/19 15:37:38 dyoung Exp $        */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 /* Jornada 720 PCMCIA support. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: j720pcic.c,v 1.7 2010/08/19 15:17:53 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: j720pcic.c,v 1.8 2011/07/19 15:37:38 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -43,8 +43,8 @@ __KERNEL_RCSID(0, "$NetBSD: j720pcic.c,v 1.7 2010/08/19 15:17:53 tsutsui Exp $")
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <machine/platid.h>
 #include <machine/platid_mask.h>
 
diff --git a/sys/arch/hpcarm/dev/sacc_hpcarm.c b/sys/arch/hpcarm/dev/sacc_hpcarm.c
index b7d888774a34..b89b84b7e851 100644
--- a/sys/arch/hpcarm/dev/sacc_hpcarm.c
+++ b/sys/arch/hpcarm/dev/sacc_hpcarm.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: sacc_hpcarm.c,v 1.11 2009/05/29 14:15:45 rjs Exp $	*/
+/*      $NetBSD: sacc_hpcarm.c,v 1.12 2011/07/19 15:37:38 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sacc_hpcarm.c,v 1.11 2009/05/29 14:15:45 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sacc_hpcarm.c,v 1.12 2011/07/19 15:37:38 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -44,8 +44,8 @@ __KERNEL_RCSID(0, "$NetBSD: sacc_hpcarm.c,v 1.11 2009/05/29 14:15:45 rjs Exp $")
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/uio.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <machine/platid.h>
 #include <machine/platid_mask.h>
 
diff --git a/sys/arch/hpcarm/dev/sed_saip.c b/sys/arch/hpcarm/dev/sed_saip.c
index 016d007343d2..049cd8355391 100644
--- a/sys/arch/hpcarm/dev/sed_saip.c
+++ b/sys/arch/hpcarm/dev/sed_saip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sed_saip.c,v 1.24 2009/05/29 14:15:45 rjs Exp $	*/
+/*	$NetBSD: sed_saip.c,v 1.25 2011/07/19 15:37:38 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1999-2001
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sed_saip.c,v 1.24 2009/05/29 14:15:45 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sed_saip.c,v 1.25 2011/07/19 15:37:38 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -42,8 +42,8 @@ __KERNEL_RCSID(0, "$NetBSD: sed_saip.c,v 1.24 2009/05/29 14:15:45 rjs Exp $");
 #include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/reboot.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <machine/bootinfo.h>
 #include <machine/config_hook.h>
 #include <machine/platid.h>
diff --git a/sys/arch/hpcarm/dev/uda1341.c b/sys/arch/hpcarm/dev/uda1341.c
index 26e82ea35458..7ae4a058de89 100644
--- a/sys/arch/hpcarm/dev/uda1341.c
+++ b/sys/arch/hpcarm/dev/uda1341.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uda1341.c,v 1.14 2009/05/29 14:15:45 rjs Exp $	*/
+/*	$NetBSD: uda1341.c,v 1.15 2011/07/19 15:37:38 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.  All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uda1341.c,v 1.14 2009/05/29 14:15:45 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uda1341.c,v 1.15 2011/07/19 15:37:38 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,8 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: uda1341.c,v 1.14 2009/05/29 14:15:45 rjs Exp $");
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <hpcarm/dev/ipaq_saipvar.h>
 #include <hpcarm/dev/ipaq_gpioreg.h>
diff --git a/sys/arch/hpcarm/dev/wzero3_kbd.c b/sys/arch/hpcarm/dev/wzero3_kbd.c
index eb504eaca89f..973df7db487e 100644
--- a/sys/arch/hpcarm/dev/wzero3_kbd.c
+++ b/sys/arch/hpcarm/dev/wzero3_kbd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wzero3_kbd.c,v 1.5 2010/05/30 03:17:21 nonaka Exp $	*/
+/*	$NetBSD: wzero3_kbd.c,v 1.6 2011/07/19 15:37:38 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2008, 2009, 2010 NONAKA Kimihiro <nonaka@netbsd.org>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wzero3_kbd.c,v 1.5 2010/05/30 03:17:21 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wzero3_kbd.c,v 1.6 2011/07/19 15:37:38 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -35,6 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: wzero3_kbd.c,v 1.5 2010/05/30 03:17:21 nonaka Exp $"
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/callout.h>
+#include <sys/bus.h>
 
 #include <dev/sysmon/sysmonvar.h>
 #include <dev/sysmon/sysmon_taskq.h>
@@ -43,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: wzero3_kbd.c,v 1.5 2010/05/30 03:17:21 nonaka Exp $"
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0_gpio.h>
 
-#include <machine/bus.h>
 #include <machine/bootinfo.h>
 #include <machine/config_hook.h>
 #include <machine/platid.h>
diff --git a/sys/arch/hpcarm/dev/wzero3_keypad.c b/sys/arch/hpcarm/dev/wzero3_keypad.c
index 5f24a2e7530e..52f590543969 100644
--- a/sys/arch/hpcarm/dev/wzero3_keypad.c
+++ b/sys/arch/hpcarm/dev/wzero3_keypad.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wzero3_keypad.c,v 1.1 2010/05/30 10:00:27 nonaka Exp $	*/
+/*	$NetBSD: wzero3_keypad.c,v 1.2 2011/07/19 15:37:39 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2010 NONAKA Kimihiro <nonaka@netbsd.org>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wzero3_keypad.c,v 1.1 2010/05/30 10:00:27 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wzero3_keypad.c,v 1.2 2011/07/19 15:37:39 dyoung Exp $");
 
 #include "wzero3lcd.h"
 #include "opt_wsdisplay_compat.h"
@@ -37,12 +37,12 @@ __KERNEL_RCSID(0, "$NetBSD: wzero3_keypad.c,v 1.1 2010/05/30 10:00:27 nonaka Exp
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/callout.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/pxa2x0cpu.h>
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0_gpio.h>
 
-#include <machine/bus.h>
 #include <machine/bootinfo.h>
 #include <machine/config_hook.h>
 #include <machine/platid.h>
diff --git a/sys/arch/hpcarm/dev/wzero3_lcd.c b/sys/arch/hpcarm/dev/wzero3_lcd.c
index e9655f59605e..835f07783b57 100644
--- a/sys/arch/hpcarm/dev/wzero3_lcd.c
+++ b/sys/arch/hpcarm/dev/wzero3_lcd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wzero3_lcd.c,v 1.2 2010/12/09 04:37:04 uebayasi Exp $	*/
+/*	$NetBSD: wzero3_lcd.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2008,2009 NONAKA Kimihiro <nonaka@netbsd.org>
@@ -27,12 +27,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wzero3_lcd.c,v 1.2 2010/12/09 04:37:04 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wzero3_lcd.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/pmf.h>
+#include <sys/bus.h>
 
 #include <dev/cons.h>
 #include <dev/wscons/wsconsio.h>
@@ -45,7 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: wzero3_lcd.c,v 1.2 2010/12/09 04:37:04 uebayasi Exp
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0_lcd.h>
 
-#include <machine/bus.h>
 #include <machine/bootinfo.h>
 #include <machine/platid.h>
 #include <machine/platid_mask.h>
diff --git a/sys/arch/hpcarm/dev/wzero3_mci.c b/sys/arch/hpcarm/dev/wzero3_mci.c
index 0b8002f3d4cf..44f100316bce 100644
--- a/sys/arch/hpcarm/dev/wzero3_mci.c
+++ b/sys/arch/hpcarm/dev/wzero3_mci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wzero3_mci.c,v 1.2 2010/05/23 11:53:18 nonaka Exp $	*/
+/*	$NetBSD: wzero3_mci.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
@@ -27,14 +27,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wzero3_mci.c,v 1.2 2010/05/23 11:53:18 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wzero3_mci.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/pmf.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <machine/bootinfo.h>
 #include <machine/platid.h>
 #include <machine/platid_mask.h>
diff --git a/sys/arch/hpcarm/dev/wzero3_usb.c b/sys/arch/hpcarm/dev/wzero3_usb.c
index d210b3495a95..bb2b702f667f 100644
--- a/sys/arch/hpcarm/dev/wzero3_usb.c
+++ b/sys/arch/hpcarm/dev/wzero3_usb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wzero3_usb.c,v 1.1 2010/04/17 13:36:21 nonaka Exp $	*/
+/*	$NetBSD: wzero3_usb.c,v 1.2 2011/07/19 15:37:39 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
@@ -24,17 +24,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wzero3_usb.c,v 1.1 2010/04/17 13:36:21 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wzero3_usb.c,v 1.2 2011/07/19 15:37:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
+#include <sys/bus.h>
 
 #include <arm/xscale/pxa2x0reg.h>
 #include <arm/xscale/pxa2x0var.h>
 #include <arm/xscale/pxa2x0_gpio.h>
 
-#include <machine/bus.h>
 #include <machine/bootinfo.h>
 #include <machine/config_hook.h>
 #include <machine/platid.h>
diff --git a/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c b/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
index 70afc8c243fc..b3918c40b418 100644
--- a/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
+++ b/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.12 2011/06/30 20:09:30 wiz Exp $	*/
+/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.13 2011/07/19 15:37:39 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.12 2011/06/30 20:09:30 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.13 2011/07/19 15:37:39 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -59,6 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.12 2011/06/30 20:09:30 wiz
 #include <sys/boot_flag.h>
 #include <sys/conf.h>	/* XXX for consinit related hacks */
 #include <sys/device.h>
+#include <sys/bus.h>
 
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 #include <machine/db_machdep.h>
@@ -82,7 +83,6 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.12 2011/06/30 20:09:30 wiz
 
 #include <machine/bootconfig.h>
 #include <machine/bootinfo.h>
-#include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <machine/intr.h>
diff --git a/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c b/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
index 778ddf5e512c..325b303bf6a6 100644
--- a/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
+++ b/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_hpc_machdep.c,v 1.2 2010/06/26 00:25:02 tsutsui Exp $	*/
+/*	$NetBSD: sa11x0_hpc_machdep.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.2 2010/06/26 00:25:02 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
@@ -60,6 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.2 2010/06/26 00:25:02 tsuts
 #include <sys/conf.h>	/* XXX for consinit related hacks */
 #include <sys/device.h>
 #include <sys/termios.h>
+#include <sys/bus.h>
 
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 #include <machine/db_machdep.h>
@@ -80,7 +81,6 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.2 2010/06/26 00:25:02 tsuts
 
 #include <machine/bootconfig.h>
 #include <machine/bootinfo.h>
-#include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <machine/intr.h>
diff --git a/sys/arch/hpcarm/include/Makefile b/sys/arch/hpcarm/include/Makefile
index 8f34b1d3ae23..ad5537b9eefd 100644
--- a/sys/arch/hpcarm/include/Makefile
+++ b/sys/arch/hpcarm/include/Makefile
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.26 2011/07/17 20:54:40 joerg Exp $
+#	$NetBSD: Makefile,v 1.27 2011/07/19 15:37:39 dyoung Exp $
 
 INCSDIR= /usr/include/hpcarm
 
 INCS=	ansi.h apmvar.h aout_machdep.h asm.h \
-	bswap.h bus.h \
+	bswap.h \
 	cdefs.h cpu.h \
 	disklabel.h \
 	elf_machdep.h endian.h endian_machdep.h \
diff --git a/sys/arch/hpcarm/include/bus.h b/sys/arch/hpcarm/include/bus.h
deleted file mode 100644
index a4ad8e27176f..000000000000
--- a/sys/arch/hpcarm/include/bus.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $NetBSD: bus.h,v 1.3 2001/06/18 21:37:34 bjh21 Exp $ */
-
-#include <arm/bus.h>
-
diff --git a/sys/arch/hpcarm/include/bus_defs.h b/sys/arch/hpcarm/include/bus_defs.h
new file mode 100644
index 000000000000..568bc7d9f78f
--- /dev/null
+++ b/sys/arch/hpcarm/include/bus_defs.h
@@ -0,0 +1,4 @@
+/* $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:37:39 dyoung Exp $ */
+
+#include <arm/bus_defs.h>
+
diff --git a/sys/arch/hpcarm/include/bus_funcs.h b/sys/arch/hpcarm/include/bus_funcs.h
new file mode 100644
index 000000000000..b5611f596826
--- /dev/null
+++ b/sys/arch/hpcarm/include/bus_funcs.h
@@ -0,0 +1,4 @@
+/* $NetBSD: bus_funcs.h,v 1.1 2011/07/19 15:37:39 dyoung Exp $ */
+
+#include <arm/bus_funcs.h>
+