From fff7ef1fc27385e0c6b085fdff15e2ca25a269b0 Mon Sep 17 00:00:00 2001
From: Pavel Solodovnikov <pa.solodovnikov@scylladb.com>
Date: Thu, 29 Apr 2021 15:46:44 +0300
Subject: [PATCH] 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                                      | 1 +
 api/storage_service.cc                                      | 1 +
 auth/authenticator.hh                                       | 1 -
 cdc/log.cc                                                  | 1 +
 counters.cc                                                 | 2 ++
 counters.hh                                                 | 2 ++
 cql3/expr/expression.cc                                     | 3 +++
 cql3/functions/functions.hh                                 | 1 -
 cql3/functions/time_uuid_fcts.hh                            | 2 --
 cql3/restrictions/multi_column_restriction.hh               | 1 -
 cql3/restrictions/single_column_primary_key_restrictions.hh | 1 -
 cql3/selection/selection.cc                                 | 1 +
 cql3/statements/batch_statement.cc                          | 4 ++++
 cql3/statements/batch_statement.hh                          | 5 -----
 cql3/statements/raw/batch_statement.hh                      | 5 -----
 database.cc                                                 | 2 ++
 db/size_estimates_virtual_reader.cc                         | 1 +
 db/view/view.cc                                             | 3 +++
 db/view/view_update_checks.hh                               | 2 --
 distributed_loader.cc                                       | 1 +
 gms/endpoint_state.hh                                       | 2 --
 gms/gossiper.cc                                             | 4 ++++
 gms/gossiper.hh                                             | 1 -
 gms/versioned_value.cc                                      | 3 +++
 gms/versioned_value.hh                                      | 2 --
 index/target_parser.hh                                      | 2 --
 init.cc                                                     | 2 ++
 locator/ec2_snitch.cc                                       | 3 +++
 locator/gce_snitch.cc                                       | 3 +++
 locator/gossiping_property_file_snitch.hh                   | 1 -
 locator/production_snitch_base.cc                           | 4 ++++
 main.cc                                                     | 2 ++
 mutation_partition.hh                                       | 1 -
 partition_range_compat.hh                                   | 1 -
 partition_snapshot_reader.hh                                | 1 +
 partition_snapshot_row_cursor.hh                            | 1 +
 query-result-reader.hh                                      | 1 +
 range_tombstone.cc                                          | 2 ++
 range_tombstone.hh                                          | 1 -
 schema.hh                                                   | 1 -
 serializer_impl.hh                                          | 1 -
 service/storage_proxy.cc                                    | 3 +++
 service/storage_service.cc                                  | 3 +++
 sstables/column_translation.hh                              | 1 -
 sstables/compaction_strategy.cc                             | 1 +
 sstables/leveled_compaction_strategy.cc                     | 2 ++
 sstables/leveled_manifest.hh                                | 1 +
 sstables/mx/writer.cc                                       | 2 ++
 sstables/sstable_mutation_reader.cc                         | 2 ++
 sstables/sstable_set.cc                                     | 1 +
 sstables/sstables.cc                                        | 1 +
 sstables/time_window_compaction_strategy.cc                 | 6 ++++++
 sstables/time_window_compaction_strategy.hh                 | 2 --
 table.cc                                                    | 2 ++
 test/boost/counter_test.cc                                  | 1 +
 test/boost/flat_mutation_reader_test.cc                     | 2 ++
 test/boost/multishard_mutation_query_test.cc                | 2 ++
 test/boost/mutation_fragment_test.cc                        | 2 ++
 test/boost/mutation_reader_test.cc                          | 2 ++
 test/boost/mutation_test.cc                                 | 1 +
 test/boost/mutation_writer_test.cc                          | 2 ++
 test/boost/partitioner_test.cc                              | 1 +
 test/boost/querier_cache_test.cc                            | 2 ++
 test/boost/row_cache_test.cc                                | 2 ++
 test/boost/sstable_3_x_test.cc                              | 2 ++
 test/boost/sstable_mutation_test.cc                         | 2 ++
 test/boost/sstable_test.cc                                  | 2 ++
 test/lib/data_model.cc                                      | 1 +
 test/lib/random_schema.cc                                   | 2 ++
 test/lib/sstable_run_based_compaction_strategy_for_tests.hh | 1 -
 test/lib/sstable_utils.cc                                   | 1 +
 test/lib/sstable_utils.hh                                   | 2 --
 test/perf/perf_fast_forward.cc                              | 1 +
 test/perf/perf_sstable.hh                                   | 6 ++++--
 transport/request.hh                                        | 2 --
 types.cc                                                    | 1 +
 types.hh                                                    | 4 ----
 types/tuple.hh                                              | 4 ++++
 utils/crc.hh                                                | 2 ++
 utils/fragment_range.hh                                     | 1 -
 utils/loading_shared_values.hh                              | 1 -
 utils/log_heap.hh                                           | 1 -
 utils/reusable_buffer.hh                                    | 2 ++
 83 files changed, 113 insertions(+), 48 deletions(-)

