Add dependencies explicitly that are included directly

... instead of relying on those dependencies being pulled in
indirectly.

33 files changed, 123 insertions, 13 deletions

diff --git a/src/buildtool/build_engine/base_maps/TARGETS b/src/buildtool/build_engine/base_maps/TARGETS
index a281af9d..eef04138 100644
--- a/src/buildtool/build_engine/base_maps/TARGETS
+++ b/src/buildtool/build_engine/base_maps/TARGETS
@@ -12,6 +12,7 @@
   , "srcs": ["directory_map.cpp"]
   , "deps":
     [ "module_name"
+    , ["@", "gsl", "", "gsl"]
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/file_system", "file_root"]
     , ["src/buildtool/multithreading", "async_map_consumer"]
@@ -91,7 +92,12 @@
     ]
   , "stage": ["src", "buildtool", "build_engine", "base_maps"]
   , "private-deps":
-    [["src/buildtool/crypto", "hash_function"], ["src/utils/cpp", "json"]]
+    [ ["src/buildtool/common", "artifact_description"]
+    , ["src/buildtool/common", "common"]
+    , ["src/buildtool/crypto", "hash_function"]
+    , ["src/buildtool/file_system", "object_type"]
+    , ["src/utils/cpp", "json"]
+    ]
   }
 , "field_reader":
   { "type": ["@", "rules", "CC", "library"]
@@ -113,7 +119,8 @@
   , "name": ["expression_function"]
   , "hdrs": ["expression_function.hpp"]
   , "deps":
-    [ ["@", "gsl", "", "gsl"]
+    [ ["@", "fmt", "", "fmt"]
+    , ["@", "gsl", "", "gsl"]
     , ["src/buildtool/build_engine/expression", "expression"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
diff --git a/src/buildtool/build_engine/expression/TARGETS b/src/buildtool/build_engine/expression/TARGETS
index 454f7726..a7e7a37b 100644
--- a/src/buildtool/build_engine/expression/TARGETS
+++ b/src/buildtool/build_engine/expression/TARGETS
@@ -43,6 +43,7 @@
     [ "expression_ptr_interface"
     , "linked_map"
     , ["@", "gsl", "", "gsl"]
+    , ["@", "json", "", "json"]
     , ["src/buildtool/build_engine/base_maps", "entity_name_data"]
     , ["src/buildtool/common", "artifact_description"]
     , ["src/buildtool/crypto", "hash_function"]
@@ -55,7 +56,8 @@
     ]
   , "stage": ["src", "buildtool", "build_engine", "expression"]
   , "private-deps":
-    [ ["src/buildtool/crypto", "hasher"]
+    [ ["@", "fmt", "", "fmt"]
+    , ["src/buildtool/crypto", "hasher"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/utils/cpp", "path"]
diff --git a/src/buildtool/build_engine/target_map/TARGETS b/src/buildtool/build_engine/target_map/TARGETS
index a8122270..b260a816 100644
--- a/src/buildtool/build_engine/target_map/TARGETS
+++ b/src/buildtool/build_engine/target_map/TARGETS
@@ -17,6 +17,7 @@
   , "hdrs": ["result_map.hpp"]
   , "deps":
     [ ["@", "gsl", "", "gsl"]
+    , ["@", "json", "", "json"]
     , ["src/buildtool/build_engine/analysed_target", "target"]
     , ["src/buildtool/build_engine/base_maps", "entity_name"]
     , ["src/buildtool/build_engine/expression", "expression"]
@@ -59,6 +60,8 @@
     , ["src/buildtool/build_engine/base_maps", "entity_name"]
     , ["src/buildtool/build_engine/base_maps", "field_reader"]
     , ["src/buildtool/build_engine/expression", "expression"]
+    , ["src/buildtool/build_engine/expression", "expression_ptr_interface"]
+    , ["src/buildtool/common", "artifact_description"]
     , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "config"]
@@ -86,6 +89,7 @@
   , "deps":
     [ "configured_target"
     , "target_map"
+    , ["@", "gsl", "", "gsl"]
     , ["src/buildtool/build_engine/analysed_target", "target"]
     , ["src/buildtool/build_engine/base_maps", "entity_name"]
     , ["src/buildtool/build_engine/base_maps", "field_reader"]
diff --git a/src/buildtool/common/TARGETS b/src/buildtool/common/TARGETS
index 17f4062d..f17bc651 100644
--- a/src/buildtool/common/TARGETS
+++ b/src/buildtool/common/TARGETS
@@ -52,7 +52,11 @@
     , ["src/utils/cpp", "expected"]
     , ["src/utils/cpp", "gsl"]
     ]
-  , "private-deps": ["protocol_traits", ["src/buildtool/crypto", "hasher"]]
+  , "private-deps":
+    [ "protocol_traits"
+    , ["@", "gsl", "", "gsl"]
+    , ["src/buildtool/crypto", "hasher"]
+    ]
   , "stage": ["src", "buildtool", "common"]
   }
 , "artifact_digest_factory":
@@ -110,7 +114,11 @@
     , ["src/buildtool/file_system", "object_type"]
     , ["src/buildtool/logging", "logging"]
     ]
-  , "private-deps": ["artifact_digest_factory", ["src/utils/cpp", "json"]]
+  , "private-deps":
+    [ "artifact_digest_factory"
+    , ["src/buildtool/logging", "log_level"]
+    , ["src/utils/cpp", "json"]
+    ]
   , "stage": ["src", "buildtool", "common"]
   }
 , "action_description":
diff --git a/src/buildtool/common/remote/TARGETS b/src/buildtool/common/remote/TARGETS
index f29a3510..8ca9daa8 100644
--- a/src/buildtool/common/remote/TARGETS
+++ b/src/buildtool/common/remote/TARGETS
@@ -8,6 +8,7 @@
     , ["@", "grpc", "", "grpc++"]
     , ["@", "gsl", "", "gsl"]
     , ["src/buildtool/auth", "auth"]
+    , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
diff --git a/src/buildtool/execution_api/bazel_msg/TARGETS b/src/buildtool/execution_api/bazel_msg/TARGETS
index 5c69e161..8fed5ede 100644
--- a/src/buildtool/execution_api/bazel_msg/TARGETS
+++ b/src/buildtool/execution_api/bazel_msg/TARGETS
@@ -36,6 +36,7 @@
     ]
   , "private-deps":
     [ ["@", "fmt", "", "fmt"]
+    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/file_system", "git_repo"]
     , ["src/utils/cpp", "hex_string"]
@@ -57,6 +58,7 @@
     [ ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
+    , ["src/utils/cpp", "gsl"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "bazel_msg"]
   }
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 7f263fc1..8532b93e 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -14,6 +14,7 @@
   , "deps":
     [ "artifact_blob_container"
     , ["@", "gsl", "", "gsl"]
+    , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "protocol_traits"]
     , ["src/buildtool/crypto", "hash_function"]
@@ -21,13 +22,17 @@
     , ["src/buildtool/execution_engine/dag", "dag"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/file_system", "git_repo"]
+    , ["src/buildtool/file_system", "object_type"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/utils/cpp", "expected"]
     , ["src/utils/cpp", "gsl"]
     , ["src/utils/cpp", "hex_string"]
     ]
-  , "private-deps": [["src/buildtool/common", "artifact_digest_factory"]]
+  , "private-deps":
+    [ ["@", "json", "", "json"]
+    , ["src/buildtool/common", "artifact_digest_factory"]
+    ]
   , "stage": ["src", "buildtool", "execution_api", "common"]
   }
 , "bytestream_utils":
@@ -47,6 +52,7 @@
   , "stage": ["src", "buildtool", "execution_api", "common"]
   , "deps":
     [ "common"
+    , ["@", "gsl", "", "gsl"]
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/execution_api/local", "context"]
@@ -62,7 +68,7 @@
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["message_limits"]
   , "hdrs": ["message_limits.hpp"]
-  , "deps": [["@", "grpc", "", "grpc++"]]
+  , "deps": [["@", "grpc", "", "grpc"]]
   , "stage": ["src", "buildtool", "execution_api", "common"]
   }
 , "common_api":
diff --git a/src/buildtool/execution_api/execution_service/TARGETS b/src/buildtool/execution_api/execution_service/TARGETS
index abb6a38b..4e325a35 100644
--- a/src/buildtool/execution_api/execution_service/TARGETS
+++ b/src/buildtool/execution_api/execution_service/TARGETS
@@ -46,7 +46,8 @@
     , ["src/buildtool/storage", "storage"]
     ]
   , "private-deps":
-    [ ["src/buildtool/common", "artifact_digest_factory"]
+    [ ["@", "fmt", "", "fmt"]
+    , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/logging", "log_level"]
     ]
@@ -82,7 +83,8 @@
   , "srcs": ["server_implementation.cpp"]
   , "stage": ["src", "buildtool", "execution_api", "execution_service"]
   , "deps":
-    [ ["src/buildtool/execution_api/common", "api_bundle"]
+    [ ["@", "gsl", "", "gsl"]
+    , ["src/buildtool/execution_api/common", "api_bundle"]
     , ["src/buildtool/execution_api/local", "context"]
     , ["src/buildtool/execution_api/remote", "context"]
     ]
@@ -152,6 +154,7 @@
   , "srcs": ["operation_cache.cpp"]
   , "stage": ["src", "buildtool", "execution_api", "execution_service"]
   , "proto": [["@", "googleapis", "", "google_longrunning_operations_proto"]]
+  , "deps": [["@", "protoc", "", "libprotobuf"]]
   , "private-deps": [["src/buildtool/logging", "logging"]]
   }
 , "operations_server":
@@ -162,6 +165,7 @@
   , "deps":
     [ "operation_cache"
     , ["@", "gsl", "", "gsl"]
+    , ["@", "protoc", "", "libprotobuf"]
     , ["src/buildtool/logging", "logging"]
     ]
   , "proto": [["@", "googleapis", "", "google_longrunning_operations_proto"]]
diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS
index 071d29be..66a27034 100644
--- a/src/buildtool/execution_api/local/TARGETS
+++ b/src/buildtool/execution_api/local/TARGETS
@@ -35,6 +35,7 @@
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
     , ["src/buildtool/execution_api/common", "artifact_blob_container"]
+    , ["src/buildtool/execution_api/common", "blob_tree"]
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/common", "common_api"]
     , ["src/buildtool/execution_api/execution_service", "cas_utils"]
diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS
index a3e072a5..2c356660 100644
--- a/src/buildtool/execution_api/remote/TARGETS
+++ b/src/buildtool/execution_api/remote/TARGETS
@@ -45,6 +45,7 @@
   , "proto":
     [ ["@", "bazel_remote_apis", "", "remote_execution_proto"]
     , ["@", "googleapis", "", "google_bytestream_proto"]
+    , ["@", "googleapis", "", "google_longrunning_operations_proto"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "remote"]
   , "private-deps":
@@ -75,6 +76,7 @@
     , ["src/buildtool/common/remote", "port"]
     , ["src/buildtool/common/remote", "retry_config"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
+    , ["src/buildtool/execution_api/common", "blob_tree"]
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/common", "common_api"]
     ]
@@ -83,12 +85,15 @@
     [ "bazel_network"
     , ["@", "fmt", "", "fmt"]
     , ["src/buildtool/common", "artifact_digest_factory"]
+    , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/common", "protocol_traits"]
     , ["src/buildtool/crypto", "hash_function"]
+    , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
     , ["src/buildtool/execution_api/common", "artifact_blob_container"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/file_system", "object_type"]
     , ["src/buildtool/logging", "log_level"]
+    , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/multithreading", "task_system"]
     , ["src/buildtool/storage", "fs_utils"]
     ]
diff --git a/src/buildtool/execution_api/utils/TARGETS b/src/buildtool/execution_api/utils/TARGETS
index d8e5a2b0..fb5ca96a 100644
--- a/src/buildtool/execution_api/utils/TARGETS
+++ b/src/buildtool/execution_api/utils/TARGETS
@@ -12,6 +12,7 @@
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
     , ["src/buildtool/execution_api/common", "common"]
+    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "utils"]
@@ -20,7 +21,10 @@
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["outputscheck"]
   , "hdrs": ["outputscheck.hpp"]
-  , "deps": [["src/buildtool/common", "common"]]
+  , "deps":
+    [ ["src/buildtool/common", "bazel_types"]
+    , ["src/buildtool/common", "common"]
+    ]
   , "stage": ["src", "buildtool", "execution_api", "utils"]
   }
 }
diff --git a/src/buildtool/graph_traverser/TARGETS b/src/buildtool/graph_traverser/TARGETS
index 172f821b..6ea498c2 100644
--- a/src/buildtool/graph_traverser/TARGETS
+++ b/src/buildtool/graph_traverser/TARGETS
@@ -4,6 +4,7 @@
   , "hdrs": ["graph_traverser.hpp"]
   , "deps":
     [ ["@", "fmt", "", "fmt"]
+    , ["@", "gsl", "", "gsl"]
     , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "cli"]
     , ["src/buildtool/common", "common"]
diff --git a/src/buildtool/main/TARGETS b/src/buildtool/main/TARGETS
index 08d20d55..22419e31 100644
--- a/src/buildtool/main/TARGETS
+++ b/src/buildtool/main/TARGETS
@@ -21,12 +21,16 @@
     , ["@", "gsl", "", "gsl"]
     , ["@", "json", "", "json"]
     , ["src/buildtool/auth", "auth"]
+    , ["src/buildtool/build_engine/base_maps", "entity_name"]
+    , ["src/buildtool/build_engine/expression", "expression"]
     , ["src/buildtool/build_engine/target_map", "result_map"]
     , ["src/buildtool/build_engine/target_map", "target_map"]
+    , ["src/buildtool/common", "artifact_description"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/common", "protocol_traits"]
     , ["src/buildtool/common/remote", "remote_common"]
+    , ["src/buildtool/common/remote", "retry_config"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/execution_api/common", "api_bundle"]
     , [ "src/buildtool/execution_api/execution_service"
@@ -35,11 +39,13 @@
     , ["src/buildtool/execution_api/local", "config"]
     , ["src/buildtool/execution_api/local", "context"]
     , ["src/buildtool/execution_api/remote", "config"]
+    , ["src/buildtool/execution_api/remote", "context"]
     , ["src/buildtool/execution_engine/executor", "context"]
     , ["src/buildtool/file_system", "file_root"]
     , ["src/buildtool/graph_traverser", "graph_traverser"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
+    , ["src/buildtool/multithreading", "async_map_consumer"]
     , ["src/buildtool/multithreading", "task_system"]
     , ["src/buildtool/progress_reporting", "progress"]
     , ["src/buildtool/progress_reporting", "progress_reporter"]
@@ -47,6 +53,7 @@
     , ["src/buildtool/serve_api/remote", "serve_api"]
     , ["src/buildtool/serve_api/serve_service", "serve_server_implementation"]
     , ["src/buildtool/storage", "backend_description"]
+    , ["src/buildtool/storage", "config"]
     , ["src/buildtool/storage", "file_chunker"]
     , ["src/buildtool/storage", "storage"]
     , ["src/utils/cpp", "concepts"]
@@ -339,6 +346,9 @@
     , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/file_system", "git_repo"]
     , ["src/buildtool/file_system", "object_type"]
+    , ["src/buildtool/logging", "log_level"]
+    , ["src/buildtool/logging", "logging"]
+    , ["src/utils/cpp", "expected"]
     , ["src/utils/cpp", "hex_string"]
     ]
   }
diff --git a/src/buildtool/multithreading/TARGETS b/src/buildtool/multithreading/TARGETS
index 619224ce..fa76b3d4 100644
--- a/src/buildtool/multithreading/TARGETS
+++ b/src/buildtool/multithreading/TARGETS
@@ -64,6 +64,7 @@
   , "deps":
     [ "async_map_consumer"
     , ["@", "fmt", "", "fmt"]
+    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     ]
   , "stage": ["src", "buildtool", "multithreading"]
diff --git a/src/buildtool/progress_reporting/TARGETS b/src/buildtool/progress_reporting/TARGETS
index e62ae77f..11dd87eb 100644
--- a/src/buildtool/progress_reporting/TARGETS
+++ b/src/buildtool/progress_reporting/TARGETS
@@ -40,7 +40,10 @@
   , "hdrs": ["base_progress_reporter.hpp"]
   , "srcs": ["base_progress_reporter.cpp"]
   , "stage": ["src", "buildtool", "progress_reporting"]
-  , "private-deps": [["src/buildtool/logging", "logging"]]
+  , "private-deps":
+    [ ["src/buildtool/logging", "log_level"]
+    , ["src/buildtool/logging", "logging"]
+    ]
   }
 , "exports_progress_reporter":
   { "type": ["@", "rules", "CC", "library"]
diff --git a/src/buildtool/serve_api/remote/TARGETS b/src/buildtool/serve_api/remote/TARGETS
index 9b4e3a4e..baf2b68c 100644
--- a/src/buildtool/serve_api/remote/TARGETS
+++ b/src/buildtool/serve_api/remote/TARGETS
@@ -81,6 +81,7 @@
     , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/common/remote", "client_common"]
     , ["src/buildtool/crypto", "hash_function"]
+    , ["src/buildtool/logging", "log_level"]
     ]
   }
 , "configuration_client":
diff --git a/src/buildtool/serve_api/serve_service/TARGETS b/src/buildtool/serve_api/serve_service/TARGETS
index 80c79f2f..05c29c3c 100644
--- a/src/buildtool/serve_api/serve_service/TARGETS
+++ b/src/buildtool/serve_api/serve_service/TARGETS
@@ -35,11 +35,13 @@
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/execution_api/serve", "mr_git_api"]
     , ["src/buildtool/execution_api/serve", "utils"]
+    , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/file_system", "git_repo"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/multithreading", "async_map_utils"]
     , ["src/buildtool/storage", "fs_utils"]
     , ["src/buildtool/storage", "repository_garbage_collector"]
+    , ["src/buildtool/storage", "storage"]
     , ["src/utils/archive", "archive_ops"]
     ]
   }
