diff --git a/LibGUI/GEventLoop.h b/LibGUI/GEventLoop.h
index 8ab1f75b45e..bc9b5894bb7 100644
--- a/LibGUI/GEventLoop.h
+++ b/LibGUI/GEventLoop.h
@@ -5,7 +5,7 @@
 #include <AK/HashMap.h>
 #include <AK/OwnPtr.h>
 #include <AK/Vector.h>
-#include <Kernel/GUITypes.h>
+#include <WindowServer/WSAPITypes.h>
 
 class GObject;
 class GNotifier;
diff --git a/Kernel/GUITypes.h b/WindowServer/WSAPITypes.h
similarity index 100%
rename from Kernel/GUITypes.h
rename to WindowServer/WSAPITypes.h
diff --git a/WindowServer/WSClientConnection.cpp b/WindowServer/WSClientConnection.cpp
index 5a47544408d..16e994e293f 100644
--- a/WindowServer/WSClientConnection.cpp
+++ b/WindowServer/WSClientConnection.cpp
@@ -5,7 +5,7 @@
 #include <WindowServer/WSMenuItem.h>
 #include <WindowServer/WSWindow.h>
 #include <WindowServer/WSWindowManager.h>
-#include <Kernel/GUITypes.h>
+#include <WindowServer/WSAPITypes.h>
 #include <Kernel/MemoryManager.h>
 #include <Kernel/Process.h>
 
diff --git a/WindowServer/WSMenu.cpp b/WindowServer/WSMenu.cpp
index 3cdba5c9d7d..e39c8500154 100644
--- a/WindowServer/WSMenu.cpp
+++ b/WindowServer/WSMenu.cpp
@@ -4,7 +4,7 @@
 #include "WSMessage.h"
 #include "WSMessageLoop.h"
 #include "WSWindowManager.h"
-#include <Kernel/GUITypes.h>
+#include <WindowServer/WSAPITypes.h>
 #include <WindowServer/WSClientConnection.h>
 #include <SharedGraphics/Painter.h>
 #include <SharedGraphics/Font.h>
diff --git a/WindowServer/WSMessageLoop.cpp b/WindowServer/WSMessageLoop.cpp
index 1559210e71c..644aa99922e 100644
--- a/WindowServer/WSMessageLoop.cpp
+++ b/WindowServer/WSMessageLoop.cpp
@@ -6,7 +6,7 @@
 #include <WindowServer/WSClientConnection.h>
 #include "PS2MouseDevice.h"
 #include <Kernel/Keyboard.h>
-#include <Kernel/GUITypes.h>
+#include <WindowServer/WSAPITypes.h>
 #include <AK/Bitmap.h>
 #include "Process.h"
 
diff --git a/WindowServer/WSWindow.cpp b/WindowServer/WSWindow.cpp
index c3f9f9d9fa0..5755329012b 100644
--- a/WindowServer/WSWindow.cpp
+++ b/WindowServer/WSWindow.cpp
@@ -2,7 +2,7 @@
 #include "WSWindowManager.h"
 #include "WSMessage.h"
 #include "WSMessageLoop.h"
-#include <Kernel/GUITypes.h>
+#include <WindowServer/WSAPITypes.h>
 #include <WindowServer/WSClientConnection.h>
 
 WSWindow::WSWindow(WSMenu& menu)