43 files changed, 122 insertions, 43 deletions

diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index 45f805d231f3e..cba303ae3e656 100644
--- a/sys/alpha/linux/linux_sysvec.c
+++ b/sys/alpha/linux/linux_sysvec.c
@@ -25,11 +25,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: linux_sysvec.c,v 1.19 1997/09/01 02:12:39 bde Exp $
+ *  $Id: linux_sysvec.c,v 1.20 1997/11/06 19:29:04 phk Exp $
  */
 
 /* XXX we use functions that might not exist. */
-#define	COMPAT_43	1
+#include "opt_compat.h"
+
+#ifndef COMPAT_43
+#error "Unable to compile Linux-emulator due to missing COMPAT_43 option!"
+#endif
 
 #include <sys/param.h>
 #include <sys/buf.h>
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index 0d6c18cdd3898..dc893193088c4 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -25,11 +25,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: linux_socket.c,v 1.9 1997/11/06 19:29:03 phk Exp $
+ *  $Id: linux_socket.c,v 1.10 1997/12/14 03:17:54 msmith Exp $
  */
 
 /* XXX we use functions that might not exist. */
-#define	COMPAT_43	1
+#include "opt_compat.h"
+
+#ifndef COMPAT_43
+#error "Unable to compile Linux-emulator due to missing COMPAT_43 option!"
+#endif
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/conf/options b/sys/conf/options
index 68d18b0f03bf3..fc6fddc0f3085 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.39 1997/12/15 20:30:38 eivind Exp $
+#	$Id: options,v 1.40 1997/12/15 21:51:44 eivind Exp $
 
 # Format:
 # Option name	filename
@@ -16,6 +16,8 @@ SYSVMSG		opt_sysvipc.h
 SYSVSEM		opt_sysvipc.h
 SYSVSHM		opt_sysvipc.h
 UCONSOLE
+COMPAT_43	opt_compat.h
+COMPAT_SUNOS	opt_compat.h
 
 # Do we want the config file compiled into the kernel?
 INCLUDE_CONFIG_FILE	opt_config.h
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 69202e967407b..001b3f26e9780 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,9 +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.56 1997/11/10 15:46:33 bde Exp $
+ *	$Id: cy.c,v 1.57 1997/12/06 13:22:26 bde Exp $
  */
 
+#include "opt_compat.h"
+
 #include "cy.h"
 
 /*
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 69202e967407b..001b3f26e9780 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,9 +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.56 1997/11/10 15:46:33 bde Exp $
+ *	$Id: cy.c,v 1.57 1997/12/06 13:22:26 bde Exp $
  */
 
+#include "opt_compat.h"
+
 #include "cy.h"
 
 /*
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index da023aa038642..1ae47547af48d 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.28 1997/09/14 03:19:00 peter Exp $
+ *  dgb.c $Id: dgb.c,v 1.29 1997/12/06 13:22:03 bde Exp $
  *
  *  Digiboard driver.
  *
@@ -27,6 +27,8 @@
  *	David L. Nugent <davidn@blaze.net.au>
  */
 
+#include "opt_compat.h"
+
 #include "dgb.h"
 
 #if NDGB > 0 
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index 3a0507a4b8581..f13233c2c80c1 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -34,6 +34,8 @@
  * rp.c - for RocketPort FreeBSD
  */
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/fcntl.h>
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 1c729608a68ec..f71871e4ee1fa 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.61 1997/09/21 21:41:37 gibbs Exp $
+ *	$Id: si.c,v 1.62 1997/12/06 13:22:56 bde Exp $
  */
 
 #ifndef lint
@@ -39,6 +39,8 @@ static const char si_copyright1[] =  "@(#) (C) Specialix International, 1990,199
                   si_copyright3[] =  "@(#) (C) Peter Wemm 1995";
 #endif	/* not lint */
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #if defined(COMPAT_43) || defined(COMPAT_SUNOS)
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index a0763da9cad68..145239a60bd7e 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,10 +31,11 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.189 1997/11/20 15:48:41 nate Exp $
+ *	$Id: sio.c,v 1.190 1997/12/06 13:23:04 bde Exp $
  */
 
 #include "opt_comconsole.h"
+#include "opt_compat.h"
 #include "opt_ddb.h"
 #include "opt_sio.h"
 #include "sio.h"
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 738c871c25833..55db19f2c4a0d 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -17,6 +17,8 @@
 
 #if NSNP > 0
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filio.h>
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index da023aa038642..1ae47547af48d 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.28 1997/09/14 03:19:00 peter Exp $
+ *  dgb.c $Id: dgb.c,v 1.29 1997/12/06 13:22:03 bde Exp $
  *
  *  Digiboard driver.
  *
@@ -27,6 +27,8 @@
  *	David L. Nugent <davidn@blaze.net.au>
  */
 
