diff --git a/Applications/DisplayProperties/DisplayProperties.cpp b/Applications/DisplayProperties/DisplayProperties.cpp
index 92f155b46f..62bdf61c48 100644
--- a/Applications/DisplayProperties/DisplayProperties.cpp
+++ b/Applications/DisplayProperties/DisplayProperties.cpp
@@ -1,3 +1,5 @@
+#include "DisplayProperties.h"
+#include "ItemListModel.h"
 #include <AK/StringBuilder.h>
 #include <LibCore/CDirIterator.h>
 #include <LibDraw/PNGLoader.h>
@@ -6,7 +8,6 @@
 #include <LibGUI/GBoxLayout.h>
 #include <LibGUI/GButton.h>
 #include <LibGUI/GDesktop.h>
-#include <LibGUI/GEventLoop.h>
 #include <LibGUI/GFileSystemModel.h>
 #include <LibGUI/GGroupBox.h>
 #include <LibGUI/GLabel.h>
@@ -17,12 +18,9 @@
 #include <LibGUI/GToolBar.h>
 #include <LibGUI/GWidget.h>
 #include <LibGUI/GWindow.h>
-
+#include <LibGUI/GWindowServerConnection.h>
 #include <Servers/WindowServer/WSWindowManager.h>
 
-#include "DisplayProperties.h"
-#include "ItemListModel.h"
-
 DisplayPropertiesWidget::DisplayPropertiesWidget()
     : m_wm_config(CConfigFile::get_for_app("WindowManager"))
 {
diff --git a/Applications/Piano/main.cpp b/Applications/Piano/main.cpp
index 4917a3cbad..735ca214a4 100644
--- a/Applications/Piano/main.cpp
+++ b/Applications/Piano/main.cpp
@@ -5,7 +5,6 @@
 #include <LibDraw/PNGLoader.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
-#include <LibGUI/GEventLoop.h>
 #include <LibGUI/GMenu.h>
 #include <LibGUI/GMenuBar.h>
 #include <LibGUI/GWindow.h>
diff --git a/Applications/Taskbar/TaskbarButton.cpp b/Applications/Taskbar/TaskbarButton.cpp
index 2838ebcf22..4951e740de 100644
--- a/Applications/Taskbar/TaskbarButton.cpp
+++ b/Applications/Taskbar/TaskbarButton.cpp
@@ -1,6 +1,6 @@
 #include "TaskbarButton.h"
 #include <LibGUI/GAction.h>
-#include <LibGUI/GEventLoop.h>
+#include <LibGUI/GWindowServerConnection.h>
 #include <WindowServer/WSAPITypes.h>
 
 TaskbarButton::TaskbarButton(const WindowIdentifier& identifier, GWidget* parent)
diff --git a/Applications/Taskbar/TaskbarWindow.cpp b/Applications/Taskbar/TaskbarWindow.cpp
index 125af65184..b096b78b7d 100644
--- a/Applications/Taskbar/TaskbarWindow.cpp
+++ b/Applications/Taskbar/TaskbarWindow.cpp
@@ -4,7 +4,6 @@
 #include <LibGUI/GBoxLayout.h>
 #include <LibGUI/GButton.h>
 #include <LibGUI/GDesktop.h>
-#include <LibGUI/GEventLoop.h>
 #include <LibGUI/GFrame.h>
 #include <LibGUI/GWindow.h>
 #include <WindowServer/WSAPITypes.h>
diff --git a/Applications/Taskbar/WindowList.cpp b/Applications/Taskbar/WindowList.cpp
index 51f5993ac3..5ada8724b3 100644
--- a/Applications/Taskbar/WindowList.cpp
+++ b/Applications/Taskbar/WindowList.cpp
@@ -1,5 +1,5 @@
 #include "WindowList.h"
-#include <LibGUI/GEventLoop.h>
+#include <LibGUI/GWindowServerConnection.h>
 #include <WindowServer/WSAPITypes.h>
 
 WindowList& WindowList::the()
diff --git a/Libraries/LibGUI/GApplication.cpp b/Libraries/LibGUI/GApplication.cpp
index 9bdd7af840..e3f9610c83 100644
--- a/Libraries/LibGUI/GApplication.cpp
+++ b/Libraries/LibGUI/GApplication.cpp
@@ -1,10 +1,10 @@
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
-#include <LibGUI/GEventLoop.h>
 #include <LibGUI/GLabel.h>
 #include <LibGUI/GMenuBar.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GWindow.h>
+#include <LibGUI/GWindowServerConnection.h>
 #include <WindowServer/WSAPITypes.h>
 
 static GApplication* s_the;
diff --git a/Libraries/LibGUI/GClipboard.cpp b/Libraries/LibGUI/GClipboard.cpp
index cfb8d29c23..dde06f8aa1 100644
--- a/Libraries/LibGUI/GClipboard.cpp
+++ b/Libraries/LibGUI/GClipboard.cpp
@@ -1,6 +1,6 @@
 #include <LibC/SharedBuffer.h>
 #include <LibGUI/GClipboard.h>
-#include <LibGUI/GEventLoop.h>
+#include <LibGUI/GWindowServerConnection.h>
 #include <WindowServer/WSAPITypes.h>
 
 GClipboard& GClipboard::the()
diff --git a/Libraries/LibGUI/GDesktop.cpp b/Libraries/LibGUI/GDesktop.cpp
index 60d286550d..d4ae3a93de 100644
--- a/Libraries/LibGUI/GDesktop.cpp
+++ b/Libraries/LibGUI/GDesktop.cpp
@@ -1,5 +1,5 @@
 #include <LibGUI/GDesktop.h>
-#include <LibGUI/GEventLoop.h>
+#include <LibGUI/GWindowServerConnection.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/Libraries/LibGUI/GMenu.cpp b/Libraries/LibGUI/GMenu.cpp
index c24dd888d6..6a90a55ddd 100644
--- a/Libraries/LibGUI/GMenu.cpp
+++ b/Libraries/LibGUI/GMenu.cpp
@@ -1,7 +1,7 @@
 #include <AK/HashMap.h>
 #include <LibGUI/GAction.h>
-#include <LibGUI/GEventLoop.h>
 #include <LibGUI/GMenu.h>
+#include <LibGUI/GWindowServerConnection.h>
 
 //#define GMENU_DEBUG
 
@@ -113,7 +113,7 @@ int GMenu::realize_menu()
             request.menu.enabled = true;
             request.menu.checkable = false;
             request.menu.checked = false;
-            
+
             // no shortcut on submenu, make sure this is cleared out
             request.menu.shortcut_text_length = 0;
             strcpy(request.menu.shortcut_text, "\0");
diff --git a/Libraries/LibGUI/GMenuBar.cpp b/Libraries/LibGUI/GMenuBar.cpp
index a48e094a11..a3a37a66a5 100644
--- a/Libraries/LibGUI/GMenuBar.cpp
+++ b/Libraries/LibGUI/GMenuBar.cpp
@@ -1,5 +1,5 @@
-#include <LibGUI/GEventLoop.h>
 #include <LibGUI/GMenuBar.h>
+#include <LibGUI/GWindowServerConnection.h>
 
 GMenuBar::GMenuBar()
 {
diff --git a/Libraries/LibGUI/GMenuItem.cpp b/Libraries/LibGUI/GMenuItem.cpp
index 2da0200ca3..970a1b59f8 100644
--- a/Libraries/LibGUI/GMenuItem.cpp
+++ b/Libraries/LibGUI/GMenuItem.cpp
@@ -1,7 +1,7 @@
 #include <LibGUI/GAction.h>
-#include <LibGUI/GEventLoop.h>
 #include <LibGUI/GMenu.h>
 #include <LibGUI/GMenuItem.h>
+#include <LibGUI/GWindowServerConnection.h>
 #include <WindowServer/WSAPITypes.h>
 
 GMenuItem::GMenuItem(unsigned menu_id, Type type)
diff --git a/Libraries/LibGUI/GWidget.cpp b/Libraries/LibGUI/GWidget.cpp
index 56d9137339..4e7eff78df 100644
--- a/Libraries/LibGUI/GWidget.cpp
+++ b/Libraries/LibGUI/GWidget.cpp
@@ -1,15 +1,15 @@
-#include "GWidget.h"
-#include "GEvent.h"
-#include "GEventLoop.h"
-#include "GWindow.h"
 #include <AK/Assertions.h>
 #include <AK/JsonObject.h>
+#include <LibDraw/GraphicsBitmap.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
+#include <LibGUI/GEvent.h>
 #include <LibGUI/GLayout.h>
 #include <LibGUI/GMenu.h>
 #include <LibGUI/GPainter.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGUI/GWidget.h>
+#include <LibGUI/GWindow.h>
+#include <LibGUI/GWindowServerConnection.h>
 #include <unistd.h>
 
 GWidget::GWidget(GWidget* parent)
diff --git a/Libraries/LibGUI/GWindow.cpp b/Libraries/LibGUI/GWindow.cpp
index bd03ef61d3..3352cbf545 100644
--- a/Libraries/LibGUI/GWindow.cpp
+++ b/Libraries/LibGUI/GWindow.cpp
@@ -8,10 +8,10 @@
 #include <LibDraw/GraphicsBitmap.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GEvent.h>
-#include <LibGUI/GEventLoop.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GWidget.h>
 #include <LibGUI/GWindow.h>
+#include <LibGUI/GWindowServerConnection.h>
 
 //#define UPDATE_COALESCING_DEBUG
 
diff --git a/Libraries/LibGUI/GEventLoop.cpp b/Libraries/LibGUI/GWindowServerConnection.cpp
similarity index 99%
rename from Libraries/LibGUI/GEventLoop.cpp
rename to Libraries/LibGUI/GWindowServerConnection.cpp
index 2736a2a3ad..7e60155e7a 100644
--- a/Libraries/LibGUI/GEventLoop.cpp
+++ b/Libraries/LibGUI/GWindowServerConnection.cpp
@@ -1,6 +1,3 @@
-#include "GEventLoop.h"
-#include "GEvent.h"
-#include "GWindow.h"
 #include <LibC/errno.h>
 #include <LibC/fcntl.h>
 #include <LibC/stdio.h>
@@ -17,8 +14,11 @@
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GClipboard.h>
 #include <LibGUI/GDesktop.h>
+#include <LibGUI/GEvent.h>
 #include <LibGUI/GMenu.h>
 #include <LibGUI/GWidget.h>
+#include <LibGUI/GWindow.h>
+#include <LibGUI/GWindowServerConnection.h>
 #include <sys/uio.h>
 
 //#define GEVENTLOOP_DEBUG
diff --git a/Libraries/LibGUI/GEventLoop.h b/Libraries/LibGUI/GWindowServerConnection.h
similarity index 100%
rename from Libraries/LibGUI/GEventLoop.h
rename to Libraries/LibGUI/GWindowServerConnection.h
diff --git a/Libraries/LibGUI/Makefile b/Libraries/LibGUI/Makefile
index 28921c6c7f..ac082da414 100644
--- a/Libraries/LibGUI/Makefile
+++ b/Libraries/LibGUI/Makefile
@@ -4,7 +4,7 @@ OBJS = \
     GPainter.o \
     GButton.o \
     GCheckBox.o \
-    GEventLoop.o \
+    GWindowServerConnection.o \
     GLabel.o \
     GTextBox.o \
     GScrollBar.o \