diff --git a/Kernel/FileSystem/Custody.cpp b/Kernel/FileSystem/Custody.cpp
index 77a2571788e165b7e0683519ab4ce83e56c1d7dc..36a7a25f844d45a622c6c0f5763c77422fd2426f 100644
--- a/Kernel/FileSystem/Custody.cpp
+++ b/Kernel/FileSystem/Custody.cpp
@@ -26,6 +26,7 @@
 
 #include <AK/HashTable.h>
 #include <AK/StringBuilder.h>
+#include <AK/Vector.h>
 #include <Kernel/FileSystem/Custody.h>
 #include <Kernel/FileSystem/Inode.h>
 #include <Kernel/Lock.h>
diff --git a/Kernel/FileSystem/Custody.h b/Kernel/FileSystem/Custody.h
index 407480d85c54cadc8501d51183caa9c5a882d138..9ba116079ce0233e1c7208ee0a53576d2899d8f8 100644
--- a/Kernel/FileSystem/Custody.h
+++ b/Kernel/FileSystem/Custody.h
@@ -26,17 +26,14 @@
 
 #pragma once
 
-#include <AK/Badge.h>
 #include <AK/InlineLinkedList.h>
 #include <AK/RefCounted.h>
 #include <AK/RefPtr.h>
 #include <AK/String.h>
+#include <Kernel/Forward.h>
 
 namespace Kernel {
 
-class Inode;
-class VFS;
-
 // FIXME: Custody needs some locking.
 
 class Custody : public RefCounted<Custody>
diff --git a/Kernel/Forward.h b/Kernel/Forward.h
index 22f9cc66c950204ec2b2317550f804c734d955a5..887dab651347444a01ca24b0471041212c101f9c 100644
--- a/Kernel/Forward.h
+++ b/Kernel/Forward.h
@@ -61,6 +61,7 @@ class TCPSocket;
 class TTY;
 class Thread;
 class UDPSocket;
+class VFS;
 class VMObject;
 class WaitQueue;
 
diff --git a/Kernel/Net/LocalSocket.h b/Kernel/Net/LocalSocket.h
index 0929b0d90f2f5e691f6a7943ccc3ddf7efa14845..20b8db640222574553fe3593691268fb3f0649cc 100644
--- a/Kernel/Net/LocalSocket.h
+++ b/Kernel/Net/LocalSocket.h
@@ -34,8 +34,10 @@ namespace Kernel {
 
 class FileDescription;
 
-class LocalSocket final : public Socket, public InlineLinkedListNode<LocalSocket> {
+class LocalSocket final : public Socket
+    , public InlineLinkedListNode<LocalSocket> {
     friend class InlineLinkedListNode<LocalSocket>;
+
 public:
     static KResultOr<NonnullRefPtr<Socket>> create(int type);
     virtual ~LocalSocket() override;
diff --git a/Kernel/Process.h b/Kernel/Process.h
index 5fad6ea8d071af48ec763acd43da2151919bed22..86bf48d8635a036f7c9dead344198093f9c02de5 100644
--- a/Kernel/Process.h
+++ b/Kernel/Process.h
@@ -30,9 +30,6 @@
 #include <AK/InlineLinkedList.h>
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/String.h>
-#include <AK/Types.h>
-#include <AK/Vector.h>
-#include <AK/WeakPtr.h>
 #include <AK/Weakable.h>
 #include <Kernel/FileSystem/InodeMetadata.h>
 #include <Kernel/Forward.h>
diff --git a/Kernel/VM/RangeAllocator.h b/Kernel/VM/RangeAllocator.h
index 68e9d57152e9da0f37bac21a55143f9e41169825..4e17819fd9b4e537e28e54716d88496d752bf874 100644
--- a/Kernel/VM/RangeAllocator.h
+++ b/Kernel/VM/RangeAllocator.h
@@ -72,8 +72,7 @@ public:
     Vector<Range, 2> carve(const Range&);
 
 private:
-    VirtualAddress m_base;
-    size_t m_size { 0 };
+    VirtualAddress m_base;    size_t m_size { 0 };
 };
 
 class RangeAllocator {