Clean up unused dependencies

19 files changed, 21 insertions, 61 deletions

diff --git a/src/buildtool/build_engine/base_maps/TARGETS b/src/buildtool/build_engine/base_maps/TARGETS
index eef04138..3a3107be 100644
--- a/src/buildtool/build_engine/base_maps/TARGETS
+++ b/src/buildtool/build_engine/base_maps/TARGETS
@@ -87,14 +87,13 @@
     , ["src/buildtool/build_engine/analysed_target", "target"]
     , ["src/buildtool/build_engine/expression", "expression"]
     , ["src/buildtool/common", "config"]
+    , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/multithreading", "async_map_consumer"]
     , ["src/buildtool/multithreading", "task_system"]
     ]
   , "stage": ["src", "buildtool", "build_engine", "base_maps"]
   , "private-deps":
-    [ ["src/buildtool/common", "artifact_description"]
-    , ["src/buildtool/common", "common"]
-    , ["src/buildtool/crypto", "hash_function"]
+    [ ["src/buildtool/common", "common"]
     , ["src/buildtool/file_system", "object_type"]
     , ["src/utils/cpp", "json"]
     ]
@@ -127,7 +126,6 @@
     , ["src/utils/cpp", "gsl"]
     ]
   , "stage": ["src", "buildtool", "build_engine", "base_maps"]
-  , "private-deps": [["src/utils/cpp", "hash_combine"]]
   }
 , "expression_map":
   { "type": ["@", "rules", "CC", "library"]
@@ -146,8 +144,7 @@
     , ["src/buildtool/multithreading", "async_map_consumer"]
     ]
   , "stage": ["src", "buildtool", "build_engine", "base_maps"]
-  , "private-deps":
-    ["field_reader", ["src/buildtool/build_engine/expression", "expression"]]
+  , "private-deps": ["field_reader"]
   }
 , "user_rule":
   { "type": ["@", "rules", "CC", "library"]
@@ -182,7 +179,6 @@
     , ["src/buildtool/multithreading", "async_map_consumer"]
     ]
   , "stage": ["src", "buildtool", "build_engine", "base_maps"]
-  , "private-deps":
-    ["field_reader", ["src/buildtool/build_engine/expression", "expression"]]
+  , "private-deps": ["field_reader"]
   }
 }
diff --git a/src/buildtool/build_engine/expression/TARGETS b/src/buildtool/build_engine/expression/TARGETS
index a7e7a37b..ff615020 100644
--- a/src/buildtool/build_engine/expression/TARGETS
+++ b/src/buildtool/build_engine/expression/TARGETS
@@ -61,7 +61,6 @@
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/utils/cpp", "path"]
-    , ["src/utils/cpp", "type_safe_arithmetic"]
     ]
   }
 }
diff --git a/src/buildtool/build_engine/target_map/TARGETS b/src/buildtool/build_engine/target_map/TARGETS
index b260a816..17b79476 100644
--- a/src/buildtool/build_engine/target_map/TARGETS
+++ b/src/buildtool/build_engine/target_map/TARGETS
@@ -52,7 +52,6 @@
     , ["src/buildtool/build_engine/base_maps", "targets_file_map"]
     , ["src/buildtool/main", "analyse_context"]
     , ["src/buildtool/multithreading", "async_map_consumer"]
-    , ["src/buildtool/storage", "storage"]
     ]
   , "stage": ["src", "buildtool", "build_engine", "target_map"]
   , "private-deps":
