7 files changed, 7 insertions, 12 deletions

diff --git a/sys/dev/pccard/if_xe.c b/sys/dev/pccard/if_xe.c
index 60ee284060ec7..4d67a35a54dc0 100644
--- a/sys/dev/pccard/if_xe.c
+++ b/sys/dev/pccard/if_xe.c
@@ -114,7 +114,6 @@
 
 #include <sys/param.h>
 #include <sys/cdefs.h>
-#include <sys/conf.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
@@ -124,6 +123,7 @@
 #include <sys/sockio.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
+#include <sys/conf.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index 963a11e5a6517..c55757e29beaf 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -39,12 +39,11 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinuminterrupt.c,v 1.6 1999/06/18 00:50:53 grog Exp grog $
+ * $Id: vinuminterrupt.c,v 1.12 1999/08/07 08:06:30 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
-#include <miscfs/specfs/specdev.h>
 #include <sys/resourcevar.h>
 
 void complete_raid5_write(struct rqelement *);
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index 8fa4f3ebc1e2c..43eefe9ab32d3 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -33,12 +33,11 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumio.c,v 1.33 1999/08/07 08:07:05 grog Exp $
+ * $Id: vinumio.c,v 1.34 1999/08/08 14:11:03 bde Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
-#include <miscfs/specfs/specdev.h>
 
 static char *sappend(char *txt, char *s);
 static int drivecmp(const void *va, const void *vb);
diff --git a/sys/dev/vinum/vinumraid5.c b/sys/dev/vinum/vinumraid5.c
index 0d3af63a6b74f..8e68a72f90680 100644
--- a/sys/dev/vinum/vinumraid5.c
+++ b/sys/dev/vinum/vinumraid5.c
@@ -38,7 +38,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: raid5.c,v 1.15 1999/07/07 03:46:01 grog Exp grog $
+ * $Id: vinumraid5.c,v 1.1 1999/08/07 08:22:49 grog Exp $
  */
 /*
  * XXX To do:
@@ -48,7 +48,6 @@
 
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
-#include <miscfs/specfs/specdev.h>
 #include <sys/resourcevar.h>
 
 /*
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index 646fd1d2bfb89..cab4aa57fac96 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -37,12 +37,11 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumrequest.c,v 1.24 1999/07/05 01:53:14 grog Exp grog $
+ * $Id: vinumrequest.c,v 1.29 1999/08/07 08:13:23 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
-#include <miscfs/specfs/specdev.h>
 #include <sys/resourcevar.h>
 
 enum requeststatus bre(struct request *rq,
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index 06bf27f0bfffa..9087d2575b19c 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -38,7 +38,7 @@
  * from: Utah Hdr: vn.c 1.13 94/04/02
  *
  *	from: @(#)vn.c	8.6 (Berkeley) 4/1/94
- *	$Id: vn.c,v 1.80 1999/05/30 16:51:55 phk Exp $
+ *	$Id: vn.c,v 1.81 1999/07/20 09:47:33 phk Exp $
  */
 
 /*
@@ -89,7 +89,6 @@
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
-#include <miscfs/specfs/specdev.h>
 #include <sys/vnioctl.h>
 
 #include <vm/vm.h>
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index 60ee284060ec7..4d67a35a54dc0 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -114,7 +114,6 @@
 
 #include <sys/param.h>
 #include <sys/cdefs.h>
-#include <sys/conf.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
@@ -124,6 +123,7 @@
 #include <sys/sockio.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
+#include <sys/conf.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>