7 files changed, 17 insertions, 17 deletions
diff --git a/src/buildtool/execution_api/execution_service/TARGETS b/src/buildtool/execution_api/execution_service/TARGETS
index 3e195136..632e8d0b 100644
--- a/src/buildtool/execution_api/execution_service/TARGETS
+++ b/src/buildtool/execution_api/execution_service/TARGETS
@@ -151,14 +151,6 @@
     , ["src/utils/cpp", "verify_hash"]
     ]
   }
-, "file_chunker":
-  { "type": ["@", "rules", "CC", "library"]
-  , "name": ["file_chunker"]
-  , "hdrs": ["file_chunker.hpp"]
-  , "srcs": ["file_chunker.cpp"]
-  , "stage": ["src", "buildtool", "execution_api", "execution_service"]
-  , "private-deps": [["@", "gsl", "", "gsl"]]
-  }
 , "cas_utils":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["cas_utils"]
@@ -171,8 +163,7 @@
     , ["src/buildtool/storage", "storage"]
     ]
   , "private-deps":
-    [ "file_chunker"
-    , ["@", "fmt", "", "fmt"]
+    [ ["@", "fmt", "", "fmt"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/compatibility", "compatibility"]
     , ["src/buildtool/file_system", "git_repo"]
@@ -180,6 +171,7 @@
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/storage", "config"]
     , ["src/utils/cpp", "hex_string"]
+    , ["src/buildtool/storage", "file_chunker"]
     ]
   }
 }
diff --git a/src/buildtool/execution_api/execution_service/cas_utils.cpp b/src/buildtool/execution_api/execution_service/cas_utils.cpp
index e2c4a418..9b7ef336 100644
--- a/src/buildtool/execution_api/execution_service/cas_utils.cpp
+++ b/src/buildtool/execution_api/execution_service/cas_utils.cpp
@@ -19,11 +19,11 @@
 #include "fmt/core.h"
 #include "src/buildtool/common/artifact_digest.hpp"
 #include "src/buildtool/compatibility/native_support.hpp"
-#include "src/buildtool/execution_api/execution_service/file_chunker.hpp"
 #include "src/buildtool/file_system/file_system_manager.hpp"
 #include "src/buildtool/file_system/git_repo.hpp"
 #include "src/buildtool/file_system/object_type.hpp"
 #include "src/buildtool/storage/config.hpp"
+#include "src/buildtool/storage/file_chunker.hpp"
 #include "src/utils/cpp/hex_string.hpp"
 
 auto CASUtils::EnsureTreeInvariant(std::string const& data,
diff --git a/src/buildtool/main/TARGETS b/src/buildtool/main/TARGETS
index b15ef25a..602e31b8 100644
--- a/src/buildtool/main/TARGETS
+++ b/src/buildtool/main/TARGETS
@@ -32,7 +32,7 @@
     , ["src/buildtool/serve_api/remote", "config"]
     , ["src/buildtool/serve_api/serve_service", "serve_server_implementation"]
     , ["src/buildtool/common/remote", "retry_parameters"]
-    , ["src/buildtool/execution_api/execution_service", "file_chunker"]
+    , ["src/buildtool/storage", "file_chunker"]
     , "common"
     , "cli"
     , "version"
diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp
index 895fd517..18beff58 100644
--- a/src/buildtool/main/main.cpp
+++ b/src/buildtool/main/main.cpp
@@ -33,7 +33,6 @@
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/common/statistics.hpp"
 #include "src/buildtool/compatibility/compatibility.hpp"
-#include "src/buildtool/execution_api/execution_service/file_chunker.hpp"
 #include "src/buildtool/execution_api/local/config.hpp"
 #include "src/buildtool/file_system/file_root.hpp"
 #include "src/buildtool/logging/log_config.hpp"
@@ -55,6 +54,7 @@
 #include "src/buildtool/multithreading/task_system.hpp"
 #include "src/buildtool/progress_reporting/progress.hpp"
 #include "src/buildtool/storage/config.hpp"
+#include "src/buildtool/storage/file_chunker.hpp"
 #include "src/buildtool/storage/garbage_collector.hpp"
 #include "src/buildtool/storage/storage.hpp"
 #include "src/buildtool/storage/target_cache.hpp"
diff --git a/src/buildtool/storage/TARGETS b/src/buildtool/storage/TARGETS
index a3e06628..38180055 100644
--- a/src/buildtool/storage/TARGETS
+++ b/src/buildtool/storage/TARGETS
@@ -81,4 +81,12 @@
     , "storage"
     ]
   }
+, "file_chunker":
+  { "type": ["@", "rules", "CC", "library"]
+  , "name": ["file_chunker"]
+  , "hdrs": ["file_chunker.hpp"]
+  , "srcs": ["file_chunker.cpp"]
+  , "stage": ["src", "buildtool", "storage"]
+  , "private-deps": [["@", "gsl", "", "gsl"]]
+  }
 }
diff --git a/src/buildtool/execution_api/execution_service/file_chunker.cpp b/src/buildtool/storage/file_chunker.cpp
index a4332110..af318501 100644
--- a/src/buildtool/execution_api/execution_service/file_chunker.cpp
+++ b/src/buildtool/storage/file_chunker.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/buildtool/execution_api/execution_service/file_chunker.hpp"
+#include "src/buildtool/storage/file_chunker.hpp"
 
 #include <array>
 #include <random>
diff --git a/src/buildtool/execution_api/execution_service/file_chunker.hpp b/src/buildtool/storage/file_chunker.hpp
index 5c4e8e89..c4611c48 100644
--- a/src/buildtool/execution_api/execution_service/file_chunker.hpp
+++ b/src/buildtool/storage/file_chunker.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef INCLUDED_SRC_EXECUTION_API_EXECUTION_SERVICE_FILE_CHUNKER_HPP
-#define INCLUDED_SRC_EXECUTION_API_EXECUTION_SERVICE_FILE_CHUNKER_HPP
+#ifndef INCLUDED_SRC_BUILDTOOL_STORAGE_FILE_CHUNKER_HPP
+#define INCLUDED_SRC_BUILDTOOL_STORAGE_FILE_CHUNKER_HPP
 
 #include <cstddef>
 #include <cstdint>
@@ -95,4 +95,4 @@ class FileChunker {
     [[nodiscard]] auto NextChunkBoundary() noexcept -> std::size_t;
 };
 
-#endif  // INCLUDED_SRC_EXECUTION_API_EXECUTION_SERVICE_FILE_CHUNKER_HPP
+#endif  // INCLUDED_SRC_BUILDTOOL_STORAGE_FILE_CHUNKER_HPP