From 7ff0d7ba989754d63e5ab0bb34c899f8d1a020e9 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kefu.chai@scylladb.com>
Date: Mon, 27 Jan 2025 09:35:23 +0800
Subject: [PATCH] tree: Remove unused boost headers

This commit eliminates unused boost header includes from the tree.

Removing these unnecessary includes reduces dependencies on the
external Boost.Adapters library, leading to faster compile times
and a slightly cleaner codebase.

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>

Closes scylladb/scylladb#22857
---
 api/collectd.cc                                             | 1 -
 api/column_family.cc                                        | 3 ---
 api/storage_service.cc                                      | 1 -
 auth/default_authorizer.cc                                  | 1 -
 collection_mutation.cc                                      | 2 --
 compaction/incremental_backlog_tracker.cc                   | 1 -
 compaction/incremental_compaction_strategy.hh               | 1 -
 cql3/selection/selection.cc                                 | 3 ---
 cql3/statements/alter_type_statement.cc                     | 1 -
 cql3/statements/create_table_statement.cc                   | 1 -
 cql3/statements/drop_type_statement.cc                      | 2 --
 db/batchlog_manager.cc                                      | 2 --
 db/commitlog/commitlog_replayer.cc                          | 1 -
 db/cql_type_parser.cc                                       | 2 --
 db/hints/internal/hint_sender.cc                            | 3 ---
 db/hints/internal/hint_storage.cc                           | 3 ---
 db/hints/resource_manager.cc                                | 1 -
 db/per_partition_rate_limit_options.cc                      | 1 -
 db/schema_applier.cc                                        | 5 -----
 db/view/view_update_generator.cc                            | 2 --
 db/virtual_tables.cc                                        | 1 -
 dht/murmur3_partitioner.cc                                  | 2 --
 ent/encryption/encryption.cc                                | 3 ---
 index/secondary_index_manager.cc                            | 2 --
 querier.cc                                                  | 2 --
 reader_concurrency_semaphore_group.hh                       | 2 --
 replica/database.cc                                         | 1 -
 replica/distributed_loader.cc                               | 1 -
 service/raft/group0_state_machine.cc                        | 1 -
 service/topology_state_machine.cc                           | 2 --
 sstables/sstable_directory.cc                               | 1 -
 streaming/stream_session.cc                                 | 1 -
 streaming/stream_transfer_task.cc                           | 1 -
 test/boost/aggregate_fcts_test.cc                           | 2 --
 test/boost/auth_test.cc                                     | 3 ---
 test/boost/batchlog_manager_test.cc                         | 2 --
 test/boost/cached_file_test.cc                              | 1 -
 test/boost/cartesian_product_test.cc                        | 1 -
 test/boost/castas_fcts_test.cc                              | 3 ---
 test/boost/cdc_test.cc                                      | 1 -
 test/boost/commitlog_test.cc                                | 1 -
 test/boost/cql_functions_test.cc                            | 2 --
 test/boost/cql_query_group_test.cc                          | 3 ---
 test/boost/cql_query_large_test.cc                          | 2 --
 test/boost/cql_query_like_test.cc                           | 2 --
 test/boost/cql_query_test.cc                                | 2 --
 test/boost/encrypted_file_test.cc                           | 3 ---
 test/boost/encryption_at_rest_test.cc                       | 3 ---
 test/boost/filtering_test.cc                                | 2 --
 test/boost/flush_queue_test.cc                              | 1 -
 test/boost/json_cql_query_test.cc                           | 2 --
 test/boost/keys_test.cc                                     | 1 -
 .../multishard_combining_reader_as_mutation_source_test.cc  | 3 ---
 test/boost/mutation_writer_test.cc                          | 1 -
 test/boost/mvcc_test.cc                                     | 1 -
 test/boost/query_processor_test.cc                          | 2 --
 test/boost/symmetric_key_test.cc                            | 3 ---
 test/boost/view_complex_test.cc                             | 1 -
 test/boost/view_schema_ckey_test.cc                         | 1 -
 test/boost/view_schema_pkey_test.cc                         | 1 -
 test/boost/view_schema_test.cc                              | 1 -
 test/boost/virtual_reader_test.cc                           | 2 --
 test/lib/dummy_sharder.hh                                   | 1 -
 test/lib/sstable_utils.cc                                   | 1 -
 test/lib/test_utils.cc                                      | 1 -
 test/manual/partition_data_test.cc                          | 3 ---
 test/manual/sstable_scan_footprint_test.cc                  | 1 -
 test/perf/memory_footprint_test.cc                          | 1 -
 test/perf/perf.hh                                           | 1 -
 test/perf/perf_cache_eviction.cc                            | 1 -
 test/perf/perf_simple_query.cc                              | 1 -
 test/perf/perf_sstable.hh                                   | 1 -
 test/unit/row_cache_stress_test.cc                          | 1 -
 tools/scylla-nodetool.cc                                    | 1 -
 tools/scylla-sstable.cc                                     | 1 -
 transport/server.cc                                         | 6 ------
 76 files changed, 131 deletions(-)

diff --git a/api/collectd.cc b/api/collectd.cc
index 695ed4f426..5788a46a1d 100644
--- a/api/collectd.cc
+++ b/api/collectd.cc
@@ -10,7 +10,6 @@
 #include "api/api-doc/collectd.json.hh"
 #include <seastar/core/scollectd.hh>
 #include <seastar/core/scollectd_api.hh>
