diff --git a/Userland/DevTools/IPCCompiler/main.cpp b/Userland/DevTools/IPCCompiler/main.cpp
index 2affb167dde..654e9fd2a28 100644
--- a/Userland/DevTools/IPCCompiler/main.cpp
+++ b/Userland/DevTools/IPCCompiler/main.cpp
@@ -276,12 +276,7 @@ int main(int argc, char** argv)
     generator.append(R"~~~(#include <AK/MemoryStream.h>
 #include <AK/OwnPtr.h>
 #include <AK/Result.h>
-#include <AK/URL.h>
 #include <AK/Utf8View.h>
-#include <LibCore/AnonymousBuffer.h>
-#include <LibGfx/Color.h>
-#include <LibGfx/Rect.h>
-#include <LibGfx/ShareableBitmap.h>
 #include <LibIPC/Connection.h>
 #include <LibIPC/Decoder.h>
 #include <LibIPC/Dictionary.h>
diff --git a/Userland/Libraries/LibGUI/Clipboard.cpp b/Userland/Libraries/LibGUI/Clipboard.cpp
index 7a15d72b771..2c7c557744e 100644
--- a/Userland/Libraries/LibGUI/Clipboard.cpp
+++ b/Userland/Libraries/LibGUI/Clipboard.cpp
@@ -8,6 +8,7 @@
 #include <Clipboard/ClipboardClientEndpoint.h>
 #include <Clipboard/ClipboardServerEndpoint.h>
 #include <LibGUI/Clipboard.h>
+#include <LibGfx/Bitmap.h>
 #include <LibIPC/ServerConnection.h>
 
 namespace GUI {
diff --git a/Userland/Services/AudioServer/AudioClient.ipc b/Userland/Services/AudioServer/AudioClient.ipc
index 54fb049836c..56b4f89d1e2 100644
--- a/Userland/Services/AudioServer/AudioClient.ipc
+++ b/Userland/Services/AudioServer/AudioClient.ipc
@@ -1,3 +1,5 @@
+#include <LibCore/AnonymousBuffer.h>
+
 endpoint AudioClient
 {
     finished_playing_buffer(i32 buffer_id) =|
diff --git a/Userland/Services/AudioServer/AudioServer.ipc b/Userland/Services/AudioServer/AudioServer.ipc
index b78e6830265..4c23e47d0cd 100644
--- a/Userland/Services/AudioServer/AudioServer.ipc
+++ b/Userland/Services/AudioServer/AudioServer.ipc
@@ -1,3 +1,5 @@
+#include <LibCore/AnonymousBuffer.h>
+
 endpoint AudioServer
 {
     // Mixer functions
diff --git a/Userland/Services/Clipboard/ClipboardClient.ipc b/Userland/Services/Clipboard/ClipboardClient.ipc
index 677533965f5..d0548d74602 100644
--- a/Userland/Services/Clipboard/ClipboardClient.ipc
+++ b/Userland/Services/Clipboard/ClipboardClient.ipc
@@ -1,3 +1,5 @@
+#include <LibCore/AnonymousBuffer.h>
+
 endpoint ClipboardClient
 {
     clipboard_data_changed([UTF8] String mime_type) =|
diff --git a/Userland/Services/Clipboard/ClipboardServer.ipc b/Userland/Services/Clipboard/ClipboardServer.ipc
index a6a12ea158a..731a1b2de27 100644
--- a/Userland/Services/Clipboard/ClipboardServer.ipc
+++ b/Userland/Services/Clipboard/ClipboardServer.ipc
@@ -1,3 +1,5 @@
+#include <LibCore/AnonymousBuffer.h>
+
 endpoint ClipboardServer
 {
     get_clipboard_data() => (Core::AnonymousBuffer data, [UTF8] String mime_type, IPC::Dictionary metadata)
diff --git a/Userland/Services/ImageDecoder/ImageDecoderClient.ipc b/Userland/Services/ImageDecoder/ImageDecoderClient.ipc
index 73dc57c2fe6..10c257a8fa0 100644
--- a/Userland/Services/ImageDecoder/ImageDecoderClient.ipc
+++ b/Userland/Services/ImageDecoder/ImageDecoderClient.ipc
@@ -1,3 +1,6 @@
+#include <LibCore/AnonymousBuffer.h>
+#include <LibGfx/ShareableBitmap.h>
+
 endpoint ImageDecoderClient
 {
 }
diff --git a/Userland/Services/ImageDecoder/ImageDecoderServer.ipc b/Userland/Services/ImageDecoder/ImageDecoderServer.ipc
index 005b0b943ca..5ca2e40ea01 100644
--- a/Userland/Services/ImageDecoder/ImageDecoderServer.ipc
+++ b/Userland/Services/ImageDecoder/ImageDecoderServer.ipc
@@ -1,3 +1,6 @@
+#include <LibCore/AnonymousBuffer.h>
+#include <LibGfx/ShareableBitmap.h>
+
 endpoint ImageDecoderServer
 {
     decode_image(Core::AnonymousBuffer data) => (bool is_animated, u32 loop_count, Vector<Gfx::ShareableBitmap> bitmaps, Vector<u32> durations)
diff --git a/Userland/Services/LaunchServer/LaunchClient.ipc b/Userland/Services/LaunchServer/LaunchClient.ipc
index 6bec1250471..8899709d896 100644
--- a/Userland/Services/LaunchServer/LaunchClient.ipc
+++ b/Userland/Services/LaunchServer/LaunchClient.ipc
@@ -1,3 +1,5 @@
+#include <AK/URL.h>
+
 endpoint LaunchClient
 {
 }
diff --git a/Userland/Services/LaunchServer/LaunchServer.ipc b/Userland/Services/LaunchServer/LaunchServer.ipc
index 9cafe225127..d296712be39 100644
--- a/Userland/Services/LaunchServer/LaunchServer.ipc
+++ b/Userland/Services/LaunchServer/LaunchServer.ipc
@@ -1,3 +1,5 @@
+#include <AK/URL.h>
+
 endpoint LaunchServer
 {
     open_url(URL url, String handler_name) => (bool response)
diff --git a/Userland/Services/NotificationServer/NotificationClient.ipc b/Userland/Services/NotificationServer/NotificationClient.ipc
index eff81745b62..2cb72f2b678 100644
--- a/Userland/Services/NotificationServer/NotificationClient.ipc
+++ b/Userland/Services/NotificationServer/NotificationClient.ipc
@@ -1,3 +1,5 @@
+#include <LibGfx/ShareableBitmap.h>
+
 endpoint NotificationClient
 {
 }
diff --git a/Userland/Services/NotificationServer/NotificationServer.ipc b/Userland/Services/NotificationServer/NotificationServer.ipc
index c51c894c604..7a6196dff9c 100644
--- a/Userland/Services/NotificationServer/NotificationServer.ipc
+++ b/Userland/Services/NotificationServer/NotificationServer.ipc
@@ -1,3 +1,5 @@
+#include <LibGfx/ShareableBitmap.h>
+
 endpoint NotificationServer
 {
     show_notification([UTF8] String text, [UTF8] String title, Gfx::ShareableBitmap icon) => ()
diff --git a/Userland/Services/RequestServer/RequestClient.ipc b/Userland/Services/RequestServer/RequestClient.ipc
index 01d712f5a2d..c6731d622ef 100644
--- a/Userland/Services/RequestServer/RequestClient.ipc
+++ b/Userland/Services/RequestServer/RequestClient.ipc
@@ -1,3 +1,5 @@
+#include <AK/URL.h>
+
 endpoint RequestClient
 {
     request_progress(i32 request_id, Optional<u32> total_size, u32 downloaded_size) =|
diff --git a/Userland/Services/RequestServer/RequestServer.ipc b/Userland/Services/RequestServer/RequestServer.ipc
index e88a4020230..cc4219418f8 100644
--- a/Userland/Services/RequestServer/RequestServer.ipc
+++ b/Userland/Services/RequestServer/RequestServer.ipc
@@ -1,3 +1,5 @@
+#include <AK/URL.h>
+
 endpoint RequestServer
 {
     // Test if a specific protocol is supported, e.g "http"
diff --git a/Userland/Services/WebContent/WebContentClient.ipc b/Userland/Services/WebContent/WebContentClient.ipc
index 16d8f111ee8..6369199dbab 100644
--- a/Userland/Services/WebContent/WebContentClient.ipc
+++ b/Userland/Services/WebContent/WebContentClient.ipc
@@ -1,3 +1,7 @@
+#include <AK/URL.h>
+#include <LibCore/AnonymousBuffer.h>
+#include <LibGfx/ShareableBitmap.h>
+
 endpoint WebContentClient
 {
     did_start_loading(URL url) =|
diff --git a/Userland/Services/WebContent/WebContentServer.ipc b/Userland/Services/WebContent/WebContentServer.ipc
index fc92a6ffaa6..92e80b676c9 100644
--- a/Userland/Services/WebContent/WebContentServer.ipc
+++ b/Userland/Services/WebContent/WebContentServer.ipc
@@ -1,3 +1,7 @@
+#include <AK/URL.h>
+#include <LibCore/AnonymousBuffer.h>
+#include <LibGfx/ShareableBitmap.h>
+
 endpoint WebContentServer
 {
     update_system_theme(Core::AnonymousBuffer theme_buffer) =|
diff --git a/Userland/Services/WebSocket/WebSocketClient.ipc b/Userland/Services/WebSocket/WebSocketClient.ipc
index ef8da187801..a7438d1e3f4 100644
--- a/Userland/Services/WebSocket/WebSocketClient.ipc
+++ b/Userland/Services/WebSocket/WebSocketClient.ipc
@@ -1,3 +1,5 @@
+#include <AK/URL.h>
+
 endpoint WebSocketClient
 {
     // Connection API
diff --git a/Userland/Services/WebSocket/WebSocketServer.ipc b/Userland/Services/WebSocket/WebSocketServer.ipc
index a77da4e85b1..a5f020fa483 100644
--- a/Userland/Services/WebSocket/WebSocketServer.ipc
+++ b/Userland/Services/WebSocket/WebSocketServer.ipc
@@ -1,3 +1,5 @@
+#include <AK/URL.h>
+
 endpoint WebSocketServer
 {
     // Connection API
diff --git a/Userland/Services/WindowServer/WindowClient.ipc b/Userland/Services/WindowServer/WindowClient.ipc
index a3219415f03..28fcee32624 100644
--- a/Userland/Services/WindowServer/WindowClient.ipc
+++ b/Userland/Services/WindowServer/WindowClient.ipc
@@ -1,3 +1,6 @@
+#include <LibCore/AnonymousBuffer.h>
+#include <LibGfx/ShareableBitmap.h>
+
 endpoint WindowClient
 {
     fast_greet(Vector<Gfx::IntRect> screen_rects, u32 main_screen_index, Core::AnonymousBuffer theme_buffer, String default_font_query, String fixed_width_font_query) =|
diff --git a/Userland/Services/WindowServer/WindowManagerClient.ipc b/Userland/Services/WindowServer/WindowManagerClient.ipc
index bd7317c6f11..220a2d6543a 100644
--- a/Userland/Services/WindowServer/WindowManagerClient.ipc
+++ b/Userland/Services/WindowServer/WindowManagerClient.ipc
@@ -1,3 +1,5 @@
+#include <LibGfx/ShareableBitmap.h>
+
 endpoint WindowManagerClient
 {
     window_removed(i32 wm_id, i32 client_id, i32 window_id) =|
diff --git a/Userland/Services/WindowServer/WindowManagerServer.ipc b/Userland/Services/WindowServer/WindowManagerServer.ipc
index b1a0140a607..d01dcb87363 100644
--- a/Userland/Services/WindowServer/WindowManagerServer.ipc
+++ b/Userland/Services/WindowServer/WindowManagerServer.ipc
@@ -1,3 +1,5 @@
+#include <LibGfx/ShareableBitmap.h>
+
 endpoint WindowManagerServer
 {
     set_event_mask(u32 event_mask) =|
diff --git a/Userland/Services/WindowServer/WindowServer.ipc b/Userland/Services/WindowServer/WindowServer.ipc
index 99ea7a6f4e3..d3d81b6ef93 100644
--- a/Userland/Services/WindowServer/WindowServer.ipc
+++ b/Userland/Services/WindowServer/WindowServer.ipc
@@ -1,3 +1,6 @@
+#include <LibCore/AnonymousBuffer.h>
+#include <LibGfx/ShareableBitmap.h>
+
 endpoint WindowServer
 {
     create_menubar(i32 menubar_id) =|