treewide: reduce boost headers usage in scylla header files

`dev-headers` target is also ensured to build successfully.

Signed-off-by: Pavel Solodovnikov <pa.solodovnikov@scylladb.com>

alternator/executor.cc

@@ -58,6 +58,7 @@
 #include "alternator/rmw_operation.hh"
 #include <seastar/core/coroutine.hh>
 #include <boost/range/adaptors.hpp>
+#include <boost/range/algorithm/find_end.hpp>
 
 logging::logger elogger("alternator-executor");
 

api/storage_service.cc

@@ -29,6 +29,7 @@
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/algorithm/string/trim_all.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
 #include <boost/functional/hash.hpp>
 #include "service/storage_service.hh"
 #include "service/load_meter.hh"

auth/authenticator.hh

@@ -47,7 +47,6 @@
 #include <stdexcept>
 #include <unordered_map>
 
-#include <boost/any.hpp>
 #include <seastar/core/enum.hh>
 #include <seastar/core/future.hh>
 #include <seastar/core/sstring.hh>

cdc/log.cc

@@ -23,6 +23,7 @@
 #include <algorithm>
 
 #include <boost/range/irange.hpp>
+#include <boost/algorithm/string/predicate.hpp>
 #include <seastar/util/defer.hh>
 #include <seastar/core/thread.hh>
 #include <seastar/core/metrics.hh>

counters.cc

@@ -23,6 +23,8 @@
 #include "mutation.hh"
 #include "combine.hh"
 
+#include <boost/range/algorithm/sort.hpp>
+
 std::ostream& operator<<(std::ostream& os, const counter_id& id) {
     return os << id.to_uuid();
 }

counters.hh

@@ -21,7 +21,9 @@
 
 #pragma once
 
+#include <boost/range/iterator_range.hpp>
 #include <boost/range/algorithm/find_if.hpp>
+#include <boost/range/numeric.hpp>
 
 #include "atomic_cell_or_collection.hh"
 #include "types.hh"

cql3/expr/expression.cc

@@ -24,6 +24,9 @@
 #include <boost/algorithm/cxx11/all_of.hpp>
 #include <boost/algorithm/cxx11/any_of.hpp>
 #include <boost/range/adaptors.hpp>
+#include <boost/range/algorithm/set_algorithm.hpp>
+#include <boost/range/algorithm/unique.hpp>
+#include <boost/range/algorithm/sort.hpp>
 #include <fmt/ostream.h>
 #include <unordered_map>
 

cql3/functions/functions.hh

@@ -53,7 +53,6 @@
 #include "cql3/column_identifier.hh"
 #include "to_string.hh"
 #include <unordered_map>
