diff --git a/Userland/DevTools/HackStudio/FindInFilesWidget.h b/Userland/DevTools/HackStudio/FindInFilesWidget.h
index 759d116374..a18d011314 100644
--- a/Userland/DevTools/HackStudio/FindInFilesWidget.h
+++ b/Userland/DevTools/HackStudio/FindInFilesWidget.h
@@ -27,6 +27,7 @@
 #pragma once
 
 #include <LibGUI/Button.h>
+#include <LibGUI/TableView.h>
 #include <LibGUI/TextBox.h>
 #include <LibGUI/Widget.h>
 
diff --git a/Userland/Services/WindowServer/Button.h b/Userland/Services/WindowServer/Button.h
index 7a2d6b82e9..e6c0433025 100644
--- a/Userland/Services/WindowServer/Button.h
+++ b/Userland/Services/WindowServer/Button.h
@@ -28,6 +28,7 @@
 
 #include <AK/Function.h>
 #include <AK/Weakable.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Forward.h>
 #include <LibGfx/Rect.h>
 
diff --git a/Userland/Services/WindowServer/ClientConnection.h b/Userland/Services/WindowServer/ClientConnection.h
index e4048cba7c..d988c340ae 100644
--- a/Userland/Services/WindowServer/ClientConnection.h
+++ b/Userland/Services/WindowServer/ClientConnection.h
@@ -35,6 +35,7 @@
 #include <LibGfx/Bitmap.h>
 #include <LibIPC/ClientConnection.h>
 #include <WindowServer/Event.h>
+#include <WindowServer/Menu.h>
 #include <WindowServer/WindowClientEndpoint.h>
 #include <WindowServer/WindowServerEndpoint.h>
 
diff --git a/Userland/Services/WindowServer/Window.h b/Userland/Services/WindowServer/Window.h
index ed7f4ca946..3e8e2b18b3 100644
--- a/Userland/Services/WindowServer/Window.h
+++ b/Userland/Services/WindowServer/Window.h
@@ -33,6 +33,7 @@
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/DisjointRectSet.h>
 #include <LibGfx/Rect.h>
+#include <WindowServer/Cursor.h>
 #include <WindowServer/WindowFrame.h>
 #include <WindowServer/WindowType.h>