diff --git a/AK/SharedBuffer.cpp b/AK/SharedBuffer.cpp
index 56e6b7e47d..3c46169db1 100644
--- a/AK/SharedBuffer.cpp
+++ b/AK/SharedBuffer.cpp
@@ -28,7 +28,7 @@
 
 #include <AK/SharedBuffer.h>
 #include <AK/kmalloc.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <stdio.h>
 #include <serenity.h>
 
diff --git a/Applications/HexEditor/HexEditor.cpp b/Applications/HexEditor/HexEditor.cpp
index e192cd7974..e733be9447 100644
--- a/Applications/HexEditor/HexEditor.cpp
+++ b/Applications/HexEditor/HexEditor.cpp
@@ -26,7 +26,7 @@
 
 #include "HexEditor.h"
 #include <AK/StringBuilder.h>
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibGfx/Palette.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/Clipboard.h>
diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp
index 7e87ec4308..7ffc1515a9 100644
--- a/Applications/Terminal/main.cpp
+++ b/Applications/Terminal/main.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibCore/ArgsParser.h>
 #include <LibGUI/AboutDialog.h>
 #include <LibGUI/Action.h>
diff --git a/Kernel/FB.h b/Kernel/API/FB.h
similarity index 100%
rename from Kernel/FB.h
rename to Kernel/API/FB.h
diff --git a/Kernel/KeyCode.h b/Kernel/API/KeyCode.h
similarity index 100%
rename from Kernel/KeyCode.h
rename to Kernel/API/KeyCode.h
diff --git a/Kernel/MousePacket.h b/Kernel/API/MousePacket.h
similarity index 100%
rename from Kernel/MousePacket.h
rename to Kernel/API/MousePacket.h
diff --git a/Kernel/Syscall.h b/Kernel/API/Syscall.h
similarity index 100%
rename from Kernel/Syscall.h
rename to Kernel/API/Syscall.h
diff --git a/Kernel/Devices/KeyboardDevice.h b/Kernel/Devices/KeyboardDevice.h
index f35ffd9621..f13ae568fc 100644
--- a/Kernel/Devices/KeyboardDevice.h
+++ b/Kernel/Devices/KeyboardDevice.h
@@ -31,7 +31,7 @@
 #include <AK/Types.h>
 #include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/Interrupts/IRQHandler.h>
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <Kernel/Random.h>
 #include <LibKeyboard/CharacterMap.h>
 
diff --git a/Kernel/Devices/PS2MouseDevice.h b/Kernel/Devices/PS2MouseDevice.h
index cfb2557f85..45f706e427 100644
--- a/Kernel/Devices/PS2MouseDevice.h
+++ b/Kernel/Devices/PS2MouseDevice.h
@@ -29,7 +29,7 @@
 #include <AK/CircularQueue.h>
 #include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/Interrupts/IRQHandler.h>