@@ -67,14 +66,13 @@
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/crypto", "hasher"]
-    , ["src/buildtool/execution_api/local", "local"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/progress_reporting", "progress"]
     , ["src/buildtool/serve_api/remote", "config"]
     , ["src/buildtool/serve_api/remote", "serve_api"]
+    , ["src/buildtool/storage", "storage"]
     , ["src/utils/cpp", "gsl"]
-    , ["src/utils/cpp", "hash_combine"]
     , ["src/utils/cpp", "json"]
     , ["src/utils/cpp", "path"]
     , ["src/utils/cpp", "path_hash"]
diff --git a/src/buildtool/common/TARGETS b/src/buildtool/common/TARGETS
index f17bc651..878d2787 100644
--- a/src/buildtool/common/TARGETS
+++ b/src/buildtool/common/TARGETS
@@ -26,7 +26,6 @@
     , ["src/buildtool/build_engine/expression", "expression"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/logging", "log_level"]
-    , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/main", "build_utils"]
     , ["src/utils/cpp", "path"]
     ]
@@ -50,7 +49,6 @@
     , ["src/buildtool/crypto", "hash_info"]
     , ["src/buildtool/file_system", "object_type"]
     , ["src/utils/cpp", "expected"]
-    , ["src/utils/cpp", "gsl"]
     ]
   , "private-deps":
     [ "protocol_traits"
@@ -90,8 +88,7 @@
     , "statistics.hpp"
     ]
   , "deps":
-    [ "bazel_types"
-    , "protocol_traits"
+    [ "protocol_traits"
     , ["@", "json", "", "json"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/crypto", "hash_info"]
@@ -112,11 +109,11 @@
     , ["@", "json", "", "json"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/file_system", "object_type"]
-    , ["src/buildtool/logging", "logging"]
     ]
   , "private-deps":
     [ "artifact_digest_factory"
     , ["src/buildtool/logging", "log_level"]
+    , ["src/buildtool/logging", "logging"]
     , ["src/utils/cpp", "json"]
     ]
   , "stage": ["src", "buildtool", "common"]
@@ -146,8 +143,6 @@
     , "common"
     , ["@", "json", "", "json"]
     , ["src/buildtool/crypto", "hash_function"]
-    , ["src/buildtool/logging", "log_level"]
-    , ["src/buildtool/logging", "logging"]
     ]
   , "stage": ["src", "buildtool", "common"]
   }
diff --git a/src/buildtool/common/remote/TARGETS b/src/buildtool/common/remote/TARGETS
index e494bd47..9bb840b7 100644
--- a/src/buildtool/common/remote/TARGETS
+++ b/src/buildtool/common/remote/TARGETS
@@ -9,7 +9,6 @@
     , ["@", "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 8fed5ede..3adeaa9e 100644
--- a/src/buildtool/execution_api/bazel_msg/TARGETS
+++ b/src/buildtool/execution_api/bazel_msg/TARGETS
@@ -9,11 +9,6 @@
     , ["src/buildtool/file_system", "file_system_manager"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "bazel_msg"]
-  , "private-deps":
-    [ ["src/buildtool/crypto", "hash_function"]
-    , ["src/buildtool/file_system", "git_cas"]
-    , ["src/utils/cpp", "gsl"]
-    ]
   }
 , "bazel_msg_factory":
   { "type": ["@", "rules", "CC", "library"]
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 8532b93e..0de32644 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -18,9 +18,7 @@
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "protocol_traits"]
     , ["src/buildtool/crypto", "hash_function"]
-    , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
     , ["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"]
@@ -98,7 +96,6 @@
   , "srcs": ["blob_tree.cpp"]
   , "deps":
     [ "artifact_blob_container"
-    , "common"
     , ["@", "gsl", "", "gsl"]
     , ["src/buildtool/execution_api/bazel_msg", "directory_tree"]
     ]
diff --git a/src/buildtool/execution_api/execution_service/TARGETS b/src/buildtool/execution_api/execution_service/TARGETS
index 4e325a35..18a66818 100644
--- a/src/buildtool/execution_api/execution_service/TARGETS
+++ b/src/buildtool/execution_api/execution_service/TARGETS
@@ -155,7 +155,6 @@
   , "stage": ["src", "buildtool", "execution_api", "execution_service"]
   , "proto": [["@", "googleapis", "", "google_longrunning_operations_proto"]]
   , "deps": [["@", "protoc", "", "libprotobuf"]]
-  , "private-deps": [["src/buildtool/logging", "logging"]]
   }
 , "operations_server":
   { "type": ["@", "rules", "CC", "library"]
diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS
index a5290001..0256ea05 100644
--- a/src/buildtool/execution_api/remote/TARGETS
+++ b/src/buildtool/execution_api/remote/TARGETS
@@ -40,7 +40,6 @@
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/utils/cpp", "expected"]
-    , ["src/utils/cpp", "gsl"]
     ]
   , "proto":
     [ ["@", "bazel_remote_apis", "", "remote_execution_proto"]
@@ -61,6 +60,7 @@
     , ["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"]
     ]
   }