+#include "opt_compat.h"
+
 #include "dgb.h"
 
 #if NDGB > 0 
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 69202e967407b..001b3f26e9780 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,9 +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.56 1997/11/10 15:46:33 bde Exp $
+ *	$Id: cy.c,v 1.57 1997/12/06 13:22:26 bde Exp $
  */
 
+#include "opt_compat.h"
+
 #include "cy.h"
 
 /*
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index 272d758efd7cf..2c477496d6f15 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -33,11 +33,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: istallion.c,v 1.13 1997/09/14 03:19:09 peter Exp $
+ * $Id: istallion.c,v 1.14 1997/12/06 13:22:33 bde Exp $
  */
 
 /*****************************************************************************/
 
+#include "opt_compat.h"
+
 #define	TTYDEFCHARS	1
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c
index 3a0507a4b8581..f13233c2c80c1 100644
--- a/sys/i386/isa/rp.c
+++ b/sys/i386/isa/rp.c
@@ -34,6 +34,8 @@
  * rp.c - for RocketPort FreeBSD
  */
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/fcntl.h>
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index 1c729608a68ec..f71871e4ee1fa 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.61 1997/09/21 21:41:37 gibbs Exp $
+ *	$Id: si.c,v 1.62 1997/12/06 13:22:56 bde Exp $
  */
 
 #ifndef lint
@@ -39,6 +39,8 @@ static const char si_copyright1[] =  "@(#) (C) Specialix International, 1990,199
                   si_copyright3[] =  "@(#) (C) Peter Wemm 1995";
 #endif	/* not lint */
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #if defined(COMPAT_43) || defined(COMPAT_SUNOS)
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index a0763da9cad68..145239a60bd7e 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,10 +31,11 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.189 1997/11/20 15:48:41 nate Exp $
+ *	$Id: sio.c,v 1.190 1997/12/06 13:23:04 bde Exp $
  */
 
 #include "opt_comconsole.h"
+#include "opt_compat.h"
 #include "opt_ddb.h"
 #include "opt_sio.h"
 #include "sio.h"
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 00b80870b1151..5a38841a21092 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -33,13 +33,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: stallion.c,v 1.13 1997/09/14 03:19:25 peter Exp $
+ * $Id: stallion.c,v 1.14 1997/12/06 13:23:15 bde Exp $
  */
 
 /*****************************************************************************/
 
 #define	TTYDEFCHARS	1
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/linux/linux_socket.c b/sys/i386/linux/linux_socket.c
index 0d6c18cdd3898..dc893193088c4 100644
--- a/sys/i386/linux/linux_socket.c
+++ b/sys/i386/linux/linux_socket.c
@@ -25,11 +25,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: linux_socket.c,v 1.9 1997/11/06 19:29:03 phk Exp $
+ *  $Id: linux_socket.c,v 1.10 1997/12/14 03:17:54 msmith Exp $
  */
 
 /* XXX we use functions that might not exist. */
-#define	COMPAT_43	1
+#include "opt_compat.h"
+
+#ifndef COMPAT_43
+#error "Unable to compile Linux-emulator due to missing COMPAT_43 option!"
+#endif
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 45f805d231f3e..cba303ae3e656 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -25,11 +25,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: linux_sysvec.c,v 1.19 1997/09/01 02:12:39 bde Exp $
+ *  $Id: linux_sysvec.c,v 1.20 1997/11/06 19:29:04 phk Exp $
  */
 
 /* XXX we use functions that might not exist. */
-#define	COMPAT_43	1
+#include "opt_compat.h"
+
+#ifndef COMPAT_43
+#error "Unable to compile Linux-emulator due to missing COMPAT_43 option!"
+#endif
 
 #include <sys/param.h>
 #include <sys/buf.h>
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index a0763da9cad68..145239a60bd7e 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -31,10 +31,11 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.189 1997/11/20 15:48:41 nate Exp $
+ *	$Id: sio.c,v 1.190 1997/12/06 13:23:04 bde Exp $
  */
 
 #include "opt_comconsole.h"
+#include "opt_compat.h"
 #include "opt_ddb.h"
 #include "opt_sio.h"
 #include "sio.h"
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 6056f3a754480..5c6e9910aa03f 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -9,6 +9,7 @@
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
 
+#include "opt_compat.h"
 #ifdef COMPAT_43
 #define compat(n, name) n, (sy_call_t *)__CONCAT(o,name)
 #else
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 9ce3e18ae1c8d..bd23290b1cc01 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
- * $Id: kern_descrip.c,v 1.45 1997/11/23 12:24:59 bde Exp $
+ * $Id: kern_descrip.c,v 1.46 1997/11/29 01:33:01 dyson Exp $
  */
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index a68949b99cac2..9052225a5f4cc 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,9 +36,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.62 1997/12/07 18:16:43 sef Exp $
+ * $Id: kern_exit.c,v 1.63 1997/12/08 01:06:36 sef Exp $
  */
 
