From 6fd2990928d8d4d606d9744d4f994f106e5d4bcd Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Sat, 3 Aug 2024 10:44:35 +0200
Subject: [PATCH] refactor: move reader library code

---
 CMakeLists.txt                                | 20 +++++++++----------
 include/dwarfs/{ => reader}/block_range.h     |  0
 include/dwarfs/{ => reader}/filesystem_v2.h   |  4 ++--
 .../{ => reader}/internal/block_cache.h       |  2 +-
 .../{ => reader}/internal/cached_block.h      |  0
 .../{ => reader}/internal/filesystem_parser.h |  0
 .../{ => reader}/internal/inode_reader_v2.h   |  4 ++--
 .../{ => reader}/internal/metadata_types.h    |  0
 .../{ => reader}/internal/metadata_v2.h       |  4 ++--
 .../{ => reader}/internal/offset_cache.h      |  0
 include/dwarfs/{ => reader}/iovec_read_buf.h  |  2 +-
 include/dwarfs/{ => reader}/metadata_types.h  |  0
 src/dwarfs/filesystem_extractor.cpp           |  2 +-
 src/dwarfs/{ => reader}/block_range.cpp       |  4 ++--
 src/dwarfs/{ => reader}/filesystem_v2.cpp     | 10 +++++-----
 .../{ => reader}/internal/block_cache.cpp     |  4 ++--
 .../{ => reader}/internal/cached_block.cpp    |  2 +-
 .../internal/filesystem_parser.cpp            |  2 +-
 .../{ => reader}/internal/inode_reader_v2.cpp |  8 ++++----
 .../{ => reader}/internal/metadata_types.cpp  |  2 +-
 .../{ => reader}/internal/metadata_v2.cpp     |  2 +-
 src/dwarfs/{ => reader}/metadata_types.cpp    |  4 ++--
 src/dwarfs_main.cpp                           |  4 ++--
 src/dwarfsck_main.cpp                         |  2 +-
 src/dwarfsextract_main.cpp                    |  2 +-
 src/mkdwarfs_main.cpp                         |  2 +-
 test/badfs_test.cpp                           |  2 +-
 test/block_cache_test.cpp                     |  6 +++---
 test/compat_test.cpp                          |  2 +-
 test/dwarfs_benchmark.cpp                     |  4 ++--
 test/dwarfs_test.cpp                          |  4 ++--
 test/filesystem_test.cpp                      |  2 +-
 test/tool_main_test.cpp                       |  4 ++--
 test/utils_test.cpp                           |  2 +-
 34 files changed, 56 insertions(+), 56 deletions(-)
 rename include/dwarfs/{ => reader}/block_range.h (100%)
 rename include/dwarfs/{ => reader}/filesystem_v2.h (99%)
 rename include/dwarfs/{ => reader}/internal/block_cache.h (98%)
 rename include/dwarfs/{ => reader}/internal/cached_block.h (100%)
 rename include/dwarfs/{ => reader}/internal/filesystem_parser.h (100%)
 rename include/dwarfs/{ => reader}/internal/inode_reader_v2.h (97%)
 rename include/dwarfs/{ => reader}/internal/metadata_types.h (100%)
 rename include/dwarfs/{ => reader}/internal/metadata_v2.h (98%)
 rename include/dwarfs/{ => reader}/internal/offset_cache.h (100%)
 rename include/dwarfs/{ => reader}/iovec_read_buf.h (97%)
 rename include/dwarfs/{ => reader}/metadata_types.h (100%)
 rename src/dwarfs/{ => reader}/block_range.cpp (94%)
 rename src/dwarfs/{ => reader}/filesystem_v2.cpp (99%)
 rename src/dwarfs/{ => reader}/internal/block_cache.cpp (99%)
 rename src/dwarfs/{ => reader}/internal/cached_block.cpp (98%)
 rename src/dwarfs/{ => reader}/internal/filesystem_parser.cpp (99%)
 rename src/dwarfs/{ => reader}/internal/inode_reader_v2.cpp (98%)
 rename src/dwarfs/{ => reader}/internal/metadata_types.cpp (99%)
 rename src/dwarfs/{ => reader}/internal/metadata_v2.cpp (99%)
 rename src/dwarfs/{ => reader}/metadata_types.cpp (97%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 734d1bcf..dc2cc4ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -616,6 +616,7 @@ list(APPEND LIBDWARFS_COMMON_SRC
   src/dwarfs/history.cpp
   src/dwarfs/internal/features.cpp
   src/dwarfs/internal/file_status_conv.cpp
+  src/dwarfs/internal/fs_section.cpp
   src/dwarfs/internal/string_table.cpp
   src/dwarfs/internal/wcwidth.c
   src/dwarfs/internal/worker_group.cpp
@@ -634,16 +635,15 @@ list(APPEND LIBDWARFS_COMMON_SRC
 )
 
 list(APPEND LIBDWARFS_READER_SRC
-  src/dwarfs/block_range.cpp
-  src/dwarfs/filesystem_v2.cpp
-  src/dwarfs/internal/block_cache.cpp
-  src/dwarfs/internal/cached_block.cpp
-  src/dwarfs/internal/filesystem_parser.cpp
-  src/dwarfs/internal/fs_section.cpp
-  src/dwarfs/internal/inode_reader_v2.cpp
-  src/dwarfs/internal/metadata_types.cpp
-  src/dwarfs/internal/metadata_v2.cpp
-  src/dwarfs/metadata_types.cpp
+  src/dwarfs/reader/block_range.cpp
+  src/dwarfs/reader/filesystem_v2.cpp
+  src/dwarfs/reader/internal/block_cache.cpp
+  src/dwarfs/reader/internal/cached_block.cpp
+  src/dwarfs/reader/internal/filesystem_parser.cpp
+  src/dwarfs/reader/internal/inode_reader_v2.cpp
+  src/dwarfs/reader/internal/metadata_types.cpp
+  src/dwarfs/reader/internal/metadata_v2.cpp
+  src/dwarfs/reader/metadata_types.cpp
 )
 
 list(APPEND LIBDWARFS_WRITER_SRC
diff --git a/include/dwarfs/block_range.h b/include/dwarfs/reader/block_range.h
similarity index 100%
rename from include/dwarfs/block_range.h
rename to include/dwarfs/reader/block_range.h
diff --git a/include/dwarfs/filesystem_v2.h b/include/dwarfs/reader/filesystem_v2.h
similarity index 99%
rename from include/dwarfs/filesystem_v2.h
rename to include/dwarfs/reader/filesystem_v2.h
index c83198cb..d7ad8ff7 100644
--- a/include/dwarfs/filesystem_v2.h
+++ b/include/dwarfs/reader/filesystem_v2.h
@@ -35,10 +35,10 @@
 
 #include <nlohmann/json.hpp>
 
-#include <dwarfs/block_range.h>
 #include <dwarfs/file_stat.h>
-#include <dwarfs/metadata_types.h>
 #include <dwarfs/options.h>
+#include <dwarfs/reader/block_range.h>
+#include <dwarfs/reader/metadata_types.h>
 #include <dwarfs/types.h>
 
 namespace dwarfs {
diff --git a/include/dwarfs/internal/block_cache.h b/include/dwarfs/reader/internal/block_cache.h
similarity index 98%
rename from include/dwarfs/internal/block_cache.h
rename to include/dwarfs/reader/internal/block_cache.h
index 82afe794..35fa91c0 100644
--- a/include/dwarfs/internal/block_cache.h
+++ b/include/dwarfs/reader/internal/block_cache.h
@@ -28,8 +28,8 @@
 #include <memory>
 
 #include <dwarfs/block_compressor.h>
-#include <dwarfs/block_range.h>
 #include <dwarfs/fstypes.h>
+#include <dwarfs/reader/block_range.h>
 
 namespace dwarfs {
 
diff --git a/include/dwarfs/internal/cached_block.h b/include/dwarfs/reader/internal/cached_block.h
similarity index 100%
rename from include/dwarfs/internal/cached_block.h
rename to include/dwarfs/reader/internal/cached_block.h
diff --git a/include/dwarfs/internal/filesystem_parser.h b/include/dwarfs/reader/internal/filesystem_parser.h
similarity index 100%
rename from include/dwarfs/internal/filesystem_parser.h
rename to include/dwarfs/reader/internal/filesystem_parser.h
diff --git a/include/dwarfs/internal/inode_reader_v2.h b/include/dwarfs/reader/internal/inode_reader_v2.h
similarity index 97%
rename from include/dwarfs/internal/inode_reader_v2.h
rename to include/dwarfs/reader/internal/inode_reader_v2.h
index 45f347bf..85a39b4f 100644
--- a/include/dwarfs/internal/inode_reader_v2.h
+++ b/include/dwarfs/reader/internal/inode_reader_v2.h
@@ -28,10 +28,10 @@
 #include <system_error>
 #include <vector>
 
-#include <dwarfs/block_range.h>
+#include <dwarfs/reader/block_range.h>
 #include <dwarfs/types.h>
 
-#include <dwarfs/internal/metadata_types.h>
+#include <dwarfs/reader/internal/metadata_types.h>
 
 namespace dwarfs {
 
diff --git a/include/dwarfs/internal/metadata_types.h b/include/dwarfs/reader/internal/metadata_types.h
similarity index 100%
rename from include/dwarfs/internal/metadata_types.h
rename to include/dwarfs/reader/internal/metadata_types.h
diff --git a/include/dwarfs/internal/metadata_v2.h b/include/dwarfs/reader/internal/metadata_v2.h
similarity index 98%
rename from include/dwarfs/internal/metadata_v2.h
rename to include/dwarfs/reader/internal/metadata_v2.h
index 6df4389b..bec8aff9 100644
--- a/include/dwarfs/internal/metadata_v2.h
+++ b/include/dwarfs/reader/internal/metadata_v2.h
@@ -34,9 +34,9 @@
 
 #include <nlohmann/json.hpp>
 
-#include <dwarfs/metadata_types.h>
+#include <dwarfs/reader/metadata_types.h>
 
-#include <dwarfs/internal/metadata_types.h>
+#include <dwarfs/reader/internal/metadata_types.h>
 
 namespace dwarfs {
 
diff --git a/include/dwarfs/internal/offset_cache.h b/include/dwarfs/reader/internal/offset_cache.h
similarity index 100%
rename from include/dwarfs/internal/offset_cache.h
rename to include/dwarfs/reader/internal/offset_cache.h
diff --git a/include/dwarfs/iovec_read_buf.h b/include/dwarfs/reader/iovec_read_buf.h
similarity index 97%
rename from include/dwarfs/iovec_read_buf.h
rename to include/dwarfs/reader/iovec_read_buf.h
index 073da48e..1a2d14c7 100644
--- a/include/dwarfs/iovec_read_buf.h
+++ b/include/dwarfs/reader/iovec_read_buf.h
@@ -25,7 +25,7 @@
 #include <sys/uio.h>
 #endif
 
-#include <dwarfs/block_range.h>
+#include <dwarfs/reader/block_range.h>
 #include <dwarfs/small_vector.h>
 
 namespace dwarfs {
diff --git a/include/dwarfs/metadata_types.h b/include/dwarfs/reader/metadata_types.h
similarity index 100%
rename from include/dwarfs/metadata_types.h
rename to include/dwarfs/reader/metadata_types.h
diff --git a/src/dwarfs/filesystem_extractor.cpp b/src/dwarfs/filesystem_extractor.cpp
index 87b5eb03..9c45f1b4 100644
--- a/src/dwarfs/filesystem_extractor.cpp
+++ b/src/dwarfs/filesystem_extractor.cpp
@@ -41,12 +41,12 @@
 
 #include <dwarfs/file_stat.h>
 #include <dwarfs/filesystem_extractor.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/fstypes.h>
 #include <dwarfs/library_dependencies.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/options.h>
 #include <dwarfs/os_access.h>
+#include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/scope_exit.h>
 #include <dwarfs/util.h>
 #include <dwarfs/vfs_stat.h>
diff --git a/src/dwarfs/block_range.cpp b/src/dwarfs/reader/block_range.cpp
similarity index 94%
rename from src/dwarfs/block_range.cpp
rename to src/dwarfs/reader/block_range.cpp
index f0ee3889..8fe40398 100644
--- a/src/dwarfs/block_range.cpp
+++ b/src/dwarfs/reader/block_range.cpp
@@ -21,10 +21,10 @@
 
 #include <fmt/format.h>
 
-#include <dwarfs/block_range.h>
 #include <dwarfs/error.h>
+#include <dwarfs/reader/block_range.h>
 
-#include <dwarfs/internal/cached_block.h>
+#include <dwarfs/reader/internal/cached_block.h>
 
 namespace dwarfs {
 
diff --git a/src/dwarfs/filesystem_v2.cpp b/src/dwarfs/reader/filesystem_v2.cpp
similarity index 99%
rename from src/dwarfs/filesystem_v2.cpp
rename to src/dwarfs/reader/filesystem_v2.cpp
index 84e1a7db..15015315 100644
--- a/src/dwarfs/filesystem_v2.cpp
+++ b/src/dwarfs/reader/filesystem_v2.cpp
@@ -36,7 +36,6 @@
 #include <dwarfs/categorizer.h>
 #include <dwarfs/category_resolver.h>
 #include <dwarfs/error.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/filesystem_writer.h>
 #include <dwarfs/fstypes.h>
 #include <dwarfs/history.h>
@@ -45,18 +44,19 @@
 #include <dwarfs/options.h>
 #include <dwarfs/os_access.h>
 #include <dwarfs/performance_monitor.h>
+#include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/util.h>
 #include <dwarfs/writer_progress.h>
 
-#include <dwarfs/internal/block_cache.h>
 #include <dwarfs/internal/block_data.h>
-#include <dwarfs/internal/filesystem_parser.h>
 #include <dwarfs/internal/filesystem_writer_detail.h>
 #include <dwarfs/internal/fs_section.h>
-#include <dwarfs/internal/inode_reader_v2.h>
-#include <dwarfs/internal/metadata_v2.h>
 #include <dwarfs/internal/progress.h>
 #include <dwarfs/internal/worker_group.h>
+#include <dwarfs/reader/internal/block_cache.h>
+#include <dwarfs/reader/internal/filesystem_parser.h>
+#include <dwarfs/reader/internal/inode_reader_v2.h>
+#include <dwarfs/reader/internal/metadata_v2.h>
 
 namespace dwarfs {
 
diff --git a/src/dwarfs/internal/block_cache.cpp b/src/dwarfs/reader/internal/block_cache.cpp
similarity index 99%
rename from src/dwarfs/internal/block_cache.cpp
rename to src/dwarfs/reader/internal/block_cache.cpp
index ec83a974..d35d2e6c 100644
--- a/src/dwarfs/internal/block_cache.cpp
+++ b/src/dwarfs/reader/internal/block_cache.cpp
@@ -48,10 +48,10 @@
 #include <dwarfs/scope_exit.h>
 #include <dwarfs/util.h>
 
-#include <dwarfs/internal/block_cache.h>
-#include <dwarfs/internal/cached_block.h>
 #include <dwarfs/internal/fs_section.h>
 #include <dwarfs/internal/worker_group.h>
+#include <dwarfs/reader/internal/block_cache.h>
+#include <dwarfs/reader/internal/cached_block.h>
 
 namespace dwarfs::internal {
 
diff --git a/src/dwarfs/internal/cached_block.cpp b/src/dwarfs/reader/internal/cached_block.cpp
similarity index 98%
rename from src/dwarfs/internal/cached_block.cpp
rename to src/dwarfs/reader/internal/cached_block.cpp
index 7aa7d5fa..d87e0844 100644
--- a/src/dwarfs/internal/cached_block.cpp
+++ b/src/dwarfs/reader/internal/cached_block.cpp
@@ -30,8 +30,8 @@
 #include <dwarfs/logger.h>
 #include <dwarfs/mmif.h>
 
-#include <dwarfs/internal/cached_block.h>
 #include <dwarfs/internal/fs_section.h>
+#include <dwarfs/reader/internal/cached_block.h>
 
 namespace dwarfs::internal {
 
diff --git a/src/dwarfs/internal/filesystem_parser.cpp b/src/dwarfs/reader/internal/filesystem_parser.cpp
similarity index 99%
rename from src/dwarfs/internal/filesystem_parser.cpp
rename to src/dwarfs/reader/internal/filesystem_parser.cpp
index 5e573a7b..111332ae 100644
--- a/src/dwarfs/internal/filesystem_parser.cpp
+++ b/src/dwarfs/reader/internal/filesystem_parser.cpp
@@ -29,7 +29,7 @@
 #include <dwarfs/mmif.h>
 #include <dwarfs/options.h>
 
-#include <dwarfs/internal/filesystem_parser.h>
+#include <dwarfs/reader/internal/filesystem_parser.h>
 
 namespace dwarfs::internal {
 
diff --git a/src/dwarfs/internal/inode_reader_v2.cpp b/src/dwarfs/reader/internal/inode_reader_v2.cpp
similarity index 98%
rename from src/dwarfs/internal/inode_reader_v2.cpp
rename to src/dwarfs/reader/internal/inode_reader_v2.cpp
index da92b1dc..0efa7990 100644
--- a/src/dwarfs/internal/inode_reader_v2.cpp
+++ b/src/dwarfs/reader/internal/inode_reader_v2.cpp
@@ -34,15 +34,15 @@
 #include <range/v3/view/enumerate.hpp>
 
 #include <dwarfs/fstypes.h>
-#include <dwarfs/iovec_read_buf.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/options.h>
 #include <dwarfs/performance_monitor.h>
+#include <dwarfs/reader/iovec_read_buf.h>
 #include <dwarfs/util.h>
 
-#include <dwarfs/internal/block_cache.h>
-#include <dwarfs/internal/inode_reader_v2.h>
-#include <dwarfs/internal/offset_cache.h>
+#include <dwarfs/reader/internal/block_cache.h>
+#include <dwarfs/reader/internal/inode_reader_v2.h>
+#include <dwarfs/reader/internal/offset_cache.h>
 
 namespace dwarfs::internal {
 
diff --git a/src/dwarfs/internal/metadata_types.cpp b/src/dwarfs/reader/internal/metadata_types.cpp
similarity index 99%
rename from src/dwarfs/internal/metadata_types.cpp
rename to src/dwarfs/reader/internal/metadata_types.cpp
index c919e4a9..9e42a3df 100644
--- a/src/dwarfs/internal/metadata_types.cpp
+++ b/src/dwarfs/reader/internal/metadata_types.cpp
@@ -31,7 +31,7 @@
 #include <dwarfs/match.h>
 #include <dwarfs/util.h>
 
-#include <dwarfs/internal/metadata_types.h>
+#include <dwarfs/reader/internal/metadata_types.h>
 
 #include <dwarfs/gen-cpp2/metadata_types_custom_protocol.h>
 
diff --git a/src/dwarfs/internal/metadata_v2.cpp b/src/dwarfs/reader/internal/metadata_v2.cpp
similarity index 99%
rename from src/dwarfs/internal/metadata_v2.cpp
rename to src/dwarfs/reader/internal/metadata_v2.cpp
index 2a52d738..1a8daf1e 100644
--- a/src/dwarfs/internal/metadata_v2.cpp
+++ b/src/dwarfs/reader/internal/metadata_v2.cpp
@@ -55,8 +55,8 @@
 #include <dwarfs/vfs_stat.h>
 
 #include <dwarfs/internal/features.h>
-#include <dwarfs/internal/metadata_v2.h>
 #include <dwarfs/internal/string_table.h>
+#include <dwarfs/reader/internal/metadata_v2.h>
 
 #include <dwarfs/gen-cpp2/metadata_layouts.h>
 #include <dwarfs/gen-cpp2/metadata_types_custom_protocol.h>
diff --git a/src/dwarfs/metadata_types.cpp b/src/dwarfs/reader/metadata_types.cpp
similarity index 97%
rename from src/dwarfs/metadata_types.cpp
rename to src/dwarfs/reader/metadata_types.cpp
index 0482158c..e5c11604 100644
--- a/src/dwarfs/metadata_types.cpp
+++ b/src/dwarfs/reader/metadata_types.cpp
@@ -29,10 +29,10 @@
 #include <dwarfs/error.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/match.h>
-#include <dwarfs/metadata_types.h>
+#include <dwarfs/reader/metadata_types.h>
 #include <dwarfs/util.h>
 
-#include <dwarfs/internal/metadata_types.h>
+#include <dwarfs/reader/internal/metadata_types.h>
 
 namespace dwarfs {
 
diff --git a/src/dwarfs_main.cpp b/src/dwarfs_main.cpp
index 9996e36b..7ad05d51 100644
--- a/src/dwarfs_main.cpp
+++ b/src/dwarfs_main.cpp
@@ -85,15 +85,15 @@
 #include <dwarfs/conv.h>
 #include <dwarfs/error.h>
 #include <dwarfs/file_stat.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/fstypes.h>
-#include <dwarfs/iovec_read_buf.h>
 #include <dwarfs/library_dependencies.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/mmap.h>
 #include <dwarfs/options.h>
 #include <dwarfs/os_access.h>
 #include <dwarfs/performance_monitor.h>
+#include <dwarfs/reader/filesystem_v2.h>
+#include <dwarfs/reader/iovec_read_buf.h>
 #include <dwarfs/scope_exit.h>
 #include <dwarfs/string.h>
 #include <dwarfs/tool/iolayer.h>
diff --git a/src/dwarfsck_main.cpp b/src/dwarfsck_main.cpp
index 284a0260..d1dabcdf 100644
--- a/src/dwarfsck_main.cpp
+++ b/src/dwarfsck_main.cpp
@@ -38,12 +38,12 @@
 #include <dwarfs/conv.h>
 #include <dwarfs/error.h>
 #include <dwarfs/file_access.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/library_dependencies.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/mmap.h>
 #include <dwarfs/options.h>
 #include <dwarfs/os_access.h>
+#include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/thread_pool.h>
 #include <dwarfs/tool/iolayer.h>
 #include <dwarfs/tool/program_options_helpers.h>
diff --git a/src/dwarfsextract_main.cpp b/src/dwarfsextract_main.cpp
index 71cd5dd0..8c1830f5 100644
--- a/src/dwarfsextract_main.cpp
+++ b/src/dwarfsextract_main.cpp
@@ -27,13 +27,13 @@
 #include <boost/program_options.hpp>
 
 #include <dwarfs/filesystem_extractor.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/library_dependencies.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/mmap.h>
 #include <dwarfs/options.h>
 #include <dwarfs/os_access.h>
 #include <dwarfs/performance_monitor.h>
+#include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/string.h>
 #include <dwarfs/tool/iolayer.h>
 #include <dwarfs/tool/program_options_helpers.h>
diff --git a/src/mkdwarfs_main.cpp b/src/mkdwarfs_main.cpp
index 7eaffd25..d348b805 100644
--- a/src/mkdwarfs_main.cpp
+++ b/src/mkdwarfs_main.cpp
@@ -65,7 +65,6 @@
 #include <dwarfs/error.h>
 #include <dwarfs/file_access.h>
 #include <dwarfs/filesystem_block_category_resolver.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/filesystem_writer_factory.h>
 #include <dwarfs/filter_debug.h>
 #include <dwarfs/fragment_order_parser.h>
@@ -76,6 +75,7 @@
 #include <dwarfs/mmap.h>
 #include <dwarfs/options.h>
 #include <dwarfs/os_access.h>
+#include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/rule_based_entry_filter.h>
 #include <dwarfs/scanner.h>
 #include <dwarfs/segmenter_factory.h>
diff --git a/test/badfs_test.cpp b/test/badfs_test.cpp
index 699e6aa8..03e02a13 100644
--- a/test/badfs_test.cpp
+++ b/test/badfs_test.cpp
@@ -24,10 +24,10 @@
 
 #include <gtest/gtest.h>
 
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/mmap.h>
 #include <dwarfs/options.h>
+#include <dwarfs/reader/filesystem_v2.h>
 
 #include "test_helpers.h"
 #include "test_logger.h"
diff --git a/test/block_cache_test.cpp b/test/block_cache_test.cpp
index ac3c9240..b6540210 100644
--- a/test/block_cache_test.cpp
+++ b/test/block_cache_test.cpp
@@ -32,13 +32,13 @@
 
 #include <range/v3/view/enumerate.hpp>
 
-#include <dwarfs/block_range.h>
 #include <dwarfs/error.h>
-#include <dwarfs/filesystem_v2.h>
+#include <dwarfs/reader/block_range.h>
+#include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/tool/main_adapter.h>
 #include <dwarfs_tool_main.h>
 
-#include <dwarfs/internal/cached_block.h>
+#include <dwarfs/reader/internal/cached_block.h>
 
 #include "mmap_mock.h"
 #include "test_helpers.h"
diff --git a/test/compat_test.cpp b/test/compat_test.cpp
index cba744b3..3cd5365c 100644
--- a/test/compat_test.cpp
+++ b/test/compat_test.cpp
@@ -40,11 +40,11 @@
 #include <dwarfs/file_stat.h>
 #include <dwarfs/filesystem_block_category_resolver.h>
 #include <dwarfs/filesystem_extractor.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/filesystem_writer_factory.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/mmap.h>
 #include <dwarfs/options.h>
+#include <dwarfs/reader/filesystem_v2.h>
 #include <dwarfs/thread_pool.h>
 #include <dwarfs/vfs_stat.h>
 #include <dwarfs/writer_progress.h>
diff --git a/test/dwarfs_benchmark.cpp b/test/dwarfs_benchmark.cpp
index ca68afc4..b87ffce7 100644
--- a/test/dwarfs_benchmark.cpp
+++ b/test/dwarfs_benchmark.cpp
@@ -28,11 +28,11 @@
 #include <dwarfs/block_compressor.h>
 #include <dwarfs/entry_factory.h>
 #include <dwarfs/file_stat.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/filesystem_writer_factory.h>
-#include <dwarfs/iovec_read_buf.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/options.h>
+#include <dwarfs/reader/filesystem_v2.h>
+#include <dwarfs/reader/iovec_read_buf.h>
 #include <dwarfs/scanner.h>
 #include <dwarfs/segmenter_factory.h>
 #include <dwarfs/thread_pool.h>
diff --git a/test/dwarfs_test.cpp b/test/dwarfs_test.cpp
index 1fd07242..be25e169 100644
--- a/test/dwarfs_test.cpp
+++ b/test/dwarfs_test.cpp
@@ -39,13 +39,13 @@
 #include <dwarfs/entry_factory.h>
 #include <dwarfs/file_stat.h>
 #include <dwarfs/file_type.h>
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/filesystem_writer_factory.h>
 #include <dwarfs/filter_debug.h>
-#include <dwarfs/iovec_read_buf.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/mmif.h>
 #include <dwarfs/options.h>
+#include <dwarfs/reader/filesystem_v2.h>
+#include <dwarfs/reader/iovec_read_buf.h>
 #include <dwarfs/rule_based_entry_filter.h>
 #include <dwarfs/scanner.h>
 #include <dwarfs/segmenter_factory.h>
diff --git a/test/filesystem_test.cpp b/test/filesystem_test.cpp
index 6d5925e2..396ecb56 100644
--- a/test/filesystem_test.cpp
+++ b/test/filesystem_test.cpp
@@ -28,9 +28,9 @@
 
 #include <folly/Utility.h>
 
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/fstypes.h>
 #include <dwarfs/mmap.h>
+#include <dwarfs/reader/filesystem_v2.h>
 
 #include "mmap_mock.h"
 #include "test_helpers.h"
diff --git a/test/tool_main_test.cpp b/test/tool_main_test.cpp
index f4194aa9..e48cd54a 100644
--- a/test/tool_main_test.cpp
+++ b/test/tool_main_test.cpp
@@ -43,10 +43,10 @@
 
 #include <range/v3/view/enumerate.hpp>
 
-#include <dwarfs/filesystem_v2.h>
 #include <dwarfs/history.h>
-#include <dwarfs/iovec_read_buf.h>
 #include <dwarfs/logger.h>
+#include <dwarfs/reader/filesystem_v2.h>
+#include <dwarfs/reader/iovec_read_buf.h>
 #include <dwarfs/tool/main_adapter.h>
 #include <dwarfs/util.h>
 #include <dwarfs_tool_main.h>
diff --git a/test/utils_test.cpp b/test/utils_test.cpp
index fbb80918..959f0864 100644
--- a/test/utils_test.cpp
+++ b/test/utils_test.cpp
@@ -31,7 +31,7 @@
 #include <dwarfs/options.h>
 #include <dwarfs/util.h>
 
-#include <dwarfs/internal/offset_cache.h>
+#include <dwarfs/reader/internal/offset_cache.h>
 
 using namespace dwarfs;