diff --git a/alternator/executor.cc b/alternator/executor.cc
index 35317001e7..4b1566b65c 100644
--- a/alternator/executor.cc
+++ b/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");
 
diff --git a/api/storage_service.cc b/api/storage_service.cc
index 3b038069c3..5e9ae2e81e 100644
--- a/api/storage_service.cc
+++ b/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"
diff --git a/auth/authenticator.hh b/auth/authenticator.hh
index f2b6c327aa..4a1537d493 100644
--- a/auth/authenticator.hh
+++ b/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>
diff --git a/cdc/log.cc b/cdc/log.cc
index ea9db83f6a..ec23a78307 100644
--- a/cdc/log.cc
+++ b/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>
diff --git a/counters.cc b/counters.cc
index 30d2147e1a..343599f1dc 100644
--- a/counters.cc
+++ b/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();
 }
diff --git a/counters.hh b/counters.hh
index 358191b194..ca81f9899c 100644
--- a/counters.hh
+++ b/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"
diff --git a/cql3/expr/expression.cc b/cql3/expr/expression.cc
index 14374a51a7..2179fb52a6 100644
--- a/cql3/expr/expression.cc
+++ b/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>
 
diff --git a/cql3/functions/functions.hh b/cql3/functions/functions.hh
index be800fe813..b2a4eb2c95 100644
--- a/cql3/functions/functions.hh
+++ b/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 {
 
diff --git a/cql3/functions/time_uuid_fcts.hh b/cql3/functions/time_uuid_fcts.hh
index b1f1de15ad..2021c5e246 100644
--- a/cql3/functions/time_uuid_fcts.hh
+++ b/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 {
 
diff --git a/cql3/restrictions/multi_column_restriction.hh b/cql3/restrictions/multi_column_restriction.hh
index 9c88d4bf84..91bcc5974c 100644
--- a/cql3/restrictions/multi_column_restriction.hh
+++ b/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 {
 
diff --git a/cql3/restrictions/single_column_primary_key_restrictions.hh b/cql3/restrictions/single_column_primary_key_restrictions.hh
index 494b5b3043..76387756d6 100644
--- a/cql3/restrictions/single_column_primary_key_restrictions.hh
+++ b/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>
diff --git a/cql3/selection/selection.cc b/cql3/selection/selection.cc
index 0263b1af41..a88aaf1017 100644
--- a/cql3/selection/selection.cc
+++ b/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"
diff --git a/cql3/statements/batch_statement.cc b/cql3/statements/batch_statement.cc
index 2230249fcb..c8b7b71082 100644
--- a/cql3/statements/batch_statement.cc
+++ b/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 {
diff --git a/cql3/statements/batch_statement.hh b/cql3/statements/batch_statement.hh
index 4b94442d74..1a8e29444b 100644
--- a/cql3/statements/batch_statement.hh
+++ b/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
 
diff --git a/cql3/statements/raw/batch_statement.hh b/cql3/statements/raw/batch_statement.hh
index b42bd91588..0a6568dc35 100644
--- a/cql3/statements/raw/batch_statement.hh
+++ b/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
 
diff --git a/database.cc b/database.cc
index 9638fa50f0..7e84ac685a 100644
--- a/database.cc
+++ b/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>
diff --git a/db/size_estimates_virtual_reader.cc b/db/size_estimates_virtual_reader.cc
index aa73548630..fbbb92e851 100644
--- a/db/size_estimates_virtual_reader.cc
+++ b/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"
diff --git a/db/view/view.cc b/db/view/view.cc
index 3db6e3dd2f..841b96f7d1 100644
--- a/db/view/view.cc
+++ b/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>
 
diff --git a/db/view/view_update_checks.hh b/db/view/view_update_checks.hh
index cc77d76d04..38dd7e6a6c 100644
--- a/db/view/view_update_checks.hh
+++ b/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;
diff --git a/distributed_loader.cc b/distributed_loader.cc
index 61ff5f1590..0e22297aa1 100644
--- a/distributed_loader.cc
+++ b/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;
diff --git a/gms/endpoint_state.hh b/gms/endpoint_state.hh
index 51c9efc522..fb34838bdd 100644
--- a/gms/endpoint_state.hh
+++ b/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>
 
diff --git a/gms/gossiper.cc b/gms/gossiper.cc
index 6d482c8f04..54b954dc98 100644
--- a/gms/gossiper.cc
+++ b/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"
 
diff --git a/gms/gossiper.hh b/gms/gossiper.hh
index 50adb12997..6eaf09fc7f 100644
--- a/gms/gossiper.hh
+++ b/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>
diff --git a/gms/versioned_value.cc b/gms/versioned_value.cc
index 00d7509f0f..d3f0c41690 100644
--- a/gms/versioned_value.cc
+++ b/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>);
diff --git a/gms/versioned_value.hh b/gms/versioned_value.hh
index 39542605fd..d128531931 100644
--- a/gms/versioned_value.hh
+++ b/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 {
 
diff --git a/index/target_parser.hh b/index/target_parser.hh
index 9ac2fcb0c8..476096e829 100644
--- a/index/target_parser.hh
+++ b/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 {
diff --git a/init.cc b/init.cc
index ce822efcb5..2e04ec96a7 100644
--- a/init.cc
+++ b/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
diff --git a/locator/ec2_snitch.cc b/locator/ec2_snitch.cc
index 8c5d0fb4f5..1c89ff520f 100644
--- a/locator/ec2_snitch.cc
+++ b/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) {
diff --git a/locator/gce_snitch.cc b/locator/gce_snitch.cc
index c07c444f92..aee7e7ef00 100644
--- a/locator/gce_snitch.cc
+++ b/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) {
diff --git a/locator/gossiping_property_file_snitch.hh b/locator/gossiping_property_file_snitch.hh
index 98df67e898..9337777d16 100644
--- a/locator/gossiping_property_file_snitch.hh
+++ b/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"
diff --git a/locator/production_snitch_base.cc b/locator/production_snitch_base.cc
index 5963e4f74e..15b2d27d19 100644
--- a/locator/production_snitch_base.cc
+++ b/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)
diff --git a/main.cc b/main.cc
index 52c18735ff..5c2ecead65 100644
--- a/main.cc
+++ b/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;
diff --git a/mutation_partition.hh b/mutation_partition.hh
index 9f3f78172c..c64402dafa 100644
--- a/mutation_partition.hh
+++ b/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>
 
diff --git a/partition_range_compat.hh b/partition_range_compat.hh
index 49f629dde9..992a86b6d5 100644
--- a/partition_range_compat.hh
+++ b/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"
diff --git a/partition_snapshot_reader.hh b/partition_snapshot_reader.hh
index 801b561630..d44516104b 100644
--- a/partition_snapshot_reader.hh
+++ b/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) {}
diff --git a/partition_snapshot_row_cursor.hh b/partition_snapshot_row_cursor.hh
index 9618aaeb02..a400c427cd 100644
--- a/partition_snapshot_row_cursor.hh
+++ b/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;
 
diff --git a/query-result-reader.hh b/query-result-reader.hh
index 73c1c67918..c03b37e682 100644
--- a/query-result-reader.hh
+++ b/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"
diff --git a/range_tombstone.cc b/range_tombstone.cc
index bdb2310b62..ba2ce19155 100644
--- a/range_tombstone.cc
+++ b/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 << "}";
diff --git a/range_tombstone.hh b/range_tombstone.hh
index 4c78ceba18..d2d03f6e66 100644
--- a/range_tombstone.hh
+++ b/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"
diff --git a/schema.hh b/schema.hh
index 355f130c69..0d7865f98a 100644
--- a/schema.hh
+++ b/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>
 
diff --git a/serializer_impl.hh b/serializer_impl.hh
index 35e26633d9..9e0af0ef11 100644
--- a/serializer_impl.hh
+++ b/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>
diff --git a/service/storage_proxy.cc b/service/storage_proxy.cc
index 0ed7362054..6b1b409166 100644
--- a/service/storage_proxy.cc
+++ b/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"
diff --git a/service/storage_service.cc b/service/storage_service.cc
index 7c12ab2e27..608dd315c6 100644
--- a/service/storage_service.cc
+++ b/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;
diff --git a/sstables/column_translation.hh b/sstables/column_translation.hh
index 39fbe22aec..686b7730e1 100644
--- a/sstables/column_translation.hh
+++ b/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"
diff --git a/sstables/compaction_strategy.cc b/sstables/compaction_strategy.cc
index e8102cba53..1503ddc88d 100644
--- a/sstables/compaction_strategy.cc
+++ b/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"
diff --git a/sstables/leveled_compaction_strategy.cc b/sstables/leveled_compaction_strategy.cc
index af31f5e649..4d59e95c5f 100644
--- a/sstables/leveled_compaction_strategy.cc
+++ b/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) {
diff --git a/sstables/leveled_manifest.hh b/sstables/leveled_manifest.hh
index c5e80ca8ef..efee4ca097 100644
--- a/sstables/leveled_manifest.hh
+++ b/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"
 
diff --git a/sstables/mx/writer.cc b/sstables/mx/writer.cc
index d5b6007d15..e8cfee06f7 100644
--- a/sstables/mx/writer.cc
+++ b/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");
 
diff --git a/sstables/sstable_mutation_reader.cc b/sstables/sstable_mutation_reader.cc
index e120b61ed8..055586366f 100644
--- a/sstables/sstable_mutation_reader.cc
+++ b/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) {
diff --git a/sstables/sstable_set.cc b/sstables/sstable_set.cc
index d5383ac965..1f17dde829 100644
--- a/sstables/sstable_set.cc
+++ b/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"
diff --git a/sstables/sstables.cc b/sstables/sstables.cc
index be83e88600..88cf9826ac 100644
--- a/sstables/sstables.cc
+++ b/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"
diff --git a/sstables/time_window_compaction_strategy.cc b/sstables/time_window_compaction_strategy.cc
index 0b020918f3..1263e6234f 100644
--- a/sstables/time_window_compaction_strategy.cc
+++ b/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) {
diff --git a/sstables/time_window_compaction_strategy.hh b/sstables/time_window_compaction_strategy.hh
index 463f6eecf0..342e6893b4 100644
--- a/sstables/time_window_compaction_strategy.hh
+++ b/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 {
 
diff --git a/table.cc b/table.cc
index 7fa98934ef..51a951a4fd 100644
--- a/table.cc
+++ b/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");
diff --git a/test/boost/counter_test.cc b/test/boost/counter_test.cc
index 389eaac100..f3c39bc071 100644
--- a/test/boost/counter_test.cc
+++ b/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"
diff --git a/test/boost/flat_mutation_reader_test.cc b/test/boost/flat_mutation_reader_test.cc
index e3e84a14af..b8fa2c0cd2 100644
--- a/test/boost/flat_mutation_reader_test.cc
+++ b/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;
diff --git a/test/boost/multishard_mutation_query_test.cc b/test/boost/multishard_mutation_query_test.cc
index 1571ff031b..45c8be4ff1 100644
--- a/test/boost/multishard_mutation_query_test.cc
+++ b/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) {
diff --git a/test/boost/mutation_fragment_test.cc b/test/boost/mutation_fragment_test.cc
index a68fe1bb17..b801b0f906 100644
--- a/test/boost/mutation_fragment_test.cc
+++ b/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;
diff --git a/test/boost/mutation_reader_test.cc b/test/boost/mutation_reader_test.cc
index a6958361e3..4a2ffd502a 100644
--- a/test/boost/mutation_reader_test.cc
+++ b/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)
diff --git a/test/boost/mutation_test.cc b/test/boost/mutation_test.cc
index 4cc2658941..f1c1685bbd 100644
--- a/test/boost/mutation_test.cc
+++ b/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"
diff --git a/test/boost/mutation_writer_test.cc b/test/boost/mutation_writer_test.cc
index 2191c24469..53717db746 100644
--- a/test/boost/mutation_writer_test.cc
+++ b/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 { };
diff --git a/test/boost/partitioner_test.cc b/test/boost/partitioner_test.cc
index b6558a9c3d..d90c569cb9 100644
--- a/test/boost/partitioner_test.cc
+++ b/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"
diff --git a/test/boost/querier_cache_test.cc b/test/boost/querier_cache_test.cc
index 531c0b5ab2..d33f41626f 100644
--- a/test/boost/querier_cache_test.cc
+++ b/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 {
diff --git a/test/boost/row_cache_test.cc b/test/boost/row_cache_test.cc
index d1b0fbd61f..567f0682ac 100644
--- a/test/boost/row_cache_test.cc
+++ b/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() {
diff --git a/test/boost/sstable_3_x_test.cc b/test/boost/sstable_3_x_test.cc
index bf694f26eb..9e22c99dbf 100644
--- a/test/boost/sstable_3_x_test.cc
+++ b/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 {
diff --git a/test/boost/sstable_mutation_test.cc b/test/boost/sstable_mutation_test.cc
index e85ac74b42..c2d4830fe4 100644
--- a/test/boost/sstable_mutation_test.cc
+++ b/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;
 
diff --git a/test/boost/sstable_test.cc b/test/boost/sstable_test.cc
index 431771b6da..55f32902c6 100644
--- a/test/boost/sstable_test.cc
+++ b/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;
diff --git a/test/lib/data_model.cc b/test/lib/data_model.cc
index 8e04ca4093..d8660082fa 100644
--- a/test/lib/data_model.cc
+++ b/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"
diff --git a/test/lib/random_schema.cc b/test/lib/random_schema.cc
index 225268308f..d783626be8 100644
--- a/test/lib/random_schema.cc
+++ b/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"
diff --git a/test/lib/sstable_run_based_compaction_strategy_for_tests.hh b/test/lib/sstable_run_based_compaction_strategy_for_tests.hh
index b50b299817..4f3918b2a7 100644
--- a/test/lib/sstable_run_based_compaction_strategy_for_tests.hh
+++ b/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"
diff --git a/test/lib/sstable_utils.cc b/test/lib/sstable_utils.cc
index bb59eabb7b..4b743dbb10 100644
--- a/test/lib/sstable_utils.cc
+++ b/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>
diff --git a/test/lib/sstable_utils.hh b/test/lib/sstable_utils.hh
index a59eb59c5e..7719d111dc 100644
--- a/test/lib/sstable_utils.hh
+++ b/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"
diff --git a/test/perf/perf_fast_forward.cc b/test/perf/perf_fast_forward.cc
index 4eff14f3ef..9ce62232a1 100644
--- a/test/perf/perf_fast_forward.cc
+++ b/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"
diff --git a/test/perf/perf_sstable.hh b/test/perf/perf_sstable.hh
index 24e2c4cdf3..d9928fbf71 100644
--- a/test/perf/perf_sstable.hh
+++ b/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;
diff --git a/transport/request.hh b/transport/request.hh
index 7d9ea04a78..3382fd7aaa 100644
--- a/transport/request.hh
+++ b/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"
diff --git a/types.cc b/types.cc
index 85ee94a4f7..a1b0cce4b7 100644
--- a/types.cc
+++ b/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>
diff --git a/types.hh b/types.hh
index 5770b78582..18ed959e3e 100644
--- a/types.hh
+++ b/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>
diff --git a/types/tuple.hh b/types/tuple.hh
index 777dbe4055..b98d8b1e76 100644
--- a/types/tuple.hh
+++ b/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 {
diff --git a/utils/crc.hh b/utils/crc.hh
index 728a80f2b5..5a18edecba 100644
--- a/utils/crc.hh
+++ b/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__)
diff --git a/utils/fragment_range.hh b/utils/fragment_range.hh
index cbf19a3d08..a9c779587a 100644
--- a/utils/fragment_range.hh
+++ b/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>
diff --git a/utils/loading_shared_values.hh b/utils/loading_shared_values.hh
index 3c1b8c84fb..ca3ac9f7bf 100644
--- a/utils/loading_shared_values.hh
+++ b/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;
diff --git a/utils/log_heap.hh b/utils/log_heap.hh
index 8b3078b478..7409820ad1 100644
--- a/utils/log_heap.hh
+++ b/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"
diff --git a/utils/reusable_buffer.hh b/utils/reusable_buffer.hh
index a584c36bf4..d0dac2c9a8 100644
--- a/utils/reusable_buffer.hh
+++ b/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