+#include "opt_compat.h"
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 41e5192804ff3..281fc62495e11 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -36,13 +36,15 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_prot.c	8.6 (Berkeley) 1/21/94
- * $Id: kern_prot.c,v 1.36 1997/10/17 23:52:56 davidg Exp $
+ * $Id: kern_prot.c,v 1.37 1997/11/06 19:29:12 phk Exp $
  */
 
 /*
  * System calls related to processes and protection
  */
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/acct.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 102de127af002..12722ddae3a1e 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -36,9 +36,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_resource.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_resource.c,v 1.27 1997/11/06 19:29:13 phk Exp $
+ * $Id: kern_resource.c,v 1.28 1997/11/07 08:52:57 phk Exp $
  */
 
+#include "opt_compat.h"
 #include "opt_rlimit.h"
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 3200080a01ce4..f76f1c530dc6c 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -36,9 +36,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
- * $Id: kern_sig.c,v 1.35 1997/11/06 19:29:14 phk Exp $
+ * $Id: kern_sig.c,v 1.36 1997/12/06 04:11:10 sef Exp $
  */
 
+#include "opt_compat.h"
 #include "opt_ktrace.h"
 
 #define	SIGPROP		/* include signal properties table */
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index f8b01d73cd23e..b1dc38f9ecff1 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -37,9 +37,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sysctl.c	8.4 (Berkeley) 4/14/94
- * $Id: kern_sysctl.c,v 1.72 1997/10/12 20:23:56 phk Exp $
+ * $Id: kern_sysctl.c,v 1.73 1997/11/06 19:29:15 phk Exp $
  */
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index 8d61720ea0561..8a61710a5b524 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_xxx.c	8.2 (Berkeley) 11/14/93
- * $Id: kern_xxx.c,v 1.25 1997/02/22 09:39:13 peter Exp $
+ * $Id: kern_xxx.c,v 1.26 1997/11/06 19:29:18 phk Exp $
  */
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index c888e03e47fb1..159e73f8aa423 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -1,6 +1,6 @@
 #! /bin/sh -
 #	@(#)makesyscalls.sh	8.1 (Berkeley) 6/10/93
-# $Id: makesyscalls.sh,v 1.26 1997/11/18 03:34:39 peter Exp $
+# $Id: makesyscalls.sh,v 1.27 1997/12/08 09:00:47 jmg Exp $
 
 set -e
 
@@ -78,7 +78,7 @@ s/\$//g
 		printf "/*\n * System call prototypes.\n *\n" > sysarg
 		printf " * DO NOT EDIT-- this file is automatically generated.\n" > sysarg
 
-		printf "\n#ifdef %s\n\n", compat > syscompat
+		printf "\n#include \"opt_compat.h\"\n#ifdef %s\n\n", compat > syscompat
 
 		printf "/*\n * System call names.\n *\n" > sysnames
 		printf " * DO NOT EDIT-- this file is automatically generated.\n" > sysnames
@@ -94,7 +94,7 @@ s/\$//g
 
 		printf " * created from%s\n */\n\n", $0 > sysinc
 
-		printf "\n#ifdef %s\n", compat > sysent
+		printf "\n#include \"opt_compat.h\"\n#ifdef %s\n", compat > sysent
 		printf "#define compat(n, name) n, (sy_call_t *)__CONCAT(o,name)\n" > sysent
 		printf("#else\n") > sysent
 		printf("#define compat(n, name) 0, (sy_call_t *)nosys\n") > sysent
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index b9fd3b8766af0..701f917cb41a1 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_shm.c,v 1.31 1997/10/12 20:24:03 phk Exp $ */
+/*	$Id: sysv_shm.c,v 1.32 1997/11/06 19:29:25 phk Exp $ */
 /*	$NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $	*/
 
 /*
@@ -31,6 +31,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "opt_compat.h"
 #include "opt_rlimit.h"
 
 #include <sys/param.h>
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 3a58b87936a19..bac398be1d82a 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.98 1997/11/07 08:53:01 phk Exp $
+ * $Id: tty.c,v 1.99 1997/12/06 13:23:52 bde Exp $
  */
 
 /*-
@@ -68,6 +68,7 @@
  */
 
 #include "snp.h"
+#include "opt_compat.h"
 #include "opt_uconsole.h"
 
 #include <sys/param.h>
diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c
index c3b116490842d..13c267d6f877b 100644
--- a/sys/kern/tty_compat.c
+++ b/sys/kern/tty_compat.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_compat.c	8.1 (Berkeley) 6/10/93
- * $Id: tty_compat.c,v 1.23 1997/08/02 14:31:39 bde Exp $
+ * $Id: tty_compat.c,v 1.24 1997/12/06 13:23:58 bde Exp $
  */
 