@@ -76,6 +78,8 @@
     , ["src/buildtool/execution_api/execution_service", "operations_server"]
     , ["src/buildtool/execution_api/local", "local"]
     , ["src/buildtool/execution_api/serve", "mr_local_api"]
+    , ["src/buildtool/file_system", "file_system_manager"]
+    , ["src/buildtool/file_system", "git_repo"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/storage", "config"]
     , ["src/buildtool/storage", "storage"]
@@ -129,6 +133,7 @@
     , ["src/buildtool/serve_api/remote", "serve_api"]
     , ["src/buildtool/storage", "backend_description"]
     , ["src/buildtool/storage", "repository_garbage_collector"]
+    , ["src/buildtool/storage", "storage"]
     ]
   }
 , "configuration_service":
diff --git a/src/buildtool/storage/TARGETS b/src/buildtool/storage/TARGETS
index 73356708..646c4619 100644
--- a/src/buildtool/storage/TARGETS
+++ b/src/buildtool/storage/TARGETS
@@ -29,6 +29,7 @@
   , "private-deps":
     [ ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/file_system", "file_system_manager"]
+    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     ]
   , "stage": ["src", "buildtool", "storage"]
@@ -85,12 +86,15 @@
     , ["src/utils/cpp", "expected"]
     , ["src/utils/cpp", "file_locking"]
     , ["src/utils/cpp", "gsl"]
