diff --git a/mutation_writer/partition_based_splitting_writer.cc b/mutation_writer/partition_based_splitting_writer.cc
index feb956a60e..ef89a2fdbc 100644
--- a/mutation_writer/partition_based_splitting_writer.cc
+++ b/mutation_writer/partition_based_splitting_writer.cc
@@ -7,6 +7,7 @@
  */
 
 #include "mutation_writer/partition_based_splitting_writer.hh"
+#include "mutation_writer/feed_writers.hh"
 #include "mutation/mutation_rebuilder.hh"
 #include "replica/memtable.hh"
 
diff --git a/mutation_writer/partition_based_splitting_writer.hh b/mutation_writer/partition_based_splitting_writer.hh
index 5484a91a9d..a870fb5e2a 100644
--- a/mutation_writer/partition_based_splitting_writer.hh
+++ b/mutation_writer/partition_based_splitting_writer.hh
@@ -9,8 +9,7 @@
 #pragma once
 
 #include <seastar/util/noncopyable_function.hh>
-
-#include "feed_writers.hh"
+#include "readers/flat_mutation_reader_v2.hh"
 
 namespace mutation_writer {
 
diff --git a/mutation_writer/shard_based_splitting_writer.cc b/mutation_writer/shard_based_splitting_writer.cc
index ba7bef39ce..01de525dab 100644
--- a/mutation_writer/shard_based_splitting_writer.cc
+++ b/mutation_writer/shard_based_splitting_writer.cc
@@ -8,11 +8,11 @@
 
 #include "mutation_writer/shard_based_splitting_writer.hh"
 
-#include <cinttypes>
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/algorithm/min_element.hpp>
 #include <seastar/core/shared_mutex.hh>
 #include "dht/i_partitioner.hh"
+#include "mutation_writer/feed_writers.hh"
 
 namespace mutation_writer {
 
diff --git a/mutation_writer/shard_based_splitting_writer.hh b/mutation_writer/shard_based_splitting_writer.hh
index 829ca1dfe5..5ed020279a 100644
--- a/mutation_writer/shard_based_splitting_writer.hh
+++ b/mutation_writer/shard_based_splitting_writer.hh
@@ -9,8 +9,7 @@
 #pragma once
 
 #include <seastar/util/noncopyable_function.hh>
-
-#include "feed_writers.hh"
+#include "readers/flat_mutation_reader_v2.hh"
 
 namespace mutation_writer {
 
diff --git a/mutation_writer/timestamp_based_splitting_writer.cc b/mutation_writer/timestamp_based_splitting_writer.cc
index 4f89b96346..e916da1755 100644
--- a/mutation_writer/timestamp_based_splitting_writer.cc
+++ b/mutation_writer/timestamp_based_splitting_writer.cc
@@ -8,11 +8,12 @@
 
 #include "mutation_writer/timestamp_based_splitting_writer.hh"
 
-#include <cinttypes>
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/algorithm/min_element.hpp>
 #include <seastar/core/shared_mutex.hh>
 
+#include "mutation_writer/feed_writers.hh"
+
 namespace mutation_writer {
 
 namespace {
diff --git a/mutation_writer/timestamp_based_splitting_writer.hh b/mutation_writer/timestamp_based_splitting_writer.hh
index 50f412d38e..6fc25aef2d 100644
--- a/mutation_writer/timestamp_based_splitting_writer.hh
+++ b/mutation_writer/timestamp_based_splitting_writer.hh
@@ -10,7 +10,7 @@
 
 #include <seastar/util/noncopyable_function.hh>
 
-#include "feed_writers.hh"
+#include "readers/flat_mutation_reader_v2.hh"
 
 namespace mutation_writer {
 
diff --git a/mutation_writer/token_group_based_splitting_writer.cc b/mutation_writer/token_group_based_splitting_writer.cc
index e76afb8138..58b7e69a48 100644
--- a/mutation_writer/token_group_based_splitting_writer.cc
+++ b/mutation_writer/token_group_based_splitting_writer.cc
@@ -8,10 +8,10 @@
 
 #include "mutation_writer/token_group_based_splitting_writer.hh"
 
-#include <cinttypes>
 #include <seastar/core/shared_mutex.hh>
 #include <seastar/core/on_internal_error.hh>
-#include "dht/i_partitioner.hh"
+
+#include "mutation_writer/feed_writers.hh"
 
 namespace mutation_writer {
 
diff --git a/mutation_writer/token_group_based_splitting_writer.hh b/mutation_writer/token_group_based_splitting_writer.hh
index 48479d1ad6..d499f85d2d 100644
--- a/mutation_writer/token_group_based_splitting_writer.hh
+++ b/mutation_writer/token_group_based_splitting_writer.hh
@@ -9,8 +9,8 @@
 #pragma once
 
 #include <functional>
-
-#include "feed_writers.hh"
+#include "readers/flat_mutation_reader_v2.hh"
+#include "dht/token.hh"
 
 namespace mutation_writer {