diff --git a/sys/adosfs/advfsops.c b/sys/adosfs/advfsops.c
index 09562f7f9f4a..49e6cd9a3f13 100644
--- a/sys/adosfs/advfsops.c
+++ b/sys/adosfs/advfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: advfsops.c,v 1.28 1998/03/01 02:25:18 fvdl Exp $	*/
+/*	$NetBSD: advfsops.c,v 1.29 1998/07/05 08:49:44 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -30,6 +30,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.
  */
+
+#if defined(_KERNEL) && !defined(_LKM)
+#include "opt_compat_netbsd.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index 8f980ae479bd..6323158ad2f3 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.119 1998/07/05 06:49:03 jonathan Exp $	*/
+/*	$NetBSD: machdep.c,v 1.120 1998/07/05 08:49:37 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -47,6 +47,7 @@
 #include "opt_atalk.h"
 #include "opt_iso.h"
 #include "opt_ns.h"
+#include "opt_compat_netbsd.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/arm32/arm32/cpufunc.c b/sys/arch/arm32/arm32/cpufunc.c
index 1f2c547c0d2d..f4922a7a8591 100644
--- a/sys/arch/arm32/arm32/cpufunc.c
+++ b/sys/arch/arm32/arm32/cpufunc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.c,v 1.5 1998/02/21 22:41:35 mark Exp $	*/
+/*	$NetBSD: cpufunc.c,v 1.6 1998/07/05 08:49:37 jonathan Exp $	*/
 
 /*
  * arm8 support code Copyright (c) 1997 ARM Limited
@@ -42,6 +42,7 @@
  *
  * Created      : 30/01/97
  */
+#include "opt_compat_netbsd.h"
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sys/arch/atari/atari/disksubr.c b/sys/arch/atari/atari/disksubr.c
index bdd66bc94cf7..4cb822195edd 100644
--- a/sys/arch/atari/atari/disksubr.c
+++ b/sys/arch/atari/atari/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.15 1998/04/15 09:02:06 leo Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.16 1998/07/05 08:49:38 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -34,6 +34,8 @@
 #define	DISKLABEL_NBDA	/* required */
 #endif
 
+#include "opt_compat_netbsd.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/arch/atari/atari/machdep.c b/sys/arch/atari/atari/machdep.c
index fc95c113bbba..4c8558bc4e22 100644
--- a/sys/arch/atari/atari/machdep.c
+++ b/sys/arch/atari/atari/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.67 1998/07/05 06:49:04 jonathan Exp $	*/
+/*	$NetBSD: machdep.c,v 1.68 1998/07/05 08:49:38 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -48,6 +48,7 @@
 #include "opt_iso.h"
 #include "opt_ns.h"
 #include "opt_uvm.h"
+#include "opt_compat_netbsd.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/bebox/isa/pccons.c b/sys/arch/bebox/isa/pccons.c
index 0c5e567ae12a..cb40c8093d74 100644
--- a/sys/arch/bebox/isa/pccons.c
+++ b/sys/arch/bebox/isa/pccons.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pccons.c,v 1.9 1998/07/04 22:18:22 jonathan Exp $	*/
+/*	$NetBSD: pccons.c,v 1.10 1998/07/05 08:49:39 jonathan Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles Hannum.  All rights reserved.
@@ -44,6 +44,7 @@
  */
 
 #include "opt_ddb.h"
+#include "opt_compat_netbsd.h"
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/sys/arch/bebox/isa/pcvt/pcvt_ext.c b/sys/arch/bebox/isa/pcvt/pcvt_ext.c
index 4822fc2ac86d..a4db80dce150 100644
--- a/sys/arch/bebox/isa/pcvt/pcvt_ext.c
+++ b/sys/arch/bebox/isa/pcvt/pcvt_ext.c
@@ -84,6 +84,7 @@
 #if NVT > 0
 
 #include "pcvt_hdr.h"		/* global include */
