4 files changed, 5 insertions, 11 deletions
diff --git a/src/buildtool/computed_roots/TARGETS b/src/buildtool/computed_roots/TARGETS
index a714cfc1..bb2bc0a4 100644
--- a/src/buildtool/computed_roots/TARGETS
+++ b/src/buildtool/computed_roots/TARGETS
@@ -66,7 +66,6 @@
     , ["src/buildtool/build_engine/base_maps", "module_name"]
     , ["src/buildtool/build_engine/base_maps", "targets_file_map"]
     , ["src/buildtool/build_engine/expression", "expression"]
-    , ["src/buildtool/build_engine/expression", "expression_ptr_interface"]
     , ["src/buildtool/build_engine/target_map", "configured_target"]
     , ["src/buildtool/common", "cli"]
     , ["src/buildtool/common", "common"]
diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS
index 5114dc35..b9d839a9 100644
--- a/src/buildtool/execution_api/local/TARGETS
+++ b/src/buildtool/execution_api/local/TARGETS
@@ -27,7 +27,6 @@
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/common", "protocol_traits"]
     , ["src/buildtool/crypto", "hash_function"]
-    , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
     , ["src/buildtool/execution_api/bazel_msg", "directory_tree"]
     , ["src/buildtool/execution_api/common", "artifact_blob_container"]
diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS
index b905970b..3b77f444 100644
--- a/src/buildtool/execution_api/remote/TARGETS
+++ b/src/buildtool/execution_api/remote/TARGETS
@@ -21,8 +21,7 @@
     , "bazel/bazel_network_reader.cpp"
     ]
   , "deps":
-    [ "config"
-    , ["@", "gsl", "", "gsl"]
+    [ ["@", "gsl", "", "gsl"]
     , ["src/buildtool/auth", "auth"]
     , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/common", "common"]
@@ -60,7 +59,6 @@
     , ["src/buildtool/execution_api/common", "content_blob_container"]
     , ["src/buildtool/execution_api/common", "message_limits"]
     , ["src/buildtool/execution_api/utils", "outputscheck"]
-    , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/file_system", "object_type"]
     , ["src/utils/cpp", "gsl"]
     , ["src/utils/cpp", "path"]
@@ -73,8 +71,7 @@
   , "hdrs": ["bazel/bazel_api.hpp"]
   , "srcs": ["bazel/bazel_api.cpp"]
   , "deps":
-    [ "config"
-    , ["@", "gsl", "", "gsl"]
+    [ ["@", "gsl", "", "gsl"]
     , ["src/buildtool/auth", "auth"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common/remote", "port"]
diff --git a/src/other_tools/just_mr/TARGETS b/src/other_tools/just_mr/TARGETS
index 2bb5db5b..a90aef8d 100644
--- a/src/other_tools/just_mr/TARGETS
+++ b/src/other_tools/just_mr/TARGETS
@@ -323,9 +323,8 @@
   , "hdrs": ["rc_merge.hpp"]
   , "srcs": ["rc_merge.cpp"]
   , "stage": ["src", "other_tools", "just_mr"]
-  , "deps":
-    [ ["src/buildtool/build_engine/expression", "expression"]
-    , ["src/buildtool/build_engine/expression", "expression_ptr_interface"]
-    ]
+  , "deps": [["src/buildtool/build_engine/expression", "expression"]]
+  , "private-deps":
+    [["src/buildtool/build_engine/expression", "expression_ptr_interface"]]
   }
 }