diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 72704e177204..7eaca7065537 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.18 1998/04/17 22:36:33 des Exp $
+ * $Id: if_ar.c,v 1.19 1998/06/07 17:10:24 dfr Exp $
  */
 
 /*
@@ -70,6 +70,7 @@
 
 #include <i386/isa/if_arregs.h>
 #include <i386/isa/ic/hd64570.h>
+#include <i386/isa/isa_device.h>
 
 #include "ioconf.h"
 
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 72704e177204..7eaca7065537 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.18 1998/04/17 22:36:33 des Exp $
+ * $Id: if_ar.c,v 1.19 1998/06/07 17:10:24 dfr Exp $
  */
 
 /*
@@ -70,6 +70,7 @@
 
 #include <i386/isa/if_arregs.h>
 #include <i386/isa/ic/hd64570.h>
+#include <i386/isa/isa_device.h>
 
 #include "ioconf.h"
 
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 00427babde26..58f4ae6a9a17 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.12 1998/04/17 22:36:35 des Exp $
+ * $Id: if_sr.c,v 1.13 1998/06/07 17:10:37 dfr Exp $
  */
 
 /*
@@ -79,6 +79,7 @@
 
 #include <i386/isa/if_srregs.h>
 #include <i386/isa/ic/hd64570.h>
+#include <i386/isa/isa_device.h>
 
 #include "ioconf.h"
 
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 00427babde26..58f4ae6a9a17 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.12 1998/04/17 22:36:35 des Exp $
+ * $Id: if_sr.c,v 1.13 1998/06/07 17:10:37 dfr Exp $
  */
 
 /*
@@ -79,6 +79,7 @@
 
 #include <i386/isa/if_srregs.h>
 #include <i386/isa/ic/hd64570.h>
+#include <i386/isa/isa_device.h>
 
 #include "ioconf.h"
 
diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index 72704e177204..7eaca7065537 100644
--- a/sys/i386/isa/if_ar.c
+++ b/sys/i386/isa/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.18 1998/04/17 22:36:33 des Exp $
+ * $Id: if_ar.c,v 1.19 1998/06/07 17:10:24 dfr Exp $
  */
 
 /*
@@ -70,6 +70,7 @@
 
 #include <i386/isa/if_arregs.h>
 #include <i386/isa/ic/hd64570.h>
+#include <i386/isa/isa_device.h>
 
 #include "ioconf.h"
 
diff --git a/sys/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c
index 00427babde26..58f4ae6a9a17 100644
--- a/sys/i386/isa/if_sr.c
+++ b/sys/i386/isa/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.12 1998/04/17 22:36:35 des Exp $
+ * $Id: if_sr.c,v 1.13 1998/06/07 17:10:37 dfr Exp $
  */
 
 /*
@@ -79,6 +79,7 @@
 
 #include <i386/isa/if_srregs.h>
 #include <i386/isa/ic/hd64570.h>
+#include <i386/isa/isa_device.h>
 
 #include "ioconf.h"
 
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index d3bd4e5b7bde..af4da2bfc5ba 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -337,7 +337,7 @@ static char	MATCDVERSION[]="Version  1(26) 18-Oct-95";
 static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV";
 /*	The proceeding strings may not be changed*/
 
-/* $Id: matcd.c,v 1.32 1998/01/24 02:54:32 eivind Exp $ */
+/* $Id: matcd.c,v 1.33 1998/06/07 17:11:16 dfr Exp $ */
 
 /*---------------------------------------------------------------------------
 	Include declarations
@@ -366,6 +366,8 @@ static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank
 #include	<sys/devfsext.h>
 #endif /*DEVFS*/
 
+#include	<i386/isa/isa_device.h>
+
 /*---------------------------------------------------------------------------
 	Defines and structures
 ---------------------------------------------------------------------------*/
diff --git a/sys/i386/isa/sound/os.h b/sys/i386/isa/sound/os.h
index 1b3378b40546..cea247c7f705 100644
--- a/sys/i386/isa/sound/os.h
+++ b/sys/i386/isa/sound/os.h
@@ -20,6 +20,9 @@
 #include <sys/signalvar.h>
 
 #include <machine/soundcard.h>
+
+#include <i386/isa/isa_device.h>
+
 #undef DELAY
 #define DELAY(x)  tenmicrosec(x)
 typedef struct uio snd_rw_buf;