diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master
--- a/sys/amd64/linux/syscalls.master
+++ b/sys/amd64/linux/syscalls.master
@@ -32,13 +32,9 @@
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <compat/linux/linux_sysproto.h>
 #include <amd64/linux/linux.h>
 #include <amd64/linux/linux_proto.h>
 
-; Isn't pretty, but there seems to be no other way to trap nosys
-#define	nosys	linux_nosys
-
 0	AUE_NULL	NOPROTO {
 		int read(
 		    int fd,
diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master
--- a/sys/amd64/linux32/syscalls.master
+++ b/sys/amd64/linux32/syscalls.master
@@ -32,14 +32,10 @@
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <compat/linux/linux_sysproto.h>
 #include <compat/freebsd32/freebsd32_util.h>
 #include <amd64/linux32/linux.h>
 #include <amd64/linux32/linux32_proto.h>
 
-; Isn't pretty, but there seems to be no other way to trap nosys
-#define	nosys	linux_nosys
-
 0	AUE_NULL	UNIMPL	setup
 1	AUE_EXIT	STD {
 		void linux_exit(
diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master
--- a/sys/arm64/linux/syscalls.master
+++ b/sys/arm64/linux/syscalls.master
@@ -9,13 +9,9 @@
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <compat/linux/linux_sysproto.h>
 #include <arm64/linux/linux.h>
 #include <arm64/linux/linux_proto.h>
 
-; Isn't pretty, but there seems to be no other way to trap nosys
-#define	nosys	linux_nosys
-
 0	AUE_NULL	UNIMPL	linux_io_setup
 1	AUE_NULL	UNIMPL	linux_io_destroy
 2	AUE_NULL	UNIMPL	linux_io_submit
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -32,13 +32,9 @@
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <compat/linux/linux_sysproto.h>
 #include <i386/linux/linux.h>
 #include <i386/linux/linux_proto.h>
 
-; Isn't pretty, but there seems to be no other way to trap nosys
-#define	nosys	linux_nosys
-
 0	AUE_NULL	UNIMPL	setup
 1	AUE_EXIT	STD {
 		void linux_exit(