diff --git a/AK/Forward.h b/AK/Forward.h
index 9dc5762ffef..ae6758b41b3 100644
--- a/AK/Forward.h
+++ b/AK/Forward.h
@@ -29,8 +29,8 @@
 namespace AK {
 
 class Bitmap;
-class ByteBuffer;
 class BufferStream;
+class ByteBuffer;
 class DebugLogStream;
 class IPv4Address;
 class JsonArray;
@@ -45,6 +45,9 @@ class StringView;
 class URL;
 class Utf8View;
 
+template<typename T>
+class Atomic;
+
 template<typename T>
 class SinglyLinkedList;
 
@@ -57,6 +60,15 @@ class InlineLinkedList;
 template<typename T, int capacity>
 class CircularQueue;
 
+template<typename T>
+struct Traits;
+
+template<typename T, typename = Traits<T>>
+class HashTable;
+
+template<typename K, typename V, typename = Traits<K>>
+class HashMap;
+
 template<typename T>
 class Badge;
 
@@ -92,6 +104,7 @@ class Vector;
 
 }
 
+using AK::Atomic;
 using AK::Badge;
 using AK::Bitmap;
 using AK::BufferStream;
@@ -101,8 +114,10 @@ using AK::DebugLogStream;
 using AK::DoublyLinkedList;
 using AK::FixedArray;
 using AK::Function;
-using AK::InlineLinkedList;
+using AK::HashMap;
+using AK::HashTable;
 using AK::IPv4Address;
+using AK::InlineLinkedList;
 using AK::JsonArray;
 using AK::JsonObject;
 using AK::JsonValue;
@@ -118,6 +133,7 @@ using AK::String;
 using AK::StringBuilder;
 using AK::StringImpl;
 using AK::StringView;
+using AK::Traits;
 using AK::URL;
 using AK::Utf8View;
 using AK::Vector;
diff --git a/AK/HashMap.h b/AK/HashMap.h
index 6c5487026a1..d521667e4b8 100644
--- a/AK/HashMap.h
+++ b/AK/HashMap.h
@@ -33,7 +33,7 @@
 
 namespace AK {
 
-template<typename K, typename V, typename KeyTraits = Traits<K>>
+template<typename K, typename V, typename KeyTraits>
 class HashMap {
 private:
     struct Entry {
diff --git a/AK/HashTable.h b/AK/HashTable.h
index 43956b6232a..c3eae131aaf 100644
--- a/AK/HashTable.h
+++ b/AK/HashTable.h
@@ -34,7 +34,7 @@
 
 namespace AK {
 
-template<typename T, typename = Traits<T>>
+template<typename T, typename>
 class HashTable;
 
 template<typename HashTableType, typename ElementType, typename BucketIteratorType>
diff --git a/AK/Traits.h b/AK/Traits.h
index ff6921150df..9d04f1d367b 100644
--- a/AK/Traits.h
+++ b/AK/Traits.h
@@ -26,6 +26,7 @@
 
 #pragma once
 
+#include <AK/Forward.h>
 #include <AK/HashFunctions.h>
 
 namespace AK {
@@ -82,3 +83,6 @@ struct Traits<T*> : public GenericTraits<T*> {
 };
 
 }
+
+using AK::GenericTraits;
+using AK::Traits;