diff --git a/Libraries/LibCore/Forward.h b/Libraries/LibCore/Forward.h
index a639b18b4f..b857acafa1 100644
--- a/Libraries/LibCore/Forward.h
+++ b/Libraries/LibCore/Forward.h
@@ -52,6 +52,7 @@ class Socket;
 class SocketAddress;
 class TCPServer;
 class TCPSocket;
+class Timer;
 class TimerEvent;
 class UdpServer;
 class UdpSocket;
diff --git a/Libraries/LibGUI/Application.h b/Libraries/LibGUI/Application.h
index 973672a0da..703d261424 100644
--- a/Libraries/LibGUI/Application.h
+++ b/Libraries/LibGUI/Application.h
@@ -29,19 +29,10 @@
 #include <AK/Badge.h>
 #include <AK/HashMap.h>
 #include <AK/OwnPtr.h>
-#include <LibGfx/Palette.h>
+#include <LibCore/Forward.h>
 #include <LibGUI/Shortcut.h>
-
-namespace AK {
-class SharedBuffer;
-}
-namespace Core {
-class EventLoop;
-}
-namespace Gfx {
-class Palette;
-class Point;
-}
+#include <LibGfx/Forward.h>
+#include <LibGfx/Palette.h>
 
 namespace GUI {
 class Action;
diff --git a/Libraries/LibGUI/DragOperation.h b/Libraries/LibGUI/DragOperation.h
index 602d836bf5..ae39b9bd00 100644
--- a/Libraries/LibGUI/DragOperation.h
+++ b/Libraries/LibGUI/DragOperation.h
@@ -28,10 +28,7 @@
 
 #include <LibCore/EventLoop.h>
 #include <LibCore/Object.h>
-
-namespace Gfx {
-class Bitmap;
-}
+#include <LibGfx/Forward.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/FontDatabase.h b/Libraries/LibGUI/FontDatabase.h
index 153cebff39..be1a95e950 100644
--- a/Libraries/LibGUI/FontDatabase.h
+++ b/Libraries/LibGUI/FontDatabase.h
@@ -29,10 +29,7 @@
 #include <AK/Function.h>
 #include <AK/HashMap.h>
 #include <AK/String.h>
-
-namespace Gfx {
-class Font;
-}
+#include <LibGfx/Forward.h>
 
 struct Metadata {
     String path;
diff --git a/Libraries/LibGUI/Label.h b/Libraries/LibGUI/Label.h
index 95378ed10e..d686fad13c 100644
--- a/Libraries/LibGUI/Label.h
+++ b/Libraries/LibGUI/Label.h
@@ -29,10 +29,6 @@
 #include <LibGfx/TextAlignment.h>
 #include <LibGUI/Frame.h>
 
-namespace Gfx {
-class Bitmap;
-}
-
 namespace GUI {
 
 class Label : public Frame {
diff --git a/Libraries/LibGUI/Menu.h b/Libraries/LibGUI/Menu.h
index 67bb97c7e6..a1e8b094ce 100644
--- a/Libraries/LibGUI/Menu.h
+++ b/Libraries/LibGUI/Menu.h
@@ -31,10 +31,7 @@
 #include <AK/NonnullRefPtr.h>
 #include <LibCore/Object.h>
 #include <LibGUI/MenuItem.h>
-
-namespace Gfx {
-class Point;
-}
+#include <LibGfx/Forward.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/Model.h b/Libraries/LibGUI/Model.h
index d70df1dd86..da09a1bac9 100644
--- a/Libraries/LibGUI/Model.h
+++ b/Libraries/LibGUI/Model.h
@@ -31,13 +31,10 @@
 #include <AK/HashTable.h>
 #include <AK/RefCounted.h>
 #include <AK/String.h>
-#include <LibGfx/TextAlignment.h>
 #include <LibGUI/ModelIndex.h>
 #include <LibGUI/Variant.h>
-
-namespace Gfx {
-class Font;
-}
+#include <LibGfx/Forward.h>
+#include <LibGfx/TextAlignment.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/Widget.h b/Libraries/LibGUI/Widget.h
index 35b2c1121f..a0e3ed13b3 100644
--- a/Libraries/LibGUI/Widget.h
+++ b/Libraries/LibGUI/Widget.h
@@ -42,10 +42,6 @@
     extern WidgetClassRegistration registration_##class_name; \
     WidgetClassRegistration registration_##class_name(#class_name, [](Widget* parent) { return class_name::construct(parent); });
 
-namespace Gfx {
-class Bitmap;
-}
-
 namespace GUI {
 class Widget;
 }
diff --git a/Libraries/LibHTML/CSS/StyleProperties.h b/Libraries/LibHTML/CSS/StyleProperties.h
index 07c997550d..0ab63fd2c5 100644
--- a/Libraries/LibHTML/CSS/StyleProperties.h
+++ b/Libraries/LibHTML/CSS/StyleProperties.h
@@ -29,12 +29,9 @@
 #include <AK/HashMap.h>
 #include <AK/NonnullRefPtr.h>
 #include <LibGfx/Font.h>
+#include <LibGfx/Forward.h>
 #include <LibHTML/CSS/StyleValue.h>
 
-namespace Gfx {
-class Color;
-}
-
 class StyleProperties : public RefCounted<StyleProperties> {
 public:
     StyleProperties();
diff --git a/Libraries/LibHTML/DOM/Document.h b/Libraries/LibHTML/DOM/Document.h
index ec8e6518b4..df43e48830 100644
--- a/Libraries/LibHTML/DOM/Document.h
+++ b/Libraries/LibHTML/DOM/Document.h
@@ -32,18 +32,11 @@
 #include <AK/String.h>
 #include <AK/URL.h>
 #include <AK/WeakPtr.h>
+#include <LibCore/Forward.h>
 #include <LibHTML/CSS/StyleResolver.h>
 #include <LibHTML/CSS/StyleSheet.h>
 #include <LibHTML/DOM/ParentNode.h>
 
-namespace Core {
-class Timer;
-}
-
-namespace Gfx {
-class Palette;
-}
-
 class Frame;
 class HTMLBodyElement;
 class HTMLHtmlElement;
diff --git a/Libraries/LibHTML/FontCache.h b/Libraries/LibHTML/FontCache.h
index f44afd4b93..159d7221e5 100644
--- a/Libraries/LibHTML/FontCache.h
+++ b/Libraries/LibHTML/FontCache.h
@@ -28,10 +28,7 @@
 
 #include <AK/HashMap.h>
 #include <AK/String.h>
-
-namespace Gfx {
-class Font;
-}
+#include <LibGfx/Forward.h>
 
 struct FontSelector {
     String family;
diff --git a/Servers/WindowServer/Button.h b/Servers/WindowServer/Button.h
index 8bb1ed5b9b..555a5d6f9e 100644
--- a/Servers/WindowServer/Button.h
+++ b/Servers/WindowServer/Button.h
@@ -30,11 +30,7 @@
 #include <AK/NonnullRefPtr.h>
 #include <AK/Weakable.h>
 #include <LibGfx/Rect.h>
-
-namespace Gfx {
-class CharacterBitmap;
-class Painter;
-}
+#include <LibGfx/Forward.h>
 
 namespace WindowServer {
 
diff --git a/Servers/WindowServer/ClientConnection.cpp b/Servers/WindowServer/ClientConnection.cpp
index db0db313ba..c201f56b1e 100644
--- a/Servers/WindowServer/ClientConnection.cpp
+++ b/Servers/WindowServer/ClientConnection.cpp
@@ -24,6 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <AK/Badge.h>
 #include <AK/SharedBuffer.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/SystemTheme.h>
diff --git a/Servers/WindowServer/Compositor.cpp b/Servers/WindowServer/Compositor.cpp
index 1ac6ae01e4..8af877ec4c 100644
--- a/Servers/WindowServer/Compositor.cpp
+++ b/Servers/WindowServer/Compositor.cpp
@@ -30,6 +30,7 @@
 #include "Screen.h"
 #include "Window.h"
 #include "WindowManager.h"
+#include <LibCore/Timer.h>
 #include <LibGfx/Font.h>
 #include <LibGfx/Painter.h>
 #include <LibThread/BackgroundAction.h>
diff --git a/Servers/WindowServer/Compositor.h b/Servers/WindowServer/Compositor.h
index 2ea441c4bf..14d2423b4a 100644
--- a/Servers/WindowServer/Compositor.h
+++ b/Servers/WindowServer/Compositor.h
@@ -29,13 +29,8 @@
 #include <AK/OwnPtr.h>
 #include <AK/RefPtr.h>
 #include <LibCore/Object.h>
-#include <LibCore/Timer.h>
-#include <LibGfx/Bitmap.h>
 #include <LibGfx/DisjointRectSet.h>
-
-namespace Gfx {
-class Painter;
-}
+#include <LibGfx/Forward.h>
 
 namespace WindowServer {
 
diff --git a/Servers/WindowServer/Menu.h b/Servers/WindowServer/Menu.h
index f4d9bc4ff5..7cb3486d52 100644
--- a/Servers/WindowServer/Menu.h
+++ b/Servers/WindowServer/Menu.h
@@ -30,15 +30,12 @@
 #include <AK/String.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/Object.h>
+#include <LibGfx/Forward.h>
 #include <LibGfx/Rect.h>
 #include <WindowServer/Cursor.h>
 #include <WindowServer/MenuItem.h>
 #include <WindowServer/Window.h>
 
-namespace Gfx {
-class Font;
-}
-
 namespace WindowServer {
 
 class ClientConnection;
diff --git a/Servers/WindowServer/MenuItem.h b/Servers/WindowServer/MenuItem.h
index c85c6a5368..297c751848 100644
--- a/Servers/WindowServer/MenuItem.h
+++ b/Servers/WindowServer/MenuItem.h
@@ -28,12 +28,9 @@
 
 #include <AK/Function.h>
 #include <AK/String.h>
+#include <LibGfx/Forward.h>
 #include <LibGfx/Rect.h>
 
-namespace Gfx {
-class Bitmap;
-}
-
 namespace WindowServer {
 
 class Menu;
diff --git a/Servers/WindowServer/MenuManager.cpp b/Servers/WindowServer/MenuManager.cpp
index 922e74fc31..abbfcd5443 100644
--- a/Servers/WindowServer/MenuManager.cpp
+++ b/Servers/WindowServer/MenuManager.cpp
@@ -25,6 +25,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <AK/Badge.h>
 #include <AK/FileSystemPath.h>
 #include <AK/QuickSort.h>
 #include <LibCore/DirIterator.h>
diff --git a/Servers/WindowServer/Window.cpp b/Servers/WindowServer/Window.cpp
index 849773f747..0ec89055a9 100644
--- a/Servers/WindowServer/Window.cpp
+++ b/Servers/WindowServer/Window.cpp
@@ -31,6 +31,7 @@
 #include "Screen.h"
 #include "WindowClientEndpoint.h"
 #include "WindowManager.h"
+#include <AK/Badge.h>
 
 namespace WindowServer {
 
@@ -414,4 +415,9 @@ void Window::set_tiled(WindowTileType tiled)
     Core::EventLoop::current().post_event(*this, make<ResizeEvent>(old_rect, m_rect));
 }
 
+void Window::detach_client(Badge<ClientConnection>)
+{
+    m_client = nullptr;
+}
+
 }
diff --git a/Servers/WindowServer/Window.h b/Servers/WindowServer/Window.h
index 394f85a781..6e14e5ccbc 100644
--- a/Servers/WindowServer/Window.h
+++ b/Servers/WindowServer/Window.h
@@ -223,7 +223,7 @@ public:
     Window* m_next { nullptr };
     Window* m_prev { nullptr };
 
-    void detach_client(Badge<ClientConnection>) { m_client = nullptr; }
+    void detach_client(Badge<ClientConnection>);
 
 private:
     void handle_mouse_event(const MouseEvent&);
diff --git a/Servers/WindowServer/WindowFrame.cpp b/Servers/WindowServer/WindowFrame.cpp
index a1b9f69ff4..fac04e9338 100644
--- a/Servers/WindowServer/WindowFrame.cpp
+++ b/Servers/WindowServer/WindowFrame.cpp
@@ -24,6 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <AK/Badge.h>
 #include <LibGfx/CharacterBitmap.h>
 #include <LibGfx/Font.h>
 #include <LibGfx/Painter.h>
diff --git a/Servers/WindowServer/WindowFrame.h b/Servers/WindowServer/WindowFrame.h
index 4b123c7b76..4b2670a725 100644
--- a/Servers/WindowServer/WindowFrame.h
+++ b/Servers/WindowServer/WindowFrame.h
@@ -26,13 +26,9 @@
 
 #pragma once
 
-#include <AK/Badge.h>
+#include <AK/Forward.h>
 #include <AK/NonnullOwnPtrVector.h>
-
-namespace Gfx {
-class Painter;
-class Rect;
-}
+#include <LibGfx/Forward.h>
 
 namespace WindowServer {
 
diff --git a/Servers/WindowServer/WindowSwitcher.h b/Servers/WindowServer/WindowSwitcher.h
index 2cf1cc5129..79fb3336a5 100644
--- a/Servers/WindowServer/WindowSwitcher.h
+++ b/Servers/WindowServer/WindowSwitcher.h
@@ -29,12 +29,9 @@
 #include <AK/Vector.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/Object.h>
+#include <LibGfx/Forward.h>
 #include <LibGfx/Rect.h>
 
-namespace Gfx {
-class Painter;
-}
-
 namespace WindowServer {
 
 class KeyEvent;