diff --git a/Applications/PaintBrush/BucketTool.cpp b/Applications/PaintBrush/BucketTool.cpp
index 796dd05b576..38ca1ad79c1 100644
--- a/Applications/PaintBrush/BucketTool.cpp
+++ b/Applications/PaintBrush/BucketTool.cpp
@@ -29,7 +29,7 @@
 #include <AK/Queue.h>
 #include <AK/SinglyLinkedList.h>
 #include <LibGUI/GPainter.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <stdio.h>
 
 BucketTool::BucketTool()
diff --git a/Applications/PaintBrush/PaintableWidget.cpp b/Applications/PaintBrush/PaintableWidget.cpp
index 3b06c514a01..20ee4df400a 100644
--- a/Applications/PaintBrush/PaintableWidget.cpp
+++ b/Applications/PaintBrush/PaintableWidget.cpp
@@ -26,7 +26,7 @@
 
 #include "PaintableWidget.h"
 #include "Tool.h"
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Palette.h>
 #include <LibGUI/GPainter.h>
 
diff --git a/Applications/PaintBrush/PickerTool.cpp b/Applications/PaintBrush/PickerTool.cpp
index b76eadb52af..7189c7d1039 100644
--- a/Applications/PaintBrush/PickerTool.cpp
+++ b/Applications/PaintBrush/PickerTool.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "PickerTool.h"
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 
 PickerTool::PickerTool()
 {
diff --git a/Applications/PaintBrush/SprayTool.cpp b/Applications/PaintBrush/SprayTool.cpp
index ce1d89d2f77..7d2e17fce04 100644
--- a/Applications/PaintBrush/SprayTool.cpp
+++ b/Applications/PaintBrush/SprayTool.cpp
@@ -31,7 +31,7 @@
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GMenu.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <stdio.h>
 #include <LibM/math.h>
 
diff --git a/Applications/QuickShow/QSWidget.cpp b/Applications/QuickShow/QSWidget.cpp
index db7d204262f..b677063f087 100644
--- a/Applications/QuickShow/QSWidget.cpp
+++ b/Applications/QuickShow/QSWidget.cpp
@@ -26,7 +26,7 @@
 
 #include "QSWidget.h"
 #include <AK/URL.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGUI/GMessageBox.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GWindow.h>
diff --git a/Demos/Fire/Fire.cpp b/Demos/Fire/Fire.cpp
index d9e10f2ac14..3e2703b4f48 100644
--- a/Demos/Fire/Fire.cpp
+++ b/Demos/Fire/Fire.cpp
@@ -42,7 +42,7 @@
  *  [ ] handle fire bitmap edges better
 */
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/PNGLoader.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GLabel.h>
diff --git a/Games/Snake/SnakeGame.cpp b/Games/Snake/SnakeGame.cpp
index 21aa51fc0af..9567499662a 100644
--- a/Games/Snake/SnakeGame.cpp
+++ b/Games/Snake/SnakeGame.cpp
@@ -27,7 +27,7 @@
 #include "SnakeGame.h"
 #include <LibGUI/GFontDatabase.h>
 #include <LibGUI/GPainter.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <stdlib.h>
 #include <time.h>
 
diff --git a/Libraries/LibGUI/GAction.h b/Libraries/LibGUI/GAction.h
index 59041077899..e4981e85d66 100644
--- a/Libraries/LibGUI/GAction.h
+++ b/Libraries/LibGUI/GAction.h
@@ -34,7 +34,7 @@
 #include <AK/String.h>
 #include <AK/WeakPtr.h>
 #include <AK/Weakable.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGUI/GShortcut.h>
 #include <LibGUI/GWindow.h>
 
diff --git a/Libraries/LibGUI/GButton.h b/Libraries/LibGUI/GButton.h
index 57cb41fa7e8..7b4ff16c24c 100644
--- a/Libraries/LibGUI/GButton.h
+++ b/Libraries/LibGUI/GButton.h
@@ -28,7 +28,7 @@
 
 #include <AK/Function.h>
 #include <AK/String.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/StylePainter.h>
 #include <LibGfx/TextAlignment.h>
 #include <LibGUI/GAbstractButton.h>
diff --git a/Libraries/LibGUI/GDragOperation.cpp b/Libraries/LibGUI/GDragOperation.cpp
index a8b506f0c70..2524d202c48 100644
--- a/Libraries/LibGUI/GDragOperation.cpp
+++ b/Libraries/LibGUI/GDragOperation.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGUI/GDragOperation.h>
 #include <LibGUI/GWindowServerConnection.h>
 
diff --git a/Libraries/LibGUI/GFileSystemModel.cpp b/Libraries/LibGUI/GFileSystemModel.cpp
index 9f349e15113..d68fdf0c814 100644
--- a/Libraries/LibGUI/GFileSystemModel.cpp
+++ b/Libraries/LibGUI/GFileSystemModel.cpp
@@ -27,7 +27,7 @@
 #include <AK/FileSystemPath.h>
 #include <AK/StringBuilder.h>
 #include <LibCore/CDirIterator.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGUI/GFileSystemModel.h>
 #include <LibGUI/GPainter.h>
 #include <LibThread/BackgroundAction.h>
diff --git a/Libraries/LibGUI/GIcon.h b/Libraries/LibGUI/GIcon.h
index 6199f4c4732..63e772c75b7 100644
--- a/Libraries/LibGUI/GIcon.h
+++ b/Libraries/LibGUI/GIcon.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/HashMap.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 
 class GIconImpl : public RefCounted<GIconImpl> {
 public:
diff --git a/Libraries/LibGUI/GLabel.cpp b/Libraries/LibGUI/GLabel.cpp
index f0f2cb087fe..336b3598f62 100644
--- a/Libraries/LibGUI/GLabel.cpp
+++ b/Libraries/LibGUI/GLabel.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Palette.h>
 #include <LibGUI/GLabel.h>
 #include <LibGUI/GPainter.h>
diff --git a/Libraries/LibGUI/GRadioButton.cpp b/Libraries/LibGUI/GRadioButton.cpp
index 325f72a89da..eda447398cf 100644
--- a/Libraries/LibGUI/GRadioButton.cpp
+++ b/Libraries/LibGUI/GRadioButton.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/StylePainter.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GRadioButton.h>
diff --git a/Libraries/LibGUI/GResizeCorner.cpp b/Libraries/LibGUI/GResizeCorner.cpp
index d109fbaec9c..b4e38801016 100644
--- a/Libraries/LibGUI/GResizeCorner.cpp
+++ b/Libraries/LibGUI/GResizeCorner.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Palette.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GResizeCorner.h>
diff --git a/Libraries/LibGUI/GScrollBar.cpp b/Libraries/LibGUI/GScrollBar.cpp
index 8fa8471963c..415b38de7fb 100644
--- a/Libraries/LibGUI/GScrollBar.cpp
+++ b/Libraries/LibGUI/GScrollBar.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <LibGfx/CharacterBitmap.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Palette.h>
 #include <LibGfx/StylePainter.h>
 #include <LibGUI/GPainter.h>
diff --git a/Libraries/LibGUI/GVariant.cpp b/Libraries/LibGUI/GVariant.cpp
index 303cbc055d3..aaa39e11caa 100644
--- a/Libraries/LibGUI/GVariant.cpp
+++ b/Libraries/LibGUI/GVariant.cpp
@@ -396,7 +396,7 @@ String Variant::to_string() const
     case Type::String:
         return as_string();
     case Type::Bitmap:
-        return "[GraphicsBitmap]";
+        return "[Gfx::Bitmap]";
     case Type::Icon:
         return "[GIcon]";
     case Type::Color:
diff --git a/Libraries/LibGUI/GVariant.h b/Libraries/LibGUI/GVariant.h
index 12f522b4100..6ef98da39a6 100644
--- a/Libraries/LibGUI/GVariant.h
+++ b/Libraries/LibGUI/GVariant.h
@@ -28,7 +28,7 @@
 
 #include <AK/String.h>
 #include <LibGfx/Font.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGUI/GIcon.h>
 
 namespace AK {
diff --git a/Libraries/LibGUI/GWidget.cpp b/Libraries/LibGUI/GWidget.cpp
index 025eaaa26fd..2b0a8edbb49 100644
--- a/Libraries/LibGUI/GWidget.cpp
+++ b/Libraries/LibGUI/GWidget.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/Assertions.h>
 #include <AK/JsonObject.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Palette.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
diff --git a/Libraries/LibGUI/GWindow.cpp b/Libraries/LibGUI/GWindow.cpp
index 111ffbd4adf..1fb7e7e84fe 100644
--- a/Libraries/LibGUI/GWindow.cpp
+++ b/Libraries/LibGUI/GWindow.cpp
@@ -28,7 +28,7 @@
 #include <AK/JsonObject.h>
 #include <AK/NeverDestroyed.h>
 #include <AK/SharedBuffer.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GEvent.h>
diff --git a/Libraries/LibGUI/GWindow.h b/Libraries/LibGUI/GWindow.h
index 35dd5645ec0..7cf6eaa9137 100644
--- a/Libraries/LibGUI/GWindow.h
+++ b/Libraries/LibGUI/GWindow.h
@@ -31,7 +31,7 @@
 #include <AK/String.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Rect.h>
 #include <LibGUI/GWindowType.h>
 
diff --git a/Libraries/LibGfx/GraphicsBitmap.cpp b/Libraries/LibGfx/Bitmap.cpp
similarity index 99%
rename from Libraries/LibGfx/GraphicsBitmap.cpp
rename to Libraries/LibGfx/Bitmap.cpp
index d48cfa7d036..55d2cbc98d7 100644
--- a/Libraries/LibGfx/GraphicsBitmap.cpp
+++ b/Libraries/LibGfx/Bitmap.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/MappedFile.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/PNGLoader.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/Libraries/LibGfx/GraphicsBitmap.h b/Libraries/LibGfx/Bitmap.h
similarity index 100%
rename from Libraries/LibGfx/GraphicsBitmap.h
rename to Libraries/LibGfx/Bitmap.h
diff --git a/Libraries/LibGfx/Emoji.cpp b/Libraries/LibGfx/Emoji.cpp
index bb0fc3910ef..530a6716aa3 100644
--- a/Libraries/LibGfx/Emoji.cpp
+++ b/Libraries/LibGfx/Emoji.cpp
@@ -27,7 +27,7 @@
 #include <AK/HashMap.h>
 #include <AK/String.h>
 #include <LibGfx/Emoji.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibGfx/Font.cpp b/Libraries/LibGfx/Font.cpp
index d8ea3127930..ddfb4705d1d 100644
--- a/Libraries/LibGfx/Font.cpp
+++ b/Libraries/LibGfx/Font.cpp
@@ -26,7 +26,7 @@
 
 #include "Font.h"
 #include "Emoji.h"
-#include "GraphicsBitmap.h"
+#include "Bitmap.h"
 #include <AK/BufferStream.h>
 #include <AK/MappedFile.h>
 #include <AK/StdLibExtras.h>
diff --git a/Libraries/LibGfx/GIFLoader.cpp b/Libraries/LibGfx/GIFLoader.cpp
index 8ec1a052ee7..84da8088354 100644
--- a/Libraries/LibGfx/GIFLoader.cpp
+++ b/Libraries/LibGfx/GIFLoader.cpp
@@ -42,7 +42,7 @@ RefPtr<Gfx::Bitmap> load_gif(const StringView& path)
         return nullptr;
     auto bitmap = load_gif_impl((const u8*)mapped_file.data(), mapped_file.size());
     if (bitmap)
-        bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded GIF: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters()));
+        bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded GIF: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters()));
     return bitmap;
 }
 
