diff --git a/sys/arch/mips/adm5120/adm5120_obio_dma.c b/sys/arch/mips/adm5120/adm5120_obio_dma.c
index d2f043153d94..95110e29ff01 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.4 2011/07/01 18:38:49 dyoung Exp $	*/
+/*	$NetBSD: adm5120_obio_dma.c,v 1.5 2015/06/09 22:50:50 matt Exp $	*/
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,13 +64,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_dma.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_dma.c,v 1.5 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
 
 #define	_MIPS_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 
+#include <mips/cpuregs.h>
+
 #include <mips/adm5120/include/adm5120_obiovar.h>
 
 void
diff --git a/sys/arch/mips/alchemy/au1000.c b/sys/arch/mips/alchemy/au1000.c
index c7d9c0370cad..f33a75b69518 100644
--- a/sys/arch/mips/alchemy/au1000.c
+++ b/sys/arch/mips/alchemy/au1000.c
@@ -1,4 +1,4 @@
-/* $NetBSD: au1000.c,v 1.10 2011/07/10 23:13:23 matt Exp $ */
+/* $NetBSD: au1000.c,v 1.11 2015/06/09 22:50:50 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -101,6 +101,8 @@ __KERNEL_RCSID(0, "$NetBSD");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/cpu.h>
+
 #include <mips/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 036ae4266d52..bf549ba44dc9 100644
--- a/sys/arch/mips/alchemy/au1100.c
+++ b/sys/arch/mips/alchemy/au1100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: au1100.c,v 1.10 2011/07/10 23:13:23 matt Exp $ */
+/* $NetBSD: au1100.c,v 1.11 2015/06/09 22:50:50 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -97,10 +97,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1100.c,v 1.10 2011/07/10 23:13:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1100.c,v 1.11 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/cpu.h>
+
 #include <mips/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 f4a3dff57d6d..508699966570 100644
--- a/sys/arch/mips/alchemy/au1500.c
+++ b/sys/arch/mips/alchemy/au1500.c
@@ -1,4 +1,4 @@
-/* $NetBSD: au1500.c,v 1.11 2011/07/10 23:13:23 matt Exp $ */
+/* $NetBSD: au1500.c,v 1.12 2015/06/09 22:50:50 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -97,10 +97,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1500.c,v 1.11 2011/07/10 23:13:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1500.c,v 1.12 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/cpu.h>
+
 #include <mips/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 c56f26081c6f..8fbd8c2384ea 100644
--- a/sys/arch/mips/alchemy/au1550.c
+++ b/sys/arch/mips/alchemy/au1550.c
@@ -1,4 +1,4 @@
-/* $NetBSD: au1550.c,v 1.14 2011/07/10 23:13:23 matt Exp $ */
+/* $NetBSD: au1550.c,v 1.15 2015/06/09 22:50:50 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -97,10 +97,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1550.c,v 1.14 2011/07/10 23:13:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1550.c,v 1.15 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/cpu.h>
+
 #include <mips/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 d891a4015bb2..087c76d0179a 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.4 2011/07/10 23:13:23 matt Exp $ */
