diff --git a/alternator/executor.cc b/alternator/executor.cc
index 07b401e3e5..fbb6edbc21 100644
--- a/alternator/executor.cc
+++ b/alternator/executor.cc
@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <fmt/ranges.h>
 #include <seastar/core/sleep.hh>
 #include "alternator/executor.hh"
 #include "db/config.hh"
diff --git a/alternator/server.cc b/alternator/server.cc
index 3eeee5489c..8aaf23a1bb 100644
--- a/alternator/server.cc
+++ b/alternator/server.cc
@@ -8,6 +8,7 @@
 
 #include "alternator/server.hh"
 #include "log.hh"
+#include <fmt/ranges.h>
 #include <seastar/http/function_handlers.hh>
 #include <seastar/http/short_streams.hh>
 #include <seastar/core/coroutine.hh>
diff --git a/api/storage_service.cc b/api/storage_service.cc
index f5328be371..8fb62353e5 100644
--- a/api/storage_service.cc
+++ b/api/storage_service.cc
@@ -26,6 +26,7 @@
 #include <boost/algorithm/string/trim_all.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/functional/hash.hpp>
+#include <fmt/ranges.h>
 #include "service/raft/raft_group0_client.hh"
 #include "service/storage_service.hh"
 #include "service/load_meter.hh"
diff --git a/api/tasks.cc b/api/tasks.cc
index cd10b3e9ad..dc4657b275 100644
--- a/api/tasks.cc
+++ b/api/tasks.cc
@@ -7,6 +7,7 @@
  */
 
 #include <seastar/core/coroutine.hh>
+#include <fmt/ranges.h>
 
 #include "api/api.hh"
 #include "api/storage_service.hh"
diff --git a/auth/certificate_authenticator.cc b/auth/certificate_authenticator.cc
index 0159bb7a5b..8269c1a17c 100644
--- a/auth/certificate_authenticator.cc
+++ b/auth/certificate_authenticator.cc
@@ -10,6 +10,7 @@
 #include "auth/certificate_authenticator.hh"
 
 #include <regex>
+#include <fmt/ranges.h>
 
 #include "utils/class_registrator.hh"
 #include "data_dictionary/data_dictionary.hh"
diff --git a/auth/permissions_cache.cc b/auth/permissions_cache.cc
index ff09c84621..0f38cb4d03 100644
--- a/auth/permissions_cache.cc
+++ b/auth/permissions_cache.cc
@@ -8,6 +8,7 @@
 
 #include "auth/permissions_cache.hh"
 
+#include <fmt/ranges.h>
 #include "auth/authorizer.hh"
 #include "auth/service.hh"
 
diff --git a/compaction/compaction_manager.cc b/compaction/compaction_manager.cc
index 939b1d75a4..9f7695a97e 100644
--- a/compaction/compaction_manager.cc
+++ b/compaction/compaction_manager.cc
@@ -14,6 +14,7 @@
 #include "sstables/sstables.hh"
 #include "sstables/sstables_manager.hh"
 #include <memory>
+#include <fmt/ranges.h>
 #include <seastar/core/metrics.hh>
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/switch_to.hh>
diff --git a/compaction/compaction_strategy.cc b/compaction/compaction_strategy.cc
index 6b8ef130d7..cd397f2a68 100644
--- a/compaction/compaction_strategy.cc
+++ b/compaction/compaction_strategy.cc
@@ -11,6 +11,7 @@
 
 #include <vector>
 #include <chrono>
+#include <fmt/ranges.h>
 #include <seastar/core/shared_ptr.hh>
 #include "seastar/core/on_internal_error.hh"
 #include "sstables/shared_sstable.hh"
diff --git a/cql3/statements/prune_materialized_view_statement.cc b/cql3/statements/prune_materialized_view_statement.cc
index f6866fe370..06b3957953 100644
--- a/cql3/statements/prune_materialized_view_statement.cc
+++ b/cql3/statements/prune_materialized_view_statement.cc
@@ -12,6 +12,7 @@
 #include "cql3/query_processor.hh"
 #include "service/storage_proxy.hh"
 #include <boost/range/adaptors.hpp>
+#include <fmt/ranges.h>
 #include <seastar/core/coroutine.hh>
 
 using namespace std::chrono_literals;
diff --git a/data_dictionary/data_dictionary.cc b/data_dictionary/data_dictionary.cc
index 996a45e593..4fd6886d83 100644
--- a/data_dictionary/data_dictionary.cc
+++ b/data_dictionary/data_dictionary.cc
@@ -385,6 +385,7 @@ struct fmt::formatter<data_dictionary::user_types_metadata> {
 };
 
 auto fmt::formatter<data_dictionary::keyspace_metadata>::format(const data_dictionary::keyspace_metadata& m, fmt::format_context& ctx) const -> decltype(ctx.out()) {
-    return fmt::format_to(ctx.out(), "KSMetaData{{name={}, strategyClass={}, strategyOptions={{{}}}, cfMetaData={{{}}}, durable_writes={}, userTypes={}}}",
-            m.name(), m.strategy_name(), fmt::join(m.strategy_options(), ", "), fmt::join(m.cf_meta_data(), ", "), m.durable_writes(), m.user_types());
+    return ctx.out();
+    // return fmt::format_to(ctx.out(), "KSMetaData{{name={}, strategyClass={}, strategyOptions={}, cfMetaData={}, durable_writes={}, userTypes={}}}",
+    //         m.name(), m.strategy_name(), m.strategy_options(), m.cf_meta_data(), m.durable_writes(), m.user_types());
 }
diff --git a/db/commitlog/commitlog.cc b/db/commitlog/commitlog.cc
index 159172509c..9e5e2c1fb0 100644
--- a/db/commitlog/commitlog.cc
+++ b/db/commitlog/commitlog.cc
@@ -20,6 +20,8 @@
 #include <exception>
 #include <filesystem>
 