+    , ["src/utils/cpp", "tmp_dir"]
     ]
   , "stage": ["src", "buildtool", "storage"]
   , "private-deps":
-    [ ["src/buildtool/execution_api/common", "message_limits"]
+    [ ["src/buildtool/crypto", "hasher"]
+    , ["src/buildtool/execution_api/common", "message_limits"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/multithreading", "task_system"]
+    , ["src/utils/cpp", "hex_string"]
     , ["src/utils/cpp", "path_hash"]
     ]
   }
diff --git a/src/other_tools/just_mr/TARGETS b/src/other_tools/just_mr/TARGETS
index 002e8fda..11cbecc8 100644
--- a/src/other_tools/just_mr/TARGETS
+++ b/src/other_tools/just_mr/TARGETS
@@ -132,6 +132,7 @@
     , ["src/buildtool/execution_api/remote", "config"]
     , ["src/buildtool/execution_api/remote", "context"]
     , ["src/buildtool/execution_api/serve", "mr_local_api"]
+    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/main", "retry"]
     , ["src/buildtool/multithreading", "async_map_utils"]
@@ -167,6 +168,7 @@
     , "utils"
     , ["@", "fmt", "", "fmt"]
     , ["@", "json", "", "json"]
+    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/multithreading", "async_map_utils"]
     , ["src/buildtool/multithreading", "task_system"]
@@ -209,6 +211,7 @@
     , ["src/buildtool/execution_api/remote", "context"]
     , ["src/buildtool/execution_api/serve", "mr_local_api"]
     , ["src/buildtool/file_system/symlinks_map", "resolve_symlinks_map"]
+    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/main", "retry"]
     , ["src/buildtool/multithreading", "async_map_utils"]
@@ -250,6 +253,7 @@
     , "utils"
     , ["@", "json", "", "json"]
     , ["src/buildtool/build_engine/expression", "expression"]
+    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/multithreading", "task_system"]
     , ["src/buildtool/storage", "repository_garbage_collector"]
@@ -273,12 +277,13 @@
   , "name": ["rc"]
   , "hdrs": ["rc.hpp"]
   , "srcs": ["rc.cpp"]
-  , "deps": ["cli"]
+  , "deps": ["cli", ["@", "gsl", "", "gsl"]]
   , "private-deps":
     [ "exit_codes"
     , "rc_merge"
     , ["@", "json", "", "json"]
     , ["src/buildtool/build_engine/expression", "expression"]
+    , ["src/buildtool/build_engine/expression", "expression_ptr_interface"]
     , ["src/buildtool/common", "location"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/logging", "log_level"]
diff --git a/src/other_tools/ops_maps/TARGETS b/src/other_tools/ops_maps/TARGETS
index 34c2d355..3bc2fbdf 100644
--- a/src/other_tools/ops_maps/TARGETS
+++ b/src/other_tools/ops_maps/TARGETS
@@ -72,6 +72,7 @@
     , ["src/other_tools/just_mr", "mirrors"]
     , ["src/other_tools/just_mr/progress_reporting", "progress"]
     , ["src/other_tools/ops_maps", "critical_git_op_map"]
+    , ["src/other_tools/utils", "curl_url_handle"]
     , ["src/utils/cpp", "hash_combine"]
     ]
   , "stage": ["src", "other_tools", "ops_maps"]
diff --git a/src/other_tools/root_maps/TARGETS b/src/other_tools/root_maps/TARGETS
index 921dbf80..33cd805f 100644
--- a/src/other_tools/root_maps/TARGETS
+++ b/src/other_tools/root_maps/TARGETS
@@ -154,6 +154,7 @@
     , ["@", "fmt", "", "fmt"]
     , ["src/buildtool/crypto", "hash_info"]
     , ["src/buildtool/file_system", "file_root"]
+    , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/storage", "fs_utils"]
     , ["src/utils/cpp", "tmp_dir"]
diff --git a/test/bootstrap/TARGETS b/test/bootstrap/TARGETS
index 288ed52d..690b20e9 100644
--- a/test/bootstrap/TARGETS
+++ b/test/bootstrap/TARGETS
@@ -60,6 +60,7 @@
     , ["@", "protoc", "", "protoc"]
     , ["@", "protoc", "", "libprotobuf"]
     , ["@", "grpc", "", "grpc++"]
+    , ["@", "grpc", "", "grpc"]
     , ["@", "grpc", "", "grpc_cpp_plugin"]
     , ["@", "src", "", "libarchive"]
     ]
diff --git a/test/buildtool/build_engine/base_maps/TARGETS b/test/buildtool/build_engine/base_maps/TARGETS
index faecc784..e243290c 100644
--- a/test/buildtool/build_engine/base_maps/TARGETS
+++ b/test/buildtool/build_engine/base_maps/TARGETS
@@ -32,6 +32,7 @@
     , ["@", "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"]
     , ["", "catch-main"]
     ]
   , "stage": ["test", "buildtool", "build_engine", "base_maps"]
