diff --git a/alternator/executor.cc b/alternator/executor.cc
index 44dab46e60..4a1be61a69 100644
--- a/alternator/executor.cc
+++ b/alternator/executor.cc
@@ -60,6 +60,7 @@
 #include <boost/range/adaptors.hpp>
 #include <boost/range/algorithm/find_end.hpp>
 #include "service/storage_proxy.hh"
+#include "gms/gossiper.hh"
 
 logging::logger elogger("alternator-executor");
 
diff --git a/db/batchlog_manager.cc b/db/batchlog_manager.cc
index 19ad8bcda6..4dbd40d63b 100644
--- a/db/batchlog_manager.cc
+++ b/db/batchlog_manager.cc
@@ -59,6 +59,7 @@
 #include "database.hh"
 #include "unimplemented.hh"
 #include "gms/failure_detector.hh"
+#include "gms/gossiper.hh"
 #include "schema_registry.hh"
 #include "idl/uuid.dist.hh"
 #include "idl/frozen_schema.dist.hh"
diff --git a/db/hints/manager.cc b/db/hints/manager.cc
index 62cd21a656..bd65fdd711 100644
--- a/db/hints/manager.cc
+++ b/db/hints/manager.cc
@@ -32,6 +32,7 @@
 #include "db/extensions.hh"
 #include "service/storage_proxy.hh"
 #include "gms/versioned_value.hh"
+#include "gms/gossiper.hh"
 #include "seastarx.hh"
 #include "converting_mutation_partition_applier.hh"
 #include "utils/disk-error-handler.hh"
diff --git a/db/hints/manager.hh b/db/hints/manager.hh
index a43cfdff41..51ab0e4686 100644
--- a/db/hints/manager.hh
+++ b/db/hints/manager.hh
@@ -34,7 +34,6 @@
 #include <seastar/core/lowres_clock.hh>
 #include <seastar/core/shared_mutex.hh>
 #include <seastar/core/abort_source.hh>
-#include "gms/gossiper.hh"
 #include "locator/snitch_base.hh"
 #include "inet_address_vectors.hh"
 #include "db/commitlog/commitlog.hh"
@@ -49,6 +48,10 @@ namespace utils {
 class directories;
 }
 
+namespace gms {
+class gossiper;
+}
+
 namespace db {
 namespace hints {
 
diff --git a/db/view/view.cc b/db/view/view.cc
index 28e1dbd75c..c38ecc711f 100644
--- a/db/view/view.cc
+++ b/db/view/view.cc
@@ -81,6 +81,7 @@
 #include "types/map.hh"
 #include "utils/error_injection.hh"
 #include "utils/exponential_backoff_retry.hh"
+#include "utils/fb_utilities.hh"
 #include "query-result-writer.hh"
 
 using namespace std::chrono_literals;
diff --git a/message/messaging_service.cc b/message/messaging_service.cc
index 5ec0d915fb..e7c85e69b9 100644
--- a/message/messaging_service.cc
+++ b/message/messaging_service.cc
@@ -28,7 +28,6 @@
 #include "gms/gossip_digest_syn.hh"
 #include "gms/gossip_digest_ack.hh"
 #include "gms/gossip_digest_ack2.hh"
-#include "gms/gossiper.hh"
 #include "query-request.hh"
 #include "query-result.hh"
 #include <seastar/rpc/rpc.hh>
diff --git a/service/storage_proxy.hh b/service/storage_proxy.hh
index 9ba3329e42..d41c655ded 100644
--- a/service/storage_proxy.hh
+++ b/service/storage_proxy.hh
@@ -91,6 +91,11 @@ namespace cdc {
     class cdc_service;    
 }
 
+namespace gms {
+class gossiper;
+class feature_service;
+}
+
 namespace service {
 
 namespace paxos {
diff --git a/service/storage_service.hh b/service/storage_service.hh
index e1dfec6aa1..188f47b50b 100644
--- a/service/storage_service.hh
+++ b/service/storage_service.hh
@@ -42,9 +42,9 @@
 #include "gms/i_endpoint_state_change_subscriber.hh"
 #include "service/endpoint_lifecycle_subscriber.hh"
 #include "locator/token_metadata.hh"
-#include "gms/gossiper.hh"
 #include "inet_address_vectors.hh"
 #include <seastar/core/distributed.hh>
+#include <seastar/core/condition-variable.hh>
 #include "dht/i_partitioner.hh"
 #include "dht/token_range_endpoints.hh"
 #include <seastar/core/sleep.hh>
@@ -92,6 +92,10 @@ class view_update_generator;
 }
 }
 
+namespace netw {
+class messaging_service;
+}
+
 namespace dht {
 class boot_strapper;
 class range_streamer;
diff --git a/service/view_update_backlog_broker.hh b/service/view_update_backlog_broker.hh
index ba5b108049..3ff096bf32 100644
--- a/service/view_update_backlog_broker.hh
+++ b/service/view_update_backlog_broker.hh
@@ -21,13 +21,16 @@
 
 #pragma once
 
-#include "gms/gossiper.hh"
 #include "gms/i_endpoint_state_change_subscriber.hh"
 
 #include <seastar/core/abort_source.hh>
 #include <seastar/core/future.hh>
 #include <seastar/core/sharded.hh>
 
+namespace gms {
+class gossiper;
+}
+
 namespace service {
 
 class storage_proxy;
diff --git a/test/perf/perf_simple_query.cc b/test/perf/perf_simple_query.cc
index c8a33877f0..1c6949a063 100644
--- a/test/perf/perf_simple_query.cc
+++ b/test/perf/perf_simple_query.cc
@@ -40,6 +40,7 @@
 #include "db/config.hh"
 #include "db/extensions.hh"
 #include "alternator/tags_extension.hh"
+#include "gms/gossiper.hh"
 
 static const sstring table_name = "cf";