diff --git a/alternator/ttl.hh b/alternator/ttl.hh
index 5bcf130582..3f6ea3aeaa 100644
--- a/alternator/ttl.hh
+++ b/alternator/ttl.hh
@@ -12,6 +12,7 @@
 #include <seastar/core/sharded.hh>
 #include <seastar/core/abort_source.hh>
 #include <seastar/core/semaphore.hh>
+#include "data_dictionary/data_dictionary.hh"
 
 namespace replica {
 class database;
diff --git a/cql3/statements/cf_properties.hh b/cql3/statements/cf_properties.hh
index 9f705e1880..840a7080c2 100644
--- a/cql3/statements/cf_properties.hh
+++ b/cql3/statements/cf_properties.hh
@@ -13,6 +13,7 @@
 
 #include "cql3/statements/cf_prop_defs.hh"
 #include "cql3/column_identifier.hh"
+#include "data_dictionary/data_dictionary.hh"
 
 namespace cql3 {
 
diff --git a/db/size_estimates_virtual_reader.hh b/db/size_estimates_virtual_reader.hh
index dabdb89404..89b6695b3a 100644
--- a/db/size_estimates_virtual_reader.hh
+++ b/db/size_estimates_virtual_reader.hh
@@ -8,9 +8,11 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <seastar/core/io_priority_class.hh>
 #include "readers/flat_mutation_reader_v2.hh"
 #include "readers/flat_mutation_reader.hh"
 #include "db/system_keyspace.hh"
+#include "tracing/trace_state.hh"
 
 namespace replica {
 class database;
diff --git a/db/system_keyspace_view_types.hh b/db/system_keyspace_view_types.hh
index 400ab6f017..306cf79d7f 100644
--- a/db/system_keyspace_view_types.hh
+++ b/db/system_keyspace_view_types.hh
@@ -10,6 +10,7 @@
 
 #include <seastar/core/seastar.hh>
 #include <seastar/core/sstring.hh>
+#include <seastar/core/smp.hh>
 #include <utility>
 #include <optional>
 #include "dht/token.hh"
diff --git a/db/view/view_updating_consumer.hh b/db/view/view_updating_consumer.hh
index 6a0a1b7b0d..77250ceb88 100644
--- a/db/view/view_updating_consumer.hh
+++ b/db/view/view_updating_consumer.hh
@@ -15,6 +15,7 @@
 #include "reader_permit.hh"
 #include "db/view/row_locking.hh"
 #include <seastar/core/abort_source.hh>
+#include <seastar/core/circular_buffer.hh>
 #include "mutation.hh"
 #include "mutation_rebuilder.hh"
 
diff --git a/protocol_server.hh b/protocol_server.hh
index 9fa616082f..295de6e796 100644
--- a/protocol_server.hh
+++ b/protocol_server.hh
@@ -10,6 +10,7 @@
 
 #include "seastarx.hh"
 #include <seastar/core/future.hh>
+#include <seastar/net/socket_defs.hh>
 #include <vector>
 #include "client_data.hh"
 #include "utils/chunked_vector.hh"
diff --git a/readers/from_mutations.hh b/readers/from_mutations.hh
index f564588340..dfcfce3939 100644
--- a/readers/from_mutations.hh
+++ b/readers/from_mutations.hh
@@ -11,6 +11,7 @@
 #include "dht/i_partitioner_fwd.hh"
 #include <vector>
 #include "mutation_fragment_fwd.hh"
+#include "readers/flat_mutation_reader_fwd.hh"
 
 class flat_mutation_reader;
 class reader_permit;
diff --git a/readers/from_mutations_v2.hh b/readers/from_mutations_v2.hh
index 3b471d0e70..df4b5360b0 100644
--- a/readers/from_mutations_v2.hh
+++ b/readers/from_mutations_v2.hh
@@ -11,6 +11,7 @@
 #include <vector>
 #include "dht/i_partitioner_fwd.hh"
 #include "mutation_fragment_fwd.hh"
+#include "readers/flat_mutation_reader_fwd.hh"
 
 class flat_mutation_reader_v2;
 class reader_permit;
diff --git a/readers/upgrading_consumer.hh b/readers/upgrading_consumer.hh
index 7b0b2e477a..5dd657e9d1 100644
--- a/readers/upgrading_consumer.hh
+++ b/readers/upgrading_consumer.hh
@@ -9,6 +9,7 @@
 #pragma once
 
 #include "mutation_fragment_v2.hh"
+#include "range_tombstone_change_generator.hh"
 
 template <typename EndConsumer>
 requires requires(EndConsumer& c, mutation_fragment_v2 mf) {
diff --git a/replica/memtable-sstable.hh b/replica/memtable-sstable.hh
index dc35d0554b..408921c6d1 100644
--- a/replica/memtable-sstable.hh
+++ b/replica/memtable-sstable.hh
@@ -17,6 +17,8 @@
 #include <seastar/core/io_priority_class.hh>
 
 class flat_mutation_reader;
+class flat_mutation_reader_v2;
+class reader_permit;
 
 namespace sstables {
 class sstables_manager;
diff --git a/schema_upgrader.hh b/schema_upgrader.hh
index 466b9253cd..7729ab0d0c 100644
--- a/schema_upgrader.hh
+++ b/schema_upgrader.hh
@@ -9,6 +9,7 @@
 #pragma once
 
 #include "mutation_fragment.hh"
+#include "mutation_fragment_v2.hh"
 #include "converting_mutation_partition_applier.hh"
 
 // A StreamedMutationTransformer which transforms the stream to a different schema
diff --git a/service/paxos/cas_request.hh b/service/paxos/cas_request.hh
index 3c8ff23fc8..7e1c72cd17 100644
--- a/service/paxos/cas_request.hh
+++ b/service/paxos/cas_request.hh
@@ -10,6 +10,7 @@
 #include <optional>
 
 #include "timestamp.hh"
+#include <seastar/core/sharded.hh>
 
 class mutation;
 
diff --git a/sstables/mutation_fragment_filter.hh b/sstables/mutation_fragment_filter.hh
index 68aa653857..ef35469e49 100644
--- a/sstables/mutation_fragment_filter.hh
+++ b/sstables/mutation_fragment_filter.hh
@@ -11,6 +11,7 @@
 #include "mutation_fragment.hh"
 #include "clustering_ranges_walker.hh"
 #include "clustering_key_filter.hh"
+#include "readers/flat_mutation_reader_fwd.hh"
 
 namespace sstables {
 
diff --git a/sstables/promoted_index_blocks_reader.hh b/sstables/promoted_index_blocks_reader.hh
index 0ebce95e75..9e768f0b09 100644
--- a/sstables/promoted_index_blocks_reader.hh
+++ b/sstables/promoted_index_blocks_reader.hh
@@ -14,6 +14,7 @@
 #include "m_format_read_helpers.hh"
 #include "sstables/mx/parsers.hh"
 #include "sstables/index_entry.hh"
+#include <seastar/core/circular_buffer.hh>
 
 namespace sstables {
 
diff --git a/test/raft/future_set.hh b/test/raft/future_set.hh
index 30ab61ff2c..9502e93907 100644
--- a/test/raft/future_set.hh
+++ b/test/raft/future_set.hh
@@ -11,6 +11,7 @@
 #include <seastar/core/coroutine.hh>
 #include <seastar/core/weak_ptr.hh>
 #include <seastar/core/condition-variable.hh>
+#include "test/raft/logical_timer.hh"
 
 using namespace seastar;
 
diff --git a/test/raft/logical_timer.hh b/test/raft/logical_timer.hh
index 19992948b1..3d2ae41623 100644
--- a/test/raft/logical_timer.hh
+++ b/test/raft/logical_timer.hh
@@ -13,6 +13,7 @@
 #include <seastar/core/future-util.hh>
 
 #include "raft/logical_clock.hh"
+#include "raft/raft.hh"
 
 using namespace seastar;
 
diff --git a/tombstone_gc.hh b/tombstone_gc.hh
index e7f15af46f..1b2c8b9805 100644
--- a/tombstone_gc.hh
+++ b/tombstone_gc.hh
@@ -12,6 +12,7 @@
 #include "gc_clock.hh"
 #include "dht/token.hh"
 #include "schema_fwd.hh"
+#include "range.hh"
 
 namespace dht {
 
@@ -21,12 +22,18 @@ using token_range = nonwrapping_range<token>;
 
 }
 
+class tombstone_gc_options;
+
 struct get_gc_before_for_range_result {
     gc_clock::time_point min_gc_before;
     gc_clock::time_point max_gc_before;
     bool knows_entire_range;
 };
 
+namespace replica {
+    class database;
+}
+
 void drop_repair_history_map_for_table(const utils::UUID& id);
 
 get_gc_before_for_range_result get_gc_before_for_range(schema_ptr s, const dht::token_range& range, const gc_clock::time_point& query_time);
diff --git a/utils/entangled.hh b/utils/entangled.hh
index 342c478b21..a44f2d15cf 100644
--- a/utils/entangled.hh
+++ b/utils/entangled.hh
@@ -9,6 +9,7 @@
 #pragma once
 
 #include <boost/intrusive/parent_from_member.hpp>
+#include <assert.h>
 
 //  A movable pointer-like object paired with exactly one other object of the same type. 
 //  The two objects which are paired with each other point at each other.
diff --git a/utils/immutable-collection.hh b/utils/immutable-collection.hh
index 6d2518567e..25a917db2c 100644
--- a/utils/immutable-collection.hh
+++ b/utils/immutable-collection.hh
@@ -9,6 +9,7 @@
 #pragma once
 #include <type_traits>
 #include <seastar/util/concepts.hh>
+#include <utility>
 
 namespace utils {