Make all file-system (MFS, FFS, NFS, LFS, DEVFS) related option new-style.

This introduce an xxxFS_BOOT for each of the rootable filesystems.
(Presently not required, but encouraged to allow a smooth move of option *FS
to opt_dontuse.h later.)

LFS is temporarily disabled, and will be re-enabled tomorrow.

103 files changed, 297 insertions, 126 deletions

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 59919da7a311..a9dbc8526fb4 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.82 1997/11/21 18:27:08 bde Exp $
+ *	$Id: autoconf.c,v 1.83 1998/01/09 03:20:53 eivind Exp $
  */
 
 /*
@@ -46,7 +46,11 @@
  * and the drivers are initialized.
  */
 #include "opt_bootp.h"
+#include "opt_ffs.h"
 #include "opt_cd9660.h"
+#include "opt_lfs.h"
+#include "opt_mfs.h"
+#include "opt_nfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -303,7 +307,7 @@ cpu_rootconf()
 	 * XXX NetBSD has a much cleaner approach to finding root.
 	 * XXX We should adopt their code.
 	 */
-#ifdef CD9660
+#if defined(CD9660) || defined(CD9660_ROOT)
 	if ((boothowto & RB_CDROM)) {
 		if (bootverbose)
 			printf("Considering CD-ROM root f/s.\n");
@@ -340,7 +344,7 @@ cpu_rootconf()
 		mountrootfsname = "nfs";
 	}
 #endif /* BOOTP_NFSROOT */
-#ifdef NFS
+#if defined(NFS) || defined(NFS_ROOT)
 	if (!mountrootfsname && nfs_diskless_valid) {
 		if (bootverbose)
 			printf("Considering NFS root f/s.\n");
@@ -348,7 +352,7 @@ cpu_rootconf()
 	}
 #endif /* NFS */
 
-#ifdef FFS
+#if defined(FFS) || defined(FFS_ROOT)
 	if (!mountrootfsname) {
 		mountrootfsname = "ufs";
 		if (bootverbose)
@@ -366,7 +370,7 @@ cpu_rootconf()
 	}
 #endif
 
