diff --git a/Applications/IRCClient/IRCLogBuffer.h b/Applications/IRCClient/IRCLogBuffer.h
index 7eecec4c8610f14c6224e8b3d76589fa71ab2a53..fef853d6b7cbb9f1b9817cc5248bce300118de85 100644
--- a/Applications/IRCClient/IRCLogBuffer.h
+++ b/Applications/IRCClient/IRCLogBuffer.h
@@ -4,7 +4,7 @@
 #include <AK/CircularQueue.h>
 #include <AK/RefPtr.h>
 #include <AK/RefCounted.h>
-#include <SharedGraphics/Color.h>
+#include <LibDraw/Color.h>
 
 class IRCLogBufferModel;
 
diff --git a/Applications/IRCClient/IRCLogBufferModel.cpp b/Applications/IRCClient/IRCLogBufferModel.cpp
index 8805b1091825411cc49ad7a3eaef42657b31101d..db14ba49cd681a332c52ed4501c0989fc7232080 100644
--- a/Applications/IRCClient/IRCLogBufferModel.cpp
+++ b/Applications/IRCClient/IRCLogBufferModel.cpp
@@ -1,6 +1,6 @@
 #include "IRCLogBufferModel.h"
 #include "IRCLogBuffer.h"
-#include <SharedGraphics/Font.h>
+#include <LibDraw/Font.h>
 #include <stdio.h>
 #include <time.h>
 
diff --git a/Applications/Launcher/main.cpp b/Applications/Launcher/main.cpp
index 464763a79b19e2685f6208b2bce37c942b2bcdcf..e9b1f97f049ee5fede918c7894eabded88a8e088 100644
--- a/Applications/Launcher/main.cpp
+++ b/Applications/Launcher/main.cpp
@@ -5,7 +5,7 @@
 #include <LibGUI/GButton.h>
 #include <LibGUI/GWidget.h>
 #include <LibGUI/GWindow.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
diff --git a/Applications/Makefile.common b/Applications/Makefile.common
index 6e36e0b8c505b75c329c1af1e91cf15564e9be23..845caa1727c5be0ec84b1f0f84cd8fc2101b784f 100755
--- a/Applications/Makefile.common
+++ b/Applications/Makefile.common
@@ -3,7 +3,7 @@ DEFINES += -DUSERLAND
 all: $(APP)
 
 $(APP): $(OBJS)
-	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc
+	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -laudio -lcore -lc
 
 .cpp.o:
 	@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
diff --git a/Applications/PaintBrush/BucketTool.cpp b/Applications/PaintBrush/BucketTool.cpp
index 5f0173ab4eac276df4b2834043d66dd4e3380e64..67c629c3926f58da50b3199b9bcd354962127ff4 100644
--- a/Applications/PaintBrush/BucketTool.cpp
+++ b/Applications/PaintBrush/BucketTool.cpp
@@ -3,7 +3,7 @@
 #include <AK/Queue.h>
 #include <AK/SinglyLinkedList.h>
 #include <LibGUI/GPainter.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 #include <stdio.h>
 
 BucketTool::BucketTool()
diff --git a/Applications/PaintBrush/EraseTool.h b/Applications/PaintBrush/EraseTool.h
index 3616edf324abd0e86f966e00e3235d19b0f74c45..d2b031e0ecf10cad798532e92c7cbb8a8489bf4c 100644
--- a/Applications/PaintBrush/EraseTool.h
+++ b/Applications/PaintBrush/EraseTool.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Tool.h"
-#include <SharedGraphics/Point.h>
+#include <LibDraw/Point.h>
 
 class GMenu;
 
diff --git a/Applications/PaintBrush/PaintableWidget.cpp b/Applications/PaintBrush/PaintableWidget.cpp
index fee2171fcbee18e94c9ded868f786552d5dbb87d..613167beb256c185262106ce0b70eb28f425d59d 100644
--- a/Applications/PaintBrush/PaintableWidget.cpp
+++ b/Applications/PaintBrush/PaintableWidget.cpp
@@ -1,7 +1,7 @@
 #include "PaintableWidget.h"
 #include "Tool.h"
 #include <LibGUI/GPainter.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 
 static PaintableWidget* s_the;
 
diff --git a/Applications/PaintBrush/PenTool.h b/Applications/PaintBrush/PenTool.h
index 2ef8f7c7aa9329b38c6cae832256a7f5eb193820..3020285e09789d125f5a1d3506038cc1f5d0fddc 100644
--- a/Applications/PaintBrush/PenTool.h
+++ b/Applications/PaintBrush/PenTool.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Tool.h"
-#include <SharedGraphics/Point.h>
+#include <LibDraw/Point.h>
 
 class GMenu;
 
