diff --git a/alternator/executor.cc b/alternator/executor.cc
index 3ee457eb86..553fe604bf 100644
--- a/alternator/executor.cc
+++ b/alternator/executor.cc
@@ -7,7 +7,6 @@
  */
 
 #include <fmt/ranges.h>
-#include <seastar/core/sleep.hh>
 #include "alternator/executor.hh"
 #include "auth/permission.hh"
 #include "auth/resource.hh"
@@ -44,6 +43,8 @@
 #include "replica/database.hh"
 #include "alternator/rmw_operation.hh"
 #include <seastar/core/coroutine.hh>
+#include <seastar/core/sleep.hh>
+#include <seastar/coroutine/maybe_yield.hh>
 #include <boost/range/algorithm/find_end.hpp>
 #include <unordered_set>
 #include "service/storage_proxy.hh"
diff --git a/auth/service.cc b/auth/service.cc
index a4cf8ffa1c..2ec560e5f0 100644
--- a/auth/service.cc
+++ b/auth/service.cc
@@ -36,6 +36,7 @@
 #include "utils/log.hh"
 #include "schema/schema_fwd.hh"
 #include <seastar/core/future.hh>
+#include <seastar/coroutine/maybe_yield.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
 #include <variant>
 #include "service/migration_manager.hh"
diff --git a/cdc/generation.cc b/cdc/generation.cc
index 1e94932158..0773b773d2 100644
--- a/cdc/generation.cc
+++ b/cdc/generation.cc
@@ -12,6 +12,7 @@
 #include <algorithm>
 #include <seastar/core/sleep.hh>
 #include <seastar/core/coroutine.hh>
+#include <seastar/coroutine/maybe_yield.hh>
 
 #include "gms/endpoint_state.hh"
 #include "gms/versioned_value.hh"
diff --git a/compaction/compaction.cc b/compaction/compaction.cc
index 17f1f1c728..1ff52eb314 100644
--- a/compaction/compaction.cc
+++ b/compaction/compaction.cc
@@ -27,6 +27,7 @@
 #include <seastar/core/shared_ptr.hh>
 #include <seastar/core/shard_id.hh>
 #include <seastar/core/on_internal_error.hh>
+#include <seastar/coroutine/maybe_yield.hh>
 
 #include "compaction/compaction_garbage_collector.hh"
 #include "dht/i_partitioner.hh"
diff --git a/compaction/task_manager_module.cc b/compaction/task_manager_module.cc
index a3632245da..cdebe2a1be 100644
--- a/compaction/task_manager_module.cc
+++ b/compaction/task_manager_module.cc
@@ -7,6 +7,7 @@
  */
 
 #include <boost/range/algorithm/min_element.hpp>
+#include <seastar/coroutine/maybe_yield.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
 
 #include "compaction/task_manager_module.hh"
diff --git a/db/hints/resource_manager.cc b/db/hints/resource_manager.cc
index 2ff1f41ac6..68f94df834 100644
--- a/db/hints/resource_manager.cc
+++ b/db/hints/resource_manager.cc
@@ -17,6 +17,7 @@
 #include "seastarx.hh"
 #include <seastar/core/sleep.hh>
 #include <seastar/core/seastar.hh>
+#include <seastar/core/when_all.hh>
 #include "utils/div_ceil.hh"
 #include "utils/lister.hh"
 
diff --git a/db/large_data_handler.cc b/db/large_data_handler.cc
index 7f11cabf9b..1da23f7997 100644
--- a/db/large_data_handler.cc
+++ b/db/large_data_handler.cc
@@ -9,6 +9,7 @@
 #include "utils/assert.hh"
 #include <seastar/core/format.hh>
 #include <seastar/core/coroutine.hh>
+#include <seastar/core/when_all.hh>
 #include "db/system_keyspace.hh"
 #include "db/large_data_handler.hh"
 #include "sstables/sstables.hh"
diff --git a/db/schema_applier.cc b/db/schema_applier.cc
index 5b2a5513c9..f02fcae417 100644
--- a/db/schema_applier.cc
+++ b/db/schema_applier.cc
@@ -13,6 +13,7 @@
 #include <seastar/rpc/rpc_types.hh>
 #include <seastar/core/coroutine.hh>
 #include <seastar/core/future.hh>
+#include <seastar/coroutine/maybe_yield.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
 #include <seastar/core/loop.hh>
 #include <seastar/core/on_internal_error.hh>