-#ifdef LFS
+#if defined(LFS) || defined(LFS_ROOT)
 	if (!mountrootfsname) {
 		if (bootverbose)
 			printf("Considering LFS root f/s.\n");
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index 36a95145411b..bed81517c195 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -38,13 +38,14 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.47 1997/09/14 03:19:02 peter Exp $
+ *	$Id: mem.c,v 1.48 1997/11/20 19:30:30 bde Exp $
  */
 
 /*
  * Memory special file
  */
 
+#include "opt_devfs.h"
 #include "opt_perfmon.h"
 
 #include <sys/param.h>
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index b83a5273acc6..c6a83cbe75e7 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.103 1998/01/16 22:12:58 pst Exp $
+#	$Id: GENERIC,v 1.104 1998/01/21 18:34:44 jkh Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -27,6 +27,9 @@ options		FFS			#Berkeley Fast Filesystem
 options		NFS			#Network Filesystem
 options		MSDOSFS			#MSDOS Filesystem
 options		"CD9660"		#ISO 9660 Filesystem
+options		"CD9660_ROOT"		#CD-ROM usable as root device
+options		FFS_ROOT		#FFS usable as root device [keep this!]
+options		NFS_ROOT		#NFS usable as root device
 options		PROCFS			#Process filesystem
 options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
 options		SCSI_DELAY=15		#Be pessimistic about Joe SCSI device
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 7fbdf3d9f5d4..40a007a61cdf 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.392 1998/01/16 22:12:59 pst Exp $
+#	$Id: LINT,v 1.393 1998/01/21 18:34:47 jkh Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -433,22 +433,17 @@ options		TCPDEBUG
 # They are included here as an incentive for some enterprising soul to
 # sit down and fix them.
 #
-# Note: 4.4BSD NQNFS lease checking has relatively high cost for
-# _local_ I/O as well as remote I/O. Don't use it unless you will
-# using NQNFS.
-#
 
 # One of these is mandatory:
 options		FFS			#Fast filesystem
 options		NFS			#Network File System
 
 # The rest are optional:
-options		NQNFS			#Enable NQNFS lease checking
 # options	NFS_NOSERVER		#Disable the NFS-server code.
 options		"CD9660"		#ISO 9660 filesystem
 options		FDESC			#File descriptor filesystem
 options		KERNFS			#Kernel filesystem
-options		LFS			#Log filesystem
+#options	LFS			#Log filesystem
 options		MFS			#Memory File System
 options		MSDOSFS			#MS DOS File System
 options		NULLFS			#NULL filesystem
@@ -456,6 +451,10 @@ options		PORTAL			#Portal filesystem
 options		PROCFS			#Process filesystem
 options		UMAPFS			#UID map filesystem
 options		UNION			#Union filesystem
+options		"CD9660_ROOT"		#CD-ROM usable as root device
+options		FFS_ROOT		#FFS usable as root device
+#options	LFS_ROOT		#LFS usable as root device
+options		NFS_ROOT		#NFS usable as root device
 # This DEVFS is experimental but seems to work
 options		DEVFS			#devices filesystem
 
diff --git a/sys/conf/options b/sys/conf/options
index 438c92a4828e..d0cd5066a0c5 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.44 1998/01/09 00:51:51 eivind Exp $
+#	$Id: options,v 1.45 1998/01/09 03:20:51 eivind Exp $
 
 # Format:
 # Option name	filename
@@ -8,9 +8,12 @@ BOUNCE_BUFFERS	opt_bounce.h
 DDB
 DDB_UNATTENDED	opt_ddb.h
 GDB_REMOTE_CHAT	opt_ddb.h
+DEVFS
 DEVFS_ROOT	opt_devfs.h
 SUIDDIR		opt_suiddir.h
 KTRACE
+MFS_AUTOLOAD	opt_mfs.h
+MFS_ROOT	opt_mfs.h
 QUOTA
 SYSVMSG		opt_sysvipc.h
 SYSVSEM		opt_sysvipc.h
@@ -36,16 +39,28 @@ PORTAL		opt_dontuse.h
 PROCFS		opt_dontuse.h
 UMAPFS		opt_dontuse.h
 
-# The cd9660 static filesystem has one slightly bogus static dependency
-# in sys/i386/i386/autoconf.c.  If this filesystem is statically
-# compiled into the kernel, code for mounting a CD-ROM root filesystem
-# will be enabled.  This is purposely unavailable for the LKM-based
-# version.
+# These static filesystems has one slightly bogus static dependency in
+# sys/i386/i386/autoconf.c.  If any of these filesystems are
+# statically compiled into the kernel, code for mounting them as root
+# filesystems will be enabled - but look below.  Boot-code is purposely
+# unavailable for the LKM-based versions.
 CD9660
+FFS
+LFS
+NFS
 
-# In particular multi-session CD-Rs might require a huge amount of
-# time in order to "settle".  If we are about mounting them as the
-# root f/s, we gotta wait a little.
+# The above static dependencies are planned removed, with a
+# <filesystem>_ROOT option to control if it usable as root.  This list
+# allows these options to be present in config files already (though
+# they won't make any difference yet).
+CD9660_ROOT	opt_cd9660.h
+FFS_ROOT	opt_ffs.h
+LFS_ROOT	opt_lfs.h
+NFS_ROOT	opt_nfs.h
+
+# Multi-session CD-Rs might require a huge amount of time in order to
+# "settle".  If we are about mounting them as the root f/s, we gotta
+# wait a little.
 CD9660_ROOTDELAY	opt_cd9660.h
 
 # The union static file system has bogus static dependencies, so it isn't
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 38ae10a5d31c..17fba20fef03 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -209,6 +209,7 @@
 
 #ifdef __FreeBSD__
 #include "bktr.h"
+#include "opt_devfs.h"
 #include "pci.h"
 #endif /* __FreeBSD__ */
 
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 8b243bec2127..bb78e2964576 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,10 +27,11 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.58 1997/12/16 17:39:59 eivind Exp $
+ *	$Id: cy.c,v 1.59 1997/12/28 06:23:03 bde Exp $
  */
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include "cy.h"
 
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 8b243bec2127..bb78e2964576 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,10 +27,11 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.58 1997/12/16 17:39:59 eivind Exp $
+ *	$Id: cy.c,v 1.59 1997/12/28 06:23:03 bde Exp $
  */
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include "cy.h"
 
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 1ae47547af48..cf98b7e71b8b 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.29 1997/12/06 13:22:03 bde Exp $
+ *  dgb.c $Id: dgb.c,v 1.30 1997/12/16 17:39:57 eivind Exp $
  *
  *  Digiboard driver.
  *
@@ -28,6 +28,7 @@
  */
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include "dgb.h"
 
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index d31c6438b9f4..c179222498e6 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.105 1997/10/19 13:12:02 joerg Exp $
+ *	$Id: fd.c,v 1.106 1997/12/02 21:06:21 phk Exp $
  *
  */
 
@@ -52,6 +52,7 @@
 #undef NFDC
 #endif
 #include "fd.h"
+#include "opt_devfs.h"
 #include "opt_fdc.h"
 
 #if NFDC > 0
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index ee500445344f..84682a929247 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -30,6 +30,8 @@
 
 #if NJOY > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 35439a58fdca..9121a71641d9 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,12 +40,14 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.95 1997/11/07 08:52:40 phk Exp $
+ *	$Id: mcd.c,v 1.96 1997/12/02 21:06:25 phk Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include "mcd.h"
 #if NMCD > 0
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 01b285bc3682..2f558d814706 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.35 1997/11/18 11:30:10 bde Exp $
+ * $Id: mse.c,v 1.36 1997/12/07 08:09:16 yokota Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -46,6 +46,8 @@
 
 #include "mse.h"
 #if NMSE > 0
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index f94498d5c764..6ecd4b78b1fe 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -23,13 +23,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci.c,v 1.79 1997/09/14 03:19:36 peter Exp $
+ * $Id: pci.c,v 1.80 1997/11/07 08:53:28 phk Exp $
  *
  */
 
 #include "pci.h"
 #if NPCI > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/dev/ppbus/nlpt.c b/sys/dev/ppbus/nlpt.c
index e82b4f493c96..46a1ea1e0542 100644
--- a/sys/dev/ppbus/nlpt.c
+++ b/sys/dev/ppbus/nlpt.c
@@ -47,7 +47,7 @@
  *
  *	from: unknown origin, 386BSD 0.1
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
- *	$Id: nlpt.c,v 1.5 1997/08/29 00:30:11 msmith Exp $
+ *	$Id: nlpt.c,v 1.6 1997/12/02 21:06:09 phk Exp $
  */
 
 /*
@@ -62,6 +62,8 @@
 
 
 #ifdef KERNEL
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 8d1e298fddf5..2779bbf5087d 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -34,6 +34,8 @@
 
 #if NRC > 0
 
+#include "opt_devfs.h"
+
 /*#define RCDEBUG*/
 
 #include <sys/param.h>
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 1d97b12c73cb..bdc1c150c515 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.33 1997/09/21 21:41:32 gibbs Exp $ */
+/* $Id: scd.c,v 1.34 1997/12/02 21:06:26 phk Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -49,6 +49,7 @@
 
 #include "scd.h"
 #if NSCD > 0
+#include "opt_devfs.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index f71871e4ee1f..2ade5e12b88c 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.62 1997/12/06 13:22:56 bde Exp $
+ *	$Id: si.c,v 1.63 1997/12/16 17:40:03 eivind Exp $
  */
 
 #ifndef lint
@@ -40,6 +40,7 @@ static const char si_copyright1[] =  "@(#) (C) Specialix International, 1990,199
 #endif	/* not lint */
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 8c9b71d81c17..922d93b927b9 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,12 +31,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.193 1997/12/28 06:36:35 bde Exp $
+ *	$Id: sio.c,v 1.194 1998/01/08 04:53:43 amurai Exp $
  */
 
 #include "opt_comconsole.h"
 #include "opt_compat.h"
 #include "opt_ddb.h"
+#include "opt_devfs.h"
 #include "opt_sio.h"
 #include "sio.h"
 #include "pnp.h"
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 55db19f2c4a0..7bfb635ce5ba 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -18,6 +18,7 @@
 #if NSNP > 0
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 780b440f4534..4b813ca42463 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -4,13 +4,15 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.29 1997/02/22 09:37:11 peter Exp $
+ *    $Id: spkr.c,v 1.30 1997/12/02 21:06:28 phk Exp $
  */
 
 #include "speaker.h"
 
 #if NSPEAKER > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 493cec7cae11..1c07a09365d1 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,12 +25,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.245 1998/01/12 03:28:36 julian Exp $
+ *  $Id: syscons.c,v 1.246 1998/01/20 03:37:27 yokota Exp $
  */
 
 #include "sc.h"
 #include "apm.h"
 #include "opt_ddb.h"
+#include "opt_devfs.h"
 #include "opt_syscons.h"
 
 #if NSC > 0
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index ac44f7079f76..82bb63260d85 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.51 1997/10/21 09:51:47 kato Exp $
+ *	$Id: vn.c,v 1.52 1997/12/06 14:27:08 bde Exp $
  */
 
 /*
@@ -68,6 +68,8 @@
 #define	NVN	8
 #endif
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index 1ae47547af48..cf98b7e71b8b 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.29 1997/12/06 13:22:03 bde Exp $
+ *  dgb.c $Id: dgb.c,v 1.30 1997/12/16 17:39:57 eivind Exp $
  *
  *  Digiboard driver.
  *
@@ -28,6 +28,7 @@
  */
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include "dgb.h"
 
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index 59067c30378d..1f5e23963df3 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -15,9 +15,11 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.66 1997/12/04 02:40:00 imp Exp $
+ *	$Id: apm.c,v 1.67 1997/12/23 16:32:35 nate Exp $
  */
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 59067c30378d..1f5e23963df3 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -15,9 +15,11 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.66 1997/12/04 02:40:00 imp Exp $
+ *	$Id: apm.c,v 1.67 1997/12/23 16:32:35 nate Exp $
  */
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index b83a5273acc6..c6a83cbe75e7 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.103 1998/01/16 22:12:58 pst Exp $
+#	$Id: GENERIC,v 1.104 1998/01/21 18:34:44 jkh Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -27,6 +27,9 @@ options		FFS			#Berkeley Fast Filesystem
 options		NFS			#Network Filesystem
 options		MSDOSFS			#MSDOS Filesystem
 options		"CD9660"		#ISO 9660 Filesystem
+options		"CD9660_ROOT"		#CD-ROM usable as root device
+options		FFS_ROOT		#FFS usable as root device [keep this!]
+options		NFS_ROOT		#NFS usable as root device
 options		PROCFS			#Process filesystem
 options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
 options		SCSI_DELAY=15		#Be pessimistic about Joe SCSI device
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 7fbdf3d9f5d4..40a007a61cdf 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.392 1998/01/16 22:12:59 pst Exp $
+#	$Id: LINT,v 1.393 1998/01/21 18:34:47 jkh Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -433,22 +433,17 @@ options		TCPDEBUG
 # They are included here as an incentive for some enterprising soul to
 # sit down and fix them.
 #
-# Note: 4.4BSD NQNFS lease checking has relatively high cost for
-# _local_ I/O as well as remote I/O. Don't use it unless you will
-# using NQNFS.
-#
 
 # One of these is mandatory:
 options		FFS			#Fast filesystem
 options		NFS			#Network File System
 
 # The rest are optional:
-options		NQNFS			#Enable NQNFS lease checking
 # options	NFS_NOSERVER		#Disable the NFS-server code.
 options		"CD9660"		#ISO 9660 filesystem
 options		FDESC			#File descriptor filesystem
 options		KERNFS			#Kernel filesystem
-options		LFS			#Log filesystem
+#options	LFS			#Log filesystem
 options		MFS			#Memory File System
 options		MSDOSFS			#MS DOS File System
 options		NULLFS			#NULL filesystem
@@ -456,6 +451,10 @@ options		PORTAL			#Portal filesystem
 options		PROCFS			#Process filesystem
 options		UMAPFS			#UID map filesystem
 options		UNION			#Union filesystem
+options		"CD9660_ROOT"		#CD-ROM usable as root device
+options		FFS_ROOT		#FFS usable as root device
+#options	LFS_ROOT		#LFS usable as root device
+options		NFS_ROOT		#NFS usable as root device
 # This DEVFS is experimental but seems to work
 options		DEVFS			#devices filesystem
 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 7fbdf3d9f5d4..40a007a61cdf 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.392 1998/01/16 22:12:59 pst Exp $
+#	$Id: LINT,v 1.393 1998/01/21 18:34:47 jkh Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -433,22 +433,17 @@ options		TCPDEBUG
 # They are included here as an incentive for some enterprising soul to
 # sit down and fix them.
 #
-# Note: 4.4BSD NQNFS lease checking has relatively high cost for
-# _local_ I/O as well as remote I/O. Don't use it unless you will
-# using NQNFS.
-#
 
 # One of these is mandatory:
 options		FFS			#Fast filesystem
 options		NFS			#Network File System
 
 # The rest are optional:
-options		NQNFS			#Enable NQNFS lease checking
 # options	NFS_NOSERVER		#Disable the NFS-server code.
 options		"CD9660"		#ISO 9660 filesystem
 options		FDESC			#File descriptor filesystem
 options		KERNFS			#Kernel filesystem
-options		LFS			#Log filesystem
+#options	LFS			#Log filesystem
 options		MFS			#Memory File System
 options		MSDOSFS			#MS DOS File System
 options		NULLFS			#NULL filesystem
@@ -456,6 +451,10 @@ options		PORTAL			#Portal filesystem
 options		PROCFS			#Process filesystem
 options		UMAPFS			#UID map filesystem
 options		UNION			#Union filesystem
+options		"CD9660_ROOT"		#CD-ROM usable as root device
+options		FFS_ROOT		#FFS usable as root device
+#options	LFS_ROOT		#LFS usable as root device
+options		NFS_ROOT		#NFS usable as root device
 # This DEVFS is experimental but seems to work
 options		DEVFS			#devices filesystem
 
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 59919da7a311..a9dbc8526fb4 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.82 1997/11/21 18:27:08 bde Exp $
+ *	$Id: autoconf.c,v 1.83 1998/01/09 03:20:53 eivind Exp $
  */
 
 /*
@@ -46,7 +46,11 @@
  * and the drivers are initialized.
  */
 #include "opt_bootp.h"
+#include "opt_ffs.h"
 #include "opt_cd9660.h"
+#include "opt_lfs.h"
+#include "opt_mfs.h"
+#include "opt_nfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -303,7 +307,7 @@ cpu_rootconf()
 	 * XXX NetBSD has a much cleaner approach to finding root.
 	 * XXX We should adopt their code.
 	 */
-#ifdef CD9660
+#if defined(CD9660) || defined(CD9660_ROOT)
 	if ((boothowto & RB_CDROM)) {
 		if (bootverbose)
 			printf("Considering CD-ROM root f/s.\n");
@@ -340,7 +344,7 @@ cpu_rootconf()
 		mountrootfsname = "nfs";
 	}
 #endif /* BOOTP_NFSROOT */
-#ifdef NFS
+#if defined(NFS) || defined(NFS_ROOT)
 	if (!mountrootfsname && nfs_diskless_valid) {
 		if (bootverbose)
 			printf("Considering NFS root f/s.\n");
@@ -348,7 +352,7 @@ cpu_rootconf()
 	}
 #endif /* NFS */
 
-#ifdef FFS
+#if defined(FFS) || defined(FFS_ROOT)
 	if (!mountrootfsname) {
 		mountrootfsname = "ufs";
 		if (bootverbose)
@@ -366,7 +370,7 @@ cpu_rootconf()
 	}
 #endif
 
-#ifdef LFS
+#if defined(LFS) || defined(LFS_ROOT)
 	if (!mountrootfsname) {
 		if (bootverbose)
 			printf("Considering LFS root f/s.\n");
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index 1da0188f2566..6cccc4fb6a7b 100644
--- a/sys/i386/i386/cons.c
+++ b/sys/i386/i386/cons.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.54 1997/08/08 20:29:47 julian Exp $
+ *	$Id: cons.c,v 1.55 1997/09/14 03:19:01 peter Exp $
  */
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 36a95145411b..bed81517c195 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,13 +38,14 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.47 1997/09/14 03:19:02 peter Exp $
+ *	$Id: mem.c,v 1.48 1997/11/20 19:30:30 bde Exp $
  */
 
 /*
  * Memory special file
  */
 
+#include "opt_devfs.h"
 #include "opt_perfmon.h"
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/alog.c b/sys/i386/isa/alog.c
index db8faf196cde..5312fa13909d 100644
--- a/sys/i386/isa/alog.c
+++ b/sys/i386/isa/alog.c
@@ -61,6 +61,7 @@
 #include <sys/alogio.h>
 #include <sys/dataacq.h>
 
+#include "opt_devfs.h"
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif 
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index 41b6c270dd56..7965ddf934b7 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $Id: asc.c,v 1.26 1997/04/14 16:47:38 jkh Exp $
+ * $Id: asc.c,v 1.27 1997/09/14 03:19:05 peter Exp $
  */
 
 #include "asc.h"
@@ -61,6 +61,9 @@
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/poll.h>
+
+#include "opt_devfs.h"
+
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
diff --git a/sys/i386/isa/b004.c b/sys/i386/isa/b004.c
index 95691268589b..7cacaf14cef2 100644
--- a/sys/i386/isa/b004.c
+++ b/sys/i386/isa/b004.c
@@ -53,6 +53,9 @@
 #include <sys/uio.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
+
+#include "opt_devfs.h"
+
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index af1523aa9dc8..92b48b8fffee 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -8,7 +8,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use.
  *
- *	$Id: ctx.c,v 1.24 1997/03/24 11:23:40 bde Exp $
+ *	$Id: ctx.c,v 1.25 1997/07/20 14:09:52 bde Exp $
  */
 
 /*
@@ -111,6 +111,8 @@
 #include "ctx.h"
 #if NCTX > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 8b243bec2127..bb78e2964576 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,10 +27,11 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.58 1997/12/16 17:39:59 eivind Exp $
+ *	$Id: cy.c,v 1.59 1997/12/28 06:23:03 bde Exp $
  */
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include "cy.h"
 
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index d31c6438b9f4..c179222498e6 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.105 1997/10/19 13:12:02 joerg Exp $
+ *	$Id: fd.c,v 1.106 1997/12/02 21:06:21 phk Exp $
  *
  */
 
@@ -52,6 +52,7 @@
 #undef NFDC
 #endif
 #include "fd.h"
+#include "opt_devfs.h"
 #include "opt_fdc.h"
 
 #if NFDC > 0
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index 2ab210589d12..61f651b7d1c6 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -24,6 +24,8 @@
 
 #if NGP > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index 310cfa1d18b4..c9aa02dadbe8 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -35,6 +35,8 @@
 #include "gsc.h"
 #if NGSC > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c
index 569209da619f..01f58f759e15 100644
--- a/sys/i386/isa/if_cx.c
+++ b/sys/i386/isa/if_cx.c
@@ -20,6 +20,7 @@
 
 #include "cx.h"
 #include "bpfilter.h"
+#include "opt_devfs.h"
 
 #include "sppp.h"
 #if NSPPP <= 0
diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c
index ee500445344f..84682a929247 100644
--- a/sys/i386/isa/joy.c
+++ b/sys/i386/isa/joy.c
@@ -30,6 +30,8 @@
 
 #if NJOY > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index 5add67f64446..728611895171 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -40,6 +40,7 @@
  */
 
 #include "labpc.h"
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index 399c69c15611..b2df6064991f 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.63 1997/12/02 21:06:24 phk Exp $
+ *	$Id: lpt.c,v 1.64 1998/01/08 23:41:10 eivind Exp $
  */
 
 /*
@@ -102,6 +102,7 @@
  */
 
 #include "lpt.h"
+#include "opt_devfs.h"
 #include "opt_inet.h"
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 4c585614645e..ba30c2fc3892 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -337,13 +337,15 @@ 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.30 1997/11/07 08:52:48 phk Exp $ */
+/* $Id: matcd.c,v 1.31 1997/12/02 21:06:37 phk Exp $ */
 
 /*---------------------------------------------------------------------------
 	Include declarations
 ---------------------------------------------------------------------------*/
 
 #include	"matcd.h"
+#include	"opt_devfs.h"
+
 #include	<sys/param.h>
 #include	<sys/systm.h>
 
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 35439a58fdca..9121a71641d9 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,12 +40,14 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.95 1997/11/07 08:52:40 phk Exp $
+ *	$Id: mcd.c,v 1.96 1997/12/02 21:06:25 phk Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include "mcd.h"
 #if NMCD > 0
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 01b285bc3682..2f558d814706 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.35 1997/11/18 11:30:10 bde Exp $
+ * $Id: mse.c,v 1.36 1997/12/07 08:09:16 yokota Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -46,6 +46,8 @@
 
 #include "mse.h"
 #if NMSE > 0
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index 04d42a3d2e19..7f99a7eb04b4 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -25,11 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pcaudio.c,v 1.37 1997/09/14 03:19:11 peter Exp $
+ *	$Id: pcaudio.c,v 1.38 1997/11/18 16:01:15 bde Exp $
  */
 
 #include "pca.h"
 #if NPCA > 0
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index f323ce608035..341129200508 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -79,6 +79,8 @@
 #include "vt.h"
 #if NVT > 0
 
+#include "opt_devfs.h"
+
 #define EXTERN			/* allocate mem */
 
 #include <i386/isa/pcvt/pcvt_hdr.h>	/* global include */
diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c
index fb23ba620b15..9207c8d73aec 100644
--- a/sys/i386/isa/psm.c
+++ b/sys/i386/isa/psm.c
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: psm.c,v 1.47 1997/12/07 08:09:17 yokota Exp $
+ * $Id: psm.c,v 1.48 1998/01/20 03:37:26 yokota Exp $
  */
 
 /*
@@ -63,6 +63,7 @@
 
 #include "psm.h"
 #include "apm.h"
+#include "opt_devfs.h"
 #include "opt_psm.h"
 
 #if NPSM > 0
diff --git a/sys/i386/isa/qcam.c b/sys/i386/isa/qcam.c
index a643dbc0ac26..61a9b362ed6a 100644
--- a/sys/i386/isa/qcam.c
+++ b/sys/i386/isa/qcam.c
@@ -36,6 +36,8 @@
 #include	"qcam.h"
 #if NQCAM > 0
 
+#include "opt_devfs.h"
+
 #include	<sys/param.h>
 #include	<sys/systm.h>
 #include	<sys/kernel.h>
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index 8d1e298fddf5..2779bbf5087d 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -34,6 +34,8 @@
 
 #if NRC > 0
 
+#include "opt_devfs.h"
+
 /*#define RCDEBUG*/
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index 1d97b12c73cb..bdc1c150c515 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.33 1997/09/21 21:41:32 gibbs Exp $ */
+/* $Id: scd.c,v 1.34 1997/12/02 21:06:26 phk Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -49,6 +49,7 @@
 
 #include "scd.h"
 #if NSCD > 0
+#include "opt_devfs.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index f71871e4ee1f..2ade5e12b88c 100644
--- a/sys/i386/isa/si.c
+++ b/sys/i386/isa/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.62 1997/12/06 13:22:56 bde Exp $
+ *	$Id: si.c,v 1.63 1997/12/16 17:40:03 eivind Exp $
  */
 
 #ifndef lint
@@ -40,6 +40,7 @@ static const char si_copyright1[] =  "@(#) (C) Specialix International, 1990,199
 #endif	/* not lint */
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index 8c9b71d81c17..922d93b927b9 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,12 +31,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.193 1997/12/28 06:36:35 bde Exp $
+ *	$Id: sio.c,v 1.194 1998/01/08 04:53:43 amurai Exp $
  */
 
 #include "opt_comconsole.h"
 #include "opt_compat.h"
 #include "opt_ddb.h"
+#include "opt_devfs.h"
 #include "opt_sio.h"
 #include "sio.h"
 #include "pnp.h"
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index 44415a694037..bda05c868457 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -26,11 +26,11 @@
  * This is the minimum driver code required to make a spigot work.
  * Unfortunatly, I can't include a real driver since the information
  * on the spigot is under non-disclosure.  You can pick up a library
- * that will work with this driver from ftp://ftp.cs.uwm.edu/pub/FreeBSD.
- * The library contains the source that I can release as well as several
- * object modules and functions that allows one to read spigot data.
- * See the code for spigot_grab.c that is included with the library
- * data.
+ * that will work with this driver from
+ * ftp://ftp.cs.uwm.edu/pub/FreeBSD-UWM.  The library contains the
+ * source that I can release as well as several object modules and
+ * functions that allows one to read spigot data.  See the code for
+ * spigot_grab.c that is included with the library data.
  *
  * The vendor will not allow me to release the spigot library code.
  * Please don't ask me for it.
@@ -38,7 +38,7 @@
  * To use this driver you will need the spigot library.  The library is
  * available from:
  *
- *	ftp.cs.uwm.edu://pub/FreeBSD/spigot/spigot.tar.gz
+ *	ftp.cs.uwm.edu://pub/FreeBSD-UWM/spigot/spigot.tar.gz
  *
  * Version 1.7, December 1995.
  *
@@ -51,6 +51,8 @@
 error "Can only have 1 spigot configured."
 #endif
 
+#include	"opt_devfs.h"
+
 #include	<sys/param.h>
 #include	<sys/systm.h>
 #include	<sys/kernel.h>
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 780b440f4534..4b813ca42463 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -4,13 +4,15 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.29 1997/02/22 09:37:11 peter Exp $
+ *    $Id: spkr.c,v 1.30 1997/12/02 21:06:28 phk Exp $
  */
 
 #include "speaker.h"
 
 #if NSPEAKER > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index 493cec7cae11..1c07a09365d1 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,12 +25,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.245 1998/01/12 03:28:36 julian Exp $
+ *  $Id: syscons.c,v 1.246 1998/01/20 03:37:27 yokota Exp $
  */
 
 #include "sc.h"
 #include "apm.h"
 #include "opt_ddb.h"
+#include "opt_devfs.h"
 #include "opt_syscons.h"
 
 #if NSC > 0
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index 603840bd1464..5e7376c903ca 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -32,6 +32,8 @@
 #include "tw.h"
 #if NTW > 0
 
+#include "opt_devfs.h"
+
 /*
  * Driver configuration parameters
  */
diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c
index e04e1c77ba7f..02e7df4f0c04 100644
--- a/sys/i386/isa/wcd.c
+++ b/sys/i386/isa/wcd.c
@@ -13,12 +13,13 @@
  * all derivative works or modified versions.
  *
  * From: Version 1.9, Mon Oct  9 20:27:42 MSK 1995
- * $Id: wcd.c,v 1.48 1997/11/07 08:52:43 phk Exp $
+ * $Id: wcd.c,v 1.49 1997/12/02 21:06:30 phk Exp $
  */
 
 #include "wdc.h"
 #include "wcd.h"
 #include "opt_atapi.h"
+#include "opt_devfs.h"
 
 #if NWCD > 0 && NWDC > 0 && defined (ATAPI)
 
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index d2140909d62a..d66945929c3d 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.147 1998/01/16 22:13:06 pst Exp $
+ *	$Id: wd.c,v 1.148 1998/01/24 02:01:13 dyson Exp $
  */
 
 /* TODO:
@@ -61,12 +61,14 @@
 #endif
 
 #include "wdc.h"
-#include "opt_wd.h"
-#include "opt_atapi.h"
 
 #if     NWDC > 0
 
+#include "opt_atapi.h"
+#include "opt_devfs.h"
+#include "opt_wd.h"
 #include "pci.h"
+
 #include <sys/param.h>
 #include <sys/dkbad.h>
 #include <sys/systm.h>
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index a59d68f889f3..3f4e7356ff36 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -20,7 +20,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wt.c,v 1.41 1997/08/25 23:31:05 bde Exp $
+ * $Id: wt.c,v 1.42 1997/12/02 21:06:34 phk Exp $
  *
  */
 
@@ -60,6 +60,8 @@
 #include "wt.h"
 #if NWT > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index d31c6438b9f4..c179222498e6 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.105 1997/10/19 13:12:02 joerg Exp $
+ *	$Id: fd.c,v 1.106 1997/12/02 21:06:21 phk Exp $
  *
  */
 
@@ -52,6 +52,7 @@
 #undef NFDC
 #endif
 #include "fd.h"
+#include "opt_devfs.h"
 #include "opt_fdc.h"
 
 #if NFDC > 0
diff --git a/sys/isa/joy.c b/sys/isa/joy.c
index ee500445344f..84682a929247 100644
--- a/sys/isa/joy.c
+++ b/sys/isa/joy.c
@@ -30,6 +30,8 @@
 
 #if NJOY > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 8c9b71d81c17..922d93b927b9 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -31,12 +31,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.193 1997/12/28 06:36:35 bde Exp $
+ *	$Id: sio.c,v 1.194 1998/01/08 04:53:43 amurai Exp $
  */
 
 #include "opt_comconsole.h"
 #include "opt_compat.h"
 #include "opt_ddb.h"
+#include "opt_devfs.h"
 #include "opt_sio.h"
 #include "sio.h"
 #include "pnp.h"
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index 493cec7cae11..1c07a09365d1 100644
--- a/sys/isa/syscons.c
+++ b/sys/isa/syscons.c
@@ -25,12 +25,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.245 1998/01/12 03:28:36 julian Exp $
+ *  $Id: syscons.c,v 1.246 1998/01/20 03:37:27 yokota Exp $
  */
 
 #include "sc.h"
 #include "apm.h"
 #include "opt_ddb.h"
+#include "opt_devfs.h"
 #include "opt_syscons.h"
 
 #if NSC > 0
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index bd23290b1cc0..40b021b8cd95 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,10 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
- * $Id: kern_descrip.c,v 1.46 1997/11/29 01:33:01 dyson Exp $
+ * $Id: kern_descrip.c,v 1.47 1997/12/16 17:40:14 eivind Exp $
  */
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 475d60173054..7c46f7dfef47 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -30,9 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_lkm.c,v 1.44 1997/10/28 15:58:15 bde Exp $
+ * $Id: kern_lkm.c,v 1.45 1997/11/06 19:29:11 phk Exp $
  */
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 79bdfcee91c6..371ec900f05f 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -43,9 +43,11 @@
  *	from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: subr_diskslice.c,v 1.39 1997/11/07 09:20:38 phk Exp $
+ *	$Id: subr_diskslice.c,v 1.40 1997/12/06 14:27:30 bde Exp $
  */
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index 1faa3fce2106..7ee1838e12f3 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -31,13 +31,15 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_log.c	8.1 (Berkeley) 6/10/93
- * $Id: subr_log.c,v 1.24 1997/09/16 11:43:30 bde Exp $
+ * $Id: subr_log.c,v 1.25 1997/10/28 15:58:21 bde Exp $
  */
 
 /*
  * Error log buffer for kernel printf's.
  */
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index c8eca301ce84..d2998e212271 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.44 1997/10/26 20:27:51 phk Exp $
+	$Id: syscalls.master,v 1.45 1998/01/01 17:07:46 alex Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
@@ -24,6 +24,8 @@
 
 ; #ifdef's, etc. may be included, and are copied to the output files.
 
+#include "opt_lfs.h"
+
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 1da0188f2566..6cccc4fb6a7b 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.54 1997/08/08 20:29:47 julian Exp $
+ *	$Id: cons.c,v 1.55 1997/09/14 03:19:01 peter Exp $
  */
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 6b2b10e57400..78e24daa4b1f 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
- * $Id: tty_pty.c,v 1.48 1997/12/06 13:24:10 bde Exp $
+ * $Id: tty_pty.c,v 1.49 1997/12/16 17:40:28 eivind Exp $
  */
 
 /*
@@ -40,6 +40,7 @@
  */
 #include "pty.h"		/* XXX */
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index 55db19f2c4a0..7bfb635ce5ba 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -18,6 +18,7 @@
 #if NSNP > 0
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index b4791ff2028e..080ecac7282a 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -31,12 +31,15 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
- * $Id: tty_tty.c,v 1.20 1997/11/18 12:59:09 bde Exp $
+ * $Id: tty_tty.c,v 1.21 1997/12/05 19:55:39 bde Exp $
  */
 
 /*
  * Indirect driver for controlling tty.
  */
+
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index fa41365619ce..d118db6d694d 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
- * $Id: bpf.c,v 1.35 1997/10/03 21:32:05 julian Exp $
+ * $Id: bpf.c,v 1.36 1997/11/18 16:29:53 bde Exp $
  */
 
 #include "bpfilter.h"
@@ -78,6 +78,9 @@
 #include <netinet/if_ether.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
+
+#include "opt_devfs.h"
+
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 4bafa370e163..498b122c3397 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -17,6 +17,7 @@
 #include "tun.h"
 #if NTUN > 0
 
+#include "opt_devfs.h"
 #include "opt_inet.h"
 
 #include <sys/param.h>
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index 9e686282dfc6..52234297a692 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.25 1997/10/21 09:48:38 kato Exp $
+ *	$Id: fd.c,v 1.26 1997/12/02 21:06:51 phk Exp $
  *
  */
 
@@ -52,6 +52,7 @@
 #undef NFDC
 #endif
 #include "fd.h"
+#include "opt_devfs.h"
 #include "opt_fdc.h"
 
 #if NFDC > 0
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 9e10528a73a2..2d5b832aa3d3 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -31,12 +31,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.48 1998/01/16 11:20:22 kato Exp $
+ *	$Id: sio.c,v 1.49 1998/01/22 03:52:55 kato Exp $
  */
 
 #include "opt_comconsole.h"
 #include "opt_compat.h"
 #include "opt_ddb.h"
+#include "opt_devfs.h"
 #include "opt_sio.h"
 #include "sio.h"
 #include "pnp.h"
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index 9e686282dfc6..52234297a692 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.25 1997/10/21 09:48:38 kato Exp $
+ *	$Id: fd.c,v 1.26 1997/12/02 21:06:51 phk Exp $
  *
  */
 
@@ -52,6 +52,7 @@
 #undef NFDC
 #endif
 #include "fd.h"
+#include "opt_devfs.h"
 #include "opt_fdc.h"
 
 #if NFDC > 0
diff --git a/sys/pc98/pc98/lpt.c b/sys/pc98/pc98/lpt.c
index 6fe025686271..f9f1c133beba 100644
--- a/sys/pc98/pc98/lpt.c
+++ b/sys/pc98/pc98/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.15 1997/12/02 21:06:52 phk Exp $
+ *	$Id: lpt.c,v 1.16 1998/01/08 23:42:13 eivind Exp $
  */
 
 /*
@@ -102,6 +102,7 @@
  */
 
 #include "lpt.h"
+#include "opt_devfs.h"
 #include "opt_inet.h"
 
 #include <sys/param.h>
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index 0bde526d0419..b14ccc9c0532 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.14 1997/12/09 11:57:59 kato Exp $
+ * $Id: mse.c,v 1.15 1998/01/16 11:20:20 kato Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -46,6 +46,8 @@
 
 #include "mse.h"
 #if NMSE > 0
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/pc98/pc98/pcaudio.c b/sys/pc98/pc98/pcaudio.c
index 211395800de3..a4acefa02a04 100644
--- a/sys/pc98/pc98/pcaudio.c
+++ b/sys/pc98/pc98/pcaudio.c
@@ -25,11 +25,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pcaudio.c,v 1.12 1997/09/14 16:27:33 kato Exp $
+ *	$Id: pcaudio.c,v 1.13 1997/11/19 11:37:06 kato Exp $
  */
 
 #include "pca.h"
 #if NPCA > 0
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 9e10528a73a2..2d5b832aa3d3 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -31,12 +31,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.48 1998/01/16 11:20:22 kato Exp $
+ *	$Id: sio.c,v 1.49 1998/01/22 03:52:55 kato Exp $
  */
 
 #include "opt_comconsole.h"
 #include "opt_compat.h"
 #include "opt_ddb.h"
+#include "opt_devfs.h"
 #include "opt_sio.h"
 #include "sio.h"
 #include "pnp.h"
diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c
index 07703e0dc60a..4a17ebde0102 100644
--- a/sys/pc98/pc98/spkr.c
+++ b/sys/pc98/pc98/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.8 1997/02/22 09:43:46 peter Exp $
+ *    $Id: spkr.c,v 1.9 1997/12/02 21:06:53 phk Exp $
  */
 
 /*
@@ -15,6 +15,8 @@
 
 #if NSPEAKER > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index 7b12cfaaf61a..f7d75adab8e1 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/syscons.c
@@ -25,12 +25,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.72 1998/01/12 15:41:16 kato Exp $
+ *  $Id: syscons.c,v 1.73 1998/01/20 10:53:26 kato Exp $
  */
 
 #include "sc.h"
 #include "apm.h"
 #include "opt_ddb.h"
+#include "opt_devfs.h"
 #include "opt_syscons.h"
 
 #if NSC > 0
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index d9407d02decc..fd360394391a 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.39 1998/01/14 08:37:59 kato Exp $
+ *	$Id: wd.c,v 1.40 1998/01/18 15:10:03 kato Exp $
  */
 
 /* TODO:
@@ -61,12 +61,14 @@
 #endif
 
 #include "wdc.h"
-#include "opt_wd.h"
-#include "opt_atapi.h"
 
 #if     NWDC > 0
 
+#include "opt_atapi.h"
+#include "opt_devfs.h"
+#include "opt_wd.h"
 #include "pci.h"
+
 #include <sys/param.h>
 #include <sys/dkbad.h>
 #include <sys/systm.h>
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index 1577d6deda11..aeebbff7190f 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -28,9 +28,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: pccard.c,v 1.54 1998/01/02 13:35:06 msmith Exp $
  */
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index 38ae10a5d31c..17fba20fef03 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -209,6 +209,7 @@
 
 #ifdef __FreeBSD__
 #include "bktr.h"
+#include "opt_devfs.h"
 #include "pci.h"
 #endif /* __FreeBSD__ */
 
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index a434e2174bbc..ac24de7a68be 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -146,6 +146,7 @@
 #include "meteor.h"
 
 #if NMETEOR > 0
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index f94498d5c764..6ecd4b78b1fe 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -23,13 +23,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci.c,v 1.79 1997/09/14 03:19:36 peter Exp $
+ * $Id: pci.c,v 1.80 1997/11/07 08:53:28 phk Exp $
  *
  */
 
 #include "pci.h"
 #if NPCI > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index c3808c5710f3..b976c233860b 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -14,10 +14,11 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *      $Id: cd.c,v 1.87 1997/12/02 21:06:58 phk Exp $
+ *      $Id: cd.c,v 1.88 1997/12/14 00:32:33 jraynard Exp $
  */
 
 #include "opt_bounce.h"
+#include "opt_devfs.h"
 #include "opt_scsi.h"
 
 #define SPLCD splbio
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index 53e598a9ca3f..5b507c69036d 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -33,9 +33,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: ch.c,v 1.41 1997/09/02 20:06:31 bde Exp $
+ *      $Id: ch.c,v 1.42 1997/09/14 03:19:38 peter Exp $
  */
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/chio.h>
diff --git a/sys/scsi/od.c b/sys/scsi/od.c
index 9f9b07719b60..7a08357d2c41 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.33 1997/12/02 21:06:59 phk Exp $
+ *	$Id: od.c,v 1.34 1997/12/06 14:27:49 bde Exp $
  */
 
 /*
@@ -56,6 +56,7 @@
  */
 
 #include "opt_bounce.h"
+#include "opt_devfs.h"
 #include "opt_scsi.h"
 #include "opt_od.h"
 
diff --git a/sys/scsi/pt.c b/sys/scsi/pt.c
index 06d314beeafe..25cb9908c0c3 100644
--- a/sys/scsi/pt.c
+++ b/sys/scsi/pt.c
@@ -37,10 +37,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: pt.c,v 1.25 1997/12/02 21:07:00 phk Exp $
+ *      $Id: pt.c,v 1.26 1998/01/06 08:28:46 julian Exp $
  */
 
 #include "opt_bounce.h"
+#include "opt_devfs.h"
 #include "opt_scsi.h"
 
 #include <sys/param.h>
diff --git a/sys/scsi/sctarg.c b/sys/scsi/sctarg.c
index 1462769e78b2..bdf1d0ee02a0 100644
--- a/sys/scsi/sctarg.c
+++ b/sys/scsi/sctarg.c
@@ -37,10 +37,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: sctarg.c,v 1.22 1997/09/21 22:03:11 gibbs Exp $
+ *      $Id: sctarg.c,v 1.23 1997/12/02 21:07:02 phk Exp $
  */
 
 #include "opt_bounce.h"
+#include "opt_devfs.h"
 #include "opt_scsi.h"
 
 #include <sys/param.h>
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 0d5200ce1090..2ee8f698083d 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -15,10 +15,11 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  *
- *      $Id: sd.c,v 1.118 1997/12/28 09:10:37 julian Exp $
+ *      $Id: sd.c,v 1.119 1997/12/29 07:49:31 julian Exp $
  */
 
 #include "opt_bounce.h"
+#include "opt_devfs.h"
 #include "opt_scsi.h"
 
 #define SPLSD splbio
diff --git a/sys/scsi/ssc.c b/sys/scsi/ssc.c
index 3e2fba6fa887..9ad707eefa22 100644
--- a/sys/scsi/ssc.c
+++ b/sys/scsi/ssc.c
@@ -49,9 +49,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *End copyright
- * $Id: ssc.c,v 1.16 1997/09/14 03:19:39 peter Exp $
+ * $Id: ssc.c,v 1.17 1997/12/23 19:44:45 brian Exp $
  */
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 93f7c54fef23..8993edeee98e 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.83 1997/11/23 11:56:18 bde Exp $
+ * $Id: st.c,v 1.84 1997/12/02 21:07:05 phk Exp $
  */
 
 /*
@@ -28,6 +28,7 @@
  */
 
 #include "opt_bounce.h"
+#include "opt_devfs.h"
 #include "opt_scsi.h"
 
 #include <sys/param.h>
diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c
index b4bb6c942432..da29b644aa73 100644
--- a/sys/scsi/worm.c
+++ b/sys/scsi/worm.c
@@ -43,10 +43,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: worm.c,v 1.49 1997/12/20 23:03:49 joerg Exp $
+ *      $Id: worm.c,v 1.50 1997/12/26 14:52:29 joerg Exp $
  */
 
 #include "opt_bounce.h"
+#include "opt_devfs.h"
 #include "opt_scsi.h"
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_syscalls.c b/sys/ufs/lfs/lfs_syscalls.c
index 4d2e06b07777..f575f34fa7c9 100644
--- a/sys/ufs/lfs/lfs_syscalls.c
+++ b/sys/ufs/lfs/lfs_syscalls.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_syscalls.c	8.10 (Berkeley) 5/14/95
- * $Id: lfs_syscalls.c,v 1.19 1997/03/23 00:45:20 bde Exp $
+ * $Id: lfs_syscalls.c,v 1.20 1997/11/06 19:29:51 phk Exp $
  */
 
+#include "opt_lfs.h"			/* XXX: Indicate bogus header dependency */
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index c811ab2a1621..7bb5cb92a38c 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vfsops.c	8.11 (Berkeley) 6/19/95
- * $Id: mfs_vfsops.c,v 1.37 1997/11/01 20:19:43 tegge Exp $
+ * $Id: mfs_vfsops.c,v 1.38 1997/11/12 05:42:30 julian Exp $
  */
 
+#include "opt_mfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 3eec6864982d..45bbe4d17eb4 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
- * $Id: vm_swap.c,v 1.48 1997/11/06 19:29:56 phk Exp $
+ * $Id: vm_swap.c,v 1.49 1997/11/07 09:21:01 phk Exp $
  */
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>