diff --git a/AK/ByteString.h b/AK/ByteString.h
index 5f82c294a6..66f4e9c487 100644
--- a/AK/ByteString.h
+++ b/AK/ByteString.h
@@ -9,7 +9,7 @@
 #include <AK/ByteStringImpl.h>
 #include <AK/Format.h>
 #include <AK/Forward.h>
-#include <AK/RefPtr.h>
+#include <AK/NonnullRefPtr.h>
 #include <AK/StringBuilder.h>
 #include <AK/StringUtils.h>
 #include <AK/Traits.h>
diff --git a/AK/Utf16StringData.cpp b/AK/Utf16StringData.cpp
index c51a111d62..8a1b711429 100644
--- a/AK/Utf16StringData.cpp
+++ b/AK/Utf16StringData.cpp
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <AK/RefPtr.h>
 #include <AK/Stream.h>
 #include <AK/TypedTransfer.h>
 #include <AK/Utf16StringData.h>
diff --git a/Libraries/LibJS/SourceRange.h b/Libraries/LibJS/SourceRange.h
index 05017b8e3a..fb8846e66c 100644
--- a/Libraries/LibJS/SourceRange.h
+++ b/Libraries/LibJS/SourceRange.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <AK/NonnullRefPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/StringView.h>
 #include <AK/Types.h>
 #include <LibJS/Export.h>
diff --git a/Libraries/LibMedia/IncrementallyPopulatedStream.h b/Libraries/LibMedia/IncrementallyPopulatedStream.h
index f1b7aa361a..74a2c9c23b 100644
--- a/Libraries/LibMedia/IncrementallyPopulatedStream.h
+++ b/Libraries/LibMedia/IncrementallyPopulatedStream.h
@@ -11,6 +11,7 @@
 #include <AK/Forward.h>
 #include <AK/Function.h>
 #include <AK/RedBlackTree.h>
+#include <AK/RefPtr.h>
 #include <AK/Time.h>
 #include <AK/Vector.h>
 #include <LibCore/Forward.h>
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/IDLGenerators.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/IDLGenerators.cpp
index 682c86e71f..5f10242f69 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/IDLGenerators.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/IDLGenerators.cpp
@@ -17,6 +17,7 @@
 #include <AK/NumericLimits.h>
 #include <AK/Queue.h>
 #include <AK/QuickSort.h>
+#include <AK/RefPtr.h>
 #include <LibIDL/ExposedTo.h>
 #include <LibIDL/Types.h>
 
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateNamedCharacterReferences.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateNamedCharacterReferences.cpp
index d6b882ee15..0d8c65385e 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateNamedCharacterReferences.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateNamedCharacterReferences.cpp
@@ -8,6 +8,7 @@
 #include <AK/Array.h>
 #include <AK/CharacterTypes.h>
 #include <AK/FixedArray.h>
+#include <AK/RefPtr.h>
 #include <AK/SourceGenerator.h>
 #include <AK/StringBuilder.h>
 #include <LibCore/ArgsParser.h>
diff --git a/Tests/AK/TestIntrusiveRedBlackTree.cpp b/Tests/AK/TestIntrusiveRedBlackTree.cpp
index 1f91dbfa1f..a8f12b7804 100644
--- a/Tests/AK/TestIntrusiveRedBlackTree.cpp
+++ b/Tests/AK/TestIntrusiveRedBlackTree.cpp
@@ -9,6 +9,7 @@
 #include <AK/IntrusiveRedBlackTree.h>
 #include <AK/NonnullOwnPtr.h>
 #include <AK/Random.h>
+#include <AK/RefPtr.h>
 #include <AK/Vector.h>
 
 class IntrusiveTest {
diff --git a/Tests/AK/TestNonnullRefPtr.cpp b/Tests/AK/TestNonnullRefPtr.cpp
index 8991802592..d091d7bc20 100644
--- a/Tests/AK/TestNonnullRefPtr.cpp
+++ b/Tests/AK/TestNonnullRefPtr.cpp
@@ -9,6 +9,7 @@
 #include <AK/ByteString.h>
 #include <AK/NonnullRefPtr.h>
 #include <AK/OwnPtr.h>
+#include <AK/RefPtr.h>
 
 struct Object : public RefCounted<Object> {
     int x;
diff --git a/Tests/AK/TestRefPtr.cpp b/Tests/AK/TestRefPtr.cpp
index 36a38981a3..05a79d9ee3 100644
--- a/Tests/AK/TestRefPtr.cpp
+++ b/Tests/AK/TestRefPtr.cpp
@@ -8,6 +8,7 @@
 
 #include <AK/ByteString.h>
 #include <AK/NonnullRefPtr.h>
+#include <AK/RefPtr.h>
 
 struct Object : public RefCounted<Object> {
     int x;