tests: Implement IWYU suggestions

16 files changed, 124 insertions, 31 deletions

diff --git a/test/buildtool/build_engine/base_maps/TARGETS b/test/buildtool/build_engine/base_maps/TARGETS
index e243290c..2bd0882a 100644
--- a/test/buildtool/build_engine/base_maps/TARGETS
+++ b/test/buildtool/build_engine/base_maps/TARGETS
@@ -3,7 +3,7 @@
   , "name": ["test_repo"]
   , "hdrs": ["test_repo.hpp"]
   , "deps":
-    [ ["@", "src", "src/buildtool/common", "config"]
+    [ ["@", "fmt", "", "fmt"]
     , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["utils", "shell_quoting"]
     ]
@@ -15,7 +15,7 @@
   , "srcs": ["entity_name.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name"]
+    , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"]
     , ["", "catch-main"]
     ]
   , "stage": ["test", "buildtool", "build_engine", "base_maps"]
@@ -46,6 +46,7 @@
     [ "test_repo"
     , ["@", "catch2", "", "catch2"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "json_file_map"]
+    , ["@", "src", "src/buildtool/build_engine/base_maps", "module_name"]
     , ["@", "src", "src/buildtool/common", "config"]
     , ["@", "src", "src/buildtool/file_system", "file_root"]
     , ["@", "src", "src/buildtool/multithreading", "task_system"]
@@ -63,14 +64,13 @@
     , ["@", "catch2", "", "catch2"]
     , ["@", "json", "", "json"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "directory_map"]
-    , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "source_map"]
     , ["@", "src", "src/buildtool/common", "config"]
     , ["@", "src", "src/buildtool/common", "protocol_traits"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/file_system", "file_root"]
-    , ["@", "src", "src/buildtool/multithreading", "async_map_consumer"]
+    , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["@", "src", "src/buildtool/multithreading", "task_system"]
     , ["", "catch-main"]
     , ["utils", "test_hash_function_type"]
@@ -85,9 +85,9 @@
   , "private-deps":
     [ "test_repo"
     , ["@", "catch2", "", "catch2"]
+    , ["@", "json", "", "json"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "expression_map"]
-    , ["@", "src", "src/buildtool/build_engine/base_maps", "json_file_map"]
     , ["@", "src", "src/buildtool/build_engine/expression", "expression"]
     , ["@", "src", "src/buildtool/common", "config"]
     , ["@", "src", "src/buildtool/file_system", "file_root"]
@@ -104,9 +104,9 @@
   , "private-deps":
     [ "test_repo"
     , ["@", "catch2", "", "catch2"]
+    , ["@", "json", "", "json"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "expression_map"]
-    , ["@", "src", "src/buildtool/build_engine/base_maps", "json_file_map"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "rule_map"]
     , ["@", "src", "src/buildtool/build_engine/expression", "expression"]
     , ["@", "src", "src/buildtool/common", "config"]
diff --git a/test/buildtool/build_engine/base_maps/directory_map.test.cpp b/test/buildtool/build_engine/base_maps/directory_map.test.cpp
index b59c4ff0..8129fe37 100644
--- a/test/buildtool/build_engine/base_maps/directory_map.test.cpp
+++ b/test/buildtool/build_engine/base_maps/directory_map.test.cpp
@@ -15,9 +15,11 @@
 #include "src/buildtool/build_engine/base_maps/directory_map.hpp"
 
 #include <filesystem>
-#include <memory>
+#include <map>
+#include <optional>
 #include <string>
 #include <utility>  // std::move
+#include <vector>
 
 #include "catch2/catch_test_macros.hpp"
 #include "src/buildtool/build_engine/base_maps/module_name.hpp"
diff --git a/test/buildtool/build_engine/base_maps/entity_name.test.cpp b/test/buildtool/build_engine/base_maps/entity_name.test.cpp
index be88f017..aee7e899 100644
--- a/test/buildtool/build_engine/base_maps/entity_name.test.cpp
+++ b/test/buildtool/build_engine/base_maps/entity_name.test.cpp
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/buildtool/build_engine/base_maps/entity_name.hpp"
+#include <string>
 
 #include "catch2/catch_test_macros.hpp"
+#include "src/buildtool/build_engine/base_maps/entity_name_data.hpp"
 
 TEST_CASE("Normal module names") {
     using NT = BuildMaps::Base::NamedTarget;
diff --git a/test/buildtool/build_engine/base_maps/expression_map.test.cpp b/test/buildtool/build_engine/base_maps/expression_map.test.cpp
index 04d5b86e..57a87db4 100644
--- a/test/buildtool/build_engine/base_maps/expression_map.test.cpp
+++ b/test/buildtool/build_engine/base_maps/expression_map.test.cpp
@@ -15,14 +15,16 @@
 #include "src/buildtool/build_engine/base_maps/expression_map.hpp"
 
 #include <filesystem>
-#include <functional>
-#include <memory>
+#include <map>
+#include <optional>
 #include <string>
 #include <utility>  // std::move
+#include <vector>
 
 #include "catch2/catch_test_macros.hpp"
+#include "nlohmann/json.hpp"
 #include "src/buildtool/build_engine/base_maps/entity_name_data.hpp"
-#include "src/buildtool/build_engine/base_maps/json_file_map.hpp"
+#include "src/buildtool/build_engine/expression/configuration.hpp"
 #include "src/buildtool/build_engine/expression/expression.hpp"
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/file_system/file_root.hpp"
diff --git a/test/buildtool/build_engine/base_maps/json_file_map.test.cpp b/test/buildtool/build_engine/base_maps/json_file_map.test.cpp
index 4a951012..2917476b 100644
--- a/test/buildtool/build_engine/base_maps/json_file_map.test.cpp
+++ b/test/buildtool/build_engine/base_maps/json_file_map.test.cpp
@@ -14,12 +14,15 @@
 
 #include "src/buildtool/build_engine/base_maps/json_file_map.hpp"
 
+#include <atomic>
 #include <filesystem>
-#include <memory>
+#include <map>
+#include <optional>
 #include <string>
 #include <utility>
 
 #include "catch2/catch_test_macros.hpp"
+#include "src/buildtool/build_engine/base_maps/module_name.hpp"
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/file_system/file_root.hpp"
 #include "src/buildtool/multithreading/task_system.hpp"
diff --git a/test/buildtool/build_engine/base_maps/rule_map.test.cpp b/test/buildtool/build_engine/base_maps/rule_map.test.cpp
index 87a76c2b..6a247cca 100644
--- a/test/buildtool/build_engine/base_maps/rule_map.test.cpp
+++ b/test/buildtool/build_engine/base_maps/rule_map.test.cpp
@@ -15,15 +15,16 @@
 #include "src/buildtool/build_engine/base_maps/rule_map.hpp"
 
 #include <filesystem>
-#include <functional>
-#include <memory>
+#include <map>
+#include <optional>
 #include <string>
 #include <utility>  // std::move
+#include <vector>
 
 #include "catch2/catch_test_macros.hpp"
+#include "nlohmann/json.hpp"
 #include "src/buildtool/build_engine/base_maps/entity_name_data.hpp"
 #include "src/buildtool/build_engine/base_maps/expression_map.hpp"
-#include "src/buildtool/build_engine/base_maps/json_file_map.hpp"
 #include "src/buildtool/build_engine/expression/configuration.hpp"
 #include "src/buildtool/build_engine/expression/expression.hpp"
 #include "src/buildtool/common/repository_config.hpp"
diff --git a/test/buildtool/build_engine/base_maps/source_map.test.cpp b/test/buildtool/build_engine/base_maps/source_map.test.cpp
index ab5323e4..7903412e 100644
--- a/test/buildtool/build_engine/base_maps/source_map.test.cpp
+++ b/test/buildtool/build_engine/base_maps/source_map.test.cpp
@@ -15,21 +15,22 @@
 #include "src/buildtool/build_engine/base_maps/source_map.hpp"
 
 #include <filesystem>
-#include <memory>
+#include <functional>
+#include <map>
 #include <optional>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "catch2/catch_test_macros.hpp"
 #include "nlohmann/json.hpp"
 #include "src/buildtool/build_engine/base_maps/directory_map.hpp"
-#include "src/buildtool/build_engine/base_maps/entity_name.hpp"
 #include "src/buildtool/build_engine/base_maps/entity_name_data.hpp"
 #include "src/buildtool/common/protocol_traits.hpp"
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/crypto/hash_function.hpp"
 #include "src/buildtool/file_system/file_root.hpp"
-#include "src/buildtool/multithreading/async_map_consumer.hpp"
+#include "src/buildtool/file_system/file_system_manager.hpp"
 #include "src/buildtool/multithreading/task_system.hpp"
 #include "test/buildtool/build_engine/base_maps/test_repo.hpp"
 #include "test/utils/hermeticity/test_hash_function_type.hpp"
diff --git a/test/buildtool/build_engine/base_maps/test_repo.hpp b/test/buildtool/build_engine/base_maps/test_repo.hpp
index 08acbdab..c4490925 100644
--- a/test/buildtool/build_engine/base_maps/test_repo.hpp
+++ b/test/buildtool/build_engine/base_maps/test_repo.hpp
@@ -21,7 +21,7 @@
 #include <optional>
 #include <string>
 
-#include "src/buildtool/common/repository_config.hpp"
+#include "fmt/core.h"
 #include "src/buildtool/file_system/file_system_manager.hpp"
 #include "test/utils/shell_quoting.hpp"
 
diff --git a/test/buildtool/build_engine/expression/TARGETS b/test/buildtool/build_engine/expression/TARGETS
index 1b994a02..8ae22d12 100644
--- a/test/buildtool/build_engine/expression/TARGETS
+++ b/test/buildtool/build_engine/expression/TARGETS
@@ -6,7 +6,6 @@
     [ ["@", "catch2", "", "catch2"]
     , ["@", "src", "src/buildtool/build_engine/expression", "linked_map"]
     , ["", "catch-main"]
-    , ["utils", "container_matchers"]
     ]
   , "stage": ["test", "buildtool", "build_engine", "expression"]
   }
@@ -16,16 +15,17 @@
   , "srcs": ["expression.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "json", "", "json"]
     , ["@", "src", "src/buildtool/build_engine/expression", "expression"]
     , [ "@"
       , "src"
       , "src/buildtool/build_engine/expression"
       , "expression_ptr_interface"
       ]
+    , ["@", "src", "src/buildtool/build_engine/expression", "linked_map"]
     , ["@", "src", "src/buildtool/common", "artifact_description"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["", "catch-main"]
-    , ["utils", "container_matchers"]
     ]
   , "stage": ["test", "buildtool", "build_engine", "expression"]
   }
@@ -35,9 +35,14 @@
   , "srcs": ["configuration.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "json", "", "json"]
     , ["@", "src", "src/buildtool/build_engine/expression", "expression"]
+    , [ "@"
+      , "src"
+      , "src/buildtool/build_engine/expression"
+      , "expression_ptr_interface"
+      ]
     , ["", "catch-main"]
-    , ["utils", "container_matchers"]
     ]
   , "stage": ["test", "buildtool", "build_engine", "expression"]
   }
diff --git a/test/buildtool/build_engine/expression/configuration.test.cpp b/test/buildtool/build_engine/expression/configuration.test.cpp
index 0a902c73..28d157e7 100644
--- a/test/buildtool/build_engine/expression/configuration.test.cpp
+++ b/test/buildtool/build_engine/expression/configuration.test.cpp
@@ -15,11 +15,13 @@
 #include "src/buildtool/build_engine/expression/configuration.hpp"
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "catch2/catch_test_macros.hpp"
+#include "nlohmann/json.hpp"
 #include "src/buildtool/build_engine/expression/expression.hpp"
-#include "test/utils/container_matchers.hpp"
+#include "src/buildtool/build_engine/expression/expression_ptr.hpp"
 
 TEST_CASE("Access", "[configuration]") {
     auto env =
diff --git a/test/buildtool/build_engine/expression/expression.test.cpp b/test/buildtool/build_engine/expression/expression.test.cpp
index 3a34702d..7276f0a4 100644
--- a/test/buildtool/build_engine/expression/expression.test.cpp
+++ b/test/buildtool/build_engine/expression/expression.test.cpp
@@ -15,16 +15,20 @@
 #include "src/buildtool/build_engine/expression/expression.hpp"
 
 #include <filesystem>
+#include <functional>
 #include <sstream>
 #include <string>
 #include <vector>
 
 #include "catch2/catch_test_macros.hpp"
 #include "catch2/matchers/catch_matchers_all.hpp"
+#include "nlohmann/json.hpp"
 #include "src/buildtool/build_engine/expression/configuration.hpp"
+#include "src/buildtool/build_engine/expression/expression_ptr.hpp"
 #include "src/buildtool/build_engine/expression/function_map.hpp"
+#include "src/buildtool/build_engine/expression/linked_map.hpp"
+#include "src/buildtool/build_engine/expression/target_result.hpp"
 #include "src/buildtool/common/artifact_description.hpp"
-#include "test/utils/container_matchers.hpp"
 
 TEST_CASE("Expression access", "[expression]") {  // NOLINT
     using namespace std::string_literals;
diff --git a/test/buildtool/build_engine/expression/linked_map.test.cpp b/test/buildtool/build_engine/expression/linked_map.test.cpp
index 1a8ceff5..8adf6dc1 100644
--- a/test/buildtool/build_engine/expression/linked_map.test.cpp
+++ b/test/buildtool/build_engine/expression/linked_map.test.cpp
@@ -16,12 +16,14 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <functional>
+#include <iterator>
 #include <memory>
 #include <string>
 #include <utility>  // std::move
+#include <vector>
 
 #include "catch2/catch_test_macros.hpp"
-#include "test/utils/container_matchers.hpp"
 
 TEST_CASE("Empty map", "[linked_map]") {
     using map_t = LinkedMap<std::string, int>;
diff --git a/test/buildtool/build_engine/target_map/TARGETS b/test/buildtool/build_engine/target_map/TARGETS
index f2d50fce..61e16910 100644
--- a/test/buildtool/build_engine/target_map/TARGETS
+++ b/test/buildtool/build_engine/target_map/TARGETS
@@ -5,11 +5,23 @@
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
     , ["@", "json", "", "json"]
+    , [ "@"
+      , "src"
+      , "src/buildtool/build_engine/analysed_target"
+      , "graph_information"
+      ]
     , ["@", "src", "src/buildtool/build_engine/analysed_target", "target"]
+    , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"]
     , ["@", "src", "src/buildtool/build_engine/expression", "expression"]
+    , [ "@"
+      , "src"
+      , "src/buildtool/build_engine/expression"
+      , "expression_ptr_interface"
+      ]
     , ["@", "src", "src/buildtool/build_engine/target_map", "result_map"]
     , ["@", "src", "src/buildtool/common", "action_description"]
     , ["@", "src", "src/buildtool/common", "common"]
+    , ["@", "src", "src/buildtool/common", "tree"]
     , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["@", "src", "src/buildtool/progress_reporting", "progress"]
     , ["", "catch-main"]
@@ -23,17 +35,39 @@
   , "data": ["test_data"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "gsl", "", "gsl"]
+    , ["@", "json", "", "json"]
     , ["@", "src", "src/buildtool/auth", "auth"]
+    , ["@", "src", "src/buildtool/build_engine/analysed_target", "target"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "directory_map"]
-    , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name"]
+    , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "expression_map"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "rule_map"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "source_map"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "targets_file_map"]
     , ["@", "src", "src/buildtool/build_engine/expression", "expression"]
+    , [ "@"
+      , "src"
+      , "src/buildtool/build_engine/expression"
+      , "expression_ptr_interface"
+      ]
+    , [ "@"
+      , "src"
+      , "src/buildtool/build_engine/target_map"
+      , "absent_target_map"
+      ]
+    , [ "@"
+      , "src"
+      , "src/buildtool/build_engine/target_map"
+      , "configured_target"
+      ]
+    , ["@", "src", "src/buildtool/build_engine/target_map", "result_map"]
     , ["@", "src", "src/buildtool/build_engine/target_map", "target_map"]
+    , ["@", "src", "src/buildtool/common", "action_description"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "config"]
+    , ["@", "src", "src/buildtool/common", "tree"]
+    , ["@", "src", "src/buildtool/common/remote", "remote_common"]
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/execution_api/common", "api_bundle"]
@@ -42,11 +76,10 @@
     , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     , ["@", "src", "src/buildtool/execution_api/remote", "context"]
     , ["@", "src", "src/buildtool/file_system", "file_root"]
+    , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["@", "src", "src/buildtool/main", "analyse_context"]
-    , ["@", "src", "src/buildtool/multithreading", "async_map_consumer"]
     , ["@", "src", "src/buildtool/multithreading", "task_system"]
     , ["@", "src", "src/buildtool/progress_reporting", "progress"]
-    , ["@", "src", "src/buildtool/serve_api/remote", "config"]
     , ["@", "src", "src/buildtool/serve_api/remote", "serve_api"]
     , ["@", "src", "src/buildtool/storage", "config"]
     , ["@", "src", "src/buildtool/storage", "storage"]
@@ -62,9 +95,15 @@
   , "srcs": ["target_map_internals.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "json", "", "json"]
     , ["@", "src", "src/buildtool/build_engine/expression", "expression"]
     , [ "@"
       , "src"
+      , "src/buildtool/build_engine/expression"
+      , "expression_ptr_interface"
+      ]
+    , [ "@"
+      , "src"
       , "src/buildtool/build_engine/target_map"
       , "target_map_testable_internals"
       ]
diff --git a/test/buildtool/build_engine/target_map/result_map.test.cpp b/test/buildtool/build_engine/target_map/result_map.test.cpp
index c781d83c..e326c725 100644
--- a/test/buildtool/build_engine/target_map/result_map.test.cpp
+++ b/test/buildtool/build_engine/target_map/result_map.test.cpp
@@ -17,16 +17,26 @@
 #include <cstdlib>
 #include <filesystem>
 #include <fstream>
+#include <functional>
+#include <map>
 #include <memory>
+#include <set>
 #include <string>
+#include <unordered_set>
 #include <vector>
 
 #include "catch2/catch_test_macros.hpp"
 #include "nlohmann/json.hpp"
 #include "src/buildtool/build_engine/analysed_target/analysed_target.hpp"
+#include "src/buildtool/build_engine/analysed_target/target_graph_information.hpp"
+#include "src/buildtool/build_engine/base_maps/entity_name_data.hpp"
+#include "src/buildtool/build_engine/expression/configuration.hpp"
+#include "src/buildtool/build_engine/expression/expression_ptr.hpp"
 #include "src/buildtool/build_engine/expression/target_result.hpp"
+#include "src/buildtool/common/action.hpp"
 #include "src/buildtool/common/action_description.hpp"
 #include "src/buildtool/common/statistics.hpp"
+#include "src/buildtool/common/tree.hpp"
 #include "src/buildtool/file_system/file_system_manager.hpp"
 #include "src/buildtool/progress_reporting/progress.hpp"
 
diff --git a/test/buildtool/build_engine/target_map/target_map.test.cpp b/test/buildtool/build_engine/target_map/target_map.test.cpp
index 9f66fd92..f4e88c44 100644
--- a/test/buildtool/build_engine/target_map/target_map.test.cpp
+++ b/test/buildtool/build_engine/target_map/target_map.test.cpp
@@ -15,21 +15,38 @@
 #include "src/buildtool/build_engine/target_map/target_map.hpp"
 
 #include <filesystem>
+#include <iterator>
+#include <map>
+#include <memory>
+#include <optional>
 #include <string>
 #include <utility>  // std::move
+#include <variant>
+#include <vector>
 
 #include "catch2/catch_test_macros.hpp"
+#include "gsl/gsl"
+#include "nlohmann/json.hpp"
 #include "src/buildtool/auth/authentication.hpp"
+#include "src/buildtool/build_engine/analysed_target/analysed_target.hpp"
 #include "src/buildtool/build_engine/base_maps/directory_map.hpp"
-#include "src/buildtool/build_engine/base_maps/entity_name.hpp"
+#include "src/buildtool/build_engine/base_maps/entity_name_data.hpp"
 #include "src/buildtool/build_engine/base_maps/expression_map.hpp"
 #include "src/buildtool/build_engine/base_maps/rule_map.hpp"
 #include "src/buildtool/build_engine/base_maps/source_map.hpp"
 #include "src/buildtool/build_engine/base_maps/targets_file_map.hpp"
+#include "src/buildtool/build_engine/expression/configuration.hpp"
 #include "src/buildtool/build_engine/expression/expression.hpp"
+#include "src/buildtool/build_engine/expression/expression_ptr.hpp"
+#include "src/buildtool/build_engine/target_map/absent_target_map.hpp"
+#include "src/buildtool/build_engine/target_map/configured_target.hpp"
+#include "src/buildtool/build_engine/target_map/result_map.hpp"
+#include "src/buildtool/common/action_description.hpp"
+#include "src/buildtool/common/remote/remote_common.hpp"
 #include "src/buildtool/common/remote/retry_config.hpp"
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/common/statistics.hpp"
+#include "src/buildtool/common/tree.hpp"
 #include "src/buildtool/crypto/hash_function.hpp"
 #include "src/buildtool/execution_api/common/api_bundle.hpp"
 #include "src/buildtool/execution_api/local/config.hpp"
@@ -37,11 +54,10 @@
 #include "src/buildtool/execution_api/remote/config.hpp"
 #include "src/buildtool/execution_api/remote/context.hpp"
 #include "src/buildtool/file_system/file_root.hpp"
+#include "src/buildtool/file_system/file_system_manager.hpp"
 #include "src/buildtool/main/analyse_context.hpp"
-#include "src/buildtool/multithreading/async_map_consumer.hpp"
 #include "src/buildtool/multithreading/task_system.hpp"
 #include "src/buildtool/progress_reporting/progress.hpp"
-#include "src/buildtool/serve_api/remote/config.hpp"
 #include "src/buildtool/serve_api/remote/serve_api.hpp"
 #include "src/buildtool/storage/config.hpp"
 #include "src/buildtool/storage/storage.hpp"
diff --git a/test/buildtool/build_engine/target_map/target_map_internals.test.cpp b/test/buildtool/build_engine/target_map/target_map_internals.test.cpp
index 7db66c7c..b4e626f7 100644
--- a/test/buildtool/build_engine/target_map/target_map_internals.test.cpp
+++ b/test/buildtool/build_engine/target_map/target_map_internals.test.cpp
@@ -12,8 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <optional>
+#include <string>
+
 #include "catch2/catch_test_macros.hpp"
+#include "nlohmann/json.hpp"
 #include "src/buildtool/build_engine/expression/expression.hpp"
+#include "src/buildtool/build_engine/expression/expression_ptr.hpp"
 #include "src/buildtool/build_engine/target_map/utils.hpp"
 
 TEST_CASE("Tree conflicts", "[tree_conflict]") {