diff --git a/database.cc b/database.cc
index 94dce787ad..d746f7a065 100644
--- a/database.cc
+++ b/database.cc
@@ -26,6 +26,7 @@
 #include <seastar/core/future-util.hh>
 #include "db/commitlog/commitlog_entry.hh"
 #include "db/system_keyspace.hh"
+#include "db/system_distributed_keyspace.hh"
 #include "db/commitlog/commitlog.hh"
 #include "db/config.hh"
 #include "to_string.hh"
diff --git a/db/view/view.cc b/db/view/view.cc
index 1799908804..3464db97cc 100644
--- a/db/view/view.cc
+++ b/db/view/view.cc
@@ -61,6 +61,7 @@
 #include "db/view/view_updating_consumer.hh"
 #include "db/system_keyspace_view_types.hh"
 #include "db/system_keyspace.hh"
+#include "db/system_distributed_keyspace.hh"
 #include "frozen_mutation.hh"
 #include "gms/inet_address.hh"
 #include "keys.hh"
diff --git a/db/view/view_builder.hh b/db/view/view_builder.hh
index 1364571806..a74150f625 100644
--- a/db/view/view_builder.hh
+++ b/db/view/view_builder.hh
@@ -22,7 +22,6 @@
 #pragma once
 
 #include "database.hh"
-#include "db/system_distributed_keyspace.hh"
 #include "dht/i_partitioner.hh"
 #include "keys.hh"
 #include "query-request.hh"
@@ -44,6 +43,12 @@
 #include <unordered_map>
 #include <vector>
 
+namespace db {
+
+class system_distributed_keyspace;
+
+}
+
 namespace db::system_keyspace {
 
 using view_name = std::pair<sstring, sstring>;
diff --git a/db/view/view_update_checks.hh b/db/view/view_update_checks.hh
index a2bab3d118..f77b951954 100644
--- a/db/view/view_update_checks.hh
+++ b/db/view/view_update_checks.hh
@@ -21,11 +21,16 @@
 
 #pragma once
 
-#include "db/system_distributed_keyspace.hh"
 #include "streaming/stream_reason.hh"
 #include <boost/range/adaptor/map.hpp>
 #include <boost/algorithm/cxx11/any_of.hpp>
 
+namespace db {
+
+class system_distributed_keyspace;
+
+}
+
 namespace db::view {
 
 future<bool> check_view_build_ongoing(db::system_distributed_keyspace& sys_dist_ks, const sstring& ks_name, const sstring& cf_name);
diff --git a/message/messaging_service.hh b/message/messaging_service.hh
index 44dc0a4271..dd557bffef 100644
--- a/message/messaging_service.hh
+++ b/message/messaging_service.hh
@@ -74,6 +74,7 @@ class update_backlog;
 class frozen_mutation;
 class frozen_schema;
 class partition_checksum;
+class canonical_mutation;
 
 namespace dht {
     class token;
diff --git a/repair/repair.cc b/repair/repair.cc
index 0cd7bf36c1..6a2b8f4f74 100644
--- a/repair/repair.cc
+++ b/repair/repair.cc
@@ -37,6 +37,7 @@
 #include "hashers.hh"
 #include "locator/network_topology_strategy.hh"
 #include "utils/bit_cast.hh"
+#include "service/migration_manager.hh"
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/split.hpp>
diff --git a/repair/repair.hh b/repair/repair.hh
index 19a42a7c0d..a02b3d30cd 100644
--- a/repair/repair.hh
+++ b/repair/repair.hh
@@ -30,6 +30,7 @@
 #include <seastar/core/sharded.hh>
 #include <seastar/core/future.hh>
 #include <seastar/core/condition-variable.hh>
+#include <seastar/core/gate.hh>
 
 #include "database_fwd.hh"
 #include "frozen_mutation.hh"
diff --git a/repair/row_level.cc b/repair/row_level.cc
index 936a713d74..ffbdb4213f 100644
--- a/repair/row_level.cc
+++ b/repair/row_level.cc
@@ -51,6 +51,7 @@
 #include "repair/row_level.hh"
 #include "mutation_source_metadata.hh"
 #include "utils/stall_free.hh"
+#include "service/migration_manager.hh"
 
 extern logging::logger rlogger;
 
diff --git a/repair/row_level.hh b/repair/row_level.hh
index 9cac523548..ce6c0ca618 100644
--- a/repair/row_level.hh
+++ b/repair/row_level.hh
@@ -23,12 +23,17 @@
 
 #include <vector>
 #include "gms/inet_address.hh"
-#include "db/system_distributed_keyspace.hh"
 #include "repair/repair.hh"
 #include <seastar/core/distributed.hh>
 
 class row_level_repair_gossip_helper;
 
+namespace db {
+
+class system_distributed_keyspace;
+
+}
+
 namespace gms {
     class gossiper;
 }
diff --git a/service/storage_proxy.cc b/service/storage_proxy.cc
index e66d4f0d94..bad335fc97 100644
--- a/service/storage_proxy.cc
+++ b/service/storage_proxy.cc
@@ -93,6 +93,7 @@
 #include "cdc/cdc_options.hh"
 #include "utils/histogram_metrics_helper.hh"
 #include "service/paxos/prepare_summary.hh"
+#include "service/migration_manager.hh"
 #include "service/paxos/proposal.hh"
 #include "locator/token_metadata.hh"
 #include "seastar/core/coroutine.hh"
diff --git a/service/storage_service.cc b/service/storage_service.cc
index 96f1ce8a5c..83c5d51364 100644
--- a/service/storage_service.cc
+++ b/service/storage_service.cc
@@ -42,6 +42,7 @@
 #include <seastar/core/distributed.hh>
 #include "locator/snitch_base.hh"
 #include "db/system_keyspace.hh"
+#include "db/system_distributed_keyspace.hh"
 #include "utils/UUID.hh"
 #include "gms/inet_address.hh"
 #include "log.hh"
diff --git a/streaming/stream_session.cc b/streaming/stream_session.cc
index b382060d2c..fff9001557 100644
--- a/streaming/stream_session.cc
+++ b/streaming/stream_session.cc
@@ -55,6 +55,7 @@
 #include "streaming/stream_exception.hh"
 #include "service/storage_proxy.hh"
 #include "service/priority_manager.hh"
+#include "service/migration_manager.hh"
 #include "query-request.hh"
 #include "schema_registry.hh"
 #include "mutation_writer/multishard_writer.hh"
diff --git a/streaming/stream_session.hh b/streaming/stream_session.hh
index 4d1656fb42..b59f3db0a7 100644
--- a/streaming/stream_session.hh
+++ b/streaming/stream_session.hh
@@ -53,11 +53,16 @@
 #include "streaming/session_info.hh"
 #include "query-request.hh"
 #include "dht/i_partitioner.hh"
-#include "db/system_distributed_keyspace.hh"
 #include <map>
 #include <vector>
 #include <memory>
 
+namespace db {
+
+class system_distributed_keyspace;
+
+}
+
 namespace db::view {
 
 class view_update_generator;