diff --git a/Applications/PaintBrush/PickerTool.cpp b/Applications/PaintBrush/PickerTool.cpp
index 4e2433a37428065773eeba9ed3536852b54281fb..9077f54f562593637175845c182d6f8743097823 100644
--- a/Applications/PaintBrush/PickerTool.cpp
+++ b/Applications/PaintBrush/PickerTool.cpp
@@ -1,5 +1,5 @@
 #include "PickerTool.h"
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 
 PickerTool::PickerTool()
 {
diff --git a/Applications/PaintBrush/SprayTool.cpp b/Applications/PaintBrush/SprayTool.cpp
index e57451535410a8f6973c3ab57782a185acf10699..0ec2cd6bc3d68981324d032fc23a7526c5bc3af4 100644
--- a/Applications/PaintBrush/SprayTool.cpp
+++ b/Applications/PaintBrush/SprayTool.cpp
@@ -5,7 +5,7 @@
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GMenu.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 #include <stdio.h>
 #include <LibM/math.h>
 
diff --git a/Applications/PaintBrush/ToolboxWidget.cpp b/Applications/PaintBrush/ToolboxWidget.cpp
index b4a97187e4591ab401cd6420ef81b2cf1f7d84a3..07475cd5041218b5f8dfa7dbc83d85037bb60c12 100644
--- a/Applications/PaintBrush/ToolboxWidget.cpp
+++ b/Applications/PaintBrush/ToolboxWidget.cpp
@@ -7,7 +7,7 @@
 #include "EraseTool.h"
 #include <LibGUI/GBoxLayout.h>
 #include <LibGUI/GButton.h>
-#include <SharedGraphics/PNGLoader.h>
+#include <LibDraw/PNGLoader.h>
 
 class ToolButton final : public GButton {
 public:
diff --git a/Applications/PaintBrush/main.cpp b/Applications/PaintBrush/main.cpp
index c5637da19feb7a46af89e68657362766f50f3cda..19026e7f32fc184708a481a98785af3e0aae3827 100644
--- a/Applications/PaintBrush/main.cpp
+++ b/Applications/PaintBrush/main.cpp
@@ -9,7 +9,7 @@
 #include <LibGUI/GMenuBar.h>
 #include <LibGUI/GMessageBox.h>
 #include <LibGUI/GWindow.h>
-#include <SharedGraphics/PNGLoader.h>
+#include <LibDraw/PNGLoader.h>
 
 int main(int argc, char** argv)
 {
diff --git a/Applications/Piano/Makefile b/Applications/Piano/Makefile
index 1e362554dfea5857864a8ee0584d162449baefb4..1e194d9b4a0562fc6f1164620ff083c0ae74e9af 100644
--- a/Applications/Piano/Makefile
+++ b/Applications/Piano/Makefile
@@ -6,18 +6,4 @@ OBJS = \
 
 APP = Piano
 
-DEFINES += -DUSERLAND
-
-all: $(APP)
-
-$(APP): $(OBJS)
-	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc -laudio
-
-.cpp.o:
-	@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
-
--include $(OBJS:%.o=%.d)
-
-clean:
-	@echo "CLEAN"; rm -f $(APP) $(OBJS) *.d
-
+include ../Makefile.common
diff --git a/Applications/Piano/PianoWidget.cpp b/Applications/Piano/PianoWidget.cpp
index 294e0e58ce696080789ddc577b5183ca39ad2bee..ddeed872a04e178af5f67daa21e1f84ad6c63971 100644
--- a/Applications/Piano/PianoWidget.cpp
+++ b/Applications/Piano/PianoWidget.cpp
@@ -1,7 +1,7 @@
 #include "PianoWidget.h"
 #include <AK/Queue.h>
 #include <LibGUI/GPainter.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 #include <math.h>
 
 PianoWidget::PianoWidget()
diff --git a/Applications/ProcessManager/MemoryStatsWidget.cpp b/Applications/ProcessManager/MemoryStatsWidget.cpp
index 433b0b7c9bfa13346160cb5d7d8bc516ef09f671..a31b0746a9417e2a485d583feac9aa6ccd7d3fca 100644
--- a/Applications/ProcessManager/MemoryStatsWidget.cpp
+++ b/Applications/ProcessManager/MemoryStatsWidget.cpp
@@ -4,7 +4,7 @@
 #include <LibGUI/GBoxLayout.h>
 #include <LibGUI/GLabel.h>
 #include <LibGUI/GPainter.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/StylePainter.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/Applications/QuickShow/QSWidget.cpp b/Applications/QuickShow/QSWidget.cpp
index 74bc2ef457bf502d7e3eb33ded47a096977d5361..cd0b2382ccedab3049e25e13be05b841d8a3ad8e 100644
--- a/Applications/QuickShow/QSWidget.cpp
+++ b/Applications/QuickShow/QSWidget.cpp
@@ -1,6 +1,6 @@
 #include "QSWidget.h"
 #include <LibGUI/GPainter.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 
 QSWidget::QSWidget(GWidget* parent)
     : GFrame(parent)
diff --git a/Applications/QuickShow/main.cpp b/Applications/QuickShow/main.cpp
index adb34b84690245ccf6a0f8017ebe93e41f68f1b0..47040ff21aaf07b67e2480483592c6d25684b81d 100644
--- a/Applications/QuickShow/main.cpp
+++ b/Applications/QuickShow/main.cpp
@@ -6,7 +6,7 @@
 #include <LibGUI/GMenu.h>
 #include <LibGUI/GMenuBar.h>
 #include <LibGUI/GWindow.h>
-#include <SharedGraphics/PNGLoader.h>
+#include <LibDraw/PNGLoader.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)
diff --git a/Applications/Taskbar/WindowList.h b/Applications/Taskbar/WindowList.h
index 406ec52e877009d7680794250f322bcfcc07ad59..d706d27eb4406fdbde7120a261c62e47a15925d9 100644
--- a/Applications/Taskbar/WindowList.h
+++ b/Applications/Taskbar/WindowList.h
@@ -4,7 +4,7 @@
 #include <AK/AKString.h>
 #include <AK/HashMap.h>
 #include <LibGUI/GButton.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Rect.h>
 
 class Window {
 public:
diff --git a/Applications/Terminal/Terminal.cpp b/Applications/Terminal/Terminal.cpp
index 6ead0cb05c2c513b1c40e15379bdda4d295e8eee..41019778fb098d115d5eca3c6638f4c8ba3143ac 100644
--- a/Applications/Terminal/Terminal.cpp
+++ b/Applications/Terminal/Terminal.cpp
@@ -8,7 +8,7 @@
 #include <LibGUI/GClipboard.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GWindow.h>
-#include <SharedGraphics/Font.h>
+#include <LibDraw/Font.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Applications/Terminal/Terminal.h b/Applications/Terminal/Terminal.h
index 48b574ba63153cfe06b1ce284f5bb9a91733c82b..69e94a3c1c119e2c8ea4eb2034f905552b71a61d 100644
--- a/Applications/Terminal/Terminal.h
+++ b/Applications/Terminal/Terminal.h
@@ -7,8 +7,8 @@
 #include <LibCore/CNotifier.h>
 #include <LibCore/CTimer.h>
 #include <LibGUI/GFrame.h>
-#include <SharedGraphics/GraphicsBitmap.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/GraphicsBitmap.h>
+#include <LibDraw/Rect.h>
 
 class Font;
 
diff --git a/Demos/Fire/Fire.cpp b/Demos/Fire/Fire.cpp
index 9dc80f300b16f913c803641973de8dd4af338535..de223b2b26abd948bbde3fc43cf83404986d47d2 100644
--- a/Demos/Fire/Fire.cpp
+++ b/Demos/Fire/Fire.cpp
@@ -21,7 +21,7 @@
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GWidget.h>
 #include <LibGUI/GWindow.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
diff --git a/Demos/Fire/Makefile b/Demos/Fire/Makefile
index 2bfd381499f58ec4541d1e76837e6e60a7076493..0d5740cfb7f2e5829e63647b2b1fca5a32b6ec7e 100644
--- a/Demos/Fire/Makefile
+++ b/Demos/Fire/Makefile
@@ -10,7 +10,7 @@ DEFINES += -DUSERLAND
 all: $(APP)
 
 $(APP): $(OBJS)
-	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc
+	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
 
 .cpp.o:
 	@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
diff --git a/Demos/HelloWorld/Makefile b/Demos/HelloWorld/Makefile
index 1c2055b8fdb54a15d2384bc7be29f72d7da1a971..80eaa7a4f494b883e0caac41fea2ee029b59d55d 100644
--- a/Demos/HelloWorld/Makefile
+++ b/Demos/HelloWorld/Makefile
@@ -10,7 +10,7 @@ DEFINES += -DUSERLAND
 all: $(APP)
 
 $(APP): $(OBJS)
-	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc
+	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
 
 .cpp.o:
 	@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
diff --git a/Demos/HelloWorld2/Makefile b/Demos/HelloWorld2/Makefile
index e80c4213686433d6d9c622b40ceabb4ceaab9cd8..f056a27a1d9876fe5c531f803808ca1bbd2f636b 100644
--- a/Demos/HelloWorld2/Makefile
+++ b/Demos/HelloWorld2/Makefile
@@ -15,7 +15,7 @@ UI_HelloWorld2.h: HelloWorld2.frm
 	../../DevTools/FormCompiler/FormCompiler $< > $@
 
 $(APP): $(OBJS)
-	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc
+	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
 
 .cpp.o:
 	@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
diff --git a/Demos/PaintTest/Makefile b/Demos/PaintTest/Makefile
index 33edbaa7e5aa9be72845a412947c86420a686b4a..eacfb875ce7795f28bcd1b6f1f6f594e5a24a50d 100644
--- a/Demos/PaintTest/Makefile
+++ b/Demos/PaintTest/Makefile
@@ -10,7 +10,7 @@ DEFINES += -DUSERLAND
 all: $(APP)
 
 $(APP): $(OBJS)
-	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc
+	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
 
 .cpp.o:
 	@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
diff --git a/Demos/PaintTest/main.cpp b/Demos/PaintTest/main.cpp
index a48395cdd0716e52f708bdde5aec0ea9320ae21b..971ae2ed60c807c0c7e1a5b3bdf8d9d96fd4c2c3 100644
--- a/Demos/PaintTest/main.cpp
+++ b/Demos/PaintTest/main.cpp
@@ -2,7 +2,7 @@
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GWidget.h>
 #include <LibGUI/GWindow.h>
-#include <SharedGraphics/PNGLoader.h>
+#include <LibDraw/PNGLoader.h>
 
 class TestWidget final : public GWidget {
 public:
diff --git a/Demos/WidgetGallery/Makefile b/Demos/WidgetGallery/Makefile
index f7f87cbc57cf91411d842e9970b681127bc90974..3dea837d1e9f2be08557936051ad56bf9b1ed7ec 100644
--- a/Demos/WidgetGallery/Makefile
+++ b/Demos/WidgetGallery/Makefile
@@ -10,7 +10,7 @@ DEFINES += -DUSERLAND
 all: $(APP)
 
 $(APP): $(OBJS)
-	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc
+	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
 
 .cpp.o:
 	@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
diff --git a/DevTools/VisualBuilder/Makefile b/DevTools/VisualBuilder/Makefile
index e2c88426f84a12dbd2672e712729583a0611ce36..45a7b94c11f96a1d56e6731579f3c40618e86167 100644
--- a/DevTools/VisualBuilder/Makefile
+++ b/DevTools/VisualBuilder/Makefile
@@ -16,7 +16,7 @@ DEFINES += -DUSERLAND
 all: $(APP)
 
 $(APP): $(OBJS)
-	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc
+	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
 
 .cpp.o:
 	@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
diff --git a/DevTools/VisualBuilder/VBWidget.h b/DevTools/VisualBuilder/VBWidget.h
index c2520bab88fe7cf5e04a331d78d60b9180b0ad26..d341dbd033b006fb67a2b1adb46ab6be2e24eb2e 100644
--- a/DevTools/VisualBuilder/VBWidget.h
+++ b/DevTools/VisualBuilder/VBWidget.h
@@ -6,7 +6,7 @@
 #include <AK/RefCounted.h>
 #include <AK/NonnullRefPtr.h>
 #include <AK/Weakable.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Rect.h>
 
 class GPainter;
 class GVariant;
diff --git a/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp b/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp
index eaed1184e3cbefd203eb0ef6c602e7a745ad9ec9..608f7f85021ab62b92a14456979d69abeac24549 100644
--- a/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp
+++ b/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp
@@ -1,7 +1,7 @@
 #include "VBWidgetPropertyModel.h"
 #include "VBProperty.h"
 #include "VBWidget.h"
-#include <SharedGraphics/Font.h>
+#include <LibDraw/Font.h>
 
 VBWidgetPropertyModel::VBWidgetPropertyModel(VBWidget& widget)
     : m_widget(widget)
diff --git a/Games/Minesweeper/Makefile b/Games/Minesweeper/Makefile
index 81e3948df0548bc23f3676718fd1d652059c7c13..360d9a8bc3ae34d312923e25027df051506596ef 100644
--- a/Games/Minesweeper/Makefile
+++ b/Games/Minesweeper/Makefile
@@ -11,7 +11,7 @@ DEFINES += -DUSERLAND
 all: $(APP)
 
 $(APP): $(OBJS)
-	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc
+	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
 
 .cpp.o:
 	@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
diff --git a/Games/Snake/Makefile b/Games/Snake/Makefile
index f0af9d7cef4a81cd8a1632134bbe6219ddd9e3da..3c3e15e437b00a5b55b917890c022c89d5bfef70 100644
--- a/Games/Snake/Makefile
+++ b/Games/Snake/Makefile
@@ -11,7 +11,7 @@ DEFINES += -DUSERLAND
 all: $(APP)
 
 $(APP): $(OBJS)
-	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc
+	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -lcore -lc
 
 .cpp.o:
 	@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
diff --git a/Games/Snake/SnakeGame.cpp b/Games/Snake/SnakeGame.cpp
index 7229895159423c5389929d34485061b7f196ac65..ed388926eeb1ecf2bc9f104727491266b93e5177 100644
--- a/Games/Snake/SnakeGame.cpp
+++ b/Games/Snake/SnakeGame.cpp
@@ -1,7 +1,7 @@
 #include "SnakeGame.h"
 #include <LibGUI/GFontDatabase.h>
 #include <LibGUI/GPainter.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 #include <stdlib.h>
 #include <time.h>
 
diff --git a/Kernel/Devices/BXVGADevice.h b/Kernel/Devices/BXVGADevice.h
index 3e93e94d322647039e00d96d09d335573eb16b0f..18d35f6fbf48e84bcacab70ec145464aab1022f3 100644
--- a/Kernel/Devices/BXVGADevice.h
+++ b/Kernel/Devices/BXVGADevice.h
@@ -4,7 +4,7 @@
 #include <AK/Types.h>
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/VM/PhysicalAddress.h>
-#include <SharedGraphics/Size.h>
+#include <LibDraw/Size.h>
 
 class BXVGADevice final : public BlockDevice {
     AK_MAKE_ETERNAL
diff --git a/Kernel/makeall.sh b/Kernel/makeall.sh
index 26be17f250b8813cf9bcd54df19e352cb1d1f772..a4e88a02c6a3031c79cc8b3d67792eeee48cc54c 100755
--- a/Kernel/makeall.sh
+++ b/Kernel/makeall.sh
@@ -18,6 +18,7 @@ build_targets="$build_targets ../DevTools/FormCompiler"
 build_targets="$build_targets ../Libraries/LibC"
 build_targets="$build_targets ../Libraries/LibM"
 build_targets="$build_targets ../Libraries/LibCore"
+build_targets="$build_targets ../Libraries/LibDraw"
 build_targets="$build_targets ../Libraries/LibAudio"
 build_targets="$build_targets ../Servers/SystemServer"
 build_targets="$build_targets ../Servers/LookupServer"
@@ -64,7 +65,6 @@ for targ in $build_targets; do
 done
 
 # has no need to build separately, but install headers.
-(cd ../SharedGraphics && ./install.sh)
 (cd ../AK && ./install.sh)
 
 sudo -E ./build-image-qemu.sh
diff --git a/Libraries/LibCore/CConfigFile.h b/Libraries/LibCore/CConfigFile.h
index 1816ba53c90d6ed4a0d47cc2cb3819e97e5824f1..7452d3d1d948b87d25d4fdb45d07732f37409e7d 100644
--- a/Libraries/LibCore/CConfigFile.h
+++ b/Libraries/LibCore/CConfigFile.h
@@ -5,7 +5,7 @@
 #include <AK/RefPtr.h>
 #include <AK/RefCounted.h>
 #include <AK/Vector.h>
-#include <SharedGraphics/Color.h>
+#include <LibDraw/Color.h>
 
 class CConfigFile : public RefCounted<CConfigFile> {
 public:
diff --git a/SharedGraphics/CharacterBitmap.cpp b/Libraries/LibDraw/CharacterBitmap.cpp
similarity index 100%
rename from SharedGraphics/CharacterBitmap.cpp
rename to Libraries/LibDraw/CharacterBitmap.cpp
diff --git a/SharedGraphics/CharacterBitmap.h b/Libraries/LibDraw/CharacterBitmap.h
similarity index 100%
rename from SharedGraphics/CharacterBitmap.h
rename to Libraries/LibDraw/CharacterBitmap.h
diff --git a/SharedGraphics/Color.cpp b/Libraries/LibDraw/Color.cpp
similarity index 100%
rename from SharedGraphics/Color.cpp
rename to Libraries/LibDraw/Color.cpp
diff --git a/SharedGraphics/Color.h b/Libraries/LibDraw/Color.h
similarity index 100%
rename from SharedGraphics/Color.h
rename to Libraries/LibDraw/Color.h
diff --git a/SharedGraphics/DisjointRectSet.cpp b/Libraries/LibDraw/DisjointRectSet.cpp
similarity index 96%
rename from SharedGraphics/DisjointRectSet.cpp
rename to Libraries/LibDraw/DisjointRectSet.cpp
index c3eacf275ac675dfe3b2c917be7fd7ed0109b3bf..435fe155ab724d1c1f134ef2f17a4d5add7f731c 100644
--- a/SharedGraphics/DisjointRectSet.cpp
+++ b/Libraries/LibDraw/DisjointRectSet.cpp
@@ -1,4 +1,4 @@
-#include <SharedGraphics/DisjointRectSet.h>
+#include <LibDraw/DisjointRectSet.h>
 
 void DisjointRectSet::add(const Rect& new_rect)
 {
diff --git a/SharedGraphics/DisjointRectSet.h b/Libraries/LibDraw/DisjointRectSet.h
similarity index 94%
rename from SharedGraphics/DisjointRectSet.h
rename to Libraries/LibDraw/DisjointRectSet.h
index 197cb4c81b3f984acc7834641ad7ed4d317d5b6f..44aabcfb2c56bdc98af6f308c5bf8f51302ca3fa 100644
--- a/SharedGraphics/DisjointRectSet.h
+++ b/Libraries/LibDraw/DisjointRectSet.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/Vector.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Rect.h>
 
 class DisjointRectSet {
 public:
diff --git a/SharedGraphics/Font.cpp b/Libraries/LibDraw/Font.cpp
similarity index 100%
rename from SharedGraphics/Font.cpp
rename to Libraries/LibDraw/Font.cpp
diff --git a/SharedGraphics/Font.h b/Libraries/LibDraw/Font.h
similarity index 98%
rename from SharedGraphics/Font.h
rename to Libraries/LibDraw/Font.h
index 83ae396dcb39cf1d5f3f2243716643211375b954..3bda8121590a8349a56f64fd41962cd2c7d8ba7f 100644
--- a/SharedGraphics/Font.h
+++ b/Libraries/LibDraw/Font.h
@@ -5,7 +5,7 @@
 #include <AK/RefPtr.h>
 #include <AK/RefCounted.h>
 #include <AK/Types.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Rect.h>
 
 // FIXME: Make a MutableGlyphBitmap buddy class for FontEditor instead?
 class GlyphBitmap {
diff --git a/SharedGraphics/GraphicsBitmap.cpp b/Libraries/LibDraw/GraphicsBitmap.cpp
similarity index 97%
rename from SharedGraphics/GraphicsBitmap.cpp
rename to Libraries/LibDraw/GraphicsBitmap.cpp
index 46fdf5777e36ce655bbd5292956a7397b23807fa..354c94eb6615cf302f6611d89a4bfa1e20aead84 100644
--- a/SharedGraphics/GraphicsBitmap.cpp
+++ b/Libraries/LibDraw/GraphicsBitmap.cpp
@@ -1,6 +1,6 @@
 #include <AK/MappedFile.h>
-#include <SharedGraphics/GraphicsBitmap.h>
-#include <SharedGraphics/PNGLoader.h>
+#include <LibDraw/GraphicsBitmap.h>
+#include <LibDraw/PNGLoader.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/SharedGraphics/GraphicsBitmap.h b/Libraries/LibDraw/GraphicsBitmap.h
similarity index 100%
rename from SharedGraphics/GraphicsBitmap.h
rename to Libraries/LibDraw/GraphicsBitmap.h
diff --git a/Libraries/LibDraw/Makefile b/Libraries/LibDraw/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..ff2839f0b8a956a824bf1075363aa0e834a204fe
--- /dev/null
+++ b/Libraries/LibDraw/Makefile
@@ -0,0 +1,35 @@
+include ../../Makefile.common
+
+OBJS = \
+    CharacterBitmap.o \
+    Color.o \
+    DisjointRectSet.o \
+    Font.o \
+    GraphicsBitmap.o \
+    Painter.o \
+    PNGLoader.o \
+    Rect.o \
+    StylePainter.o
+
+LIBRARY = libdraw.a
+DEFINES += -DUSERLAND
+
+all: $(LIBRARY)
+
+$(LIBRARY): $(OBJS)
+	@echo "LIB $@"; $(AR) rcs $@ $(OBJS) $(LIBS)
+
+.cpp.o:
+	@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
+
+-include $(OBJS:%.o=%.d)
+
+clean:
+	@echo "CLEAN"; rm -f $(LIBRARY) $(OBJS) *.d
+
+install: $(LIBRARY)
+	mkdir -p ../../Root/usr/include/LibGfx
+	# Copy headers
+	rsync -r -a --include '*/' --include '*.h' --exclude '*' . ../../Root/usr/include/LibGfx
+	# Install the library
+	cp $(LIBRARY) ../../Root/usr/lib
diff --git a/SharedGraphics/PNGLoader.cpp b/Libraries/LibDraw/PNGLoader.cpp
similarity index 99%
rename from SharedGraphics/PNGLoader.cpp
rename to Libraries/LibDraw/PNGLoader.cpp
index b6fecfb89034bc252d7380dc4713cade863968ee..6f863a4c9c4562654437964d0e3a6e4ac49c90e4 100644
--- a/SharedGraphics/PNGLoader.cpp
+++ b/Libraries/LibDraw/PNGLoader.cpp
@@ -1,8 +1,8 @@
 #include <AK/FileSystemPath.h>
 #include <AK/MappedFile.h>
 #include <AK/NetworkOrdered.h>
-#include <SharedGraphics/PNGLoader.h>
-#include <SharedGraphics/puff.c>
+#include <LibDraw/PNGLoader.h>
+#include <LibDraw/puff.c>
 #include <fcntl.h>
 #include <serenity.h>
 #include <stdio.h>
diff --git a/SharedGraphics/PNGLoader.h b/Libraries/LibDraw/PNGLoader.h
similarity index 62%
rename from SharedGraphics/PNGLoader.h
rename to Libraries/LibDraw/PNGLoader.h
index 3fa06bd927a589d10564cdd4f71616b0ccec0b44..aff9eac8dd033556b519b49b35b7050fe23ac150 100644
--- a/SharedGraphics/PNGLoader.h
+++ b/Libraries/LibDraw/PNGLoader.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 
 RefPtr<GraphicsBitmap> load_png(const StringView& path);
diff --git a/SharedGraphics/Painter.cpp b/Libraries/LibDraw/Painter.cpp
similarity index 99%
rename from SharedGraphics/Painter.cpp
rename to Libraries/LibDraw/Painter.cpp
index 0676d47da3eebbeb0ada517de35ef85f34a74080..de0ea14f9c552ac00a276def3abe04c1c10843fa 100644
--- a/SharedGraphics/Painter.cpp
+++ b/Libraries/LibDraw/Painter.cpp
@@ -4,7 +4,7 @@
 #include <AK/Assertions.h>
 #include <AK/StdLibExtras.h>
 #include <AK/StringBuilder.h>
-#include <SharedGraphics/CharacterBitmap.h>
+#include <LibDraw/CharacterBitmap.h>
 #include <math.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/SharedGraphics/Painter.h b/Libraries/LibDraw/Painter.h
similarity index 97%
rename from SharedGraphics/Painter.h
rename to Libraries/LibDraw/Painter.h
index df3d714e76c2eae8ab0598a4acebc617b5fe8049..3d16905b202a17ee8a755a16eb8cc0e4ed17fcbb 100644
--- a/SharedGraphics/Painter.h
+++ b/Libraries/LibDraw/Painter.h
@@ -5,8 +5,8 @@
 #include "Rect.h"
 #include "Size.h"
 #include <AK/AKString.h>
-#include <SharedGraphics/TextAlignment.h>
-#include <SharedGraphics/TextElision.h>
+#include <LibDraw/TextAlignment.h>
+#include <LibDraw/TextElision.h>
 
 class CharacterBitmap;
 class GlyphBitmap;
diff --git a/SharedGraphics/Point.h b/Libraries/LibDraw/Point.h
similarity index 100%
rename from SharedGraphics/Point.h
rename to Libraries/LibDraw/Point.h
diff --git a/SharedGraphics/Rect.cpp b/Libraries/LibDraw/Rect.cpp
similarity index 100%
rename from SharedGraphics/Rect.cpp
rename to Libraries/LibDraw/Rect.cpp
diff --git a/SharedGraphics/Rect.h b/Libraries/LibDraw/Rect.h
similarity index 98%
rename from SharedGraphics/Rect.h
rename to Libraries/LibDraw/Rect.h
index c9a7ededf3789698e4cf6e31f6c13d1bb791e115..c3ae82de1c56468d7c3c0611b710113a20e4be53 100644
--- a/SharedGraphics/Rect.h
+++ b/Libraries/LibDraw/Rect.h
@@ -2,9 +2,9 @@
 
 #include <AK/AKString.h>
 #include <AK/LogStream.h>
-#include <SharedGraphics/Point.h>
-#include <SharedGraphics/Size.h>
-#include <SharedGraphics/TextAlignment.h>
+#include <LibDraw/Point.h>
+#include <LibDraw/Size.h>
+#include <LibDraw/TextAlignment.h>
 
 struct WSAPI_Rect;
 
diff --git a/SharedGraphics/Size.h b/Libraries/LibDraw/Size.h
similarity index 100%
rename from SharedGraphics/Size.h
rename to Libraries/LibDraw/Size.h
diff --git a/SharedGraphics/StylePainter.cpp b/Libraries/LibDraw/StylePainter.cpp
similarity index 99%
rename from SharedGraphics/StylePainter.cpp
rename to Libraries/LibDraw/StylePainter.cpp
index 019167dcfd0cba8a660a0a3c8da966ed95885174..aa68e5bea3ae30a4c9a51fd7c3d4e45ec53ae21f 100644
--- a/SharedGraphics/StylePainter.cpp
+++ b/Libraries/LibDraw/StylePainter.cpp
@@ -1,5 +1,5 @@
-#include <LibGUI/GPainter.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/Painter.h>
+#include <LibDraw/StylePainter.h>
 
 void StylePainter::paint_tab_button(Painter& painter, const Rect& rect, bool active, bool hovered, bool enabled)
 {
diff --git a/SharedGraphics/StylePainter.h b/Libraries/LibDraw/StylePainter.h
similarity index 100%
rename from SharedGraphics/StylePainter.h
rename to Libraries/LibDraw/StylePainter.h
diff --git a/SharedGraphics/TextAlignment.h b/Libraries/LibDraw/TextAlignment.h
similarity index 100%
rename from SharedGraphics/TextAlignment.h
rename to Libraries/LibDraw/TextAlignment.h
diff --git a/SharedGraphics/TextElision.h b/Libraries/LibDraw/TextElision.h
similarity index 100%
rename from SharedGraphics/TextElision.h
rename to Libraries/LibDraw/TextElision.h
diff --git a/Libraries/LibDraw/install.sh b/Libraries/LibDraw/install.sh
new file mode 100755
index 0000000000000000000000000000000000000000..33f40e68704f4134933170b3844aef7c554e7f72
--- /dev/null
+++ b/Libraries/LibDraw/install.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+mkdir -p ../Root/usr/include/LibGfx/
+cp *.h ../Root/usr/include/LibGfx/
diff --git a/SharedGraphics/puff.c b/Libraries/LibDraw/puff.c
similarity index 100%
rename from SharedGraphics/puff.c
rename to Libraries/LibDraw/puff.c
diff --git a/SharedGraphics/puff.h b/Libraries/LibDraw/puff.h
similarity index 100%
rename from SharedGraphics/puff.h
rename to Libraries/LibDraw/puff.h
diff --git a/Libraries/LibGUI/GAbstractButton.h b/Libraries/LibGUI/GAbstractButton.h
index 386bfc4960480870bcd41b2f6552f8c662529b57..6e5f77e19a1be27668499f8c2e8981b9be586ce8 100644
--- a/Libraries/LibGUI/GAbstractButton.h
+++ b/Libraries/LibGUI/GAbstractButton.h
@@ -2,7 +2,7 @@
 
 #include <LibCore/CTimer.h>
 #include <LibGUI/GWidget.h>
-#include <SharedGraphics/TextAlignment.h>
+#include <LibDraw/TextAlignment.h>
 
 class GPainter;
 
diff --git a/Libraries/LibGUI/GAction.h b/Libraries/LibGUI/GAction.h
index 867c41e213a61066db4abdc8238b3eee6d80e7b2..eedb597d61bd7979617877db775cd6844156478e 100644
--- a/Libraries/LibGUI/GAction.h
+++ b/Libraries/LibGUI/GAction.h
@@ -9,7 +9,7 @@
 #include <AK/WeakPtr.h>
 #include <AK/Weakable.h>
 #include <LibGUI/GShortcut.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 
 class GActionGroup;
 class GButton;
diff --git a/Libraries/LibGUI/GButton.cpp b/Libraries/LibGUI/GButton.cpp
index 3274d4992fca7a60df2a371a2fa4eb8422273815..d94fe81e7446db56aae01fe30dcd0bc8e585d5b2 100644
--- a/Libraries/LibGUI/GButton.cpp
+++ b/Libraries/LibGUI/GButton.cpp
@@ -4,7 +4,7 @@
 #include <LibGUI/GActionGroup.h>
 #include <LibGUI/GButton.h>
 #include <LibGUI/GPainter.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/StylePainter.h>
 
 GButton::GButton(GWidget* parent)
     : GAbstractButton(parent)
diff --git a/Libraries/LibGUI/GButton.h b/Libraries/LibGUI/GButton.h
index acd7d7298cdf6071d1be5c6d142798fb165344e0..c5724c0f0180ee7d00cf537d6ecd326bdbf82c9c 100644
--- a/Libraries/LibGUI/GButton.h
+++ b/Libraries/LibGUI/GButton.h
@@ -3,9 +3,9 @@
 #include <AK/AKString.h>
 #include <AK/Function.h>
 #include <LibGUI/GAbstractButton.h>
-#include <SharedGraphics/GraphicsBitmap.h>
-#include <SharedGraphics/StylePainter.h>
-#include <SharedGraphics/TextAlignment.h>
+#include <LibDraw/GraphicsBitmap.h>
+#include <LibDraw/StylePainter.h>
+#include <LibDraw/TextAlignment.h>
 
 class GAction;
 
diff --git a/Libraries/LibGUI/GCheckBox.cpp b/Libraries/LibGUI/GCheckBox.cpp
index 2bd5067bc93f881769c544352826174ef78e29ba..bca4cd8a97b92a33be4773f4cd0f83ca407c0a96 100644
--- a/Libraries/LibGUI/GCheckBox.cpp
+++ b/Libraries/LibGUI/GCheckBox.cpp
@@ -1,8 +1,8 @@
 #include <Kernel/KeyCode.h>
 #include <LibGUI/GCheckBox.h>
 #include <LibGUI/GPainter.h>
-#include <SharedGraphics/CharacterBitmap.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/CharacterBitmap.h>
+#include <LibDraw/StylePainter.h>
 
 static const char* s_checked_bitmap_data = {
     "         "
diff --git a/Libraries/LibGUI/GDesktop.h b/Libraries/LibGUI/GDesktop.h
index a76142fe0fc13064ad826abcf9e97490e3347dd4..01b03debacd537abf8191ae57de21cc973132be1 100644
--- a/Libraries/LibGUI/GDesktop.h
+++ b/Libraries/LibGUI/GDesktop.h
@@ -3,7 +3,7 @@
 #include <AK/AKString.h>
 #include <AK/Badge.h>
 #include <AK/Function.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Rect.h>
 
 class GWindowServerConnection;
 
diff --git a/Libraries/LibGUI/GDirectoryModel.cpp b/Libraries/LibGUI/GDirectoryModel.cpp
index c8ad8f40d0e371f133ae01aa45ecc3ac0cf50a72..b682f9bf7eb57aaa78295b70bff4d37fcee3093c 100644
--- a/Libraries/LibGUI/GDirectoryModel.cpp
+++ b/Libraries/LibGUI/GDirectoryModel.cpp
@@ -4,7 +4,7 @@
 #include <LibCore/CDirIterator.h>
 #include <LibCore/CLock.h>
 #include <LibGUI/GPainter.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 #include <dirent.h>
 #include <grp.h>
 #include <pwd.h>
diff --git a/Libraries/LibGUI/GEvent.h b/Libraries/LibGUI/GEvent.h
index 9d9818883627f3d610a6323b2b120e1e8510c0b7..980fb54296b61d056739f19ac51afdf1fb908f0b 100644
--- a/Libraries/LibGUI/GEvent.h
+++ b/Libraries/LibGUI/GEvent.h
@@ -3,8 +3,8 @@
 #include <Kernel/KeyCode.h>
 #include <LibCore/CEvent.h>
 #include <LibGUI/GWindowType.h>
-#include <SharedGraphics/Point.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Point.h>
+#include <LibDraw/Rect.h>
 
 class CObject;
 
diff --git a/Libraries/LibGUI/GFilePicker.cpp b/Libraries/LibGUI/GFilePicker.cpp
index 9fe7c4db1a895d6eb1e12a98f968b13c6140768b..fb4b3c819c299b7e9d98b59be7fdadd539e359e2 100644
--- a/Libraries/LibGUI/GFilePicker.cpp
+++ b/Libraries/LibGUI/GFilePicker.cpp
@@ -11,7 +11,7 @@
 #include <LibGUI/GSortingProxyModel.h>
 #include <LibGUI/GTextBox.h>
 #include <LibGUI/GToolBar.h>
-#include <SharedGraphics/PNGLoader.h>
+#include <LibDraw/PNGLoader.h>
 
 Optional<String> GFilePicker::get_open_filepath()
 {
diff --git a/Libraries/LibGUI/GFontDatabase.cpp b/Libraries/LibGUI/GFontDatabase.cpp
index 6bd3887707dde996eb7f694bce16039b680854d3..a8fee8844c39651fcc34ced7037c110ea893ad06 100644
--- a/Libraries/LibGUI/GFontDatabase.cpp
+++ b/Libraries/LibGUI/GFontDatabase.cpp
@@ -1,6 +1,6 @@
 #include <LibCore/CDirIterator.h>
 #include <LibGUI/GFontDatabase.h>
-#include <SharedGraphics/Font.h>
+#include <LibDraw/Font.h>
 #include <dirent.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Libraries/LibGUI/GFrame.cpp b/Libraries/LibGUI/GFrame.cpp
index 418fe404924b6e89771850a3c6addf858e51df1c..8854bb5e03f8f29a38700d37910f00585a18125b 100644
--- a/Libraries/LibGUI/GFrame.cpp
+++ b/Libraries/LibGUI/GFrame.cpp
@@ -1,6 +1,6 @@
 #include <LibGUI/GFrame.h>
 #include <LibGUI/GPainter.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/StylePainter.h>
 
 GFrame::GFrame(GWidget* parent)
     : GWidget(parent)
diff --git a/Libraries/LibGUI/GFrame.h b/Libraries/LibGUI/GFrame.h
index b6757e4d8dea8e0c425c1b0ba4a4d3fc9c432ef3..84b07413f664668908a27a755d1c49b21a1f2af2 100644
--- a/Libraries/LibGUI/GFrame.h
+++ b/Libraries/LibGUI/GFrame.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <LibGUI/GWidget.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/StylePainter.h>
 
 class GFrame : public GWidget {
 public:
diff --git a/Libraries/LibGUI/GGroupBox.cpp b/Libraries/LibGUI/GGroupBox.cpp
index 5242c332401d4b5a15c0a828aa3257cdcf43cc78..3ce063f248fb41a9db9403c3514ccf091558b5a8 100644
--- a/Libraries/LibGUI/GGroupBox.cpp
+++ b/Libraries/LibGUI/GGroupBox.cpp
@@ -1,6 +1,6 @@
 #include <LibGUI/GGroupBox.h>
 #include <LibGUI/GPainter.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/StylePainter.h>
 
 GGroupBox::GGroupBox(GWidget* parent)
     : GGroupBox({}, parent)
diff --git a/Libraries/LibGUI/GIcon.h b/Libraries/LibGUI/GIcon.h
index 2aecd7f2ede18ed6d8e5c193b98e6c81e7a95d25..d849929a50af114aeb217ab5e310173a57ba10d2 100644
--- a/Libraries/LibGUI/GIcon.h
+++ b/Libraries/LibGUI/GIcon.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/HashMap.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 
 class GIconImpl : public RefCounted<GIconImpl> {
 public:
diff --git a/Libraries/LibGUI/GLabel.cpp b/Libraries/LibGUI/GLabel.cpp
index 5a6fdc6580b5370b288d5ec330e2f97f71dcec26..bba9e4897e59d91a0343d492fa0fdfccfea3596b 100644
--- a/Libraries/LibGUI/GLabel.cpp
+++ b/Libraries/LibGUI/GLabel.cpp
@@ -1,6 +1,6 @@
 #include "GLabel.h"
 #include <LibGUI/GPainter.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 
 GLabel::GLabel(GWidget* parent)
     : GFrame(parent)
diff --git a/Libraries/LibGUI/GLabel.h b/Libraries/LibGUI/GLabel.h
index e3ad6a568efbd73490a039b17d00b4aece9adda6..4ee427d2bdf2fd9c513f83d7cf03df4d26885f9e 100644
--- a/Libraries/LibGUI/GLabel.h
+++ b/Libraries/LibGUI/GLabel.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <LibGUI/GFrame.h>
-#include <SharedGraphics/TextAlignment.h>
+#include <LibDraw/TextAlignment.h>
 
 class GraphicsBitmap;
 
diff --git a/Libraries/LibGUI/GModel.h b/Libraries/LibGUI/GModel.h
index dbb94524daf74c7b183bf2b9efeb248be429e44a..fb634930e690f310172c1ff333ea7bfd2094f650 100644
--- a/Libraries/LibGUI/GModel.h
+++ b/Libraries/LibGUI/GModel.h
@@ -7,7 +7,7 @@
 #include <AK/RefCounted.h>
 #include <LibGUI/GModelIndex.h>
 #include <LibGUI/GVariant.h>
-#include <SharedGraphics/TextAlignment.h>
+#include <LibDraw/TextAlignment.h>
 
 class Font;
 class GAbstractView;
diff --git a/Libraries/LibGUI/GPainter.h b/Libraries/LibGUI/GPainter.h
index 1ad436e343b47eab98d197d844688351ef649cfa..93e4b4688240afaa717ffb14586db80907caa000 100644
--- a/Libraries/LibGUI/GPainter.h
+++ b/Libraries/LibGUI/GPainter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <SharedGraphics/Painter.h>
+#include <LibDraw/Painter.h>
 
 class GWidget;
 class GraphicsBitmap;
diff --git a/Libraries/LibGUI/GRadioButton.cpp b/Libraries/LibGUI/GRadioButton.cpp
index 377b3000ae7753e23b3259b87c4c15304cd8b65f..9c488f6ffa8129d32bb3b3c58aff0916c02d9d84 100644
--- a/Libraries/LibGUI/GRadioButton.cpp
+++ b/Libraries/LibGUI/GRadioButton.cpp
@@ -1,6 +1,6 @@
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GRadioButton.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 
 static RefPtr<GraphicsBitmap> s_unfilled_circle_bitmap;
 static RefPtr<GraphicsBitmap> s_filled_circle_bitmap;
diff --git a/Libraries/LibGUI/GResizeCorner.cpp b/Libraries/LibGUI/GResizeCorner.cpp
index 1dfba8b786224bbab91bae00b836422f65472d47..5aa050ec451672278e8cabedbf4215a470a22155 100644
--- a/Libraries/LibGUI/GResizeCorner.cpp
+++ b/Libraries/LibGUI/GResizeCorner.cpp
@@ -1,7 +1,7 @@
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GResizeCorner.h>
 #include <LibGUI/GWindow.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 #include <WindowServer/WSAPITypes.h>
 
 GResizeCorner::GResizeCorner(GWidget* parent)
diff --git a/Libraries/LibGUI/GScrollBar.cpp b/Libraries/LibGUI/GScrollBar.cpp
index f1ce391309070b8f67935778e53f3ae48c42fa3e..037b5aca4080cdda6d1dae6f3fa9e90c47139d61 100644
--- a/Libraries/LibGUI/GScrollBar.cpp
+++ b/Libraries/LibGUI/GScrollBar.cpp
@@ -1,8 +1,8 @@
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GScrollBar.h>
-#include <SharedGraphics/CharacterBitmap.h>
-#include <SharedGraphics/GraphicsBitmap.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/CharacterBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
+#include <LibDraw/StylePainter.h>
 
 static const char* s_up_arrow_bitmap_data = {
     "         "
diff --git a/Libraries/LibGUI/GSlider.cpp b/Libraries/LibGUI/GSlider.cpp
index ff166e90efd9267df3f852aea4fe3b98d85684ce..3a821e9d414f6aaf6c72d6ff31ed863756512f75 100755
--- a/Libraries/LibGUI/GSlider.cpp
+++ b/Libraries/LibGUI/GSlider.cpp
@@ -1,6 +1,6 @@
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GSlider.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/StylePainter.h>
 
 GSlider::GSlider(GWidget* parent)
     : GWidget(parent)
diff --git a/Libraries/LibGUI/GStatusBar.cpp b/Libraries/LibGUI/GStatusBar.cpp
index e219035e32dc9cc0e08098601d56c6a67514066f..12ff8da2f7222ea21a889031a2c3918af039ca24 100644
--- a/Libraries/LibGUI/GStatusBar.cpp
+++ b/Libraries/LibGUI/GStatusBar.cpp
@@ -3,7 +3,7 @@
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GResizeCorner.h>
 #include <LibGUI/GStatusBar.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/StylePainter.h>
 
 GStatusBar::GStatusBar(GWidget* parent)
     : GWidget(parent)
diff --git a/Libraries/LibGUI/GTabWidget.cpp b/Libraries/LibGUI/GTabWidget.cpp
index 73b1552d1f2bd88bc79b445826bd9b0ef3fa5688..374390fd3fa2f0306ebc8718fa8d17dcfd5d7824 100644
--- a/Libraries/LibGUI/GTabWidget.cpp
+++ b/Libraries/LibGUI/GTabWidget.cpp
@@ -1,7 +1,7 @@
 #include <LibGUI/GBoxLayout.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GTabWidget.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/StylePainter.h>
 
 GTabWidget::GTabWidget(GWidget* parent)
     : GWidget(parent)
diff --git a/Libraries/LibGUI/GTextEditor.h b/Libraries/LibGUI/GTextEditor.h
index 1bfbfa5b70824693839c075f5186b8d61e207d89..751b6a542830a30b1b2f23cabaa1204cd53b31ed 100644
--- a/Libraries/LibGUI/GTextEditor.h
+++ b/Libraries/LibGUI/GTextEditor.h
@@ -3,7 +3,7 @@
 #include <AK/Function.h>
 #include <AK/HashMap.h>
 #include <LibGUI/GScrollableWidget.h>
-#include <SharedGraphics/TextAlignment.h>
+#include <LibDraw/TextAlignment.h>
 
 class GAction;
 class GMenu;
diff --git a/Libraries/LibGUI/GVariant.h b/Libraries/LibGUI/GVariant.h
index c7dc60d2de22af93073647fba244c737acdb98aa..7725412f2045881618edcafbffad22566e4f6ea8 100644
--- a/Libraries/LibGUI/GVariant.h
+++ b/Libraries/LibGUI/GVariant.h
@@ -2,7 +2,7 @@
 
 #include <AK/AKString.h>
 #include <LibGUI/GIcon.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 
 namespace AK {
 class JsonValue;
diff --git a/Libraries/LibGUI/GWidget.cpp b/Libraries/LibGUI/GWidget.cpp
index 41e5b5854c34da214f5a8ff10accbcdf605c9937..eb963b0314835a05872cf5c33d2e9069fd1ef0da 100644
--- a/Libraries/LibGUI/GWidget.cpp
+++ b/Libraries/LibGUI/GWidget.cpp
@@ -8,7 +8,7 @@
 #include <LibGUI/GLayout.h>
 #include <LibGUI/GMenu.h>
 #include <LibGUI/GPainter.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 #include <unistd.h>
 
 GWidget::GWidget(GWidget* parent)
diff --git a/Libraries/LibGUI/GWidget.h b/Libraries/LibGUI/GWidget.h
index da0ae762ea18390f5e40900376a213e544404887..410bbe3653a026e128a7c535653de4c8c5410f60 100644
--- a/Libraries/LibGUI/GWidget.h
+++ b/Libraries/LibGUI/GWidget.h
@@ -7,9 +7,9 @@
 #include <LibCore/CObject.h>
 #include <LibGUI/GEvent.h>
 #include <LibGUI/GShortcut.h>
-#include <SharedGraphics/Color.h>
-#include <SharedGraphics/Font.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Color.h>
+#include <LibDraw/Font.h>
+#include <LibDraw/Rect.h>
 
 class GraphicsBitmap;
 class GAction;
diff --git a/Libraries/LibGUI/GWindow.cpp b/Libraries/LibGUI/GWindow.cpp
index 74c582cb52cb015954abd2e2fcb06c7f32487bdc..1e2013726991b74543d6dfebf790bbadcdb815e8 100644
--- a/Libraries/LibGUI/GWindow.cpp
+++ b/Libraries/LibGUI/GWindow.cpp
@@ -8,7 +8,7 @@
 #include <LibC/stdlib.h>
 #include <LibC/unistd.h>
 #include <LibGUI/GPainter.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 
 //#define UPDATE_COALESCING_DEBUG
 
diff --git a/Libraries/LibGUI/GWindow.h b/Libraries/LibGUI/GWindow.h
index 392f078ce615601e39fd14b439205c8081ae4533..5101a2430cfb27a74f1bc5c44dd343be29016cf3 100644
--- a/Libraries/LibGUI/GWindow.h
+++ b/Libraries/LibGUI/GWindow.h
@@ -5,8 +5,8 @@
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
 #include <LibGUI/GWindowType.h>
-#include <SharedGraphics/GraphicsBitmap.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/GraphicsBitmap.h>
+#include <LibDraw/Rect.h>
 
 class GWidget;
 class GWMEvent;
diff --git a/Libraries/LibGUI/Makefile b/Libraries/LibGUI/Makefile
index 7589e77b91699c1a9e5c528414eee2fa4296d1d4..1b2c461115434fb16b5b4cbed233e50ec8ef68f6 100644
--- a/Libraries/LibGUI/Makefile
+++ b/Libraries/LibGUI/Makefile
@@ -1,16 +1,6 @@
 include ../../Makefile.common
 
-SHAREDGRAPHICS_OBJS = \
-    ../../SharedGraphics/Painter.o \
-    ../../SharedGraphics/StylePainter.o \
-    ../../SharedGraphics/Font.o \
-    ../../SharedGraphics/Rect.o \
-    ../../SharedGraphics/GraphicsBitmap.o \
-    ../../SharedGraphics/CharacterBitmap.o \
-    ../../SharedGraphics/Color.o \
-    ../../SharedGraphics/PNGLoader.o
-
-LIBGUI_OBJS = \
+OBJS = \
     GPainter.o \
     GButton.o \
     GCheckBox.o \
@@ -64,8 +54,6 @@ LIBGUI_OBJS = \
     GComboBox.o \
     GWindow.o
 
-OBJS = $(SHAREDGRAPHICS_OBJS) $(LIBGUI_OBJS)
-
 LIBRARY = libgui.a
 DEFINES += -DUSERLAND
 
diff --git a/Libraries/LibHTML/Frame.h b/Libraries/LibHTML/Frame.h
index 1ceef02564bc05b076efa98c491eb2cce6920f90..b58021fa5cc05167e4c2512b7e45941292794d0e 100644
--- a/Libraries/LibHTML/Frame.h
+++ b/Libraries/LibHTML/Frame.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <LibHTML/DOM/Document.h>
-#include <SharedGraphics/Size.h>
+#include <LibDraw/Size.h>
 
 class Frame {
 public:
diff --git a/Libraries/LibHTML/Layout/ComputedStyle.h b/Libraries/LibHTML/Layout/ComputedStyle.h
index af339fecd65d49585b89ca4848094d091a6ccf9d..856118a7908e07897c4f44897935ea71f5ddca47 100644
--- a/Libraries/LibHTML/Layout/ComputedStyle.h
+++ b/Libraries/LibHTML/Layout/ComputedStyle.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <LibHTML/CSS/LengthBox.h>
-#include <SharedGraphics/Color.h>
-#include <SharedGraphics/Size.h>
+#include <LibDraw/Color.h>
+#include <LibDraw/Size.h>
 
 enum FontStyle {
     Normal,
diff --git a/Libraries/LibHTML/Layout/LayoutNode.h b/Libraries/LibHTML/Layout/LayoutNode.h
index 9604636b11b62c54ac266f193626430feff49e34..a48e11d4223d8929c3dbafd0dd5597c176b31673 100644
--- a/Libraries/LibHTML/Layout/LayoutNode.h
+++ b/Libraries/LibHTML/Layout/LayoutNode.h
@@ -4,7 +4,7 @@
 #include <AK/Vector.h>
 #include <LibHTML/Layout/ComputedStyle.h>
 #include <LibHTML/TreeNode.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Rect.h>
 
 class Node;
 class LayoutBlock;
diff --git a/Makefile.common b/Makefile.common
index cbe8e3836517156ac71bad98b9ffd8cc89589227..cc49b2646c5014cee42f95a967bb76417fa3325f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -7,8 +7,22 @@ OPTIMIZATION_FLAGS = -Os
 MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 SERENITY_BASE_DIR := $(patsubst %/,%,$(dir $(MAKEFILE_PATH)))
 
-INCLUDE_FLAGS = -I$(SERENITY_BASE_DIR) -I$(SERENITY_BASE_DIR)/Libraries -I. -I$(SERENITY_BASE_DIR)/Libraries/LibC -I$(SERENITY_BASE_DIR)/Servers -I$(SERENITY_BASE_DIR)/Libraries/LibM
-LDFLAGS = -L$(SERENITY_BASE_DIR)/Libraries/LibC -L$(SERENITY_BASE_DIR)/Libraries/LibCore -L$(SERENITY_BASE_DIR)/Libraries/LibM -L$(SERENITY_BASE_DIR)/Libraries/LibGUI -L$(SERENITY_BASE_DIR)/Libraries/LibAudio
+INCLUDE_FLAGS = \
+    -I. \
+    -I$(SERENITY_BASE_DIR) \
+    -I$(SERENITY_BASE_DIR)/Libraries \
+    -I$(SERENITY_BASE_DIR)/Libraries/LibC \
+    -I$(SERENITY_BASE_DIR)/Servers \
+    -I$(SERENITY_BASE_DIR)/Libraries/LibM
+
+LDFLAGS = \
+    -L$(SERENITY_BASE_DIR)/Libraries/LibC \
+    -L$(SERENITY_BASE_DIR)/Libraries/LibCore \
+    -L$(SERENITY_BASE_DIR)/Libraries/LibM \
+    -L$(SERENITY_BASE_DIR)/Libraries/LibDraw \
+    -L$(SERENITY_BASE_DIR)/Libraries/LibGUI \
+    -L$(SERENITY_BASE_DIR)/Libraries/LibAudio
+
 CLANG_FLAGS = -Wconsumed -m32 -ffreestanding -march=i686
 #SUGGEST_FLAGS = -Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override #-Wsuggest-attribute=noreturn 
 CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(SUGGEST_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
diff --git a/Servers/WindowServer/Makefile b/Servers/WindowServer/Makefile
index a51fd588c8726a4f154b5e01970418ec789aee04..01e2de476ef2cd7aa2f118dc8dc9c3dbbf268d11 100644
--- a/Servers/WindowServer/Makefile
+++ b/Servers/WindowServer/Makefile
@@ -1,17 +1,6 @@
 include ../../Makefile.common
 
-SHAREDGRAPHICS_OBJS = \
-    ../../SharedGraphics/Painter.o \
-    ../../SharedGraphics/StylePainter.o \
-    ../../SharedGraphics/Font.o \
-    ../../SharedGraphics/Rect.o \
-    ../../SharedGraphics/GraphicsBitmap.o \
-    ../../SharedGraphics/CharacterBitmap.o \
-    ../../SharedGraphics/DisjointRectSet.o \
-    ../../SharedGraphics/Color.o \
-    ../../SharedGraphics/PNGLoader.o
-
-WINDOWSERVER_OBJS = \
+OBJS = \
     WSEventLoop.o \
     WSWindow.o \
     WSWindowManager.o \
@@ -31,14 +20,13 @@ WINDOWSERVER_OBJS = \
     main.o
 
 APP = WindowServer
-OBJS = $(SHAREDGRAPHICS_OBJS) $(WINDOWSERVER_OBJS)
 
 DEFINES += -DUSERLAND
 
 all: $(APP)
 
 $(APP): $(OBJS)
-	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lc -lcore
+	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lc -lcore -ldraw
 
 .cpp.o:
 	@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
diff --git a/Servers/WindowServer/WSAPITypes.h b/Servers/WindowServer/WSAPITypes.h
index 62c22a2b9e0ed37e55dd6c5060b139a6154ba500..28fe734d6e0efcc8f8718b631c01292dac696150 100644
--- a/Servers/WindowServer/WSAPITypes.h
+++ b/Servers/WindowServer/WSAPITypes.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <SharedGraphics/Color.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Color.h>
+#include <LibDraw/Rect.h>
 
 typedef unsigned WSAPI_Color;
 
diff --git a/Servers/WindowServer/WSButton.cpp b/Servers/WindowServer/WSButton.cpp
index 10b635fb683087aa2fd253f87172a3689e187924..7e0a7de879867721e37165f9ac209dc368b8194a 100644
--- a/Servers/WindowServer/WSButton.cpp
+++ b/Servers/WindowServer/WSButton.cpp
@@ -1,6 +1,6 @@
-#include <SharedGraphics/CharacterBitmap.h>
-#include <SharedGraphics/Painter.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/CharacterBitmap.h>
+#include <LibDraw/Painter.h>
+#include <LibDraw/StylePainter.h>
 #include <WindowServer/WSButton.h>
 #include <WindowServer/WSEvent.h>
 #include <WindowServer/WSWindowManager.h>
diff --git a/Servers/WindowServer/WSButton.h b/Servers/WindowServer/WSButton.h
index b9c51ea10a3da35de7f7dfceaf2b347775fa0a49..dc2b09ad10c4cb60e64f0b1bc8169c179cd8aa65 100644
--- a/Servers/WindowServer/WSButton.h
+++ b/Servers/WindowServer/WSButton.h
@@ -3,7 +3,7 @@
 #include <AK/Function.h>
 #include <AK/NonnullRefPtr.h>
 #include <AK/Weakable.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Rect.h>
 
 class CharacterBitmap;
 class Painter;
diff --git a/Servers/WindowServer/WSClientConnection.h b/Servers/WindowServer/WSClientConnection.h
index 4c621fe4222a6d57f6167f8e25ac053379d20f70..2a5d2e474988d0b8c835552575c314cc063c4420 100644
--- a/Servers/WindowServer/WSClientConnection.h
+++ b/Servers/WindowServer/WSClientConnection.h
@@ -6,7 +6,7 @@
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
 #include <LibCore/CoreIPCServer.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 #include <WindowServer/WSEvent.h>
 
 class WSWindow;
diff --git a/Servers/WindowServer/WSCompositor.cpp b/Servers/WindowServer/WSCompositor.cpp
index 115b5cea444323c5ad271152bf82badddd5c903a..dae11e64ac496d919000e7dab333356b0afea407 100644
--- a/Servers/WindowServer/WSCompositor.cpp
+++ b/Servers/WindowServer/WSCompositor.cpp
@@ -4,9 +4,9 @@
 #include "WSScreen.h"
 #include "WSWindow.h"
 #include "WSWindowManager.h"
-#include <SharedGraphics/Font.h>
-#include <SharedGraphics/PNGLoader.h>
-#include <SharedGraphics/Painter.h>
+#include <LibDraw/Font.h>
+#include <LibDraw/PNGLoader.h>
+#include <LibDraw/Painter.h>
 
 // #define COMPOSITOR_DEBUG
 
diff --git a/Servers/WindowServer/WSCompositor.h b/Servers/WindowServer/WSCompositor.h
index 27635d04ca5f5e4b5a0d25f9057994c53b30332d..e11da2b21fc1673f23e217be83bc54b6479b2f88 100644
--- a/Servers/WindowServer/WSCompositor.h
+++ b/Servers/WindowServer/WSCompositor.h
@@ -4,8 +4,8 @@
 #include <AK/RefPtr.h>
 #include <LibCore/CObject.h>
 #include <LibCore/CTimer.h>
-#include <SharedGraphics/DisjointRectSet.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/DisjointRectSet.h>
+#include <LibDraw/GraphicsBitmap.h>
 
 class Painter;
 class WSCursor;
diff --git a/Servers/WindowServer/WSCursor.h b/Servers/WindowServer/WSCursor.h
index 76640da4a7796310c0a103216fa5f63a9063db00..5b46f64674facf6056c3ae8852455f5efa4793ba 100644
--- a/Servers/WindowServer/WSCursor.h
+++ b/Servers/WindowServer/WSCursor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 
 enum class WSStandardCursor {
     None = 0,
diff --git a/Servers/WindowServer/WSEvent.h b/Servers/WindowServer/WSEvent.h
index 2527c88fcafe8281da8b7caca8d3e716e4a21a34..4339be917bf3d8ec3fb6cd9e42f2785819ba869c 100644
--- a/Servers/WindowServer/WSEvent.h
+++ b/Servers/WindowServer/WSEvent.h
@@ -4,8 +4,8 @@
 #include <AK/Types.h>
 #include <Kernel/KeyCode.h>
 #include <LibCore/CEvent.h>
-#include <SharedGraphics/Point.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Point.h>
+#include <LibDraw/Rect.h>
 #include <WindowServer/WSCursor.h>
 #include <WindowServer/WSWindowType.h>
 
diff --git a/Servers/WindowServer/WSMenu.cpp b/Servers/WindowServer/WSMenu.cpp
index d820a9425a5a41130c815ec21581ff92579e8141..7b6b1dcc5ad3ce4beac97b68cdc5f81c65eb0083 100644
--- a/Servers/WindowServer/WSMenu.cpp
+++ b/Servers/WindowServer/WSMenu.cpp
@@ -5,10 +5,10 @@
 #include "WSScreen.h"
 #include "WSWindow.h"
 #include "WSWindowManager.h"
-#include <SharedGraphics/CharacterBitmap.h>
-#include <SharedGraphics/Font.h>
-#include <SharedGraphics/Painter.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/CharacterBitmap.h>
+#include <LibDraw/Font.h>
+#include <LibDraw/Painter.h>
+#include <LibDraw/StylePainter.h>
 #include <WindowServer/WSAPITypes.h>
 #include <WindowServer/WSClientConnection.h>
 
diff --git a/Servers/WindowServer/WSMenu.h b/Servers/WindowServer/WSMenu.h
index 25d27179e34e986347742f208ff1224cd1c4aed2..a50d505349b974328a6ff8a8b54a80296d4b8264 100644
--- a/Servers/WindowServer/WSMenu.h
+++ b/Servers/WindowServer/WSMenu.h
@@ -4,7 +4,7 @@
 #include <AK/Vector.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Rect.h>
 #include <WindowServer/WSMenuItem.h>
 
 class WSClientConnection;
diff --git a/Servers/WindowServer/WSMenuItem.h b/Servers/WindowServer/WSMenuItem.h
index 0b29d361baec3873616d25a0104fbe9d2239b238..4489e332d23ec701857d01a8d61442d2b6dcfb01 100644
--- a/Servers/WindowServer/WSMenuItem.h
+++ b/Servers/WindowServer/WSMenuItem.h
@@ -2,7 +2,7 @@
 
 #include <AK/AKString.h>
 #include <AK/Function.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Rect.h>
 
 class WSMenu;
 
diff --git a/Servers/WindowServer/WSMenuManager.cpp b/Servers/WindowServer/WSMenuManager.cpp
index 50a88f274cf7ab190fe875e7de916680ba8b56dc..90cf29189bb7ff5d07d597e7803bb110b2d8a639 100644
--- a/Servers/WindowServer/WSMenuManager.cpp
+++ b/Servers/WindowServer/WSMenuManager.cpp
@@ -1,6 +1,6 @@
 #include <LibCore/CTimer.h>
-#include <SharedGraphics/Font.h>
-#include <SharedGraphics/Painter.h>
+#include <LibDraw/Font.h>
+#include <LibDraw/Painter.h>
 #include <WindowServer/WSMenuBarKeeper.h>
 #include <WindowServer/WSWindowManager.h>
 #include <time.h>
diff --git a/Servers/WindowServer/WSScreen.h b/Servers/WindowServer/WSScreen.h
index 6a9d4928218b444c3a4818ad12678c1ea7459490..59ef14456cf0f183c305ec1c37eaaa6c792b3e97 100644
--- a/Servers/WindowServer/WSScreen.h
+++ b/Servers/WindowServer/WSScreen.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <Kernel/KeyCode.h>
-#include <SharedGraphics/Color.h>
-#include <SharedGraphics/Rect.h>
-#include <SharedGraphics/Size.h>
+#include <LibDraw/Color.h>
+#include <LibDraw/Rect.h>
+#include <LibDraw/Size.h>
 
 class WSScreen {
 public:
diff --git a/Servers/WindowServer/WSWindow.h b/Servers/WindowServer/WSWindow.h
index c3db207f60e69d6b2fae901f81be9ff0713ac957..07a022244d510eaa7d330062bb44140531d4a3be 100644
--- a/Servers/WindowServer/WSWindow.h
+++ b/Servers/WindowServer/WSWindow.h
@@ -3,9 +3,9 @@
 #include <AK/AKString.h>
 #include <AK/InlineLinkedList.h>
 #include <LibCore/CObject.h>
-#include <SharedGraphics/DisjointRectSet.h>
-#include <SharedGraphics/GraphicsBitmap.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/DisjointRectSet.h>
+#include <LibDraw/GraphicsBitmap.h>
+#include <LibDraw/Rect.h>
 #include <WindowServer/WSWindowFrame.h>
 #include <WindowServer/WSWindowType.h>
 
diff --git a/Servers/WindowServer/WSWindowFrame.cpp b/Servers/WindowServer/WSWindowFrame.cpp
index 09b2cecc7b7b3aa8a9c7aa3110ebc23314d1e0c0..340ebebd320086e28bf1a72a34674b7c6825aae4 100644
--- a/Servers/WindowServer/WSWindowFrame.cpp
+++ b/Servers/WindowServer/WSWindowFrame.cpp
@@ -1,7 +1,7 @@
-#include <SharedGraphics/CharacterBitmap.h>
-#include <SharedGraphics/Font.h>
-#include <SharedGraphics/Painter.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/CharacterBitmap.h>
+#include <LibDraw/Font.h>
+#include <LibDraw/Painter.h>
+#include <LibDraw/StylePainter.h>
 #include <WindowServer/WSButton.h>
 #include <WindowServer/WSCompositor.h>
 #include <WindowServer/WSEvent.h>
diff --git a/Servers/WindowServer/WSWindowManager.cpp b/Servers/WindowServer/WSWindowManager.cpp
index cb5522186e9b6331e41cee84a5ac37c6b6d223ba..eaa660888363aa574cf90d8e1e4f723f5336962b 100644
--- a/Servers/WindowServer/WSWindowManager.cpp
+++ b/Servers/WindowServer/WSWindowManager.cpp
@@ -10,11 +10,11 @@
 #include <AK/StdLibExtras.h>
 #include <AK/Vector.h>
 #include <LibCore/CTimer.h>
-#include <SharedGraphics/CharacterBitmap.h>
-#include <SharedGraphics/Font.h>
-#include <SharedGraphics/PNGLoader.h>
-#include <SharedGraphics/Painter.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/CharacterBitmap.h>
+#include <LibDraw/Font.h>
+#include <LibDraw/PNGLoader.h>
+#include <LibDraw/Painter.h>
+#include <LibDraw/StylePainter.h>
 #include <WindowServer/WSAPITypes.h>
 #include <WindowServer/WSButton.h>
 #include <WindowServer/WSClientConnection.h>
diff --git a/Servers/WindowServer/WSWindowManager.h b/Servers/WindowServer/WSWindowManager.h
index eaadf75d573be6afeea48d24a738ca3da0d23dc0..da48011de8603b61c542865a4402d17a117356cd 100644
--- a/Servers/WindowServer/WSWindowManager.h
+++ b/Servers/WindowServer/WSWindowManager.h
@@ -6,10 +6,10 @@
 #include <AK/WeakPtr.h>
 #include <LibCore/CConfigFile.h>
 #include <LibCore/CElapsedTimer.h>
-#include <SharedGraphics/Color.h>
-#include <SharedGraphics/DisjointRectSet.h>
-#include <SharedGraphics/Painter.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Color.h>
+#include <LibDraw/DisjointRectSet.h>
+#include <LibDraw/Painter.h>
+#include <LibDraw/Rect.h>
 #include <WindowServer/WSCursor.h>
 #include <WindowServer/WSEvent.h>
 #include <WindowServer/WSMenuBar.h>
diff --git a/Servers/WindowServer/WSWindowSwitcher.cpp b/Servers/WindowServer/WSWindowSwitcher.cpp
index 6e91f58bef608196f292ad81e27f83a446d9c140..8123027f9b557cc38d30b965d2a079dd1854f6e0 100644
--- a/Servers/WindowServer/WSWindowSwitcher.cpp
+++ b/Servers/WindowServer/WSWindowSwitcher.cpp
@@ -1,5 +1,5 @@
-#include <SharedGraphics/Font.h>
-#include <SharedGraphics/StylePainter.h>
+#include <LibDraw/Font.h>
+#include <LibDraw/StylePainter.h>
 #include <WindowServer/WSEvent.h>
 #include <WindowServer/WSScreen.h>
 #include <WindowServer/WSWindowManager.h>
diff --git a/Servers/WindowServer/WSWindowSwitcher.h b/Servers/WindowServer/WSWindowSwitcher.h
index 1feed2625c4464f0d8ae7eab8ef6181969695bb1..4c9764f66807749c0fe6ffea97f7414e1234220b 100644
--- a/Servers/WindowServer/WSWindowSwitcher.h
+++ b/Servers/WindowServer/WSWindowSwitcher.h
@@ -3,7 +3,7 @@
 #include <AK/Vector.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
-#include <SharedGraphics/Rect.h>
+#include <LibDraw/Rect.h>
 
 class Painter;
 class WSKeyEvent;
diff --git a/SharedGraphics/install.sh b/SharedGraphics/install.sh
deleted file mode 100755
index 5b19415f9d4a52d219069f8a01b1ad16f27fd6bd..0000000000000000000000000000000000000000
--- a/SharedGraphics/install.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-mkdir -p ../Root/usr/include/SharedGraphics/
-cp *.h ../Root/usr/include/SharedGraphics/
diff --git a/Userland/Makefile b/Userland/Makefile
index e56242e7e260604e0b31fd061a274007579bb782..7a52b5c449ccd57faf221e840d76741dda135355 100644
--- a/Userland/Makefile
+++ b/Userland/Makefile
@@ -19,7 +19,7 @@ clean:
 
 $(APPS) : % : %.o $(OBJS)
 	@echo "LD $@"
-	@$(LD) -o $@ $(LDFLAGS) $< -lc -lgui -laudio -lcore
+	@$(LD) -o $@ $(LDFLAGS) $< -lc -lgui -ldraw -laudio -lcore
 
 %.o: %.cpp
 	@echo "CXX $<"
diff --git a/Userland/guitest2.cpp b/Userland/guitest2.cpp
index 21ce0fd2a59ddc0d5cf8be42f5ff4ccb8a9d775b..dc3f1e5063d8b080cc80d4141425e51df6fd2474 100644
--- a/Userland/guitest2.cpp
+++ b/Userland/guitest2.cpp
@@ -9,7 +9,7 @@
 #include <LibGUI/GTextBox.h>
 #include <LibGUI/GWidget.h>
 #include <LibGUI/GWindow.h>
-#include <SharedGraphics/GraphicsBitmap.h>
+#include <LibDraw/GraphicsBitmap.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>