diff --git a/Libraries/LibCrypto/ASN1/ASN1.h b/Libraries/LibCrypto/ASN1/ASN1.h
index dea932271a9..1acf82c5509 100644
--- a/Libraries/LibCrypto/ASN1/ASN1.h
+++ b/Libraries/LibCrypto/ASN1/ASN1.h
@@ -8,7 +8,6 @@
 
 #include <AK/Time.h>
 #include <AK/Types.h>
-#include <LibCrypto/BigInt/UnsignedBigInteger.h>
 
 namespace Crypto::ASN1 {
 
diff --git a/Libraries/LibCrypto/ASN1/DER.h b/Libraries/LibCrypto/ASN1/DER.h
index b9a09d7b0b3..6bcc4a132b8 100644
--- a/Libraries/LibCrypto/ASN1/DER.h
+++ b/Libraries/LibCrypto/ASN1/DER.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <AK/BitmapView.h>
-#include <AK/Result.h>
 #include <AK/Types.h>
 #include <LibCrypto/ASN1/ASN1.h>
 #include <LibCrypto/BigInt/UnsignedBigInteger.h>
diff --git a/Libraries/LibCrypto/ASN1/PEM.h b/Libraries/LibCrypto/ASN1/PEM.h
index 15a1914852c..c34a081c402 100644
--- a/Libraries/LibCrypto/ASN1/PEM.h
+++ b/Libraries/LibCrypto/ASN1/PEM.h
@@ -6,9 +6,8 @@
 
 #pragma once
 
+#include <AK/ByteBuffer.h>
 #include <AK/Span.h>
-#include <LibCrypto/ASN1/ASN1.h>
-#include <LibCrypto/ASN1/DER.h>
 
 namespace Crypto {
 
diff --git a/Libraries/LibCrypto/Authentication/GHash.h b/Libraries/LibCrypto/Authentication/GHash.h
index 2839d3300c5..c2c4d8795c1 100644
--- a/Libraries/LibCrypto/Authentication/GHash.h
+++ b/Libraries/LibCrypto/Authentication/GHash.h
@@ -10,7 +10,6 @@
 #include <AK/ByteString.h>
 #include <AK/Endian.h>
 #include <AK/Types.h>
-#include <LibCrypto/Hash/HashFunction.h>
 
 namespace Crypto::Authentication {
 
diff --git a/Libraries/LibCrypto/BigInt/Algorithms/BitwiseOperations.cpp b/Libraries/LibCrypto/BigInt/Algorithms/BitwiseOperations.cpp
index fd4376a8d32..980596181ca 100644
--- a/Libraries/LibCrypto/BigInt/Algorithms/BitwiseOperations.cpp
+++ b/Libraries/LibCrypto/BigInt/Algorithms/BitwiseOperations.cpp
@@ -6,9 +6,8 @@
  */
 
 #include "UnsignedBigIntegerAlgorithms.h"
-#include <AK/BigIntBase.h>
-#include <AK/BuiltinWrappers.h>
 #include <AK/NumericLimits.h>
+#include <LibCrypto/BigInt/UnsignedBigInteger.h>
 
 namespace Crypto {
 
diff --git a/Libraries/LibCrypto/BigInt/Algorithms/Division.cpp b/Libraries/LibCrypto/BigInt/Algorithms/Division.cpp
index 5cc6149bb52..cbdb1c6f47a 100644
--- a/Libraries/LibCrypto/BigInt/Algorithms/Division.cpp
+++ b/Libraries/LibCrypto/BigInt/Algorithms/Division.cpp
@@ -7,7 +7,6 @@
 
 #include "UnsignedBigIntegerAlgorithms.h"
 #include <AK/BigIntBase.h>
-#include <AK/BuiltinWrappers.h>
 
 namespace Crypto {
 
diff --git a/Libraries/LibCrypto/BigInt/SignedBigInteger.h b/Libraries/LibCrypto/BigInt/SignedBigInteger.h
index 725e4f8bdf2..1a61e310994 100644
--- a/Libraries/LibCrypto/BigInt/SignedBigInteger.h
+++ b/Libraries/LibCrypto/BigInt/SignedBigInteger.h
@@ -9,7 +9,6 @@
 
 #include <AK/Concepts.h>
 #include <AK/Span.h>
-#include <AK/String.h>
 #include <LibCrypto/BigInt/UnsignedBigInteger.h>
 
 namespace Crypto {
diff --git a/Libraries/LibCrypto/BigInt/UnsignedBigInteger.h b/Libraries/LibCrypto/BigInt/UnsignedBigInteger.h
index adac4695c2b..c133e37ca99 100644
--- a/Libraries/LibCrypto/BigInt/UnsignedBigInteger.h
+++ b/Libraries/LibCrypto/BigInt/UnsignedBigInteger.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include <AK/BigIntBase.h>
-#include <AK/ByteBuffer.h>
 #include <AK/ByteString.h>
 #include <AK/Concepts.h>
 #include <AK/Span.h>
diff --git a/Libraries/LibCrypto/Checksum/CRC32.cpp b/Libraries/LibCrypto/Checksum/CRC32.cpp
index 6427ae08e45..87699a3a81d 100644
--- a/Libraries/LibCrypto/Checksum/CRC32.cpp
+++ b/Libraries/LibCrypto/Checksum/CRC32.cpp
@@ -5,7 +5,6 @@
  */
 
 #include <AK/Array.h>
-#include <AK/NumericLimits.h>
 #include <AK/Span.h>
 #include <AK/Types.h>
 #include <LibCrypto/Checksum/CRC32.h>
diff --git a/Libraries/LibCrypto/Cipher/AES.h b/Libraries/LibCrypto/Cipher/AES.h
index 2672579669a..eb0dcec2ae2 100644
--- a/Libraries/LibCrypto/Cipher/AES.h
+++ b/Libraries/LibCrypto/Cipher/AES.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <AK/ByteString.h>
-#include <AK/Vector.h>
 #include <LibCrypto/Cipher/Cipher.h>
 #include <LibCrypto/Cipher/Mode/CBC.h>
 #include <LibCrypto/Cipher/Mode/CTR.h>
diff --git a/Libraries/LibCrypto/Cipher/ChaCha20.h b/Libraries/LibCrypto/Cipher/ChaCha20.h
index 333bb6d6b2e..71ddb2c79f9 100644
--- a/Libraries/LibCrypto/Cipher/ChaCha20.h
+++ b/Libraries/LibCrypto/Cipher/ChaCha20.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <AK/ByteBuffer.h>
+#include <AK/Span.h>
 
 namespace Crypto::Cipher {
 
diff --git a/Libraries/LibCrypto/Cipher/Cipher.h b/Libraries/LibCrypto/Cipher/Cipher.h
index 10f5b63876c..e83846ff426 100644
--- a/Libraries/LibCrypto/Cipher/Cipher.h
+++ b/Libraries/LibCrypto/Cipher/Cipher.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <AK/Optional.h>
 #include <AK/Span.h>
 #include <AK/Types.h>
 
diff --git a/Libraries/LibCrypto/Curves/Curve25519.h b/Libraries/LibCrypto/Curves/Curve25519.h
index eb4d32e0de8..b0ab7a9e86e 100644
--- a/Libraries/LibCrypto/Curves/Curve25519.h
+++ b/Libraries/LibCrypto/Curves/Curve25519.h
@@ -6,8 +6,6 @@
 
 #pragma once
 
-#include <AK/Random.h>
-
 namespace Crypto::Curves {
 
 class Curve25519 {
diff --git a/Libraries/LibCrypto/Curves/Ed25519.h b/Libraries/LibCrypto/Curves/Ed25519.h
index 81b1a42b59c..e7f5b21a6cc 100644
--- a/Libraries/LibCrypto/Curves/Ed25519.h
+++ b/Libraries/LibCrypto/Curves/Ed25519.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <AK/ByteBuffer.h>
-#include <LibCrypto/Curves/EllipticCurve.h>
 
 namespace Crypto::Curves {
 
diff --git a/Libraries/LibCrypto/Curves/X25519.cpp b/Libraries/LibCrypto/Curves/X25519.cpp
index 61b4533490e..bf028bf99f5 100644
--- a/Libraries/LibCrypto/Curves/X25519.cpp
+++ b/Libraries/LibCrypto/Curves/X25519.cpp
@@ -5,7 +5,6 @@
  */
 
 #include <AK/ByteReader.h>
-#include <AK/Endian.h>
 #include <AK/Random.h>
 #include <LibCrypto/Curves/Curve25519.h>
 #include <LibCrypto/Curves/X25519.h>
diff --git a/Libraries/LibCrypto/NumberTheory/ModularFunctions.cpp b/Libraries/LibCrypto/NumberTheory/ModularFunctions.cpp
index cd933bb57c8..6f466d396ad 100644
--- a/Libraries/LibCrypto/NumberTheory/ModularFunctions.cpp
+++ b/Libraries/LibCrypto/NumberTheory/ModularFunctions.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <AK/Debug.h>
+#include <AK/Random.h>
 #include <LibCrypto/BigInt/Algorithms/UnsignedBigIntegerAlgorithms.h>
 #include <LibCrypto/NumberTheory/ModularFunctions.h>
 
diff --git a/Libraries/LibCrypto/NumberTheory/ModularFunctions.h b/Libraries/LibCrypto/NumberTheory/ModularFunctions.h
index 6a00e8a32d9..3204fe0fbf7 100644
--- a/Libraries/LibCrypto/NumberTheory/ModularFunctions.h
+++ b/Libraries/LibCrypto/NumberTheory/ModularFunctions.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <AK/Random.h>
 #include <LibCrypto/BigInt/UnsignedBigInteger.h>
 
 namespace Crypto::NumberTheory {
diff --git a/Libraries/LibTLS/Record.cpp b/Libraries/LibTLS/Record.cpp
index 8041f3df1f2..ad800b1d0bc 100644
--- a/Libraries/LibTLS/Record.cpp
+++ b/Libraries/LibTLS/Record.cpp
@@ -7,6 +7,7 @@
 #include <AK/Debug.h>
 #include <AK/Endian.h>
 #include <AK/MemoryStream.h>
+#include <AK/Random.h>
 #include <LibCore/EventLoop.h>
 #include <LibCore/Timer.h>
 #include <LibTLS/TLSv12.h>
diff --git a/Meta/Lagom/Fuzzers/FuzzPEM.cpp b/Meta/Lagom/Fuzzers/FuzzPEM.cpp
index 0fb4dd3ed8e..14c6010ac40 100644
--- a/Meta/Lagom/Fuzzers/FuzzPEM.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzPEM.cpp
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <AK/Format.h>
 #include <LibCrypto/ASN1/PEM.h>
 #include <stddef.h>
 #include <stdint.h>