summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/buildtool/build_engine/analysed_target/analysed_target.hpp1
-rw-r--r--src/buildtool/build_engine/analysed_target/target_graph_information.hpp1
-rw-r--r--src/buildtool/build_engine/base_maps/directory_map.hpp1
-rw-r--r--src/buildtool/build_engine/base_maps/entity_name.hpp1
-rw-r--r--src/buildtool/build_engine/base_maps/entity_name_data.hpp1
-rw-r--r--src/buildtool/build_engine/base_maps/expression_function.hpp1
-rw-r--r--src/buildtool/build_engine/base_maps/expression_map.cpp1
-rw-r--r--src/buildtool/build_engine/base_maps/expression_map.hpp1
-rw-r--r--src/buildtool/build_engine/base_maps/field_reader.hpp3
-rw-r--r--src/buildtool/build_engine/base_maps/json_file_map.hpp2
-rw-r--r--src/buildtool/build_engine/base_maps/module_name.hpp4
-rw-r--r--src/buildtool/build_engine/base_maps/rule_map.cpp1
-rw-r--r--src/buildtool/build_engine/base_maps/rule_map.hpp1
-rw-r--r--src/buildtool/build_engine/base_maps/source_map.cpp1
-rw-r--r--src/buildtool/build_engine/base_maps/source_map.hpp1
-rw-r--r--src/buildtool/build_engine/base_maps/user_rule.hpp2
-rw-r--r--src/buildtool/build_engine/expression/configuration.hpp2
-rw-r--r--src/buildtool/build_engine/expression/evaluator.cpp1
-rw-r--r--src/buildtool/build_engine/expression/evaluator.hpp1
-rw-r--r--src/buildtool/build_engine/expression/expression.cpp1
-rw-r--r--src/buildtool/build_engine/expression/expression.hpp2
-rw-r--r--src/buildtool/build_engine/expression/expression_ptr.cpp7
-rw-r--r--src/buildtool/build_engine/expression/expression_ptr.hpp6
-rw-r--r--src/buildtool/build_engine/expression/linked_map.hpp2
-rw-r--r--src/buildtool/build_engine/expression/target_node.hpp1
-rw-r--r--src/buildtool/build_engine/expression/target_result.cpp1
-rw-r--r--src/buildtool/build_engine/expression/target_result.hpp2
-rw-r--r--src/buildtool/build_engine/target_map/absent_target_map.cpp3
-rw-r--r--src/buildtool/build_engine/target_map/absent_target_map.hpp1
-rw-r--r--src/buildtool/build_engine/target_map/built_in_rules.cpp1
-rw-r--r--src/buildtool/build_engine/target_map/configured_target.hpp1
-rw-r--r--src/buildtool/build_engine/target_map/export.cpp1
-rw-r--r--src/buildtool/build_engine/target_map/result_map.hpp2
-rw-r--r--src/buildtool/build_engine/target_map/target_map.cpp2
-rw-r--r--src/buildtool/build_engine/target_map/target_map.hpp1
-rw-r--r--src/buildtool/build_engine/target_map/utils.cpp2
-rw-r--r--src/buildtool/common/action_description.hpp1
-rw-r--r--src/buildtool/common/artifact.hpp1
-rw-r--r--src/buildtool/common/artifact_description.hpp2
-rw-r--r--src/buildtool/common/artifact_digest.hpp2
-rw-r--r--src/buildtool/common/artifact_factory.hpp1
-rw-r--r--src/buildtool/common/bazel_types.hpp1
-rw-r--r--src/buildtool/common/cli.hpp1
-rw-r--r--src/buildtool/common/remote/retry.hpp1
-rw-r--r--src/buildtool/common/repository_config.hpp1
-rw-r--r--src/buildtool/compatibility/native_support.hpp1
-rw-r--r--src/buildtool/crypto/hash_function.cpp1
-rw-r--r--src/buildtool/crypto/hash_impl_sha1.cpp1
-rw-r--r--src/buildtool/crypto/hash_impl_sha256.cpp1
-rw-r--r--src/buildtool/crypto/hash_impl_sha512.cpp1
-rw-r--r--src/buildtool/crypto/hasher.hpp2
-rw-r--r--src/buildtool/execution_api/bazel_msg/bazel_blob.hpp1
-rw-r--r--src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp1
-rw-r--r--src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp1
-rw-r--r--src/buildtool/execution_api/common/execution_api.hpp1
-rw-r--r--src/buildtool/execution_api/common/execution_common.hpp1
-rw-r--r--src/buildtool/execution_api/execution_service/bytestream_server.cpp1
-rw-r--r--src/buildtool/execution_api/execution_service/capabilities_server.cpp2
-rw-r--r--src/buildtool/execution_api/execution_service/cas_server.cpp2
-rw-r--r--src/buildtool/execution_api/execution_service/file_chunker.hpp1
-rw-r--r--src/buildtool/execution_api/execution_service/operation_cache.hpp1
-rw-r--r--src/buildtool/execution_api/git/git_api.hpp5
-rw-r--r--src/buildtool/execution_api/local/local_action.cpp2
-rw-r--r--src/buildtool/execution_api/local/local_action.hpp1
-rw-r--r--src/buildtool/execution_api/local/local_api.hpp2
-rw-r--r--src/buildtool/execution_api/local/local_response.hpp1
-rw-r--r--src/buildtool/execution_api/remote/bazel/bazel_action.cpp2
-rw-r--r--src/buildtool/execution_api/remote/bazel/bazel_api.cpp1
-rw-r--r--src/buildtool/execution_api/remote/bazel/bazel_api.hpp1
-rw-r--r--src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp1
-rw-r--r--src/buildtool/execution_api/remote/bazel/bazel_execution_client.cpp2
-rw-r--r--src/buildtool/execution_api/remote/bazel/bazel_network.cpp3
-rw-r--r--src/buildtool/execution_api/remote/bazel/bazel_response.cpp2
-rw-r--r--src/buildtool/execution_api/remote/bazel/bazel_response.hpp1
-rw-r--r--src/buildtool/execution_api/remote/bazel/bytestream_client.hpp2
-rw-r--r--src/buildtool/execution_engine/dag/dag.hpp2
-rw-r--r--src/buildtool/execution_engine/executor/executor.hpp1
-rw-r--r--src/buildtool/execution_engine/traverser/traverser.hpp2
-rw-r--r--src/buildtool/file_system/file_root.hpp1
-rw-r--r--src/buildtool/file_system/file_system_manager.hpp1
-rw-r--r--src/buildtool/file_system/git_cas.hpp2
-rw-r--r--src/buildtool/file_system/git_repo.cpp2
-rw-r--r--src/buildtool/file_system/git_repo.hpp1
-rw-r--r--src/buildtool/file_system/git_tree.hpp3
-rw-r--r--src/buildtool/file_system/git_utils.hpp1
-rw-r--r--src/buildtool/file_system/object_cas.hpp1
-rw-r--r--src/buildtool/file_system/symlinks_map/resolve_symlinks_map.hpp2
-rw-r--r--src/buildtool/graph_traverser/graph_traverser.hpp1
-rw-r--r--src/buildtool/logging/log_config.hpp1
-rw-r--r--src/buildtool/logging/logger.hpp2
-rw-r--r--src/buildtool/main/analyse.hpp1
-rw-r--r--src/buildtool/main/build_utils.hpp1
-rw-r--r--src/buildtool/main/describe.hpp2
-rw-r--r--src/buildtool/main/diagnose.cpp5
-rw-r--r--src/buildtool/main/install_cas.cpp2
-rw-r--r--src/buildtool/main/serve.cpp1
-rw-r--r--src/buildtool/main/version.cpp2
-rw-r--r--src/buildtool/multithreading/async_map.hpp1
-rw-r--r--src/buildtool/multithreading/async_map_consumer.hpp2
-rw-r--r--src/buildtool/multithreading/async_map_node.hpp1
-rw-r--r--src/buildtool/multithreading/notification_queue.hpp2
-rw-r--r--src/buildtool/multithreading/task.hpp1
-rw-r--r--src/buildtool/multithreading/task_system.hpp2
-rw-r--r--src/buildtool/progress_reporting/progress.hpp1
-rw-r--r--src/buildtool/progress_reporting/task_tracker.hpp1
-rw-r--r--src/buildtool/serve_api/remote/config.hpp1
-rw-r--r--src/buildtool/serve_api/remote/serve_api.hpp1
-rw-r--r--src/buildtool/serve_api/remote/source_tree_client.hpp1
-rw-r--r--src/buildtool/serve_api/serve_service/source_tree.cpp1
-rw-r--r--src/buildtool/serve_api/serve_service/source_tree.hpp1
-rw-r--r--src/buildtool/storage/config.hpp1
-rw-r--r--src/buildtool/storage/garbage_collector.cpp1
-rw-r--r--src/buildtool/storage/local_ac.hpp2
-rw-r--r--src/buildtool/storage/local_cas.tpp3
-rw-r--r--src/buildtool/storage/storage.hpp1
-rw-r--r--src/buildtool/system/system_command.hpp1
-rw-r--r--src/other_tools/git_operations/git_ops_types.hpp1
-rw-r--r--src/other_tools/git_operations/git_repo_remote.cpp2
-rw-r--r--src/other_tools/just_mr/cli.hpp2
-rw-r--r--src/other_tools/just_mr/fetch.cpp1
-rw-r--r--src/other_tools/just_mr/mirrors.hpp1
-rw-r--r--src/other_tools/just_mr/rc.cpp2
-rw-r--r--src/other_tools/just_mr/utils.hpp1
-rw-r--r--src/other_tools/ops_maps/archive_fetch_map.hpp1
-rw-r--r--src/other_tools/ops_maps/content_cas_map.cpp2
-rw-r--r--src/other_tools/ops_maps/content_cas_map.hpp1
-rw-r--r--src/other_tools/ops_maps/critical_git_op_map.hpp1
-rw-r--r--src/other_tools/ops_maps/git_tree_fetch_map.cpp1
-rw-r--r--src/other_tools/ops_maps/git_tree_fetch_map.hpp1
-rw-r--r--src/other_tools/ops_maps/git_update_map.hpp1
-rw-r--r--src/other_tools/ops_maps/import_to_git_map.hpp1
-rw-r--r--src/other_tools/repo_map/repos_to_setup_map.cpp3
-rw-r--r--src/other_tools/repo_map/repos_to_setup_map.hpp1
-rw-r--r--src/other_tools/root_maps/commit_git_map.hpp1
-rw-r--r--src/other_tools/root_maps/content_git_map.hpp1
-rw-r--r--src/other_tools/root_maps/distdir_git_map.hpp1
-rw-r--r--src/other_tools/root_maps/foreign_file_git_map.hpp1
-rw-r--r--src/other_tools/root_maps/fpath_git_map.cpp2
-rw-r--r--src/other_tools/root_maps/fpath_git_map.hpp1
-rw-r--r--src/other_tools/root_maps/tree_id_git_map.hpp1
-rw-r--r--src/other_tools/utils/content.hpp1
-rw-r--r--src/other_tools/utils/parse_archive.cpp2
-rw-r--r--src/utils/automata/dfa_minimizer.hpp1
-rw-r--r--src/utils/cpp/atomic.hpp1
-rw-r--r--src/utils/cpp/concepts.hpp1
-rw-r--r--src/utils/cpp/file_locking.hpp1
-rw-r--r--src/utils/cpp/hash_combine.hpp2
-rw-r--r--src/utils/cpp/json.hpp1
-rw-r--r--src/utils/cpp/path_hash.hpp1
149 files changed, 217 insertions, 6 deletions
diff --git a/src/buildtool/build_engine/analysed_target/analysed_target.hpp b/src/buildtool/build_engine/analysed_target/analysed_target.hpp
index 5867e77e..c5d3c9ba 100644
--- a/src/buildtool/build_engine/analysed_target/analysed_target.hpp
+++ b/src/buildtool/build_engine/analysed_target/analysed_target.hpp
@@ -19,6 +19,7 @@
#include <set>
#include <string>
#include <unordered_set>
+#include <utility> // std::move
#include <vector>
#include "src/buildtool/build_engine/analysed_target/target_graph_information.hpp"
diff --git a/src/buildtool/build_engine/analysed_target/target_graph_information.hpp b/src/buildtool/build_engine/analysed_target/target_graph_information.hpp
index f926421d..cabd42c8 100644
--- a/src/buildtool/build_engine/analysed_target/target_graph_information.hpp
+++ b/src/buildtool/build_engine/analysed_target/target_graph_information.hpp
@@ -17,6 +17,7 @@
#include <optional>
#include <string>
+#include <utility> // std::move
#include <vector>
#include "nlohmann/json.hpp"
diff --git a/src/buildtool/build_engine/base_maps/directory_map.hpp b/src/buildtool/build_engine/base_maps/directory_map.hpp
index efce6510..1b927da9 100644
--- a/src/buildtool/build_engine/base_maps/directory_map.hpp
+++ b/src/buildtool/build_engine/base_maps/directory_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_DIRECTORY_MAP_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_DIRECTORY_MAP_HPP
+#include <cstddef>
#include <filesystem>
#include <map>
#include <unordered_set>
diff --git a/src/buildtool/build_engine/base_maps/entity_name.hpp b/src/buildtool/build_engine/base_maps/entity_name.hpp
index 12d1ec95..65722189 100644
--- a/src/buildtool/build_engine/base_maps/entity_name.hpp
+++ b/src/buildtool/build_engine/base_maps/entity_name.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_ENTITY_NAME_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_ENTITY_NAME_HPP
+#include <cstddef>
#include <filesystem>
#include <optional>
#include <utility>
diff --git a/src/buildtool/build_engine/base_maps/entity_name_data.hpp b/src/buildtool/build_engine/base_maps/entity_name_data.hpp
index f2d8387a..d6228f64 100644
--- a/src/buildtool/build_engine/base_maps/entity_name_data.hpp
+++ b/src/buildtool/build_engine/base_maps/entity_name_data.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_ENTITY_NAME_DATA_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_ENTITY_NAME_DATA_HPP
+#include <cstddef>
#include <filesystem>
#include <optional>
#include <utility>
diff --git a/src/buildtool/build_engine/base_maps/expression_function.hpp b/src/buildtool/build_engine/base_maps/expression_function.hpp
index aa01f57a..41e6ad83 100644
--- a/src/buildtool/build_engine/base_maps/expression_function.hpp
+++ b/src/buildtool/build_engine/base_maps/expression_function.hpp
@@ -18,6 +18,7 @@
#include <memory>
#include <string>
#include <unordered_map>
+#include <utility> // std::move
#include <vector>
#include "fmt/core.h"
diff --git a/src/buildtool/build_engine/base_maps/expression_map.cpp b/src/buildtool/build_engine/base_maps/expression_map.cpp
index 4e1c58ad..06db646a 100644
--- a/src/buildtool/build_engine/base_maps/expression_map.cpp
+++ b/src/buildtool/build_engine/base_maps/expression_map.cpp
@@ -16,6 +16,7 @@
#include <optional>
#include <string>
+#include <utility> // std::move
#include "fmt/core.h"
#include "src/buildtool/build_engine/base_maps/field_reader.hpp"
diff --git a/src/buildtool/build_engine/base_maps/expression_map.hpp b/src/buildtool/build_engine/base_maps/expression_map.hpp
index 3a72c109..c7259bfd 100644
--- a/src/buildtool/build_engine/base_maps/expression_map.hpp
+++ b/src/buildtool/build_engine/base_maps/expression_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_EXPRESSION_MAP_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_EXPRESSION_MAP_HPP
+#include <cstddef>
#include <functional>
#include <memory>
#include <string>
diff --git a/src/buildtool/build_engine/base_maps/field_reader.hpp b/src/buildtool/build_engine/base_maps/field_reader.hpp
index bc73a56c..8c1c0f23 100644
--- a/src/buildtool/build_engine/base_maps/field_reader.hpp
+++ b/src/buildtool/build_engine/base_maps/field_reader.hpp
@@ -15,9 +15,12 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_FIELD_READER_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_FIELD_READER_HPP
+#include <cstddef>
#include <memory>
#include <optional>
#include <string>
+#include <unordered_set>
+#include <utility> // std::move
#include <vector>
#include "fmt/core.h"
diff --git a/src/buildtool/build_engine/base_maps/json_file_map.hpp b/src/buildtool/build_engine/base_maps/json_file_map.hpp
index 79ba7eff..4e1ebf70 100644
--- a/src/buildtool/build_engine/base_maps/json_file_map.hpp
+++ b/src/buildtool/build_engine/base_maps/json_file_map.hpp
@@ -15,9 +15,11 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_JSON_FILE_MAP_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_JSON_FILE_MAP_HPP
+#include <cstddef>
#include <filesystem>
#include <fstream>
#include <string>
+#include <utility> // std::move
#include "fmt/core.h"
#include "gsl/gsl"
diff --git a/src/buildtool/build_engine/base_maps/module_name.hpp b/src/buildtool/build_engine/base_maps/module_name.hpp
index dfe3a19e..84f5e837 100644
--- a/src/buildtool/build_engine/base_maps/module_name.hpp
+++ b/src/buildtool/build_engine/base_maps/module_name.hpp
@@ -15,6 +15,10 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_MODULE_NAME_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_MODULE_NAME_HPP
+#include <cstddef>
+#include <string>
+#include <utility>
+
#include "src/utils/cpp/hash_combine.hpp"
namespace BuildMaps::Base {
diff --git a/src/buildtool/build_engine/base_maps/rule_map.cpp b/src/buildtool/build_engine/base_maps/rule_map.cpp
index a2b614b7..19b1ed80 100644
--- a/src/buildtool/build_engine/base_maps/rule_map.cpp
+++ b/src/buildtool/build_engine/base_maps/rule_map.cpp
@@ -17,6 +17,7 @@
#include <optional>
#include <string>
#include <unordered_set>
+#include <utility> // std::move
#include "fmt/core.h"
#include "src/buildtool/build_engine/base_maps/field_reader.hpp"
diff --git a/src/buildtool/build_engine/base_maps/rule_map.hpp b/src/buildtool/build_engine/base_maps/rule_map.hpp
index 251065dc..efc049cc 100644
--- a/src/buildtool/build_engine/base_maps/rule_map.hpp
+++ b/src/buildtool/build_engine/base_maps/rule_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_RULE_MAP_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_RULE_MAP_HPP
+#include <cstddef>
#include <memory>
#include <string>
diff --git a/src/buildtool/build_engine/base_maps/source_map.cpp b/src/buildtool/build_engine/base_maps/source_map.cpp
index 242e546a..7ad8d487 100644
--- a/src/buildtool/build_engine/base_maps/source_map.cpp
+++ b/src/buildtool/build_engine/base_maps/source_map.cpp
@@ -15,6 +15,7 @@
#include "src/buildtool/build_engine/base_maps/source_map.hpp"
#include <filesystem>
+#include <utility> // std::move
#include "nlohmann/json.hpp"
#include "src/buildtool/common/artifact_digest.hpp"
diff --git a/src/buildtool/build_engine/base_maps/source_map.hpp b/src/buildtool/build_engine/base_maps/source_map.hpp
index 61c8ad6f..9e703ff3 100644
--- a/src/buildtool/build_engine/base_maps/source_map.hpp
+++ b/src/buildtool/build_engine/base_maps/source_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_SOURCE_MAP_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_SOURCE_MAP_HPP
+#include <cstddef>
#include <unordered_set>
#include "gsl/gsl"
diff --git a/src/buildtool/build_engine/base_maps/user_rule.hpp b/src/buildtool/build_engine/base_maps/user_rule.hpp
index 58e5ca40..979a9cf6 100644
--- a/src/buildtool/build_engine/base_maps/user_rule.hpp
+++ b/src/buildtool/build_engine/base_maps/user_rule.hpp
@@ -16,12 +16,14 @@
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_BASE_MAPS_USER_RULE_HPP
#include <algorithm>
+#include <cstddef>
#include <memory>
#include <set>
#include <sstream>
#include <string>
#include <unordered_map>
#include <unordered_set>
+#include <utility> // std::move
#include <vector>
#include "fmt/core.h"
diff --git a/src/buildtool/build_engine/expression/configuration.hpp b/src/buildtool/build_engine/expression/configuration.hpp
index 725d2860..af169818 100644
--- a/src/buildtool/build_engine/expression/configuration.hpp
+++ b/src/buildtool/build_engine/expression/configuration.hpp
@@ -16,8 +16,10 @@
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_EXPRESSION_CONFIGURATION_HPP
#include <algorithm>
+#include <cstddef>
#include <sstream>
#include <string>
+#include <utility> // std::move
#include "gsl/gsl"
#include "src/buildtool/build_engine/expression/expression.hpp"
diff --git a/src/buildtool/build_engine/expression/evaluator.cpp b/src/buildtool/build_engine/expression/evaluator.cpp
index 4499552b..8945fe0e 100644
--- a/src/buildtool/build_engine/expression/evaluator.cpp
+++ b/src/buildtool/build_engine/expression/evaluator.cpp
@@ -20,6 +20,7 @@
#include <sstream>
#include <string>
#include <unordered_set>
+#include <utility> // std::move
#include "fmt/core.h"
#include "src/buildtool/build_engine/expression/configuration.hpp"
diff --git a/src/buildtool/build_engine/expression/evaluator.hpp b/src/buildtool/build_engine/expression/evaluator.hpp
index 40f9dfd1..efcbeaca 100644
--- a/src/buildtool/build_engine/expression/evaluator.hpp
+++ b/src/buildtool/build_engine/expression/evaluator.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_EXPRESSION_EVALUATOR_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_EXPRESSION_EVALUATOR_HPP
+#include <cstddef>
#include <exception>
#include <string>
diff --git a/src/buildtool/build_engine/expression/expression.cpp b/src/buildtool/build_engine/expression/expression.cpp
index 0b470a9d..474acdca 100644
--- a/src/buildtool/build_engine/expression/expression.cpp
+++ b/src/buildtool/build_engine/expression/expression.cpp
@@ -14,6 +14,7 @@
#include "src/buildtool/build_engine/expression/expression.hpp"
+#include <algorithm>
#include <exception>
#include <optional>
#include <sstream>
diff --git a/src/buildtool/build_engine/expression/expression.hpp b/src/buildtool/build_engine/expression/expression.hpp
index b31107d6..eb0a3d5f 100644
--- a/src/buildtool/build_engine/expression/expression.hpp
+++ b/src/buildtool/build_engine/expression/expression.hpp
@@ -15,12 +15,14 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_EXPRESSION_EXPRESSION_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_EXPRESSION_EXPRESSION_HPP
+#include <cstddef>
#include <exception>
#include <functional>
#include <memory>
#include <optional>
#include <string>
#include <type_traits>
+#include <utility> // std::move
#include <variant>
#include <vector>
diff --git a/src/buildtool/build_engine/expression/expression_ptr.cpp b/src/buildtool/build_engine/expression/expression_ptr.cpp
index 28d2b094..368d2816 100644
--- a/src/buildtool/build_engine/expression/expression_ptr.cpp
+++ b/src/buildtool/build_engine/expression/expression_ptr.cpp
@@ -12,7 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/buildtool/build_engine/expression/expression_ptr.hpp"
+
#include <string>
+#include <utility> // std::move
#include "src/buildtool/build_engine/expression/evaluator.hpp"
#include "src/buildtool/build_engine/expression/expression.hpp"
@@ -37,11 +40,11 @@ auto ExpressionPtr::operator[](ExpressionPtr const& key) && -> ExpressionPtr {
return (*ptr_)[key];
}
-auto ExpressionPtr::operator[](size_t pos) const& -> ExpressionPtr const& {
+auto ExpressionPtr::operator[](std::size_t pos) const& -> ExpressionPtr const& {
return (*ptr_)[pos];
}
-auto ExpressionPtr::operator[](size_t pos) && -> ExpressionPtr {
+auto ExpressionPtr::operator[](std::size_t pos) && -> ExpressionPtr {
return (*ptr_)[pos];
}
diff --git a/src/buildtool/build_engine/expression/expression_ptr.hpp b/src/buildtool/build_engine/expression/expression_ptr.hpp
index 0c29cc04..77b1cfba 100644
--- a/src/buildtool/build_engine/expression/expression_ptr.hpp
+++ b/src/buildtool/build_engine/expression/expression_ptr.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_EXPRESSION_EXPRESSION_PTR_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_EXPRESSION_EXPRESSION_PTR_HPP
+#include <cstddef>
#include <functional>
#include <memory>
#include <string>
@@ -62,8 +63,9 @@ class ExpressionPtr {
[[nodiscard]] auto operator[](
ExpressionPtr const& key) const& -> ExpressionPtr const&;
[[nodiscard]] auto operator[](ExpressionPtr const& key) && -> ExpressionPtr;
- [[nodiscard]] auto operator[](size_t pos) const& -> ExpressionPtr const&;
- [[nodiscard]] auto operator[](size_t pos) && -> ExpressionPtr;
+ [[nodiscard]] auto operator[](
+ std::size_t pos) const& -> ExpressionPtr const&;
+ [[nodiscard]] auto operator[](std::size_t pos) && -> ExpressionPtr;
[[nodiscard]] auto operator<(ExpressionPtr const& other) const -> bool;
[[nodiscard]] auto operator==(ExpressionPtr const& other) const -> bool;
template <class T>
diff --git a/src/buildtool/build_engine/expression/linked_map.hpp b/src/buildtool/build_engine/expression/linked_map.hpp
index 6f394c7e..1f66ab3c 100644
--- a/src/buildtool/build_engine/expression/linked_map.hpp
+++ b/src/buildtool/build_engine/expression/linked_map.hpp
@@ -18,9 +18,11 @@
#include <algorithm>
#include <atomic>
#include <condition_variable>
+#include <cstddef>
#include <map>
#include <memory>
#include <mutex>
+#include <utility> // std::move
#include <vector>
#include "fmt/core.h"
diff --git a/src/buildtool/build_engine/expression/target_node.hpp b/src/buildtool/build_engine/expression/target_node.hpp
index f65a90b1..39c1b4dd 100644
--- a/src/buildtool/build_engine/expression/target_node.hpp
+++ b/src/buildtool/build_engine/expression/target_node.hpp
@@ -16,6 +16,7 @@
#define INCLUDED_SRC_BUILDTOOL_BUILDENGINE_EXPRESSION_TARGET_NODE_HPP
#include <type_traits>
+#include <utility> // std::move
#include <variant>
#include "src/buildtool/build_engine/expression/expression_ptr.hpp"
diff --git a/src/buildtool/build_engine/expression/target_result.cpp b/src/buildtool/build_engine/expression/target_result.cpp
index 62676ee9..3d2e2dda 100644
--- a/src/buildtool/build_engine/expression/target_result.cpp
+++ b/src/buildtool/build_engine/expression/target_result.cpp
@@ -16,6 +16,7 @@
#include <unordered_map>
#include <unordered_set>
+#include <utility> // std::move
#include <vector>
#include "gsl/gsl"
diff --git a/src/buildtool/build_engine/expression/target_result.hpp b/src/buildtool/build_engine/expression/target_result.hpp
index 02ef4faa..dcf201ee 100644
--- a/src/buildtool/build_engine/expression/target_result.hpp
+++ b/src/buildtool/build_engine/expression/target_result.hpp
@@ -15,6 +15,8 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILDENGINE_EXPRESSION_TARGET_RESULT_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILDENGINE_EXPRESSION_TARGET_RESULT_HPP
+#include <cstddef>
+#include <optional>
#include <unordered_map>
#include "nlohmann/json.hpp"
diff --git a/src/buildtool/build_engine/target_map/absent_target_map.cpp b/src/buildtool/build_engine/target_map/absent_target_map.cpp
index 4657e002..2aad0b99 100644
--- a/src/buildtool/build_engine/target_map/absent_target_map.cpp
+++ b/src/buildtool/build_engine/target_map/absent_target_map.cpp
@@ -14,6 +14,9 @@
#include "src/buildtool/build_engine/target_map/absent_target_map.hpp"
#ifndef BOOTSTRAP_BUILD_TOOL
+#include <unordered_set>
+#include <utility> // std::move
+
#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/logging/logger.hpp"
#include "src/buildtool/serve_api/remote/serve_api.hpp"
diff --git a/src/buildtool/build_engine/target_map/absent_target_map.hpp b/src/buildtool/build_engine/target_map/absent_target_map.hpp
index 5b1196df..a3f92889 100644
--- a/src/buildtool/build_engine/target_map/absent_target_map.hpp
+++ b/src/buildtool/build_engine/target_map/absent_target_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_TARGET_MAP_ABSENT_TARGET_MAP_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_TARGET_MAP_ABSENT_TARGET_MAP_HPP
+#include <cstddef>
#include <string>
#include <vector>
diff --git a/src/buildtool/build_engine/target_map/built_in_rules.cpp b/src/buildtool/build_engine/target_map/built_in_rules.cpp
index 77298d5c..afdd4bf9 100644
--- a/src/buildtool/build_engine/target_map/built_in_rules.cpp
+++ b/src/buildtool/build_engine/target_map/built_in_rules.cpp
@@ -23,6 +23,7 @@
#include <string>
#include <unordered_map>
#include <unordered_set>
+#include <utility> // std::move
#include "fmt/core.h"
#include "src/buildtool/build_engine/base_maps/field_reader.hpp"
diff --git a/src/buildtool/build_engine/target_map/configured_target.hpp b/src/buildtool/build_engine/target_map/configured_target.hpp
index c8183b4f..b97b1912 100644
--- a/src/buildtool/build_engine/target_map/configured_target.hpp
+++ b/src/buildtool/build_engine/target_map/configured_target.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_TARGET_MAP_CONFIGURED_TARGET_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_TARGET_MAP_CONFIGURED_TARGET_HPP
+#include <cstddef>
#include <memory>
#include "fmt/core.h"
diff --git a/src/buildtool/build_engine/target_map/export.cpp b/src/buildtool/build_engine/target_map/export.cpp
index e8825f67..7142bfa8 100644
--- a/src/buildtool/build_engine/target_map/export.cpp
+++ b/src/buildtool/build_engine/target_map/export.cpp
@@ -15,6 +15,7 @@
#include "src/buildtool/build_engine/target_map/export.hpp"
#include <unordered_set>
+#include <utility> // std::move
#include "src/buildtool/build_engine/base_maps/field_reader.hpp"
#include "src/buildtool/build_engine/expression/configuration.hpp"
diff --git a/src/buildtool/build_engine/target_map/result_map.hpp b/src/buildtool/build_engine/target_map/result_map.hpp
index a4b7272e..484b86ee 100644
--- a/src/buildtool/build_engine/target_map/result_map.hpp
+++ b/src/buildtool/build_engine/target_map/result_map.hpp
@@ -16,12 +16,14 @@
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_TARGET_MAP_RESULT_MAP_HPP
#include <algorithm>
+#include <cstddef>
#include <fstream>
#include <mutex>
#include <optional>
#include <string>
#include <thread>
#include <unordered_set>
+#include <utility> // std::move
#include <vector>
#include "gsl/gsl"
diff --git a/src/buildtool/build_engine/target_map/target_map.cpp b/src/buildtool/build_engine/target_map/target_map.cpp
index b5350eb8..7ed497af 100644
--- a/src/buildtool/build_engine/target_map/target_map.cpp
+++ b/src/buildtool/build_engine/target_map/target_map.cpp
@@ -18,6 +18,8 @@
#include <memory>
#include <set>
#include <string>
+#include <unordered_map>
+#include <unordered_set>
#include <utility>
#include <fnmatch.h>
diff --git a/src/buildtool/build_engine/target_map/target_map.hpp b/src/buildtool/build_engine/target_map/target_map.hpp
index 15540f00..86b7aad7 100644
--- a/src/buildtool/build_engine/target_map/target_map.hpp
+++ b/src/buildtool/build_engine/target_map/target_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_TARGET_MAP_TARGET_MAP_HPP
#define INCLUDED_SRC_BUILDTOOL_BUILD_ENGINE_TARGET_MAP_TARGET_MAP_HPP
+#include <cstddef>
#include <functional>
#include <string>
diff --git a/src/buildtool/build_engine/target_map/utils.cpp b/src/buildtool/build_engine/target_map/utils.cpp
index aa733521..924b3727 100644
--- a/src/buildtool/build_engine/target_map/utils.cpp
+++ b/src/buildtool/build_engine/target_map/utils.cpp
@@ -15,8 +15,10 @@
#include "src/buildtool/build_engine/target_map/utils.hpp"
#include <algorithm>
+#include <cstddef>
#include <filesystem>
#include <unordered_set>
+#include <utility> // std::move
#include <vector>
#include "src/utils/cpp/path.hpp"
diff --git a/src/buildtool/common/action_description.hpp b/src/buildtool/common/action_description.hpp
index 374227f2..bb11c68b 100644
--- a/src/buildtool/common/action_description.hpp
+++ b/src/buildtool/common/action_description.hpp
@@ -20,6 +20,7 @@
#include <optional>
#include <string>
#include <unordered_map>
+#include <utility> // std::move
#include <vector>
#include "nlohmann/json.hpp"
diff --git a/src/buildtool/common/artifact.hpp b/src/buildtool/common/artifact.hpp
index 5bef1f27..b41c4300 100644
--- a/src/buildtool/common/artifact.hpp
+++ b/src/buildtool/common/artifact.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_COMMON_ARTIFACT_HPP
#define INCLUDED_SRC_BUILDTOOL_COMMON_ARTIFACT_HPP
+#include <cstddef>
#include <filesystem>
#include <optional>
#include <string>
diff --git a/src/buildtool/common/artifact_description.hpp b/src/buildtool/common/artifact_description.hpp
index 8393fd76..ba4723f7 100644
--- a/src/buildtool/common/artifact_description.hpp
+++ b/src/buildtool/common/artifact_description.hpp
@@ -15,9 +15,11 @@
#ifndef INCLUDED_SRC_BUILDTOOL_COMMON_ARTIFACT_DESCRIPTION_HPP
#define INCLUDED_SRC_BUILDTOOL_COMMON_ARTIFACT_DESCRIPTION_HPP
+#include <cstddef>
#include <filesystem>
#include <optional>
#include <string>
+#include <utility> // std::move
#include <variant>
#include "src/buildtool/common/artifact.hpp"
diff --git a/src/buildtool/common/artifact_digest.hpp b/src/buildtool/common/artifact_digest.hpp
index 1e0405dd..ec3c65da 100644
--- a/src/buildtool/common/artifact_digest.hpp
+++ b/src/buildtool/common/artifact_digest.hpp
@@ -15,8 +15,10 @@
#ifndef INCLUDED_SRC_COMMON_ARTIFACT_DIGEST_HPP
#define INCLUDED_SRC_COMMON_ARTIFACT_DIGEST_HPP
+#include <cstddef>
#include <optional>
#include <string>
+#include <utility> // std::move
#include "gsl/gsl"
#include "src/buildtool/common/bazel_types.hpp"
diff --git a/src/buildtool/common/artifact_factory.hpp b/src/buildtool/common/artifact_factory.hpp
index 59d7c80a..e933a16e 100644
--- a/src/buildtool/common/artifact_factory.hpp
+++ b/src/buildtool/common/artifact_factory.hpp
@@ -16,6 +16,7 @@
#define INCLUDED_SRC_COMMON_ARTIFACT_FACTORY_HPP
#include <algorithm>
+#include <cstddef>
#include <optional>
#include <string>
#include <utility>
diff --git a/src/buildtool/common/bazel_types.hpp b/src/buildtool/common/bazel_types.hpp
index e2b785a1..f95a1864 100644
--- a/src/buildtool/common/bazel_types.hpp
+++ b/src/buildtool/common/bazel_types.hpp
@@ -21,6 +21,7 @@
#ifdef BOOTSTRAP_BUILD_TOOL
+#include <cstddef>
#include <cstdint>
#include <string>
diff --git a/src/buildtool/common/cli.hpp b/src/buildtool/common/cli.hpp
index 6b6be63a..e7f78201 100644
--- a/src/buildtool/common/cli.hpp
+++ b/src/buildtool/common/cli.hpp
@@ -16,6 +16,7 @@
#define INCLUDED_SRC_BUILDTOOL_COMMON_CLI_HPP
#include <chrono>
+#include <cstddef>
#include <cstdlib>
#include <filesystem>
#include <string>
diff --git a/src/buildtool/common/remote/retry.hpp b/src/buildtool/common/remote/retry.hpp
index 1d2d54a0..4e1e3492 100644
--- a/src/buildtool/common/remote/retry.hpp
+++ b/src/buildtool/common/remote/retry.hpp
@@ -14,6 +14,7 @@
#include <optional>
#include <thread>
+#include <utility> // std::move
#include "grpcpp/grpcpp.h"
#include "src/buildtool/common/remote/retry_parameters.hpp"
diff --git a/src/buildtool/common/repository_config.hpp b/src/buildtool/common/repository_config.hpp
index 795ee5e5..ea463d43 100644
--- a/src/buildtool/common/repository_config.hpp
+++ b/src/buildtool/common/repository_config.hpp
@@ -21,6 +21,7 @@
#include <optional>
#include <string>
#include <unordered_map>
+#include <utility> // std::move
#include "gsl/gsl"
#include "nlohmann/json.hpp"
diff --git a/src/buildtool/compatibility/native_support.hpp b/src/buildtool/compatibility/native_support.hpp
index b0fee1ea..9890742e 100644
--- a/src/buildtool/compatibility/native_support.hpp
+++ b/src/buildtool/compatibility/native_support.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_COMPATIBILITY_NATIVE_SUPPORT_HPP
#define INCLUDED_SRC_BUILDTOOL_COMPATIBILITY_NATIVE_SUPPORT_HPP
+#include <cstddef>
#include <string>
#include "gsl/gsl"
diff --git a/src/buildtool/crypto/hash_function.cpp b/src/buildtool/crypto/hash_function.cpp
index 89bb0cb8..02e43f1f 100644
--- a/src/buildtool/crypto/hash_function.cpp
+++ b/src/buildtool/crypto/hash_function.cpp
@@ -14,6 +14,7 @@
#include "src/buildtool/crypto/hash_function.hpp"
+#include <cstddef>
#include <fstream>
#include <string>
diff --git a/src/buildtool/crypto/hash_impl_sha1.cpp b/src/buildtool/crypto/hash_impl_sha1.cpp
index 1f1f7749..97ff5464 100644
--- a/src/buildtool/crypto/hash_impl_sha1.cpp
+++ b/src/buildtool/crypto/hash_impl_sha1.cpp
@@ -16,6 +16,7 @@
#include <array>
#include <cstdint>
+#include <utility> // std::move
#include "openssl/sha.h"
diff --git a/src/buildtool/crypto/hash_impl_sha256.cpp b/src/buildtool/crypto/hash_impl_sha256.cpp
index aace1ade..ea96a3ba 100644
--- a/src/buildtool/crypto/hash_impl_sha256.cpp
+++ b/src/buildtool/crypto/hash_impl_sha256.cpp
@@ -16,6 +16,7 @@
#include <array>
#include <cstdint>
+#include <utility> // std::move
#include "openssl/sha.h"
diff --git a/src/buildtool/crypto/hash_impl_sha512.cpp b/src/buildtool/crypto/hash_impl_sha512.cpp
index 802ebf0e..4b96e470 100644
--- a/src/buildtool/crypto/hash_impl_sha512.cpp
+++ b/src/buildtool/crypto/hash_impl_sha512.cpp
@@ -16,6 +16,7 @@
#include <array>
#include <cstdint>
+#include <utility> // std::move
#include "openssl/sha.h"
diff --git a/src/buildtool/crypto/hasher.hpp b/src/buildtool/crypto/hasher.hpp
index ceabc44c..4bbcc7b7 100644
--- a/src/buildtool/crypto/hasher.hpp
+++ b/src/buildtool/crypto/hasher.hpp
@@ -15,10 +15,12 @@
#ifndef INCLUDED_SRC_BUILDTOOL_CRYPTO_HASHER_HPP
#define INCLUDED_SRC_BUILDTOOL_CRYPTO_HASHER_HPP
+#include <cstddef>
#include <cstdint>
#include <memory>
#include <optional>
#include <string>
+#include <utility> // std::move
#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/logging/logger.hpp"
diff --git a/src/buildtool/execution_api/bazel_msg/bazel_blob.hpp b/src/buildtool/execution_api/bazel_msg/bazel_blob.hpp
index 944bb2d8..75ceb97f 100644
--- a/src/buildtool/execution_api/bazel_msg/bazel_blob.hpp
+++ b/src/buildtool/execution_api/bazel_msg/bazel_blob.hpp
@@ -19,6 +19,7 @@
#include <memory>
#include <optional>
#include <string>
+#include <utility> // std::move
#include "src/buildtool/common/artifact_digest.hpp"
#include "src/buildtool/common/bazel_types.hpp"
diff --git a/src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp b/src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp
index 50552126..2e028d05 100644
--- a/src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp
+++ b/src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_BAZEL_MSG_BAZEL_BLOB_CONTAINER_HPP
#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_BAZEL_MSG_BAZEL_BLOB_CONTAINER_HPP
+#include <cstddef>
#include <string>
#include <type_traits>
#include <unordered_map>
diff --git a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
index 145b51cd..4be46db2 100644
--- a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
+++ b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
@@ -22,6 +22,7 @@
#include <optional>
#include <sstream>
#include <string>
+#include <utility> // std::move
#include <vector>
#include "gsl/gsl"
diff --git a/src/buildtool/execution_api/common/execution_api.hpp b/src/buildtool/execution_api/common/execution_api.hpp
index 993f6d17..635a44f8 100644
--- a/src/buildtool/execution_api/common/execution_api.hpp
+++ b/src/buildtool/execution_api/common/execution_api.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_EXECUTION_APIHPP
#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_EXECUTION_APIHPP
+#include <cstddef>
#include <filesystem>
#include <map>
#include <memory>
diff --git a/src/buildtool/execution_api/common/execution_common.hpp b/src/buildtool/execution_api/common/execution_common.hpp
index 5269a76f..d3079d5d 100644
--- a/src/buildtool/execution_api/common/execution_common.hpp
+++ b/src/buildtool/execution_api/common/execution_common.hpp
@@ -23,6 +23,7 @@
#endif
#include <array>
+#include <cstddef>
#include <filesystem>
#include <optional>
#include <random>
diff --git a/src/buildtool/execution_api/execution_service/bytestream_server.cpp b/src/buildtool/execution_api/execution_service/bytestream_server.cpp
index ed5a6bc2..3433f031 100644
--- a/src/buildtool/execution_api/execution_service/bytestream_server.cpp
+++ b/src/buildtool/execution_api/execution_service/bytestream_server.cpp
@@ -14,6 +14,7 @@
#include "bytestream_server.hpp"
+#include <cstddef>
#include <fstream>
#include <sstream>
#include <utility>
diff --git a/src/buildtool/execution_api/execution_service/capabilities_server.cpp b/src/buildtool/execution_api/execution_service/capabilities_server.cpp
index 7fef8a19..1f34b388 100644
--- a/src/buildtool/execution_api/execution_service/capabilities_server.cpp
+++ b/src/buildtool/execution_api/execution_service/capabilities_server.cpp
@@ -14,6 +14,8 @@
#include "src/buildtool/execution_api/execution_service/capabilities_server.hpp"
+#include <cstddef>
+
#include "src/buildtool/compatibility/compatibility.hpp"
#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/logging/logger.hpp"
diff --git a/src/buildtool/execution_api/execution_service/cas_server.cpp b/src/buildtool/execution_api/execution_service/cas_server.cpp
index 32ec1d58..1fbea75b 100644
--- a/src/buildtool/execution_api/execution_service/cas_server.cpp
+++ b/src/buildtool/execution_api/execution_service/cas_server.cpp
@@ -15,9 +15,11 @@
#include "src/buildtool/execution_api/execution_service/cas_server.hpp"
#include <algorithm>
+#include <cstddef>
#include <filesystem>
#include <fstream>
#include <sstream>
+#include <utility> // std::move
#include <vector>
#include "fmt/core.h"
diff --git a/src/buildtool/execution_api/execution_service/file_chunker.hpp b/src/buildtool/execution_api/execution_service/file_chunker.hpp
index 6cad28aa..5c4e8e89 100644
--- a/src/buildtool/execution_api/execution_service/file_chunker.hpp
+++ b/src/buildtool/execution_api/execution_service/file_chunker.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_EXECUTION_API_EXECUTION_SERVICE_FILE_CHUNKER_HPP
#define INCLUDED_SRC_EXECUTION_API_EXECUTION_SERVICE_FILE_CHUNKER_HPP
+#include <cstddef>
#include <cstdint>
#include <filesystem>
#include <fstream>
diff --git a/src/buildtool/execution_api/execution_service/operation_cache.hpp b/src/buildtool/execution_api/execution_service/operation_cache.hpp
index 2467add7..f06620a5 100644
--- a/src/buildtool/execution_api/execution_service/operation_cache.hpp
+++ b/src/buildtool/execution_api/execution_service/operation_cache.hpp
@@ -16,6 +16,7 @@
#define OPERATION_CACHE_HPP
#include <atomic>
+#include <cstddef>
#include <mutex>
#include <optional>
#include <shared_mutex>
diff --git a/src/buildtool/execution_api/git/git_api.hpp b/src/buildtool/execution_api/git/git_api.hpp
index f9465ce1..f4e1dbd3 100644
--- a/src/buildtool/execution_api/git/git_api.hpp
+++ b/src/buildtool/execution_api/git/git_api.hpp
@@ -15,7 +15,12 @@
#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_GIT_GIT_API_HPP
#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_GIT_GIT_API_HPP
+#include <cstddef>
#include <cstdio>
+#include <map>
+#include <optional>
+#include <string>
+#include <vector>
#include "gsl/gsl"
#include "src/buildtool/common/repository_config.hpp"
diff --git a/src/buildtool/execution_api/local/local_action.cpp b/src/buildtool/execution_api/local/local_action.cpp
index 1fecb9f5..52b513f0 100644
--- a/src/buildtool/execution_api/local/local_action.cpp
+++ b/src/buildtool/execution_api/local/local_action.cpp
@@ -15,7 +15,9 @@
#include "src/buildtool/execution_api/local/local_action.hpp"
#include <algorithm>
+#include <cstddef>
#include <filesystem>
+#include <utility>
#include "src/buildtool/common/bazel_types.hpp"
#include "src/buildtool/compatibility/native_support.hpp"
diff --git a/src/buildtool/execution_api/local/local_action.hpp b/src/buildtool/execution_api/local/local_action.hpp
index 46f414cc..0fce3c35 100644
--- a/src/buildtool/execution_api/local/local_action.hpp
+++ b/src/buildtool/execution_api/local/local_action.hpp
@@ -19,6 +19,7 @@
#include <map>
#include <memory>
#include <string>
+#include <utility> // std::move
#include <vector>
#include "gsl/gsl"
diff --git a/src/buildtool/execution_api/local/local_api.hpp b/src/buildtool/execution_api/local/local_api.hpp
index e3751175..874674dd 100644
--- a/src/buildtool/execution_api/local/local_api.hpp
+++ b/src/buildtool/execution_api/local/local_api.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_LOCAL_LOCAL_API_HPP
#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_LOCAL_LOCAL_API_HPP
+#include <cstddef>
#include <iterator>
#include <map>
#include <memory>
@@ -22,6 +23,7 @@
#include <sstream>
#include <string>
#include <unordered_map>
+#include <utility> // std::move
#include <variant>
#include <vector>
diff --git a/src/buildtool/execution_api/local/local_response.hpp b/src/buildtool/execution_api/local/local_response.hpp
index 5c69c491..bcb98a2e 100644
--- a/src/buildtool/execution_api/local/local_response.hpp
+++ b/src/buildtool/execution_api/local/local_response.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_LOCAL_LOCAL_RESPONSE_HPP
#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_LOCAL_LOCAL_RESPONSE_HPP
+#include <cstddef>
#include <string>
#include <utility>
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_action.cpp b/src/buildtool/execution_api/remote/bazel/bazel_action.cpp
index f1984ef4..13342da0 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_action.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_action.cpp
@@ -14,6 +14,8 @@
#include "src/buildtool/execution_api/remote/bazel/bazel_action.hpp"
+#include <utility> // std::move
+
#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp"
#include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp"
#include "src/buildtool/execution_api/remote/bazel/bazel_response.hpp"
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
index 9e79f178..e278d6a5 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp
@@ -21,6 +21,7 @@
#include <sstream>
#include <unordered_map>
#include <unordered_set>
+#include <utility> // std::move
#include "fmt/core.h"
#include "src/buildtool/common/bazel_types.hpp"
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp
index dcef334e..adb6bd33 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_API_HPP
#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_API_HPP
+#include <cstddef>
#include <filesystem>
#include <map>
#include <memory>
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp
index 1509b359..cc7d56b9 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_CAS_CLIENT_HPP
#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_CAS_CLIENT_HPP
+#include <cstddef>
#include <functional>
#include <memory>
#include <optional>
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_execution_client.cpp b/src/buildtool/execution_api/remote/bazel/bazel_execution_client.cpp
index 02766abd..56f0b137 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_execution_client.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_execution_client.cpp
@@ -14,6 +14,8 @@
#include "src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp"
+#include <utility> // std::move
+
#include "grpcpp/grpcpp.h"
#include "gsl/gsl"
#include "src/buildtool/common/remote/client_common.hpp"
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp
index d6b61fb7..2d434bde 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp
@@ -14,6 +14,9 @@
#include "src/buildtool/execution_api/remote/bazel/bazel_network.hpp"
+#include <algorithm>
+#include <cstddef>
+
#include "src/buildtool/common/remote/client_common.hpp"
#include "src/buildtool/execution_api/common/message_limits.hpp"
#include "src/buildtool/execution_api/remote/bazel/bazel_response.hpp"
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
index df4685fb..f290a7f4 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
@@ -14,6 +14,8 @@
#include "src/buildtool/execution_api/remote/bazel/bazel_response.hpp"
+#include <cstddef>
+
#include "gsl/gsl"
#include "src/buildtool/compatibility/native_support.hpp"
#include "src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp"
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_response.hpp b/src/buildtool/execution_api/remote/bazel/bazel_response.hpp
index 358c98c8..41957255 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_response.hpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_response.hpp
@@ -16,6 +16,7 @@
#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BAZEL_RESPONSE_HPP
#include <string>
+#include <utility> // std::move
#include <vector>
#include "src/buildtool/execution_api/common/execution_api.hpp"
diff --git a/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp b/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp
index eb3c17c9..a6516e47 100644
--- a/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp
+++ b/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp
@@ -16,10 +16,12 @@
#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_BAZEL_BYTESTREAM_CLIENT_HPP
#include <algorithm>
+#include <cstddef>
#include <functional>
#include <iomanip>
#include <optional>
#include <string>
+#include <utility> // std::move
#include <vector>
#include "google/bytestream/bytestream.grpc.pb.h"
diff --git a/src/buildtool/execution_engine/dag/dag.hpp b/src/buildtool/execution_engine/dag/dag.hpp
index d7cbeebf..b371896b 100644
--- a/src/buildtool/execution_engine/dag/dag.hpp
+++ b/src/buildtool/execution_engine/dag/dag.hpp
@@ -17,6 +17,7 @@
#include <algorithm>
#include <atomic>
+#include <cstddef>
#include <cstdint>
#include <map>
#include <memory>
@@ -24,6 +25,7 @@
#include <string>
#include <unordered_map>
#include <unordered_set>
+#include <utility> // std::move
#include <variant>
#include <vector>
diff --git a/src/buildtool/execution_engine/executor/executor.hpp b/src/buildtool/execution_engine/executor/executor.hpp
index eab18898..53a0f6da 100644
--- a/src/buildtool/execution_engine/executor/executor.hpp
+++ b/src/buildtool/execution_engine/executor/executor.hpp
@@ -23,6 +23,7 @@
#include <optional>
#include <sstream>
#include <type_traits>
+#include <unordered_map>
#include <utility>
#include <vector>
diff --git a/src/buildtool/execution_engine/traverser/traverser.hpp b/src/buildtool/execution_engine/traverser/traverser.hpp
index d55a8059..81f2e348 100644
--- a/src/buildtool/execution_engine/traverser/traverser.hpp
+++ b/src/buildtool/execution_engine/traverser/traverser.hpp
@@ -16,6 +16,8 @@
#define INCLUDED_SRC_BUILDTOOL_EXECUTION_ENGINE_TRAVERSER_TRAVERSER_HPP
#include <atomic>
+#include <cstddef>
+#include <unordered_set>
#include "gsl/gsl"
#include "src/buildtool/execution_engine/dag/dag.hpp"
diff --git a/src/buildtool/file_system/file_root.hpp b/src/buildtool/file_system/file_root.hpp
index 0f2a3d79..08779e8e 100644
--- a/src/buildtool/file_system/file_root.hpp
+++ b/src/buildtool/file_system/file_root.hpp
@@ -20,7 +20,6 @@
#include <memory>
#include <string>
#include <unordered_map>
-#include <unordered_set>
#include <utility>
#include <variant>
diff --git a/src/buildtool/file_system/file_system_manager.hpp b/src/buildtool/file_system/file_system_manager.hpp
index 9bbd2264..6f32458e 100644
--- a/src/buildtool/file_system/file_system_manager.hpp
+++ b/src/buildtool/file_system/file_system_manager.hpp
@@ -17,6 +17,7 @@
#include <array>
#include <chrono>
+#include <cstddef>
#include <cstdio> // for std::fopen
#include <cstring>
#include <exception>
diff --git a/src/buildtool/file_system/git_cas.hpp b/src/buildtool/file_system/git_cas.hpp
index 3ef8b6d8..f01d5617 100644
--- a/src/buildtool/file_system/git_cas.hpp
+++ b/src/buildtool/file_system/git_cas.hpp
@@ -15,11 +15,13 @@
#ifndef INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_GIT_CAS_HPP
#define INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_GIT_CAS_HPP
+#include <cstddef>
#include <filesystem>
#include <memory>
#include <optional>
#include <shared_mutex>
#include <unordered_map>
+#include <utility>
#include <vector>
#include "src/buildtool/file_system/git_context.hpp"
diff --git a/src/buildtool/file_system/git_repo.cpp b/src/buildtool/file_system/git_repo.cpp
index 4799bcbf..ea5b50d4 100644
--- a/src/buildtool/file_system/git_repo.cpp
+++ b/src/buildtool/file_system/git_repo.cpp
@@ -14,6 +14,8 @@
#include "src/buildtool/file_system/git_repo.hpp"
+#include <algorithm>
+#include <cstddef>
#include <thread>
#include <unordered_set>
diff --git a/src/buildtool/file_system/git_repo.hpp b/src/buildtool/file_system/git_repo.hpp
index 7d0428d0..885ddde1 100644
--- a/src/buildtool/file_system/git_repo.hpp
+++ b/src/buildtool/file_system/git_repo.hpp
@@ -20,6 +20,7 @@
#include <optional>
#include <string>
#include <unordered_map>
+#include <utility> // std::move
#include <variant>
#include <vector>
diff --git a/src/buildtool/file_system/git_tree.hpp b/src/buildtool/file_system/git_tree.hpp
index 8dbfb4ed..6146fb0b 100644
--- a/src/buildtool/file_system/git_tree.hpp
+++ b/src/buildtool/file_system/git_tree.hpp
@@ -15,9 +15,12 @@
#ifndef INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_GIT_TREE_HPP
#define INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_GIT_TREE_HPP
+#include <cstddef>
#include <filesystem>
#include <optional>
+#include <string>
#include <unordered_map>
+#include <utility> // std::move
#include "gsl/gsl"
#include "src/buildtool/file_system/git_repo.hpp"
diff --git a/src/buildtool/file_system/git_utils.hpp b/src/buildtool/file_system/git_utils.hpp
index 17647595..b2c5173f 100644
--- a/src/buildtool/file_system/git_utils.hpp
+++ b/src/buildtool/file_system/git_utils.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_GIT_UTILS_HPP
#define INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_GIT_UTILS_HPP
+#include <cstddef>
#include <optional>
#include "gsl/gsl"
diff --git a/src/buildtool/file_system/object_cas.hpp b/src/buildtool/file_system/object_cas.hpp
index c4377a5c..93b2055b 100644
--- a/src/buildtool/file_system/object_cas.hpp
+++ b/src/buildtool/file_system/object_cas.hpp
@@ -18,6 +18,7 @@
#include <memory>
#include <sstream>
#include <thread>
+#include <utility> // std::move
#include "src/buildtool/common/artifact.hpp"
#include "src/buildtool/common/bazel_types.hpp"
diff --git a/src/buildtool/file_system/symlinks_map/resolve_symlinks_map.hpp b/src/buildtool/file_system/symlinks_map/resolve_symlinks_map.hpp
index a02a8de2..41986c23 100644
--- a/src/buildtool/file_system/symlinks_map/resolve_symlinks_map.hpp
+++ b/src/buildtool/file_system/symlinks_map/resolve_symlinks_map.hpp
@@ -15,10 +15,12 @@
#ifndef INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_SYMLINKS_MAP_RESOLVE_SYMLINKS_MAP_HPP
#define INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_SYMLINKS_MAP_RESOLVE_SYMLINKS_MAP_HPP
+#include <cstddef>
#include <filesystem>
#include <functional>
#include <optional>
#include <string>
+#include <utility> // std::move
#include "src/buildtool/file_system/git_repo.hpp"
#include "src/buildtool/file_system/object_type.hpp"
diff --git a/src/buildtool/graph_traverser/graph_traverser.hpp b/src/buildtool/graph_traverser/graph_traverser.hpp
index 7fad80ac..e0ae6b4a 100644
--- a/src/buildtool/graph_traverser/graph_traverser.hpp
+++ b/src/buildtool/graph_traverser/graph_traverser.hpp
@@ -16,6 +16,7 @@
#define INCLUDED_SRC_BUILDTOOL_GRAPH_TRAVERSER_GRAPH_TRAVERSER_HPP
#include <algorithm>
+#include <cstddef>
#include <cstdlib>
#include <filesystem>
#include <functional>
diff --git a/src/buildtool/logging/log_config.hpp b/src/buildtool/logging/log_config.hpp
index cad4f3f3..c37fc535 100644
--- a/src/buildtool/logging/log_config.hpp
+++ b/src/buildtool/logging/log_config.hpp
@@ -16,6 +16,7 @@
#define INCLUDED_SRC_BUILDTOOL_LOGGING_LOG_CONFIG_HPP
#include <mutex>
+#include <utility> // std::move
#include <vector>
#include "src/buildtool/logging/log_level.hpp"
diff --git a/src/buildtool/logging/logger.hpp b/src/buildtool/logging/logger.hpp
index d8e20f6d..bc380e6a 100644
--- a/src/buildtool/logging/logger.hpp
+++ b/src/buildtool/logging/logger.hpp
@@ -15,9 +15,11 @@
#ifndef INCLUDED_SRC_BUILDTOOL_LOGGING_LOGGER_HPP
#define INCLUDED_SRC_BUILDTOOL_LOGGING_LOGGER_HPP
+#include <algorithm>
#include <functional>
#include <memory>
#include <string>
+#include <utility> // std::move
#include <vector>
#include "fmt/core.h"
diff --git a/src/buildtool/main/analyse.hpp b/src/buildtool/main/analyse.hpp
index 960d4fc7..f93e0dda 100644
--- a/src/buildtool/main/analyse.hpp
+++ b/src/buildtool/main/analyse.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDOOL_MAIN_ANALYSE_HPP
#define INCLUDED_SRC_BUILDOOL_MAIN_ANALYSE_HPP
+#include <cstddef>
#include <optional>
#include <string>
diff --git a/src/buildtool/main/build_utils.hpp b/src/buildtool/main/build_utils.hpp
index e86e2a90..60f2ca97 100644
--- a/src/buildtool/main/build_utils.hpp
+++ b/src/buildtool/main/build_utils.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDOOL_MAIN_BUILD_UTILS_HPP
#define INCLUDED_SRC_BUILDOOL_MAIN_BUILD_UTILS_HPP
+#include <cstddef>
#include <functional>
#include <map>
#include <optional>
diff --git a/src/buildtool/main/describe.hpp b/src/buildtool/main/describe.hpp
index ca02924d..7642e087 100644
--- a/src/buildtool/main/describe.hpp
+++ b/src/buildtool/main/describe.hpp
@@ -15,6 +15,8 @@
#ifndef INCLUDED_SRC_BUILDTOOL_MAIN_DESCRIBE_HPP
#define INCLUDED_SRC_BUILDTOOL_MAIN_DESCRIBE_HPP
+#include <cstddef>
+
#include "gsl/gsl"
#include "src/buildtool/build_engine/base_maps/entity_name.hpp"
#include "src/buildtool/build_engine/target_map/configured_target.hpp"
diff --git a/src/buildtool/main/diagnose.cpp b/src/buildtool/main/diagnose.cpp
index 75e6854f..2da1c89a 100644
--- a/src/buildtool/main/diagnose.cpp
+++ b/src/buildtool/main/diagnose.cpp
@@ -14,6 +14,11 @@
#include "src/buildtool/main/diagnose.hpp"
+#include <algorithm>
+#include <cstddef>
+#include <string>
+#include <unordered_map>
+
#include "gsl/gsl"
#include "nlohmann/json.hpp"
#include "src/buildtool/logging/log_level.hpp"
diff --git a/src/buildtool/main/install_cas.cpp b/src/buildtool/main/install_cas.cpp
index 84968109..ed989883 100644
--- a/src/buildtool/main/install_cas.cpp
+++ b/src/buildtool/main/install_cas.cpp
@@ -14,6 +14,8 @@
#include "src/buildtool/main/install_cas.hpp"
+#include <cstddef>
+
#include "src/buildtool/compatibility/compatibility.hpp"
#include "src/buildtool/crypto/hash_function.hpp"
#include "src/buildtool/execution_api/remote/config.hpp"
diff --git a/src/buildtool/main/serve.cpp b/src/buildtool/main/serve.cpp
index cebbd247..c794308e 100644
--- a/src/buildtool/main/serve.cpp
+++ b/src/buildtool/main/serve.cpp
@@ -15,6 +15,7 @@
#include "src/buildtool/main/serve.hpp"
#include <chrono>
+#include <cstddef>
#ifndef BOOTSTRAP_BUILD_TOOL
diff --git a/src/buildtool/main/version.cpp b/src/buildtool/main/version.cpp
index 5900c53e..0dae24b8 100644
--- a/src/buildtool/main/version.cpp
+++ b/src/buildtool/main/version.cpp
@@ -14,6 +14,8 @@
#include "src/buildtool/main/version.hpp"
+#include <cstddef>
+
#include "nlohmann/json.hpp"
#include "src/utils/cpp/json.hpp"
diff --git a/src/buildtool/multithreading/async_map.hpp b/src/buildtool/multithreading/async_map.hpp
index 3267b312..41e7dded 100644
--- a/src/buildtool/multithreading/async_map.hpp
+++ b/src/buildtool/multithreading/async_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_MULTITHREADING_ASYNC_MAP_HPP
#define INCLUDED_SRC_BUILDTOOL_MULTITHREADING_ASYNC_MAP_HPP
+#include <cstddef>
#include <memory>
#include <mutex> // unique_lock
#include <shared_mutex>
diff --git a/src/buildtool/multithreading/async_map_consumer.hpp b/src/buildtool/multithreading/async_map_consumer.hpp
index 0de6b36f..bc7f33ac 100644
--- a/src/buildtool/multithreading/async_map_consumer.hpp
+++ b/src/buildtool/multithreading/async_map_consumer.hpp
@@ -17,12 +17,14 @@
#include <atomic>
#include <condition_variable>
+#include <cstddef>
#include <functional>
#include <mutex>
#include <shared_mutex>
#include <thread>
#include <unordered_map>
#include <unordered_set>
+#include <utility> // std::move
#include <vector>
#include "gsl/gsl"
diff --git a/src/buildtool/multithreading/async_map_node.hpp b/src/buildtool/multithreading/async_map_node.hpp
index 2c07f11b..15687344 100644
--- a/src/buildtool/multithreading/async_map_node.hpp
+++ b/src/buildtool/multithreading/async_map_node.hpp
@@ -18,6 +18,7 @@
#include <atomic>
#include <mutex>
#include <optional>
+#include <utility> // std::move
#include "gsl/gsl"
#include "src/buildtool/multithreading/task.hpp"
diff --git a/src/buildtool/multithreading/notification_queue.hpp b/src/buildtool/multithreading/notification_queue.hpp
index 9d2f06eb..f84e47c6 100644
--- a/src/buildtool/multithreading/notification_queue.hpp
+++ b/src/buildtool/multithreading/notification_queue.hpp
@@ -15,7 +15,9 @@
#ifndef INCLUDED_SRC_BUILDTOOL_MULTITHREADING_NOTIFICATION_QUEUE_HPP
#define INCLUDED_SRC_BUILDTOOL_MULTITHREADING_NOTIFICATION_QUEUE_HPP
+#include <atomic>
#include <condition_variable>
+#include <cstddef>
#include <deque>
#include <mutex>
#include <optional>
diff --git a/src/buildtool/multithreading/task.hpp b/src/buildtool/multithreading/task.hpp
index f1661b92..a8c4591e 100644
--- a/src/buildtool/multithreading/task.hpp
+++ b/src/buildtool/multithreading/task.hpp
@@ -17,6 +17,7 @@
#include <functional>
#include <type_traits>
+#include <utility> // std::move
class Task {
public:
diff --git a/src/buildtool/multithreading/task_system.hpp b/src/buildtool/multithreading/task_system.hpp
index 58d2352d..089dc3d8 100644
--- a/src/buildtool/multithreading/task_system.hpp
+++ b/src/buildtool/multithreading/task_system.hpp
@@ -17,7 +17,9 @@
#include <algorithm>
#include <atomic>
+#include <cstddef>
#include <thread>
+#include <utility> // std::forward
#include <vector>
#include "src/buildtool/multithreading/notification_queue.hpp"
diff --git a/src/buildtool/progress_reporting/progress.hpp b/src/buildtool/progress_reporting/progress.hpp
index d9b3aa8e..303617e1 100644
--- a/src/buildtool/progress_reporting/progress.hpp
+++ b/src/buildtool/progress_reporting/progress.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_PROGRESS_REPORTING_PROGRESS_HPP
#define INCLUDED_SRC_BUILDTOOL_PROGRESS_REPORTING_PROGRESS_HPP
+#include <cstddef>
#include <cstdlib>
#include <string>
#include <unordered_map>
diff --git a/src/buildtool/progress_reporting/task_tracker.hpp b/src/buildtool/progress_reporting/task_tracker.hpp
index 6a92ee12..b3ff8809 100644
--- a/src/buildtool/progress_reporting/task_tracker.hpp
+++ b/src/buildtool/progress_reporting/task_tracker.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_PROGRESS_REPORTING_TASK_TRACKER_HPP
#define INCLUDED_SRC_BUILDTOOL_PROGRESS_REPORTING_TASK_TRACKER_HPP
+#include <cstddef>
#include <cstdint>
#include <mutex>
#include <string>
diff --git a/src/buildtool/serve_api/remote/config.hpp b/src/buildtool/serve_api/remote/config.hpp
index 8978565b..17fe758e 100644
--- a/src/buildtool/serve_api/remote/config.hpp
+++ b/src/buildtool/serve_api/remote/config.hpp
@@ -16,6 +16,7 @@
#define INCLUDED_SRC_BUILDTOOL_SERVE_API_REMOTE_CONFIG_HPP
#include <chrono>
+#include <cstddef>
#include <filesystem>
#include <iterator>
#include <vector>
diff --git a/src/buildtool/serve_api/remote/serve_api.hpp b/src/buildtool/serve_api/remote/serve_api.hpp
index 055cf78b..83b2f9d0 100644
--- a/src/buildtool/serve_api/remote/serve_api.hpp
+++ b/src/buildtool/serve_api/remote/serve_api.hpp
@@ -18,6 +18,7 @@
#include <memory>
#include <optional>
#include <string>
+#include <unordered_map>
#include "src/buildtool/common/artifact.hpp"
#include "src/buildtool/common/artifact_digest.hpp"
diff --git a/src/buildtool/serve_api/remote/source_tree_client.hpp b/src/buildtool/serve_api/remote/source_tree_client.hpp
index 2ce89e4b..9eeef493 100644
--- a/src/buildtool/serve_api/remote/source_tree_client.hpp
+++ b/src/buildtool/serve_api/remote/source_tree_client.hpp
@@ -17,6 +17,7 @@
#include <memory>
#include <string>
+#include <unordered_map>
#include <variant>
#include "justbuild/just_serve/just_serve.grpc.pb.h"
diff --git a/src/buildtool/serve_api/serve_service/source_tree.cpp b/src/buildtool/serve_api/serve_service/source_tree.cpp
index 2674b3d7..7a4a8828 100644
--- a/src/buildtool/serve_api/serve_service/source_tree.cpp
+++ b/src/buildtool/serve_api/serve_service/source_tree.cpp
@@ -14,6 +14,7 @@
#include "src/buildtool/serve_api/serve_service/source_tree.hpp"
+#include <algorithm>
#include <shared_mutex>
#include <thread>
diff --git a/src/buildtool/serve_api/serve_service/source_tree.hpp b/src/buildtool/serve_api/serve_service/source_tree.hpp
index ce53d750..f2585f40 100644
--- a/src/buildtool/serve_api/serve_service/source_tree.hpp
+++ b/src/buildtool/serve_api/serve_service/source_tree.hpp
@@ -20,6 +20,7 @@
#include <mutex>
#include <optional>
#include <string>
+#include <unordered_map>
#include <utility>
#include <variant>
#include <vector>
diff --git a/src/buildtool/storage/config.hpp b/src/buildtool/storage/config.hpp
index 858f74ff..f0a13e96 100644
--- a/src/buildtool/storage/config.hpp
+++ b/src/buildtool/storage/config.hpp
@@ -23,6 +23,7 @@
#error "Non-unix is not supported yet"
#endif
+#include <cstddef>
#include <filesystem>
#include <functional>
#include <string>
diff --git a/src/buildtool/storage/garbage_collector.cpp b/src/buildtool/storage/garbage_collector.cpp
index 7ed8d572..cfc6daf5 100644
--- a/src/buildtool/storage/garbage_collector.cpp
+++ b/src/buildtool/storage/garbage_collector.cpp
@@ -16,6 +16,7 @@
#include "src/buildtool/storage/garbage_collector.hpp"
+#include <cstddef>
#include <filesystem>
#include <vector>
diff --git a/src/buildtool/storage/local_ac.hpp b/src/buildtool/storage/local_ac.hpp
index 069af936..41f7b7ac 100644
--- a/src/buildtool/storage/local_ac.hpp
+++ b/src/buildtool/storage/local_ac.hpp
@@ -15,6 +15,8 @@
#ifndef INCLUDED_SRC_BUILDTOOL_STORAGE_LOCAL_AC_HPP
#define INCLUDED_SRC_BUILDTOOL_STORAGE_LOCAL_AC_HPP
+#include <utility> // std::move
+
#include "gsl/gsl"
#include "src/buildtool/execution_api/common/execution_common.hpp"
#include "src/buildtool/file_system/file_storage.hpp"
diff --git a/src/buildtool/storage/local_cas.tpp b/src/buildtool/storage/local_cas.tpp
index 9bcb090d..744a14e9 100644
--- a/src/buildtool/storage/local_cas.tpp
+++ b/src/buildtool/storage/local_cas.tpp
@@ -15,6 +15,9 @@
#ifndef INCLUDED_SRC_BUILDTOOL_STORAGE_LOCAL_CAS_TPP
#define INCLUDED_SRC_BUILDTOOL_STORAGE_LOCAL_CAS_TPP
+#include <cstddef>
+#include <utility> // std::move
+
#include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp"
#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/storage/local_cas.hpp"
diff --git a/src/buildtool/storage/storage.hpp b/src/buildtool/storage/storage.hpp
index d4ea83fe..95d06495 100644
--- a/src/buildtool/storage/storage.hpp
+++ b/src/buildtool/storage/storage.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_BUILDTOOL_STORAGE_STORAGE_HPP
#define INCLUDED_SRC_BUILDTOOL_STORAGE_STORAGE_HPP
+#include <cstddef>
#include <filesystem>
#include <optional>
#include <vector>
diff --git a/src/buildtool/system/system_command.hpp b/src/buildtool/system/system_command.hpp
index 7c40ec2c..7f16fc99 100644
--- a/src/buildtool/system/system_command.hpp
+++ b/src/buildtool/system/system_command.hpp
@@ -24,6 +24,7 @@
#include <optional>
#include <sstream>
#include <string>
+#include <utility> // std::move
#include <vector>
#include <sys/wait.h>
diff --git a/src/other_tools/git_operations/git_ops_types.hpp b/src/other_tools/git_operations/git_ops_types.hpp
index 2c4b5ff0..0147ee57 100644
--- a/src/other_tools/git_operations/git_ops_types.hpp
+++ b/src/other_tools/git_operations/git_ops_types.hpp
@@ -18,6 +18,7 @@
#include <filesystem>
#include <optional>
#include <string>
+#include <utility> // std::move
#include "src/buildtool/file_system/git_cas.hpp"
#include "src/utils/cpp/path.hpp"
diff --git a/src/other_tools/git_operations/git_repo_remote.cpp b/src/other_tools/git_operations/git_repo_remote.cpp
index d323c08f..9820f352 100644
--- a/src/other_tools/git_operations/git_repo_remote.cpp
+++ b/src/other_tools/git_operations/git_repo_remote.cpp
@@ -14,6 +14,8 @@
#include "src/other_tools/git_operations/git_repo_remote.hpp"
+#include <utility> // std::move
+
#include "fmt/core.h"
#include "nlohmann/json.hpp"
#include "src/buildtool/file_system/git_utils.hpp"
diff --git a/src/other_tools/just_mr/cli.hpp b/src/other_tools/just_mr/cli.hpp
index 1a77bc62..04bda36a 100644
--- a/src/other_tools/just_mr/cli.hpp
+++ b/src/other_tools/just_mr/cli.hpp
@@ -15,10 +15,12 @@
#ifndef INCLUDED_SRC_OTHER_TOOLS_JUST_MR_CLI_HPP
#define INCLUDED_SRC_OTHER_TOOLS_JUST_MR_CLI_HPP
+#include <cstddef>
#include <filesystem>
#include <optional>
#include <string>
#include <thread>
+#include <unordered_map>
#include <vector>
#include "CLI/CLI.hpp"
diff --git a/src/other_tools/just_mr/fetch.cpp b/src/other_tools/just_mr/fetch.cpp
index 0dfb6c8a..f2c3e8a9 100644
--- a/src/other_tools/just_mr/fetch.cpp
+++ b/src/other_tools/just_mr/fetch.cpp
@@ -15,6 +15,7 @@
#include "src/other_tools/just_mr/fetch.hpp"
#include <filesystem>
+#include <utility> // std::move
#include "fmt/core.h"
#include "nlohmann/json.hpp"
diff --git a/src/other_tools/just_mr/mirrors.hpp b/src/other_tools/just_mr/mirrors.hpp
index 71d811b5..8b7dae30 100644
--- a/src/other_tools/just_mr/mirrors.hpp
+++ b/src/other_tools/just_mr/mirrors.hpp
@@ -19,7 +19,6 @@
#include <memory>
#include <string>
#include <unordered_map>
-#include <unordered_set>
#include <vector>
#include "nlohmann/json.hpp"
diff --git a/src/other_tools/just_mr/rc.cpp b/src/other_tools/just_mr/rc.cpp
index 8985c958..90d0f2ed 100644
--- a/src/other_tools/just_mr/rc.cpp
+++ b/src/other_tools/just_mr/rc.cpp
@@ -14,6 +14,8 @@
#include "src/other_tools/just_mr/rc.hpp"
+#include <utility> // std::move
+
#include "nlohmann/json.hpp"
#include "src/buildtool/build_engine/expression/configuration.hpp"
#include "src/buildtool/build_engine/expression/expression_ptr.hpp"
diff --git a/src/other_tools/just_mr/utils.hpp b/src/other_tools/just_mr/utils.hpp
index 909918bd..4d397902 100644
--- a/src/other_tools/just_mr/utils.hpp
+++ b/src/other_tools/just_mr/utils.hpp
@@ -18,6 +18,7 @@
#include <map>
#include <optional>
#include <string>
+#include <unordered_map>
#include <unordered_set>
#include <vector>
diff --git a/src/other_tools/ops_maps/archive_fetch_map.hpp b/src/other_tools/ops_maps/archive_fetch_map.hpp
index 9724a09b..7a676592 100644
--- a/src/other_tools/ops_maps/archive_fetch_map.hpp
+++ b/src/other_tools/ops_maps/archive_fetch_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_ARCHIVE_FETCH_MAP_HPP
#define INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_ARCHIVE_FETCH_MAP_HPP
+#include <cstddef>
#include <filesystem>
#include <optional>
diff --git a/src/other_tools/ops_maps/content_cas_map.cpp b/src/other_tools/ops_maps/content_cas_map.cpp
index d6a3e36e..a8d2eebf 100644
--- a/src/other_tools/ops_maps/content_cas_map.cpp
+++ b/src/other_tools/ops_maps/content_cas_map.cpp
@@ -14,6 +14,8 @@
#include "src/other_tools/ops_maps/content_cas_map.hpp"
+#include <utility> // std::move
+
#include "fmt/core.h"
#include "src/buildtool/file_system/file_storage.hpp"
#include "src/buildtool/serve_api/remote/serve_api.hpp"
diff --git a/src/other_tools/ops_maps/content_cas_map.hpp b/src/other_tools/ops_maps/content_cas_map.hpp
index d6ad0088..63934b24 100644
--- a/src/other_tools/ops_maps/content_cas_map.hpp
+++ b/src/other_tools/ops_maps/content_cas_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_CONTENT_CAS_MAP_HPP
#define INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_CONTENT_CAS_MAP_HPP
+#include <cstddef>
#include <optional>
#include <string>
#include <vector>
diff --git a/src/other_tools/ops_maps/critical_git_op_map.hpp b/src/other_tools/ops_maps/critical_git_op_map.hpp
index fc4cf758..fa091655 100644
--- a/src/other_tools/ops_maps/critical_git_op_map.hpp
+++ b/src/other_tools/ops_maps/critical_git_op_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_CRITICAL_GIT_OP_MAP_HPP
#define INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_CRITICAL_GIT_OP_MAP_HPP
+#include <cstddef>
#include <filesystem>
#include <memory>
#include <mutex>
diff --git a/src/other_tools/ops_maps/git_tree_fetch_map.cpp b/src/other_tools/ops_maps/git_tree_fetch_map.cpp
index fecd2756..743ba7f7 100644
--- a/src/other_tools/ops_maps/git_tree_fetch_map.cpp
+++ b/src/other_tools/ops_maps/git_tree_fetch_map.cpp
@@ -15,6 +15,7 @@
#include "src/other_tools/ops_maps/git_tree_fetch_map.hpp"
#include <cstdlib>
+#include <utility> // std::move
#include "fmt/core.h"
#include "src/buildtool/common/repository_config.hpp"
diff --git a/src/other_tools/ops_maps/git_tree_fetch_map.hpp b/src/other_tools/ops_maps/git_tree_fetch_map.hpp
index 1b012a2a..05ad1c3c 100644
--- a/src/other_tools/ops_maps/git_tree_fetch_map.hpp
+++ b/src/other_tools/ops_maps/git_tree_fetch_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_GIT_TREE_FETCH_MAP_HPP
#define INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_GIT_TREE_FETCH_MAP_HPP
+#include <cstddef>
#include <map>
#include <optional>
#include <string>
diff --git a/src/other_tools/ops_maps/git_update_map.hpp b/src/other_tools/ops_maps/git_update_map.hpp
index e1aac2e3..bc021113 100644
--- a/src/other_tools/ops_maps/git_update_map.hpp
+++ b/src/other_tools/ops_maps/git_update_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_GIT_UPDATE_MAP_HPP
#define INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_GIT_UPDATE_MAP_HPP
+#include <cstddef>
#include <string>
#include <utility>
#include <vector>
diff --git a/src/other_tools/ops_maps/import_to_git_map.hpp b/src/other_tools/ops_maps/import_to_git_map.hpp
index 50f80150..d56c2d71 100644
--- a/src/other_tools/ops_maps/import_to_git_map.hpp
+++ b/src/other_tools/ops_maps/import_to_git_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_IMPORT_TO_GIT_MAP_HPP
#define INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_IMPORT_TO_GIT_MAP_HPP
+#include <cstddef>
#include <filesystem>
#include <string>
#include <utility>
diff --git a/src/other_tools/repo_map/repos_to_setup_map.cpp b/src/other_tools/repo_map/repos_to_setup_map.cpp
index df7eebb0..7ccb73d9 100644
--- a/src/other_tools/repo_map/repos_to_setup_map.cpp
+++ b/src/other_tools/repo_map/repos_to_setup_map.cpp
@@ -14,6 +14,9 @@
#include "src/other_tools/repo_map/repos_to_setup_map.hpp"
+#include <unordered_map>
+#include <utility> // std::move
+
#include "fmt/core.h"
#include "src/buildtool/file_system/file_root.hpp"
#include "src/buildtool/file_system/symlinks_map/pragma_special.hpp"
diff --git a/src/other_tools/repo_map/repos_to_setup_map.hpp b/src/other_tools/repo_map/repos_to_setup_map.hpp
index 4cf992e8..64bec13a 100644
--- a/src/other_tools/repo_map/repos_to_setup_map.hpp
+++ b/src/other_tools/repo_map/repos_to_setup_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_OTHER_TOOLS_REPO_MAP_REPOS_TO_SETUP_MAP_HPP
#define INCLUDED_SRC_OTHER_TOOLS_REPO_MAP_REPOS_TO_SETUP_MAP_HPP
+#include <cstddef>
#include <memory>
#include <optional>
#include <string>
diff --git a/src/other_tools/root_maps/commit_git_map.hpp b/src/other_tools/root_maps/commit_git_map.hpp
index 423393fb..79fe873d 100644
--- a/src/other_tools/root_maps/commit_git_map.hpp
+++ b/src/other_tools/root_maps/commit_git_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_COMMIT_GIT_MAP_HPP
#define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_COMMIT_GIT_MAP_HPP
+#include <cstddef>
#include <optional>
#include <string>
#include <utility>
diff --git a/src/other_tools/root_maps/content_git_map.hpp b/src/other_tools/root_maps/content_git_map.hpp
index f369e944..d278b44a 100644
--- a/src/other_tools/root_maps/content_git_map.hpp
+++ b/src/other_tools/root_maps/content_git_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_CONTENT_GIT_MAP_HPP
#define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_CONTENT_GIT_MAP_HPP
+#include <cstddef>
#include <optional>
#include <utility>
diff --git a/src/other_tools/root_maps/distdir_git_map.hpp b/src/other_tools/root_maps/distdir_git_map.hpp
index 4100ebfc..abaa1e84 100644
--- a/src/other_tools/root_maps/distdir_git_map.hpp
+++ b/src/other_tools/root_maps/distdir_git_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_DISTDIR_GIT_MAP_HPP
#define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_DISTDIR_GIT_MAP_HPP
+#include <cstddef>
#include <memory>
#include <optional>
#include <string>
diff --git a/src/other_tools/root_maps/foreign_file_git_map.hpp b/src/other_tools/root_maps/foreign_file_git_map.hpp
index c37d97f3..363a80f1 100644
--- a/src/other_tools/root_maps/foreign_file_git_map.hpp
+++ b/src/other_tools/root_maps/foreign_file_git_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_FOREIGN_FILE_GIT_MAP_HPP
#define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_FOREIGN_FILE_GIT_MAP_HPP
+#include <cstddef>
#include <optional>
#include <utility>
diff --git a/src/other_tools/root_maps/fpath_git_map.cpp b/src/other_tools/root_maps/fpath_git_map.cpp
index 4c398612..7f05e8b5 100644
--- a/src/other_tools/root_maps/fpath_git_map.cpp
+++ b/src/other_tools/root_maps/fpath_git_map.cpp
@@ -14,6 +14,8 @@
#include "src/other_tools/root_maps/fpath_git_map.hpp"
+#include <utility> // std::move
+
#include "fmt/core.h"
#include "src/buildtool/execution_api/local/config.hpp"
#include "src/buildtool/file_system/file_root.hpp"
diff --git a/src/other_tools/root_maps/fpath_git_map.hpp b/src/other_tools/root_maps/fpath_git_map.hpp
index e6cd45f9..398e9c3c 100644
--- a/src/other_tools/root_maps/fpath_git_map.hpp
+++ b/src/other_tools/root_maps/fpath_git_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_FPATH_GIT_MAP_HPP
#define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_FPATH_GIT_MAP_HPP
+#include <cstddef>
#include <filesystem>
#include <optional>
#include <string>
diff --git a/src/other_tools/root_maps/tree_id_git_map.hpp b/src/other_tools/root_maps/tree_id_git_map.hpp
index 6a4e93b0..56cf783d 100644
--- a/src/other_tools/root_maps/tree_id_git_map.hpp
+++ b/src/other_tools/root_maps/tree_id_git_map.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_TREE_ID_GIT_MAP_HPP
#define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_TREE_ID_GIT_MAP_HPP
+#include <cstddef>
#include <optional>
#include <string>
#include <utility>
diff --git a/src/other_tools/utils/content.hpp b/src/other_tools/utils/content.hpp
index b1308a97..15c582c4 100644
--- a/src/other_tools/utils/content.hpp
+++ b/src/other_tools/utils/content.hpp
@@ -17,6 +17,7 @@
#include <optional>
#include <string>
+#include <utility> // std::move
#include <variant>
#include "src/buildtool/common/user_structs.hpp"
diff --git a/src/other_tools/utils/parse_archive.cpp b/src/other_tools/utils/parse_archive.cpp
index f0026eaa..1aebe239 100644
--- a/src/other_tools/utils/parse_archive.cpp
+++ b/src/other_tools/utils/parse_archive.cpp
@@ -14,6 +14,8 @@
#include "src/other_tools/utils/parse_archive.hpp"
+#include <utility> // std::move
+
#include "fmt/core.h"
namespace {
diff --git a/src/utils/automata/dfa_minimizer.hpp b/src/utils/automata/dfa_minimizer.hpp
index 93acb83e..950635ac 100644
--- a/src/utils/automata/dfa_minimizer.hpp
+++ b/src/utils/automata/dfa_minimizer.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_UTILS_AUTOMATA_DFA_MINIMIZER_HPP
#define INCLUDED_SRC_UTILS_AUTOMATA_DFA_MINIMIZER_HPP
+#include <cstddef>
#include <map>
#include <regex>
#include <string>
diff --git a/src/utils/cpp/atomic.hpp b/src/utils/cpp/atomic.hpp
index bc2a7865..13dc8ca9 100644
--- a/src/utils/cpp/atomic.hpp
+++ b/src/utils/cpp/atomic.hpp
@@ -18,6 +18,7 @@
#include <atomic>
#include <condition_variable>
#include <shared_mutex>
+#include <utility> // std::move
// Atomic wrapper with notify/wait capabilities.
// TODO(modernize): Replace any use this class by C++20's std::atomic<T>, once
diff --git a/src/utils/cpp/concepts.hpp b/src/utils/cpp/concepts.hpp
index 167c6551..548fb960 100644
--- a/src/utils/cpp/concepts.hpp
+++ b/src/utils/cpp/concepts.hpp
@@ -16,6 +16,7 @@
#define INCLUDED_SRC_UTILS_CPP_CONCEPTS_HPP
#include <chrono>
+#include <cstddef>
#include <string>
#include <type_traits>
diff --git a/src/utils/cpp/file_locking.hpp b/src/utils/cpp/file_locking.hpp
index 24aeb90b..f8ac1443 100644
--- a/src/utils/cpp/file_locking.hpp
+++ b/src/utils/cpp/file_locking.hpp
@@ -18,6 +18,7 @@
#include <filesystem>
#include <memory>
#include <optional>
+#include <utility> // std::move
#include "gsl/gsl"
diff --git a/src/utils/cpp/hash_combine.hpp b/src/utils/cpp/hash_combine.hpp
index 6660815d..a09c9985 100644
--- a/src/utils/cpp/hash_combine.hpp
+++ b/src/utils/cpp/hash_combine.hpp
@@ -15,6 +15,8 @@
#ifndef INCLUDED_SRC_UTILS_CPP_HASH_COMBINE_HPP
#define INCLUDED_SRC_UTILS_CPP_HASH_COMBINE_HPP
+#include <cstddef>
+
#include "gsl/gsl"
// Taken from Boost, as hash_combine did not yet make it to STL.
diff --git a/src/utils/cpp/json.hpp b/src/utils/cpp/json.hpp
index d83f30ed..c52b8bd2 100644
--- a/src/utils/cpp/json.hpp
+++ b/src/utils/cpp/json.hpp
@@ -16,6 +16,7 @@
#define INCLUDED_SRC_UTILS_CPP_JSON_HPP
#include <algorithm>
+#include <cstddef>
#include <optional>
#include <sstream>
#include <string>
diff --git a/src/utils/cpp/path_hash.hpp b/src/utils/cpp/path_hash.hpp
index 0f3910f2..2f433c30 100644
--- a/src/utils/cpp/path_hash.hpp
+++ b/src/utils/cpp/path_hash.hpp
@@ -15,6 +15,7 @@
#ifndef INCLUDED_SRC_UTILS_CPP_PATH_HASH_HPP
#define INCLUDED_SRC_UTILS_CPP_PATH_HASH_HPP
+#include <cstddef>
#include <filesystem>
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)