+#include "opt_compat_netbsd.h"
 
 static int  s3testwritable( void );
 static int  et4000_col( int );
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index ee68f2821486..4c9620d04a2e 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.309 1998/07/04 22:18:25 jonathan Exp $	*/
+/*	$NetBSD: machdep.c,v 1.310 1998/07/05 08:49:34 jonathan Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -84,6 +84,7 @@
 #include "opt_user_ldt.h"
 #include "opt_uvm.h"
 #include "opt_pmap_new.h"
+#include "opt_compat_netbsd.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/i386/i386/mem.c b/sys/arch/i386/i386/mem.c
index 822605e61991..778e02adf3fb 100644
--- a/sys/arch/i386/i386/mem.c
+++ b/sys/arch/i386/i386/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.34 1998/02/10 14:11:07 mrg Exp $	*/
+/*	$NetBSD: mem.c,v 1.35 1998/07/05 08:49:35 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -42,6 +42,7 @@
 
 #include "opt_uvm.h"
 #include "opt_pmap_new.h"
+#include "opt_compat_netbsd.h"
 
 /*
  * Memory special file
diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index b7155e9cacfd..7419f5aaa8d4 100644
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pccons.c,v 1.126 1998/07/04 22:18:26 jonathan Exp $	*/
+/*	$NetBSD: pccons.c,v 1.127 1998/07/05 08:49:35 jonathan Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles Hannum.  All rights reserved.
@@ -49,6 +49,7 @@
 
 #include "opt_ddb.h"
 #include "opt_xserver.h"
+#include "opt_compat_netbsd.h"
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/sys/arch/i386/isa/pcvt/pcvt_ext.c b/sys/arch/i386/isa/pcvt/pcvt_ext.c
index dc2295a671fa..45e93328bd15 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_ext.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_ext.c
@@ -81,6 +81,7 @@
  *---------------------------------------------------------------------------*/
 
 #include "pcvt_hdr.h"		/* global include */
+#include "opt_compat_netbsd.h"
 
 static int  s3testwritable( void );
 static int  et4000_col( int );
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index d48287a5e571..42e7b9ede1ae 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.204 1998/07/05 06:49:05 jonathan Exp $	*/
+/*	$NetBSD: machdep.c,v 1.205 1998/07/05 08:49:39 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -83,6 +83,7 @@
 #include "opt_iso.h"
 #include "opt_ns.h"
 #include "opt_uvm.h"
+#include "opt_compat_netbsd.h"
 #include "zsc.h"
 
 #include <sys/param.h>
diff --git a/sys/arch/mips/mips/cpu_exec.c b/sys/arch/mips/mips/cpu_exec.c
index 069ef216f8df..a944bf983ea6 100644
--- a/sys/arch/mips/mips/cpu_exec.c
+++ b/sys/arch/mips/mips/cpu_exec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_exec.c,v 1.15 1998/06/25 23:28:15 thorpej Exp $	*/
+/*	$NetBSD: cpu_exec.c,v 1.16 1998/07/05 08:49:30 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -38,6 +38,7 @@
  *	@(#)machdep.c	8.3 (Berkeley) 1/12/94
  */
 
+#include "opt_compat_netbsd.h"
 #include "opt_compat_ultrix.h"
 
 #include <sys/param.h>