+/* $NetBSD: au_chipdep.c,v 1.5 2015/06/09 22:50:50 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,10 +32,12 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_chipdep.c,v 1.4 2011/07/10 23:13:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_chipdep.c,v 1.5 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/cpu.h>
+
 #include <mips/locore.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/auvar.h>
diff --git a/sys/arch/mips/alchemy/include/auvar.h b/sys/arch/mips/alchemy/include/auvar.h
index 396a0dc54bf2..64078e51e2d8 100644
--- a/sys/arch/mips/alchemy/include/auvar.h
+++ b/sys/arch/mips/alchemy/include/auvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: auvar.h,v 1.11 2011/07/10 23:13:23 matt Exp $ */
+/* $NetBSD: auvar.h,v 1.12 2015/06/09 22:50:50 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -69,6 +69,8 @@
 #ifndef _MIPS_ALCHEMY_AUVAR_H_
 #define	_MIPS_ALCHEMY_AUVAR_H_
 
+#include <mips/cpuregs.h>
+
 #include "opt_alchemy.h"
 
 struct au_dev {
diff --git a/sys/arch/mips/atheros/ar5312_board.c b/sys/arch/mips/atheros/ar5312_board.c
index 0c4e92c30c22..6c7c1c5ac05c 100644
--- a/sys/arch/mips/atheros/ar5312_board.c
+++ b/sys/arch/mips/atheros/ar5312_board.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ar5312_board.c,v 1.4 2011/07/07 05:06:44 matt Exp $ */
+/* $NetBSD: ar5312_board.c,v 1.5 2015/06/09 22:50:50 matt Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -40,13 +40,15 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.4 2011/07/07 05:06:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.5 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-
 #include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/systm.h>
+
+#include <mips/cpuregs.h>
+
 #include <mips/atheros/include/ar5312reg.h>
 #include <mips/atheros/include/platform.h>
 
diff --git a/sys/arch/mips/atheros/ar7100.c b/sys/arch/mips/atheros/ar7100.c
index 35687ebae675..e8ddcd70ba94 100644
--- a/sys/arch/mips/atheros/ar7100.c
+++ b/sys/arch/mips/atheros/ar7100.c
@@ -29,18 +29,19 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: ar7100.c,v 1.2 2011/07/31 23:10:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar7100.c,v 1.3 2015/06/09 22:50:50 matt Exp $");
 
 #define	__INTR_PRIVATE
 #include "pci.h"
 #include "opt_memsize.h"
 
 #include <sys/param.h>
-
 #include <sys/device.h>
+#include <sys/cpu.h>
 
 #include <prop/proplib.h>
 
+#include <mips/cpuregs.h>
 #include <mips/atheros/include/platform.h>
 #include <mips/atheros/include/ar9344reg.h>
 
diff --git a/sys/arch/mips/atheros/ar_conf.c b/sys/arch/mips/atheros/ar_conf.c
index 815e6616c3ce..fcf1ceb532e9 100644
--- a/sys/arch/mips/atheros/ar_conf.c
+++ b/sys/arch/mips/atheros/ar_conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ar_conf.c,v 1.2 2011/07/10 06:26:02 matt Exp $	*/
+/*	$NetBSD: ar_conf.c,v 1.3 2015/06/09 22:50:50 matt Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -30,9 +30,10 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: ar_conf.c,v 1.2 2011/07/10 06:26:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar_conf.c,v 1.3 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
+#include <sys/cpu.h>
 
 #include "opt_wisoc.h"
 
diff --git a/sys/arch/mips/atheros/ar_intr.c b/sys/arch/mips/atheros/ar_intr.c
index d86a5b8e0331..84310e027385 100644
--- a/sys/arch/mips/atheros/ar_intr.c
+++ b/sys/arch/mips/atheros/ar_intr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ar_intr.c,v 1.3 2011/07/10 06:24:18 matt Exp $ */
+/* $NetBSD: ar_intr.c,v 1.4 2015/06/09 22:50:50 matt Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -41,15 +41,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar_intr.c,v 1.3 2011/07/10 06:24:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar_intr.c,v 1.4 2015/06/09 22:50:50 matt Exp $");
 
 #define __INTR_PRIVATE
 
 #include <sys/param.h>
 #include <sys/intr.h>
+#include <sys/cpu.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 
+#include <mips/cpuregs.h>
 #include <mips/locore.h>
 #include <mips/atheros/include/platform.h>
 
diff --git a/sys/arch/mips/atheros/dev/athflash.c b/sys/arch/mips/atheros/dev/athflash.c
index 8e53e2d857cd..26fc916b2788 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.8 2014/07/25 08:10:34 dholland Exp $ */
+/* $NetBSD: athflash.c,v 1.9 2015/06/09 22:50:50 matt 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.8 2014/07/25 08:10:34 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athflash.c,v 1.9 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -318,8 +318,6 @@ int
 flashwrite(dev_t dev, struct uio *uio, int flag)
 {
 	struct flash_softc	*sc;
-	bus_space_tag_t		iot;
-	bus_space_handle_t	ioh;
 	bus_size_t		off;
 	int			stat;
 	int			error;
@@ -333,9 +331,6 @@ flashwrite(dev_t dev, struct uio *uio, int flag)
 	if (uio->uio_resid % sc->sc_sector_size)
 		return EINVAL;
 
-	iot = sc->sc_iot;
-	ioh = sc->sc_ioh;
-	
 	for (off = uio->uio_offset;
 	     uio->uio_resid > 0;
 	     off += sc->sc_sector_size) {
diff --git a/sys/arch/mips/atheros/dev/if_ae.c b/sys/arch/mips/atheros/dev/if_ae.c
index f1f752800129..93e7453a2e48 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.25 2014/08/10 16:44:34 tls Exp $ */
+/* $Id: if_ae.c,v 1.26 2015/06/09 22:50:50 matt 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.25 2014/08/10 16:44:34 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.26 2015/06/09 22:50:50 matt Exp $");
 
 
 #include <sys/param.h>
@@ -547,7 +547,7 @@ ae_start(struct ifnet *ifp)
 {
 	struct ae_softc *sc = ifp->if_softc;
 	struct mbuf *m0, *m;
-	struct ae_txsoft *txs, *last_txs = NULL;
+	struct ae_txsoft *txs;
 	bus_dmamap_t dmamap;
 	int error, firsttx, nexttx, lasttx = 1, ofree, seg;
 
@@ -728,8 +728,6 @@ ae_start(struct ifnet *ifp)
 		SIMPLEQ_REMOVE_HEAD(&sc->sc_txfreeq, txs_q);
 		SIMPLEQ_INSERT_TAIL(&sc->sc_txdirtyq, txs, txs_q);
 
-		last_txs = txs;
-
 		/*
 		 * Pass the packet to any BPF listeners.
 		 */
