diff --git a/locator/abstract_replication_strategy.hh b/locator/abstract_replication_strategy.hh
index 46f469f80e..34ed725f2c 100644
--- a/locator/abstract_replication_strategy.hh
+++ b/locator/abstract_replication_strategy.hh
@@ -12,11 +12,9 @@
 #include <functional>
 #include <unordered_map>
 #include "gms/inet_address.hh"
-#include "locator/snitch_base.hh"
 #include "locator/token_range_splitter.hh"
 #include "dht/token-sharding.hh"
 #include "token_metadata.hh"
-#include "snitch_base.hh"
 #include "utils/maybe_yield.hh"
 #include "utils/sequenced_set.hh"
 #include "utils/simple_hashers.hh"
diff --git a/locator/tablet_sharder.hh b/locator/tablet_sharder.hh
index 922fea6aa9..9b52a8fb29 100644
--- a/locator/tablet_sharder.hh
+++ b/locator/tablet_sharder.hh
@@ -11,7 +11,7 @@
 #include "dht/token-sharding.hh"
 #include "locator/tablets.hh"
 #include "locator/token_metadata.hh"
-#include "utils/to_string.hh"
+#include <fmt/std.h>
 
 namespace locator {
 
diff --git a/locator/topology.hh b/locator/topology.hh
index db5921e761..95b5c5eeed 100644
--- a/locator/topology.hh
+++ b/locator/topology.hh
@@ -15,7 +15,6 @@
 #include <functional>
 #include <unordered_set>
 #include <unordered_map>
-#include <compare>
 #include <iostream>
 #include <random>
 
diff --git a/service/storage_service.hh b/service/storage_service.hh
index 0d44ed864c..ecf3ad7c8f 100644
--- a/service/storage_service.hh
+++ b/service/storage_service.hh
@@ -20,6 +20,7 @@
 #include "service/qos/service_level_controller.hh"
 #include "service/topology_guard.hh"
 #include "locator/abstract_replication_strategy.hh"
+#include "locator/snitch_base.hh"
 #include "locator/tablets.hh"
 #include "locator/tablet_metadata_guard.hh"
 #include "inet_address_vectors.hh"
diff --git a/test/boost/cdc_test.cc b/test/boost/cdc_test.cc
index 75f74d8b27..cb17e9e012 100644
--- a/test/boost/cdc_test.cc
+++ b/test/boost/cdc_test.cc
@@ -14,6 +14,7 @@
 #include <string>
 #include <boost/range/adaptor/map.hpp>
 #include <fmt/ranges.h>
+#include <fmt/std.h>
 
 #include "cdc/log.hh"
 #include "cdc/cdc_options.hh"
diff --git a/test/boost/network_topology_strategy_test.cc b/test/boost/network_topology_strategy_test.cc
index d80ddf27a8..58cbb556d7 100644
--- a/test/boost/network_topology_strategy_test.cc
+++ b/test/boost/network_topology_strategy_test.cc
@@ -11,6 +11,7 @@
 #include "gms/inet_address.hh"
 #include "inet_address_vectors.hh"
 #include "locator/types.hh"
+#include "locator/snitch_base.hh"
 #include "utils/assert.hh"
 #include "utils/UUID_gen.hh"
 #include "utils/sequenced_set.hh"
diff --git a/test/boost/tablets_test.cc b/test/boost/tablets_test.cc
index 07ceaf04ca..3e4c241810 100644
--- a/test/boost/tablets_test.cc
+++ b/test/boost/tablets_test.cc
@@ -30,6 +30,7 @@
 #include "locator/tablet_replication_strategy.hh"
 #include "locator/tablet_sharder.hh"
 #include "locator/load_sketch.hh"
+#include "locator/snitch_base.hh"
 #include "utils/UUID_gen.hh"
 #include "utils/error_injection.hh"
 #include "utils/to_string.hh"