23 files changed, 120 insertions, 120 deletions

diff --git a/sys/compat/svr4/imgact_svr4.c b/sys/compat/svr4/imgact_svr4.c
index 7dc0d635c4d9e..a244d7b87e9ac 100644
--- a/sys/compat/svr4/imgact_svr4.c
+++ b/sys/compat/svr4/imgact_svr4.c
@@ -51,7 +51,7 @@
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
-#include <svr4/svr4.h>
+#include <compat/svr4/svr4.h>
 
 static int	exec_svr4_imgact __P((struct image_params *iparams));
 
diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c
index c65f34584b76e..fb71d9a9d2f29 100644
--- a/sys/compat/svr4/svr4_fcntl.c
+++ b/sys/compat/svr4/svr4_fcntl.c
@@ -44,12 +44,12 @@
 
 #include <sys/sysproto.h>
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_util.h>
-#include <svr4/svr4_fcntl.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_types.h>
+#include <compat/svr4/svr4_signal.h>
+#include <compat/svr4/svr4_proto.h>
+#include <compat/svr4/svr4_util.h>
+#include <compat/svr4/svr4_fcntl.h>
 
 static int svr4_to_bsd_flags __P((int));
 static u_long svr4_to_bsd_cmd __P((u_long));
diff --git a/sys/compat/svr4/svr4_fcntl.h b/sys/compat/svr4/svr4_fcntl.h
index 615e09c219fbd..3309a4f21cd1d 100644
--- a/sys/compat/svr4/svr4_fcntl.h
+++ b/sys/compat/svr4/svr4_fcntl.h
@@ -31,7 +31,7 @@
 #ifndef	_SVR4_FCNTL_H_
 #define	_SVR4_FCNTL_H_
 
-#include <svr4/svr4_types.h>
+#include <compat/svr4/svr4_types.h>
 #include <sys/fcntl.h>
 
 #define	SVR4_O_RDONLY		0x0000
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c
index 92b409270e282..c467dad798756 100644
--- a/sys/compat/svr4/svr4_filio.c
+++ b/sys/compat/svr4/svr4_filio.c
@@ -40,13 +40,13 @@
 
 #include <sys/sysproto.h>
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
-#include <svr4/svr4_util.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_ioctl.h>
-#include <svr4/svr4_filio.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_types.h>
+#include <compat/svr4/svr4_util.h>
+#include <compat/svr4/svr4_signal.h>
+#include <compat/svr4/svr4_proto.h>
+#include <compat/svr4/svr4_ioctl.h>
+#include <compat/svr4/svr4_filio.h>
 
 /*#define GROTTY_READ_HACK*/
 
diff --git a/sys/compat/svr4/svr4_fuser.h b/sys/compat/svr4/svr4_fuser.h
index 25cdcf13e0be3..f828c843c2b48 100644
--- a/sys/compat/svr4/svr4_fuser.h
+++ b/sys/compat/svr4/svr4_fuser.h
@@ -74,7 +74,7 @@
 #ifndef	_SVR4_FUSER_H_
 #define	_SVR4_FUSER_H_
 
