diff --git a/src/kernel/emulation/linux/bsdthread/bsdthread_terminate.c b/src/kernel/emulation/linux/bsdthread/bsdthread_terminate.c
index b00e62e4c..7aceea2cf 100644
--- a/src/kernel/emulation/linux/bsdthread/bsdthread_terminate.c
+++ b/src/kernel/emulation/linux/bsdthread/bsdthread_terminate.c
@@ -3,7 +3,7 @@
 #include "../base.h"
 #include "../errno.h"
 #include "../../../../../platform-include/sys/errno.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include <linux-syscalls/linux.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/kernel/emulation/linux/bsdthread/pthread_canceled.c b/src/kernel/emulation/linux/bsdthread/pthread_canceled.c
index 3902441b6..a0ae14388 100644
--- a/src/kernel/emulation/linux/bsdthread/pthread_canceled.c
+++ b/src/kernel/emulation/linux/bsdthread/pthread_canceled.c
@@ -4,7 +4,7 @@
 #include <linux-syscalls/linux.h>
 #include <stddef.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "bsdthread_create.h"
 #include <sys/errno.h>
 
diff --git a/src/kernel/emulation/linux/bsdthread/pthread_chdir.c b/src/kernel/emulation/linux/bsdthread/pthread_chdir.c
index 2c5fe6217..e0dd537d3 100644
--- a/src/kernel/emulation/linux/bsdthread/pthread_chdir.c
+++ b/src/kernel/emulation/linux/bsdthread/pthread_chdir.c
@@ -3,7 +3,7 @@
 #include "../errno.h"
 #include <stddef.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "../fcntl/open.h"
 #include "../unistd/close.h"
 #include "../vchroot_expand.h"
diff --git a/src/kernel/emulation/linux/bsdthread/pthread_fchdir.c b/src/kernel/emulation/linux/bsdthread/pthread_fchdir.c
index cefdaf976..7af4cc527 100644
--- a/src/kernel/emulation/linux/bsdthread/pthread_fchdir.c
+++ b/src/kernel/emulation/linux/bsdthread/pthread_fchdir.c
@@ -3,7 +3,7 @@
 #include "../errno.h"
 #include <stddef.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "../fcntl/open.h"
 #include "../fcntl/fcntl.h"
 #include "../unistd/close.h"
diff --git a/src/kernel/emulation/linux/bsdthread/pthread_kill.c b/src/kernel/emulation/linux/bsdthread/pthread_kill.c
index 4aa58b39d..437152cf7 100644
--- a/src/kernel/emulation/linux/bsdthread/pthread_kill.c
+++ b/src/kernel/emulation/linux/bsdthread/pthread_kill.c
@@ -5,7 +5,7 @@
 #include "../../../../../platform-include/sys/errno.h"
 #include <stddef.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "../simple.h"
 
 long sys_pthread_kill(int thread_port, int sig)
