diff --git a/apps/sysfuzz.cpp b/apps/sysfuzz.cpp
index 75348e18..997b096d 100644
--- a/apps/sysfuzz.cpp
+++ b/apps/sysfuzz.cpp
@@ -1,4 +1,4 @@
-#include <luna/Syscall.h>
+#include <moon/Syscall.h>
 #include <os/ArgumentParser.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libluna/include/luna/Syscall.h b/kernel/src/api/Syscall.h
similarity index 100%
rename from libluna/include/luna/Syscall.h
rename to kernel/src/api/Syscall.h
diff --git a/kernel/src/sys/Syscall.h b/kernel/src/sys/Syscall.h
index 15b69505..63bcc738 100644
--- a/kernel/src/sys/Syscall.h
+++ b/kernel/src/sys/Syscall.h
@@ -1,7 +1,7 @@
 #pragma once
+#include "api/Syscall.h"
 #include "arch/CPU.h"
 #include <luna/Result.h>
-#include <luna/Syscall.h>
 
 typedef u64 SyscallArgs[6];
 
diff --git a/libc/include/sys/syscall.h b/libc/include/sys/syscall.h
index 856bda76..723f9daa 100644
--- a/libc/include/sys/syscall.h
+++ b/libc/include/sys/syscall.h
@@ -3,8 +3,8 @@
 #ifndef _SYS_SYSCALL_H
 #define _SYS_SYSCALL_H
 
-/* This header just forwards to luna/Syscall.h, which is used in the kernel as well. */
-#include <luna/Syscall.h>
+/* This header just forwards to the kernel API header Syscall.h. */
+#include <moon/Syscall.h>
 #undef enumerate_syscalls
 
 #endif