diff --git a/kernel/include/kernel/Device.h b/kernel/include/kernel/Device.h
index f6959e6140..ff6a37659c 100644
--- a/kernel/include/kernel/Device.h
+++ b/kernel/include/kernel/Device.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <kernel/FS/FileSystem.h>
 #include <kernel/FS/Inode.h>
 
 namespace Kernel
diff --git a/kernel/include/kernel/Thread.h b/kernel/include/kernel/Thread.h
index 5821fd4273..5e4139e3f6 100644
--- a/kernel/include/kernel/Thread.h
+++ b/kernel/include/kernel/Thread.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <BAN/Function.h>
+#include <BAN/Memory.h>
 #include <BAN/NoCopyMove.h>
 
 #include <sys/types.h>
diff --git a/kernel/kernel/FS/Ext2.cpp b/kernel/kernel/FS/Ext2.cpp
index c9bdc8cdb7..58bdd31e25 100644
--- a/kernel/kernel/FS/Ext2.cpp
+++ b/kernel/kernel/FS/Ext2.cpp
@@ -1,7 +1,6 @@
 #include <BAN/ScopeGuard.h>
 #include <BAN/StringView.h>
 #include <kernel/FS/Ext2.h>
-#include <kernel/Process.h>
 #include <kernel/RTC.h>
 
 #define EXT2_DEBUG_PRINT 0
diff --git a/kernel/kernel/FS/VirtualFileSystem.cpp b/kernel/kernel/FS/VirtualFileSystem.cpp
index 7549d17558..72f5fc680d 100644
--- a/kernel/kernel/FS/VirtualFileSystem.cpp
+++ b/kernel/kernel/FS/VirtualFileSystem.cpp
@@ -4,7 +4,6 @@
 #include <kernel/FS/Ext2.h>
 #include <kernel/FS/VirtualFileSystem.h>
 #include <kernel/LockGuard.h>
-#include <kernel/PCI.h>
 
 namespace Kernel
 {
diff --git a/kernel/kernel/Input/PS2Controller.cpp b/kernel/kernel/Input/PS2Controller.cpp
index a0460865ae..d63ae643e2 100644
--- a/kernel/kernel/Input/PS2Controller.cpp
+++ b/kernel/kernel/Input/PS2Controller.cpp
@@ -1,5 +1,4 @@
 #include <BAN/ScopeGuard.h>
-#include <BAN/Time.h>
 #include <kernel/ACPI.h>
 #include <kernel/DeviceManager.h>
 #include <kernel/IDT.h>
@@ -7,7 +6,6 @@
 #include <kernel/Input/PS2Keyboard.h>
 #include <kernel/InterruptController.h>
 #include <kernel/IO.h>
-#include <kernel/RTC.h>
 
 namespace Kernel::Input
 {
diff --git a/kernel/kernel/PIT.cpp b/kernel/kernel/PIT.cpp
index fce8c2b3e0..2dcab13c8c 100644
--- a/kernel/kernel/PIT.cpp
+++ b/kernel/kernel/PIT.cpp
@@ -1,7 +1,6 @@
 #include <kernel/IDT.h>
 #include <kernel/InterruptController.h>
 #include <kernel/IO.h>
-#include <kernel/kprint.h>
 #include <kernel/Scheduler.h>
 
 #define TIMER0_CTL			0x40
diff --git a/kernel/kernel/Semaphore.cpp b/kernel/kernel/Semaphore.cpp
index 30076a53e9..685436bbd7 100644
--- a/kernel/kernel/Semaphore.cpp
+++ b/kernel/kernel/Semaphore.cpp
@@ -1,4 +1,3 @@
-#include <kernel/LockGuard.h>
 #include <kernel/Scheduler.h>
 #include <kernel/Semaphore.h>