diff --git a/sys/compat/linux/arch/alpha/syscalls.master b/sys/compat/linux/arch/alpha/syscalls.master
index 3e5153d5a993..d109c346bab9 100644
--- a/sys/compat/linux/arch/alpha/syscalls.master
+++ b/sys/compat/linux/arch/alpha/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.22 2000/11/17 03:55:18 erh Exp $
+	$NetBSD: syscalls.master,v 1.23 2000/12/01 21:02:55 jdolecek Exp $
 ;
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 
@@ -57,9 +57,11 @@
 ; UNIMPL osf_*   = osf functions implemented in linux, not here.
 ;
 
+if defined(_KERNEL) && !defined(_LKM)
 #include "opt_sysv.h"
 #include "opt_compat_43.h"
 #include "opt_compat_osf1.h"
+endif
 
 #include <sys/param.h>
 #include <sys/poll.h>
@@ -310,7 +312,8 @@
 ;165	ALIAS		osf1_sys_getdomainname
 165	NOARGS		{ int compat_09_sys_getdomainname(char *domainname, \
 			    int len); }
-166	UNIMPL		setdomainname
+166	STD		{ int linux_sys_setdomainname(char *domainname, \
+                            int len); }
 167	UNIMPL
 168	UNIMPL
 169	UNIMPL
@@ -494,7 +497,7 @@
 			    int cmd, void *arg); }
 312	STD		{ int linux_sys_clone(int flags, void *stack); }
 #ifdef EXEC_AOUT
-313	STD		{ int linux_sys_uselib(char *path); }
+313	STD		{ int linux_sys_uselib(const char *path); }
 #else
 313	UNIMPL		sys_uselib
 #endif
@@ -506,7 +509,7 @@
 319	STD		{ int linux_sys___sysctl(struct linux___sysctl *lsp); }
 320	UNIMPL		idle
 321	UNIMPL		oldumount
-322	NOARGS		{ int compat_12_sys_swapon(const char *name); }
+322	STD		{ int linux_sys_swapon(const char *name); }
 323	STD		{ int linux_sys_times(struct times *tms); }
 324	STD		{ int linux_sys_personality(int per); }
 325	STD		{ int linux_sys_setfsuid(uid_t uid); }
diff --git a/sys/compat/linux/arch/i386/syscalls.master b/sys/compat/linux/arch/i386/syscalls.master
index 271af058ded4..425e24f753fb 100644
--- a/sys/compat/linux/arch/i386/syscalls.master
+++ b/sys/compat/linux/arch/i386/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.43 2000/11/01 20:38:49 jdolecek Exp $
+	$NetBSD: syscalls.master,v 1.44 2000/12/01 21:02:56 jdolecek Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 
@@ -33,7 +33,9 @@
 ; #ifdef's, etc. may be included, and are copied to the output files.
 ; #include's are copied to the syscall names and switch definition files only.
 
+if defined(_KERNEL) && !defined(_LKM)
 #include "opt_compat_43.h"
+endif
 
 #include <sys/param.h>
 #include <sys/poll.h>
@@ -160,7 +162,7 @@
 85	STD		{ int linux_sys_readlink(const char *name, char *buf, \
 			    int count); }
 86	STD		{ int linux_sys_uselib(const char *path); }
-87	NOARGS		{ int compat_12_sys_swapon(char *name); }
+87	STD		{ int linux_sys_swapon(char *name); }
 88	STD		{ int linux_sys_reboot(int magic1, int magic2, \
 			    int cmd, void *arg); }
 89	STD		{ int linux_sys_readdir(int fd, caddr_t dent, \
@@ -207,7 +209,7 @@
 118	NOARGS		{ int sys_fsync(int fd); }
 119	STD		{ int linux_sys_sigreturn(struct linux_sigcontext *scp); }
 120	STD		{ int linux_sys_clone(int flags, void *stack); }
-121	NOARGS		{ int compat_09_sys_setdomainname(char *name, \
+121	STD		{ int linux_sys_setdomainname(char *domainname, \
 			    int len); }
 122	STD		{ int linux_sys_uname(struct linux_utsname *up); }
 123	STD		{ int linux_sys_modify_ldt(int func, void *ptr, \
diff --git a/sys/compat/linux/arch/m68k/syscalls.master b/sys/compat/linux/arch/m68k/syscalls.master
index 547a705c59ab..1b01247d9316 100644
--- a/sys/compat/linux/arch/m68k/syscalls.master
+++ b/sys/compat/linux/arch/m68k/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.16 2000/11/01 20:38:50 jdolecek Exp $
+	$NetBSD: syscalls.master,v 1.17 2000/12/01 21:02:56 jdolecek Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 
@@ -33,8 +33,10 @@
 ; #ifdef's, etc. may be included, and are copied to the output files.
 ; #include's are copied to the syscall names and switch definition files only.
 
+if defined(_KERNEL) && !defined(_LKM)
 #include "opt_compat_netbsd.h"
 #include "opt_compat_43.h"
+endif
 
 #include <sys/param.h>
 #include <sys/poll.h>
@@ -175,11 +177,7 @@
 85	STD		{ int linux_sys_readlink(const char *name, char *buf, \
 			    int count); }
 86	STD		{ int linux_sys_uselib(const char *path); }
-#if !defined(_KERNEL) || defined(COMPAT_12)
-87	NOARGS		{ int compat_12_sys_swapon(char *name); }
-#else
-87	UNIMPL		compat_12_sys_swapon
-#endif
+87	STD		{ int linux_sys_swapon(char *name); }
 88	STD		{ int linux_sys_reboot(int magic1, int magic2, \
 			    int cmd, void *arg); }
 89	STD		{ int linux_sys_readdir(int fd, caddr_t dent, \
@@ -229,12 +227,8 @@
 118	NOARGS		{ int sys_fsync(int fd); }
 119	STD		{ int linux_sys_sigreturn(void); }
 120	STD		{ int linux_sys_clone(int flags, void *stack); }
-#if !defined(_KERNEL) || defined(COMPAT_09)
-121	NOARGS		{ int compat_09_sys_setdomainname(char *name, \
+121	STD		{ int linux_sys_setdomainname(char *domainname, \
 			    int len); }
-#else
-121	UNIMPL		compat_09_sys_setdomainname
-#endif
 122	STD		{ int linux_sys_uname(struct linux_utsname *up); }
 123	STD		{ int linux_sys_cacheflush(unsigned long addr, \
 			    int scope, int cache, unsigned long len); }