diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index f5acadb5c346..7b523d461116 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.330 1998/10/17 00:07:11 jtk Exp $	*/
+/*	$NetBSD: machdep.c,v 1.331 1998/10/19 22:14:54 tron Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -83,6 +83,7 @@
 #include "opt_pmap_new.h"
 #include "opt_compat_netbsd.h"
 #include "opt_cpureset_delay.h"
+#include "opt_sysv.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/i386/i386/vm86.c b/sys/arch/i386/i386/vm86.c
index 8e68dea1c85c..5dad9abfda1d 100644
--- a/sys/arch/i386/i386/vm86.c
+++ b/sys/arch/i386/i386/vm86.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm86.c,v 1.20 1998/09/11 12:50:06 mycroft Exp $	*/
+/*	$NetBSD: vm86.c,v 1.21 1998/10/19 22:14:55 tron Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -36,6 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "opt_sysv.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
diff --git a/sys/conf/files b/sys/conf/files
index 30414bdd1e6d..2e8e08d3ea92 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.249 1998/10/12 16:09:14 bouyer Exp $
+#	$NetBSD: files,v 1.250 1998/10/19 22:16:22 tron Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -18,6 +18,8 @@ defopt	DEVPAGER
 defopt	SWAPPAGER
 defopt	VNODEPAGER
 
+defopt	opt_sysv.h	SYSVMSG SYSVSEM	SYSVSHM
+
 defopt	opt_ntp.h	PPS_SYNC NTP 
 
 defopt	opt_nfs_boot.h	NFS_BOOT_BOOTP NFS_BOOT_BOOTPARAM NFS_BOOT_DHCP
diff --git a/sys/conf/param.c b/sys/conf/param.c
index ae09166cebe9..834ca016c0ca 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.c,v 1.23 1998/02/05 07:59:34 mrg Exp $	*/
+/*	$NetBSD: param.c,v 1.24 1998/10/19 22:16:22 tron Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1989 Regents of the University of California.
@@ -41,6 +41,7 @@
  */
 
 #include "opt_rtc_offset.h"
+#include "opt_sysv.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 277c34928cd0..8708d37a1b66 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: init_main.c,v 1.133 1998/10/19 11:51:53 pk Exp $	*/
+/*	$NetBSD: init_main.c,v 1.134 1998/10/19 22:19:26 tron Exp $	*/
 
 /*
  * Copyright (c) 1995 Christopher G. Demetriou.  All rights reserved.
@@ -44,6 +44,7 @@
 #include "fs_nfs.h"
 #include "opt_nfsserver.h"
 #include "opt_uvm.h"
+#include "opt_sysv.h"
 
 #include "rnd.h"
 
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index bfcff8f75907..3bfbb9e41b70 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.84 1998/09/12 10:48:29 mycroft Exp $
+	$NetBSD: syscalls.master,v 1.85 1998/10/19 22:17:41 tron Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 
@@ -36,6 +36,7 @@
 #include "opt_ktrace.h"
 #include "opt_nfsserver.h"
 #include "opt_compat_netbsd.h"
+#include "opt_sysv.h"
 
 #include "fs_lfs.h"
 #include "fs_nfs.h"
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index b4b30df445fb..089db913af3a 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_glue.c,v 1.80 1998/10/14 11:45:16 ws Exp $	*/
+/*	$NetBSD: vm_glue.c,v 1.81 1998/10/19 22:16:22 tron Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -62,6 +62,8 @@
  * rights to redistribute these changes.
  */
 
+#include "opt_sysv.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index b2d6978bc0dd..01e5c49b06ae 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_map.c,v 1.39 1998/08/13 02:11:07 eeh Exp $	*/
+/*	$NetBSD: vm_map.c,v 1.40 1998/10/19 22:16:22 tron Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -68,6 +68,8 @@
  *	Virtual memory mapping module.
  */
 
+#include "opt_sysv.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>