15 files changed, 4 insertions, 55 deletions
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c
index 9d404c749864..c3e56f95505d 100644
--- a/sys/compat/svr4/svr4_filio.c
+++ b/sys/compat/svr4/svr4_filio.c
@@ -35,14 +35,10 @@
 #include <sys/filio.h>
 #include <sys/fcntl.h>
 #include <sys/signal.h>
-#include <sys/unistd.h>
 #include <sys/filedesc.h>
 #include <sys/termios.h>
-#include <sys/tty.h>
 #include <sys/poll.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/mount.h>
 #include <net/if.h>
 #include <sys/malloc.h>
 
diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c
index 401c58b2a960..183678e05cb4 100644
--- a/sys/compat/svr4/svr4_ioctl.c
+++ b/sys/compat/svr4/svr4_ioctl.c
@@ -30,20 +30,13 @@
 
 #include <sys/param.h>
 #include <sys/proc.h>
-#include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
-#include <sys/unistd.h>
 #include <sys/fcntl.h>
 #include <sys/termios.h>
-#include <sys/tty.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/mount.h>
 #include <net/if.h>
-#include <sys/malloc.h>
 
-#include <sys/sysproto.h>
 
 #include <svr4/svr4.h>
 #include <svr4/svr4_types.h>
diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c
index f884fa16c4ed..4a9f5d7ce3c9 100644
--- a/sys/compat/svr4/svr4_ipc.c
+++ b/sys/compat/svr4/svr4_ipc.c
@@ -80,19 +80,9 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
-#include <sys/shm.h>
-#include <sys/msg.h>
-#include <sys/sem.h>
 #include <sys/proc.h>
-#include <sys/uio.h>
 #include <sys/time.h>
-#include <sys/malloc.h>
-#include <sys/mman.h>
-#include <sys/systm.h>
-#include <sys/stat.h>
 
-#include <sys/mount.h>
-#include <sys/sysproto.h>
 
 #include <svr4/svr4_types.h>
 #include <svr4/svr4_signal.h>
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 9720abca1e58..a24759e64e52 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -47,24 +47,18 @@
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
-#include <sys/mbuf.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
-#include <sys/socket.h>
 #include <sys/vnode.h>
 #include <sys/uio.h>
 #include <sys/wait.h>
-#include <sys/utsname.h>
-#include <sys/unistd.h>
 #include <sys/times.h>
 #include <sys/fcntl.h>
 #include <sys/sem.h>
 #include <sys/msg.h>
 #include <sys/ptrace.h>
-#include <sys/signalvar.h>
-#include <ufs/ufs/dir.h>
 #include <vm/vm_zone.h>
 
 #include <sys/sysproto.h>
diff --git a/sys/compat/svr4/svr4_proto.h b/sys/compat/svr4/svr4_proto.h
index 6a234e72a1f1..407513af4f89 100644
--- a/sys/compat/svr4/svr4_proto.h
+++ b/sys/compat/svr4/svr4_proto.h
@@ -2,6 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
+ * $FreeBSD$
  * created from;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
  */
 
diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c
index 791e9f23cc72..ee8dfd6ca875 100644
--- a/sys/compat/svr4/svr4_signal.c
+++ b/sys/compat/svr4/svr4_signal.c
@@ -30,14 +30,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/filedesc.h>
-#include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
-#include <sys/malloc.h>
 #include <sys/sysproto.h>
 
 #include <svr4/svr4.h>
diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c
index e2eafa304e5d..1bcd92da605c 100644
--- a/sys/compat/svr4/svr4_socket.c
+++ b/sys/compat/svr4/svr4_socket.c
@@ -46,9 +46,7 @@
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
-#include <sys/mbuf.h>
 #include <sys/file.h>
-#include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysproto.h>
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index 8fe80998010a..d4f4505b2298 100644
--- a/sys/compat/svr4/svr4_sockio.c
+++ b/sys/compat/svr4/svr4_sockio.c
@@ -35,13 +35,9 @@
 #include <sys/filedesc.h>
 #include <sys/sockio.h>
 #include <sys/termios.h>
