diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index ec9937e4d6e..b2b5f3f4ca6 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *      $Id: cd.c,v 1.92 1998/04/27 11:36:04 des Exp $
+ *      $Id: cd.c,v 1.93 1998/06/07 17:12:45 dfr Exp $
  */
 
 #include "opt_bounce.h"
@@ -44,6 +44,8 @@
 #include <scsi/scsi_debug.h>
 #include <scsi/scsi_driver.h>
 
+#include "ioconf.h"
+
 static errval cd_get_parms __P((int, int));
 static u_int32_t cd_size __P((int unit, int flags));
 static errval cd_get_mode __P((u_int32_t, struct cd_mode_data *, u_int32_t));
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index 985011f9ec7..3ba80fb99f3 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: ch.c,v 1.45 1998/05/06 09:11:20 phk Exp $
+ *      $Id: ch.c,v 1.46 1998/06/07 17:12:47 dfr Exp $
  */
 
 #include "opt_devfs.h"
@@ -56,6 +56,7 @@
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_driver.h>
 
+#include "ioconf.h"
 
 #define CHRETRIES	2
 #define CHUNIT(x)	(minor((x)))
diff --git a/sys/scsi/od.c b/sys/scsi/od.c
index 18111215850..082ae07d89b 100644
--- a/sys/scsi/od.c
+++ b/sys/scsi/od.c
@@ -28,7 +28,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: od.c,v 1.38 1998/04/27 11:36:04 des Exp $
+ *	$Id: od.c,v 1.39 1998/06/07 17:12:48 dfr Exp $
  */
 
 /*
@@ -79,6 +79,8 @@
 #include <scsi/scsi_debug.h>
 #include <scsi/scsi_driver.h>
 
+#include "ioconf.h"
+
 static u_int32_t odstrats, odqueues;
 
 #define SECSIZE		512	/* default sector size */
diff --git a/sys/scsi/pt.c b/sys/scsi/pt.c
index 25cb9908c0c..94cb036a606 100644
--- a/sys/scsi/pt.c
+++ b/sys/scsi/pt.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: pt.c,v 1.26 1998/01/06 08:28:46 julian Exp $
+ *      $Id: pt.c,v 1.27 1998/01/24 02:54:49 eivind Exp $
  */
 
 #include "opt_bounce.h"
@@ -56,6 +56,8 @@
 #include <scsi/scsi_debug.h>
 #include <scsi/scsi_driver.h>
 
+#include "ioconf.h"
+
 struct scsi_data {
 	struct buf_queue_head buf_queue;
 #ifdef DEVFS
diff --git a/sys/scsi/sctarg.c b/sys/scsi/sctarg.c
index 568844ebd5b..6e4d42c6950 100644
--- a/sys/scsi/sctarg.c
+++ b/sys/scsi/sctarg.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: sctarg.c,v 1.24 1998/01/24 02:54:51 eivind Exp $
+ *      $Id: sctarg.c,v 1.25 1998/06/01 03:44:56 gibbs Exp $
  */
 
 #include "opt_bounce.h"
@@ -56,6 +56,8 @@
 #include <scsi/scsi_debug.h>
 #include <scsi/scsi_driver.h>
 
+#include "ioconf.h"
+
 #define OPEN 0x01
 
 struct scsi_data {
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index fcd81963b1e..c8723851d54 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  *
- *      $Id: sd.c,v 1.129 1998/05/07 12:13:47 julian Exp $
+ *      $Id: sd.c,v 1.130 1998/06/07 17:12:51 dfr Exp $
  */
 
 #include "opt_bounce.h"
@@ -55,6 +55,8 @@
 #include <pc98/pc98/pc98_machdep.h>
 #endif
 
+#include "ioconf.h"
+
 static u_int32_t sdstrats, sdqueues;
 
 #define SECSIZE 512
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index aa31ee62bcd..26d71711764 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $Id: st.c,v 1.87 1998/04/17 22:37:16 des Exp $
+ * $Id: st.c,v 1.88 1998/06/07 17:12:52 dfr Exp $
  */
 
 /*
@@ -49,6 +49,8 @@
 #include <scsi/scsi_debug.h>
 #include <scsi/scsi_driver.h>
 
+#include "ioconf.h"
+
 /* Defines for device specific stuff */
 #define		PAGE_0_SENSE_DATA_SIZE	12
 #define DEF_FIXED_BSIZE  512
diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c
index 214202291b3..b3046e91545 100644
--- a/sys/scsi/worm.c
+++ b/sys/scsi/worm.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: worm.c,v 1.55 1998/04/16 12:28:31 peter Exp $
+ *      $Id: worm.c,v 1.56 1998/06/07 17:12:54 dfr Exp $
  */
 
 #include "opt_bounce.h"
@@ -70,6 +70,8 @@
 #include <sys/dkstat.h>
 #include <sys/malloc.h>
 
+#include "ioconf.h"
+
 struct worm_quirks
 {
 	/*