diff --git a/Kernel/Arch/x86_64/ISABus/I8042Controller.cpp b/Kernel/Arch/x86_64/ISABus/I8042Controller.cpp
index 57f7a86798..648d60291c 100644
--- a/Kernel/Arch/x86_64/ISABus/I8042Controller.cpp
+++ b/Kernel/Arch/x86_64/ISABus/I8042Controller.cpp
@@ -10,6 +10,9 @@
 #include <Kernel/Arch/x86_64/ISABus/HID/PS2MouseDevice.h>
 #include <Kernel/Arch/x86_64/ISABus/HID/VMWareMouseDevice.h>
 #include <Kernel/Arch/x86_64/ISABus/I8042Controller.h>
+#include <Kernel/Devices/HID/KeyboardDevice.h>
+#include <Kernel/Devices/HID/MouseDevice.h>
+#include <Kernel/Devices/HID/ScanCodeEvent.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Arch/x86_64/ISABus/I8042Controller.h b/Kernel/Arch/x86_64/ISABus/I8042Controller.h
index f663a43c53..07905947e8 100644
--- a/Kernel/Arch/x86_64/ISABus/I8042Controller.h
+++ b/Kernel/Arch/x86_64/ISABus/I8042Controller.h
@@ -6,11 +6,10 @@
 
 #pragma once
 
-#include <AK/AtomicRefCounted.h>
+#include <AK/Types.h>
 #include <Kernel/Devices/HID/Controller.h>
 #include <Kernel/Devices/HID/KeyboardDevice.h>
 #include <Kernel/Devices/HID/MouseDevice.h>
-#include <Kernel/Devices/HID/ScanCodeEvent.h>
 #include <Kernel/Locking/Spinlock.h>
 
 namespace Kernel {
diff --git a/Kernel/Devices/HID/Management.cpp b/Kernel/Devices/HID/Management.cpp
index 9c7be9ca5d..df75a90d2c 100644
--- a/Kernel/Devices/HID/Management.cpp
+++ b/Kernel/Devices/HID/Management.cpp
@@ -10,6 +10,7 @@
 #    include <Kernel/Arch/x86_64/ISABus/I8042Controller.h>
 #endif
 #include <Kernel/CommandLine.h>
+#include <Kernel/Devices/HID/Device.h>
 #include <Kernel/Devices/HID/Management.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/Devices/HID/Management.h b/Kernel/Devices/HID/Management.h
index d55eb0d724..0dae995cd1 100644
--- a/Kernel/Devices/HID/Management.h
+++ b/Kernel/Devices/HID/Management.h
@@ -9,13 +9,12 @@
 #include <AK/Atomic.h>
 #include <AK/CircularQueue.h>
 #include <AK/Error.h>
+#include <AK/IntrusiveList.h>
+#include <AK/NonnullRefPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/API/KeyCode.h>
-#include <Kernel/API/MousePacket.h>
 #include <Kernel/Devices/HID/Controller.h>
-#include <Kernel/Devices/HID/Device.h>
-#include <Kernel/Forward.h>
-#include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Locking/SpinlockProtected.h>
 #include <Kernel/UnixTypes.h>
@@ -25,8 +24,6 @@ namespace Kernel {
 
 extern Atomic<bool> g_caps_lock_remapped_to_ctrl;
 
-class HIDDevice;
-class I8042Controller;
 class MouseDevice;
 class KeyboardDevice;
 class KeyboardClient;