diff --git a/Libraries/LibAudio/AClientConnection.h b/Libraries/LibAudio/AClientConnection.h
index c48b90efa9..d05d37e047 100644
--- a/Libraries/LibAudio/AClientConnection.h
+++ b/Libraries/LibAudio/AClientConnection.h
@@ -2,7 +2,7 @@
 
 #include <AudioServer/AudioClientEndpoint.h>
 #include <AudioServer/AudioServerEndpoint.h>
-#include <LibCore/CoreIPCClient.h>
+#include <LibIPC/IServerConnection.h>
 
 class ABuffer;
 
diff --git a/Libraries/LibGUI/GWindowServerConnection.h b/Libraries/LibGUI/GWindowServerConnection.h
index 39390971fa..0cda7e17c7 100644
--- a/Libraries/LibGUI/GWindowServerConnection.h
+++ b/Libraries/LibGUI/GWindowServerConnection.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <LibCore/CoreIPCClient.h>
+#include <LibIPC/IServerConnection.h>
 #include <WindowServer/WindowClientEndpoint.h>
 #include <WindowServer/WindowServerEndpoint.h>
 
diff --git a/Libraries/LibCore/CoreIPCServer.h b/Libraries/LibIPC/IClientConnection.h
similarity index 100%
rename from Libraries/LibCore/CoreIPCServer.h
rename to Libraries/LibIPC/IClientConnection.h
diff --git a/Libraries/LibCore/CoreIPCClient.h b/Libraries/LibIPC/IServerConnection.h
similarity index 100%
rename from Libraries/LibCore/CoreIPCClient.h
rename to Libraries/LibIPC/IServerConnection.h
diff --git a/Libraries/LibProtocol/Client.h b/Libraries/LibProtocol/Client.h
index f334e2a47d..fc90dc9320 100644
--- a/Libraries/LibProtocol/Client.h
+++ b/Libraries/LibProtocol/Client.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <LibCore/CoreIPCClient.h>
+#include <LibIPC/IServerConnection.h>
 #include <ProtocolServer/ProtocolClientEndpoint.h>
 #include <ProtocolServer/ProtocolServerEndpoint.h>
 
diff --git a/Servers/AudioServer/ASClientConnection.h b/Servers/AudioServer/ASClientConnection.h
index aa67ebc08f..0d9235a7fc 100644
--- a/Servers/AudioServer/ASClientConnection.h
+++ b/Servers/AudioServer/ASClientConnection.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AudioServer/AudioServerEndpoint.h>
-#include <LibCore/CoreIPCServer.h>
+#include <LibIPC/IClientConnection.h>
 
 class ABuffer;
 class ASBufferQueue;
diff --git a/Servers/ProtocolServer/PSClientConnection.h b/Servers/ProtocolServer/PSClientConnection.h
index fd6b71f195..cce3ccb2c4 100644
--- a/Servers/ProtocolServer/PSClientConnection.h
+++ b/Servers/ProtocolServer/PSClientConnection.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/Badge.h>
-#include <LibCore/CoreIPCServer.h>
+#include <LibIPC/IClientConnection.h>
 #include <ProtocolServer/ProtocolServerEndpoint.h>
 
 class Download;
diff --git a/Servers/ProtocolServer/main.cpp b/Servers/ProtocolServer/main.cpp
index 8937aa1578..33df6a085a 100644
--- a/Servers/ProtocolServer/main.cpp
+++ b/Servers/ProtocolServer/main.cpp
@@ -1,6 +1,6 @@
 #include <LibCore/CEventLoop.h>
 #include <LibCore/CLocalServer.h>
-#include <LibCore/CoreIPCServer.h>
+#include <LibIPC/IClientConnection.h>
 #include <ProtocolServer/HttpProtocol.h>
 #include <ProtocolServer/PSClientConnection.h>
 
diff --git a/Servers/WindowServer/WSClientConnection.h b/Servers/WindowServer/WSClientConnection.h
index adbd64b901..8d757969d4 100644
--- a/Servers/WindowServer/WSClientConnection.h
+++ b/Servers/WindowServer/WSClientConnection.h
@@ -5,8 +5,8 @@
 #include <AK/OwnPtr.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
-#include <LibCore/CoreIPCServer.h>
 #include <LibDraw/GraphicsBitmap.h>
+#include <LibIPC/IClientConnection.h>
 #include <WindowServer/WSEvent.h>
 #include <WindowServer/WindowServerEndpoint.h>