-#include <Kernel/MousePacket.h>
+#include <Kernel/API/MousePacket.h>
 #include <Kernel/Random.h>
 
 namespace Kernel {
diff --git a/Kernel/Devices/VMWareBackdoor.cpp b/Kernel/Devices/VMWareBackdoor.cpp
index 7eecb3fd5b..20efb8e8fe 100644
--- a/Kernel/Devices/VMWareBackdoor.cpp
+++ b/Kernel/Devices/VMWareBackdoor.cpp
@@ -29,7 +29,7 @@
 #include <Kernel/Arch/i386/CPU.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Devices/VMWareBackdoor.h>
-#include <Kernel/MousePacket.h>
+#include <Kernel/API/MousePacket.h>
 #include <Kernel/IO.h>
 
 namespace Kernel {
diff --git a/Kernel/Devices/VMWareBackdoor.h b/Kernel/Devices/VMWareBackdoor.h
index 7e9b878f27..1325253390 100644
--- a/Kernel/Devices/VMWareBackdoor.h
+++ b/Kernel/Devices/VMWareBackdoor.h
@@ -29,7 +29,7 @@
 #include <AK/Optional.h>
 #include <AK/Types.h>
 #include <AK/kmalloc.h>
-#include <Kernel/MousePacket.h>
+#include <Kernel/API/MousePacket.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Interrupts/InterruptManagement.cpp b/Kernel/Interrupts/InterruptManagement.cpp
index db24edf8bd..058b45dcd3 100644
--- a/Kernel/Interrupts/InterruptManagement.cpp
+++ b/Kernel/Interrupts/InterruptManagement.cpp
@@ -36,7 +36,7 @@
 #include <Kernel/Interrupts/PIC.h>
 #include <Kernel/Interrupts/SpuriousInterruptHandler.h>
 #include <Kernel/Interrupts/UnhandledInterruptHandler.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <Kernel/VM/MemoryManager.h>
 #include <Kernel/VM/TypedMapping.h>
 
diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp
index 7fff146132..ed4c571fde 100644
--- a/Kernel/Process.cpp
+++ b/Kernel/Process.cpp
@@ -66,7 +66,7 @@
 #include <Kernel/Scheduler.h>
 #include <Kernel/SharedBuffer.h>
 #include <Kernel/StdLib.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <Kernel/TTY/MasterPTY.h>
 #include <Kernel/TTY/TTY.h>
 #include <Kernel/Thread.h>
diff --git a/Kernel/Process.h b/Kernel/Process.h
index 6592a9f787..353fa80178 100644
--- a/Kernel/Process.h
+++ b/Kernel/Process.h
@@ -37,7 +37,7 @@
 #include <Kernel/Forward.h>
 #include <Kernel/Lock.h>
 #include <Kernel/StdLib.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <Kernel/Thread.h>
 #include <Kernel/UnixTypes.h>
 #include <Kernel/VM/RangeAllocator.h>
diff --git a/Kernel/Ptrace.h b/Kernel/Ptrace.h
index 6145ffa637..789b7fc72e 100644
--- a/Kernel/Ptrace.h
+++ b/Kernel/Ptrace.h
@@ -28,7 +28,7 @@
 
 #include <Kernel/KResult.h>
 #include <Kernel/Process.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <LibC/sys/arch/i386/regs.h>
 
 namespace Ptrace {
diff --git a/Kernel/Syscall.cpp b/Kernel/Syscall.cpp
index 46594cedf1..ae0bf894cf 100644
--- a/Kernel/Syscall.cpp
+++ b/Kernel/Syscall.cpp
@@ -27,7 +27,7 @@
 #include <Kernel/Arch/i386/CPU.h>
 #include <Kernel/Process.h>
 #include <Kernel/Random.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <Kernel/ThreadTracer.h>
 #include <Kernel/VM/MemoryManager.h>
 
diff --git a/Libraries/LibC/dirent.cpp b/Libraries/LibC/dirent.cpp
index 2ef0d6b03d..1d6a932371 100644
--- a/Libraries/LibC/dirent.cpp
+++ b/Libraries/LibC/dirent.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/Assertions.h>
 #include <AK/StdLibExtras.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/Libraries/LibC/fcntl.cpp b/Libraries/LibC/fcntl.cpp
index 0cf2be9d37..4716d1b862 100644
--- a/Libraries/LibC/fcntl.cpp
+++ b/Libraries/LibC/fcntl.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
diff --git a/Libraries/LibC/ioctl.cpp b/Libraries/LibC/ioctl.cpp
index 6a32a65cce..e20c2afba4 100644
--- a/Libraries/LibC/ioctl.cpp
+++ b/Libraries/LibC/ioctl.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/Libraries/LibC/mman.cpp b/Libraries/LibC/mman.cpp
index 3311c5c53a..f496582ae5 100644
--- a/Libraries/LibC/mman.cpp
+++ b/Libraries/LibC/mman.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <errno.h>
 #include <mman.h>
 #include <stdio.h>
diff --git a/Libraries/LibC/poll.cpp b/Libraries/LibC/poll.cpp
index 256c4528f4..437ea8243a 100644
--- a/Libraries/LibC/poll.cpp
+++ b/Libraries/LibC/poll.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <errno.h>
 #include <poll.h>
 #include <sys/time.h>
diff --git a/Libraries/LibC/sched.cpp b/Libraries/LibC/sched.cpp
index 254d6417de..f0dbe73ca1 100644
--- a/Libraries/LibC/sched.cpp
+++ b/Libraries/LibC/sched.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <errno.h>
 #include <sched.h>
 
diff --git a/Libraries/LibC/serenity.cpp b/Libraries/LibC/serenity.cpp
index 0474e15579..68e10accb0 100644
--- a/Libraries/LibC/serenity.cpp
+++ b/Libraries/LibC/serenity.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <errno.h>
 #include <serenity.h>
 
diff --git a/Libraries/LibC/signal.cpp b/Libraries/LibC/signal.cpp
index 7c4fa3d47f..be7d26a5a2 100644
--- a/Libraries/LibC/signal.cpp
+++ b/Libraries/LibC/signal.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <assert.h>
 #include <errno.h>
 #include <setjmp.h>
diff --git a/Libraries/LibC/stat.cpp b/Libraries/LibC/stat.cpp
index e9ef9fd1ff..e12252b943 100644
--- a/Libraries/LibC/stat.cpp
+++ b/Libraries/LibC/stat.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/Libraries/LibC/stdio.cpp b/Libraries/LibC/stdio.cpp
index 1c473c3288..8d9c0d0233 100644
--- a/Libraries/LibC/stdio.cpp
+++ b/Libraries/LibC/stdio.cpp
@@ -30,7 +30,7 @@
 #include <AK/ScopedValueRollback.h>
 #include <AK/StdLibExtras.h>
 #include <AK/kmalloc.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/Libraries/LibC/stdlib.cpp b/Libraries/LibC/stdlib.cpp
index 2571b4f257..542554d7b3 100644
--- a/Libraries/LibC/stdlib.cpp
+++ b/Libraries/LibC/stdlib.cpp
@@ -30,7 +30,7 @@
 #include <AK/StdLibExtras.h>
 #include <AK/Types.h>
 #include <AK/Utf8View.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <alloca.h>
 #include <assert.h>
 #include <ctype.h>
diff --git a/Libraries/LibC/sys/ptrace.cpp b/Libraries/LibC/sys/ptrace.cpp
index f991b077bc..fd97a0ffca 100644
--- a/Libraries/LibC/sys/ptrace.cpp
+++ b/Libraries/LibC/sys/ptrace.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/LogStream.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <errno.h>
 #include <sys/ptrace.h>
 
diff --git a/Libraries/LibC/sys/select.cpp b/Libraries/LibC/sys/select.cpp
index e4ff159ef4..85c5b03d43 100644
--- a/Libraries/LibC/sys/select.cpp
+++ b/Libraries/LibC/sys/select.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <errno.h>
 #include <stdio.h>
 #include <sys/select.h>
diff --git a/Libraries/LibC/sys/socket.cpp b/Libraries/LibC/sys/socket.cpp
index 62e27a20f8..f6584bcb85 100644
--- a/Libraries/LibC/sys/socket.cpp
+++ b/Libraries/LibC/sys/socket.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/Assertions.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <errno.h>
 #include <stdio.h>
 #include <sys/socket.h>
diff --git a/Libraries/LibC/sys/uio.cpp b/Libraries/LibC/sys/uio.cpp
index 3da7cdc585..4aad828c65 100644
--- a/Libraries/LibC/sys/uio.cpp
+++ b/Libraries/LibC/sys/uio.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <errno.h>
 #include <sys/uio.h>
 
diff --git a/Libraries/LibC/sys/wait.cpp b/Libraries/LibC/sys/wait.cpp
index e3c92483ff..88e06522a6 100644
--- a/Libraries/LibC/sys/wait.cpp
+++ b/Libraries/LibC/sys/wait.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <assert.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/Libraries/LibC/termios.cpp b/Libraries/LibC/termios.cpp
index a48a69e154..575d8824ed 100644
--- a/Libraries/LibC/termios.cpp
+++ b/Libraries/LibC/termios.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/ioctl.h>
diff --git a/Libraries/LibC/time.cpp b/Libraries/LibC/time.cpp
index b4a60614d4..fff2336a49 100644
--- a/Libraries/LibC/time.cpp
+++ b/Libraries/LibC/time.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/String.h>
 #include <AK/StringBuilder.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/Libraries/LibC/times.cpp b/Libraries/LibC/times.cpp
index c75bd16e07..012dfc7d70 100644
--- a/Libraries/LibC/times.cpp
+++ b/Libraries/LibC/times.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <errno.h>
 #include <sys/times.h>
 
diff --git a/Libraries/LibC/unistd.cpp b/Libraries/LibC/unistd.cpp
index 68931259a3..80b05a16af 100644
--- a/Libraries/LibC/unistd.cpp
+++ b/Libraries/LibC/unistd.cpp
@@ -27,7 +27,7 @@
 #include <AK/ScopedValueRollback.h>
 #include <AK/String.h>
 #include <AK/Vector.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <alloca.h>
 #include <assert.h>
 #include <errno.h>
diff --git a/Libraries/LibC/utime.cpp b/Libraries/LibC/utime.cpp
index 1fa4893708..501d7f06c2 100644
--- a/Libraries/LibC/utime.cpp
+++ b/Libraries/LibC/utime.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <errno.h>
 #include <string.h>
 #include <utime.h>
diff --git a/Libraries/LibC/utsname.cpp b/Libraries/LibC/utsname.cpp
index 533c6e4857..23d10ee7e9 100644
--- a/Libraries/LibC/utsname.cpp
+++ b/Libraries/LibC/utsname.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <errno.h>
 #include <sys/utsname.h>
 
diff --git a/Libraries/LibCore/File.cpp b/Libraries/LibCore/File.cpp
index d90b82d0f0..5b6e0abb7b 100644
--- a/Libraries/LibCore/File.cpp
+++ b/Libraries/LibCore/File.cpp
@@ -25,7 +25,7 @@
  */
 
 #ifdef __serenity__
-#    include <Kernel/Syscall.h>
+#    include <Kernel/API/Syscall.h>
 #endif
 #include <LibCore/File.h>
 #include <errno.h>
diff --git a/Libraries/LibGUI/AbstractView.cpp b/Libraries/LibGUI/AbstractView.cpp
index afe1b19cbe..f1895fb8a4 100644
--- a/Libraries/LibGUI/AbstractView.cpp
+++ b/Libraries/LibGUI/AbstractView.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/StringBuilder.h>
 #include <AK/Vector.h>
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibGUI/AbstractView.h>
 #include <LibGUI/DragOperation.h>
 #include <LibGUI/Model.h>
diff --git a/Libraries/LibGUI/Button.cpp b/Libraries/LibGUI/Button.cpp
index 9621490180..80fdf3d7e0 100644
--- a/Libraries/LibGUI/Button.cpp
+++ b/Libraries/LibGUI/Button.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/StringBuilder.h>
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/ActionGroup.h>
 #include <LibGUI/Button.h>
diff --git a/Libraries/LibGUI/CheckBox.cpp b/Libraries/LibGUI/CheckBox.cpp
index b6d8d6c658..6c8cf4a855 100644
--- a/Libraries/LibGUI/CheckBox.cpp
+++ b/Libraries/LibGUI/CheckBox.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibGUI/CheckBox.h>
 #include <LibGUI/Painter.h>
 #include <LibGfx/CharacterBitmap.h>
diff --git a/Libraries/LibGUI/Event.cpp b/Libraries/LibGUI/Event.cpp
index 3274185eb5..9cd4fba7af 100644
--- a/Libraries/LibGUI/Event.cpp
+++ b/Libraries/LibGUI/Event.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/StringBuilder.h>
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibCore/MimeData.h>
 #include <LibGUI/Event.h>
 
diff --git a/Libraries/LibGUI/Event.h b/Libraries/LibGUI/Event.h
index d587b6fc35..298e8872a6 100644
--- a/Libraries/LibGUI/Event.h
+++ b/Libraries/LibGUI/Event.h
@@ -28,7 +28,7 @@
 
 #include <AK/StringBuilder.h>
 #include <AK/Vector.h>
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibCore/Event.h>
 #include <LibGUI/WindowType.h>
 #include <LibGfx/Point.h>
diff --git a/Libraries/LibGUI/IconView.cpp b/Libraries/LibGUI/IconView.cpp
index 0e20d899c5..24801d9373 100644
--- a/Libraries/LibGUI/IconView.cpp
+++ b/Libraries/LibGUI/IconView.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/StringBuilder.h>
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibGUI/DragOperation.h>
 #include <LibGUI/IconView.h>
 #include <LibGUI/Model.h>
diff --git a/Libraries/LibGUI/ListView.cpp b/Libraries/LibGUI/ListView.cpp
index 2bdfefef64..35621ed17a 100644
--- a/Libraries/LibGUI/ListView.cpp
+++ b/Libraries/LibGUI/ListView.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibGUI/ListView.h>
 #include <LibGUI/Model.h>
 #include <LibGUI/Painter.h>
diff --git a/Libraries/LibGUI/Shortcut.h b/Libraries/LibGUI/Shortcut.h
index ad19c6398a..ebc571515a 100644
--- a/Libraries/LibGUI/Shortcut.h
+++ b/Libraries/LibGUI/Shortcut.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Traits.h>
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/TableView.cpp b/Libraries/LibGUI/TableView.cpp
index 772c3ef158..e1fe41e197 100644
--- a/Libraries/LibGUI/TableView.cpp
+++ b/Libraries/LibGUI/TableView.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/StringBuilder.h>
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/Menu.h>
 #include <LibGUI/Model.h>
diff --git a/Libraries/LibGUI/TextEditor.cpp b/Libraries/LibGUI/TextEditor.cpp
index 05e2947b36..db572ddaea 100644
--- a/Libraries/LibGUI/TextEditor.cpp
+++ b/Libraries/LibGUI/TextEditor.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/QuickSort.h>
 #include <AK/StringBuilder.h>
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibCore/Timer.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/Clipboard.h>
diff --git a/Libraries/LibKeyboard/CharacterMap.cpp b/Libraries/LibKeyboard/CharacterMap.cpp
index d3a7ad99a3..577f25422d 100644
--- a/Libraries/LibKeyboard/CharacterMap.cpp
+++ b/Libraries/LibKeyboard/CharacterMap.cpp
@@ -26,7 +26,7 @@
 
 #include "CharacterMap.h"
 #include <AK/StringBuilder.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #ifndef KERNEL
 #    include <LibKeyboard/CharacterMapFile.h>
 #endif
diff --git a/Libraries/LibKeyboard/CharacterMap.h b/Libraries/LibKeyboard/CharacterMap.h
index 569b2732d2..d263fa81f7 100644
--- a/Libraries/LibKeyboard/CharacterMap.h
+++ b/Libraries/LibKeyboard/CharacterMap.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/String.h>
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibKeyboard/CharacterMapData.h>
 
 namespace Keyboard {
diff --git a/Libraries/LibPthread/pthread.cpp b/Libraries/LibPthread/pthread.cpp
index da50ee7430..e90e8a7399 100644
--- a/Libraries/LibPthread/pthread.cpp
+++ b/Libraries/LibPthread/pthread.cpp
@@ -27,7 +27,7 @@
 #include <AK/Assertions.h>
 #include <AK/Atomic.h>
 #include <AK/StdLibExtras.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <limits.h>
 #include <pthread.h>
 #include <serenity.h>
diff --git a/Libraries/LibVT/Terminal.h b/Libraries/LibVT/Terminal.h
index a141dbade2..86de66578a 100644
--- a/Libraries/LibVT/Terminal.h
+++ b/Libraries/LibVT/Terminal.h
@@ -30,7 +30,7 @@
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/String.h>
 #include <AK/Vector.h>
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibVT/Line.h>
 #include <LibVT/Position.h>
 
diff --git a/Libraries/LibVT/TerminalWidget.cpp b/Libraries/LibVT/TerminalWidget.cpp
index d99870e239..70e12fd805 100644
--- a/Libraries/LibVT/TerminalWidget.cpp
+++ b/Libraries/LibVT/TerminalWidget.cpp
@@ -32,7 +32,7 @@
 #include <AK/StringBuilder.h>
 #include <AK/Utf32View.h>
 #include <AK/Utf8View.h>
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibCore/ConfigFile.h>
 #include <LibCore/MimeData.h>
 #include <LibDesktop/Launcher.h>
diff --git a/Services/WindowServer/Event.h b/Services/WindowServer/Event.h
index 453d42bef6..fb29fb4d4e 100644
--- a/Services/WindowServer/Event.h
+++ b/Services/WindowServer/Event.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/String.h>
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibCore/Event.h>
 #include <LibGfx/Rect.h>
 #include <WindowServer/Cursor.h>
diff --git a/Services/WindowServer/EventLoop.cpp b/Services/WindowServer/EventLoop.cpp
index 45a34e9055..f4480e6937 100644
--- a/Services/WindowServer/EventLoop.cpp
+++ b/Services/WindowServer/EventLoop.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/KeyCode.h>
-#include <Kernel/MousePacket.h>
+#include <Kernel/API/KeyCode.h>
+#include <Kernel/API/MousePacket.h>
 #include <LibCore/LocalSocket.h>
 #include <LibCore/Object.h>
 #include <WindowServer/ClientConnection.h>
diff --git a/Services/WindowServer/Screen.cpp b/Services/WindowServer/Screen.cpp
index fb4a1b65fe..4e386f9b81 100644
--- a/Services/WindowServer/Screen.cpp
+++ b/Services/WindowServer/Screen.cpp
@@ -29,8 +29,8 @@
 #include "Event.h"
 #include "EventLoop.h"
 #include "WindowManager.h"
-#include <Kernel/FB.h>
-#include <Kernel/MousePacket.h>
+#include <Kernel/API/FB.h>
+#include <Kernel/API/MousePacket.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <sys/mman.h>
diff --git a/Services/WindowServer/Screen.h b/Services/WindowServer/Screen.h
index cce7d23e89..79b4010e31 100644
--- a/Services/WindowServer/Screen.h
+++ b/Services/WindowServer/Screen.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <Kernel/KeyCode.h>
+#include <Kernel/API/KeyCode.h>
 #include <LibGfx/Color.h>
 #include <LibGfx/Rect.h>
 #include <LibGfx/Size.h>
diff --git a/Userland/crash.cpp b/Userland/crash.cpp
index 886b687017..1d86ba64e7 100644
--- a/Userland/crash.cpp
+++ b/Userland/crash.cpp
@@ -27,7 +27,7 @@
 
 #include <AK/Function.h>
 #include <AK/String.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <Kernel/IO.h>
 #include <LibCore/ArgsParser.h>
 #include <stdio.h>
diff --git a/Userland/functrace.cpp b/Userland/functrace.cpp
index 3dc34417e4..69a5283068 100644
--- a/Userland/functrace.cpp
+++ b/Userland/functrace.cpp
@@ -32,7 +32,7 @@
 #include <AK/NonnullOwnPtr.h>
 #include <AK/StringBuilder.h>
 #include <AK/kmalloc.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <LibC/sys/arch/i386/regs.h>
 #include <LibCore/ArgsParser.h>
 #include <LibCore/File.h>
diff --git a/Userland/purge.cpp b/Userland/purge.cpp
index 8fd0677795..77032a3d7e 100644
--- a/Userland/purge.cpp
+++ b/Userland/purge.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <serenity.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/Userland/strace.cpp b/Userland/strace.cpp
index dcfa9e7510..6922218bb7 100644
--- a/Userland/strace.cpp
+++ b/Userland/strace.cpp
@@ -27,7 +27,7 @@
 #include <AK/Assertions.h>
 #include <AK/LogStream.h>
 #include <AK/Types.h>
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <LibC/sys/arch/i386/regs.h>
 #include <LibCore/ArgsParser.h>
 #include <signal.h>
diff --git a/Userland/syscall.cpp b/Userland/syscall.cpp
index 1c826c2a52..5aa24f6526 100644
--- a/Userland/syscall.cpp
+++ b/Userland/syscall.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Syscall.h>
+#include <Kernel/API/Syscall.h>
 #include <errno.h>
 #include <getopt.h>
 #include <stdint.h>