-#include <boost/range/irange.hpp>
 #include <ranges>
 #include <regex>
 #include "api/api_init.hh"
diff --git a/api/column_family.cc b/api/column_family.cc
index e6baf52a96..f3c235a9e8 100644
--- a/api/column_family.cc
+++ b/api/column_family.cc
@@ -24,9 +24,6 @@
 #include "compaction/compaction_manager.hh"
 #include "unimplemented.hh"
 
-#include <boost/range/algorithm/copy.hpp>
-#include <boost/range/numeric.hpp>
-
 extern logging::logger apilog;
 
 namespace api {
diff --git a/api/storage_service.cc b/api/storage_service.cc
index f37a6b717b..cda62471e0 100644
--- a/api/storage_service.cc
+++ b/api/storage_service.cc
@@ -22,7 +22,6 @@
 #include <functional>
 #include <iterator>
 #include <chrono>
-#include <boost/range/adaptor/map.hpp>
 #include <boost/algorithm/string/trim_all.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/functional/hash.hpp>
diff --git a/auth/default_authorizer.cc b/auth/default_authorizer.cc
index 13fa66abfc..ec045a848b 100644
--- a/auth/default_authorizer.cc
+++ b/auth/default_authorizer.cc
@@ -16,7 +16,6 @@ extern "C" {
 #include <unistd.h>
 }
 
-#include <boost/range.hpp>
 #include <seastar/core/seastar.hh>
 #include <seastar/core/sleep.hh>
 
diff --git a/collection_mutation.cc b/collection_mutation.cc
index 75bc8bad18..87a89c6e2a 100644
--- a/collection_mutation.cc
+++ b/collection_mutation.cc
@@ -16,8 +16,6 @@
 
 #include "collection_mutation.hh"
 
-#include <boost/range/numeric.hpp>
-
 bytes_view collection_mutation_input_stream::read_linearized(size_t n) {
     managed_bytes_view mbv = ::read_simple_bytes(_src, n);
     if (mbv.is_linearized()) {
diff --git a/compaction/incremental_backlog_tracker.cc b/compaction/incremental_backlog_tracker.cc
index 322cda38b4..fbdc278128 100644
--- a/compaction/incremental_backlog_tracker.cc
+++ b/compaction/incremental_backlog_tracker.cc
@@ -6,7 +6,6 @@
 
 #include "incremental_backlog_tracker.hh"
 #include "sstables/sstables.hh"
-#include <boost/range/adaptor/map.hpp>
 
 using namespace sstables;
 
diff --git a/compaction/incremental_compaction_strategy.hh b/compaction/incremental_compaction_strategy.hh
index b388ed0beb..2546704f25 100644
--- a/compaction/incremental_compaction_strategy.hh
+++ b/compaction/incremental_compaction_strategy.hh
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "compaction_strategy_impl.hh"
-#include <boost/range/algorithm.hpp>
 
 class incremental_backlog_tracker;
 
diff --git a/cql3/selection/selection.cc b/cql3/selection/selection.cc
index 39cccdb5ec..e9602e1a5c 100644
--- a/cql3/selection/selection.cc
+++ b/cql3/selection/selection.cc
@@ -8,9 +8,6 @@
  * SPDX-License-Identifier: (LicenseRef-ScyllaDB-Source-Available-1.0 and Apache-2.0)
  */
 
-#include <boost/range/algorithm/equal.hpp>
-#include <boost/range/algorithm/transform.hpp>
-
 #include "cql3/selection/selection.hh"
 #include "cql3/selection/raw_selector.hh"
 #include "cql3/result_set.hh"
diff --git a/cql3/statements/alter_type_statement.cc b/cql3/statements/alter_type_statement.cc
index b753059505..169d02e237 100644
--- a/cql3/statements/alter_type_statement.cc
+++ b/cql3/statements/alter_type_statement.cc
@@ -18,7 +18,6 @@
 #include "service/storage_proxy.hh"
 #include "data_dictionary/data_dictionary.hh"
 #include "data_dictionary/keyspace_metadata.hh"
-#include "boost/range/adaptor/map.hpp"
 #include "data_dictionary/user_types_metadata.hh"
 
 namespace cql3 {
diff --git a/cql3/statements/create_table_statement.cc b/cql3/statements/create_table_statement.cc
index f1ae0a2104..a2228a871b 100644
--- a/cql3/statements/create_table_statement.cc
+++ b/cql3/statements/create_table_statement.cc
@@ -13,7 +13,6 @@
 #include <inttypes.h>
 #include <boost/regex.hpp>
 
-#include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/adjacent_find.hpp>
 #include <seastar/core/coroutine.hh>
 
diff --git a/cql3/statements/drop_type_statement.cc b/cql3/statements/drop_type_statement.cc
index 78157084d8..cc967afe64 100644
--- a/cql3/statements/drop_type_statement.cc
+++ b/cql3/statements/drop_type_statement.cc
@@ -12,8 +12,6 @@
 #include "cql3/query_processor.hh"
 #include "cql3/functions/functions.hh"
 
-#include "boost/range/adaptor/map.hpp"
-
 #include "service/migration_manager.hh"
 #include "service/storage_proxy.hh"
 #include "data_dictionary/data_dictionary.hh"
diff --git a/db/batchlog_manager.cc b/db/batchlog_manager.cc
index eb8f76913a..09d2fe0ef2 100644
--- a/db/batchlog_manager.cc
+++ b/db/batchlog_manager.cc
@@ -16,8 +16,6 @@
 #include <seastar/core/metrics.hh>
 #include <seastar/core/coroutine.hh>
 #include <seastar/core/sleep.hh>
-#include <boost/range/adaptor/map.hpp>
-#include <boost/range/adaptor/sliced.hpp>
 
 #include "batchlog_manager.hh"
 #include "mutation/canonical_mutation.hh"
diff --git a/db/commitlog/commitlog_replayer.cc b/db/commitlog/commitlog_replayer.cc
index aae9117a51..33bbf022b7 100644
--- a/db/commitlog/commitlog_replayer.cc
+++ b/db/commitlog/commitlog_replayer.cc
@@ -13,7 +13,6 @@
 #include <algorithm>
 #include <unordered_map>
 #include <ranges>
-#include <boost/range/adaptor/map.hpp>
 
 #include <seastar/core/future.hh>
 #include <seastar/core/sharded.hh>
diff --git a/db/cql_type_parser.cc b/db/cql_type_parser.cc
index c85a593cb9..1d03b78f62 100644
--- a/db/cql_type_parser.cc
+++ b/db/cql_type_parser.cc
@@ -7,8 +7,6 @@
  * SPDX-License-Identifier: (LicenseRef-ScyllaDB-Source-Available-1.0 and Apache-2.0)
  */
 #include <unordered_map>
-#include <boost/range/adaptor/map.hpp>
-#include <boost/range/adaptor/sliced.hpp>
 #include <seastar/coroutine/maybe_yield.hh>
 
 #include "replica/database.hh"
diff --git a/db/hints/internal/hint_sender.cc b/db/hints/internal/hint_sender.cc
index cc15c54ff7..7c7fd45764 100644
--- a/db/hints/internal/hint_sender.cc
+++ b/db/hints/internal/hint_sender.cc
@@ -20,9 +20,6 @@
 #include <seastar/core/format.hh>
 #include <seastar/core/seastar.hh>
 
-// Boost features.
-#include <boost/range/algorithm/find.hpp>
-
 // Scylla includes.
 #include "db/hints/internal/common.hh"
 #include "db/hints/internal/hint_logger.hh"
diff --git a/db/hints/internal/hint_storage.cc b/db/hints/internal/hint_storage.cc
index 5904db1ab4..227b287689 100644
--- a/db/hints/internal/hint_storage.cc
+++ b/db/hints/internal/hint_storage.cc
@@ -19,9 +19,6 @@
 #include <seastar/core/smp.hh>
 #include <seastar/core/sstring.hh>
 
-// Boost features.
-#include <boost/range/adaptor/map.hpp>
-
 // Scylla includes.
 #include "db/hints/internal/hint_logger.hh"
 #include <seastar/core/future.hh>
diff --git a/db/hints/resource_manager.cc b/db/hints/resource_manager.cc
index 6e0045945f..916cba9f41 100644
--- a/db/hints/resource_manager.cc
+++ b/db/hints/resource_manager.cc
@@ -12,7 +12,6 @@
 #include "manager.hh"
 #include "utils/log.hh"
 #include <boost/range/algorithm/for_each.hpp>
-#include <boost/range/adaptor/map.hpp>
 #include <boost/range/numeric.hpp>
 #include "utils/disk-error-handler.hh"
 #include "seastarx.hh"
diff --git a/db/per_partition_rate_limit_options.cc b/db/per_partition_rate_limit_options.cc
index fa4d9f32cf..211eb4bf6f 100644
--- a/db/per_partition_rate_limit_options.cc
+++ b/db/per_partition_rate_limit_options.cc
@@ -7,7 +7,6 @@
  */
 
 #include <optional>
-#include <boost/range/adaptor/map.hpp>
 #include "exceptions/exceptions.hh"
 #include "serializer.hh"
 #include "schema/schema.hh"
diff --git a/db/schema_applier.cc b/db/schema_applier.cc
index 7cb11c2419..7ec4f0c979 100644
--- a/db/schema_applier.cc
+++ b/db/schema_applier.cc
@@ -18,11 +18,6 @@
 #include <seastar/core/loop.hh>
 #include <seastar/core/on_internal_error.hh>
 
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/range/algorithm/copy.hpp>
-#include <boost/range/algorithm/transform.hpp>
-#include <boost/range/adaptor/indirected.hpp>
-#include <boost/range/adaptor/map.hpp>
 #include <boost/range/join.hpp>
 
 #include <fmt/ranges.h>
diff --git a/db/view/view_update_generator.cc b/db/view/view_update_generator.cc
index 93716685ce..beb906e05b 100644
--- a/db/view/view_update_generator.cc
+++ b/db/view/view_update_generator.cc
@@ -10,8 +10,6 @@
 #include <seastar/core/timed_out_error.hh>
 #include "gms/inet_address.hh"
 #include <seastar/util/defer.hh>
-#include <boost/range/adaptor/map.hpp>
-#include <boost/range/numeric.hpp>
 #include "replica/database.hh"
 #include "view_update_generator.hh"
 #include "utils/error_injection.hh"
diff --git a/db/virtual_tables.cc b/db/virtual_tables.cc
index d5efc4bae0..947b96010f 100644
--- a/db/virtual_tables.cc
+++ b/db/virtual_tables.cc
@@ -8,7 +8,6 @@
 
 #include <algorithm>
 
-#include <boost/range/algorithm.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 #include <seastar/core/coroutine.hh>
diff --git a/dht/murmur3_partitioner.cc b/dht/murmur3_partitioner.cc
index 62cccdf9b1..d654e87d0a 100644
--- a/dht/murmur3_partitioner.cc
+++ b/dht/murmur3_partitioner.cc
@@ -10,8 +10,6 @@
 #include "utils/murmur_hash.hh"
 #include "sstables/key.hh"
 #include "utils/class_registrator.hh"
-#include <boost/lexical_cast.hpp>
-#include <boost/range/irange.hpp>
 
 namespace dht {
 
diff --git a/ent/encryption/encryption.cc b/ent/encryption/encryption.cc
index 07f2db63fa..2f6eff496b 100644
--- a/ent/encryption/encryption.cc
+++ b/ent/encryption/encryption.cc
@@ -22,9 +22,6 @@
 #include <openssl/sha.h>
 #include <openssl/hmac.h>
 
-#include <boost/range/adaptor/map.hpp>
-#include <boost/filesystem.hpp>
-
 #include <seastar/core/seastar.hh>
 #include <seastar/core/future-util.hh>
 #include <seastar/core/shared_ptr.hh>
diff --git a/index/secondary_index_manager.cc b/index/secondary_index_manager.cc
index 0fcf72cbf2..a99efe6afa 100644
--- a/index/secondary_index_manager.cc
+++ b/index/secondary_index_manager.cc
@@ -20,8 +20,6 @@
 #include "concrete_types.hh"
 #include "db/tags/extension.hh"
 
-#include <boost/range/adaptor/map.hpp>
-
 namespace secondary_index {
 
 index::index(const sstring& target_column, const index_metadata& im)
diff --git a/querier.cc b/querier.cc
index 734cd2ffc2..971729d1e5 100644
--- a/querier.cc
+++ b/querier.cc
@@ -15,8 +15,6 @@
 #include "utils/log.hh"
 #include "utils/error_injection.hh"
 
-#include <boost/range/adaptor/map.hpp>
-
 namespace query {
 
 logging::logger qlogger("querier_cache");
diff --git a/reader_concurrency_semaphore_group.hh b/reader_concurrency_semaphore_group.hh
index 349f8e79cb..2000dc6c45 100644
--- a/reader_concurrency_semaphore_group.hh
+++ b/reader_concurrency_semaphore_group.hh
@@ -11,8 +11,6 @@
 #include <unordered_map>
 #include <optional>
 #include "reader_concurrency_semaphore.hh"
-#include <boost/range/adaptor/map.hpp>
-#include <boost/range/numeric.hpp>
 
 // The reader_concurrency_semaphore_group is a group of semaphores that shares a common pool of memory,
 // the memory is dynamically divided between them according to a relative slice of shares each semaphore
diff --git a/replica/database.cc b/replica/database.cc
index bcdc3b8903..71826b9afc 100644
--- a/replica/database.cc
+++ b/replica/database.cc
@@ -33,7 +33,6 @@
 #include <seastar/core/metrics.hh>
 #include "sstables/sstables.hh"
 #include "sstables/sstables_manager.hh"
-#include <boost/range/adaptor/map.hpp>
 #include <boost/container/static_vector.hpp>
 #include "mutation/frozen_mutation.hh"
 #include "mutation/async_utils.hh"
diff --git a/replica/distributed_loader.cc b/replica/distributed_loader.cc
index 28bb4eb90d..6b035f5217 100644
--- a/replica/distributed_loader.cc
+++ b/replica/distributed_loader.cc
@@ -30,7 +30,6 @@
 #include "tracing/trace_keyspace_helper.hh"
 #include "db/view/view_update_checks.hh"
 #include <unordered_map>
-#include <boost/range/adaptor/map.hpp>
 #include "db/view/view_builder.hh"
 
 extern logging::logger dblog;
diff --git a/service/raft/group0_state_machine.cc b/service/raft/group0_state_machine.cc
index 827862bcb2..144d8a02cf 100644
--- a/service/raft/group0_state_machine.cc
+++ b/service/raft/group0_state_machine.cc
@@ -40,7 +40,6 @@
 #include "timestamp.hh"
 #include "utils/overloaded_functor.hh"
 #include "utils/to_string.hh"
-#include <boost/range/algorithm/transform.hpp>
 #include <optional>
 #include "db/config.hh"
 #include "replica/database.hh"
diff --git a/service/topology_state_machine.cc b/service/topology_state_machine.cc
index c35453a505..ed767fa535 100644
--- a/service/topology_state_machine.cc
+++ b/service/topology_state_machine.cc
@@ -11,8 +11,6 @@
 #include "utils/log.hh"
 #include "db/system_keyspace.hh"
 
-#include <boost/range/adaptor/map.hpp>
-
 namespace service {
 
 logging::logger tsmlogger("topology_state_machine");
diff --git a/sstables/sstable_directory.cc b/sstables/sstable_directory.cc
index 0d465ca47a..c0b7979dd0 100644
--- a/sstables/sstable_directory.cc
+++ b/sstables/sstable_directory.cc
@@ -12,7 +12,6 @@
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
 #include <seastar/util/file.hh>
-#include <boost/range/adaptor/map.hpp>
 #include <boost/algorithm/string.hpp>
 #include "sstables/sstable_directory.hh"
 #include "sstables/sstables.hh"
diff --git a/streaming/stream_session.cc b/streaming/stream_session.cc
index b7cd2a91ab..8a9a672f19 100644
--- a/streaming/stream_session.cc
+++ b/streaming/stream_session.cc
@@ -25,7 +25,6 @@
 #include "mutation_writer/multishard_writer.hh"
 #include "sstables/sstable_set.hh"
 #include "db/view/view_update_checks.hh"
-#include <boost/range/adaptor/map.hpp>
 #include "replica/database.hh"
 #include "streaming/stream_mutation_fragments_cmd.hh"
 #include "consumer.hh"
diff --git a/streaming/stream_transfer_task.cc b/streaming/stream_transfer_task.cc
index ce1616cbb5..e0a2e8617f 100644
--- a/streaming/stream_transfer_task.cc
+++ b/streaming/stream_transfer_task.cc
@@ -25,7 +25,6 @@
 #include "interval.hh"
 #include "dht/i_partitioner.hh"
 #include "dht/sharder.hh"
-#include <boost/range/irange.hpp>
 #include <boost/icl/interval.hpp>
 #include <boost/icl/interval_set.hpp>
 #include <fmt/ranges.h>
diff --git a/test/boost/aggregate_fcts_test.cc b/test/boost/aggregate_fcts_test.cc
index ccd266119b..740646724e 100644
--- a/test/boost/aggregate_fcts_test.cc
+++ b/test/boost/aggregate_fcts_test.cc
@@ -7,8 +7,6 @@
  */
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
 
diff --git a/test/boost/auth_test.cc b/test/boost/auth_test.cc
index 566aec47d1..422d789dc1 100644
--- a/test/boost/auth_test.cc
+++ b/test/boost/auth_test.cc
@@ -7,9 +7,6 @@
  */
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/algorithm.hpp>
-#include <boost/test/unit_test.hpp>
 #include <stdint.h>
 #include <fmt/ranges.h>
 
diff --git a/test/boost/batchlog_manager_test.cc b/test/boost/batchlog_manager_test.cc
index 74de28c884..0a4bd68036 100644
--- a/test/boost/batchlog_manager_test.cc
+++ b/test/boost/batchlog_manager_test.cc
@@ -7,8 +7,6 @@
  */
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 #include <stdint.h>
 
diff --git a/test/boost/cached_file_test.cc b/test/boost/cached_file_test.cc
index 8190fdd309..4a30307e13 100644
--- a/test/boost/cached_file_test.cc
+++ b/test/boost/cached_file_test.cc
@@ -6,7 +6,6 @@
  * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
  */
 
-#include <boost/range/irange.hpp>
 #include "test/lib/scylla_test_case.hh"
 #include <seastar/testing/thread_test_case.hh>
 #include <seastar/core/iostream.hh>
diff --git a/test/boost/cartesian_product_test.cc b/test/boost/cartesian_product_test.cc
index 4df23b6ee3..55d4a8fdcf 100644
--- a/test/boost/cartesian_product_test.cc
+++ b/test/boost/cartesian_product_test.cc
@@ -26,7 +26,6 @@
 #define BOOST_TEST_MODULE core
 
 #include <boost/test/unit_test.hpp>
-#include <boost/range/algorithm/copy.hpp>
 #include "cartesian_product.hh"
 
 template<typename Range>
diff --git a/test/boost/castas_fcts_test.cc b/test/boost/castas_fcts_test.cc
index c3bcd88f96..fd174de331 100644
--- a/test/boost/castas_fcts_test.cc
+++ b/test/boost/castas_fcts_test.cc
@@ -7,10 +7,7 @@
  */
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/multiprecision/cpp_int.hpp>
 
 #include "utils/big_decimal.hh"
 #include "exceptions/exceptions.hh"
diff --git a/test/boost/cdc_test.cc b/test/boost/cdc_test.cc
index cb17e9e012..9604cb168f 100644
--- a/test/boost/cdc_test.cc
+++ b/test/boost/cdc_test.cc
@@ -12,7 +12,6 @@
 #include <seastar/testing/test_case.hh>
 #include <seastar/testing/thread_test_case.hh>
 #include <string>
-#include <boost/range/adaptor/map.hpp>
 #include <fmt/ranges.h>
 #include <fmt/std.h>
 
diff --git a/test/boost/commitlog_test.cc b/test/boost/commitlog_test.cc
index 26c11b7669..ca8de23b4f 100644
--- a/test/boost/commitlog_test.cc
+++ b/test/boost/commitlog_test.cc
@@ -8,7 +8,6 @@
 
 
 #include <boost/test/unit_test.hpp>
-#include <boost/range/adaptor/map.hpp>
 
 #include <stdlib.h>
 #include <iostream>
diff --git a/test/boost/cql_functions_test.cc b/test/boost/cql_functions_test.cc
index f85e4097fe..ca8443b181 100644
--- a/test/boost/cql_functions_test.cc
+++ b/test/boost/cql_functions_test.cc
@@ -8,8 +8,6 @@
 
 #include <algorithm>
 
-#include <boost/range/irange.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
 
diff --git a/test/boost/cql_query_group_test.cc b/test/boost/cql_query_group_test.cc
index 47179f714e..5f99c08c9d 100644
--- a/test/boost/cql_query_group_test.cc
+++ b/test/boost/cql_query_group_test.cc
@@ -7,10 +7,7 @@
  */
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/multiprecision/cpp_int.hpp>
 
 #include <seastar/net/inet_address.hh>
 
diff --git a/test/boost/cql_query_large_test.cc b/test/boost/cql_query_large_test.cc
index aef1f4e49c..d96a3fce53 100644
--- a/test/boost/cql_query_large_test.cc
+++ b/test/boost/cql_query_large_test.cc
@@ -7,8 +7,6 @@
  */
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
 
diff --git a/test/boost/cql_query_like_test.cc b/test/boost/cql_query_like_test.cc
index 0d921d98ae..88e230c0dc 100644
--- a/test/boost/cql_query_like_test.cc
+++ b/test/boost/cql_query_like_test.cc
@@ -7,8 +7,6 @@
  */
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
 
diff --git a/test/boost/cql_query_test.cc b/test/boost/cql_query_test.cc
index 581f7ed547..f8f997100a 100644
--- a/test/boost/cql_query_test.cc
+++ b/test/boost/cql_query_test.cc
@@ -7,8 +7,6 @@
  */
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
 
diff --git a/test/boost/encrypted_file_test.cc b/test/boost/encrypted_file_test.cc
index a3d12054c8..951ef51034 100644
--- a/test/boost/encrypted_file_test.cc
+++ b/test/boost/encrypted_file_test.cc
@@ -4,9 +4,6 @@
 
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/adaptors.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 #include <stdint.h>
 #include <random>
diff --git a/test/boost/encryption_at_rest_test.cc b/test/boost/encryption_at_rest_test.cc
index acf06d3564..332f5740ec 100644
--- a/test/boost/encryption_at_rest_test.cc
+++ b/test/boost/encryption_at_rest_test.cc
@@ -4,9 +4,6 @@
 
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/adaptors.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/process.hpp>
 
diff --git a/test/boost/filtering_test.cc b/test/boost/filtering_test.cc
index 9616924585..01d5e73218 100644
--- a/test/boost/filtering_test.cc
+++ b/test/boost/filtering_test.cc
@@ -7,8 +7,6 @@
  */
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
 
diff --git a/test/boost/flush_queue_test.cc b/test/boost/flush_queue_test.cc
index bed182a1d0..9dc96ae489 100644
--- a/test/boost/flush_queue_test.cc
+++ b/test/boost/flush_queue_test.cc
@@ -11,7 +11,6 @@
 #include <bitset>
 #include <ranges>
 #include <boost/test/unit_test.hpp>
-#include <boost/range/irange.hpp>
 #include <seastar/core/loop.hh>
 #include <seastar/core/semaphore.hh>
 #include <seastar/core/seastar.hh>
diff --git a/test/boost/json_cql_query_test.cc b/test/boost/json_cql_query_test.cc
index 71a04757f8..dd277be964 100644
--- a/test/boost/json_cql_query_test.cc
+++ b/test/boost/json_cql_query_test.cc
@@ -7,8 +7,6 @@
  */
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
 
diff --git a/test/boost/keys_test.cc b/test/boost/keys_test.cc
index b51f39d227..a2ebfe0659 100644
--- a/test/boost/keys_test.cc
+++ b/test/boost/keys_test.cc
@@ -9,7 +9,6 @@
 #define BOOST_TEST_MODULE core
 
 #include <boost/test/unit_test.hpp>
-#include <boost/range/algorithm/copy.hpp>
 #include "keys.hh"
 #include "schema/schema.hh"
 #include "schema/schema_builder.hh"
diff --git a/test/boost/multishard_combining_reader_as_mutation_source_test.cc b/test/boost/multishard_combining_reader_as_mutation_source_test.cc
index c3543e3f3b..58d9c380f4 100644
--- a/test/boost/multishard_combining_reader_as_mutation_source_test.cc
+++ b/test/boost/multishard_combining_reader_as_mutation_source_test.cc
@@ -7,9 +7,6 @@
  */
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/adaptor/uniqued.hpp>
-
 #include <seastar/core/thread.hh>
 
 #undef SEASTAR_TESTING_MAIN
diff --git a/test/boost/mutation_writer_test.cc b/test/boost/mutation_writer_test.cc
index b137bab337..dce4b37875 100644
--- a/test/boost/mutation_writer_test.cc
+++ b/test/boost/mutation_writer_test.cc
@@ -31,7 +31,6 @@
 #include "test/lib/log.hh"
 #include "test/lib/test_utils.hh"
 
-#include <boost/range/adaptor/map.hpp>
 #include "readers/from_mutations_v2.hh"
 #include "readers/empty_v2.hh"
 #include "readers/generating_v2.hh"
diff --git a/test/boost/mvcc_test.cc b/test/boost/mvcc_test.cc
index f28157eeb2..9fd57f677d 100644
--- a/test/boost/mvcc_test.cc
+++ b/test/boost/mvcc_test.cc
@@ -8,7 +8,6 @@
 
 
 #include "utils/assert.hh"
-#include <boost/range/algorithm_ext/push_back.hpp>
 #include <boost/range/size.hpp>
 #include <seastar/core/thread.hh>
 #include <seastar/util/defer.hh>
diff --git a/test/boost/query_processor_test.cc b/test/boost/query_processor_test.cc
index e1d72dbe34..b21ade4817 100644
--- a/test/boost/query_processor_test.cc
+++ b/test/boost/query_processor_test.cc
@@ -7,8 +7,6 @@
  */
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 #include <fmt/ranges.h>
 #include <iterator>
diff --git a/test/boost/symmetric_key_test.cc b/test/boost/symmetric_key_test.cc
index 891f9b00e7..aaef5a604d 100644
--- a/test/boost/symmetric_key_test.cc
+++ b/test/boost/symmetric_key_test.cc
@@ -4,9 +4,6 @@
 
 
 
-#include <boost/range/irange.hpp>
-#include <boost/range/adaptors.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/lexical_cast.hpp>
 #include <stdint.h>
diff --git a/test/boost/view_complex_test.cc b/test/boost/view_complex_test.cc
index f4ca4b3d00..985c8e128e 100644
--- a/test/boost/view_complex_test.cc
+++ b/test/boost/view_complex_test.cc
@@ -7,7 +7,6 @@
  */
 
 #include <boost/test/unit_test.hpp>
-#include <boost/range/adaptor/map.hpp>
 #include <fmt/ranges.h>
 
 #include "replica/database.hh"
diff --git a/test/boost/view_schema_ckey_test.cc b/test/boost/view_schema_ckey_test.cc
index dfe654db81..e601b39c11 100644
--- a/test/boost/view_schema_ckey_test.cc
+++ b/test/boost/view_schema_ckey_test.cc
@@ -8,7 +8,6 @@
 
 
 #include <boost/test/unit_test.hpp>
-#include <boost/range/adaptor/map.hpp>
 
 #undef SEASTAR_TESTING_MAIN
 #include <seastar/testing/test_case.hh>
diff --git a/test/boost/view_schema_pkey_test.cc b/test/boost/view_schema_pkey_test.cc
index 01abd7ef8d..9840ad07bb 100644
--- a/test/boost/view_schema_pkey_test.cc
+++ b/test/boost/view_schema_pkey_test.cc
@@ -8,7 +8,6 @@
 
 
 #include <boost/test/unit_test.hpp>
-#include <boost/range/adaptor/map.hpp>
 
 #include "db/view/view_builder.hh"
 
diff --git a/test/boost/view_schema_test.cc b/test/boost/view_schema_test.cc
index 67d000dbcd..e66cd48d52 100644
--- a/test/boost/view_schema_test.cc
+++ b/test/boost/view_schema_test.cc
@@ -8,7 +8,6 @@
 
 
 #include <boost/test/unit_test.hpp>
-#include <boost/range/adaptor/map.hpp>
 #include <fmt/ostream.h>
 #include <fmt/ranges.h>
 #include "replica/database.hh"
diff --git a/test/boost/virtual_reader_test.cc b/test/boost/virtual_reader_test.cc
index 938da924da..941474549f 100644
--- a/test/boost/virtual_reader_test.cc
+++ b/test/boost/virtual_reader_test.cc
@@ -8,8 +8,6 @@
  * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
  */
 
-#include <boost/range/irange.hpp>
-#include <boost/range/algorithm.hpp>
 #include <boost/test/unit_test.hpp>
 #include <stdint.h>
 
diff --git a/test/lib/dummy_sharder.hh b/test/lib/dummy_sharder.hh
index cb6076a5db..a729040935 100644
--- a/test/lib/dummy_sharder.hh
+++ b/test/lib/dummy_sharder.hh
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include <boost/range/adaptor/map.hpp>
 #include "dht/token.hh"
 #include "dht/token-sharding.hh"
 
diff --git a/test/lib/sstable_utils.cc b/test/lib/sstable_utils.cc
index cd4aa9443b..4a0df95251 100644
--- a/test/lib/sstable_utils.cc
+++ b/test/lib/sstable_utils.cc
@@ -12,7 +12,6 @@
 #include "replica/memtable-sstable.hh"
 #include "dht/i_partitioner.hh"
 #include "dht/murmur3_partitioner.hh"
-#include <boost/range/irange.hpp>
 #include "sstables/version.hh"
 #include "test/lib/mutation_reader_assertions.hh"
 #include "test/lib/reader_concurrency_semaphore.hh"
diff --git a/test/lib/test_utils.cc b/test/lib/test_utils.cc
index 7133daa43d..d5e792a0af 100644
--- a/test/lib/test_utils.cc
+++ b/test/lib/test_utils.cc
@@ -9,7 +9,6 @@
 #include "test/lib/test_utils.hh"
 
 #include <seastar/util/file.hh>
-#include <boost/range/adaptor/map.hpp>
 #include <seastar/core/format.hh>
 #include <seastar/util/backtrace.hh>
 #include "test/lib/log.hh"
diff --git a/test/manual/partition_data_test.cc b/test/manual/partition_data_test.cc
index 80732ae9d8..5cc0e593ef 100644
--- a/test/manual/partition_data_test.cc
+++ b/test/manual/partition_data_test.cc
@@ -11,9 +11,6 @@
 
 #include <random>
 
-#include <boost/range/irange.hpp>
-#include <boost/range/algorithm/generate.hpp>
-
 #include "test/lib/random_utils.hh"
 #include "utils/disk-error-handler.hh"
 #include "mutation/atomic_cell.hh"
diff --git a/test/manual/sstable_scan_footprint_test.cc b/test/manual/sstable_scan_footprint_test.cc
index b57b0a2ade..2979fb1959 100644
--- a/test/manual/sstable_scan_footprint_test.cc
+++ b/test/manual/sstable_scan_footprint_test.cc
@@ -16,7 +16,6 @@
 #include "db/config.hh"
 #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>
diff --git a/test/perf/memory_footprint_test.cc b/test/perf/memory_footprint_test.cc
index 8fd7127fb4..448b4d299b 100644
--- a/test/perf/memory_footprint_test.cc
+++ b/test/perf/memory_footprint_test.cc
@@ -7,7 +7,6 @@
  */
 
 #include "utils/assert.hh"
-#include <boost/range/irange.hpp>
 
 #include <seastar/util/defer.hh>
 #include <seastar/core/app-template.hh>
diff --git a/test/perf/perf.hh b/test/perf/perf.hh
index 3266102c7d..de27b5524d 100644
--- a/test/perf/perf.hh
+++ b/test/perf/perf.hh
@@ -23,7 +23,6 @@
 
 #include <chrono>
 #include <iosfwd>
-#include <boost/range/irange.hpp>
 #include <vector>
 
 template <typename Func>
diff --git a/test/perf/perf_cache_eviction.cc b/test/perf/perf_cache_eviction.cc
index 12d7a97545..047c9d290c 100644
--- a/test/perf/perf_cache_eviction.cc
+++ b/test/perf/perf_cache_eviction.cc
@@ -6,7 +6,6 @@
  * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
  */
 
-#include <boost/range/irange.hpp>
 #include <fmt/ranges.h>
 #include "seastarx.hh"
 #include "test/lib/simple_schema.hh"
diff --git a/test/perf/perf_simple_query.cc b/test/perf/perf_simple_query.cc
index 48ebb0403e..b4c8367212 100644
--- a/test/perf/perf_simple_query.cc
+++ b/test/perf/perf_simple_query.cc
@@ -9,7 +9,6 @@
 #include "utils/assert.hh"
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
-#include <boost/range/irange.hpp>
 #include <json/json.h>
 #include <fmt/ranges.h>
 
diff --git a/test/perf/perf_sstable.hh b/test/perf/perf_sstable.hh
index a2f814b97f..f5e0f910e9 100644
--- a/test/perf/perf_sstable.hh
+++ b/test/perf/perf_sstable.hh
@@ -25,7 +25,6 @@
 #include <boost/accumulators/framework/features.hpp>
 #include <boost/accumulators/statistics/mean.hpp>
 #include <boost/accumulators/statistics/error_of_mean.hpp>
-#include <boost/range/irange.hpp>
 
 using namespace sstables;
 
diff --git a/test/unit/row_cache_stress_test.cc b/test/unit/row_cache_stress_test.cc
index 86819b9de2..dcff65c03f 100644
--- a/test/unit/row_cache_stress_test.cc
+++ b/test/unit/row_cache_stress_test.cc
@@ -6,7 +6,6 @@
  * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
  */
 
-#include <boost/range/irange.hpp>
 #include "seastarx.hh"
 #include "test/lib/simple_schema.hh"
 #include "test/lib/log.hh"
diff --git a/tools/scylla-nodetool.cc b/tools/scylla-nodetool.cc
index 2fb4431036..7755f0b81a 100644
--- a/tools/scylla-nodetool.cc
+++ b/tools/scylla-nodetool.cc
@@ -20,7 +20,6 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/make_shared.hpp>
-#include <boost/range/adaptor/map.hpp>
 #include <fmt/chrono.h>
 #include <fmt/ranges.h>
 #include <seastar/core/sleep.hh>
diff --git a/tools/scylla-sstable.cc b/tools/scylla-sstable.cc
index dceaa91d29..9ce5c39639 100644
--- a/tools/scylla-sstable.cc
+++ b/tools/scylla-sstable.cc
@@ -7,7 +7,6 @@
  */
 
 #include <boost/algorithm/string.hpp>
-#include <boost/range/adaptor/map.hpp>
 #include <filesystem>
 #include <set>
 #include <fmt/chrono.h>
diff --git a/transport/server.cc b/transport/server.cc
index 8f51570c00..bd10170b10 100644
--- a/transport/server.cc
+++ b/transport/server.cc
@@ -8,12 +8,6 @@
 
 #include "server.hh"
 
-#include <boost/bimap/unordered_set_of.hpp>
-#include <boost/range/irange.hpp>
-#include <boost/bimap.hpp>
-#include <boost/assign.hpp>
-#include <boost/range/adaptor/sliced.hpp>
-
 #include "cql3/statements/batch_statement.hh"
 #include "cql3/statements/modification_statement.hh"
 #include "seastar/core/scheduling.hh"