diff --git a/AK/FlyString.cpp b/AK/FlyString.cpp
index 13f08ddfc4..2f644de884 100644
--- a/AK/FlyString.cpp
+++ b/AK/FlyString.cpp
@@ -6,7 +6,7 @@
 
 #include <AK/DeprecatedFlyString.h>
 #include <AK/FlyString.h>
-#include <AK/HashMap.h>
+#include <AK/HashTable.h>
 #include <AK/Singleton.h>
 #include <AK/String.h>
 #include <AK/StringData.h>
diff --git a/Libraries/LibCore/EventReceiver.h b/Libraries/LibCore/EventReceiver.h
index 32b44c83e4..ac95020ac8 100644
--- a/Libraries/LibCore/EventReceiver.h
+++ b/Libraries/LibCore/EventReceiver.h
@@ -10,11 +10,11 @@
 #include <AK/ByteString.h>
 #include <AK/Forward.h>
 #include <AK/Function.h>
-#include <AK/HashMap.h>
 #include <AK/Noncopyable.h>
 #include <AK/OwnPtr.h>
 #include <AK/StringView.h>
 #include <AK/TypeCasts.h>
+#include <AK/Vector.h>
 #include <AK/Weakable.h>
 #include <LibCore/Forward.h>
 
diff --git a/Libraries/LibCore/FileWatcher.h b/Libraries/LibCore/FileWatcher.h
index ea05ad0b84..2df8203989 100644
--- a/Libraries/LibCore/FileWatcher.h
+++ b/Libraries/LibCore/FileWatcher.h
@@ -10,6 +10,7 @@
 #include <AK/ByteString.h>
 #include <AK/EnumBits.h>
 #include <AK/Function.h>
+#include <AK/HashMap.h>
 #include <AK/Noncopyable.h>
 #include <AK/NonnullRefPtr.h>
 #include <AK/RefCounted.h>
diff --git a/Libraries/LibGC/ConservativeVector.h b/Libraries/LibGC/ConservativeVector.h
index 150525a7ce..8277e6bcbc 100644
--- a/Libraries/LibGC/ConservativeVector.h
+++ b/Libraries/LibGC/ConservativeVector.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <AK/HashMap.h>
 #include <AK/IntrusiveList.h>
 #include <AK/Vector.h>
 #include <LibGC/Cell.h>
diff --git a/Libraries/LibJS/AST.cpp b/Libraries/LibJS/AST.cpp
index 6764b1ac87..d08433cc55 100644
--- a/Libraries/LibJS/AST.cpp
+++ b/Libraries/LibJS/AST.cpp
@@ -7,7 +7,6 @@
  */
 
 #include <AK/Demangle.h>
-#include <AK/HashMap.h>
 #include <AK/HashTable.h>
 #include <AK/QuickSort.h>
 #include <AK/ScopeGuard.h>
diff --git a/Libraries/LibJS/AST.h b/Libraries/LibJS/AST.h
index dec69d2ec5..cd3fe0b6c1 100644
--- a/Libraries/LibJS/AST.h
+++ b/Libraries/LibJS/AST.h
@@ -10,7 +10,6 @@
 
 #include <AK/ByteString.h>
 #include <AK/DeprecatedFlyString.h>
-#include <AK/HashMap.h>
 #include <AK/OwnPtr.h>
 #include <AK/RefPtr.h>
 #include <AK/Variant.h>
diff --git a/Libraries/LibJS/Runtime/MapIterator.h b/Libraries/LibJS/Runtime/MapIterator.h
index 224dec301f..e2d4f1fd31 100644
--- a/Libraries/LibJS/Runtime/MapIterator.h
+++ b/Libraries/LibJS/Runtime/MapIterator.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <AK/HashMap.h>
 #include <LibJS/Runtime/Map.h>
 #include <LibJS/Runtime/Object.h>
 
diff --git a/Libraries/LibJS/Runtime/MapPrototype.cpp b/Libraries/LibJS/Runtime/MapPrototype.cpp
index 048e891f7f..bddd63d01c 100644
--- a/Libraries/LibJS/Runtime/MapPrototype.cpp
+++ b/Libraries/LibJS/Runtime/MapPrototype.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <AK/HashMap.h>
 #include <AK/TypeCasts.h>
 #include <LibJS/Runtime/AbstractOperations.h>
 #include <LibJS/Runtime/KeyedCollections.h>
