3 files changed, 6 insertions, 4 deletions
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 4c9cfa81..b417e26a 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -15,6 +15,7 @@
     [ "artifact_blob_container"
     , ["@", "gsl", "", "gsl"]
     , ["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/file_system", "file_system_manager"]
diff --git a/src/buildtool/execution_api/common/stream_dumper.hpp b/src/buildtool/execution_api/common/stream_dumper.hpp
index 81d3bf35..ea0a323d 100644
--- a/src/buildtool/execution_api/common/stream_dumper.hpp
+++ b/src/buildtool/execution_api/common/stream_dumper.hpp
@@ -22,7 +22,7 @@
 
 #include "gsl/gsl"
 #include "src/buildtool/common/artifact.hpp"
-#include "src/buildtool/compatibility/compatibility.hpp"
+#include "src/buildtool/common/protocol_traits.hpp"
 #include "src/buildtool/execution_api/common/tree_reader_utils.hpp"
 #include "src/buildtool/file_system/object_type.hpp"
 
@@ -65,7 +65,7 @@ class StreamDumper final {
     [[nodiscard]] auto DumpTree(
         Artifact::ObjectInfo const& info,
         gsl::not_null<FILE*> const& stream) const noexcept -> bool {
-        if (Compatibility::IsCompatible()) {
+        if (ProtocolTraits::Instance().IsCompatible()) {
             auto directory = impl_.ReadDirectory(info.digest);
             auto data = directory
                             ? TreeReaderUtils::DirectoryToString(*directory)
diff --git a/src/buildtool/execution_api/common/tree_reader.hpp b/src/buildtool/execution_api/common/tree_reader.hpp
index d9048e1f..18e94fe8 100644
--- a/src/buildtool/execution_api/common/tree_reader.hpp
+++ b/src/buildtool/execution_api/common/tree_reader.hpp
@@ -23,6 +23,7 @@
 
 #include "src/buildtool/common/artifact.hpp"
 #include "src/buildtool/common/bazel_types.hpp"
+#include "src/buildtool/common/protocol_traits.hpp"
 #include "src/buildtool/execution_api/common/tree_reader_utils.hpp"
 #include "src/buildtool/file_system/git_repo.hpp"
 #include "src/buildtool/file_system/object_type.hpp"
@@ -58,7 +59,7 @@ class TreeReader final {
                 return true;
             };
 
-        if (Compatibility::IsCompatible()) {
+        if (ProtocolTraits::Instance().IsCompatible()) {
             auto tree = impl_.ReadDirectory(digest);
             if (tree and
                 not TreeReaderUtils::ReadObjectInfos(*tree, store_info)) {
@@ -131,7 +132,7 @@ class TreeReader final {
                        : store(parent / path, info);
         };
 
-        if (Compatibility::IsCompatible()) {
+        if (ProtocolTraits::Instance().IsCompatible()) {
             if (auto tree = impl_.ReadDirectory(digest)) {
                 if (include_trees and IsDirectoryEmpty(*tree)) {
                     if (not store(parent, {digest, ObjectType::Tree})) {