diff --git a/sys/arch/x68k/x68k/disksubr.c b/sys/arch/x68k/x68k/disksubr.c
index 4eb03066dfce..fc9cc2f18382 100644
--- a/sys/arch/x68k/x68k/disksubr.c
+++ b/sys/arch/x68k/x68k/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.6 1997/10/12 18:23:18 oki Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.7 1998/07/05 08:49:40 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -35,6 +35,8 @@
  *	@(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  */
 
+#include "opt_compat_netbsd.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/arch/x68k/x68k/machdep.c b/sys/arch/x68k/x68k/machdep.c
index 9c0b49e43a9e..a7e2e576198b 100644
--- a/sys/arch/x68k/x68k/machdep.c
+++ b/sys/arch/x68k/x68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.36 1998/07/05 06:49:10 jonathan Exp $	*/
+/*	$NetBSD: machdep.c,v 1.37 1998/07/05 08:49:40 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -50,6 +50,7 @@
 #include "opt_ns.h"
 #include "opt_uvm.h"
 #include "opt_compat_hpux.h"
+#include "opt_compat_netbsd.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/common/kern_sig_43.c b/sys/compat/common/kern_sig_43.c
index e56213ecf89c..c3d7ebadc74b 100644
--- a/sys/compat/common/kern_sig_43.c
+++ b/sys/compat/common/kern_sig_43.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_sig_43.c,v 1.7 1996/03/14 19:31:47 christos Exp $	*/
+/*	$NetBSD: kern_sig_43.c,v 1.8 1998/07/05 08:49:44 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -40,6 +40,8 @@
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
  */
 
+#include "opt_compat_netbsd.h"
+
 #include <sys/param.h>
 #include <sys/signalvar.h>
 #include <sys/resourcevar.h>
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 189ac376a2f1..875c1c8f56bd 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.86 1998/05/18 18:27:43 augustss Exp $	*/
+/*	$NetBSD: audio.c,v 1.87 1998/07/05 08:49:41 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -63,6 +63,8 @@
 #include "audio.h"
 #if NAUDIO > 0
 
+#include "opt_compat_netbsd.h"
+
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
diff --git a/sys/dev/scsipi/scsipi_ioctl.c b/sys/dev/scsipi/scsipi_ioctl.c
index 41df6c4c51dd..04e02289f67c 100644
--- a/sys/dev/scsipi/scsipi_ioctl.c
+++ b/sys/dev/scsipi/scsipi_ioctl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsipi_ioctl.c,v 1.30 1998/06/25 22:50:18 thorpej Exp $	*/
+/*	$NetBSD: scsipi_ioctl.c,v 1.31 1998/07/05 08:49:41 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1994 Charles Hannum.  All rights reserved.
@@ -37,6 +37,7 @@
  */
 
 #include "opt_compat_freebsd.h"
+#include "opt_compat_netbsd.h"
 
 #include <sys/types.h>
 #include <sys/errno.h>
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 5cee067c0075..f9bf705400c9 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_vfsops.c,v 1.30 1998/06/24 20:58:45 sommerfe Exp $	*/
+/*	$NetBSD: cd9660_vfsops.c,v 1.31 1998/07/05 08:49:45 jonathan Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -40,6 +40,10 @@
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
  */
 
+#if defined(_KERNEL) && !defined(_LKM)
+#include "opt_compat_netbsd.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 487ff71bf30d..da33f8401994 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: init_sysent.c,v 1.93 1998/07/02 01:24:24 thorpej Exp $	*/
+/*	$NetBSD: init_sysent.c,v 1.94 1998/07/05 08:49:42 jonathan Exp $	*/
 
 /*
  * System call switch table.
@@ -9,6 +9,7 @@
 
 #include "opt_ktrace.h"
 #include "opt_nfsserver.h"
+#include "opt_compat_netbsd.h"
 #include "fs_lfs.h"
 #include "fs_nfs.h"
 #include <sys/param.h>
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index b6bc1e3334d4..ebf120e2fccf 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscalls.c,v 1.87 1998/07/02 01:24:25 thorpej Exp $	*/
+/*	$NetBSD: syscalls.c,v 1.88 1998/07/05 08:49:49 jonathan Exp $	*/
 
 /*
  * System call names.
@@ -10,6 +10,7 @@
 #if defined(_KERNEL) && !defined(_LKM)
 #include "opt_ktrace.h"
 #include "opt_nfsserver.h"
+#include "opt_compat_netbsd.h"
 #include "fs_lfs.h"
 #include "fs_nfs.h"
 #include <sys/param.h>
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 86de9e0156c1..8d5580342fde 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.80 1998/07/02 01:23:33 thorpej Exp $
+	$NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 
@@ -35,6 +35,7 @@
 
 #include "opt_ktrace.h"
 #include "opt_nfsserver.h"
+#include "opt_compat_netbsd.h"
 
 #include "fs_lfs.h"
 #include "fs_nfs.h"
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 574fd1abff70..8eab541da0e9 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_syscalls.c,v 1.120 1998/06/30 19:36:24 thorpej Exp $	*/
+/*	$NetBSD: vfs_syscalls.c,v 1.121 1998/07/05 08:49:43 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -41,6 +41,7 @@
  */
 
 #include "opt_uvm.h"
+#include "opt_compat_netbsd.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c
index 65e593a109ae..4dba9934fbe2 100644
--- a/sys/miscfs/fdesc/fdesc_vfsops.c
+++ b/sys/miscfs/fdesc/fdesc_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fdesc_vfsops.c,v 1.24 1998/03/01 02:21:08 fvdl Exp $	*/
+/*	$NetBSD: fdesc_vfsops.c,v 1.25 1998/07/05 08:49:45 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1995
@@ -44,6 +44,10 @@
  * /dev/fd Filesystem
  */
 
+#if defined(_KERNEL) && !defined(_LKM)
+#include "opt_compat_netbsd.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index 1689e21a4498..e896eef46ed0 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kernfs_vfsops.c,v 1.32 1998/03/01 02:21:04 fvdl Exp $	*/
+/*	$NetBSD: kernfs_vfsops.c,v 1.33 1998/07/05 08:49:45 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1995
@@ -42,6 +42,10 @@
  * Kernel params Filesystem
  */
 
+#if defined(_KERNEL) && !defined(_LKM)
+#include "opt_compat_netbsd.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index cf3c272820a0..b7e4edebf3c2 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: portal_vfsops.c,v 1.17 1998/03/01 02:21:38 fvdl Exp $	*/
+/*	$NetBSD: portal_vfsops.c,v 1.18 1998/07/05 08:49:46 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1995
@@ -43,6 +43,10 @@
  * Portal Filesystem
  */
 
+#if defined(_KERNEL) && !defined(_LKM)
+#include "opt_compat_netbsd.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index 1115ee350c86..6e0729b5ff28 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs_vfsops.c,v 1.28 1998/03/01 02:21:16 fvdl Exp $	*/
+/*	$NetBSD: procfs_vfsops.c,v 1.29 1998/07/05 08:49:46 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1993 Jan-Simon Pendry
@@ -43,6 +43,10 @@
  * procfs VFS interface
  */
 
+#if defined(_KERNEL) && !defined(_LKM)
+#include "opt_compat_netbsd.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index fc0f99a5c638..ebf891311837 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: msdosfs_vfsops.c,v 1.56 1998/06/09 07:46:32 scottr Exp $	*/
+/*	$NetBSD: msdosfs_vfsops.c,v 1.57 1998/07/05 08:49:47 jonathan Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -49,6 +49,7 @@
 
 #if defined(_KERNEL) && !defined(_LKM)
 #include "opt_quota.h"
+#include "opt_compat_netbsd.h"
 #endif
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 0feb3b2c0eb0..4a57b1afd3d3 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_vfsops.c,v 1.75 1998/06/24 20:58:46 sommerfe Exp $	*/
+/*	$NetBSD: nfs_vfsops.c,v 1.76 1998/07/05 08:49:48 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1995
@@ -38,6 +38,10 @@
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
  */
 
+#if defined(_KERNEL) && !defined(_LKM)
+#include "opt_compat_netbsd.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/ioctl.h>
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c
index a026053a0f23..f9e2bc0cc713 100644
--- a/sys/ufs/ext2fs/ext2fs_vfsops.c
+++ b/sys/ufs/ext2fs/ext2fs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_vfsops.c,v 1.14 1998/06/24 20:58:47 sommerfe Exp $	*/
+/*	$NetBSD: ext2fs_vfsops.c,v 1.15 1998/07/05 08:49:48 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.
@@ -37,6 +37,10 @@
  * Modified for ext2fs by Manuel Bouyer.
  */
 
+#if defined(_KERNEL) && !defined(_LKM)
+#include "opt_compat_netbsd.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index d83d0aed3b2f..4a03ebdeb19b 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_vfsops.c,v 1.40 1998/06/24 20:58:48 sommerfe Exp $	*/
+/*	$NetBSD: ffs_vfsops.c,v 1.41 1998/07/05 08:49:48 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1994
@@ -37,6 +37,7 @@
 
 #if defined(_KERNEL) && !defined(_LKM)
 #include "opt_quota.h"
+#include "opt_compat_netbsd.h"
 #endif
 
 #include <sys/param.h>
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index d8dcfd70cc80..fd51cbf284da 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mfs_vfsops.c,v 1.16 1998/03/01 22:16:01 fvdl Exp $	*/
+/*	$NetBSD: mfs_vfsops.c,v 1.17 1998/07/05 08:49:49 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1989, 1990, 1993, 1994
@@ -35,6 +35,10 @@
  *	@(#)mfs_vfsops.c	8.11 (Berkeley) 6/19/95
  */
 
+#if defined(_KERNEL) && !defined(_LKM)
+#include "opt_compat_netbsd.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>