4 files changed, 31 insertions, 13 deletions
diff --git a/src/buildtool/execution_api/bazel_msg/TARGETS b/src/buildtool/execution_api/bazel_msg/TARGETS
index 8812d401..64cbddd3 100644
--- a/src/buildtool/execution_api/bazel_msg/TARGETS
+++ b/src/buildtool/execution_api/bazel_msg/TARGETS
@@ -4,12 +4,15 @@
   , "hdrs": ["bazel_blob.hpp", "bazel_blob_container.hpp", "bazel_common.hpp"]
   , "deps":
     [ ["src/buildtool/common", "common"]
-    , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/file_system", "file_system_manager"]
-    , ["src/buildtool/file_system", "git_cas"]
     , ["src/utils/cpp", "concepts"]
+    , ["src/buildtool/common", "bazel_types"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "bazel_msg"]
+  , "private-deps":
+    [ ["src/buildtool/crypto", "hash_function"]
+    , ["src/buildtool/file_system", "git_cas"]
+    ]
   }
 , "bazel_msg_factory":
   { "type": ["@", "rules", "CC", "library"]
@@ -19,11 +22,15 @@
   , "deps":
     [ "bazel_msg"
     , ["src/buildtool/common", "common"]
-    , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/file_system", "git_cas"]
     , ["src/buildtool/execution_engine/dag", "dag"]
-    , ["src/buildtool/compatibility", "compatibility"]
+    , ["src/buildtool/common", "bazel_types"]
+    ]
+  , "private-deps":
+    [ ["src/buildtool/compatibility", "compatibility"]
+    , ["src/utils/cpp", "hex_string"]
     , ["@", "gsl-lite", "", "gsl-lite"]
+    , ["src/buildtool/file_system", "file_system_manager"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "bazel_msg"]
   }
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 47ec0fc0..61a18115 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -11,11 +11,12 @@
     [ ["@", "gsl-lite", "", "gsl-lite"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/crypto", "hash_function"]
-    , ["src/buildtool/file_system", "object_type"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
     , ["src/utils/cpp", "hex_string"]
+    , ["src/buildtool/logging", "logging"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "common"]
+  , "private-deps": [["src/buildtool/file_system", "object_type"]]
   }
 }
diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS
index 4af36d70..7b839530 100644
--- a/src/buildtool/execution_api/local/TARGETS
+++ b/src/buildtool/execution_api/local/TARGETS
@@ -28,11 +28,16 @@
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
     , ["src/buildtool/file_system", "file_system_manager"]
-    , ["src/buildtool/file_system", "object_type"]
     , ["src/buildtool/compatibility", "compatibility"]
-    , ["src/buildtool/system", "system_command"]
     , ["src/buildtool/logging", "logging"]
+    , ["src/buildtool/common", "common"]
+    , ["src/buildtool/common", "bazel_types"]
+    , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "local"]
+  , "private-deps":
+    [ ["src/buildtool/file_system", "object_type"]
+    , ["src/buildtool/system", "system_command"]
+    ]
   }
 }
diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS
index 50a28550..8e15dcfd 100644
--- a/src/buildtool/execution_api/remote/TARGETS
+++ b/src/buildtool/execution_api/remote/TARGETS
@@ -21,21 +21,25 @@
     ]
   , "deps":
     [ "config"
-    , ["src/buildtool/common", "common"]
     , ["src/buildtool/logging", "logging"]
-    , ["src/buildtool/file_system", "file_system_manager"]
-    , ["src/buildtool/file_system", "object_type"]
-    , ["src/buildtool/compatibility", "compatibility"]
     , ["src/buildtool/execution_api/common", "common"]
-    , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
     , ["@", "grpc", "", "grpc++"]
     , ["@", "gsl-lite", "", "gsl-lite"]
+    , ["src/buildtool/common", "bazel_types"]
+    , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
     ]
   , "proto":
     [ ["@", "bazel_remote_apis", "", "remote_execution_proto"]
     , ["@", "googleapis", "", "google_bytestream_proto"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "remote"]
+  , "private-deps":
+    [ ["src/buildtool/common", "common"]
+    , ["src/buildtool/file_system", "file_system_manager"]
+    , ["src/buildtool/file_system", "object_type"]
+    , ["src/buildtool/compatibility", "compatibility"]
+    , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
+    ]
   }
 , "bazel":
   { "type": ["@", "rules", "CC", "library"]
@@ -44,12 +48,13 @@
   , "srcs": ["bazel/bazel_api.cpp"]
   , "deps":
     [ "config"
-    , "bazel_network"
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
     , ["@", "gsl-lite", "", "gsl-lite"]
+    , ["src/buildtool/common", "common"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "remote"]
+  , "private-deps": ["bazel_network"]
   }
 , "config":
   { "type": ["@", "rules", "CC", "library"]