+#include <fmt/ranges.h>
+
 #include <seastar/core/align.hh>
 #include <seastar/core/seastar.hh>
 #include <seastar/core/metrics.hh>
diff --git a/db/config.cc b/db/config.cc
index 90ff40e414..44c5beae14 100644
--- a/db/config.cc
+++ b/db/config.cc
@@ -16,6 +16,8 @@
 #include <boost/program_options.hpp>
 #include <yaml-cpp/yaml.h>
 
+#include <fmt/ranges.h>
+
 #include <seastar/core/coroutine.hh>
 #include <seastar/core/print.hh>
 #include <seastar/util/log.hh>
diff --git a/db/consistency_level.cc b/db/consistency_level.cc
index 6d0b69a2d6..ceb503f971 100644
--- a/db/consistency_level.cc
+++ b/db/consistency_level.cc
@@ -15,6 +15,7 @@
 #include <boost/range/algorithm/find.hpp>
 #include <boost/range/algorithm/transform.hpp>
 #include "exceptions/exceptions.hh"
+#include <fmt/ranges.h>
 #include <seastar/core/sstring.hh>
 #include "schema/schema.hh"
 #include "replica/database.hh"
diff --git a/db/hints/internal/hint_storage.cc b/db/hints/internal/hint_storage.cc
index 2ee7d0809a..874977a5f8 100644
--- a/db/hints/internal/hint_storage.cc
+++ b/db/hints/internal/hint_storage.cc
@@ -9,6 +9,8 @@
 
 #include "db/hints/internal/hint_storage.hh"
 
+#include <fmt/std.h>
+
 // Seastar features.
 #include <seastar/core/coroutine.hh>
 #include <seastar/core/file.hh>
diff --git a/db/hints/manager.cc b/db/hints/manager.cc
index 7cb569972e..cda42bc915 100644
--- a/db/hints/manager.cc
+++ b/db/hints/manager.cc
@@ -9,6 +9,8 @@
 
 #include "db/hints/manager.hh"
 
+#include <fmt/ranges.h>
+
 // Seastar features.
 #include <seastar/core/abort_source.hh>
 #include <seastar/core/coroutine.hh>
diff --git a/db/schema_tables.cc b/db/schema_tables.cc
index 86a558b852..aafc585c84 100644
--- a/db/schema_tables.cc
+++ b/db/schema_tables.cc
@@ -44,6 +44,8 @@
 #include "db/extensions.hh"
 #include "utils/hashers.hh"
 
+#include <fmt/ranges.h>
+
 #include <seastar/util/noncopyable_function.hh>
 #include <seastar/rpc/rpc_types.hh>
 #include <seastar/core/coroutine.hh>
diff --git a/db/system_keyspace.cc b/db/system_keyspace.cc
index 4b30cff35d..7f8cf4e9e2 100644
--- a/db/system_keyspace.cc
+++ b/db/system_keyspace.cc
@@ -11,6 +11,7 @@
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/icl/interval_map.hpp>
+#include <fmt/ranges.h>
 
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
diff --git a/db/view/view.cc b/db/view/view.cc
index a95687a286..a24a2a24ff 100644
--- a/db/view/view.cc
+++ b/db/view/view.cc
@@ -23,6 +23,8 @@
 #include <boost/algorithm/cxx11/any_of.hpp>
 #include <boost/algorithm/cxx11/all_of.hpp>
 
+#include <fmt/ranges.h>
+
 #include <seastar/core/future-util.hh>
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/maybe_yield.hh>
diff --git a/dht/boot_strapper.cc b/dht/boot_strapper.cc
index 9b69cde2fc..29c0762273 100644
--- a/dht/boot_strapper.cc
+++ b/dht/boot_strapper.cc
@@ -12,6 +12,8 @@
 #include <boost/algorithm/string/erase.hpp>
 #include <boost/algorithm/string/classification.hpp>
 
+#include <fmt/ranges.h>
+
 #include <seastar/core/coroutine.hh>
 
 #include "dht/boot_strapper.hh"
diff --git a/dht/range_streamer.cc b/dht/range_streamer.cc
index bb4dc7a13a..8961a0b02d 100644
--- a/dht/range_streamer.cc
+++ b/dht/range_streamer.cc
@@ -8,15 +8,16 @@
  * SPDX-License-Identifier: (AGPL-3.0-or-later and Apache-2.0)
  */
 
-#include <seastar/core/sleep.hh>
 #include "dht/range_streamer.hh"
 #include "replica/database.hh"
 #include "gms/gossiper.hh"
 #include "log.hh"
 #include "streaming/stream_plan.hh"
 #include "db/config.hh"
-#include <seastar/core/semaphore.hh>
 #include <boost/range/adaptors.hpp>