@@ -1011,7 +1009,6 @@ static void
 ae_rxintr(struct ae_softc *sc)
 {
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
-	struct ether_header *eh;
 	struct ae_rxsoft *rxs;
 	struct mbuf *m;
 	u_int32_t rxstat;
@@ -1132,7 +1129,6 @@ ae_rxintr(struct ae_softc *sc)
 #endif /* __NO_STRICT_ALIGNMENT */
 
 		ifp->if_ipackets++;
-		eh = mtod(m, struct ether_header *);
 		m->m_pkthdr.rcvif = ifp;
 		m->m_pkthdr.len = m->m_len = len;
 
diff --git a/sys/arch/mips/atheros/include/arbusvar.h b/sys/arch/mips/atheros/include/arbusvar.h
index 09f5736b3ebb..c2aafe669ef8 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.4 2011/07/10 06:26:02 matt Exp $ */
+/* $Id: arbusvar.h,v 1.5 2015/06/09 22:50:50 matt Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -44,6 +44,9 @@
 #define	_MIPS_ATHEROS_ARBUSVAR_H_
 
 #include <sys/bus.h>
+#include <sys/cpu.h>
+
+#include <mips/cpuregs.h>
 
 struct arbus_attach_args {
 	const char	*aa_name;
diff --git a/sys/arch/mips/bonito/bonitovar.h b/sys/arch/mips/bonito/bonitovar.h
index 11ccaf847c6f..1a05d27302c6 100644
--- a/sys/arch/mips/bonito/bonitovar.h
+++ b/sys/arch/mips/bonito/bonitovar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: bonitovar.h,v 1.5 2011/08/27 12:59:17 bouyer Exp $	*/
+/*	$NetBSD: bonitovar.h,v 1.6 2015/06/09 22:50:50 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -34,6 +34,8 @@
 
 #include <dev/pci/pcivar.h>
 
+#include <mips/cpuregs.h>
+
 struct bonito_config {
 	int		bc_adbase;	/* AD line base for config access */
 
diff --git a/sys/arch/mips/mips/bds_emul.S b/sys/arch/mips/mips/bds_emul.S
index 971d30472a35..53c27969841c 100644
--- a/sys/arch/mips/mips/bds_emul.S
+++ b/sys/arch/mips/mips/bds_emul.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: bds_emul.S,v 1.7 2015/06/07 06:07:49 matt Exp $	*/
+/*	$NetBSD: bds_emul.S,v 1.8 2015/06/09 22:50:50 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -38,6 +38,7 @@
 
 #include <mips/asm.h>
 #include <mips/trap.h>			/* for T_RES_INST */
+#include <mips/cpuregs.h>
 
 #include "assym.h"