diff --git a/sys/arch/evbmips/adm5120/machdep.c b/sys/arch/evbmips/adm5120/machdep.c
index 997fd73b342e..2d9477fdd961 100644
--- a/sys/arch/evbmips/adm5120/machdep.c
+++ b/sys/arch/evbmips/adm5120/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.20 2011/02/20 07:48:33 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.21 2011/07/10 00:03:52 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.20 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2011/07/10 00:03:52 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -83,16 +83,16 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.20 2011/02/20 07:48:33 matt Exp $");
 #include "pci.h"
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/buf.h>
-#include <sys/reboot.h>
-#include <sys/mount.h>
-#include <sys/kcore.h>
 #include <sys/boot_flag.h>
-#include <sys/termios.h>
-#include <sys/ksyms.h>
+#include <sys/buf.h>
 #include <sys/device.h>
+#include <sys/kcore.h>
+#include <sys/kernel.h>
+#include <sys/ksyms.h>
+#include <sys/mount.h>
+#include <sys/reboot.h>
+#include <sys/systm.h>
+#include <sys/termios.h>
 
 #include <net/if.h>
 #include <net/if_ether.h>
@@ -104,7 +104,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.20 2011/02/20 07:48:33 matt Exp $");
 #include "ksyms.h"
 
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-#include <machine/db_machdep.h>
+#include <mips/db_machdep.h>
 #include <ddb/db_extern.h>
 #endif
 