+#include "opt_compat.h"
+
 /*
  * mapping routines for old line discipline (yuck)
  */
diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c
index ce9d88111ec40..714a4a55c790f 100644
--- a/sys/kern/tty_conf.c
+++ b/sys/kern/tty_conf.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_conf.c	8.4 (Berkeley) 1/21/94
- * $Id: tty_conf.c,v 1.10 1997/02/22 09:39:25 peter Exp $
+ * $Id: tty_conf.c,v 1.11 1997/12/06 13:24:04 bde Exp $
  */
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/tty.h>
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index e60f47327f93d..6b2b10e574000 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.47 1997/09/16 11:43:32 bde Exp $
+ * $Id: tty_pty.c,v 1.48 1997/12/06 13:24:10 bde Exp $
  */
 
 /*
@@ -39,6 +39,7 @@
  * (Actually two drivers, requiring two entries in 'cdevsw')
  */
 #include "pty.h"		/* XXX */
+#include "opt_compat.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index 738c871c25833..55db19f2c4a0d 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -17,6 +17,8 @@
 
 #if NSNP > 0
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filio.h>
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 35c483b91fafb..20004a757e15f 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -31,9 +31,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_syscalls.c	8.4 (Berkeley) 2/21/94
- * $Id: uipc_syscalls.c,v 1.33 1997/12/14 03:15:21 msmith Exp $
+ * $Id: uipc_syscalls.c,v 1.34 1997/12/15 02:29:10 msmith Exp $
  */
 
+#include "opt_compat.h"
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index e9497c7c40a7f..928d16bf3d8d7 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.84 1997/11/22 06:41:21 bde Exp $
+ * $Id: vfs_syscalls.c,v 1.85 1997/12/02 10:32:21 bde Exp $
  */
 
+/* For 4.3 integer FS ID compatibility */
+#include "opt_compat.h"
+
 /*
  * XXX - The following is required because of some magic done 
  * in getdirentries() below which is only done if the translucent
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index e9497c7c40a7f..928d16bf3d8d7 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.84 1997/11/22 06:41:21 bde Exp $
+ * $Id: vfs_syscalls.c,v 1.85 1997/12/02 10:32:21 bde Exp $
  */
 
+/* For 4.3 integer FS ID compatibility */
+#include "opt_compat.h"
+
 /*
  * XXX - The following is required because of some magic done 
  * in getdirentries() below which is only done if the translucent
diff --git a/sys/net/if.c b/sys/net/if.c
index 61f951bf530ea..665b90f2a91de 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.3 (Berkeley) 1/4/94
- *	$Id: if.c,v 1.55 1997/10/12 20:25:09 phk Exp $
+ *	$Id: if.c,v 1.56 1997/10/28 15:58:30 bde Exp $
  */
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 1189f27bf25d1..bcf4d2135fdff 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -31,10 +31,11 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.43 1997/11/25 09:42:26 kato Exp $
+ *	$Id: sio.c,v 1.44 1997/12/06 13:24:54 bde Exp $
  */
 
 #include "opt_comconsole.h"
+#include "opt_compat.h"
 #include "opt_ddb.h"
 #include "opt_sio.h"
 #include "sio.h"
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 1189f27bf25d1..bcf4d2135fdff 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -31,10 +31,11 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.43 1997/11/25 09:42:26 kato Exp $
+ *	$Id: sio.c,v 1.44 1997/12/06 13:24:54 bde Exp $
  */
 
 #include "opt_comconsole.h"
+#include "opt_compat.h"
 #include "opt_ddb.h"
 #include "opt_sio.h"
 #include "sio.h"
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 7f89cb8d157ea..14fc1d538c502 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -1041,6 +1041,7 @@ int	mlockall __P((struct proc *, struct mlockall_args *));
 int	munlockall __P((struct proc *, struct munlockall_args *));
 int	__getcwd __P((struct proc *, struct __getcwd_args *));
 
+#include "opt_compat.h"
 #ifdef COMPAT_43
 
 struct	ocreat_args {
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 6c6ab99d0d600..459a20c978dec 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -38,13 +38,14 @@
  * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
  *
  *	@(#)vm_mmap.c	8.4 (Berkeley) 1/12/94
- * $Id: vm_mmap.c,v 1.68 1997/09/01 03:17:20 bde Exp $
+ * $Id: vm_mmap.c,v 1.69 1997/11/06 19:29:54 phk Exp $
  */
 
 /*
  * Mapped file (mmap) interface to VM
  */
 
+#include "opt_compat.h"
 #include "opt_rlimit.h"
 
 #include <sys/param.h>