diff --git a/Libraries/LibJS/Runtime/Object.h b/Libraries/LibJS/Runtime/Object.h
index 606d86fb9e..e1032884c6 100644
--- a/Libraries/LibJS/Runtime/Object.h
+++ b/Libraries/LibJS/Runtime/Object.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <AK/Badge.h>
-#include <AK/HashMap.h>
 #include <AK/StringView.h>
 #include <LibGC/CellAllocator.h>
 #include <LibGC/MarkedVector.h>
diff --git a/Libraries/LibRegex/RegexMatch.h b/Libraries/LibRegex/RegexMatch.h
index bdeb3baaae..1593647fbe 100644
--- a/Libraries/LibRegex/RegexMatch.h
+++ b/Libraries/LibRegex/RegexMatch.h
@@ -13,7 +13,6 @@
 #include <AK/ByteString.h>
 #include <AK/COWVector.h>
 #include <AK/DeprecatedFlyString.h>
-#include <AK/HashMap.h>
 #include <AK/MemMem.h>
 #include <AK/RedBlackTree.h>
 #include <AK/StringBuilder.h>
diff --git a/Libraries/LibRegex/RegexParser.h b/Libraries/LibRegex/RegexParser.h
index d5634e8924..6ac48c0053 100644
--- a/Libraries/LibRegex/RegexParser.h
+++ b/Libraries/LibRegex/RegexParser.h
@@ -12,6 +12,7 @@
 #include "RegexOptions.h"
 
 #include <AK/Forward.h>
+#include <AK/HashMap.h>
 #include <AK/Types.h>
 #include <AK/Vector.h>
 #include <LibUnicode/Forward.h>