diff --git a/sys/arch/evbmips/alchemy/dbau1500.c b/sys/arch/evbmips/alchemy/dbau1500.c
index cdf1454cd9c1..176bad3146ab 100644
--- a/sys/arch/evbmips/alchemy/dbau1500.c
+++ b/sys/arch/evbmips/alchemy/dbau1500.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dbau1500.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $ */
+/* $NetBSD: dbau1500.c,v 1.7 2011/07/10 00:03:52 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,11 +32,13 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbau1500.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbau1500.c,v 1.7 2011/07/10 00:03:52 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
-#include <machine/locore.h>
+
+#include <mips/locore.h>
+
 #include <evbmips/alchemy/obiovar.h>
 #include <evbmips/alchemy/board.h>
 #include <evbmips/alchemy/dbau1500reg.h>
diff --git a/sys/arch/evbmips/alchemy/dbau1550.c b/sys/arch/evbmips/alchemy/dbau1550.c
index e291ce3478a3..f3475ea9ac90 100644
--- a/sys/arch/evbmips/alchemy/dbau1550.c
+++ b/sys/arch/evbmips/alchemy/dbau1550.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dbau1550.c,v 1.11 2011/07/01 18:44:45 dyoung Exp $ */
+/* $NetBSD: dbau1550.c,v 1.12 2011/07/10 00:03:52 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,19 +32,22 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v 1.11 2011/07/01 18:44:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v 1.12 2011/07/10 00:03:52 matt Exp $");
 
 #include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/time.h>
-#include <sys/proc.h>
 #include <sys/bus.h>
-#include <machine/locore.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <sys/time.h>
+
+#include <mips/locore.h>
+
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/dev/aupcmciavar.h>
 #include <mips/alchemy/dev/aupcmciareg.h>
 #include <mips/alchemy/dev/augpioreg.h>
 #include <mips/alchemy/dev/auspivar.h>
+
 #include <evbmips/alchemy/obiovar.h>
 #include <evbmips/alchemy/board.h>
 #include <evbmips/alchemy/dbau1550reg.h>
diff --git a/sys/arch/evbmips/alchemy/genericbd.c b/sys/arch/evbmips/alchemy/genericbd.c
index 88b00e3ff5cd..aaf83351cfb4 100644
--- a/sys/arch/evbmips/alchemy/genericbd.c
+++ b/sys/arch/evbmips/alchemy/genericbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: genericbd.c,v 1.3 2011/07/01 18:44:45 dyoung Exp $ */
+/* $NetBSD: genericbd.c,v 1.4 2011/07/10 00:03:52 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,11 +32,13 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genericbd.c,v 1.3 2011/07/01 18:44:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genericbd.c,v 1.4 2011/07/10 00:03:52 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
-#include <machine/locore.h>
+
+#include <mips/locore.h>
+
 #include <evbmips/alchemy/obiovar.h>
 #include <evbmips/alchemy/board.h>
 
diff --git a/sys/arch/evbmips/alchemy/mach_intr.c b/sys/arch/evbmips/alchemy/mach_intr.c
index 94463f3d4429..0a6e70cd8010 100644
--- a/sys/arch/evbmips/alchemy/mach_intr.c
+++ b/sys/arch/evbmips/alchemy/mach_intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mach_intr.c,v 1.5 2011/07/01 18:44:45 dyoung Exp $	*/
+/*	$NetBSD: mach_intr.c,v 1.6 2011/07/10 00:03:52 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,19 +38,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.5 2011/07/01 18:44:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.6 2011/07/10 00:03:52 matt Exp $");
 
 #include "opt_ddb.h"
 
 #include <sys/param.h>
-#include <sys/queue.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/kernel.h>
-
-#include <sys/bus.h>
-#include <machine/intr.h>
 
 #include <mips/locore.h>
 #include <mips/alchemy/include/auvar.h>
diff --git a/sys/arch/evbmips/alchemy/machdep.c b/sys/arch/evbmips/alchemy/machdep.c
index e30ccad1848b..4ea4dba04f2a 100644
--- a/sys/arch/evbmips/alchemy/machdep.c
+++ b/sys/arch/evbmips/alchemy/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.50 2011/04/04 20:37:49 dyoung Exp $ */
+/* $NetBSD: machdep.c,v 1.51 2011/07/10 00:03:52 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2011/04/04 20:37:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.51 2011/07/10 00:03:52 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -80,16 +80,16 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2011/04/04 20:37:49 dyoung Exp $");
 #include "opt_ethaddr.h"
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/buf.h>
-#include <sys/reboot.h>
-#include <sys/mount.h>
-#include <sys/kcore.h>
 #include <sys/boot_flag.h>
-#include <sys/termios.h>
-#include <sys/ksyms.h>
+#include <sys/buf.h>
 #include <sys/device.h>
+#include <sys/kcore.h>
+#include <sys/kernel.h>
+#include <sys/ksyms.h>
+#include <sys/mount.h>
+#include <sys/reboot.h>
+#include <sys/systm.h>
+#include <sys/termios.h>
 
 #include <net/if.h>
 #include <net/if_ether.h>
@@ -101,15 +101,17 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2011/04/04 20:37:49 dyoung Exp $");
 #include "ksyms.h"
 
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-#include <machine/db_machdep.h>
+#include <mips/db_machdep.h>
 #include <ddb/db_extern.h>
 #endif
 
 #include <mips/cache.h>
 #include <mips/locore.h>
+
 #include <machine/yamon.h>
 
 #include <evbmips/alchemy/board.h>
+
 #include <mips/alchemy/dev/aupcivar.h>
 #include <mips/alchemy/dev/aupcmciavar.h>
 #include <mips/alchemy/dev/auspivar.h>
diff --git a/sys/arch/evbmips/alchemy/mtx-1.c b/sys/arch/evbmips/alchemy/mtx-1.c
index a1855f1b1287..c0aa67489d13 100644
--- a/sys/arch/evbmips/alchemy/mtx-1.c
+++ b/sys/arch/evbmips/alchemy/mtx-1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mtx-1.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $ */
+/* $NetBSD: mtx-1.c,v 1.7 2011/07/10 00:03:52 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,11 +32,13 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mtx-1.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mtx-1.c,v 1.7 2011/07/10 00:03:52 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
-#include <machine/locore.h>
+
+#include <mips/locore.h>
+
 #include <evbmips/alchemy/obiovar.h>
 #include <evbmips/alchemy/board.h>
 
diff --git a/sys/arch/evbmips/alchemy/omsal400.c b/sys/arch/evbmips/alchemy/omsal400.c
index be5e7aebc9d4..6a0b58363ac7 100644
--- a/sys/arch/evbmips/alchemy/omsal400.c
+++ b/sys/arch/evbmips/alchemy/omsal400.c
@@ -1,4 +1,4 @@
-/* $NetBSD: omsal400.c,v 1.8 2011/07/01 18:44:45 dyoung Exp $ */
+/* $NetBSD: omsal400.c,v 1.9 2011/07/10 00:03:52 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -36,13 +36,16 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omsal400.c,v 1.8 2011/07/01 18:44:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omsal400.c,v 1.9 2011/07/10 00:03:52 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
-#include <machine/locore.h>
+
+#include <mips/locore.h>
+
 #include <mips/alchemy/dev/augpiovar.h>
 #include <mips/alchemy/dev/aupcmciavar.h>
+
 #include <evbmips/alchemy/obiovar.h>
 #include <evbmips/alchemy/board.h>
 #include <evbmips/alchemy/omsal400reg.h>
diff --git a/sys/arch/evbmips/atheros/mach_intr.c b/sys/arch/evbmips/atheros/mach_intr.c
index 81592de1b323..3c6c22c1a93b 100644
--- a/sys/arch/evbmips/atheros/mach_intr.c
+++ b/sys/arch/evbmips/atheros/mach_intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mach_intr.c,v 1.5 2011/07/07 05:06:44 matt Exp $	*/
+/*	$NetBSD: mach_intr.c,v 1.6 2011/07/10 00:03:53 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,18 +34,16 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.5 2011/07/07 05:06:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.6 2011/07/10 00:03:53 matt Exp $");
 
 #include "opt_ddb.h"
 
 #include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/kernel.h>
-
 #include <sys/bus.h>
-#include <machine/intr.h>
+#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/kernel.h>
+#include <sys/systm.h>
 
 #include <mips/locore.h>
 #include <mips/atheros/include/platform.h>
diff --git a/sys/arch/evbmips/atheros/machdep.c b/sys/arch/evbmips/atheros/machdep.c
index 3fb250861a46..cf680ab44640 100644
--- a/sys/arch/evbmips/atheros/machdep.c
+++ b/sys/arch/evbmips/atheros/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.26 2011/07/07 05:06:44 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.27 2011/07/10 00:03:53 matt Exp $ */
 
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -110,23 +110,20 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.26 2011/07/07 05:06:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.27 2011/07/10 00:03:53 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/buf.h>
-#include <sys/reboot.h>
-#include <sys/mount.h>
-#include <sys/kcore.h>
 #include <sys/boot_flag.h>