@@ -62,12 +63,15 @@
     , ["@", "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/multithreading", "task_system"]
     , ["", "catch-main"]
     , ["utils", "test_hash_function_type"]
     ]
diff --git a/test/buildtool/build_engine/expression/TARGETS b/test/buildtool/build_engine/expression/TARGETS
index 01f7e610..1b994a02 100644
--- a/test/buildtool/build_engine/expression/TARGETS
+++ b/test/buildtool/build_engine/expression/TARGETS
@@ -17,6 +17,12 @@
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
     , ["@", "src", "src/buildtool/build_engine/expression", "expression"]
+    , [ "@"
+      , "src"
+      , "src/buildtool/build_engine/expression"
+      , "expression_ptr_interface"
+      ]
+    , ["@", "src", "src/buildtool/common", "artifact_description"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["", "catch-main"]
     , ["utils", "container_matchers"]
diff --git a/test/buildtool/build_engine/target_map/TARGETS b/test/buildtool/build_engine/target_map/TARGETS
index f1de7752..f2d50fce 100644
--- a/test/buildtool/build_engine/target_map/TARGETS
+++ b/test/buildtool/build_engine/target_map/TARGETS
@@ -25,20 +25,26 @@
     [ ["@", "catch2", "", "catch2"]
     , ["@", "src", "src/buildtool/auth", "auth"]
     , ["@", "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", "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/target_map", "target_map"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "config"]
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
+    , ["@", "src", "src/buildtool/execution_api/common", "api_bundle"]
     , ["@", "src", "src/buildtool/execution_api/local", "config"]
     , ["@", "src", "src/buildtool/execution_api/local", "context"]
     , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     , ["@", "src", "src/buildtool/execution_api/remote", "context"]
     , ["@", "src", "src/buildtool/file_system", "file_root"]
     , ["@", "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"]
diff --git a/test/buildtool/common/TARGETS b/test/buildtool/common/TARGETS
index bec2d031..298f93eb 100644
--- a/test/buildtool/common/TARGETS
+++ b/test/buildtool/common/TARGETS
@@ -23,6 +23,7 @@
     [ ["@", "catch2", "", "catch2"]
     , ["@", "json", "", "json"]
     , ["@", "src", "src/buildtool/common", "action_description"]
+    , ["@", "src", "src/buildtool/common", "artifact_description"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["", "catch-main"]
diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS
index 883fc1a6..7f0bd860 100644
--- a/test/buildtool/execution_api/bazel/TARGETS
+++ b/test/buildtool/execution_api/bazel/TARGETS
@@ -45,9 +45,11 @@
   , "srcs": ["bytestream_client.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "src", "src/buildtool/auth", "auth"]
     , ["@", "src", "src/buildtool/common", "bazel_digest_factory"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/execution_api/common", "bytestream_utils"]
+    , ["@", "src", "src/buildtool/execution_api/common", "common"]
     , ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"]
     , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     , ["@", "src", "src/buildtool/file_system", "object_type"]
@@ -65,6 +67,7 @@
   , "srcs": ["bazel_network.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "src", "src/buildtool/auth", "auth"]
     , ["@", "src", "src/buildtool/common", "bazel_digest_factory"]
     , ["@", "src", "src/buildtool/common", "protocol_traits"]
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
@@ -119,6 +122,7 @@
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/execution_api/remote", "bazel"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     , ["buildtool/execution_api/common", "api_test"]
     , ["utils", "catch-main-remote-execution"]
     , ["utils", "test_auth_config"]
diff --git a/test/buildtool/execution_api/common/TARGETS b/test/buildtool/execution_api/common/TARGETS
index a2bb8a82..13b393e3 100644
--- a/test/buildtool/execution_api/common/TARGETS
+++ b/test/buildtool/execution_api/common/TARGETS
@@ -41,6 +41,7 @@
     , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "protocol_traits"]
+    , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , [ "@"
       , "src"
       , "src/buildtool/execution_api/bazel_msg"
diff --git a/test/buildtool/execution_engine/executor/TARGETS b/test/buildtool/execution_engine/executor/TARGETS
index 3683a9d4..cc3e94d7 100644
--- a/test/buildtool/execution_engine/executor/TARGETS
+++ b/test/buildtool/execution_engine/executor/TARGETS
@@ -9,6 +9,8 @@
     , ["@", "src", "src/buildtool/common", "artifact_description"]
     , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "common"]
+    , ["@", "src", "src/buildtool/common", "config"]
+    , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/execution_api/common", "common"]
     , ["@", "src", "src/buildtool/execution_api/remote", "config"]
@@ -44,6 +46,7 @@
     , ["@", "src", "src/buildtool/execution_engine/dag", "dag"]
     , ["@", "src", "src/buildtool/execution_engine/executor", "context"]
     , ["@", "src", "src/buildtool/execution_engine/executor", "executor"]
+    , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["@", "src", "src/buildtool/progress_reporting", "progress"]
     , ["@", "src", "src/utils/cpp", "expected"]
     , ["", "catch-main"]
diff --git a/test/buildtool/graph_traverser/TARGETS b/test/buildtool/graph_traverser/TARGETS
index 7a437e9a..5e5633d5 100644
--- a/test/buildtool/graph_traverser/TARGETS
+++ b/test/buildtool/graph_traverser/TARGETS
@@ -4,6 +4,7 @@
   , "hdrs": ["graph_traverser.test.hpp"]
   , "deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "gsl", "", "gsl"]
     , ["@", "json", "", "json"]
     , ["@", "src", "src/buildtool/auth", "auth"]
     , ["@", "src", "src/buildtool/common", "common"]
@@ -23,6 +24,7 @@
     , ["@", "src", "src/buildtool/progress_reporting", "progress"]
     , ["@", "src", "src/buildtool/storage", "config"]
     , ["@", "src", "src/buildtool/storage", "storage"]
+    , ["@", "src", "src/utils/cpp", "json"]
     , ["utils", "test_hash_function_type"]
     ]
   , "stage": ["test", "buildtool", "graph_traverser"]
@@ -35,6 +37,7 @@
   , "private-deps":
     [ "graph_traverser_tests"
     , ["@", "catch2", "", "catch2"]
+    , ["@", "src", "src/buildtool/auth", "auth"]
     , ["@", "src", "src/buildtool/common", "protocol_traits"]
     , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     , ["@", "src", "src/buildtool/storage", "config"]
@@ -54,6 +57,7 @@
     [ "graph_traverser_tests"
     , ["@", "catch2", "", "catch2"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     , ["@", "src", "src/buildtool/storage", "config"]
     , ["@", "src", "src/buildtool/storage", "storage"]
     , ["utils", "catch-main-remote-execution"]
diff --git a/test/buildtool/multithreading/TARGETS b/test/buildtool/multithreading/TARGETS
index 0ff7f635..bd501759 100644
--- a/test/buildtool/multithreading/TARGETS
+++ b/test/buildtool/multithreading/TARGETS
@@ -4,6 +4,7 @@
   , "srcs": ["task.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "src", "src/buildtool/multithreading", "task"]
     , ["@", "src", "src/buildtool/multithreading", "task_system"]
     , ["", "catch-main"]
     ]
diff --git a/test/buildtool/storage/TARGETS b/test/buildtool/storage/TARGETS
index 214c1fa8..d3cc1c4c 100644
--- a/test/buildtool/storage/TARGETS
+++ b/test/buildtool/storage/TARGETS
@@ -33,6 +33,7 @@
   , "srcs": ["local_ac.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "gsl", "", "gsl"]
     , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "bazel_types"]
     , ["@", "src", "src/buildtool/common", "common"]
diff --git a/test/utils/TARGETS b/test/utils/TARGETS
index 409ce392..7d8f7148 100644
--- a/test/utils/TARGETS
+++ b/test/utils/TARGETS
@@ -14,11 +14,13 @@
     , "test_env"
     , "test_remote_config"
     , ["@", "gsl", "", "gsl"]
+    , ["@", "src", "src/buildtool/auth", "auth"]
     , ["@", "src", "src/buildtool/common", "bazel_digest_factory"]
     , ["@", "src", "src/buildtool/common", "bazel_types"]
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     ]
   , "stage": ["test", "utils"]
   }