+#include <fmt/ranges.h>
+#include <seastar/core/semaphore.hh>
+#include <seastar/core/sleep.hh>
 #include "utils/stall_free.hh"
 
 namespace dht {
diff --git a/generic_server.cc b/generic_server.cc
index 28a6c8096f..c263f97a76 100644
--- a/generic_server.cc
+++ b/generic_server.cc
@@ -10,6 +10,7 @@
 
 #include "utils/to_string.hh"
 
+#include <fmt/ranges.h>
 #include <seastar/core/when_all.hh>
 #include <seastar/core/loop.hh>
 #include <seastar/core/reactor.hh>
diff --git a/gms/gossiper.cc b/gms/gossiper.cc
index d2b57b2a4d..b85a4671c2 100644
--- a/gms/gossiper.cc
+++ b/gms/gossiper.cc
@@ -22,6 +22,7 @@
 #include "message/messaging_service.hh"
 #include "log.hh"
 #include "db/system_keyspace.hh"
+#include <fmt/ranges.h>
 #include <seastar/core/sleep.hh>
 #include <seastar/core/thread.hh>
 #include <seastar/core/metrics.hh>
diff --git a/locator/abstract_replication_strategy.cc b/locator/abstract_replication_strategy.cc
index 32541e6e70..e1e7c4ff34 100644
--- a/locator/abstract_replication_strategy.cc
+++ b/locator/abstract_replication_strategy.cc
@@ -11,6 +11,7 @@
 #include "utils/class_registrator.hh"
 #include "exceptions/exceptions.hh"
 #include <boost/range/algorithm/remove_if.hpp>
+#include <fmt/ranges.h>
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/maybe_yield.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
diff --git a/locator/network_topology_strategy.cc b/locator/network_topology_strategy.cc
index 46f6909815..7a9560dfec 100644
--- a/locator/network_topology_strategy.cc
+++ b/locator/network_topology_strategy.cc
@@ -12,6 +12,8 @@
 #include <functional>
 #include <random>
 
+#include <fmt/ranges.h>
+
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/maybe_yield.hh>
 
diff --git a/locator/tablets.cc b/locator/tablets.cc
index f01f9e3d25..5ab65fab25 100644
--- a/locator/tablets.cc
+++ b/locator/tablets.cc
@@ -19,6 +19,8 @@
 #include <algorithm>
 #include <iterator>
 
+#include <fmt/ranges.h>
+
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/maybe_yield.hh>
 
diff --git a/message/messaging_service.cc b/message/messaging_service.cc
index 31e6d41d5a..58fa00b60b 100644
--- a/message/messaging_service.cc
+++ b/message/messaging_service.cc
@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <fmt/ranges.h>
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/as_future.hh>
 #include <seastar/coroutine/exception.hh>
diff --git a/node_ops/node_ops_ctl.cc b/node_ops/node_ops_ctl.cc
index 9db04329ab..cc219cb533 100644
--- a/node_ops/node_ops_ctl.cc
+++ b/node_ops/node_ops_ctl.cc
@@ -12,6 +12,7 @@
 #include "node_ops/node_ops_ctl.hh"
 #include "service/storage_service.hh"
 
+#include <fmt/ranges.h>
 #include <seastar/core/sleep.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
 
@@ -203,4 +204,4 @@ future<> node_ops_ctl::heartbeat_updater(node_ops_cmd cmd) {
         co_await sleep_abortable(heartbeat_interval, as).handle_exception([] (std::exception_ptr) {});
     }
     nlogger.info("{}[{}]: Stopped heartbeat_updater", desc, uuid());
-}
\ No newline at end of file
+}
diff --git a/query.cc b/query.cc
index dd8c1c8ee7..2f262263c2 100644
--- a/query.cc
+++ b/query.cc
@@ -9,6 +9,7 @@
 #include <limits>
 #include <memory>
 #include <stdexcept>
+#include <fmt/ranges.h>
 #include "query-request.hh"
 #include "query-result.hh"
 #include "query-result-writer.hh"
diff --git a/repair/repair.cc b/repair/repair.cc
index 70177c067d..2c1219da19 100644
--- a/repair/repair.cc
+++ b/repair/repair.cc
@@ -31,6 +31,8 @@
 #include <boost/range/algorithm_ext.hpp>
 #include <boost/range/adaptor/map.hpp>
 
+#include <fmt/ranges.h>
+
 #include <seastar/core/gate.hh>
 #include <seastar/util/defer.hh>
 #include <seastar/core/metrics_registration.hh>
diff --git a/repair/row_level.cc b/repair/row_level.cc
index ead7a0ecce..2bf05265f0 100644
--- a/repair/row_level.cc
+++ b/repair/row_level.cc
@@ -7,6 +7,7 @@
  */
 
 #include <exception>
+#include <fmt/ranges.h>
 #include <seastar/util/defer.hh>
 #include "gms/endpoint_state.hh"
 #include "repair/repair.hh"
diff --git a/replica/database.cc b/replica/database.cc
index bf8ade4377..60a143b44b 100644
--- a/replica/database.cc
+++ b/replica/database.cc
@@ -6,6 +6,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <fmt/ranges.h>
+#include <fmt/std.h>
 #include "log.hh"
 #include "replica/database_fwd.hh"
 #include "utils/lister.hh"
diff --git a/replica/distributed_loader.cc b/replica/distributed_loader.cc
index a986ab87cf..8b3e9a9bad 100644
--- a/replica/distributed_loader.cc
+++ b/replica/distributed_loader.cc
@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <fmt/std.h>
 #include <seastar/core/coroutine.hh>
 #include <seastar/core/smp.hh>
 #include <seastar/coroutine/maybe_yield.hh>
diff --git a/replica/tablets.cc b/replica/tablets.cc
index ab61804f26..e12978fd77 100644
--- a/replica/tablets.cc
+++ b/replica/tablets.cc
@@ -6,6 +6,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <fmt/ranges.h>
+
 #include "types/types.hh"
 #include "types/tuple.hh"
 #include "types/list.hh"
diff --git a/row_cache.cc b/row_cache.cc
index 69ff612324..94879b6aa3 100644
--- a/row_cache.cc
+++ b/row_cache.cc
@@ -7,6 +7,7 @@
  */
 
 #include "row_cache.hh"
+#include <fmt/ranges.h>
 #include <seastar/core/memory.hh>
 #include <seastar/core/do_with.hh>
 #include <seastar/core/future-util.hh>
diff --git a/service/pager/query_pagers.cc b/service/pager/query_pagers.cc
index 1b41c5ab81..58a656d2cf 100644
--- a/service/pager/query_pagers.cc
+++ b/service/pager/query_pagers.cc
@@ -18,6 +18,8 @@
 #include "utils/result_combinators.hh"
 #include "db/view/delete_ghost_rows_visitor.hh"
 
