6 files changed, 27 insertions, 5 deletions
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"]
   }
 }