diff --git a/sys/compat/aout/aout_exec.c b/sys/compat/aout/aout_exec.c
index e22b8e3b6e5b..80b0b9802191 100644
--- a/sys/compat/aout/aout_exec.c
+++ b/sys/compat/aout/aout_exec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aout_exec.c,v 1.6 2000/12/01 19:12:11 jdolecek Exp $	*/
+/*	$NetBSD: aout_exec.c,v 1.7 2000/12/06 21:02:00 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if defined(_KERNEL) && !defined(_LKM)
 #include "opt_syscall_debug.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/aout/aout_misc.c b/sys/compat/aout/aout_misc.c
index ce07fb803f25..c7cb85b1b01c 100644
--- a/sys/compat/aout/aout_misc.c
+++ b/sys/compat/aout/aout_misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aout_misc.c,v 1.4 2000/12/01 12:28:31 jdolecek Exp $	*/
+/*	$NetBSD: aout_misc.c,v 1.5 2000/12/06 21:02:00 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,6 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if defined(_KERNEL) && !defined(_LKM)
 #include "opt_ktrace.h"
 #include "opt_nfsserver.h"
 #include "opt_compat_netbsd.h"
@@ -44,6 +45,7 @@
 
 #include "fs_lfs.h"
 #include "fs_nfs.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/aout/syscalls.master b/sys/compat/aout/syscalls.master
index 7d5e7cdd40d3..d44d9cd4357b 100644
--- a/sys/compat/aout/syscalls.master
+++ b/sys/compat/aout/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.10 2000/08/07 17:59:35 bjh21 Exp $
+	$NetBSD: syscalls.master,v 1.11 2000/12/06 21:02:00 jdolecek Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 
@@ -34,6 +34,7 @@
 ; #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_ktrace.h"
 #include "opt_nfsserver.h"
 #include "opt_ntp.h"
@@ -43,6 +44,7 @@
 
 #include "fs_lfs.h"
 #include "fs_nfs.h"
+endif
 
 #include <sys/param.h>
 #include <sys/systm.h>