diff --git a/db/snapshot/backup_task.cc b/db/snapshot/backup_task.cc
index a7e3a0894c..edb717c5f4 100644
--- a/db/snapshot/backup_task.cc
+++ b/db/snapshot/backup_task.cc
@@ -7,6 +7,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <seastar/coroutine/maybe_yield.hh>
+
 #include "utils/lister.hh"
 #include "utils/s3/client.hh"
 #include "replica/database.hh"
diff --git a/locator/util.cc b/locator/util.cc
index e4ba5d1678..b6b0245341 100644
--- a/locator/util.cc
+++ b/locator/util.cc
@@ -8,6 +8,7 @@
 #include "locator/util.hh"
 #include "replica/database.hh"
 #include "gms/gossiper.hh"
+#include <seastar/coroutine/maybe_yield.hh>
 
 namespace locator {
 
diff --git a/mutation/atomic_cell.hh b/mutation/atomic_cell.hh
index f1ab170693..90822466a2 100644
--- a/mutation/atomic_cell.hh
+++ b/mutation/atomic_cell.hh
@@ -10,16 +10,13 @@
 
 #include <seastar/util/bool_class.hh>
 
-#include "bytes.hh"
 #include "timestamp.hh"
 #include "mutation/tombstone.hh"
 #include "gc_clock.hh"
 #include "utils/assert.hh"
 #include "utils/managed_bytes.hh"
-#include <seastar/net//byteorder.hh>
 #include <seastar/util/bool_class.hh>
 #include <cstdint>
-#include <iosfwd>
 #include "utils/fragmented_temporary_buffer.hh"
 
 #include "serializer.hh"
diff --git a/mutation/mutation.hh b/mutation/mutation.hh
index 9e3e10a878..7a336a6dde 100644
--- a/mutation/mutation.hh
+++ b/mutation/mutation.hh
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include <iosfwd>
-
 #include "mutation_partition.hh"
 #include "keys.hh"
 #include "schema/schema_fwd.hh"
@@ -21,9 +19,8 @@
 #include "mutation/mutation_consumer_concepts.hh"
 #include "utils/preempt.hh"
 
+#include <seastar/util/later.hh>
 #include <seastar/util/optimized_optional.hh>
-#include <seastar/core/coroutine.hh>
-#include <seastar/coroutine/maybe_yield.hh>
 
 struct mutation_consume_cookie {
     using crs_iterator_type = mutation_partition::rows_type::iterator;
diff --git a/mutation/mutation_fragment.hh b/mutation/mutation_fragment.hh
index 4f80f2e4ac..fbe33e6705 100644
--- a/mutation/mutation_fragment.hh
+++ b/mutation/mutation_fragment.hh
@@ -14,8 +14,6 @@
 #include <optional>
 #include <seastar/util/optimized_optional.hh>
 
-#include <seastar/core/future-util.hh>
-
 #include "reader_permit.hh"
 #include "mutation_fragment_fwd.hh"
 #include "mutation/mutation_partition.hh"
diff --git a/mutation/mutation_fragment_fwd.hh b/mutation/mutation_fragment_fwd.hh
index 421640b176..e3566c2d24 100644
--- a/mutation/mutation_fragment_fwd.hh
+++ b/mutation/mutation_fragment_fwd.hh
@@ -7,7 +7,6 @@
  */
 
 #pragma once
-#include <seastar/util/bool_class.hh>
 #include <seastar/util/optimized_optional.hh>
 
 using namespace seastar;
diff --git a/mutation/mutation_fragment_stream_validator.cc b/mutation/mutation_fragment_stream_validator.cc
index c3b22afe28..f1c5c41fc8 100644
--- a/mutation/mutation_fragment_stream_validator.cc
+++ b/mutation/mutation_fragment_stream_validator.cc
@@ -7,7 +7,7 @@
  */
 
 #include "mutation/mutation_fragment_stream_validator.hh"
-#include "utils/to_string.hh"
+#include <fmt/std.h>
 #include "seastarx.hh"
 
 logging::logger validator_log("mutation_fragment_stream_validator");
diff --git a/mutation/mutation_fragment_v2.hh b/mutation/mutation_fragment_v2.hh
index dd432f775f..26b6a68ccb 100644
--- a/mutation/mutation_fragment_v2.hh
+++ b/mutation/mutation_fragment_v2.hh
@@ -15,8 +15,6 @@
 #include <optional>
 #include <seastar/util/optimized_optional.hh>
 
-#include <seastar/core/future-util.hh>
-
 #include "reader_permit.hh"
 
 // Mutation fragment which represents a range tombstone boundary.
diff --git a/mutation/mutation_partition.hh b/mutation/mutation_partition.hh
index e3e7e35b02..778f2e66fc 100644
--- a/mutation/mutation_partition.hh
+++ b/mutation/mutation_partition.hh
@@ -9,10 +9,8 @@
 #pragma once
 
 #include <iosfwd>
-#include <boost/intrusive/set.hpp>
 #include <boost/intrusive/parent_from_member.hpp>
 
-#include <seastar/core/bitset-iter.hh>
 #include <seastar/util/optimized_optional.hh>
 
 #include <ranges>
diff --git a/mutation/mutation_partition_serializer.cc b/mutation/mutation_partition_serializer.cc
index bd084848b9..255ec36bfc 100644
--- a/mutation/mutation_partition_serializer.cc
+++ b/mutation/mutation_partition_serializer.cc
@@ -11,7 +11,6 @@
 #include "mutation_partition.hh"
 
 #include "counters.hh"
-#include "idl/mutation.dist.hh"
 #include "idl/mutation.dist.impl.hh"
 #include "frozen_mutation.hh"
 #include <seastar/coroutine/maybe_yield.hh>
diff --git a/mutation/mutation_partition_v2.hh b/mutation/mutation_partition_v2.hh
index 091792f01d..48f45c541d 100644
--- a/mutation/mutation_partition_v2.hh
+++ b/mutation/mutation_partition_v2.hh
@@ -9,13 +9,8 @@
 #pragma once
 
 #include "utils/assert.hh"
-#include <iosfwd>
-#include <boost/intrusive/set.hpp>
 #include <boost/intrusive/parent_from_member.hpp>
 
-#include <seastar/core/bitset-iter.hh>
-#include <seastar/util/optimized_optional.hh>
-
 #include "mutation_partition.hh"
 
 #include <ranges>
diff --git a/mutation/mutation_partition_view.hh b/mutation/mutation_partition_view.hh
index a1dbfe31eb..f7f81dc765 100644
--- a/mutation/mutation_partition_view.hh
+++ b/mutation/mutation_partition_view.hh
@@ -12,7 +12,6 @@
 #include "mutation_partition_visitor.hh"
 #include "utils/input_stream.hh"
 #include "atomic_cell.hh"
-#include "idl/mutation.dist.hh"
 #include "idl/mutation.dist.impl.hh"
 
 namespace ser {
diff --git a/mutation/partition_version.hh b/mutation/partition_version.hh
index bad8ec4274..87ae46aeb6 100644
--- a/mutation/partition_version.hh
+++ b/mutation/partition_version.hh
@@ -17,7 +17,6 @@
 #include "utils/chunked_vector.hh"
 
 #include <boost/intrusive/parent_from_member.hpp>
-#include <boost/intrusive/slist.hpp>
 
 class static_row;
 
diff --git a/mutation/range_tombstone.hh b/mutation/range_tombstone.hh
index b9e91d635d..e1c3eb37bd 100644
--- a/mutation/range_tombstone.hh
+++ b/mutation/range_tombstone.hh
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include <boost/intrusive/set.hpp>
 #include <optional>
 #include "utils/hashing.hh"
 #include "keys.hh"
@@ -16,8 +15,6 @@
 #include "clustering_bounds_comparator.hh"
 #include "mutation/position_in_partition.hh"
 
-namespace bi = boost::intrusive;
-
 /**
  * Represents a ranged deletion operation. Can be empty.
  */
diff --git a/mutation/range_tombstone_assembler.hh b/mutation/range_tombstone_assembler.hh
index c36d810f0b..745424b5e8 100644
--- a/mutation/range_tombstone_assembler.hh
+++ b/mutation/range_tombstone_assembler.hh
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include <exception>
 #include <seastar/core/format.hh>
 
 #include "mutation/mutation_fragment_v2.hh"
diff --git a/mutation/range_tombstone_list.hh b/mutation/range_tombstone_list.hh
index 348723ca18..b76151aea4 100644
--- a/mutation/range_tombstone_list.hh
+++ b/mutation/range_tombstone_list.hh
@@ -9,6 +9,7 @@
 #pragma once
 
 #include <seastar/util/defer.hh>
+#include <boost/intrusive/set.hpp>
 #include "range_tombstone.hh"
 #include "query-request.hh"
 #include "utils/assert.hh"
diff --git a/mutation/tombstone.hh b/mutation/tombstone.hh
index 6696feb396..72e5e89599 100644
--- a/mutation/tombstone.hh
+++ b/mutation/tombstone.hh
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include <functional>
 #include <compare>
 
 #include "timestamp.hh"
diff --git a/mutation_writer/timestamp_based_splitting_writer.cc b/mutation_writer/timestamp_based_splitting_writer.cc
index a2172dbfa7..4a7093c553 100644
--- a/mutation_writer/timestamp_based_splitting_writer.cc
+++ b/mutation_writer/timestamp_based_splitting_writer.cc
@@ -12,6 +12,7 @@
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/algorithm/min_element.hpp>
 #include <seastar/core/shared_mutex.hh>
+#include <seastar/core/when_all.hh>
 
 #include "mutation_writer/feed_writers.hh"
 
diff --git a/readers/combined.cc b/readers/combined.cc
index 0970f1243f..4dbd2cc991 100644
--- a/readers/combined.cc
+++ b/readers/combined.cc
@@ -7,6 +7,7 @@
  */
 
 #include <seastar/core/coroutine.hh>
+#include <seastar/core/when_all.hh>
 
 #include "readers/empty_v2.hh"
 #include "readers/clustering_combined.hh"
diff --git a/repair/repair.cc b/repair/repair.cc
index 5a3951c4df..621557bd3d 100644
--- a/repair/repair.cc
+++ b/repair/repair.cc
@@ -37,10 +37,11 @@
 #include <seastar/util/defer.hh>
 #include <seastar/core/metrics_registration.hh>
 #include <seastar/core/coroutine.hh>
-#include <seastar/coroutine/parallel_for_each.hh>
 #include <seastar/core/sleep.hh>
-#include <seastar/coroutine/exception.hh>
 #include <seastar/coroutine/as_future.hh>
+#include <seastar/coroutine/exception.hh>
+#include <seastar/coroutine/maybe_yield.hh>
+#include <seastar/coroutine/parallel_for_each.hh>
 
 #include <exception>
 #include <cfloat>
diff --git a/replica/tablets.cc b/replica/tablets.cc
index 7ec6fbb123..bc08a48357 100644
--- a/replica/tablets.cc
+++ b/replica/tablets.cc
@@ -7,6 +7,7 @@
  */
 
 #include <fmt/ranges.h>
+#include <seastar/coroutine/maybe_yield.hh>
 
 #include "types/types.hh"
 #include "types/tuple.hh"
diff --git a/service/mapreduce_service.cc b/service/mapreduce_service.cc
index 47842a2266..0ae059c3c0 100644
--- a/service/mapreduce_service.cc
+++ b/service/mapreduce_service.cc
@@ -10,6 +10,7 @@
 
 #include <boost/range/algorithm/remove_if.hpp>
 #include <seastar/core/coroutine.hh>
+#include <seastar/coroutine/maybe_yield.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
 #include <seastar/core/future-util.hh>
 #include <seastar/core/smp.hh>
diff --git a/service/tablet_allocator.cc b/service/tablet_allocator.cc
index b9e6d67893..b5a3f443ac 100644
--- a/service/tablet_allocator.cc
+++ b/service/tablet_allocator.cc
@@ -21,6 +21,7 @@
 #include "gms/feature_service.hh"
 #include <utility>
 #include <fmt/ranges.h>
+#include <seastar/coroutine/maybe_yield.hh>
 #include <absl/container/flat_hash_map.h>
 
 using namespace locator;
diff --git a/service/topology_coordinator.cc b/service/topology_coordinator.cc
index 59d006842a..1112b50947 100644
--- a/service/topology_coordinator.cc
+++ b/service/topology_coordinator.cc
@@ -11,6 +11,7 @@
 #include <seastar/core/abort_source.hh>
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/as_future.hh>
+#include <seastar/coroutine/maybe_yield.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
 #include <seastar/core/future.hh>
 #include <seastar/core/sharded.hh>
diff --git a/sstables_loader.cc b/sstables_loader.cc
index 2c5747b434..382ef1f270 100644
--- a/sstables_loader.cc
+++ b/sstables_loader.cc
@@ -8,6 +8,7 @@
 
 #include <fmt/ranges.h>
 #include <seastar/core/coroutine.hh>
+#include <seastar/coroutine/maybe_yield.hh>
 #include <seastar/coroutine/switch_to.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
 #include <seastar/rpc/rpc.hh>
diff --git a/test/lib/random_schema.cc b/test/lib/random_schema.cc
index 3efa660ec7..e765ff45b6 100644
--- a/test/lib/random_schema.cc
+++ b/test/lib/random_schema.cc
@@ -11,6 +11,8 @@
 #include <boost/algorithm/string/join.hpp>
 #include <boost/range/algorithm/unique.hpp>
 
+#include <seastar/coroutine/maybe_yield.hh>
+
 #include "cql3/cql3_type.hh"
 #include "cql3/description.hh"
 #include "mutation/mutation.hh"