-#include <sys/tty.h>
 #include <sys/socket.h>
-#include <sys/mount.h>
 #include <net/if.h>
-#include <sys/malloc.h>
 
-#include <sys/sysproto.h>
 
 #include <svr4/svr4.h>
 #include <svr4/svr4_types.h>
diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c
index 9ffcbc58d754..f1d8c407334e 100644
--- a/sys/compat/svr4/svr4_stat.c
+++ b/sys/compat/svr4/svr4_stat.c
@@ -30,18 +30,14 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
-#include <sys/mount.h>
-#include <sys/malloc.h>
 #include <sys/unistd.h>
 
 #include <sys/time.h>
-#include <sys/ucred.h>
 #include <vm/vm.h>
 #include <sys/sysctl.h>
 #include <netinet/in.h>
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index 7ac31f36dbd5..fbe6eebe747b 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -44,10 +44,8 @@
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
-#include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
-#include <sys/unistd.h>
 #include <sys/fcntl.h>
 #include <sys/filio.h>
 #include <sys/select.h>
@@ -56,7 +54,6 @@
 #include <sys/un.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <sys/mount.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/signal.h>
@@ -64,7 +61,6 @@
 #include <sys/uio.h>
 #include <sys/ktrace.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/stat.h>
 
 #include <sys/sysproto.h>
diff --git a/sys/compat/svr4/svr4_syscall.h b/sys/compat/svr4/svr4_syscall.h
index 1489740208bf..749acaebbc9d 100644
--- a/sys/compat/svr4/svr4_syscall.h
+++ b/sys/compat/svr4/svr4_syscall.h
@@ -2,6 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
+ * $FreeBSD$
  * created from;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
  */
 
diff --git a/sys/compat/svr4/svr4_syscallnames.c b/sys/compat/svr4/svr4_syscallnames.c
index bb715b0a1f7a..6de96e6917fb 100644
--- a/sys/compat/svr4/svr4_syscallnames.c
+++ b/sys/compat/svr4/svr4_syscallnames.c
@@ -2,6 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
+ * $FreeBSD$
  * created from;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
  */
 
diff --git a/sys/compat/svr4/svr4_sysent.c b/sys/compat/svr4/svr4_sysent.c
index 3b1415d348f2..e53cb87ea4b9 100644
--- a/sys/compat/svr4/svr4_sysent.c
+++ b/sys/compat/svr4/svr4_sysent.c
@@ -2,6 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
+ * $FreeBSD$
  * created from;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
  */
 
diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c
index 6a2bc03d9bff..f88b7d127ce4 100644
--- a/sys/compat/svr4/svr4_sysvec.c
+++ b/sys/compat/svr4/svr4_sysvec.c
@@ -45,17 +45,11 @@
 #include <sys/imgact.h>
 #include <sys/imgact_elf.h>
 #include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/signalvar.h>
 #include <sys/malloc.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/module.h>
 #include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_prot.h>
-#include <vm/vm_page.h>
-#include <vm/vm_extern.h>
 #include <sys/exec.h>
 #include <sys/kernel.h>
 #include <machine/cpu.h>
diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c
index 699d44d0aa00..890b0e8f7b11 100644
--- a/sys/compat/svr4/svr4_ttold.c
+++ b/sys/compat/svr4/svr4_ttold.c
@@ -35,15 +35,10 @@
 #include <sys/filedesc.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl_compat.h>
-#include <sys/unistd.h>
 #include <sys/termios.h>
-#include <sys/tty.h>
 #include <sys/socket.h>
-#include <sys/mount.h>
 #include <net/if.h>
-#include <sys/malloc.h>
 
-#include <sys/sysproto.h>
 
 #include <svr4/svr4_types.h>
 #include <svr4/svr4_util.h>