-#include <boost/lexical_cast.hpp>
 
 namespace cql3 {
 

cql3/functions/time_uuid_fcts.hh

@@ -44,8 +44,6 @@
 #include "castas_fcts.hh"
 #include "native_scalar_function.hh"
 #include "utils/UUID_gen.hh"
-#include <boost/uuid/uuid.hpp>
-#include <boost/uuid/uuid_generators.hpp>
 
 namespace cql3 {
 

cql3/restrictions/multi_column_restriction.hh

@@ -49,7 +49,6 @@
 #include "cql3/constants.hh"
 #include "cql3/lists.hh"
 #include "cql3/expr/expression.hh"
-#include <boost/algorithm/cxx11/any_of.hpp>
 
 namespace cql3 {
 

cql3/restrictions/single_column_primary_key_restrictions.hh

@@ -49,7 +49,6 @@
 #include "cql3/restrictions/single_column_restrictions.hh"
 #include "cql3/cql_config.hh"
 #include "clustering_bounds_comparator.hh"
-#include <boost/algorithm/cxx11/any_of.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/adaptor/map.hpp>

cql3/selection/selection.cc

@@ -42,6 +42,7 @@
 #include <boost/range/adaptors.hpp>
 #include <boost/range/algorithm/equal.hpp>
 #include <boost/range/algorithm/transform.hpp>
+#include <boost/algorithm/cxx11/any_of.hpp>
 
 #include "cql3/selection/selection.hh"
 #include "cql3/selection/selector_factories.hh"

cql3/statements/batch_statement.cc

@@ -47,6 +47,10 @@
 #include "cas_request.hh"
 #include "cql3/query_processor.hh"
 
+#include <boost/algorithm/cxx11/any_of.hpp>
+#include <boost/algorithm/cxx11/all_of.hpp>
+#include <boost/range/adaptor/uniqued.hpp>
+
 namespace cql3 {
 
 namespace statements {

cql3/statements/batch_statement.hh

@@ -45,11 +45,6 @@
 #include "timestamp.hh"
 #include "log.hh"
 #include "to_string.hh"
-#include <boost/algorithm/cxx11/any_of.hpp>
-#include <boost/algorithm/cxx11/all_of.hpp>
-#include <boost/range/adaptor/transformed.hpp>
-#include <boost/range/adaptor/uniqued.hpp>
-#include <boost/iterator/counting_iterator.hpp>
 
 #pragma once
 

cql3/statements/raw/batch_statement.hh

@@ -43,11 +43,6 @@
 #include "timestamp.hh"
 #include "log.hh"
 #include "to_string.hh"
-#include <boost/algorithm/cxx11/any_of.hpp>
-#include <boost/algorithm/cxx11/all_of.hpp>
-#include <boost/range/adaptor/transformed.hpp>
-#include <boost/range/adaptor/uniqued.hpp>
-#include <boost/iterator/counting_iterator.hpp>
 
 #pragma once
 

database.cc

@@ -36,6 +36,7 @@
 #include <seastar/util/defer.hh>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/erase.hpp>
+#include <boost/algorithm/string/classification.hpp>
 #include "sstables/sstables.hh"
 #include "sstables/sstables_manager.hh"
 #include "sstables/compaction.hh"
@@ -43,6 +44,7 @@
 #include <boost/algorithm/cxx11/any_of.hpp>
 #include <boost/range/algorithm/find_if.hpp>
 #include <boost/range/algorithm/sort.hpp>
+#include <boost/range/algorithm/min_element.hpp>
 #include <boost/container/static_vector.hpp>
 #include "frozen_mutation.hh"
 #include <seastar/core/do_with.hh>

db/size_estimates_virtual_reader.cc

@@ -25,6 +25,7 @@
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/algorithm/find_if.hpp>
+#include <boost/range/algorithm/sort.hpp>
 
 #include "clustering_bounds_comparator.hh"
 #include "database_fwd.hh"

db/view/view.cc

@@ -48,7 +48,10 @@
 #include <boost/range/algorithm/find_if.hpp>
 #include <boost/range/algorithm/remove_if.hpp>
 #include <boost/range/algorithm/transform.hpp>
+#include <boost/range/algorithm/sort.hpp>
 #include <boost/range/adaptors.hpp>
+#include <boost/algorithm/cxx11/any_of.hpp>
+#include <boost/algorithm/cxx11/all_of.hpp>
 
 #include <seastar/core/future-util.hh>
 

db/view/view_update_checks.hh

@@ -23,8 +23,6 @@
 
 #include <seastar/core/future.hh>
 #include "streaming/stream_reason.hh"
-#include <boost/range/adaptor/map.hpp>
-#include <boost/algorithm/cxx11/any_of.hpp>
 #include "seastarx.hh"
 
 class table;

distributed_loader.cc

@@ -37,6 +37,7 @@
 #include "db/view/view_update_checks.hh"
 #include <unordered_map>
 #include <boost/range/adaptor/map.hpp>
+#include <boost/range/algorithm/min_element.hpp>
 #include "db/view/view_update_generator.hh"
 
 extern logging::logger dblog;

gms/endpoint_state.hh

@@ -42,8 +42,6 @@
 #include "gms/heart_beat_state.hh"
 #include "gms/application_state.hh"
 #include "gms/versioned_value.hh"
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string/classification.hpp>
 #include <optional>
 #include <chrono>
 

gms/gossiper.cc

@@ -61,6 +61,10 @@
 #include "db/config.hh"
 #include <boost/range/algorithm/set_algorithm.hpp>
 #include <boost/range/adaptors.hpp>
+#include <boost/range/algorithm/count_if.hpp>
+#include <boost/range/algorithm/partition.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
 #include "utils/generation-number.hh"
 #include "locator/token_metadata.hh"
 

gms/gossiper.hh

@@ -56,7 +56,6 @@
 #include "utils/loading_shared_values.hh"
 #include "utils/in.hh"
 #include "message/messaging_service_fwd.hh"
-#include <boost/algorithm/string.hpp>
 #include <optional>
 #include <algorithm>
 #include <chrono>

gms/versioned_value.cc

@@ -38,6 +38,9 @@
 #include "gms/versioned_value.hh"
 #include "message/messaging_service.hh"
 
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+
 namespace gms {
 
 static_assert(std::is_nothrow_default_constructible_v<versioned_value>);

gms/versioned_value.hh

@@ -48,8 +48,6 @@
 #include "version.hh"
 #include "cdc/generation_id.hh"
 #include <unordered_set>
-#include <vector>
-#include <boost/range/adaptor/transformed.hpp>
 
 namespace gms {
 

index/target_parser.hh

@@ -43,8 +43,6 @@
 
 #include "cql3/statements/index_target.hh"
 
-#include <boost/algorithm/string/predicate.hpp>
-
 namespace secondary_index {
 
 struct target_parser {

init.cc

@@ -27,6 +27,8 @@
 #include "seastarx.hh"
 #include "db/config.hh"
 
+#include <boost/algorithm/string/trim.hpp>
+
 logging::logger startlog("init");
 
 void init_gossiper(sharded<gms::gossiper>& gossiper

locator/ec2_snitch.cc

@@ -1,6 +1,9 @@
 #include "locator/ec2_snitch.hh"
 #include <seastar/core/seastar.hh>
 
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
+
 namespace locator {
 
 ec2_snitch::ec2_snitch(const sstring& fname, unsigned io_cpuid) : production_snitch_base(fname) {

locator/gce_snitch.cc

@@ -42,6 +42,9 @@
 #include <seastar/core/seastar.hh>
 #include "locator/gce_snitch.hh"
 
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+
 namespace locator {
 
 gce_snitch::gce_snitch(const sstring& fname, unsigned io_cpuid, const sstring& meta_server_url) : production_snitch_base(fname) {

locator/gossiping_property_file_snitch.hh

@@ -41,7 +41,6 @@
 #include <sstream>
 #include <string>
 #include <chrono>
-#include <boost/algorithm/string.hpp>
 #include <optional>
 #include "production_snitch_base.hh"
 #include "exceptions/exceptions.hh"

locator/production_snitch_base.cc

@@ -46,6 +46,10 @@
 #include "utils/fb_utilities.hh"
 #include "db/config.hh"
 
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
+
 namespace locator {
 
 production_snitch_base::production_snitch_base(const sstring& prop_file_name)

main.cc

@@ -92,6 +92,8 @@
 
 #include "service/raft/raft_services.hh"
 
+#include <boost/algorithm/string/join.hpp>
+
 namespace fs = std::filesystem;
 
 seastar::metrics::metric_groups app_metrics;

mutation_partition.hh

@@ -25,7 +25,6 @@
 #include <map>
 #include <boost/intrusive/set.hpp>
 #include <boost/range/iterator_range.hpp>
-#include <boost/range/adaptor/indexed.hpp>
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/intrusive/parent_from_member.hpp>
 

partition_range_compat.hh

@@ -23,7 +23,6 @@
 #pragma once
 
 #include <vector>
-#include <boost/range/iterator_range_core.hpp>
 #include "range.hh"
 #include "dht/i_partitioner.hh"
 #include "query-request.hh"

partition_snapshot_reader.hh

@@ -23,6 +23,7 @@
 
 #include "partition_version.hh"
 #include "flat_mutation_reader.hh"
+#include <boost/range/algorithm/heap_algorithm.hpp>
 
 struct partition_snapshot_reader_dummy_accounter {
    void operator()(const clustering_row& cr) {}

partition_snapshot_row_cursor.hh

@@ -25,6 +25,7 @@
 #include "row_cache.hh"
 #include "utils/small_vector.hh"
 #include <boost/algorithm/cxx11/any_of.hpp>
+#include <boost/range/algorithm/heap_algorithm.hpp>
 
 class partition_snapshot_row_cursor;
 

query-result-reader.hh

@@ -22,6 +22,7 @@
 #pragma once
 
 #include <boost/range/adaptor/transformed.hpp>
+#include <boost/range/numeric.hpp>
 
 #include "query-request.hh"
 #include "query-result.hh"

range_tombstone.cc

@@ -22,6 +22,8 @@
 #include "range_tombstone.hh"
 #include "mutation_fragment.hh"
 
+#include <boost/range/algorithm/upper_bound.hpp>
+
 std::ostream& operator<<(std::ostream& out, const range_tombstone& rt) {
     if (rt) {
         return out << "{range_tombstone: start=" << rt.start_bound() << ", end=" << rt.end_bound() << ", " << rt.tomb << "}";

range_tombstone.hh

@@ -22,7 +22,6 @@
 #pragma once
 
 #include <boost/intrusive/set.hpp>
-#include <boost/range/algorithm.hpp>
 #include <optional>
 #include "hashing.hh"
 #include "keys.hh"

schema.hh

@@ -26,7 +26,6 @@
 #include <unordered_map>
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/join.hpp>
-#include <boost/range/algorithm/transform.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/dynamic_bitset.hpp>
 

serializer_impl.hh

@@ -23,7 +23,6 @@
 
 #include "serializer.hh"
 #include <seastar/util/bool_class.hh>
-#include <boost/range/algorithm/for_each.hpp>
 #include "utils/small_vector.hh"
 #include <absl/container/btree_set.h>
 #include <seastar/core/shared_ptr.hh>

service/storage_proxy.cc

@@ -77,6 +77,9 @@
 #include <boost/range/empty.hpp>
 #include <boost/range/algorithm/min_element.hpp>
 #include <boost/range/adaptor/transformed.hpp>
+#include <boost/range/combine.hpp>
+#include <boost/range/algorithm/transform.hpp>
+#include <boost/range/algorithm/partition.hpp>
 #include <boost/intrusive/list.hpp>
 #include "utils/latency.hh"
 #include "schema.hh"

service/storage_service.cc

@@ -87,6 +87,9 @@
 #include "utils/generation-number.hh"
 #include <seastar/core/coroutine.hh>
 
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+
 using token = dht::token;
 using UUID = utils::UUID;
 using inet_address = gms::inet_address;

sstables/column_translation.hh

@@ -22,7 +22,6 @@
 #pragma once
 
 #include <vector>
-#include <boost/range/algorithm/stable_partition.hpp>
 #include <seastar/core/shared_ptr.hh>
 
 #include "schema_fwd.hh"

sstables/compaction_strategy.cc

@@ -48,6 +48,7 @@
 #include "schema.hh"
 #include "sstable_set.hh"
 #include <boost/range/algorithm/find.hpp>
+#include <boost/range/algorithm/remove_if.hpp>
 #include <boost/range/adaptors.hpp>
 #include <boost/algorithm/cxx11/any_of.hpp>
 #include "size_tiered_compaction_strategy.hh"

sstables/leveled_compaction_strategy.cc

@@ -23,6 +23,8 @@
 #include <algorithm>
 #include <ranges>
 
+#include <boost/range/algorithm/remove_if.hpp>
+
 namespace sstables {
 
 compaction_descriptor leveled_compaction_strategy::get_sstables_for_compaction(column_family& cfs, std::vector<sstables::shared_sstable> candidates) {

sstables/leveled_manifest.hh

@@ -46,6 +46,7 @@
 #include "size_tiered_compaction_strategy.hh"
 #include "range.hh"
 #include "log.hh"
+#include <boost/range/algorithm/sort.hpp>
 #include <boost/range/algorithm/partial_sort.hpp>
 #include "service/priority_manager.hh"
 

sstables/mx/writer.cc

@@ -34,6 +34,8 @@
 #include <functional>
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/container/static_vector.hpp>
+#include <boost/range/adaptor/indexed.hpp>
+#include <boost/range/algorithm/stable_partition.hpp>
 
 logging::logger slogger("mc_writer");
 

sstables/sstable_mutation_reader.cc

@@ -25,6 +25,8 @@
 #include "concrete_types.hh"
 #include "utils/fragment_range.hh"
 
+#include <boost/range/algorithm/stable_partition.hpp>
+
 namespace sstables {
 
 atomic_cell make_counter_cell(api::timestamp_type timestamp, fragmented_temporary_buffer::view cell_value) {

sstables/sstable_set.cc

@@ -21,6 +21,7 @@
 
 #include <boost/icl/interval_map.hpp>
 #include <boost/range/adaptor/map.hpp>
+#include <boost/range/algorithm/remove_if.hpp>
 
 #include "compatible_ring_position.hh"
 #include "compaction_strategy_impl.hh"

sstables/sstables.cc

@@ -57,6 +57,7 @@
 #include <boost/range/algorithm_ext/push_back.hpp>
 #include <boost/range/algorithm/set_algorithm.hpp>
 #include <boost/range/algorithm_ext/is_sorted.hpp>
+#include <boost/range/algorithm/sort.hpp>
 #include <regex>
 #include <seastar/core/align.hh>
 #include "range_tombstone_list.hh"

sstables/time_window_compaction_strategy.cc

@@ -23,6 +23,12 @@
 #include "mutation_writer/timestamp_based_splitting_writer.hh"
 #include "mutation_source_metadata.hh"
 
+#include <boost/range/algorithm/find.hpp>
+#include <boost/range/algorithm/remove_if.hpp>
+#include <boost/range/algorithm/min_element.hpp>
+#include <boost/range/algorithm/partial_sort.hpp>
+#include <boost/range/adaptor/reversed.hpp>
+
 namespace sstables {
 
 time_window_compaction_strategy_options::time_window_compaction_strategy_options(const std::map<sstring, sstring>& options) {

sstables/time_window_compaction_strategy.hh

@@ -48,8 +48,6 @@
 #include "exceptions/exceptions.hh"
 #include "sstables/sstables.hh"
 #include "service/priority_manager.hh"
-#include <boost/range/algorithm/partial_sort.hpp>
-#include <boost/range/adaptors.hpp>
 
 namespace sstables {
 

table.cc

@@ -49,6 +49,8 @@
 #include "gms/gossiper.hh"
 #include "db/config.hh"
 
+#include <boost/range/algorithm/remove_if.hpp>
+
 static logging::logger tlogger("table");
 static seastar::metrics::label column_family_label("cf");
 static seastar::metrics::label keyspace_label("ks");

test/boost/counter_test.cc

@@ -26,6 +26,7 @@
 #include <seastar/core/thread.hh>
 
 #include <boost/range/algorithm/sort.hpp>
+#include <boost/range/algorithm/random_shuffle.hpp>
 
 #include <seastar/testing/test_case.hh>
 #include "test/lib/test_services.hh"

test/boost/flat_mutation_reader_test.cc

@@ -42,6 +42,8 @@
 #include "test/lib/log.hh"
 #include "test/lib/reader_permit.hh"
 
+#include <boost/range/adaptor/map.hpp>
+
 struct mock_consumer {
     struct result {
         size_t _depth;

test/boost/multishard_mutation_query_test.cc

@@ -37,6 +37,8 @@
 
 #include <experimental/source_location>
 
+#include <boost/range/algorithm/sort.hpp>
+
 const sstring KEYSPACE_NAME = "multishard_mutation_query_test";
 
 static uint64_t aggregate_querier_cache_stat(distributed<database>& db, uint64_t query::querier_cache::stats::*stat) {

test/boost/mutation_fragment_test.cc

@@ -38,6 +38,8 @@
 #include "test/lib/reader_permit.hh"
 #include "test/lib/simple_schema.hh"
 
+#include <boost/range/algorithm/transform.hpp>
+
 // A StreamedMutationConsumer which distributes fragments randomly into several mutations.
 class fragment_scatterer {
     std::vector<mutation>& _mutations;

test/boost/mutation_reader_test.cc

@@ -59,6 +59,8 @@
 #include "service/priority_manager.hh"
 #include "utils/ranges.hh"
 
+#include <boost/range/algorithm/sort.hpp>
+
 static schema_ptr make_schema() {
     return schema_builder("ks", "cf")
         .with_column("pk", bytes_type, column_kind::partition_key)

test/boost/mutation_test.cc

@@ -24,6 +24,7 @@
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/range/algorithm_ext/push_back.hpp>
+#include <boost/range/combine.hpp>
 #include "mutation_query.hh"
 #include "hashers.hh"
 #include "xx_hasher.hh"

test/boost/mutation_writer_test.cc

@@ -39,6 +39,8 @@
 #include "test/lib/random_schema.hh"
 #include "test/lib/log.hh"
 
+#include <boost/range/adaptor/map.hpp>
+
 using namespace mutation_writer;
 
 struct generate_error_tag { };

test/boost/partitioner_test.cc

@@ -20,6 +20,7 @@
  */
 
 #include <boost/algorithm/cxx11/all_of.hpp>
+#include <boost/range/combine.hpp>
 #include <seastar/testing/thread_test_case.hh>
 
 #include "dht/i_partitioner.hh"

test/boost/querier_cache_test.cc

@@ -31,6 +31,8 @@
 #include <seastar/testing/thread_test_case.hh>
 #include <seastar/util/closeable.hh>
 
+#include <boost/range/algorithm/sort.hpp>
+
 using namespace std::chrono_literals;
 
 class dummy_result_builder {

test/boost/row_cache_test.cc

@@ -43,6 +43,8 @@
 #include "test/lib/reader_permit.hh"
 #include "test/lib/random_utils.hh"
 
+#include <boost/range/algorithm/min_element.hpp>
+
 using namespace std::chrono_literals;
 
 static schema_ptr make_schema() {

test/boost/sstable_3_x_test.cc

@@ -56,6 +56,8 @@
 #include "test/lib/exception_utils.hh"
 #include "test/lib/reader_permit.hh"
 
+#include <boost/range/algorithm/sort.hpp>
+
 using namespace sstables;
 
 class sstable_assertions final {

test/boost/sstable_mutation_test.cc

@@ -50,6 +50,8 @@
 #include "test/lib/log.hh"
 #include "test/lib/reader_permit.hh"
 
+#include <boost/range/algorithm/sort.hpp>
+
 using namespace sstables;
 using namespace std::chrono_literals;
 

test/boost/sstable_test.cc

@@ -44,6 +44,8 @@
 #include "sstables/sstable_mutation_reader.hh"
 #include "sstables/kl/reader_impl.hh"
 
+#include <boost/range/combine.hpp>
+
 using namespace sstables;
 using row_consumer = sstables::kl::row_consumer;
 using data_consume_rows_context = sstables::kl::data_consume_rows_context;

test/lib/data_model.cc

@@ -22,6 +22,7 @@
 #include "test/lib/data_model.hh"
 
 #include <boost/algorithm/string/join.hpp>
+#include <boost/range/algorithm/sort.hpp>
 
 #include "schema_builder.hh"
 #include "concrete_types.hh"

test/lib/random_schema.cc

@@ -20,6 +20,8 @@
  */
 
 #include <boost/algorithm/string/join.hpp>
+#include <boost/range/algorithm/sort.hpp>
+#include <boost/range/algorithm/unique.hpp>
 
 #include "cql3/cql3_type.hh"
 #include "mutation.hh"

test/lib/sstable_run_based_compaction_strategy_for_tests.hh

@@ -21,7 +21,6 @@
 
 #include <vector>
 #include <map>
-#include <boost/range/numeric.hpp>
 #include "sstables/compaction_strategy_impl.hh"
 #include "sstables/sstable_set.hh"
 #include "sstables/compaction.hh"

test/lib/sstable_utils.cc

@@ -27,6 +27,7 @@
 #include "dht/murmur3_partitioner.hh"
 #include <boost/range/irange.hpp>
 #include <boost/range/adaptor/map.hpp>
+#include <boost/range/algorithm/sort.hpp>
 #include "test/lib/flat_mutation_reader_assertions.hh"
 #include "test/lib/reader_permit.hh"
 #include <seastar/core/reactor.hh>

test/lib/sstable_utils.hh

@@ -28,8 +28,6 @@
 #include "sstables/writer.hh"
 #include "memtable-sstable.hh"
 #include "dht/i_partitioner.hh"
-#include <boost/range/irange.hpp>
-#include <boost/range/adaptor/map.hpp>
 #include "test/lib/test_services.hh"
 #include "test/lib/sstable_test_env.hh"
 #include "test/lib/reader_permit.hh"

test/perf/perf_fast_forward.cc

@@ -26,6 +26,7 @@
 #include <boost/range/irange.hpp>
 #include <boost/range/algorithm_ext.hpp>
 #include <boost/range/adaptors.hpp>
+#include <boost/range/algorithm/sort.hpp>
 #include <json/json.h>
 #include "test/lib/cql_test_env.hh"
 #include "test/lib/reader_permit.hh"

test/perf/perf_sstable.hh

@@ -29,8 +29,10 @@
 #include "mutation_reader.hh"
 #include "test/lib/sstable_utils.hh"
 #include "test/lib/test_services.hh"
-#include <boost/accumulators/accumulators.hpp>
-#include <boost/accumulators/statistics.hpp>
+#include <boost/accumulators/framework/accumulator_set.hpp>
+#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;

transport/request.hh

@@ -21,8 +21,6 @@
 
 #pragma once
 
-#include <boost/locale/encoding_utf.hpp>
-
 #include "server.hh"
 #include "utils/utf8.hh"
 #include "utils/reusable_buffer.hh"

types.cc

@@ -43,6 +43,7 @@
 #include <boost/iterator/transform_iterator.hpp>
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/numeric.hpp>
+#include <boost/range/combine.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/date_time/c_local_time_adjustor.hpp>
 #include <boost/locale/encoding_utf.hpp>

types.hh

@@ -39,10 +39,6 @@
 #include "to_string.hh"
 #include "duration.hh"
 #include "marshal_exception.hh"
-#include <boost/range/adaptor/transformed.hpp>
-#include <boost/range/algorithm/for_each.hpp>
-#include <boost/range/numeric.hpp>
-#include <boost/range/combine.hpp>
 #include <seastar/net/ip.hh>
 #include <seastar/net/inet_address.hh>
 #include <seastar/util/backtrace.hh>

types/tuple.hh

@@ -25,6 +25,10 @@
 #include <vector>
 #include <string>
 
+#include <boost/range/numeric.hpp>
+#include <boost/range/adaptor/transformed.hpp>
+#include <boost/range/algorithm/for_each.hpp>
+
 #include "types.hh"
 
 struct tuple_deserializing_iterator {

utils/crc.hh

@@ -29,6 +29,8 @@
 #include <seastar/net/byteorder.hh>
 #include <seastar/core/byteorder.hh>
 
+#include <boost/range/algorithm/for_each.hpp>
+
 #if defined(__x86_64__) || defined(__i386__)
 #include <smmintrin.h>
 #elif defined(__aarch64__)

utils/fragment_range.hh

@@ -23,7 +23,6 @@
 
 #include <concepts>
 #include <boost/range/algorithm/copy.hpp>
-#include <boost/range/algorithm/for_each.hpp>
 #include <seastar/net/byteorder.hh>
 #include <seastar/core/print.hh>
 #include <seastar/util/backtrace.hh>

utils/loading_shared_values.hh

@@ -29,7 +29,6 @@
 #include <seastar/core/bitops.hh>
 #include <boost/intrusive/unordered_set.hpp>
 #include <boost/iterator/transform_iterator.hpp>
-#include <boost/lambda/bind.hpp>
 #include "seastarx.hh"
 
 namespace bi = boost::intrusive;

utils/log_heap.hh

@@ -23,7 +23,6 @@
 #pragma once
 
 #include <boost/intrusive/list.hpp>
-#include <boost/range/algorithm/max_element.hpp>
 #include <limits>
 #include <seastar/core/bitops.hh>
 #include "seastarx.hh"

utils/reusable_buffer.hh

@@ -27,6 +27,8 @@
 #include "bytes_ostream.hh"
 #include "utils/fragmented_temporary_buffer.hh"
 
+#include <boost/range/algorithm/for_each.hpp>
+
 namespace utils {
 
 /// A reusable buffer, for temporary linearisation of bytes_ostream