@@ -50,7 +50,7 @@ RefPtr<Gfx::Bitmap> load_gif_from_memory(const u8* data, size_t length)
 {
     auto bitmap = load_gif_impl(data, length);
     if (bitmap)
-        bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded GIF: <memory>", bitmap->width(), bitmap->height()));
+        bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded GIF: <memory>", bitmap->width(), bitmap->height()));
     return bitmap;
 }
 
diff --git a/Libraries/LibGfx/GIFLoader.h b/Libraries/LibGfx/GIFLoader.h
index b18eafa0b09..5f509402a3b 100644
--- a/Libraries/LibGfx/GIFLoader.h
+++ b/Libraries/LibGfx/GIFLoader.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/ImageDecoder.h>
 
 namespace Gfx {
diff --git a/Libraries/LibGfx/Makefile b/Libraries/LibGfx/Makefile
index c7d4da3efc6..96fc1a064d4 100644
--- a/Libraries/LibGfx/Makefile
+++ b/Libraries/LibGfx/Makefile
@@ -1,18 +1,18 @@
 OBJS = \
+    Bitmap.o \
     CharacterBitmap.o \
     Color.o \
     DisjointRectSet.o \
+    Emoji.o \
     Font.o \
-    GraphicsBitmap.o \
-    Painter.o \
-    PNGLoader.o \
     GIFLoader.o \
     ImageDecoder.o \
+    PNGLoader.o \
+    Painter.o \
+    Palette.o \
     Rect.o \
     StylePainter.o \
-    SystemTheme.o \
-    Palette.o \
-    Emoji.o
+    SystemTheme.o
 
 LIBRARY = libgfx.a
 
diff --git a/Libraries/LibGfx/PNGLoader.cpp b/Libraries/LibGfx/PNGLoader.cpp
index f194adde89d..0b293dbac7d 100644
--- a/Libraries/LibGfx/PNGLoader.cpp
+++ b/Libraries/LibGfx/PNGLoader.cpp
@@ -179,7 +179,7 @@ RefPtr<Gfx::Bitmap> load_png(const StringView& path)
         return nullptr;
     auto bitmap = load_png_impl((const u8*)mapped_file.data(), mapped_file.size());
     if (bitmap)
-        bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded PNG: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters()));
+        bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded PNG: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters()));
     return bitmap;
 }
 
