diff --git a/Kernel/Arch/x86/common/Processor.cpp b/Kernel/Arch/x86/common/Processor.cpp
index fb97ab0d65b..569dbdd97c7 100644
--- a/Kernel/Arch/x86/common/Processor.cpp
+++ b/Kernel/Arch/x86/common/Processor.cpp
@@ -24,6 +24,10 @@
 #include <Kernel/Arch/x86/SafeMem.h>
 #include <Kernel/Arch/x86/ScopedCritical.h>
 #include <Kernel/Arch/x86/TrapFrame.h>
+#include <Kernel/Arch/x86/InterruptDisabler.h>
+
+#include <Kernel/Memory/ScopedAddressSpaceSwitcher.h>
+#include <Kernel/Memory/PageDirectory.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Arch/x86/common/TrapFrame.cpp b/Kernel/Arch/x86/common/TrapFrame.cpp
index a5e4468d34d..b591c2513fd 100644
--- a/Kernel/Arch/x86/common/TrapFrame.cpp
+++ b/Kernel/Arch/x86/common/TrapFrame.cpp
@@ -5,6 +5,8 @@
  */
 
 #include <Kernel/Arch/x86/TrapFrame.h>
+#include <Kernel/Arch/x86/InterruptDisabler.h>
+#include <Kernel/Arch/x86/Processor.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Bus/PCI/Access.cpp b/Kernel/Bus/PCI/Access.cpp
index 1278984f6fa..83d438e7727 100644
--- a/Kernel/Bus/PCI/Access.cpp
+++ b/Kernel/Bus/PCI/Access.cpp
@@ -14,6 +14,7 @@
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/Region.h>
 #include <Kernel/Sections.h>
+#include <Kernel/Arch/x86/InterruptDisabler.h>
 
 namespace Kernel::PCI {
 
diff --git a/Kernel/Bus/USB/USBHub.cpp b/Kernel/Bus/USB/USBHub.cpp
index a6c958363d5..335e582f9b4 100644
--- a/Kernel/Bus/USB/USBHub.cpp
+++ b/Kernel/Bus/USB/USBHub.cpp
@@ -10,6 +10,7 @@
 #include <Kernel/Bus/USB/USBHub.h>
 #include <Kernel/Bus/USB/USBRequest.h>
 #include <Kernel/StdLib.h>
+#include <Kernel/Arch/x86/IO.h>
 
 namespace Kernel::USB {
 
diff --git a/Kernel/FileSystem/InodeMetadata.h b/Kernel/FileSystem/InodeMetadata.h
index 03020413d77..407d941a831 100644
--- a/Kernel/FileSystem/InodeMetadata.h
+++ b/Kernel/FileSystem/InodeMetadata.h
@@ -10,6 +10,7 @@
 #include <Kernel/API/KResult.h>
 #include <Kernel/FileSystem/InodeIdentifier.h>
 #include <Kernel/UnixTypes.h>
+#include <Kernel/Forward.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Thread.cpp b/Kernel/Thread.cpp
index aa9d1162893..0a4adbe1b0f 100644
--- a/Kernel/Thread.cpp
+++ b/Kernel/Thread.cpp
@@ -8,6 +8,7 @@
 #include <AK/Singleton.h>
 #include <AK/StringBuilder.h>
 #include <AK/Time.h>
+#include <Kernel/Arch/x86/InterruptDisabler.h>
 #include <Kernel/Arch/x86/SmapDisabler.h>
 #include <Kernel/Arch/x86/TrapFrame.h>
 #include <Kernel/Debug.h>