diff --git a/sys/arch/evbarm/include/intr.h b/sys/arch/evbarm/include/intr.h
index e70ff63940a9..32e6ecb9ce8d 100644
--- a/sys/arch/evbarm/include/intr.h
+++ b/sys/arch/evbarm/include/intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.21 2010/06/13 02:11:23 tsutsui Exp $	*/
+/*	$NetBSD: intr.h,v 1.22 2010/11/13 14:07:06 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -86,7 +86,6 @@
 
 #ifndef _LOCORE
 
-#include <sys/device.h>
 #include <sys/queue.h>
 
 #if defined(_LKM)
diff --git a/sys/arch/hpcarm/include/intr.h b/sys/arch/hpcarm/include/intr.h
index beb674e08e2b..907f1c9d609e 100644
--- a/sys/arch/hpcarm/include/intr.h
+++ b/sys/arch/hpcarm/include/intr.h
@@ -1,4 +1,4 @@
-/* 	$NetBSD: intr.h,v 1.14 2010/06/13 02:11:23 tsutsui Exp $	*/
+/* 	$NetBSD: intr.h,v 1.15 2010/11/13 14:07:07 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -72,7 +72,6 @@
 
 #ifndef _LOCORE
 
-#include <sys/device.h>
 #include <sys/queue.h>
 
 #if defined(_LKM)
diff --git a/sys/arch/ibmnws/include/intr.h b/sys/arch/ibmnws/include/intr.h
index 27a0d93a0081..4e23513c68b9 100644
--- a/sys/arch/ibmnws/include/intr.h
+++ b/sys/arch/ibmnws/include/intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.13 2010/04/24 09:39:57 kiyohara Exp $	*/
+/*	$NetBSD: intr.h,v 1.14 2010/11/13 14:07:07 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,6 @@
 
 #ifndef _LOCORE
 #include <machine/cpu.h>
-#include <sys/device.h>
 
 void init_intr_ivr(void);
 void init_intr_openpic(void);
diff --git a/sys/arch/ofppc/include/intr.h b/sys/arch/ofppc/include/intr.h
index a1951f493513..212717bb1906 100644
--- a/sys/arch/ofppc/include/intr.h
+++ b/sys/arch/ofppc/include/intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.13 2010/04/24 09:39:57 kiyohara Exp $	*/
+/*	$NetBSD: intr.h,v 1.14 2010/11/13 14:07:07 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -36,7 +36,6 @@
 
 #ifndef _LOCORE
 #include <machine/cpu.h>
-#include <sys/device.h>
 
 #define ICU_LEN		32
 #define IRQ_SLAVE	2
diff --git a/sys/arch/prep/include/intr.h b/sys/arch/prep/include/intr.h
index 70ec422220eb..4cac0259fa7d 100644
--- a/sys/arch/prep/include/intr.h
+++ b/sys/arch/prep/include/intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.32 2010/04/24 09:39:57 kiyohara Exp $	*/
+/*	$NetBSD: intr.h,v 1.33 2010/11/13 14:07:07 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -36,7 +36,6 @@
 
 #ifndef _LOCORE
 #include <machine/cpu.h>
-#include <sys/device.h>
 
 void init_intr_ivr(void);
 void init_intr_openpic(void);
diff --git a/sys/arch/rs6000/include/intr.h b/sys/arch/rs6000/include/intr.h
index 21b119a4e5b9..06041a23576c 100644
--- a/sys/arch/rs6000/include/intr.h
+++ b/sys/arch/rs6000/include/intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.3 2010/04/25 12:26:07 kiyohara Exp $	*/
+/*	$NetBSD: intr.h,v 1.4 2010/11/13 14:07:08 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,6 @@
 
 #ifndef _LOCORE
 #include <machine/cpu.h>
-#include <sys/device.h>
 
 #define	ICU_LEN			16
 
diff --git a/sys/arch/sandpoint/include/intr.h b/sys/arch/sandpoint/include/intr.h
index c3490dfca47d..6354248d3383 100644
--- a/sys/arch/sandpoint/include/intr.h
+++ b/sys/arch/sandpoint/include/intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.17 2010/04/24 09:39:57 kiyohara Exp $	*/
+/*	$NetBSD: intr.h,v 1.18 2010/11/13 14:07:08 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -36,7 +36,6 @@
 
 #ifndef _LOCORE
 #include <machine/cpu.h>
-#include <sys/device.h>
 
 void enable_intr(void);
 void disable_intr(void);
diff --git a/sys/arch/zaurus/include/intr.h b/sys/arch/zaurus/include/intr.h
index 2439bdb8f3a6..a1557a4df268 100644
--- a/sys/arch/zaurus/include/intr.h
+++ b/sys/arch/zaurus/include/intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.6 2008/04/27 18:58:47 matt Exp $	*/
+/*	$NetBSD: intr.h,v 1.7 2010/11/13 14:07:08 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -82,7 +82,6 @@
 
 #ifndef _LOCORE
 
-#include <sys/device.h>
 #include <sys/queue.h>
 
 #if defined(_LKM)