@@ -187,7 +187,7 @@ RefPtr<Gfx::Bitmap> load_png_from_memory(const u8* data, size_t length)
 {
     auto bitmap = load_png_impl(data, length);
     if (bitmap)
-        bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded PNG: <memory>", bitmap->width(), bitmap->height()));
+        bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded PNG: <memory>", bitmap->width(), bitmap->height()));
     return bitmap;
 }
 
diff --git a/Libraries/LibGfx/PNGLoader.h b/Libraries/LibGfx/PNGLoader.h
index c5217d52768..ec2e1ec03c3 100644
--- a/Libraries/LibGfx/PNGLoader.h
+++ b/Libraries/LibGfx/PNGLoader.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/ImageDecoder.h>
 
 namespace Gfx {
diff --git a/Libraries/LibGfx/Painter.cpp b/Libraries/LibGfx/Painter.cpp
index 00c1e9d050b..c6b0091bc57 100644
--- a/Libraries/LibGfx/Painter.cpp
+++ b/Libraries/LibGfx/Painter.cpp
@@ -27,7 +27,7 @@
 #include "Painter.h"
 #include "Emoji.h"
 #include "Font.h"
-#include "GraphicsBitmap.h"
+#include "Bitmap.h"
 #include <AK/Assertions.h>
 #include <AK/StdLibExtras.h>
 #include <AK/StringBuilder.h>
diff --git a/Libraries/LibGfx/StylePainter.cpp b/Libraries/LibGfx/StylePainter.cpp
index db5a99a0952..6d086fd325f 100644
--- a/Libraries/LibGfx/StylePainter.cpp
+++ b/Libraries/LibGfx/StylePainter.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Painter.h>
 #include <LibGfx/Palette.h>
 #include <LibGfx/StylePainter.h>
diff --git a/Libraries/LibHTML/CSS/StyleValue.cpp b/Libraries/LibHTML/CSS/StyleValue.cpp
index 17398c8cbd2..591e8bdcaa3 100644
--- a/Libraries/LibHTML/CSS/StyleValue.cpp
+++ b/Libraries/LibHTML/CSS/StyleValue.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/PNGLoader.h>
 #include <LibHTML/CSS/StyleValue.h>
 #include <LibHTML/DOM/Document.h>
diff --git a/Libraries/LibHTML/CSS/StyleValue.h b/Libraries/LibHTML/CSS/StyleValue.h
index f2a1dd76b33..b65677af0a9 100644
--- a/Libraries/LibHTML/CSS/StyleValue.h
+++ b/Libraries/LibHTML/CSS/StyleValue.h
@@ -33,7 +33,7 @@
 #include <AK/URL.h>
 #include <AK/WeakPtr.h>
 #include <LibGfx/Color.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibHTML/CSS/Length.h>
 #include <LibHTML/CSS/PropertyID.h>
 
diff --git a/Libraries/LibHTML/DOM/HTMLImageElement.h b/Libraries/LibHTML/DOM/HTMLImageElement.h
index be8466f3bed..7035b1706d5 100644
--- a/Libraries/LibHTML/DOM/HTMLImageElement.h
+++ b/Libraries/LibHTML/DOM/HTMLImageElement.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/ImageDecoder.h>
 #include <LibHTML/DOM/HTMLElement.h>
 
diff --git a/Libraries/LibVT/TerminalWidget.h b/Libraries/LibVT/TerminalWidget.h
index 42287df2460..30cd591fb78 100644
--- a/Libraries/LibVT/TerminalWidget.h
+++ b/Libraries/LibVT/TerminalWidget.h
@@ -30,7 +30,7 @@
 #include <LibCore/CConfigFile.h>
 #include <LibCore/CNotifier.h>
 #include <LibCore/CTimer.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Rect.h>
 #include <LibGUI/GFrame.h>
 #include <LibVT/Terminal.h>
diff --git a/Servers/WindowServer/WSClientConnection.cpp b/Servers/WindowServer/WSClientConnection.cpp
index d95aee9e503..8ac8598f011 100644
--- a/Servers/WindowServer/WSClientConnection.cpp
+++ b/Servers/WindowServer/WSClientConnection.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/SharedBuffer.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/SystemTheme.h>
 #include <WindowServer/WSClientConnection.h>
 #include <WindowServer/WSClipboard.h>
diff --git a/Servers/WindowServer/WSClientConnection.h b/Servers/WindowServer/WSClientConnection.h
index 6987a2921bd..7d8a8092287 100644
--- a/Servers/WindowServer/WSClientConnection.h
+++ b/Servers/WindowServer/WSClientConnection.h
@@ -31,7 +31,7 @@
 #include <AK/OwnPtr.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibIPC/IClientConnection.h>
 #include <WindowServer/WSEvent.h>
 #include <WindowServer/WindowServerEndpoint.h>
diff --git a/Servers/WindowServer/WSCompositor.h b/Servers/WindowServer/WSCompositor.h
index a8ab9dd9ae7..7c113d84a79 100644
--- a/Servers/WindowServer/WSCompositor.h
+++ b/Servers/WindowServer/WSCompositor.h
@@ -31,7 +31,7 @@
 #include <LibCore/CObject.h>
 #include <LibCore/CTimer.h>
 #include <LibGfx/DisjointRectSet.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 
 namespace Gfx {
 class Painter;
diff --git a/Servers/WindowServer/WSCursor.h b/Servers/WindowServer/WSCursor.h
index 6db202ddd62..b1d84561116 100644
--- a/Servers/WindowServer/WSCursor.h
+++ b/Servers/WindowServer/WSCursor.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 
 enum class WSStandardCursor {
     None = 0,
diff --git a/Servers/WindowServer/WSMenu.cpp b/Servers/WindowServer/WSMenu.cpp
index fb1b1444bb4..f5531367c91 100644
--- a/Servers/WindowServer/WSMenu.cpp
+++ b/Servers/WindowServer/WSMenu.cpp
@@ -35,7 +35,7 @@
 #include "WSWindowManager.h"
 #include <LibGfx/CharacterBitmap.h>
 #include <LibGfx/Font.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Painter.h>
 #include <LibGfx/StylePainter.h>
 #include <LibGfx/Triangle.h>
diff --git a/Servers/WindowServer/WSMenuBar.cpp b/Servers/WindowServer/WSMenuBar.cpp
index f4e5a65ce3f..8c5bcebeabd 100644
--- a/Servers/WindowServer/WSMenuBar.cpp
+++ b/Servers/WindowServer/WSMenuBar.cpp
@@ -27,7 +27,7 @@
 #include "WSMenuBar.h"
 #include "WSMenu.h"
 #include "WSMenuItem.h"
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 
 WSMenuBar::WSMenuBar(WSClientConnection& client, int menubar_id)
     : m_client(client)
diff --git a/Servers/WindowServer/WSMenuItem.cpp b/Servers/WindowServer/WSMenuItem.cpp
index e2daa4e2dd5..27bd38af526 100644
--- a/Servers/WindowServer/WSMenuItem.cpp
+++ b/Servers/WindowServer/WSMenuItem.cpp
@@ -28,7 +28,7 @@
 #include "WSClientConnection.h"
 #include "WSMenu.h"
 #include "WSWindowManager.h"
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 
 WSMenuItem::WSMenuItem(WSMenu& menu, unsigned identifier, const String& text, const String& shortcut_text, bool enabled, bool checkable, bool checked, const Gfx::Bitmap* icon)
     : m_menu(menu)
diff --git a/Servers/WindowServer/WSWindow.h b/Servers/WindowServer/WSWindow.h
index b8935f06277..a8499be0ca6 100644
--- a/Servers/WindowServer/WSWindow.h
+++ b/Servers/WindowServer/WSWindow.h
@@ -30,7 +30,7 @@
 #include <AK/String.h>
 #include <LibCore/CObject.h>
 #include <LibGfx/DisjointRectSet.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Rect.h>
 #include <WindowServer/WSWindowFrame.h>
 #include <WindowServer/WSWindowType.h>
diff --git a/Servers/WindowServer/WSWindowManager.h b/Servers/WindowServer/WSWindowManager.h
index 70774770972..74bf3285e29 100644
--- a/Servers/WindowServer/WSWindowManager.h
+++ b/Servers/WindowServer/WSWindowManager.h
@@ -51,7 +51,6 @@ class WSClientWantsToPaintMessage;
 class WSWindow;
 class WSClientConnection;
 class WSWindowSwitcher;
-class GraphicsBitmap;
 class WSButton;
 
 enum class ResizeDirection {
diff --git a/Servers/WindowServer/WSWindowSwitcher.cpp b/Servers/WindowServer/WSWindowSwitcher.cpp
index 34d325d5a9c..8e622ee2300 100644
--- a/Servers/WindowServer/WSWindowSwitcher.cpp
+++ b/Servers/WindowServer/WSWindowSwitcher.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <LibGfx/Font.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/StylePainter.h>
 #include <WindowServer/WSEvent.h>
 #include <WindowServer/WSScreen.h>