diff --git a/include/dwarfs/block_cache.h b/include/dwarfs/block_cache.h
index be779c4e..627941d0 100644
--- a/include/dwarfs/block_cache.h
+++ b/include/dwarfs/block_cache.h
@@ -21,19 +21,20 @@
 
 #pragma once
 
-#include <future>
-#include <limits>
-#include <memory>
-#include <mutex>
+#include <cstddef>
+#include <cstdint>
 
-#include "dwarfs/fstypes.h"
-#include "dwarfs/logger.h"
+#include <future>
+#include <memory>
+
+#include "dwarfs/block_compressor.h"
 
 namespace dwarfs {
 
 struct block_cache_options;
 
-class cached_block;
+class block_range;
+class logger;
 
 class block_cache {
  public:
diff --git a/include/dwarfs/block_compressor.h b/include/dwarfs/block_compressor.h
index ddc800f3..35403456 100644
--- a/include/dwarfs/block_compressor.h
+++ b/include/dwarfs/block_compressor.h
@@ -21,7 +21,11 @@
 
 #pragma once
 
+#include <cstdint>
+#include <cstdio>
 #include <memory>
+#include <string>
+#include <utility>
 #include <vector>
 
 namespace dwarfs {
diff --git a/include/dwarfs/block_manager.h b/include/dwarfs/block_manager.h
index 48b03f7c..db790454 100644
--- a/include/dwarfs/block_manager.h
+++ b/include/dwarfs/block_manager.h
@@ -21,15 +21,15 @@
 
 #pragma once
 
+#include <cstddef>
 #include <memory>
 #include <vector>
 
-#include "dwarfs/logger.h"
-
 namespace dwarfs {
 
 class filesystem_writer;
 class inode;
+class logger;
 class os_access;
 class progress;
 
diff --git a/include/dwarfs/console_writer.h b/include/dwarfs/console_writer.h
index 70d6d904..d1f79672 100644
--- a/include/dwarfs/console_writer.h
+++ b/include/dwarfs/console_writer.h
@@ -21,14 +21,18 @@
 
 #pragma once
 
-#include <array>
-#include <ostream>
+#include <atomic>
+#include <cstddef>
+#include <iosfwd>
+#include <mutex>
+#include <string>
 
 #include "dwarfs/logger.h"
-#include "dwarfs/progress.h"
 
 namespace dwarfs {
 
+class progress;
+
 class console_writer : public logger {
  public:
   console_writer(std::ostream& os, bool is_terminal, size_t width,
diff --git a/include/dwarfs/entry.h b/include/dwarfs/entry.h
index de7618e1..92ab42de 100644
--- a/include/dwarfs/entry.h
+++ b/include/dwarfs/entry.h
@@ -22,7 +22,11 @@
 #pragma once
 
 #include <array>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <memory>
+#include <string>
 #include <string_view>
 #include <vector>
 
@@ -30,10 +34,15 @@
 
 #include "dwarfs/file_interface.h"
 
-#include "dwarfs/gen-cpp2/metadata_types.h"
-
 namespace dwarfs {
 
+namespace thrift::metadata {
+
+class entry;
+class metadata;
+
+} // namespace thrift::metadata
+
 class file;
 class link;
 class dir;
diff --git a/include/dwarfs/filesystem_v2.h b/include/dwarfs/filesystem_v2.h
index 2342d067..8a14b5ad 100644
--- a/include/dwarfs/filesystem_v2.h
+++ b/include/dwarfs/filesystem_v2.h
@@ -21,27 +21,33 @@
 
 #pragma once
 
-#include <exception>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
+#include <iosfwd>
 #include <memory>
-#include <ostream>
+#include <optional>
 #include <string>
+#include <string_view>
+#include <utility>
 
-#include <sys/stat.h>
-#include <sys/statvfs.h>
 #include <sys/types.h>
 
-#include "dwarfs/error.h"
-#include "dwarfs/logger.h"
-#include "dwarfs/metadata_v2.h"
-#include "dwarfs/mmif.h"
+#include <folly/Expected.h>
+
+#include "dwarfs/metadata_types.h"
+
+struct stat;
+struct statvfs;
 
 namespace dwarfs {
 
-struct iovec_read_buf;
 struct block_cache_options;
+struct iovec_read_buf;
 
 class filesystem_writer;
+class logger;
+class mmif;
 class progress;
 
 class filesystem_v2 {
diff --git a/include/dwarfs/filesystem_writer.h b/include/dwarfs/filesystem_writer.h
index 441dbf2d..c52fe3d7 100644
--- a/include/dwarfs/filesystem_writer.h
+++ b/include/dwarfs/filesystem_writer.h
@@ -21,7 +21,11 @@
 
 #pragma once
 
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <ostream>
+#include <utility>
 #include <vector>
 
 #include "dwarfs/fstypes.h"
@@ -32,6 +36,7 @@ namespace dwarfs {
 class block_compressor;
 class logger;
 class progress;
+class worker_group;
 
 class section {
  public:
diff --git a/include/dwarfs/fstypes.h b/include/dwarfs/fstypes.h
index 6dbee246..17c72ede 100644
--- a/include/dwarfs/fstypes.h
+++ b/include/dwarfs/fstypes.h
@@ -21,12 +21,13 @@
 
 #pragma once
 
+#include <cstddef>
 #include <cstdint>
-#include <iostream>
+#include <iosfwd>
 #include <memory>
-#include <stdexcept>
+#include <string>
 
-#include <sys/uio.h>
+#include <bits/types/struct_iovec.h>
 
 #include <folly/small_vector.h>
 
@@ -62,7 +63,7 @@ struct iovec_read_buf {
   folly::small_vector<block_range, inline_storage> ranges;
 };
 
-constexpr uint8_t MAJOR_VERSION = 1;
+constexpr uint8_t MAJOR_VERSION = 2;
 constexpr uint8_t MINOR_VERSION = 0;
 
 enum class section_type : uint16_t {
diff --git a/include/dwarfs/global_entry_data.h b/include/dwarfs/global_entry_data.h
index a694b8cb..1573fe5d 100644
--- a/include/dwarfs/global_entry_data.h
+++ b/include/dwarfs/global_entry_data.h
@@ -23,6 +23,7 @@
 
 #include <cstdint>
 #include <limits>
+#include <string>
 #include <unordered_map>
 #include <vector>
 
diff --git a/include/dwarfs/inode.h b/include/dwarfs/inode.h
index 14ab3e22..4a72b030 100644
--- a/include/dwarfs/inode.h
+++ b/include/dwarfs/inode.h
@@ -19,7 +19,7 @@
  * along with dwarfs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <ostream>
+#include <iosfwd>
 #include <vector>
 
 #include "dwarfs/fstypes.h"
diff --git a/include/dwarfs/inode_manager.h b/include/dwarfs/inode_manager.h
index 5971fb72..42e83ca6 100644
--- a/include/dwarfs/inode_manager.h
+++ b/include/dwarfs/inode_manager.h
@@ -21,15 +21,13 @@
 
 #pragma once
 
+#include <cstddef>
 #include <functional>
 #include <memory>
-#include <ostream>
-
-#include "dwarfs/file_interface.h"
-#include "dwarfs/inode.h"
 
 namespace dwarfs {
 
+class inode;
 class script;
 
 class inode_manager {
diff --git a/include/dwarfs/inode_reader_v2.h b/include/dwarfs/inode_reader_v2.h
index 5477c9b8..48d3d62f 100644
--- a/include/dwarfs/inode_reader_v2.h
+++ b/include/dwarfs/inode_reader_v2.h
@@ -21,15 +21,21 @@
 
 #pragma once
 
+#include <cstddef>
+#include <iosfwd>
 #include <memory>
+#include <string>
+
+#include <sys/types.h>
 
-#include "dwarfs/block_cache.h"
-#include "dwarfs/fstypes.h"
-#include "dwarfs/logger.h"
 #include "dwarfs/metadata_types.h"
 
 namespace dwarfs {
 
+class block_cache;
+class logger;
+struct iovec_read_buf;
+
 class inode_reader_v2 {
  public:
   inode_reader_v2() = default;
diff --git a/include/dwarfs/logger.h b/include/dwarfs/logger.h
index 20673b6d..fefe4ade 100644
--- a/include/dwarfs/logger.h
+++ b/include/dwarfs/logger.h
@@ -21,15 +21,19 @@
 
 #pragma once
 
+#include <array>
 #include <atomic>
 #include <chrono>
+#include <cstddef>
 #include <iostream>
 #include <memory>
 #include <mutex>
 #include <sstream>
+#include <stdexcept>
 #include <string>
 #include <tuple>
 #include <type_traits>
+#include <utility>
 
 #include "dwarfs/util.h"
 
diff --git a/include/dwarfs/metadata_types.h b/include/dwarfs/metadata_types.h
index abea5115..a6f4991e 100644
--- a/include/dwarfs/metadata_types.h
+++ b/include/dwarfs/metadata_types.h
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include <cstddef>
 #include <cstdint>
 #include <string_view>
 
diff --git a/include/dwarfs/metadata_v2.h b/include/dwarfs/metadata_v2.h
index eaa728c4..e5d28fd7 100644
--- a/include/dwarfs/metadata_v2.h
+++ b/include/dwarfs/metadata_v2.h
@@ -21,28 +21,35 @@
 
 #pragma once
 
+#include <cstddef>
 #include <cstdint>
 #include <functional>
+#include <iosfwd>
 #include <memory>
 #include <optional>
+#include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
-#include <sys/stat.h>
-#include <sys/statvfs.h>
 #include <sys/types.h>
 
-#include <boost/iterator/iterator_facade.hpp>
-
 #include <folly/Expected.h>
 #include <folly/Range.h>
 
-#include "dwarfs/fstypes.h"
-#include "dwarfs/logger.h"
 #include "dwarfs/metadata_types.h"
 
+struct stat;
+struct statvfs;
+
 namespace dwarfs {
 
+class logger;
+
+namespace thrift::metadata {
+class metadata;
+}
+
 class metadata_v2 {
  public:
   metadata_v2() = default;
diff --git a/include/dwarfs/mmap.h b/include/dwarfs/mmap.h
index 24f497ab..c56d9f12 100644
--- a/include/dwarfs/mmap.h
+++ b/include/dwarfs/mmap.h
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include <cstddef>
 #include <string>
 
 #include "dwarfs/mmif.h"
diff --git a/include/dwarfs/options.h b/include/dwarfs/options.h
index 11a0b2b8..d2ac2ae1 100644
--- a/include/dwarfs/options.h
+++ b/include/dwarfs/options.h
@@ -21,7 +21,8 @@
 
 #pragma once
 
-#include <ostream>
+#include <cstddef>
+#include <iosfwd>
 
 namespace dwarfs {
 
diff --git a/include/dwarfs/os_access.h b/include/dwarfs/os_access.h
index e6133544..f720e03b 100644
--- a/include/dwarfs/os_access.h
+++ b/include/dwarfs/os_access.h
@@ -26,10 +26,10 @@
 
 #include <sys/stat.h>
 
-#include "dwarfs/mmif.h"
-
 namespace dwarfs {
 
+class mmif;
+
 class dir_reader {
  public:
   virtual ~dir_reader() = default;
diff --git a/include/dwarfs/os_access_posix.h b/include/dwarfs/os_access_posix.h
index 54815bbf..a1c44b56 100644
--- a/include/dwarfs/os_access_posix.h
+++ b/include/dwarfs/os_access_posix.h
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include <cstddef>
 #include <memory>
 #include <string>
 
@@ -28,6 +29,8 @@
 
 namespace dwarfs {
 
+class mmif;
+
 class os_access_posix : public os_access {
  public:
   std::shared_ptr<dir_reader> opendir(const std::string& path) const override;
diff --git a/include/dwarfs/progress.h b/include/dwarfs/progress.h
index 74cb3574..4eda89c1 100644
--- a/include/dwarfs/progress.h
+++ b/include/dwarfs/progress.h
@@ -23,9 +23,10 @@
 
 #include <atomic>
 #include <condition_variable>
+#include <cstddef>
 #include <cstdint>
+#include <iosfwd>
 #include <mutex>
-#include <ostream>
 #include <thread>
 
 #include <folly/Function.h>
diff --git a/include/dwarfs/scanner.h b/include/dwarfs/scanner.h
index d0a1d1ae..6bc37fa9 100644
--- a/include/dwarfs/scanner.h
+++ b/include/dwarfs/scanner.h
@@ -25,16 +25,18 @@
 #include <string>
 
 #include "dwarfs/block_manager.h"
-#include "dwarfs/worker_group.h"
 
 namespace dwarfs {
 
+struct scanner_options;
+
 class entry_factory;
+class filesystem_writer;
 class logger;
 class os_access;
 class progress;
-struct scanner_options;
 class script;
+class worker_group;
 
 class scanner {
  public:
diff --git a/include/dwarfs/similarity.h b/include/dwarfs/similarity.h
index 51700407..30990796 100644
--- a/include/dwarfs/similarity.h
+++ b/include/dwarfs/similarity.h
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include <cstddef>
 #include <cstdint>
 
 namespace dwarfs {
diff --git a/include/dwarfs/util.h b/include/dwarfs/util.h
index 53e477cd..6a73995e 100644
--- a/include/dwarfs/util.h
+++ b/include/dwarfs/util.h
@@ -21,8 +21,7 @@
 
 #pragma once
 
-#include <array>
-#include <climits>
+#include <cstddef>
 #include <string>
 
 namespace dwarfs {
@@ -31,4 +30,5 @@ std::string time_with_unit(double sec);
 std::string size_with_unit(size_t size);
 size_t parse_size_with_unit(const std::string& str);
 std::string get_program_path();
+
 } // namespace dwarfs
diff --git a/include/dwarfs/worker_group.h b/include/dwarfs/worker_group.h
index 5b6d14c7..2dacd232 100644
--- a/include/dwarfs/worker_group.h
+++ b/include/dwarfs/worker_group.h
@@ -21,8 +21,10 @@
 
 #pragma once
 
+#include <cstddef>
 #include <limits>
 #include <memory>
+#include <utility>
 
 #include <folly/Function.h>
 
diff --git a/src/dwarfs.cpp b/src/dwarfs.cpp
index ed4c46a4..d4740047 100644
--- a/src/dwarfs.cpp
+++ b/src/dwarfs.cpp
@@ -32,7 +32,10 @@
 
 #include <fuse3/fuse_lowlevel.h>
 
+#include "dwarfs/error.h"
 #include "dwarfs/filesystem_v2.h"
+#include "dwarfs/fstypes.h"
+#include "dwarfs/logger.h"
 #include "dwarfs/metadata_v2.h"
 #include "dwarfs/mmap.h"
 #include "dwarfs/options.h"
diff --git a/src/dwarfs/block_cache.cpp b/src/dwarfs/block_cache.cpp
index 2e09f5e4..103d0236 100644
--- a/src/dwarfs/block_cache.cpp
+++ b/src/dwarfs/block_cache.cpp
@@ -20,18 +20,24 @@
  */
 
 #include <algorithm>
+#include <atomic>
 #include <cassert>
 #include <deque>
 #include <exception>
 #include <future>
-#include <map>
-#include <queue>
+#include <iterator>
+#include <mutex>
+#include <new>
 #include <thread>
 #include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include <folly/container/EvictingCacheMap.h>
 
 #include "dwarfs/block_cache.h"
+#include "dwarfs/fstypes.h"
+#include "dwarfs/logger.h"
 #include "dwarfs/options.h"
 #include "dwarfs/worker_group.h"
 
diff --git a/src/dwarfs/block_compressor.cpp b/src/dwarfs/block_compressor.cpp
index 6a84c741..5e9c26c6 100644
--- a/src/dwarfs/block_compressor.cpp
+++ b/src/dwarfs/block_compressor.cpp
@@ -21,16 +21,24 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
+#include <cstdint>
 #include <cstring>
-#include <iostream>
+#include <iterator>
 #include <memory>
 #include <stdexcept>
 #include <unordered_map>
 
-#include <boost/algorithm/string.hpp>
+#include <sys/types.h>
+
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/split.hpp>
 
 #include <folly/Conv.h>
 
+#include <fmt/format.h>
+
 #ifdef DWARFS_HAVE_LIBLZ4
 #include <lz4.h>
 #include <lz4hc.h>
@@ -685,8 +693,8 @@ size_t lzma_block_decompressor::get_uncompressed_size(const uint8_t* data,
 
   lzma_ret ret = lzma_code(&s, LZMA_RUN);
   if (ret != LZMA_STREAM_END || s.avail_in != 0) {
-    std::cerr << ret << " - " << s.avail_in << std::endl;
-    throw std::runtime_error("lzma_code()");
+    throw std::runtime_error(
+        fmt::format("lzma_code(): {} (avail_in={})", ret, s.avail_in));
   }
 
   pos -= LZMA_STREAM_HEADER_SIZE;
diff --git a/src/dwarfs/block_manager.cpp b/src/dwarfs/block_manager.cpp
index 269b49c9..059591ff 100644
--- a/src/dwarfs/block_manager.cpp
+++ b/src/dwarfs/block_manager.cpp
@@ -19,21 +19,26 @@
  * along with dwarfs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <condition_variable>
-#include <map>
-#include <mutex>
-
+#include <algorithm>
+#include <cstdint>
 #include <cstring>
+#include <map>
+#include <stdexcept>
+#include <string>
+#include <utility>
+
+#include <fmt/format.h>
 
 #include <sparsehash/dense_hash_map>
 
-#include <fmt/core.h>
-
 #include "dwarfs/block_manager.h"
+#include "dwarfs/cyclic_hash.h"
 #include "dwarfs/file_interface.h"
 #include "dwarfs/filesystem_writer.h"
 #include "dwarfs/inode.h"
 #include "dwarfs/inode_hasher.h"
+#include "dwarfs/logger.h"
+#include "dwarfs/mmif.h"
 #include "dwarfs/os_access.h"
 #include "dwarfs/progress.h"
 #include "dwarfs/util.h"
diff --git a/src/dwarfs/console_writer.cpp b/src/dwarfs/console_writer.cpp
index bb0784aa..5b8de1f5 100644
--- a/src/dwarfs/console_writer.cpp
+++ b/src/dwarfs/console_writer.cpp
@@ -19,13 +19,17 @@
  * along with dwarfs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <locale>
 #include <sstream>
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 #include "dwarfs/console_writer.h"
 #include "dwarfs/entry.h"
+#include "dwarfs/file_interface.h"
 #include "dwarfs/inode.h"
+#include "dwarfs/progress.h"
+#include "dwarfs/util.h"
 
 namespace dwarfs {
 
diff --git a/src/dwarfs/entry.cpp b/src/dwarfs/entry.cpp
index d5a2df47..612ea3b4 100644
--- a/src/dwarfs/entry.cpp
+++ b/src/dwarfs/entry.cpp
@@ -21,21 +21,21 @@
 
 #include <algorithm>
 #include <cstring>
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <unistd.h>
+#include <stdexcept>
+#include <utility>
 
 #include <openssl/sha.h>
 
 #include "dwarfs/entry.h"
 #include "dwarfs/global_entry_data.h"
 #include "dwarfs/inode.h"
+#include "dwarfs/mmif.h"
 #include "dwarfs/os_access.h"
 #include "dwarfs/progress.h"
 #include "dwarfs/similarity.h"
 
+#include "dwarfs/gen-cpp2/metadata_types.h"
+
 namespace dwarfs {
 
 entry::entry(const std::string& name, std::shared_ptr<entry> parent,
diff --git a/src/dwarfs/filesystem_v2.cpp b/src/dwarfs/filesystem_v2.cpp
index 2c1024ff..0b17b266 100644
--- a/src/dwarfs/filesystem_v2.cpp
+++ b/src/dwarfs/filesystem_v2.cpp
@@ -21,18 +21,27 @@
 
 #include <cstddef>
 #include <cstring>
-
 #include <optional>
+#include <stdexcept>
 #include <unordered_map>
+#include <vector>
 
-#include <fmt/core.h>
+#include <sys/statvfs.h>
+
+#include <folly/Range.h>
+
+#include <fmt/format.h>
 
 #include "dwarfs/block_cache.h"
+#include "dwarfs/block_compressor.h"
 #include "dwarfs/config.h"
 #include "dwarfs/filesystem_v2.h"
 #include "dwarfs/filesystem_writer.h"
 #include "dwarfs/fstypes.h"
 #include "dwarfs/inode_reader_v2.h"
+#include "dwarfs/logger.h"
+#include "dwarfs/metadata_v2.h"
+#include "dwarfs/mmif.h"
 #include "dwarfs/options.h"
 #include "dwarfs/progress.h"
 
diff --git a/src/dwarfs/filesystem_writer.cpp b/src/dwarfs/filesystem_writer.cpp
index 43d895f5..c6a01c9b 100644
--- a/src/dwarfs/filesystem_writer.cpp
+++ b/src/dwarfs/filesystem_writer.cpp
@@ -21,6 +21,7 @@
 
 #include <atomic>
 #include <condition_variable>
+#include <cstdint>
 #include <cstring>
 #include <deque>
 #include <memory>
@@ -31,9 +32,11 @@
 
 #include "dwarfs/block_compressor.h"
 #include "dwarfs/filesystem_writer.h"
+#include "dwarfs/fstypes.h"
 #include "dwarfs/logger.h"
 #include "dwarfs/progress.h"
 #include "dwarfs/util.h"
+#include "dwarfs/worker_group.h"
 
 namespace dwarfs {
 
diff --git a/src/dwarfs/inode_manager.cpp b/src/dwarfs/inode_manager.cpp
index dc55c8f8..357fbc52 100644
--- a/src/dwarfs/inode_manager.cpp
+++ b/src/dwarfs/inode_manager.cpp
@@ -20,11 +20,16 @@
  */
 
 #include <algorithm>
+#include <cstdint>
+#include <limits>
 #include <numeric>
+#include <stdexcept>
+#include <string>
 #include <vector>
 
-#include "dwarfs/config.h"
 #include "dwarfs/entry.h"
+#include "dwarfs/file_interface.h"
+#include "dwarfs/inode.h"
 #include "dwarfs/inode_manager.h"
 #include "dwarfs/script.h"
 
diff --git a/src/dwarfs/inode_reader_v2.cpp b/src/dwarfs/inode_reader_v2.cpp
index bf818c26..1286b36c 100644
--- a/src/dwarfs/inode_reader_v2.cpp
+++ b/src/dwarfs/inode_reader_v2.cpp
@@ -19,15 +19,22 @@
  * along with dwarfs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <cerrno>
+#include <cstdint>
 #include <cstring>
+#include <future>
 #include <mutex>
+#include <ostream>
+#include <utility>
+#include <vector>
 
 #include <folly/container/Enumerate.h>
 #include <folly/stats/Histogram.h>
 
 #include "dwarfs/block_cache.h"
-#include "dwarfs/config.h"
+#include "dwarfs/fstypes.h"
 #include "dwarfs/inode_reader_v2.h"
+#include "dwarfs/logger.h"
 
 namespace dwarfs {
 
diff --git a/src/dwarfs/logger.cpp b/src/dwarfs/logger.cpp
index ef4133ec..b5ca5c6b 100644
--- a/src/dwarfs/logger.cpp
+++ b/src/dwarfs/logger.cpp
@@ -19,6 +19,9 @@
  * along with dwarfs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <cstdlib>
+#include <iterator>
+#include <locale>
 #include <stdexcept>
 
 #include <cxxabi.h>
diff --git a/src/dwarfs/metadata_types.cpp b/src/dwarfs/metadata_types.cpp
index 2475127f..8b5f9b79 100644
--- a/src/dwarfs/metadata_types.cpp
+++ b/src/dwarfs/metadata_types.cpp
@@ -22,9 +22,6 @@
 #include "dwarfs/metadata_types.h"
 
 #include "dwarfs/gen-cpp2/metadata_types_custom_protocol.h"
-#include <thrift/lib/cpp2/frozen/FrozenUtil.h>
-#include <thrift/lib/cpp2/protocol/DebugProtocol.h>
-#include <thrift/lib/thrift/gen-cpp2/frozen_types_custom_protocol.h>
 
 namespace dwarfs {
 
diff --git a/src/dwarfs/metadata_v2.cpp b/src/dwarfs/metadata_v2.cpp
index 59fd1d86..3d2cb277 100644
--- a/src/dwarfs/metadata_v2.cpp
+++ b/src/dwarfs/metadata_v2.cpp
@@ -20,17 +20,26 @@
  */
 
 #include <algorithm>
+#include <cerrno>
+#include <climits>
+#include <cstring>
+#include <ostream>
 
-#include <cassert>
-
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+#include <time.h>
 #include <unistd.h>
 
-#include "dwarfs/metadata_v2.h"
-
-#include "dwarfs/gen-cpp2/metadata_types_custom_protocol.h"
 #include <thrift/lib/cpp2/frozen/FrozenUtil.h>
 #include <thrift/lib/cpp2/protocol/DebugProtocol.h>
-#include <thrift/lib/thrift/gen-cpp2/frozen_types_custom_protocol.h>
+// #include <thrift/lib/thrift/gen-cpp2/frozen_types_custom_protocol.h>
+
+#include "dwarfs/logger.h"
+#include "dwarfs/metadata_v2.h"
+
+#include "dwarfs/gen-cpp2/metadata_layouts.h"
+#include "dwarfs/gen-cpp2/metadata_types_custom_protocol.h"
 
 namespace dwarfs {
 
diff --git a/src/dwarfs/mmap.cpp b/src/dwarfs/mmap.cpp
index d205a1b1..604751ce 100644
--- a/src/dwarfs/mmap.cpp
+++ b/src/dwarfs/mmap.cpp
@@ -19,10 +19,11 @@
  * along with dwarfs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <cerrno>
+
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include <boost/system/system_error.hpp>
diff --git a/src/dwarfs/options.cpp b/src/dwarfs/options.cpp
index ad02f85b..31661cd6 100644
--- a/src/dwarfs/options.cpp
+++ b/src/dwarfs/options.cpp
@@ -19,6 +19,9 @@
  * along with dwarfs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <ostream>
+#include <string>
+
 #include "dwarfs/options.h"
 
 namespace dwarfs {
diff --git a/src/dwarfs/os_access_posix.cpp b/src/dwarfs/os_access_posix.cpp
index 91f2e2ff..b40ec2c6 100644
--- a/src/dwarfs/os_access_posix.cpp
+++ b/src/dwarfs/os_access_posix.cpp
@@ -19,10 +19,12 @@
  * along with dwarfs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <cerrno>
 #include <stdexcept>
 #include <vector>
 
 #include <dirent.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include <boost/system/system_error.hpp>
diff --git a/src/dwarfs/progress.cpp b/src/dwarfs/progress.cpp
index 98b2fd35..f8979ecf 100644
--- a/src/dwarfs/progress.cpp
+++ b/src/dwarfs/progress.cpp
@@ -19,10 +19,13 @@
  * along with dwarfs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "dwarfs/progress.h"
+#include <chrono>
+#include <utility>
 
 #include <folly/system/ThreadName.h>
 
+#include "dwarfs/progress.h"
+
 namespace dwarfs {
 
 progress::progress(folly::Function<void(const progress&, bool)>&& func)
diff --git a/src/dwarfs/scanner.cpp b/src/dwarfs/scanner.cpp
index e9f25244..8c7fd80a 100644
--- a/src/dwarfs/scanner.cpp
+++ b/src/dwarfs/scanner.cpp
@@ -19,21 +19,29 @@
  * along with dwarfs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <algorithm>
+#include <cstdint>
 #include <cstring>
 #include <deque>
-#include <functional>
+#include <iterator>
+#include <stdexcept>
 #include <string>
+#include <string_view>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
+#include <unistd.h>
+
 #include <boost/system/system_error.hpp>
 
-#include "dwarfs/config.h"
+#include <folly/ExceptionString.h>
+
 #include "dwarfs/entry.h"
 #include "dwarfs/filesystem_writer.h"
-#include "dwarfs/fstypes.h"
 #include "dwarfs/global_entry_data.h"
 #include "dwarfs/hash_util.h"
+#include "dwarfs/inode.h"
 #include "dwarfs/inode_manager.h"
 #include "dwarfs/logger.h"
 #include "dwarfs/metadata_v2.h"
@@ -43,6 +51,9 @@
 #include "dwarfs/scanner.h"
 #include "dwarfs/script.h"
 #include "dwarfs/util.h"
+#include "dwarfs/worker_group.h"
+
+#include "dwarfs/gen-cpp2/metadata_types.h"
 
 namespace dwarfs {
 
diff --git a/src/dwarfs/similarity.cpp b/src/dwarfs/similarity.cpp
index 4b0b5d5f..7858a0be 100644
--- a/src/dwarfs/similarity.cpp
+++ b/src/dwarfs/similarity.cpp
@@ -21,6 +21,7 @@
 
 #include <algorithm>
 #include <array>
+#include <utility>
 
 #include <folly/Hash.h>
 
diff --git a/src/dwarfs/util.cpp b/src/dwarfs/util.cpp
index 42636d6d..00b3110a 100644
--- a/src/dwarfs/util.cpp
+++ b/src/dwarfs/util.cpp
@@ -19,7 +19,9 @@
  * along with dwarfs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <iomanip>
+#include <array>
+#include <climits>
+#include <stdexcept>
 #include <string>
 
 #include <unistd.h>
@@ -99,4 +101,5 @@ std::string get_program_path() {
 
   return std::string();
 }
+
 } // namespace dwarfs
diff --git a/src/dwarfs/worker_group.cpp b/src/dwarfs/worker_group.cpp
index fd6f7c56..3b5bb987 100644
--- a/src/dwarfs/worker_group.cpp
+++ b/src/dwarfs/worker_group.cpp
@@ -21,9 +21,13 @@
 
 #include <atomic>
 #include <condition_variable>
+#include <cstdint>
 #include <mutex>
 #include <queue>
+#include <stdexcept>
+#include <string>
 #include <thread>
+#include <vector>
 
 #include <sys/resource.h>
 #include <sys/time.h>
diff --git a/src/dwarfsbench.cpp b/src/dwarfsbench.cpp
index becd9ee8..d6bf6651 100644
--- a/src/dwarfsbench.cpp
+++ b/src/dwarfsbench.cpp
@@ -26,6 +26,7 @@
 
 #include "dwarfs/filesystem_v2.h"
 #include "dwarfs/fstypes.h"
+#include "dwarfs/logger.h"
 #include "dwarfs/mmap.h"
 #include "dwarfs/options.h"
 #include "dwarfs/util.h"
diff --git a/src/dwarfsck.cpp b/src/dwarfsck.cpp
index 58cfd784..6b0b12a8 100644
--- a/src/dwarfsck.cpp
+++ b/src/dwarfsck.cpp
@@ -27,6 +27,7 @@
 #include <folly/String.h>
 
 #include "dwarfs/filesystem_v2.h"
+#include "dwarfs/logger.h"
 #include "dwarfs/mmap.h"
 #include "dwarfs/options.h"
 
diff --git a/src/mkdwarfs.cpp b/src/mkdwarfs.cpp
index 8a9ab50b..147ae854 100644
--- a/src/mkdwarfs.cpp
+++ b/src/mkdwarfs.cpp
@@ -20,24 +20,33 @@
  */
 
 #include <algorithm>
+#include <array>
 #include <cstdio>
+#include <cstring>
 #include <fstream>
 #include <iostream>
+#include <iterator>
+#include <map>
+#include <memory>
 #include <sstream>
+#include <stdexcept>
+#include <string>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include <sys/ioctl.h>
 #include <unistd.h>
 
 #include <boost/algorithm/string.hpp>
+#include <boost/any.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
 
 #include <folly/Conv.h>
 #include <folly/gen/String.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #ifdef DWARFS_HAVE_LIBZSTD
 #include <zstd.h>
@@ -50,14 +59,18 @@
 #include "dwarfs/filesystem_v2.h"
 #include "dwarfs/filesystem_writer.h"
 #include "dwarfs/logger.h"
-#include "dwarfs/lua_script.h"
 #include "dwarfs/mmap.h"
 #include "dwarfs/options.h"
 #include "dwarfs/os_access_posix.h"
 #include "dwarfs/progress.h"
 #include "dwarfs/scanner.h"
+#include "dwarfs/script.h"
 #include "dwarfs/util.h"
 
+#ifdef DWARFS_HAVE_LUA
+#include "dwarfs/lua_script.h"
+#endif
+
 namespace po = boost::program_options;
 
 using namespace dwarfs;
diff --git a/test/dwarfs.cpp b/test/dwarfs.cpp
index 8f8de3ef..e68dc532 100644
--- a/test/dwarfs.cpp
+++ b/test/dwarfs.cpp
@@ -29,6 +29,7 @@
 #include "dwarfs/filesystem_v2.h"
 #include "dwarfs/filesystem_writer.h"
 #include "dwarfs/logger.h"
+#include "dwarfs/mmif.h"
 #include "dwarfs/options.h"
 #include "dwarfs/os_access.h"
 #include "dwarfs/progress.h"