diff --git a/include/revng/ADT/STLExtras.h b/include/revng/ADT/STLExtras.h
index 67e91e9db..dc65c43d3 100644
--- a/include/revng/ADT/STLExtras.h
+++ b/include/revng/ADT/STLExtras.h
@@ -18,6 +18,7 @@
 
 #include "revng/ADT/CompilationTime.h"
 #include "revng/ADT/Concepts.h"
+#include "revng/Support/Assert.h"
 #include "revng/Support/Debug.h"
 
 //
diff --git a/include/revng/Model/Importer/TypeCopier.h b/include/revng/Model/Importer/TypeCopier.h
index 162beab82..4b903c3b3 100644
--- a/include/revng/Model/Importer/TypeCopier.h
+++ b/include/revng/Model/Importer/TypeCopier.h
@@ -4,6 +4,7 @@
 // This file is distributed under the MIT License. See LICENSE.md for details.
 //
 
+#include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/DepthFirstIterator.h"
 
 #include "revng/ADT/GenericGraph.h"
diff --git a/include/revng/Model/LoadModelPass.h b/include/revng/Model/LoadModelPass.h
index ed4ded382..5baa73258 100644
--- a/include/revng/Model/LoadModelPass.h
+++ b/include/revng/Model/LoadModelPass.h
@@ -8,6 +8,7 @@
 
 #include "llvm/IR/PassManager.h"
 #include "llvm/Pass.h"
+#include "llvm/Support/CommandLine.h"
 
 #include "revng/Model/Binary.h"
 #include "revng/TupleTree/TupleTree.h"
diff --git a/include/revng/Model/TypeSystemPrinter.h b/include/revng/Model/TypeSystemPrinter.h
index 520875c3c..50ac8ee6d 100644
--- a/include/revng/Model/TypeSystemPrinter.h
+++ b/include/revng/Model/TypeSystemPrinter.h
@@ -4,6 +4,8 @@
 // This file is distributed under the MIT License. See LICENSE.md for details.
 //
 
+#include "llvm/ADT/SmallPtrSet.h"
+
 #include "revng/Model/QualifiedType.h"
 #include "revng/Model/Segment.h"
 
diff --git a/include/revng/Pipeline/RegisterAnalysis.h b/include/revng/Pipeline/RegisterAnalysis.h
index e7a4e02e2..96e9b2d16 100644
--- a/include/revng/Pipeline/RegisterAnalysis.h
+++ b/include/revng/Pipeline/RegisterAnalysis.h
@@ -7,6 +7,7 @@
 #include "revng/Pipeline/Analysis.h"
 #include "revng/Pipeline/Loader.h"
 #include "revng/Pipeline/Registry.h"