diff --git a/src/kernel/emulation/linux/bsdthread/pthread_markcancel.c b/src/kernel/emulation/linux/bsdthread/pthread_markcancel.c
index fd54b5727..eefaf753e 100644
--- a/src/kernel/emulation/linux/bsdthread/pthread_markcancel.c
+++ b/src/kernel/emulation/linux/bsdthread/pthread_markcancel.c
@@ -4,7 +4,7 @@
 #include <linux-syscalls/linux.h>
 #include <stddef.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 
 long sys_pthread_markcancel(int thread_port)
 {
diff --git a/src/kernel/emulation/linux/mach/lkm.c b/src/kernel/emulation/linux/mach/lkm.c
index 701b582a2..2aa590fbc 100644
--- a/src/kernel/emulation/linux/mach/lkm.c
+++ b/src/kernel/emulation/linux/mach/lkm.c
@@ -1,5 +1,5 @@
 #include "lkm.h"
-#include "../../lkm/api.h"
+#include "../../external/lkm/api.h"
 #include "../signal/sigexc.h"
 #include "../base.h"
 #include "../linux-syscalls/linux.h"
diff --git a/src/kernel/emulation/linux/mach/mach_traps.c b/src/kernel/emulation/linux/mach/mach_traps.c
index cdd569148..2599e1b55 100644
--- a/src/kernel/emulation/linux/mach/mach_traps.c
+++ b/src/kernel/emulation/linux/mach/mach_traps.c
@@ -5,7 +5,7 @@
 #include <sys/mman.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include "../../lkm/api.h"
+#include "../../external/lkm/api.h"
 #include "lkm.h"
 #include "mach_traps.h"
 
diff --git a/src/kernel/emulation/linux/misc/ptrace.c b/src/kernel/emulation/linux/misc/ptrace.c
index 9350629e0..c9a9d63f0 100644
--- a/src/kernel/emulation/linux/misc/ptrace.c
+++ b/src/kernel/emulation/linux/misc/ptrace.c
@@ -11,7 +11,7 @@
 #include "../signal/sigexc.h"
 #include "../process/wait4.h"
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "../unistd/getppid.h"
 
 // faster than sys_getpid(), because it caches the PID
diff --git a/src/kernel/emulation/linux/process/wait4.c b/src/kernel/emulation/linux/process/wait4.c
index 3e6d57ab9..defea39aa 100644
--- a/src/kernel/emulation/linux/process/wait4.c
+++ b/src/kernel/emulation/linux/process/wait4.c
@@ -5,7 +5,7 @@
 #include "../signal/sigexc.h"
 #include "../misc/ptrace.h"
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include <sys/signal.h>
 #include <stddef.h>
 #include <linux-syscalls/linux.h>
diff --git a/src/kernel/emulation/linux/psynch/psynch_cvbroad.c b/src/kernel/emulation/linux/psynch/psynch_cvbroad.c
index 5ee0923be..f5420d30c 100644
--- a/src/kernel/emulation/linux/psynch/psynch_cvbroad.c
+++ b/src/kernel/emulation/linux/psynch/psynch_cvbroad.c
@@ -3,7 +3,7 @@
 #include "psynch_errno.h"
 #include <linux-syscalls/linux.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 
 long sys_psynch_cvbroad(void* cv, uint64_t cvlsgen, uint64_t cvudgen, uint32_t flags, void* mutex, uint64_t mugen,
 		uint64_t tid)
diff --git a/src/kernel/emulation/linux/psynch/psynch_cvclrprepost.c b/src/kernel/emulation/linux/psynch/psynch_cvclrprepost.c
index 3b4f57f4b..a11b73b23 100644
--- a/src/kernel/emulation/linux/psynch/psynch_cvclrprepost.c
+++ b/src/kernel/emulation/linux/psynch/psynch_cvclrprepost.c
@@ -3,7 +3,7 @@
 #include "psynch_errno.h"
 #include <linux-syscalls/linux.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "../simple.h"
 
 long sys_psynch_cvclrprepost(void* cv, uint32_t cvgen, uint32_t cvugen, uint32_t cvsgen, uint32_t prepocnt, uint32_t preposeq, uint32_t flags)
diff --git a/src/kernel/emulation/linux/psynch/psynch_cvsignal.c b/src/kernel/emulation/linux/psynch/psynch_cvsignal.c
index 5c67bdd0d..731a7be4c 100644
--- a/src/kernel/emulation/linux/psynch/psynch_cvsignal.c
+++ b/src/kernel/emulation/linux/psynch/psynch_cvsignal.c
@@ -3,7 +3,7 @@
 #include "psynch_errno.h"
 #include <linux-syscalls/linux.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "../simple.h"
 
 long sys_psynch_cvsignal(void* cv, uint32_t cvlsgen, uint32_t cvugen, int thread_port, void* mutex, uint32_t mugen,
diff --git a/src/kernel/emulation/linux/psynch/psynch_cvwait.c b/src/kernel/emulation/linux/psynch/psynch_cvwait.c
index ca660a0cf..d33f84e27 100644
--- a/src/kernel/emulation/linux/psynch/psynch_cvwait.c
+++ b/src/kernel/emulation/linux/psynch/psynch_cvwait.c
@@ -3,7 +3,7 @@
 #include "psynch_errno.h"
 #include <linux-syscalls/linux.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "../simple.h"
 
 
diff --git a/src/kernel/emulation/linux/psynch/psynch_mutexdrop.c b/src/kernel/emulation/linux/psynch/psynch_mutexdrop.c
index c9cdb16a6..14b81b725 100644
--- a/src/kernel/emulation/linux/psynch/psynch_mutexdrop.c
+++ b/src/kernel/emulation/linux/psynch/psynch_mutexdrop.c
@@ -3,7 +3,7 @@
 #include "psynch_errno.h"
 #include <linux-syscalls/linux.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "../simple.h"
 
 long sys_psynch_mutexdrop(void* mutex, uint32_t mgen, uint32_t ugen, uint64_t tid, uint32_t flags)
diff --git a/src/kernel/emulation/linux/psynch/psynch_mutexwait.c b/src/kernel/emulation/linux/psynch/psynch_mutexwait.c
index ee8235244..9be5d3c89 100644
--- a/src/kernel/emulation/linux/psynch/psynch_mutexwait.c
+++ b/src/kernel/emulation/linux/psynch/psynch_mutexwait.c
@@ -3,7 +3,7 @@
 #include "psynch_errno.h"
 #include <linux-syscalls/linux.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "../simple.h"
 
 long sys_psynch_mutexwait(void* mutex, uint32_t mgen, uint32_t ugen, uint64_t tid, uint32_t flags)
diff --git a/src/kernel/emulation/linux/psynch/psynch_rw_rdlock.c b/src/kernel/emulation/linux/psynch/psynch_rw_rdlock.c
index a1f6d76c1..3074da9be 100644
--- a/src/kernel/emulation/linux/psynch/psynch_rw_rdlock.c
+++ b/src/kernel/emulation/linux/psynch/psynch_rw_rdlock.c
@@ -3,7 +3,7 @@
 #include "psynch_errno.h"
 #include <linux-syscalls/linux.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "../simple.h"
 
 long sys_psynch_rw_rdlock(void* rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags)
diff --git a/src/kernel/emulation/linux/psynch/psynch_rw_unlock.c b/src/kernel/emulation/linux/psynch/psynch_rw_unlock.c
index ee0384b8b..dd03d95ce 100644
--- a/src/kernel/emulation/linux/psynch/psynch_rw_unlock.c
+++ b/src/kernel/emulation/linux/psynch/psynch_rw_unlock.c
@@ -3,7 +3,7 @@
 #include "psynch_errno.h"
 #include <linux-syscalls/linux.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "../simple.h"
 
 long sys_psynch_rw_unlock(void* rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags)
diff --git a/src/kernel/emulation/linux/psynch/psynch_rw_wrlock.c b/src/kernel/emulation/linux/psynch/psynch_rw_wrlock.c
index d566bc206..7e4543e70 100644
--- a/src/kernel/emulation/linux/psynch/psynch_rw_wrlock.c
+++ b/src/kernel/emulation/linux/psynch/psynch_rw_wrlock.c
@@ -3,7 +3,7 @@
 #include "psynch_errno.h"
 #include <linux-syscalls/linux.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "../simple.h"
 
 long sys_psynch_rw_wrlock(void* rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags)
diff --git a/src/kernel/emulation/linux/signal/kill.c b/src/kernel/emulation/linux/signal/kill.c
index f458567f0..135972cf9 100644
--- a/src/kernel/emulation/linux/signal/kill.c
+++ b/src/kernel/emulation/linux/signal/kill.c
@@ -5,7 +5,7 @@
 #include "duct_signals.h"
 #include <linux-syscalls/linux.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "sigexc.h"
 
 extern int getpid(void);
diff --git a/src/kernel/emulation/linux/signal/sigexc.c b/src/kernel/emulation/linux/signal/sigexc.c
index 4cf307ca3..8d101b8dd 100644
--- a/src/kernel/emulation/linux/signal/sigexc.c
+++ b/src/kernel/emulation/linux/signal/sigexc.c
@@ -9,7 +9,7 @@
 #include "signal/exc.h"
 #include "sigaltstack.h"
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 #include "../../../libsyscall/wrappers/_libkernel_init.h"
 #include "kill.h"
 #include "../simple.h"
@@ -134,7 +134,7 @@ static void handle_rt_signal(int signum)
 
 	//char buf[128];
 	//__simple_sprintf(xyzbuf, "Setting handler for RT signal %d: %d", signum, rv);
-	//lkm_call(0x1028, buf);
+	//external/lkm_call(0x1028, buf);
 }
 
 bool darling_am_i_ptraced(void)
diff --git a/src/kernel/emulation/linux/unistd/getegid.c b/src/kernel/emulation/linux/unistd/getegid.c
index 49713a22a..aa4c1ddd9 100644
--- a/src/kernel/emulation/linux/unistd/getegid.c
+++ b/src/kernel/emulation/linux/unistd/getegid.c
@@ -2,7 +2,7 @@
 #include "../base.h"
 #include <stddef.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 
 long sys_getegid(void)
 {
diff --git a/src/kernel/emulation/linux/unistd/geteuid.c b/src/kernel/emulation/linux/unistd/geteuid.c
index 12ef220fe..2837ce51f 100644
--- a/src/kernel/emulation/linux/unistd/geteuid.c
+++ b/src/kernel/emulation/linux/unistd/geteuid.c
@@ -2,7 +2,7 @@
 #include "../base.h"
 #include <stddef.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 
 long sys_geteuid(void)
 {
diff --git a/src/kernel/emulation/linux/unistd/getgid.c b/src/kernel/emulation/linux/unistd/getgid.c
index d6e96b1a6..8ee9a57cf 100644
--- a/src/kernel/emulation/linux/unistd/getgid.c
+++ b/src/kernel/emulation/linux/unistd/getgid.c
@@ -2,7 +2,7 @@
 #include "../base.h"
 #include <stddef.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 
 long sys_getgid(void)
 {
diff --git a/src/kernel/emulation/linux/unistd/gettid.c b/src/kernel/emulation/linux/unistd/gettid.c
index b8e4a63c2..e3132550a 100644
--- a/src/kernel/emulation/linux/unistd/gettid.c
+++ b/src/kernel/emulation/linux/unistd/gettid.c
@@ -2,7 +2,7 @@
 #include "../base.h"
 #include <stddef.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 
 long sys_gettid(int* uid, int* gid)
 {
diff --git a/src/kernel/emulation/linux/unistd/getuid.c b/src/kernel/emulation/linux/unistd/getuid.c
index 311c6de82..aedc52336 100644
--- a/src/kernel/emulation/linux/unistd/getuid.c
+++ b/src/kernel/emulation/linux/unistd/getuid.c
@@ -2,7 +2,7 @@
 #include "../base.h"
 #include <stddef.h>
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 
 long sys_getuid(void)
 {
diff --git a/src/kernel/emulation/linux/unistd/setegid.c b/src/kernel/emulation/linux/unistd/setegid.c
index 4a3b3685a..5eb8f59a9 100644
--- a/src/kernel/emulation/linux/unistd/setegid.c
+++ b/src/kernel/emulation/linux/unistd/setegid.c
@@ -1,7 +1,7 @@
 #include "setegid.h"
 #include "../base.h"
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 
 long sys_setegid(int egid)
 {
diff --git a/src/kernel/emulation/linux/unistd/seteuid.c b/src/kernel/emulation/linux/unistd/seteuid.c
index ad1e86f63..4887a0a24 100644
--- a/src/kernel/emulation/linux/unistd/seteuid.c
+++ b/src/kernel/emulation/linux/unistd/seteuid.c
@@ -1,7 +1,7 @@
 #include "seteuid.h"
 #include "../base.h"
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 
 long sys_seteuid(int euid)
 {
diff --git a/src/kernel/emulation/linux/unistd/setgid.c b/src/kernel/emulation/linux/unistd/setgid.c
index 089cef535..aa4cf7039 100644
--- a/src/kernel/emulation/linux/unistd/setgid.c
+++ b/src/kernel/emulation/linux/unistd/setgid.c
@@ -1,7 +1,7 @@
 #include "setgid.h"
 #include "../base.h"
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 
 long sys_setgid(int gid)
 {
diff --git a/src/kernel/emulation/linux/unistd/settid.c b/src/kernel/emulation/linux/unistd/settid.c
index f0f4e46f8..a1602cb00 100644
--- a/src/kernel/emulation/linux/unistd/settid.c
+++ b/src/kernel/emulation/linux/unistd/settid.c
@@ -1,7 +1,7 @@
 #include "settid.h"
 #include "../base.h"
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 
 long sys_settid(int uid, int gid)
 {
diff --git a/src/kernel/emulation/linux/unistd/setuid.c b/src/kernel/emulation/linux/unistd/setuid.c
index b13d61a1b..411446473 100644
--- a/src/kernel/emulation/linux/unistd/setuid.c
+++ b/src/kernel/emulation/linux/unistd/setuid.c
@@ -1,7 +1,7 @@
 #include "setuid.h"
 #include "../base.h"
 #include "../mach/lkm.h"
-#include "../../../../lkm/api.h"
+#include "../../../../external/lkm/api.h"
 
 long sys_setuid(int uid)
 {