diff --git a/sys/arch/ews4800mips/ews4800mips/autoconf.c b/sys/arch/ews4800mips/ews4800mips/autoconf.c
index 63c104a857c6..4abdaab67408 100644
--- a/sys/arch/ews4800mips/ews4800mips/autoconf.c
+++ b/sys/arch/ews4800mips/ews4800mips/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.4 2007/12/05 12:31:26 tsutsui Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.5 2008/01/04 22:15:08 ad Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -34,13 +34,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.4 2007/12/05 12:31:26 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2008/01/04 22:15:08 ad Exp $");
 
 #include "opt_sbd.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/device.h>
 
 #include <machine/sbdvar.h>
 #include <machine/disklabel.h>
diff --git a/sys/arch/ews4800mips/ews4800mips/cpu.c b/sys/arch/ews4800mips/ews4800mips/cpu.c
index 5231086160e8..0504bb9198a4 100644
--- a/sys/arch/ews4800mips/ews4800mips/cpu.c
+++ b/sys/arch/ews4800mips/ews4800mips/cpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.1 2005/12/29 15:20:08 tsutsui Exp $	*/
+/*	$NetBSD: cpu.c,v 1.2 2008/01/04 22:15:09 ad Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,10 +26,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.1 2005/12/29 15:20:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.2 2008/01/04 22:15:09 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/device.h>
 
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/ews4800mips/ews4800mips/mainbus.c b/sys/arch/ews4800mips/ews4800mips/mainbus.c
index f6e7aaa6ffcc..d7a9a931afb9 100644
--- a/sys/arch/ews4800mips/ews4800mips/mainbus.c
+++ b/sys/arch/ews4800mips/ews4800mips/mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.1 2005/12/29 15:20:08 tsutsui Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.2 2008/01/04 22:15:09 ad Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
@@ -34,10 +34,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.1 2005/12/29 15:20:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.2 2008/01/04 22:15:09 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/device.h>
 
 #include <machine/autoconf.h>
 #include <machine/sbdvar.h>
diff --git a/sys/arch/ews4800mips/ews4800mips/tr2.c b/sys/arch/ews4800mips/ews4800mips/tr2.c
index 5d2b9d9db5b9..383ae054e2ba 100644
--- a/sys/arch/ews4800mips/ews4800mips/tr2.c
+++ b/sys/arch/ews4800mips/ews4800mips/tr2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tr2.c,v 1.1 2005/12/29 15:20:08 tsutsui Exp $	*/
+/*	$NetBSD: tr2.c,v 1.2 2008/01/04 22:15:09 ad Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tr2.c,v 1.1 2005/12/29 15:20:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tr2.c,v 1.2 2008/01/04 22:15:09 ad Exp $");
 
 #include "fb_sbdio.h"
 #include "kbms_sbdio.h"
@@ -47,6 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: tr2.c,v 1.1 2005/12/29 15:20:08 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/device.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/arch/ews4800mips/ews4800mips/tr2_intr.c b/sys/arch/ews4800mips/ews4800mips/tr2_intr.c
index ff4b034a1d53..c2157922540f 100644
--- a/sys/arch/ews4800mips/ews4800mips/tr2_intr.c
+++ b/sys/arch/ews4800mips/ews4800mips/tr2_intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tr2_intr.c,v 1.7 2007/12/03 15:33:36 ad Exp $	*/
+/*	$NetBSD: tr2_intr.c,v 1.8 2008/01/04 22:15:09 ad Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -37,13 +37,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tr2_intr.c,v 1.7 2007/12/03 15:33:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tr2_intr.c,v 1.8 2008/01/04 22:15:09 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/device.h>
+#include <sys/intr.h>
 
-#include <machine/intr.h>
 #include <machine/locore.h>	/* mips3_cp0* */
 #include <machine/sbdvar.h>
 #define	_SBD_TR2_PRIVATE
diff --git a/sys/arch/ews4800mips/ews4800mips/tr2a.c b/sys/arch/ews4800mips/ews4800mips/tr2a.c
index f1c6ce1429fd..548899207b55 100644
--- a/sys/arch/ews4800mips/ews4800mips/tr2a.c
+++ b/sys/arch/ews4800mips/ews4800mips/tr2a.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tr2a.c,v 1.1 2005/12/29 15:20:08 tsutsui Exp $	*/
+/*	$NetBSD: tr2a.c,v 1.2 2008/01/04 22:15:09 ad Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tr2a.c,v 1.1 2005/12/29 15:20:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tr2a.c,v 1.2 2008/01/04 22:15:09 ad Exp $");
 
 #include "fb_sbdio.h"
 #include "kbms_sbdio.h"
@@ -47,6 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: tr2a.c,v 1.1 2005/12/29 15:20:08 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/device.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c b/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c
index 902f26182df9..5ea14bb51e8e 100644
--- a/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c
+++ b/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tr2a_intr.c,v 1.9 2007/12/03 15:33:37 ad Exp $	*/
+/*	$NetBSD: tr2a_intr.c,v 1.10 2008/01/04 22:15:09 ad Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -37,13 +37,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tr2a_intr.c,v 1.9 2007/12/03 15:33:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tr2a_intr.c,v 1.10 2008/01/04 22:15:09 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/evcnt.h>
+#include <sys/intr.h>
 
-#include <machine/intr.h>
 #include <machine/locore.h>	/* mips3_cp0* */
 #include <machine/sbdvar.h>
 #define	_SBD_TR2A_PRIVATE