+#include "revng/Support/CommandLine.h"
 
 namespace pipeline {
 
diff --git a/include/revng/RegisterUsageAnalyses/Function.h b/include/revng/RegisterUsageAnalyses/Function.h
index a2c6332a2..cb843f7e3 100644
--- a/include/revng/RegisterUsageAnalyses/Function.h
+++ b/include/revng/RegisterUsageAnalyses/Function.h
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DenseMapInfo.h"
 #include "llvm/ADT/PostOrderIterator.h"
 #include "llvm/ADT/SmallVector.h"
diff --git a/include/revng/Support/DynamicHierarchy.h b/include/revng/Support/DynamicHierarchy.h
index 273fbdaa7..d548ff8de 100644
--- a/include/revng/Support/DynamicHierarchy.h
+++ b/include/revng/Support/DynamicHierarchy.h
@@ -12,6 +12,7 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
 
+#include "revng/Support/Assert.h"
 #include "revng/Support/Debug.h"
 
 /// A dynamic hierarchy is a tree that can be extended by downstream
diff --git a/include/revng/Support/IRHelpers.h b/include/revng/Support/IRHelpers.h
index eb8648f8f..ed66e0460 100644
--- a/include/revng/Support/IRHelpers.h
+++ b/include/revng/Support/IRHelpers.h
@@ -22,6 +22,7 @@
 #include "llvm/IR/Metadata.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/ValueMap.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/raw_ostream.h"
 
 #include "revng/ADT/Concepts.h"
diff --git a/include/revng/Support/Statistics.h b/include/revng/Support/Statistics.h
index 33195a360..f8c62dc1d 100644
--- a/include/revng/Support/Statistics.h
+++ b/include/revng/Support/Statistics.h
@@ -8,6 +8,8 @@
 #include <string>
 #include <vector>
 
+#include "llvm/Support/CommandLine.h"
+
 #include "revng/Support/Debug.h"
 #include "revng/Support/OnQuit.h"
 
diff --git a/lib/Lift/Lift.cpp b/lib/Lift/Lift.cpp
index 4878da9da..5e230c57c 100644
--- a/lib/Lift/Lift.cpp
+++ b/lib/Lift/Lift.cpp
@@ -5,6 +5,7 @@
 //
 
 #include "revng/Lift/Lift.h"
+#include "revng/Support/CommandLine.h"
 #include "revng/Support/ResourceFinder.h"
 
 #include "CodeGenerator.h"
diff --git a/lib/Model/Binary.cpp b/lib/Model/Binary.cpp
index c6b22f0ed..443bd92f0 100644
--- a/lib/Model/Binary.cpp
+++ b/lib/Model/Binary.cpp
@@ -18,8 +18,10 @@
 
 #include "revng/ADT/GenericGraph.h"
 #include "revng/Model/Binary.h"
+#include "revng/Model/Qualifier.h"
 #include "revng/Model/TypeSystemPrinter.h"
 #include "revng/Model/VerifyHelper.h"
+#include "revng/Support/CommandLine.h"
 #include "revng/Support/OverflowSafeInt.h"
 #include "revng/Support/YAMLTraits.h"
 #include "revng/TupleTree/Tracking.h"
diff --git a/lib/Model/Importer/DebugInfo/PDBImporter.cpp b/lib/Model/Importer/DebugInfo/PDBImporter.cpp
index 1eb936688..82d299133 100644
--- a/lib/Model/Importer/DebugInfo/PDBImporter.cpp
+++ b/lib/Model/Importer/DebugInfo/PDBImporter.cpp
@@ -35,6 +35,7 @@
 #include "revng/Model/QualifiedType.h"
 #include "revng/Model/Type.h"
 #include "revng/Support/Assert.h"
+#include "revng/Support/CommandLine.h"
 #include "revng/Support/Debug.h"
 #include "revng/Support/MetaAddress.h"
 #include "revng/Support/ProgramRunner.h"
diff --git a/lib/Storage/S3StorageClient.h b/lib/Storage/S3StorageClient.h
index 98071ccd0..310c1f760 100644
--- a/lib/Storage/S3StorageClient.h
+++ b/lib/Storage/S3StorageClient.h
@@ -7,6 +7,7 @@
 #include "aws/core/auth/AWSCredentials.h"
 #include "aws/s3/S3Client.h"
 
+#include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 
 #include "revng/Storage/StorageClient.h"
diff --git a/lib/Support/Assert.cpp b/lib/Support/Assert.cpp
index f1fa4a249..879b69abd 100644
--- a/lib/Support/Assert.cpp
+++ b/lib/Support/Assert.cpp
@@ -8,6 +8,7 @@
 #include <cassert>
 #include <iostream>
 
+#include "llvm/Support/Error.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/raw_os_ostream.h"
 
diff --git a/lib/Support/Debug.cpp b/lib/Support/Debug.cpp
index 258bcbbc6..b0d9a9949 100644
--- a/lib/Support/Debug.cpp
+++ b/lib/Support/Debug.cpp
@@ -12,7 +12,10 @@
 
 #include "llvm/ADT/Twine.h"
 #include "llvm/IR/Value.h"
+#include "llvm/Support/ManagedStatic.h"
 
+#include "revng/Support/Assert.h"
+#include "revng/Support/CommandLine.h"
 #include "revng/Support/Debug.h"
 
 namespace cl = llvm::cl;
diff --git a/lib/Support/PathList.cpp b/lib/Support/PathList.cpp
index ba44bf841..d37633f01 100644
--- a/lib/Support/PathList.cpp
+++ b/lib/Support/PathList.cpp
@@ -13,6 +13,7 @@ extern "C" {
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/GlobPattern.h"
+#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
 
diff --git a/lib/Support/Progress.cpp b/lib/Support/Progress.cpp
index ae9f6cac1..34964d51d 100644
--- a/lib/Support/Progress.cpp
+++ b/lib/Support/Progress.cpp
@@ -13,10 +13,12 @@ extern "C" {
 
 #include <chrono>
 
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Mutex.h"
 #include "llvm/Support/Progress.h"
 #include "llvm/Support/Signals.h"
 
+#include "revng/Support/Assert.h"
 #include "revng/Support/Debug.h"
 
 static void destroyTraceProgressListener(void *OpaqueListener);
diff --git a/lib/TypeShrinking/TypeShrinking.cpp b/lib/TypeShrinking/TypeShrinking.cpp
index 7191caedb..9d6fd0fe2 100644
--- a/lib/TypeShrinking/TypeShrinking.cpp
+++ b/lib/TypeShrinking/TypeShrinking.cpp
@@ -22,6 +22,7 @@
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/CommandLine.h"
 
+#include "revng/Support/CommandLine.h"
 #include "revng/Support/IRHelpers.h"
 #include "revng/TypeShrinking/BitLiveness.h"
 #include "revng/TypeShrinking/DataFlowGraph.h"
diff --git a/lib/UnitTestHelpers/DotGraphObject.cpp b/lib/UnitTestHelpers/DotGraphObject.cpp
index ce584e5d5..bec93d4ee 100644
--- a/lib/UnitTestHelpers/DotGraphObject.cpp
+++ b/lib/UnitTestHelpers/DotGraphObject.cpp
@@ -10,6 +10,7 @@
 
 #include "llvm/Support/raw_ostream.h"
 
+#include "revng/Support/Assert.h"
 #include "revng/Support/Debug.h"
 #include "revng/UnitTestHelpers/DotGraphObject.h"
 
diff --git a/scripts/tuple_tree_generator/tuple_tree_generator/templates/struct_late.h.tpl b/scripts/tuple_tree_generator/tuple_tree_generator/templates/struct_late.h.tpl
index e747605e7..2253ac48f 100644
--- a/scripts/tuple_tree_generator/tuple_tree_generator/templates/struct_late.h.tpl
+++ b/scripts/tuple_tree_generator/tuple_tree_generator/templates/struct_late.h.tpl
@@ -20,6 +20,8 @@ The notice below applies to the generated files.
 #include "revng/ADT/UpcastablePointer/YAMLTraits.h"
 #include "revng/TupleTree/TupleLikeTraits.h"
 #include "revng/TupleTree/TupleTree.h"
+#include "revng/TupleTree/Visits.h"
+#include "revng/TupleTree/Tracking.h"
 
 using namespace std::string_view_literals;