-#include <sys/termios.h>
-#include <sys/ksyms.h>
 #include <sys/device.h>
+#include <sys/kernel.h>
+#include <sys/kcore.h>
+#include <sys/ksyms.h>
+#include <sys/mount.h>
+#include <sys/reboot.h>
 
 #include <uvm/uvm_extern.h>
 
@@ -135,7 +132,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.26 2011/07/07 05:06:44 matt Exp $");
 #include "ksyms.h"
 
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-#include <machine/db_machdep.h>
+#include <mips/db_machdep.h>
 #include <ddb/db_extern.h>
 #endif
 
diff --git a/sys/arch/evbmips/atheros/wdog.c b/sys/arch/evbmips/atheros/wdog.c
index 0802f424d231..c750b9ddc10c 100644
--- a/sys/arch/evbmips/atheros/wdog.c
+++ b/sys/arch/evbmips/atheros/wdog.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdog.c,v 1.6 2011/07/07 05:06:44 matt Exp $ */
+/* $NetBSD: wdog.c,v 1.7 2011/07/10 00:03:53 matt Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -79,15 +79,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdog.c,v 1.6 2011/07/07 05:06:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdog.c,v 1.7 2011/07/10 00:03:53 matt Exp $");
 
 #include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/wdog.h>
 
-#include <machine/cpu.h>
-
 #include <mips/atheros/include/platform.h>
 
 #include <dev/sysmon/sysmonvar.h>
diff --git a/sys/arch/evbmips/evbmips/interrupt.c b/sys/arch/evbmips/evbmips/interrupt.c
index 3bad3fe99875..1d3f7626a862 100644
--- a/sys/arch/evbmips/evbmips/interrupt.c
+++ b/sys/arch/evbmips/evbmips/interrupt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: interrupt.c,v 1.16 2011/07/07 05:06:44 matt Exp $	*/
+/*	$NetBSD: interrupt.c,v 1.17 2011/07/10 00:03:53 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,15 +30,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.16 2011/07/07 05:06:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.17 2011/07/10 00:03:53 matt Exp $");
 
 #include <sys/param.h>
-#include <sys/device.h>
 #include <sys/cpu.h>
+#include <sys/device.h>
 #include <sys/intr.h>
 
+#include <mips/locore.h>
 #include <mips/mips3_clock.h>
-#include <machine/locore.h>
 
 void
 intr_init(void)
diff --git a/sys/arch/evbmips/gdium/gdium_bus_io.c b/sys/arch/evbmips/gdium/gdium_bus_io.c
index 71a840ad19fa..6e8d71973d05 100644
--- a/sys/arch/evbmips/gdium/gdium_bus_io.c
+++ b/sys/arch/evbmips/gdium/gdium_bus_io.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdium_bus_io.c,v 1.1 2009/08/06 00:50:26 matt Exp $	*/
+/*	$NetBSD: gdium_bus_io.c,v 1.2 2011/07/10 00:03:53 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,17 +34,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_bus_io.c,v 1.1 2009/08/06 00:50:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_bus_io.c,v 1.2 2011/07/10 00:03:53 matt Exp $");
 
 #include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
-#include <sys/device.h>
+#include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/locore.h>
+#include <mips/locore.h>
 
 #include <mips/bonito/bonitoreg.h>
 
diff --git a/sys/arch/evbmips/gdium/gdium_bus_mem.c b/sys/arch/evbmips/gdium/gdium_bus_mem.c
index 879eca633928..fdc04bf9b29e 100644
--- a/sys/arch/evbmips/gdium/gdium_bus_mem.c
+++ b/sys/arch/evbmips/gdium/gdium_bus_mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdium_bus_mem.c,v 1.1 2009/08/06 00:50:26 matt Exp $	*/
+/*	$NetBSD: gdium_bus_mem.c,v 1.2 2011/07/10 00:03:53 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,17 +34,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_bus_mem.c,v 1.1 2009/08/06 00:50:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_bus_mem.c,v 1.2 2011/07/10 00:03:53 matt Exp $");
 
 #include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
-#include <sys/device.h>
+#include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/locore.h>
+#include <mips/locore.h>
 
 #include <mips/bonito/bonitoreg.h>
 
diff --git a/sys/arch/evbmips/gdium/gdium_dma.c b/sys/arch/evbmips/gdium/gdium_dma.c
index c511a6059d89..f9a65e098887 100644
--- a/sys/arch/evbmips/gdium/gdium_dma.c
+++ b/sys/arch/evbmips/gdium/gdium_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdium_dma.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $	*/
+/*	$NetBSD: gdium_dma.c,v 1.5 2011/07/10 00:03:53 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,11 +34,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_dma.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $");
-
-#include <sys/param.h>
+__KERNEL_RCSID(0, "$NetBSD: gdium_dma.c,v 1.5 2011/07/10 00:03:53 matt Exp $");
 
 #define	_MIPS_BUS_DMA_PRIVATE
+
+#include <sys/param.h>
 #include <sys/bus.h>
 
 #include <evbmips/gdium/gdiumreg.h>
diff --git a/sys/arch/evbmips/gdium/gdium_genfb.c b/sys/arch/evbmips/gdium/gdium_genfb.c
index 0339e62f06dc..6487d6bfaf7e 100644
--- a/sys/arch/evbmips/gdium/gdium_genfb.c
+++ b/sys/arch/evbmips/gdium/gdium_genfb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdium_genfb.c,v 1.5 2011/07/01 18:45:36 dyoung Exp $	*/
+/*	$NetBSD: gdium_genfb.c,v 1.6 2011/07/10 00:03:53 matt Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,10 +28,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_genfb.c,v 1.5 2011/07/01 18:45:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_genfb.c,v 1.6 2011/07/10 00:03:53 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
+#include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
@@ -39,8 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: gdium_genfb.c,v 1.5 2011/07/01 18:45:36 dyoung Exp $
 #include <sys/malloc.h>
 #include <sys/systm.h>
 
-#include <sys/bus.h>
-
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/rasops/rasops.h>
diff --git a/sys/arch/evbmips/gdium/gdium_intr.c b/sys/arch/evbmips/gdium/gdium_intr.c
index 5ae2947ef733..d8747e2f300a 100644
--- a/sys/arch/evbmips/gdium/gdium_intr.c
+++ b/sys/arch/evbmips/gdium/gdium_intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdium_intr.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $	*/
+/*	$NetBSD: gdium_intr.c,v 1.5 2011/07/10 00:03:53 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_intr.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_intr.c,v 1.5 2011/07/10 00:03:53 matt Exp $");
 
 #define __INTR_PRIVATE
 
@@ -45,15 +45,13 @@ __KERNEL_RCSID(0, "$NetBSD: gdium_intr.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $"
 #include "opt_ddb.h"
 
 #include <sys/param.h>
-#include <sys/queue.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/kernel.h>
-#include <sys/cpu.h>
-
-#include <sys/bus.h>
-#include <machine/intr.h>
 
 #include <mips/locore.h>
 
diff --git a/sys/arch/evbmips/gdium/machdep.c b/sys/arch/evbmips/gdium/machdep.c
index 7113c356c385..e1dc6ec5d06b 100644
--- a/sys/arch/evbmips/gdium/machdep.c
+++ b/sys/arch/evbmips/gdium/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.14 2011/06/08 17:47:48 bouyer Exp $	*/
+/*	$NetBSD: machdep.c,v 1.15 2011/07/10 00:03:53 matt Exp $	*/
 
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -74,23 +74,24 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2011/06/08 17:47:48 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2011/07/10 00:03:53 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
 #include "opt_modular.h"
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/buf.h>
-#include <sys/reboot.h>
-#include <sys/mount.h>
-#include <sys/kcore.h>
 #include <sys/boot_flag.h>