+#include <fmt/ranges.h>
+
 template<typename T = void>
 using result = service::pager::query_pager::result<T>;
 
diff --git a/service/raft/raft_group0.cc b/service/raft/raft_group0.cc
index 922c1e857b..7e7f739fc5 100644
--- a/service/raft/raft_group0.cc
+++ b/service/raft/raft_group0.cc
@@ -7,6 +7,7 @@
  */
 #include <iterator>
 #include <source_location>
+#include <fmt/ranges.h>
 
 #include "service/raft/group0_fwd.hh"
 #include "service/raft/raft_group0.hh"
diff --git a/service/storage_proxy.cc b/service/storage_proxy.cc
index ceb4e73e67..d98887663c 100644
--- a/service/storage_proxy.cc
+++ b/service/storage_proxy.cc
@@ -9,6 +9,7 @@
  */
 
 #include <random>
+#include <fmt/ranges.h>
 #include <seastar/core/sleep.hh>
 #include <seastar/util/defer.hh>
 #include "partition_range_compat.hh"
diff --git a/service/storage_service.cc b/service/storage_service.cc
index 21a81e665c..7a709bb74f 100644
--- a/service/storage_service.cc
+++ b/service/storage_service.cc
@@ -23,6 +23,7 @@
 #include "dht/boot_strapper.hh"
 #include <exception>
 #include <optional>
+#include <fmt/ranges.h>
 #include <seastar/core/distributed.hh>
 #include <seastar/util/defer.hh>
 #include <seastar/coroutine/as_future.hh>
diff --git a/service/tablet_allocator.cc b/service/tablet_allocator.cc
index 0fa4cc4ac1..cd2490aedc 100644
--- a/service/tablet_allocator.cc
+++ b/service/tablet_allocator.cc
@@ -17,6 +17,7 @@
 #include "db/config.hh"
 #include "locator/load_sketch.hh"
 #include <utility>
+#include <fmt/ranges.h>
 
 using namespace locator;
 using namespace replica;
diff --git a/service/topology_coordinator.cc b/service/topology_coordinator.cc
index 710a274e66..9a4072ea47 100644
--- a/service/topology_coordinator.cc
+++ b/service/topology_coordinator.cc
@@ -6,6 +6,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <fmt/ranges.h>
+
 #include <seastar/core/abort_source.hh>
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/as_future.hh>
diff --git a/sstables/sstable_directory.cc b/sstables/sstable_directory.cc
index f60761a62e..27d61d5092 100644
--- a/sstables/sstable_directory.cc
+++ b/sstables/sstable_directory.cc
@@ -7,6 +7,8 @@
  */
 
 #include <type_traits>
+#include <fmt/ranges.h>
+#include <fmt/std.h>
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
 #include <seastar/util/file.hh>
diff --git a/sstables/sstables.cc b/sstables/sstables.cc
index ca46340087..35edaf0373 100644
--- a/sstables/sstables.cc
+++ b/sstables/sstables.cc
@@ -10,6 +10,7 @@
 #include <concepts>
 #include <vector>
 #include <limits>
+#include <fmt/ranges.h>
 #include <seastar/core/future.hh>
 #include <seastar/core/future-util.hh>
 #include <seastar/core/sstring.hh>
diff --git a/sstables/storage.cc b/sstables/storage.cc
index 191ff68848..da6564bc6d 100644
--- a/sstables/storage.cc
+++ b/sstables/storage.cc
@@ -13,6 +13,7 @@
 
 #include <exception>
 #include <stdexcept>
+#include <fmt/std.h>
 #include <seastar/coroutine/exception.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
 #include <seastar/util/file.hh>
diff --git a/sstables_loader.cc b/sstables_loader.cc
index ffc54b395b..5588a7572c 100644
--- a/sstables_loader.cc
+++ b/sstables_loader.cc
@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <fmt/ranges.h>
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
 #include <seastar/rpc/rpc.hh>
diff --git a/streaming/stream_result_future.cc b/streaming/stream_result_future.cc
index 3c2fda0cf3..2067ae87f3 100644
--- a/streaming/stream_result_future.cc
+++ b/streaming/stream_result_future.cc
@@ -12,6 +12,7 @@
 #include "streaming/stream_exception.hh"
 #include "log.hh"
 #include <cfloat>
