diff --git a/src/common/debug.h b/src/common/debug.h
index 8eaae7a..da0277e 100644
--- a/src/common/debug.h
+++ b/src/common/debug.h
@@ -43,7 +43,7 @@ extern int __thread_selfid();
 #endif
 
 #ifdef DARLING
-#include <darling/emulation/simple.h>
+#include <darling/emulation/syscall/common/simple.h>
 #endif
 
 FILE* debug_file();
diff --git a/src/linux/machport.c b/src/linux/machport.c
index db5aab0..aab23aa 100644
--- a/src/linux/machport.c
+++ b/src/linux/machport.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <stdint.h>
 #include <mach/message.h>
-#include <darling/emulation/ext/for-libkqueue.h>
+#include <darling/emulation/syscall/other/for_libkqueue.h>
 #include <darlingserver/rpc-supplement.h>
 
 #include "private.h"
diff --git a/src/linux/platform.h b/src/linux/platform.h
index 8fba541..8bf7f90 100644
--- a/src/linux/platform.h
+++ b/src/linux/platform.h
@@ -20,11 +20,20 @@
 struct filter;
 
 #include <sys/syscall.h>
+#ifdef DARLING
+#include <darling/emulation/syscall/linux/ext/sys/epoll.h>
+#include <darling/emulation/syscall/linux/ext/sys/inotify.h>
+#else
 #include <sys/epoll.h>
-#include <sys/queue.h>
 #include <sys/inotify.h>
+#endif
+#include <sys/queue.h>
 #if HAVE_SYS_EVENTFD_H
+#ifdef DARLING
+# include <darling/emulation/syscall/linux/ext/sys/eventfd.h>
+#else
 # include <sys/eventfd.h>
+#endif
 #else
 # define eventfd(a,b) syscall(SYS_eventfd, (a), (b))
 
@@ -36,14 +45,18 @@ struct filter;
   }
 #endif
 #if HAVE_SYS_TIMERFD_H
+#ifdef DARLING
+#include <darling/emulation/syscall/linux/ext/sys/timerfd.h>
+#else
 # include <sys/timerfd.h>
 #endif
+#endif
 
 /*
  * Get the current thread ID
  */
 #ifdef DARLING
-#include <darling/emulation/base.h>
+#include <darling/emulation/syscall/common/base.h>
 # define syscall __linux_syscall
 #else
 # define _GNU_SOURCE
diff --git a/src/linux/proc.c b/src/linux/proc.c
index 39a76da..c29ee7b 100644
--- a/src/linux/proc.c
+++ b/src/linux/proc.c
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <string.h>
 #include <unistd.h>
-#include <darling/emulation/ext/for-libkqueue.h>
+#include <darling/emulation/syscall/other/for_libkqueue.h>
 #include <darlingserver/rpc-supplement.h>
 
 #include "private.h"
diff --git a/src/linux/read.c b/src/linux/read.c
index f7c9870..8c6e750 100644
--- a/src/linux/read.c
+++ b/src/linux/read.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <darling/emulation/ext/for-libkqueue.h>
+#include <darling/emulation/syscall/other/for_libkqueue.h>
 
 #include "private.h"
 
diff --git a/src/linux/write.c b/src/linux/write.c
index 2ebc97f..39e23f3 100644
--- a/src/linux/write.c
+++ b/src/linux/write.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <darling/emulation/ext/for-libkqueue.h>
+#include <darling/emulation/syscall/other/for_libkqueue.h>
 
 #include "private.h"