Index: sys/compat/common/Makefile
===================================================================
RCS file: /cvsroot/src/sys/compat/common/Makefile,v
retrieving revision 1.57
diff -p -u -r1.57 Makefile
--- sys/compat/common/Makefile	21 Sep 2016 10:50:23 -0000	1.57
+++ sys/compat/common/Makefile	3 Nov 2016 03:51:33 -0000
@@ -11,50 +11,8 @@ CPPFLAGS=	${COMPATCPPFLAGS} ${SKIP_AUTOD
 # Common compatibility code, used by all emulations
 SRCS=	compat_exec.c compat_util.c
 
-# Compatibility code for 4.3BSD
-SRCS+=	kern_exit_43.c kern_info_43.c kern_resource_43.c kern_sig_43.c \
-	tty_43.c uipc_syscalls_43.c vfs_syscalls_43.c vm_43.c if_43.c
-
-# Compatibility code for NetBSD 0.9
-SRCS+=	kern_info_09.c
-
-# Compatibility code for NetBSD 1.2
-SRCS+=	kern_xxx_12.c vfs_syscalls_12.c vm_12.c
-
-# Compatibility code for NetBSD 1.3
-SRCS+=	kern_sig_13.c
-
-# Compatibility code for NetBSD 1.6
-SRCS+=	kern_sig_16.c
-
-# Compatibility code for NetBSD 1.4
-SRCS+=	sysv_msg_14.c sysv_shm_14.c sysv_sem_14.c rtsock_14.c
-
-# Compatibility code for NetBSD 2.0
-SRCS+=	vfs_syscalls_20.c
-
-# Compatibility code for NetBSD 3.0
-SRCS+=	kern_time_30.c vfs_syscalls_30.c uipc_syscalls_30.c
-
-# Compatibility code for NetBSD 4.0
-SRCS+=	vfs_syscalls_40.c uipc_syscalls_40.c
-
-# Compatibility code for NetBSD 5.0
-SRCS+=	kern_50.c kern_time_50.c kern_select_50.c rndpseudo_50.c rtsock_50.c \
-	sysv_ipc_50.c sysv_msg_50.c sysv_sem_50.c sysv_shm_50.c \
-	vfs_syscalls_50.c  uipc_syscalls_50.c
-
-# Compatibility code for NetBSD 6.0
-SRCS+=	kern_sa_60.c tty_60.c kern_time_60.c
-
-# Compatibility code for NetBSD 7.0
-SRCS+=	rtsock_70.c uipc_usrreq_70.c
-
-# really, all machines where sizeof(int) != sizeof(long) (LP64)
-.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "sparc64" \
-  && ${MACHINE_ARCH} != "x86_64")
-SRCS+=	kern_ipc_10.c
-.endif
+.include "Makefile.sysio"
+.include "Makefile.sysv"
 
 # only needed during build
 libinstall::