+#include <fmt/ranges.h>
 
 namespace streaming {
 
diff --git a/streaming/stream_transfer_task.cc b/streaming/stream_transfer_task.cc
index a40746dd68..915c007058 100644
--- a/streaming/stream_transfer_task.cc
+++ b/streaming/stream_transfer_task.cc
@@ -28,6 +28,7 @@
 #include <boost/range/irange.hpp>
 #include <boost/icl/interval.hpp>
 #include <boost/icl/interval_set.hpp>
+#include <fmt/ranges.h>
 #include "sstables/sstables.hh"
 #include "replica/database.hh"
 #include "repair/table_check.hh"
diff --git a/test/boost/auth_test.cc b/test/boost/auth_test.cc
index 1775da640e..2f937f754c 100644
--- a/test/boost/auth_test.cc
+++ b/test/boost/auth_test.cc
@@ -12,6 +12,7 @@
 #include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 #include <stdint.h>
+#include <fmt/ranges.h>
 
 #include <seastar/core/future-util.hh>
 #include <seastar/core/shared_ptr.hh>
diff --git a/test/boost/cache_algorithm_test.cc b/test/boost/cache_algorithm_test.cc
index 6caaa5e2be..7f593238ac 100644
--- a/test/boost/cache_algorithm_test.cc
+++ b/test/boost/cache_algorithm_test.cc
@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <fmt/ranges.h>
 #include <seastar/testing/test_case.hh>
 #include "test/lib/cql_test_env.hh"
 
diff --git a/test/boost/cdc_test.cc b/test/boost/cdc_test.cc
index b539875a70..440233dc79 100644
--- a/test/boost/cdc_test.cc
+++ b/test/boost/cdc_test.cc
@@ -10,6 +10,7 @@
 #include "test/lib/scylla_test_case.hh"
 #include <string>
 #include <boost/range/adaptor/map.hpp>
+#include <fmt/ranges.h>
 
 #include "cdc/log.hh"
 #include "cdc/cdc_options.hh"
diff --git a/test/boost/commitlog_cleanup_test.cc b/test/boost/commitlog_cleanup_test.cc
index 1abf15b74c..e156a792bc 100644
--- a/test/boost/commitlog_cleanup_test.cc
+++ b/test/boost/commitlog_cleanup_test.cc
@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <fmt/ranges.h>
 #include "test/lib/scylla_test_case.hh"
 #include "test/lib/cql_test_env.hh"
 #include "db/commitlog/commitlog_replayer.hh"
diff --git a/test/boost/cql_auth_query_test.cc b/test/boost/cql_auth_query_test.cc
index dcb346aed5..63c5a67ff9 100644
--- a/test/boost/cql_auth_query_test.cc
+++ b/test/boost/cql_auth_query_test.cc
@@ -7,6 +7,7 @@
  */
 
 #include <string_view>
+#include <fmt/ranges.h>
 
 #include <seastar/core/future.hh>
 #include <seastar/core/shared_ptr.hh>
diff --git a/test/boost/cql_query_large_test.cc b/test/boost/cql_query_large_test.cc
index 0aa216e9b0..8060e7c682 100644
--- a/test/boost/cql_query_large_test.cc
+++ b/test/boost/cql_query_large_test.cc
@@ -13,6 +13,8 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
 
+#include <fmt/ranges.h>
+
 #include "test/lib/scylla_test_case.hh"
 #include <seastar/testing/thread_test_case.hh>
 #include "test/lib/cql_test_env.hh"
diff --git a/test/boost/cql_query_test.cc b/test/boost/cql_query_test.cc
index 83cebe07a1..5e5e9423b2 100644
--- a/test/boost/cql_query_test.cc
+++ b/test/boost/cql_query_test.cc
@@ -14,6 +14,8 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
 
+#include <fmt/ranges.h>
+
 #include <seastar/net/inet_address.hh>
 
 #include "test/lib/scylla_test_case.hh"
diff --git a/test/boost/database_test.cc b/test/boost/database_test.cc
index 909c59b12f..7cd65a9369 100644
--- a/test/boost/database_test.cc
+++ b/test/boost/database_test.cc
@@ -16,6 +16,8 @@
 #include "test/lib/scylla_test_case.hh"
 #include <seastar/testing/thread_test_case.hh>
 #include <utility>
+#include <fmt/ranges.h>
+#include <fmt/std.h>
 
 #include "test/lib/cql_test_env.hh"
 #include "test/lib/result_set_assertions.hh"
diff --git a/test/boost/group0_cmd_merge_test.cc b/test/boost/group0_cmd_merge_test.cc
index 75fbd11ae7..2fb2581fb4 100644
--- a/test/boost/group0_cmd_merge_test.cc
+++ b/test/boost/group0_cmd_merge_test.cc
@@ -6,6 +6,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <fmt/ranges.h>
+
 #include "test/lib/scylla_test_case.hh"
 #include "test/lib/cql_test_env.hh"
 
diff --git a/test/boost/group0_test.cc b/test/boost/group0_test.cc
index 71f8dabc1a..2ff5d2e74a 100644
--- a/test/boost/group0_test.cc
+++ b/test/boost/group0_test.cc
@@ -16,6 +16,7 @@
 #include "utils/error_injection.hh"
 #include "transport/messages/result_message.hh"
 #include "service/migration_manager.hh"
+#include <fmt/ranges.h>
 #include <seastar/core/metrics_api.hh>
 
 static future<utils::chunked_vector<std::vector<managed_bytes_opt>>> fetch_rows(cql_test_env& e, std::string_view cql) {
diff --git a/test/boost/memtable_test.cc b/test/boost/memtable_test.cc
index 34e357c751..39aa115d69 100644
--- a/test/boost/memtable_test.cc
+++ b/test/boost/memtable_test.cc
@@ -16,6 +16,7 @@
 #include <seastar/util/closeable.hh>
 #include "service/migration_manager.hh"
 
+#include <fmt/ranges.h>
 #include <seastar/core/thread.hh>
 #include "replica/memtable.hh"
 #include "test/lib/cql_test_env.hh"
diff --git a/test/boost/multishard_mutation_query_test.cc b/test/boost/multishard_mutation_query_test.cc
index 53fd0ba881..d7ee37a9c2 100644
--- a/test/boost/multishard_mutation_query_test.cc
+++ b/test/boost/multishard_mutation_query_test.cc
@@ -29,6 +29,7 @@
 
 #include "test/lib/scylla_test_case.hh"
 
+#include <fmt/ranges.h>
 #include <boost/range/algorithm/sort.hpp>
 #include <utility>
 
diff --git a/test/boost/mutation_reader_test.cc b/test/boost/mutation_reader_test.cc
index b53e854e65..c76566e193 100644
--- a/test/boost/mutation_reader_test.cc
+++ b/test/boost/mutation_reader_test.cc
@@ -11,6 +11,8 @@
 #include <random>
 #include <source_location>
 
+#include <fmt/ranges.h>
+
 #include <seastar/core/sleep.hh>
 #include <seastar/core/do_with.hh>
 #include <seastar/core/thread.hh>
diff --git a/test/boost/mutation_writer_test.cc b/test/boost/mutation_writer_test.cc
index 2e937e4db8..1e8f6b9aa5 100644
--- a/test/boost/mutation_writer_test.cc
+++ b/test/boost/mutation_writer_test.cc
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-
+#include <fmt/ranges.h>
 #include <seastar/core/thread.hh>
 #include "test/lib/scylla_test_case.hh"
 #include <seastar/testing/thread_test_case.hh>
diff --git a/test/boost/network_topology_strategy_test.cc b/test/boost/network_topology_strategy_test.cc
index 646362db95..e4f2562bd6 100644
--- a/test/boost/network_topology_strategy_test.cc
+++ b/test/boost/network_topology_strategy_test.cc
@@ -8,6 +8,7 @@
 
 #include <boost/test/unit_test.hpp>
 #include <boost/range/adaptors.hpp>
+#include <fmt/ranges.h>
 #include "gms/inet_address.hh"
 #include "locator/types.hh"
 #include "utils/UUID_gen.hh"
diff --git a/test/boost/partitioner_test.cc b/test/boost/partitioner_test.cc
index 94437e37d5..1bb0c291ae 100644
--- a/test/boost/partitioner_test.cc
+++ b/test/boost/partitioner_test.cc
@@ -8,6 +8,7 @@
 
 #include <boost/algorithm/cxx11/all_of.hpp>
 #include <boost/range/combine.hpp>
+#include <fmt/ranges.h>
 #include "test/lib/scylla_test_case.hh"
 
 #include "dht/i_partitioner.hh"
diff --git a/test/boost/querier_cache_test.cc b/test/boost/querier_cache_test.cc
index e57fc3cbde..f874e99f9d 100644
--- a/test/boost/querier_cache_test.cc
+++ b/test/boost/querier_cache_test.cc
@@ -15,6 +15,7 @@
 #include "test/lib/exception_utils.hh"
 #include "db/config.hh"
 
+#include <fmt/ranges.h>
 #include <seastar/core/sleep.hh>
 #include <seastar/core/thread.hh>
 #include "test/lib/scylla_test_case.hh"
diff --git a/test/boost/reader_concurrency_semaphore_test.cc b/test/boost/reader_concurrency_semaphore_test.cc
index 852065f6d7..ee74529275 100644
--- a/test/boost/reader_concurrency_semaphore_test.cc
+++ b/test/boost/reader_concurrency_semaphore_test.cc
@@ -20,6 +20,7 @@
 #include "test/lib/random_schema.hh"
 #include "test/lib/tmpdir.hh"
 
+#include <fmt/ranges.h>
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
 #include "test/lib/scylla_test_case.hh"
diff --git a/test/boost/restrictions_test.cc b/test/boost/restrictions_test.cc
index 9e9d829e76..12e47a4377 100644
--- a/test/boost/restrictions_test.cc
+++ b/test/boost/restrictions_test.cc
@@ -8,6 +8,7 @@
 
 #include <boost/range/adaptors.hpp>
 #include <fmt/format.h>
+#include <fmt/ranges.h>
 #include "test/lib/scylla_test_case.hh"
 
 #include "cql3/cql_config.hh"
diff --git a/test/boost/row_cache_test.cc b/test/boost/row_cache_test.cc
index 559bceed62..39f1744030 100644
--- a/test/boost/row_cache_test.cc
+++ b/test/boost/row_cache_test.cc
@@ -36,6 +36,7 @@
 #include "test/lib/sstable_utils.hh"
 #include "utils/throttle.hh"
 
+#include <fmt/ranges.h>
 #include <boost/range/algorithm/min_element.hpp>
 #include "readers/from_mutations_v2.hh"
 #include "readers/delegating_v2.hh"
diff --git a/test/boost/schema_change_test.cc b/test/boost/schema_change_test.cc
index 67ea51fdee..789de98449 100644
--- a/test/boost/schema_change_test.cc
+++ b/test/boost/schema_change_test.cc
@@ -8,6 +8,7 @@
 
 
 #include <iostream>
+#include <fmt/ranges.h>
 #include <seastar/core/thread.hh>
 #include "test/lib/scylla_test_case.hh"
 #include <seastar/util/defer.hh>
diff --git a/test/boost/sstable_compaction_test.cc b/test/boost/sstable_compaction_test.cc
index abe30c7427..edfb00e09f 100644
--- a/test/boost/sstable_compaction_test.cc
+++ b/test/boost/sstable_compaction_test.cc
@@ -7,6 +7,7 @@
  */
 
 #include <iterator>
+#include <fmt/ranges.h>
 #include <seastar/core/sstring.hh>
 #include <seastar/core/future-util.hh>
 #include <seastar/core/align.hh>
diff --git a/test/boost/sstable_datafile_test.cc b/test/boost/sstable_datafile_test.cc
index c978735e3f..34b31318b0 100644
--- a/test/boost/sstable_datafile_test.cc
+++ b/test/boost/sstable_datafile_test.cc
@@ -6,6 +6,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <fmt/ranges.h>
+
 #include <seastar/core/sstring.hh>
 #include <seastar/core/future-util.hh>
 #include <seastar/core/align.hh>
diff --git a/test/boost/sstable_directory_test.cc b/test/boost/sstable_directory_test.cc
index b081a289ac..f535647fc1 100644
--- a/test/boost/sstable_directory_test.cc
+++ b/test/boost/sstable_directory_test.cc
@@ -25,6 +25,7 @@
 #include "db/config.hh"
 
 #include <fmt/core.h>
+#include <fmt/ranges.h>
 #include <boost/algorithm/string/erase.hpp>
 
 class distributed_loader_for_tests {
diff --git a/test/boost/storage_proxy_test.cc b/test/boost/storage_proxy_test.cc
index 4e7cae1a41..ab75b5bc97 100644
--- a/test/boost/storage_proxy_test.cc
+++ b/test/boost/storage_proxy_test.cc
@@ -7,6 +7,7 @@
  */
 
 
+#include <fmt/ranges.h>
 #include <seastar/core/thread.hh>
 #include "test/lib/scylla_test_case.hh"
 
diff --git a/test/boost/string_format_test.cc b/test/boost/string_format_test.cc
index 0eaa5d1689..184000b861 100644
--- a/test/boost/string_format_test.cc
+++ b/test/boost/string_format_test.cc
@@ -25,6 +25,8 @@
 #include <boost/range/adaptor/transformed.hpp>
 
 #include <fmt/format.h>
+#include <fmt/ranges.h>
+#include <fmt/std.h>
 
 #include <seastar/core/print.hh>
 
diff --git a/test/boost/tablets_test.cc b/test/boost/tablets_test.cc
index 6476fc7712..614c6bedf6 100644
--- a/test/boost/tablets_test.cc
+++ b/test/boost/tablets_test.cc
@@ -10,6 +10,7 @@
 
 #include "test/lib/scylla_test_case.hh"
 #include "test/lib/random_utils.hh"
+#include <fmt/ranges.h>
 #include <seastar/testing/thread_test_case.hh>
 #include "test/lib/cql_test_env.hh"
 #include "test/lib/log.hh"
diff --git a/test/boost/user_function_test.cc b/test/boost/user_function_test.cc
index 51f709eeb3..58c5ca04cc 100644
--- a/test/boost/user_function_test.cc
+++ b/test/boost/user_function_test.cc
@@ -7,6 +7,7 @@
  */
 
 #include "test/lib/scylla_test_case.hh"
+#include <fmt/ranges.h>
 #include <seastar/testing/thread_test_case.hh>
 #include "test/lib/cql_assertions.hh"
 #include "test/lib/cql_test_env.hh"
diff --git a/test/boost/user_types_test.cc b/test/boost/user_types_test.cc
index f8ce6f44a7..802fcb026a 100644
--- a/test/boost/user_types_test.cc
+++ b/test/boost/user_types_test.cc
@@ -16,6 +16,7 @@
 #include "test/lib/exception_utils.hh"
 #include "db/config.hh"
 
+#include <fmt/ranges.h>
 #include <boost/algorithm/string/join.hpp>
 
 // Specifies that the given 'cql' query fails with the 'msg' message.
diff --git a/test/boost/view_build_test.cc b/test/boost/view_build_test.cc
index d9482acd2a..2864e8a01e 100644
--- a/test/boost/view_build_test.cc
+++ b/test/boost/view_build_test.cc
@@ -7,6 +7,7 @@
  */
 
 #include <boost/test/unit_test.hpp>
+#include <fmt/ranges.h>
 
 #include "replica/database.hh"
 #include "db/view/view_builder.hh"
diff --git a/test/boost/view_complex_test.cc b/test/boost/view_complex_test.cc
index 6ce4d66d7d..1f33cc9862 100644
--- a/test/boost/view_complex_test.cc
+++ b/test/boost/view_complex_test.cc
@@ -8,6 +8,7 @@
 
 #include <boost/test/unit_test.hpp>
 #include <boost/range/adaptor/map.hpp>
+#include <fmt/ranges.h>
 
 #include "replica/database.hh"
 #include "db/view/view_builder.hh"
diff --git a/test/lib/cql_assertions.cc b/test/lib/cql_assertions.cc
index f52eacf781..a980bfbb05 100644
--- a/test/lib/cql_assertions.cc
+++ b/test/lib/cql_assertions.cc
@@ -9,6 +9,7 @@
 
 #include <boost/test/unit_test.hpp>
 #include <boost/range/adaptor/transformed.hpp>
+#include <fmt/ranges.h>
 #include "test/lib/cql_assertions.hh"
 #include "transport/messages/result_message.hh"
 #include "utils/to_string.hh"
diff --git a/test/lib/cql_test_env.cc b/test/lib/cql_test_env.cc
index 4478167263..ce8ca07e44 100644
--- a/test/lib/cql_test_env.cc
+++ b/test/lib/cql_test_env.cc
@@ -22,6 +22,7 @@
 #include "cql3/statements/batch_statement.hh"
 #include "cql3/statements/modification_statement.hh"
 #include "cql3/cql_config.hh"
+#include <fmt/ranges.h>
 #include <seastar/core/distributed.hh>
 #include <seastar/core/abort_source.hh>
 #include <seastar/core/shared_ptr.hh>
diff --git a/test/lib/expr_test_utils.cc b/test/lib/expr_test_utils.cc
index c77162dd98..47ab06d321 100644
--- a/test/lib/expr_test_utils.cc
+++ b/test/lib/expr_test_utils.cc
@@ -7,6 +7,7 @@
  */
 
 #include "expr_test_utils.hh"
+#include <fmt/ranges.h>
 
 namespace cql3 {
 namespace expr {
diff --git a/test/lib/mutation_source_test.cc b/test/lib/mutation_source_test.cc
index 6bf3516e83..115fdc57d1 100644
--- a/test/lib/mutation_source_test.cc
+++ b/test/lib/mutation_source_test.cc
@@ -9,6 +9,7 @@
 #include <set>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/test/unit_test.hpp>
+#include <fmt/ranges.h>
 #include "partition_slice_builder.hh"
 #include "schema/schema_builder.hh"
 #include "test/lib/mutation_source_test.hh"
diff --git a/test/lib/test_services.cc b/test/lib/test_services.cc
index c89a8db8fc..e0e0590a4e 100644
--- a/test/lib/test_services.cc
+++ b/test/lib/test_services.cc
@@ -20,6 +20,7 @@
 #include "utils/overloaded_functor.hh"
 #include <boost/program_options.hpp>
 #include <iostream>
+#include <fmt/ranges.h>
 #include <seastar/util/defer.hh>
 
 static const sstring some_keyspace("ks");
diff --git a/test/manual/sstable_scan_footprint_test.cc b/test/manual/sstable_scan_footprint_test.cc
index bfdc3afaae..325002c0fc 100644
--- a/test/manual/sstable_scan_footprint_test.cc
+++ b/test/manual/sstable_scan_footprint_test.cc
@@ -17,6 +17,7 @@
 #include "db/commitlog/commitlog.hh"
 
 #include <boost/range/irange.hpp>
+#include <fmt/ranges.h>
 #include <seastar/core/app-template.hh>
 #include <seastar/core/seastar.hh>
 #include <seastar/core/units.hh>
diff --git a/test/perf/perf_cache_eviction.cc b/test/perf/perf_cache_eviction.cc
index 196fab446f..b5495094e0 100644
--- a/test/perf/perf_cache_eviction.cc
+++ b/test/perf/perf_cache_eviction.cc
@@ -7,6 +7,7 @@
  */
 
 #include <boost/range/irange.hpp>
+#include <fmt/ranges.h>
 #include "seastarx.hh"
 #include "test/lib/simple_schema.hh"
 #include "test/lib/cql_test_env.hh"
diff --git a/test/perf/perf_commitlog.cc b/test/perf/perf_commitlog.cc
index 98cf171215..50140a8948 100644
--- a/test/perf/perf_commitlog.cc
+++ b/test/perf/perf_commitlog.cc
@@ -8,6 +8,7 @@
 
 #include <fstream>
 
+#include <fmt/ranges.h>
 #include <boost/range/irange.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
diff --git a/test/perf/perf_fast_forward.cc b/test/perf/perf_fast_forward.cc
index 0073adc15d..219f1e7b4f 100644
--- a/test/perf/perf_fast_forward.cc
+++ b/test/perf/perf_fast_forward.cc
@@ -15,6 +15,7 @@
 #include <boost/range/adaptors.hpp>
 #include <boost/range/algorithm/sort.hpp>
 #include <json/json.h>
+#include <fmt/ranges.h>
 #include "test/lib/cql_test_env.hh"
 #include "test/lib/reader_concurrency_semaphore.hh"
 #include "test/perf/perf.hh"
diff --git a/test/perf/perf_simple_query.cc b/test/perf/perf_simple_query.cc
index 0ba84777c0..ee3ad84f1c 100644
--- a/test/perf/perf_simple_query.cc
+++ b/test/perf/perf_simple_query.cc
@@ -8,9 +8,10 @@
 
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
-#include <json/json.h>
-
 #include <boost/range/irange.hpp>
+#include <json/json.h>
+#include <fmt/ranges.h>
+
 #include "test/lib/cql_test_env.hh"
 #include "test/lib/alternator_test_env.hh"
 #include "test/perf/perf.hh"
diff --git a/test/perf/perf_tablets.cc b/test/perf/perf_tablets.cc
index 460b363ef2..554c4c975b 100644
--- a/test/perf/perf_tablets.cc
+++ b/test/perf/perf_tablets.cc
@@ -6,6 +6,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <fmt/ranges.h>
+
 #include <seastar/core/distributed.hh>
 #include <seastar/core/app-template.hh>
 #include <seastar/core/sstring.hh>
diff --git a/test/unit/radix_tree_stress_test.cc b/test/unit/radix_tree_stress_test.cc
index 7ca1497163..2014ace894 100644
--- a/test/unit/radix_tree_stress_test.cc
+++ b/test/unit/radix_tree_stress_test.cc
@@ -15,6 +15,7 @@
 #include <iostream>
 #include <fmt/core.h>
 #include <fmt/ostream.h>
+#include <fmt/ranges.h>
 
 #include "utils/compact-radix-tree.hh"
 #include "radix_tree_printer.hh"
diff --git a/tools/schema_loader.cc b/tools/schema_loader.cc
index e6bd484807..0074712ac7 100644
--- a/tools/schema_loader.cc
+++ b/tools/schema_loader.cc
@@ -8,6 +8,7 @@
 
 #include <algorithm>
 #include <boost/algorithm/string.hpp>
+#include <fmt/ranges.h>
 #include <seastar/core/fstream.hh>
 #include <seastar/http/short_streams.hh>
 #include <seastar/util/closeable.hh>
diff --git a/tools/scylla-nodetool.cc b/tools/scylla-nodetool.cc
index d3e7a4ad21..33dabc9145 100644
--- a/tools/scylla-nodetool.cc
+++ b/tools/scylla-nodetool.cc
@@ -21,6 +21,7 @@
 #include <boost/make_shared.hpp>
 #include <boost/range/adaptor/map.hpp>
 #include <fmt/chrono.h>
+#include <fmt/ranges.h>
 #include <seastar/core/sleep.hh>
 #include <seastar/core/thread.hh>
 #include <seastar/core/when_all.hh>
diff --git a/tools/scylla-sstable.cc b/tools/scylla-sstable.cc
index e0c4a5c54a..ba434432ff 100644
--- a/tools/scylla-sstable.cc
+++ b/tools/scylla-sstable.cc
@@ -11,6 +11,7 @@
 #include <filesystem>
 #include <set>
 #include <fmt/chrono.h>
+#include <fmt/ranges.h>
 #include <seastar/core/coroutine.hh>
 #include <seastar/core/queue.hh>
 #include <seastar/util/closeable.hh>
diff --git a/tools/utils.cc b/tools/utils.cc
index 841618b8b0..4851342db6 100644
--- a/tools/utils.cc
+++ b/tools/utils.cc
@@ -7,6 +7,7 @@
  */
 
 #include <seastar/core/thread.hh>
+#include <fmt/ranges.h>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/range/adaptor/transformed.hpp>
diff --git a/utils/directories.cc b/utils/directories.cc
index 6573c1c807..5eb11805b0 100644
--- a/utils/directories.cc
+++ b/utils/directories.cc
@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <fmt/std.h>
 #include <seastar/core/seastar.hh>
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/parallel_for_each.hh>