-#include <sys/termios.h>
-#include <sys/ksyms.h>
+#include <sys/buf.h>
+#include <sys/cpu.h>
 #include <sys/device.h>
+#include <sys/kcore.h>
+#include <sys/kernel.h>
+#include <sys/ksyms.h>
+#include <sys/mount.h>
+#include <sys/reboot.h>
+#include <sys/systm.h>
+#include <sys/termios.h>
 
 #include <uvm/uvm_extern.h>
 
@@ -99,14 +100,12 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2011/06/08 17:47:48 bouyer Exp $");
 #include "ksyms.h"
 
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-#include <machine/db_machdep.h>
+#include <mips/db_machdep.h>
 #include <ddb/db_extern.h>
 #endif
 
-#include <machine/cpu.h>
-#include <machine/psl.h>
-
 #include <mips/locore.h>
+#include <mips/psl.h>
 
 #include <mips/bonito/bonitoreg.h>
 #include <evbmips/gdium/gdiumvar.h>
diff --git a/sys/arch/evbmips/isa/isadma_bounce.c b/sys/arch/evbmips/isa/isadma_bounce.c
index f1d0ec3b3a04..f4e37873396e 100644
--- a/sys/arch/evbmips/isa/isadma_bounce.c
+++ b/sys/arch/evbmips/isa/isadma_bounce.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isadma_bounce.c,v 1.10 2011/07/08 18:50:11 matt Exp $	*/
+/*	$NetBSD: isadma_bounce.c,v 1.11 2011/07/10 00:03:53 matt Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,20 +31,20 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.10 2011/07/08 18:50:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.11 2011/07/10 00:03:53 matt Exp $");
+
+#define _MIPS_BUS_DMA_PRIVATE
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/syslog.h>
+#include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
 #include <sys/mbuf.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
 
 #include <mips/cache.h>
-#define _MIPS_BUS_DMA_PRIVATE
-#include <sys/bus.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
 
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
diff --git a/sys/arch/evbmips/malta/machdep.c b/sys/arch/evbmips/malta/machdep.c
index e7b0e6e9ed58..f327616676ee 100644
--- a/sys/arch/evbmips/malta/machdep.c
+++ b/sys/arch/evbmips/malta/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.40 2011/02/20 07:48:34 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.41 2011/07/10 00:03:53 matt Exp $	*/
 
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -74,23 +74,24 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.40 2011/02/20 07:48:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.41 2011/07/10 00:03:53 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
 #include "opt_modular.h"
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/buf.h>
-#include <sys/reboot.h>
-#include <sys/mount.h>
-#include <sys/kcore.h>
 #include <sys/boot_flag.h>
-#include <sys/termios.h>
-#include <sys/ksyms.h>
+#include <sys/buf.h>
+#include <sys/cpu.h>
 #include <sys/device.h>
+#include <sys/kcore.h>
+#include <sys/kernel.h>
+#include <sys/ksyms.h>
+#include <sys/mount.h>
+#include <sys/reboot.h>
+#include <sys/systm.h>
+#include <sys/termios.h>
 
 #include <uvm/uvm_extern.h>
 
@@ -99,15 +100,14 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.40 2011/02/20 07:48:34 matt Exp $");
 #include "ksyms.h"
 
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-#include <machine/db_machdep.h>
+#include <mips/db_machdep.h>
 #include <ddb/db_extern.h>
 #endif
 
-#include <machine/cpu.h>
-#include <machine/psl.h>
 #include <machine/yamon.h>
 
 #include <mips/locore.h>
+#include <mips/psl.h>
 
 #include <evbmips/malta/autoconf.h>
 #include <evbmips/malta/maltareg.h>