diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index 1fa411471c29..f6b59ca7fd6c 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.38 1996/05/03 19:14:50 christos Exp $	*/
+/*	$NetBSD: clock.c,v 1.39 1996/05/12 23:11:54 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -95,6 +95,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <sys/device.h>
 
 #include <machine/cpu.h>
+#include <machine/intr.h>
 #include <machine/pio.h>
 #include <machine/cpufunc.h>
 
diff --git a/sys/arch/i386/isa/fd.c b/sys/arch/i386/isa/fd.c
index 75a2fb283bf9..946abd7d7d34 100644
--- a/sys/arch/i386/isa/fd.c
+++ b/sys/arch/i386/isa/fd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.89 1996/05/12 01:37:02 thorpej Exp $	*/
+/*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles Hannum.
@@ -56,6 +56,7 @@
 #include <machine/cpu.h>
 #include <machine/bus.h>
 #include <machine/conf.h>
+#include <machine/intr.h>
 
 #include <dev/isa/isavar.h>
 #include <dev/isa/isadmavar.h>
diff --git a/sys/arch/i386/isa/lms.c b/sys/arch/i386/isa/lms.c
index 0adc93af6a08..cf840de8be9e 100644
--- a/sys/arch/i386/isa/lms.c
+++ b/sys/arch/i386/isa/lms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lms.c,v 1.25 1996/05/03 20:12:01 christos Exp $	*/
+/*	$NetBSD: lms.c,v 1.26 1996/05/12 23:12:11 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -38,6 +38,7 @@
 
 #include <machine/cpu.h>
 #include <machine/bus.h>
+#include <machine/intr.h>
 #include <machine/mouse.h>
 #include <machine/conf.h>
 
diff --git a/sys/arch/i386/isa/mms.c b/sys/arch/i386/isa/mms.c
index 141251dfcb1b..2f8f909becd1 100644
--- a/sys/arch/i386/isa/mms.c
+++ b/sys/arch/i386/isa/mms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mms.c,v 1.23 1996/05/03 20:11:57 christos Exp $	*/
+/*	$NetBSD: mms.c,v 1.24 1996/05/12 23:12:18 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -37,6 +37,7 @@
 #include <sys/device.h>
 
 #include <machine/cpu.h>
+#include <machine/intr.h>
 #include <machine/pio.h>
 #include <machine/mouse.h>
 #include <machine/conf.h>
diff --git a/sys/arch/i386/isa/npx.c b/sys/arch/i386/isa/npx.c
index f00bceb1e50f..fb704d4962bc 100644
--- a/sys/arch/i386/isa/npx.c
+++ b/sys/arch/i386/isa/npx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: npx.c,v 1.56 1996/05/03 19:14:58 christos Exp $	*/
+/*	$NetBSD: npx.c,v 1.57 1996/05/12 23:12:24 mycroft Exp $	*/
 
 #if 0
 #define iprintf(x)	printf x
@@ -53,6 +53,7 @@
 #include <sys/device.h>
 
 #include <machine/cpu.h>
+#include <machine/intr.h>
 #include <machine/pio.h>
 #include <machine/cpufunc.h>
 #include <machine/pcb.h>
diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index 8c3ae13bf369..d194428d7148 100644
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pccons.c,v 1.98 1996/05/05 19:48:15 christos Exp $	*/
+/*	$NetBSD: pccons.c,v 1.99 1996/05/12 23:12:33 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles Hannum.  All rights reserved.
@@ -59,6 +59,7 @@
 #include <dev/cons.h>
 
 #include <machine/cpu.h>
+#include <machine/intr.h>
 #include <machine/pio.h>
 #include <machine/pc/display.h>
 #include <machine/pccons.h>
diff --git a/sys/arch/i386/isa/pms.c b/sys/arch/i386/isa/pms.c
index d7e84b63ba76..90606ce3a36a 100644
--- a/sys/arch/i386/isa/pms.c
+++ b/sys/arch/i386/isa/pms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pms.c,v 1.28 1996/05/05 19:46:18 christos Exp $	*/
+/*	$NetBSD: pms.c,v 1.29 1996/05/12 23:12:42 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1994 Charles Hannum.
@@ -50,6 +50,7 @@
 #include <sys/device.h>
 
 #include <machine/cpu.h>
+#include <machine/intr.h>
 #include <machine/pio.h>
 #include <machine/mouse.h>
 #include <machine/conf.h>