Index: sys/compat/common/Makefile.sysio
===================================================================
RCS file: sys/compat/common/Makefile.sysio
diff -N sys/compat/common/Makefile.sysio
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sys/compat/common/Makefile.sysio	3 Nov 2016 03:51:33 -0000
@@ -0,0 +1,41 @@
+#	$NetBSD$
+
+# Sources for syscall and ioctl compatibility across the versions.
+
+# Compatibility code for 4.3BSD
+SRCS+=	kern_exit_43.c kern_info_43.c kern_resource_43.c kern_sig_43.c \
+	tty_43.c uipc_syscalls_43.c vfs_syscalls_43.c vm_43.c if_43.c
+
+# Compatibility code for NetBSD 0.9
+SRCS+=	kern_info_09.c
+
+# Compatibility code for NetBSD 1.2
+SRCS+=	kern_xxx_12.c vfs_syscalls_12.c vm_12.c
+
+# Compatibility code for NetBSD 1.3
+SRCS+=	kern_sig_13.c
+
+# Compatibility code for NetBSD 1.6
+SRCS+=	kern_sig_16.c
+
+# Compatibility code for NetBSD 1.4
+SRCS+=	rtsock_14.c
+
+# Compatibility code for NetBSD 2.0
+SRCS+=	vfs_syscalls_20.c
+
+# Compatibility code for NetBSD 3.0
+SRCS+=	kern_time_30.c vfs_syscalls_30.c uipc_syscalls_30.c
+
+# Compatibility code for NetBSD 4.0
+SRCS+=	vfs_syscalls_40.c uipc_syscalls_40.c
+
+# Compatibility code for NetBSD 5.0
+SRCS+=	kern_50.c kern_time_50.c kern_select_50.c rndpseudo_50.c rtsock_50.c \
+	vfs_syscalls_50.c  uipc_syscalls_50.c
+
+# Compatibility code for NetBSD 6.0
+SRCS+=	kern_sa_60.c tty_60.c kern_time_60.c
+
+# Compatibility code for NetBSD 7.0
+SRCS+=	rtsock_70.c uipc_usrreq_70.c
Index: sys/compat/common/Makefile.sysv
===================================================================
RCS file: sys/compat/common/Makefile.sysv
diff -N sys/compat/common/Makefile.sysv
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sys/compat/common/Makefile.sysv	3 Nov 2016 03:51:33 -0000
@@ -0,0 +1,15 @@
+#	$NetBSD$
+
+# Sources for sysv ipc compatibility across the versions.
+
+# Compatibility code for NetBSD 1.4
+SRCS+=	sysv_msg_14.c sysv_shm_14.c sysv_sem_14.c
+
+# Compatibility code for NetBSD 5.0
+SRCS+=	sysv_ipc_50.c sysv_msg_50.c sysv_sem_50.c sysv_shm_50.c
+
+# really, all machines where sizeof(int) != sizeof(long) (LP64)
+.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "sparc64" \
+  && ${MACHINE_ARCH} != "x86_64")
+SRCS+=	kern_ipc_10.c
+.endif
Index: sys/modules/compat/Makefile
===================================================================
RCS file: /cvsroot/src/sys/modules/compat/Makefile,v
retrieving revision 1.13
diff -p -u -r1.13 Makefile
--- sys/modules/compat/Makefile	6 Apr 2016 19:45:45 -0000	1.13
+++ sys/modules/compat/Makefile	3 Nov 2016 03:51:33 -0000
@@ -25,16 +25,9 @@ CPPFLAGS+=	-DCOMPAT_30 -DCOMPAT_40 -DCOM
 CPPFLAGS+=	-DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
 CPPFLAGS+=	-DCOMPAT_43
 
-SRCS=	kern_exit_43.c kern_info_09.c
-SRCS+=	kern_info_43.c kern_resource_43.c kern_select_50.c
-SRCS+=	kern_sig_13.c kern_sig_43.c kern_xxx_12.c
-SRCS+=	tty_43.c uipc_syscalls_30.c
-SRCS+=	uipc_syscalls_43.c vfs_syscalls_12.c kern_sig_16.c
-SRCS+=	vfs_syscalls_20.c vfs_syscalls_30.c vfs_syscalls_40.c
-SRCS+=	vfs_syscalls_43.c vm_12.c vm_43.c compat_mod.c
-SRCS+=	kern_time_50.c kern_50.c vfs_syscalls_50.c
-SRCS+=	tty_60.c kern_time_60.c
-SRCS+=	uipc_usrreq_70.c
+.include "../../compat/common/Makefile.sysio"
+
+SRCS+=	compat_mod.c
 
 .PATH:	${S}/arch/${MACHINE}/${MACHINE}
 .PATH:	${S}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
Index: sys/modules/sysv_ipc/Makefile
===================================================================
RCS file: /cvsroot/src/sys/modules/sysv_ipc/Makefile,v
retrieving revision 1.2
diff -p -u -r1.2 Makefile
--- sys/modules/sysv_ipc/Makefile	3 Dec 2015 02:51:01 -0000	1.2
+++ sys/modules/sysv_ipc/Makefile	3 Nov 2016 03:51:33 -0000
@@ -17,11 +17,6 @@ CPPFLAGS+=	-DCOMPAT_13
 CPPFLAGS+=	-DCOMPAT_14
 CPPFLAGS+=	-DCOMPAT_50
 
-SRCS+=	sysv_msg_14.c sysv_sem_14.c sysv_shm_14.c
-SRCS+=	sysv_msg_50.c sysv_sem_50.c sysv_shm_50.c sysv_ipc_50.c
-
-.if ${MACHINE_ARCH} != "alpha"
-SRCS+=  kern_ipc_10.c
-.endif
+.include "../../compat/common/Makefile.sysv"
 
 .include <bsd.kmodule.mk>