@@ -76,10 +76,10 @@
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common/remote", "port"]
     , ["src/buildtool/common/remote", "retry_config"]
+    , ["src/buildtool/crypto", "hash_function"]
     , ["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"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "remote"]
   , "private-deps":
@@ -88,9 +88,9 @@
     , ["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/execution_api/common", "common_api"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/file_system", "object_type"]
     , ["src/buildtool/logging", "log_level"]
diff --git a/src/buildtool/execution_api/serve/TARGETS b/src/buildtool/execution_api/serve/TARGETS
index f4ce0161..2d45ed14 100644
--- a/src/buildtool/execution_api/serve/TARGETS
+++ b/src/buildtool/execution_api/serve/TARGETS
@@ -52,12 +52,10 @@
     [ ["@", "gsl", "", "gsl"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/crypto", "hash_function"]
-    , ["src/buildtool/execution_api/common", "api_bundle"]
     , ["src/buildtool/execution_api/common", "artifact_blob_container"]
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/local", "context"]
     , ["src/buildtool/execution_engine/dag", "dag"]
-    , ["src/buildtool/storage", "config"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "serve"]
   , "private-deps":
diff --git a/src/buildtool/execution_api/utils/TARGETS b/src/buildtool/execution_api/utils/TARGETS
index fb5ca96a..f4033ee5 100644
--- a/src/buildtool/execution_api/utils/TARGETS
+++ b/src/buildtool/execution_api/utils/TARGETS
@@ -21,10 +21,7 @@
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["outputscheck"]
   , "hdrs": ["outputscheck.hpp"]
-  , "deps":
-    [ ["src/buildtool/common", "bazel_types"]
-    , ["src/buildtool/common", "common"]
-    ]
+  , "deps": [["src/buildtool/common", "bazel_types"]]
   , "stage": ["src", "buildtool", "execution_api", "utils"]
   }
 }
diff --git a/src/buildtool/execution_engine/executor/TARGETS b/src/buildtool/execution_engine/executor/TARGETS
index e2654ba9..3b798b49 100644
--- a/src/buildtool/execution_engine/executor/TARGETS
+++ b/src/buildtool/execution_engine/executor/TARGETS
@@ -12,7 +12,6 @@
     , ["src/buildtool/common", "protocol_traits"]
     , ["src/buildtool/common", "tree"]
     , ["src/buildtool/crypto", "hash_function"]
-    , ["src/buildtool/execution_api/common", "api_bundle"]
     , ["src/buildtool/execution_api/common", "artifact_blob_container"]
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/common", "common_api"]
diff --git a/src/buildtool/file_system/TARGETS b/src/buildtool/file_system/TARGETS
index f4d4e858..e9ee489d 100644
--- a/src/buildtool/file_system/TARGETS
+++ b/src/buildtool/file_system/TARGETS
@@ -92,8 +92,7 @@
     ]
   , "stage": ["src", "buildtool", "file_system"]
   , "private-deps":