diff --git a/Libraries/LibUnicode/CurrencyCode.cpp b/Libraries/LibUnicode/CurrencyCode.cpp
index 1457f0594b..e6a1326318 100644
--- a/Libraries/LibUnicode/CurrencyCode.cpp
+++ b/Libraries/LibUnicode/CurrencyCode.cpp
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <AK/HashMap.h>
 #include <LibUnicode/CurrencyCode.h>
 
 namespace Unicode {
diff --git a/Libraries/LibUnicode/CurrencyCode.h b/Libraries/LibUnicode/CurrencyCode.h
index 11ca5f1c3d..c33d31e8e3 100644
--- a/Libraries/LibUnicode/CurrencyCode.h
+++ b/Libraries/LibUnicode/CurrencyCode.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <AK/HashMap.h>
 #include <AK/Optional.h>
 #include <AK/Span.h>
 #include <AK/StringView.h>
diff --git a/Libraries/LibWeb/Bindings/Intrinsics.cpp b/Libraries/LibWeb/Bindings/Intrinsics.cpp
index e077138ed5..de2585589d 100644
--- a/Libraries/LibWeb/Bindings/Intrinsics.cpp
+++ b/Libraries/LibWeb/Bindings/Intrinsics.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <AK/HashMap.h>
 #include <LibJS/Forward.h>
 #include <LibJS/Runtime/NativeFunction.h>
 #include <LibJS/Runtime/Object.h>
diff --git a/Libraries/LibWeb/Crypto/SubtleCrypto.h b/Libraries/LibWeb/Crypto/SubtleCrypto.h
index 6cc934a973..f8ca8e032e 100644
--- a/Libraries/LibWeb/Crypto/SubtleCrypto.h
+++ b/Libraries/LibWeb/Crypto/SubtleCrypto.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <AK/HashMap.h>
 #include <AK/String.h>
 #include <AK/Vector.h>
 #include <LibJS/Forward.h>
diff --git a/Libraries/LibWeb/HTML/BrowsingContextGroup.h b/Libraries/LibWeb/HTML/BrowsingContextGroup.h
index 1669518b03..583b024e7a 100644
--- a/Libraries/LibWeb/HTML/BrowsingContextGroup.h
+++ b/Libraries/LibWeb/HTML/BrowsingContextGroup.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <AK/HashMap.h>
 #include <AK/NonnullRefPtr.h>
 #include <AK/WeakPtr.h>
 #include <LibJS/Heap/Cell.h>
diff --git a/Libraries/LibWeb/IndexedDB/Internal/Database.h b/Libraries/LibWeb/IndexedDB/Internal/Database.h
index 4b2de0f8a3..8550eaa59a 100644
--- a/Libraries/LibWeb/IndexedDB/Internal/Database.h
+++ b/Libraries/LibWeb/IndexedDB/Internal/Database.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <AK/HashMap.h>
 #include <LibGC/Ptr.h>
 #include <LibWeb/DOM/EventTarget.h>
 #include <LibWeb/IndexedDB/IDBDatabase.h>
diff --git a/Libraries/LibWeb/Loader/Resource.h b/Libraries/LibWeb/Loader/Resource.h
index d06c06d951..bd475594c5 100644
--- a/Libraries/LibWeb/Loader/Resource.h
+++ b/Libraries/LibWeb/Loader/Resource.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <AK/ByteBuffer.h>
-#include <AK/HashMap.h>
 #include <AK/HashTable.h>
 #include <AK/Noncopyable.h>
 #include <AK/RefCounted.h>
diff --git a/Libraries/LibWeb/Worker/WebWorkerClient.h b/Libraries/LibWeb/Worker/WebWorkerClient.h
index e1f4df0f3c..6e40be7e18 100644
--- a/Libraries/LibWeb/Worker/WebWorkerClient.h
+++ b/Libraries/LibWeb/Worker/WebWorkerClient.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <AK/HashMap.h>
 #include <LibIPC/ConnectionToServer.h>
 #include <LibWeb/Worker/WebWorkerClientEndpoint.h>
 #include <LibWeb/Worker/WebWorkerServerEndpoint.h>
diff --git a/Libraries/LibWebView/EventLoop/EventLoopImplementationMacOS.mm b/Libraries/LibWebView/EventLoop/EventLoopImplementationMacOS.mm
index 4362367d27..8652d2c526 100644
--- a/Libraries/LibWebView/EventLoop/EventLoopImplementationMacOS.mm
+++ b/Libraries/LibWebView/EventLoop/EventLoopImplementationMacOS.mm
@@ -5,6 +5,7 @@
  */
 
 #include <AK/Assertions.h>
+#include <AK/HashMap.h>
 #include <AK/IDAllocator.h>
 #include <AK/Singleton.h>
 #include <AK/TemporaryChange.h>
diff --git a/Libraries/LibWebView/EventLoop/EventLoopImplementationQt.cpp b/Libraries/LibWebView/EventLoop/EventLoopImplementationQt.cpp
index 15d64919c1..18a7fb6bd7 100644
--- a/Libraries/LibWebView/EventLoop/EventLoopImplementationQt.cpp
+++ b/Libraries/LibWebView/EventLoop/EventLoopImplementationQt.cpp
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <AK/HashMap.h>
 #include <AK/IDAllocator.h>
 #include <AK/Singleton.h>
 #include <AK/TemporaryChange.h>
diff --git a/Libraries/LibXML/DOM/Node.cpp b/Libraries/LibXML/DOM/Node.cpp
index 0fb50ead62..088088fa3f 100644
--- a/Libraries/LibXML/DOM/Node.cpp
+++ b/Libraries/LibXML/DOM/Node.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <AK/HashMap.h>
 #include <AK/NonnullOwnPtr.h>
 #include <LibXML/DOM/Node.h>
 
diff --git a/Services/RequestServer/Request.h b/Services/RequestServer/Request.h
index a166dd608f..ade90b2626 100644
--- a/Services/RequestServer/Request.h
+++ b/Services/RequestServer/Request.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <AK/HashMap.h>
 #include <AK/NonnullOwnPtr.h>
 #include <AK/Optional.h>
 #include <AK/RefCounted.h>
diff --git a/Services/WebContent/WebDriverConnection.h b/Services/WebContent/WebDriverConnection.h
index a5d7380df4..c1789c222d 100644
--- a/Services/WebContent/WebDriverConnection.h
+++ b/Services/WebContent/WebDriverConnection.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include <AK/ByteString.h>
-#include <AK/HashMap.h>
 #include <AK/String.h>
 #include <LibGC/MarkedVector.h>
 #include <LibGfx/Rect.h>
diff --git a/Tests/AK/TestJSON.cpp b/Tests/AK/TestJSON.cpp
index 3178f2dd64..438f990167 100644
--- a/Tests/AK/TestJSON.cpp
+++ b/Tests/AK/TestJSON.cpp
@@ -7,7 +7,6 @@
 #include <LibTest/TestCase.h>
 
 #include <AK/ByteString.h>
-#include <AK/HashMap.h>
 #include <AK/JsonObject.h>
 #include <AK/JsonValue.h>
 #include <AK/StringBuilder.h>
diff --git a/UI/Qt/WebContentView.h b/UI/Qt/WebContentView.h
index 0d20a36883..377c32a0df 100644
--- a/UI/Qt/WebContentView.h
+++ b/UI/Qt/WebContentView.h
@@ -9,7 +9,6 @@
 
 #include <AK/ByteString.h>
 #include <AK/Function.h>
-#include <AK/HashMap.h>
 #include <AK/OwnPtr.h>
 #include <LibGfx/Forward.h>
 #include <LibGfx/Rect.h>