9 files changed, 28 insertions, 31 deletions
diff --git a/src/buildtool/execution_api/bazel_msg/TARGETS b/src/buildtool/execution_api/bazel_msg/TARGETS
index 2c17b873..a0032c86 100644
--- a/src/buildtool/execution_api/bazel_msg/TARGETS
+++ b/src/buildtool/execution_api/bazel_msg/TARGETS
@@ -55,24 +55,4 @@
     ]
   , "stage": ["src", "buildtool", "execution_api", "bazel_msg"]
   }
-, "blob_tree":
-  { "type": ["@", "rules", "CC", "library"]
-  , "name": ["blob_tree"]
-  , "hdrs": ["blob_tree.hpp"]
-  , "srcs": ["blob_tree.cpp"]
-  , "deps":
-    [ "bazel_msg"
-    , "directory_tree"
-    , ["@", "gsl", "", "gsl"]
-    , ["src/buildtool/compatibility", "compatibility"]
-    ]
-  , "private-deps":
-    [ ["src/buildtool/common", "common"]
-    , ["src/buildtool/common", "bazel_types"]
-    , ["src/buildtool/file_system", "git_repo"]
-    , ["src/buildtool/file_system", "object_type"]
-    , ["src/utils/cpp", "hex_string"]
-    ]
-  , "stage": ["src", "buildtool", "execution_api", "bazel_msg"]
-  }
 }
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 4cb4e4b2..0eac0c15 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -58,10 +58,10 @@
   , "srcs": ["common_api.cpp"]
   , "deps":
     [ "common"
+    , "blob_tree"
     , ["@", "gsl", "", "gsl"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
-    , ["src/buildtool/execution_api/bazel_msg", "blob_tree"]
     , ["src/buildtool/execution_api/bazel_msg", "directory_tree"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "common"]
@@ -71,6 +71,25 @@
     , ["src/buildtool/logging", "log_level"]
     ]
   }
+, "blob_tree":
+  { "type": ["@", "rules", "CC", "library"]
+  , "name": ["blob_tree"]
+  , "hdrs": ["blob_tree.hpp"]
+  , "srcs": ["blob_tree.cpp"]
+  , "deps":
+    [ "common"
+    , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
+    , ["src/buildtool/execution_api/bazel_msg", "directory_tree"]
+    , ["@", "gsl", "", "gsl"]
+    , ["src/buildtool/compatibility", "compatibility"]
+    ]
+  , "private-deps":
+    [ ["src/buildtool/file_system", "git_repo"]
+    , ["src/buildtool/file_system", "object_type"]
+    , ["src/utils/cpp", "hex_string"]
+    ]
+  , "stage": ["src", "buildtool", "execution_api", "common"]
+  }
 , "content_blob_container":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["content_blob_container"]
diff --git a/src/buildtool/execution_api/bazel_msg/blob_tree.cpp b/src/buildtool/execution_api/common/blob_tree.cpp
index 88797970..0954220e 100644
--- a/src/buildtool/execution_api/bazel_msg/blob_tree.cpp
+++ b/src/buildtool/execution_api/common/blob_tree.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/buildtool/execution_api/bazel_msg/blob_tree.hpp"
+#include "src/buildtool/execution_api/common/blob_tree.hpp"
 
 #include <utility>
 #include <variant>
diff --git a/src/buildtool/execution_api/bazel_msg/blob_tree.hpp b/src/buildtool/execution_api/common/blob_tree.hpp
index b407e8ee..59e58410 100644
--- a/src/buildtool/execution_api/bazel_msg/blob_tree.hpp
+++ b/src/buildtool/execution_api/common/blob_tree.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_BAZEL_MSG_BLOB_TREE_HPP
-#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_BAZEL_MSG_BLOB_TREE_HPP
+#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_BLOB_TREE_HPP
+#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_BLOB_TREE_HPP
 
 #include <filesystem>
 #include <memory>
@@ -56,4 +56,4 @@ class BlobTree {
     std::vector<BlobTreePtr> nodes_;
 };
 
-#endif  // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_BAZEL_MSG_BLOB_TREE_HPP
+#endif  // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_BLOB_TREE_HPP
diff --git a/src/buildtool/execution_api/common/common_api.hpp b/src/buildtool/execution_api/common/common_api.hpp
index 312f97db..1a2914fb 100644
--- a/src/buildtool/execution_api/common/common_api.hpp
+++ b/src/buildtool/execution_api/common/common_api.hpp
@@ -27,8 +27,8 @@
 #include "src/buildtool/common/artifact.hpp"
 #include "src/buildtool/common/artifact_digest.hpp"
 #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp"
-#include "src/buildtool/execution_api/bazel_msg/blob_tree.hpp"
 #include "src/buildtool/execution_api/bazel_msg/directory_tree.hpp"
+#include "src/buildtool/execution_api/common/blob_tree.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
 
 /// \brief Stores a list of missing artifact digests, as well as a back-mapping
diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS
index b192b402..294311e7 100644
--- a/src/buildtool/execution_api/local/TARGETS
+++ b/src/buildtool/execution_api/local/TARGETS
@@ -35,7 +35,6 @@
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/common", "common_api"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
-    , ["src/buildtool/execution_api/bazel_msg", "blob_tree"]
     , ["src/buildtool/execution_api/git", "git"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/compatibility", "compatibility"]
diff --git a/src/buildtool/execution_api/local/local_api.hpp b/src/buildtool/execution_api/local/local_api.hpp
index 91b86de2..978d3968 100644
--- a/src/buildtool/execution_api/local/local_api.hpp
+++ b/src/buildtool/execution_api/local/local_api.hpp
@@ -34,7 +34,7 @@
 #include "src/buildtool/compatibility/compatibility.hpp"
 #include "src/buildtool/compatibility/native_support.hpp"
 #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp"
-#include "src/buildtool/execution_api/bazel_msg/blob_tree.hpp"
+#include "src/buildtool/execution_api/common/blob_tree.hpp"
 #include "src/buildtool/execution_api/common/common_api.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
 #include "src/buildtool/execution_api/common/stream_dumper.hpp"
diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS
index c919b7bf..661df625 100644
--- a/src/buildtool/execution_api/remote/TARGETS
+++ b/src/buildtool/execution_api/remote/TARGETS
@@ -66,10 +66,10 @@
     [ "config"
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
-    , ["src/buildtool/execution_api/bazel_msg", "blob_tree"]
     , ["@", "gsl", "", "gsl"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common/remote", "port"]
+    , ["src/buildtool/execution_api/common", "common_api"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "remote"]
   , "private-deps":
@@ -79,7 +79,6 @@
     , ["src/buildtool/multithreading", "task_system"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/file_system", "object_type"]
-    , ["src/buildtool/execution_api/common", "common_api"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/storage", "fs_utils"]
     ]
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp
index 49827922..b96148b1 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp
@@ -28,7 +28,7 @@
 #include "src/buildtool/common/artifact_digest.hpp"
 #include "src/buildtool/common/remote/port.hpp"
 #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp"
-#include "src/buildtool/execution_api/bazel_msg/blob_tree.hpp"
+#include "src/buildtool/execution_api/common/blob_tree.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
 #include "src/buildtool/execution_api/remote/config.hpp"