-#include <svr4/svr4_types.h>
+#include <compat/svr4/svr4_types.h>
 
 struct svr4_f_user {
 	svr4_pid_t	fu_pid;
diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c
index 2891694166a67..55465d12d3617 100644
--- a/sys/compat/svr4/svr4_ioctl.c
+++ b/sys/compat/svr4/svr4_ioctl.c
@@ -37,17 +37,17 @@
 #include <sys/socketvar.h>
 #include <sys/systm.h>
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
-#include <svr4/svr4_util.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_stropts.h>
-#include <svr4/svr4_ioctl.h>
-#include <svr4/svr4_termios.h>
-#include <svr4/svr4_ttold.h>
-#include <svr4/svr4_filio.h>
-#include <svr4/svr4_sockio.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_types.h>
+#include <compat/svr4/svr4_util.h>
+#include <compat/svr4/svr4_signal.h>
+#include <compat/svr4/svr4_proto.h>
+#include <compat/svr4/svr4_stropts.h>
+#include <compat/svr4/svr4_ioctl.h>
+#include <compat/svr4/svr4_termios.h>
+#include <compat/svr4/svr4_ttold.h>
+#include <compat/svr4/svr4_filio.h>
+#include <compat/svr4/svr4_sockio.h>
 
 #ifdef DEBUG_SVR4
 static void svr4_decode_cmd __P((u_long, char *, char *, int *, int *));
diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c
index b37e213f92799..6c0e578f71123 100644
--- a/sys/compat/svr4/svr4_ipc.c
+++ b/sys/compat/svr4/svr4_ipc.c
@@ -82,12 +82,12 @@
 #include <sys/proc.h>
 #include <sys/time.h>
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_util.h>
-#include <svr4/svr4_ipc.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_types.h>
+#include <compat/svr4/svr4_signal.h>
+#include <compat/svr4/svr4_proto.h>
+#include <compat/svr4/svr4_util.h>
+#include <compat/svr4/svr4_ipc.h>
 
 #if defined(SYSVMSG) || defined(SYSVSHM) || defined(SYSVSEM)
 static void svr4_to_bsd_ipc_perm __P((const struct svr4_ipc_perm *,
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 81b7e653039be..4d921b56c045e 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -62,19 +62,19 @@
 
 #include <sys/sysproto.h>
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_util.h>
-#include <svr4/svr4_sysconfig.h>
-#include <svr4/svr4_dirent.h>
-#include <svr4/svr4_acl.h>
-#include <svr4/svr4_ulimit.h>
-#include <svr4/svr4_statvfs.h>
-#include <svr4/svr4_hrt.h>
-#include <svr4/svr4_mman.h>
-#include <svr4/svr4_wait.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_types.h>
+#include <compat/svr4/svr4_signal.h>
+#include <compat/svr4/svr4_proto.h>
+#include <compat/svr4/svr4_util.h>
+#include <compat/svr4/svr4_sysconfig.h>
+#include <compat/svr4/svr4_dirent.h>
+#include <compat/svr4/svr4_acl.h>
+#include <compat/svr4/svr4_ulimit.h>
+#include <compat/svr4/svr4_statvfs.h>
+#include <compat/svr4/svr4_hrt.h>
+#include <compat/svr4/svr4_mman.h>
+#include <compat/svr4/svr4_wait.h>
 
 #include <machine/vmparam.h>
 #include <vm/vm.h>
diff --git a/sys/compat/svr4/svr4_resource.c b/sys/compat/svr4/svr4_resource.c
index 1e5e8fd2691a6..c5593453822ee 100644
--- a/sys/compat/svr4/svr4_resource.c
+++ b/sys/compat/svr4/svr4_resource.c
@@ -79,12 +79,12 @@
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
-#include <svr4/svr4_resource.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_util.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_types.h>
+#include <compat/svr4/svr4_resource.h>
+#include <compat/svr4/svr4_signal.h>
+#include <compat/svr4/svr4_proto.h>
+#include <compat/svr4/svr4_util.h>
 
 static __inline int svr4_to_native_rl __P((int));
 
diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c
index 821f62c68b400..c80538edb42a6 100644
--- a/sys/compat/svr4/svr4_signal.c
+++ b/sys/compat/svr4/svr4_signal.c
@@ -36,12 +36,12 @@
 #include <sys/signalvar.h>
 #include <sys/sysproto.h>
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_util.h>
-#include <svr4/svr4_ucontext.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_types.h>
+#include <compat/svr4/svr4_signal.h>
+#include <compat/svr4/svr4_proto.h>
+#include <compat/svr4/svr4_util.h>
+#include <compat/svr4/svr4_ucontext.h>
 
 #define	svr4_sigmask(n)		(1 << (((n) - 1) & 31))
 #define	svr4_sigword(n)		(((n) - 1) >> 5)
diff --git a/sys/compat/svr4/svr4_signal.h b/sys/compat/svr4/svr4_signal.h
index 1fdc3ab4cbc69..1549c83301253 100644
--- a/sys/compat/svr4/svr4_signal.h
+++ b/sys/compat/svr4/svr4_signal.h
@@ -32,7 +32,7 @@
 #define	_SVR4_SIGNAL_H_
 
 #include <i386/svr4/svr4_machdep.h>
-#include <svr4/svr4_siginfo.h>
+#include <compat/svr4/svr4_siginfo.h>
 
 #define	SVR4_SIGHUP	 1
 #define	SVR4_SIGINT	 2
diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c
index 1884b07ef3165..9757d29db4d6f 100644
--- a/sys/compat/svr4/svr4_socket.c
+++ b/sys/compat/svr4/svr4_socket.c
@@ -54,13 +54,13 @@
 #include <sys/proc.h>
 #include <sys/malloc.h>
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
-#include <svr4/svr4_util.h>
-#include <svr4/svr4_socket.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_sockmod.h>
-#include <svr4/svr4_proto.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_types.h>
+#include <compat/svr4/svr4_util.h>
+#include <compat/svr4/svr4_socket.h>
+#include <compat/svr4/svr4_signal.h>
+#include <compat/svr4/svr4_sockmod.h>
+#include <compat/svr4/svr4_proto.h>
 
 struct svr4_sockcache_entry {
 	struct proc *p;		/* Process for the socket		*/
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index 5b99ae924dab6..7217091a2785f 100644
--- a/sys/compat/svr4/svr4_sockio.c
+++ b/sys/compat/svr4/svr4_sockio.c
@@ -38,10 +38,10 @@
 #include <net/if.h>
 
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_util.h>
-#include <svr4/svr4_ioctl.h>
-#include <svr4/svr4_sockio.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_util.h>
+#include <compat/svr4/svr4_ioctl.h>
+#include <compat/svr4/svr4_sockio.h>
 
 static int bsd_to_svr4_flags __P((int));
 
diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c
index 8884116f9b2b5..a3f22c8d2288b 100644
--- a/sys/compat/svr4/svr4_stat.c
+++ b/sys/compat/svr4/svr4_stat.c
@@ -43,17 +43,17 @@
 
 #include <netinet/in.h>
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_util.h>
-#include <svr4/svr4_stat.h>
-#include <svr4/svr4_ustat.h>
-#include <svr4/svr4_utsname.h>
-#include <svr4/svr4_systeminfo.h>
-#include <svr4/svr4_socket.h>
-#include <svr4/svr4_time.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_types.h>
+#include <compat/svr4/svr4_signal.h>
+#include <compat/svr4/svr4_proto.h>
+#include <compat/svr4/svr4_util.h>
+#include <compat/svr4/svr4_stat.h>
+#include <compat/svr4/svr4_ustat.h>
+#include <compat/svr4/svr4_utsname.h>
+#include <compat/svr4/svr4_systeminfo.h>
+#include <compat/svr4/svr4_socket.h>
+#include <compat/svr4/svr4_time.h>
 #if defined(NOTYET)
 #include "svr4_fuser.h"
 #endif
diff --git a/sys/compat/svr4/svr4_stat.h b/sys/compat/svr4/svr4_stat.h
index 7eeff44f30acf..e92aea68f367c 100644
--- a/sys/compat/svr4/svr4_stat.h
+++ b/sys/compat/svr4/svr4_stat.h
@@ -31,7 +31,7 @@
 #ifndef	_SVR4_STAT_H_
 #define	_SVR4_STAT_H_
 
-#include <svr4/svr4_types.h>
+#include <compat/svr4/svr4_types.h>
 #include <sys/stat.h>
 
 struct svr4_stat {
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index b2cadc910c109..da01b24b7a37d 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -62,16 +62,16 @@
 
 #include <sys/sysproto.h>
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
-#include <svr4/svr4_util.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_stropts.h>
-#include <svr4/svr4_timod.h>
-#include <svr4/svr4_sockmod.h>
-#include <svr4/svr4_ioctl.h>
-#include <svr4/svr4_socket.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_types.h>
+#include <compat/svr4/svr4_util.h>
+#include <compat/svr4/svr4_signal.h>
+#include <compat/svr4/svr4_proto.h>
+#include <compat/svr4/svr4_stropts.h>
+#include <compat/svr4/svr4_timod.h>
+#include <compat/svr4/svr4_sockmod.h>
+#include <compat/svr4/svr4_ioctl.h>
+#include <compat/svr4/svr4_socket.h>
 
 /* Utils */
 static int clean_pipe __P((struct proc *, const char *));
diff --git a/sys/compat/svr4/svr4_sysent.c b/sys/compat/svr4/svr4_sysent.c
index 9e231b2e57bad..bad9e4e55c439 100644
--- a/sys/compat/svr4/svr4_sysent.c
+++ b/sys/compat/svr4/svr4_sysent.c
@@ -10,10 +10,10 @@
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
 #include <netinet/in.h>
-#include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_types.h>
+#include <compat/svr4/svr4_signal.h>
+#include <compat/svr4/svr4_proto.h>
 
 #define AS(name) (sizeof(struct name) / sizeof(register_t))
 
diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c
index 5063ea690e903..9690a99b3adfe 100644
--- a/sys/compat/svr4/svr4_sysvec.c
+++ b/sys/compat/svr4/svr4_sysvec.c
@@ -54,16 +54,16 @@
 #include <machine/cpu.h>
 #include <netinet/in.h>
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
-#include <svr4/svr4_syscall.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_sockio.h>
-#include <svr4/svr4_socket.h>
-#include <svr4/svr4_errno.h>
-#include <svr4/svr4_proto.h>
-#include <svr4/svr4_siginfo.h>
-#include <svr4/svr4_util.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_types.h>
+#include <compat/svr4/svr4_syscall.h>
+#include <compat/svr4/svr4_signal.h>
+#include <compat/svr4/svr4_sockio.h>
+#include <compat/svr4/svr4_socket.h>
+#include <compat/svr4/svr4_errno.h>
+#include <compat/svr4/svr4_proto.h>
+#include <compat/svr4/svr4_siginfo.h>
+#include <compat/svr4/svr4_util.h>
 
 int bsd_to_svr4_errno[ELAST+1] = {
         0,
diff --git a/sys/compat/svr4/svr4_termios.c b/sys/compat/svr4/svr4_termios.c
index 9b9f0e458f734..bd3ac782a6d20 100644
--- a/sys/compat/svr4/svr4_termios.c
+++ b/sys/compat/svr4/svr4_termios.c
@@ -37,10 +37,10 @@
 
 #include <sys/sysproto.h>
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_util.h>
-#include <svr4/svr4_ioctl.h>
-#include <svr4/svr4_termios.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_util.h>
+#include <compat/svr4/svr4_ioctl.h>
+#include <compat/svr4/svr4_termios.h>
 
 #ifndef __CONCAT3
 # if __STDC__
diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c
index 7684487e31af7..e139016c7fde8 100644
--- a/sys/compat/svr4/svr4_ttold.c
+++ b/sys/compat/svr4/svr4_ttold.c
@@ -36,10 +36,10 @@
 #include <sys/ioctl_compat.h>
 #include <sys/termios.h>
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_util.h>
-#include <svr4/svr4_ttold.h>
-#include <svr4/svr4_ioctl.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_util.h>
+#include <compat/svr4/svr4_ttold.h>
+#include <compat/svr4/svr4_ioctl.h>
 
 
 static void svr4_tchars_to_bsd_tchars __P((const struct svr4_tchars *st,
diff --git a/sys/compat/svr4/svr4_ustat.h b/sys/compat/svr4/svr4_ustat.h
index 0033c96bae0d8..e9ebffbfdaaeb 100644
--- a/sys/compat/svr4/svr4_ustat.h
+++ b/sys/compat/svr4/svr4_ustat.h
@@ -31,7 +31,7 @@
 #ifndef	_SVR4_USTAT_H_
 #define	_SVR4_USTAT_H_
 
-#include <svr4/svr4_types.h>
+#include <compat/svr4/svr4_types.h>
 
 struct svr4_ustat {
 	svr4_daddr_t	f_tfree;
diff --git a/sys/compat/svr4/svr4_utsname.h b/sys/compat/svr4/svr4_utsname.h
index a3714c9b1c10b..0ff6deadc7d1e 100644
--- a/sys/compat/svr4/svr4_utsname.h
+++ b/sys/compat/svr4/svr4_utsname.h
@@ -31,7 +31,7 @@
 #ifndef	_SVR4_UTSNAME_H_
 #define	_SVR4_UTSNAME_H_
 
-#include <svr4/svr4_types.h>
+#include <compat/svr4/svr4_types.h>
 
 struct svr4_utsname {
 	char	sysname[257];
diff --git a/sys/compat/svr4/syscalls.master b/sys/compat/svr4/syscalls.master
index 4fb6950214ccf..3a155722f2f75 100644
--- a/sys/compat/svr4/syscalls.master
+++ b/sys/compat/svr4/syscalls.master
@@ -29,10 +29,10 @@
 #include <sys/sysproto.h>
 #include <netinet/in.h>
 
-#include <svr4/svr4.h>
-#include <svr4/svr4_types.h>
-#include <svr4/svr4_signal.h>
-#include <svr4/svr4_proto.h>
+#include <compat/svr4/svr4.h>
+#include <compat/svr4/svr4_types.h>
+#include <compat/svr4/svr4_signal.h>
+#include <compat/svr4/svr4_proto.h>
 
 0	UNIMPL	SVR4	unused
 1	NOPROTO	POSIX	{ void sys_exit(int rval); } exit sys_exit_args void