-    [ "file_system_manager"
-    , ["", "libgit2"]
+    [ ["", "libgit2"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
diff --git a/src/buildtool/main/TARGETS b/src/buildtool/main/TARGETS
index 22419e31..e25e1677 100644
--- a/src/buildtool/main/TARGETS
+++ b/src/buildtool/main/TARGETS
@@ -196,15 +196,12 @@
     , ["src/buildtool/build_engine/base_maps", "source_map"]
     , ["src/buildtool/build_engine/base_maps", "targets_file_map"]
     , ["src/buildtool/build_engine/target_map", "target_map"]
-    , ["src/buildtool/common", "common"]
-    , ["src/buildtool/common", "config"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/multithreading", "async_map_consumer"]
     , ["src/buildtool/multithreading", "async_map_utils"]
     , ["src/buildtool/multithreading", "task_system"]
     , ["src/buildtool/progress_reporting", "exports_progress_reporter"]
-    , ["src/buildtool/progress_reporting", "progress"]
     , ["src/buildtool/serve_api/remote", "config"]
     , ["src/buildtool/storage", "storage"]
     ]
@@ -217,7 +214,6 @@
     [ ["@", "gsl", "", "gsl"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "config"]
-    , ["src/buildtool/progress_reporting", "exports_progress_reporter"]
     , ["src/buildtool/progress_reporting", "progress"]
     , ["src/buildtool/serve_api/remote", "serve_api"]
     , ["src/buildtool/storage", "storage"]
@@ -318,6 +314,8 @@
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/execution_api/common", "api_bundle"]
+    , ["src/buildtool/execution_api/common", "common"]
+    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/multithreading", "async_map_consumer"]
     , ["src/buildtool/storage", "storage"]
@@ -325,8 +323,6 @@
   , "stage": ["src", "buildtool", "main"]
   , "private-deps":
     [ ["src/buildtool/crypto", "hash_function"]
-    , ["src/buildtool/execution_api/common", "common"]
-    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/multithreading", "async_map_utils"]
     ]
   }
diff --git a/src/buildtool/serve_api/serve_service/TARGETS b/src/buildtool/serve_api/serve_service/TARGETS
index 05c29c3c..4e9e3909 100644
--- a/src/buildtool/serve_api/serve_service/TARGETS
+++ b/src/buildtool/serve_api/serve_service/TARGETS
@@ -53,7 +53,6 @@
   , "deps":
     [ ["@", "gsl", "", "gsl"]
     , ["src/buildtool/execution_api/common", "api_bundle"]
-    , ["src/buildtool/execution_api/execution_service", "operation_cache"]
     , ["src/buildtool/execution_api/local", "context"]
     , ["src/buildtool/execution_api/remote", "context"]
     , ["src/buildtool/logging", "logging"]
@@ -93,6 +92,7 @@
   , "proto": ["just_serve_proto"]
   , "deps":
     [ ["@", "gsl", "", "gsl"]
+    , ["src/buildtool/common", "common"]
     , ["src/buildtool/common/remote", "remote_common"]
     , ["src/buildtool/execution_api/common", "api_bundle"]
     , ["src/buildtool/execution_api/common", "common"]
@@ -101,6 +101,7 @@
     , ["src/buildtool/execution_api/remote", "context"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/serve_api/remote", "config"]
+    , ["src/buildtool/serve_api/remote", "serve_api"]
     , ["src/utils/cpp", "expected"]
     ]
   , "stage": ["src", "buildtool", "serve_api", "serve_service"]
@@ -115,7 +116,6 @@
     , ["src/buildtool/build_engine/target_map", "configured_target"]
     , ["src/buildtool/build_engine/target_map", "result_map"]
     , ["src/buildtool/common", "artifact_digest_factory"]
-    , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/common/remote", "retry_config"]
     , ["src/buildtool/crypto", "hash_function"]
@@ -130,7 +130,6 @@
     , ["src/buildtool/multithreading", "task_system"]
     , ["src/buildtool/progress_reporting", "progress"]
     , ["src/buildtool/progress_reporting", "progress_reporter"]
-    , ["src/buildtool/serve_api/remote", "serve_api"]
     , ["src/buildtool/storage", "backend_description"]
     , ["src/buildtool/storage", "repository_garbage_collector"]
     , ["src/buildtool/storage", "storage"]
diff --git a/src/buildtool/storage/TARGETS b/src/buildtool/storage/TARGETS
index 646c4619..1bd1fbb2 100644
--- a/src/buildtool/storage/TARGETS
+++ b/src/buildtool/storage/TARGETS
@@ -82,18 +82,18 @@
     , ["src/buildtool/file_system", "git_repo"]
     , ["src/buildtool/file_system", "object_cas"]
     , ["src/buildtool/file_system", "object_type"]
+    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["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/crypto", "hasher"]
     , ["src/buildtool/execution_api/common", "message_limits"]
-    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/multithreading", "task_system"]
+    , ["src/utils/cpp", "gsl"]
     , ["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 11cbecc8..f0793d5d 100644
--- a/src/other_tools/just_mr/TARGETS
+++ b/src/other_tools/just_mr/TARGETS
@@ -89,13 +89,13 @@
     , ["src/buildtool/build_engine/expression", "expression"]
     , ["src/buildtool/build_engine/expression", "expression_ptr_interface"]
     , ["src/buildtool/execution_api/local", "config"]
+    , ["src/buildtool/execution_api/remote", "config"]
     , ["src/buildtool/serve_api/remote", "config"]
     ]
   , "stage": ["src", "other_tools", "just_mr"]
   , "private-deps":
     [ "exit_codes"
     , ["@", "json", "", "json"]
-    , ["src/buildtool/execution_api/remote", "config"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
@@ -250,7 +250,6 @@
     [ "exit_codes"
     , "setup"
     , "setup_utils"
-    , "utils"
     , ["@", "json", "", "json"]
     , ["src/buildtool/build_engine/expression", "expression"]
     , ["src/buildtool/logging", "log_level"]
diff --git a/src/other_tools/ops_maps/TARGETS b/src/other_tools/ops_maps/TARGETS
index 3bc2fbdf..545de74f 100644
--- a/src/other_tools/ops_maps/TARGETS
+++ b/src/other_tools/ops_maps/TARGETS
@@ -72,7 +72,6 @@
     , ["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"]
@@ -83,6 +82,7 @@
     , ["src/buildtool/storage", "fs_utils"]
     , ["src/other_tools/git_operations", "git_repo_remote"]
     , ["src/other_tools/utils", "content"]
+    , ["src/other_tools/utils", "curl_url_handle"]
     ]
   }
 , "archive_fetch_map":
@@ -134,7 +134,6 @@
     , ["src/buildtool/multithreading", "task_system"]
     , ["src/buildtool/system", "system_command"]
     , ["src/other_tools/git_operations", "git_repo_remote"]
-    , ["src/other_tools/ops_maps", "content_cas_map"]
     ]
   }
 }
diff --git a/src/other_tools/root_maps/TARGETS b/src/other_tools/root_maps/TARGETS
index 33cd805f..5340ef32 100644
--- a/src/other_tools/root_maps/TARGETS
+++ b/src/other_tools/root_maps/TARGETS
@@ -20,7 +20,6 @@
     , ["src/buildtool/common", "artifact_digest_factory"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/crypto", "hash_function"]
-    , ["src/buildtool/execution_api/local", "config"]
     , ["src/buildtool/file_system", "file_root"]
     , ["src/buildtool/file_system", "file_storage"]
     , ["src/buildtool/file_system", "git_repo"]
@@ -51,7 +50,6 @@
     , ["src/other_tools/ops_maps", "critical_git_op_map"]
     , ["src/other_tools/ops_maps", "import_to_git_map"]
     , ["src/utils/cpp", "hash_combine"]
-    , ["src/utils/cpp", "path"]
     ]
   , "stage": ["src", "other_tools", "root_maps"]
   , "private-deps":
@@ -65,7 +63,7 @@
     , ["src/buildtool/storage", "fs_utils"]
     , ["src/other_tools/git_operations", "git_repo_remote"]
     , ["src/other_tools/utils", "curl_url_handle"]
-    , ["src/utils/cpp", "tmp_dir"]
+    , ["src/utils/cpp", "path"]
     ]
   }
 , "fpath_git_map":
@@ -126,11 +124,9 @@
     , ["src/buildtool/crypto", "hash_info"]
     , ["src/buildtool/file_system", "file_root"]
     , ["src/buildtool/file_system", "file_storage"]
-    , ["src/buildtool/file_system", "git_repo"]
     , ["src/buildtool/file_system/symlinks_map", "pragma_special"]
     , ["src/buildtool/multithreading", "task_system"]
     , ["src/buildtool/storage", "fs_utils"]
-    , ["src/other_tools/git_operations", "git_repo_remote"]
     , ["src/other_tools/utils", "content"]
     , ["src/utils/archive", "archive_ops"]
     ]