From e0284bb9eef201c43aa5a351ecbb0a629dfe216e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Botond=20D=C3=A9nes?= <bdenes@scylladb.com>
Date: Tue, 10 Mar 2020 18:08:51 +0200
Subject: [PATCH] treewide: add missing headers and/or forward declarations

---
 alternator/rmw_operation.hh                                  | 3 +++
 alternator/tags_extension.hh                                 | 1 +
 backlog_controller.hh                                        | 4 ++++
 cartesian_product.hh                                         | 3 +++
 cdc/split.hh                                                 | 2 ++
 checked-file-impl.hh                                         | 3 +++
 column_computation.hh                                        | 2 ++
 combine.hh                                                   | 2 ++
 cql3/functions/native_aggregate_function.hh                  | 1 +
 cql3/functions/scalar_function.hh                            | 1 +
 cql3/statements/cas_request.hh                               | 1 +
 cql3/statements/cf_properties.hh                             | 1 +
 cql3/statements/request_validations.hh                       | 2 ++
 cql_serialization_format.hh                                  | 3 ++-
 db/commitlog/commitlog_replayer.hh                           | 2 ++
 db/commitlog/replay_position.hh                              | 1 +
 db/consistency_level_validations.hh                          | 3 +++
 db/cql_type_parser.hh                                        | 4 ++++
 db/legacy_schema_migrator.hh                                 | 3 +++
 db/size_estimates_virtual_reader.hh                          | 1 +
 db/system_keyspace_view_types.hh                             | 1 +
 db/view/view_builder.hh                                      | 2 +-
 db/write_type.hh                                             | 1 +
 dht/token_range_endpoints.hh                                 | 3 +++
 digest_algorithm.hh                                          | 2 ++
 gms/failure_detector.hh                                      | 3 ++-
 gms/feature.hh                                               | 2 ++
 gms/feature_service.hh                                       | 5 +++--
 imr/methods.hh                                               | 2 ++
 marshal_exception.hh                                         | 3 +++
 memtable-sstable.hh                                          | 5 ++++-
 noexcept_traits.hh                                           | 2 ++
 redis/exceptions.hh                                          | 4 ++++
 repair/row_level.hh                                          | 1 +
 serializer.hh                                                | 1 +
 service/cache_hitrate_calculator.hh                          | 1 +
 service/migration_listener.hh                                | 2 ++
 service/pager/query_pager.hh                                 | 1 +
 sstables/component_type.hh                                   | 2 ++
 sstables/downsampling.hh                                     | 1 +
 sstables/exceptions.hh                                       | 2 ++
 sstables/filter.hh                                           | 2 ++
 sstables/hyperloglog.hh                                      | 4 ++++
 sstables/random_access_reader.hh                             | 2 ++
 sstables/remove.hh                                           | 4 ++++
 sstables/stats.hh                                            | 2 ++
 streaming/stream_mutation_fragments_cmd.hh                   | 2 ++
 streaming/stream_reason.hh                                   | 2 ++
 .../boost/sstable_run_based_compaction_strategy_for_tests.hh | 1 +
 test/lib/eventually.hh                                       | 2 ++
 test/lib/index_reader_assertions.hh                          | 2 ++
 test/lib/random_utils.hh                                     | 2 ++
 test/lib/reader_lifecycle_policy.hh                          | 2 ++
 thrift/utils.hh                                              | 2 ++
 to_string.hh                                                 | 1 +
 transport/messages/result_message_base.hh                    | 5 +++++
 utils/bounded_stats_deque.hh                                 | 4 ++--
 utils/class_registrator.hh                                   | 3 +++
 utils/config_file.hh                                         | 1 +
 utils/coroutine.hh                                           | 2 ++
 utils/directories.hh                                         | 4 ++++
 utils/estimated_histogram.hh                                 | 4 ++++
 utils/exponential_backoff_retry.hh                           | 2 ++
 utils/flush_queue.hh                                         | 2 ++
 utils/int_range.hh                                           | 2 ++
 utils/joinpoint.hh                                           | 3 +++
 utils/memory_data_sink.hh                                    | 3 +++
 utils/meta.hh                                                | 5 +++++
 utils/mutable_view.hh                                        | 2 ++
 utils/preempt.hh                                             | 2 ++
 utils/sequenced_set.hh                                       | 5 +++++
 71 files changed, 160 insertions(+), 8 deletions(-)

diff --git a/alternator/rmw_operation.hh b/alternator/rmw_operation.hh
index 4f98469959..abe2187f2b 100644
--- a/alternator/rmw_operation.hh
+++ b/alternator/rmw_operation.hh
@@ -23,6 +23,9 @@
 
 #include <seastarx.hh>
 #include <service/storage_proxy.hh>
+#include <service/storage_proxy.hh>
+#include "rjson.hh"
+#include "executor.hh"
 
 namespace alternator {
 
diff --git a/alternator/tags_extension.hh b/alternator/tags_extension.hh
index 6185827f39..fd1258e978 100644
--- a/alternator/tags_extension.hh
+++ b/alternator/tags_extension.hh
@@ -22,6 +22,7 @@
 #pragma once
 
 #include "serializer.hh"
+#include "schema.hh"
 #include "db/extensions.hh"
 
 namespace alternator {
diff --git a/backlog_controller.hh b/backlog_controller.hh
index 2423d949d4..e420177cd1 100644
--- a/backlog_controller.hh
+++ b/backlog_controller.hh
@@ -23,7 +23,11 @@
 #include <seastar/core/scheduling.hh>
 #include <seastar/core/timer.hh>
 #include <seastar/core/gate.hh>
+#include <seastar/core/file.hh>
 #include <chrono>
+#include <cmath>
+
+#include "seastarx.hh"
 
 // Simple proportional controller to adjust shares for processes for which a backlog can be clearly
 // defined.
diff --git a/cartesian_product.hh b/cartesian_product.hh
index b0e4357417..a2c13a81fb 100644
--- a/cartesian_product.hh
+++ b/cartesian_product.hh
@@ -22,6 +22,9 @@
 
 #pragma once
 
+#include <vector>
+#include <sys/types.h>
+
 // Single-pass range over cartesian product of vectors.
 
 // Note:
diff --git a/cdc/split.hh b/cdc/split.hh
index 77382ac161..a555646d8d 100644
--- a/cdc/split.hh
+++ b/cdc/split.hh
@@ -23,6 +23,8 @@
 
 #include <vector>
 #include "schema_fwd.hh"
+#include "timestamp.hh"
+#include "bytes.hh"
 #include <seastar/util/noncopyable_function.hh>
 
 class mutation;
diff --git a/checked-file-impl.hh b/checked-file-impl.hh
index 413313ebec..6cb3900334 100644
--- a/checked-file-impl.hh
+++ b/checked-file-impl.hh
@@ -22,8 +22,11 @@
 #pragma once
 
 #include "seastar/core/file.hh"
+#include "seastar/core/reactor.hh"
 #include "utils/disk-error-handler.hh"
 
+#include "seastarx.hh"
+
 class checked_file_impl : public file_impl {
 public:
 
diff --git a/column_computation.hh b/column_computation.hh
index 8fc53042dd..1a52e9cca4 100644
--- a/column_computation.hh
+++ b/column_computation.hh
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include <json/json.h>
+
 #include "bytes.hh"
 
 class schema;
diff --git a/combine.hh b/combine.hh
index 2b08f48eda..08b4034ee2 100644
--- a/combine.hh
+++ b/combine.hh
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include <algorithm>
+
 // combine two sorted uniqued sequences into a single sorted sequence
 // unique elements are copied, duplicate elements are merged with a
 // binary function.
diff --git a/cql3/functions/native_aggregate_function.hh b/cql3/functions/native_aggregate_function.hh
index f4880bd8ed..bb92377972 100644
--- a/cql3/functions/native_aggregate_function.hh
+++ b/cql3/functions/native_aggregate_function.hh
@@ -43,6 +43,7 @@
 
 #include "types.hh"
 #include "native_function.hh"
+#include "aggregate_function.hh"
 #include <seastar/core/shared_ptr.hh>
 
 namespace cql3 {
diff --git a/cql3/functions/scalar_function.hh b/cql3/functions/scalar_function.hh
index 5184220201..7e5efdc786 100644
--- a/cql3/functions/scalar_function.hh
+++ b/cql3/functions/scalar_function.hh
@@ -42,6 +42,7 @@
 #pragma once
 
 #include "bytes.hh"
+#include "function.hh"
 #include <vector>
 
 namespace cql3 {
diff --git a/cql3/statements/cas_request.hh b/cql3/statements/cas_request.hh
index 5384fbc8c8..1ca71a20d6 100644
--- a/cql3/statements/cas_request.hh
+++ b/cql3/statements/cas_request.hh
@@ -39,6 +39,7 @@
  */
 #pragma once
 #include "service/storage_proxy.hh"
+#include "cql3/statements/modification_statement.hh"
 
 namespace cql3::statements {
 
diff --git a/cql3/statements/cf_properties.hh b/cql3/statements/cf_properties.hh
index 6d52fe855c..fe3c3b98b4 100644
--- a/cql3/statements/cf_properties.hh
+++ b/cql3/statements/cf_properties.hh
@@ -40,6 +40,7 @@
 #pragma once
 
 #include "cql3/statements/cf_prop_defs.hh"
+#include "cql3/column_identifier.hh"
 
 namespace cql3 {
 
diff --git a/cql3/statements/request_validations.hh b/cql3/statements/request_validations.hh
index 4e6beba971..e5d83b8cfc 100644
--- a/cql3/statements/request_validations.hh
+++ b/cql3/statements/request_validations.hh
@@ -45,6 +45,8 @@
 
 #include <boost/range/algorithm/count_if.hpp>
 
+#include <set>
+
 namespace cql3 {
 namespace statements {
 
diff --git a/cql_serialization_format.hh b/cql_serialization_format.hh
index c2d69bdc58..2337a0a6d9 100644
--- a/cql_serialization_format.hh
+++ b/cql_serialization_format.hh
@@ -21,7 +21,8 @@
 
 #pragma once
 
-#include <iosfwd>
+#include <iostream>
+#include <cstdint>
 
 using cql_protocol_version_type = uint8_t;
 
diff --git a/db/commitlog/commitlog_replayer.hh b/db/commitlog/commitlog_replayer.hh
index 25207add89..839faa772a 100644
--- a/db/commitlog/commitlog_replayer.hh
+++ b/db/commitlog/commitlog_replayer.hh
@@ -45,6 +45,8 @@
 #include <seastar/core/future.hh>
 #include <seastar/core/sharded.hh>
 
+#include "seastarx.hh"
+
 class database;
 
 namespace db {
diff --git a/db/commitlog/replay_position.hh b/db/commitlog/replay_position.hh
index 681701ccdd..0e8975adca 100644
--- a/db/commitlog/replay_position.hh
+++ b/db/commitlog/replay_position.hh
@@ -41,6 +41,7 @@
 #pragma once
 
 #include <stdint.h>
+#include <seastar/core/shared_ptr.hh>
 #include "utils/UUID.hh"
 #include "utils/hash.hh"
 #include "sstables/version.hh"
diff --git a/db/consistency_level_validations.hh b/db/consistency_level_validations.hh
index a02a17167f..7bff2db62d 100644
--- a/db/consistency_level_validations.hh
+++ b/db/consistency_level_validations.hh
@@ -41,8 +41,11 @@
 
 #pragma once
 
+#include <seastar/core/sstring.hh>
 #include "consistency_level_type.hh"
 
+#include "seastarx.hh"
+
 class schema;
 
 namespace db {
diff --git a/db/cql_type_parser.hh b/db/cql_type_parser.hh
index 9af6fec808..644d656e75 100644
--- a/db/cql_type_parser.hh
+++ b/db/cql_type_parser.hh
@@ -46,7 +46,11 @@
 
 #include "types.hh"
 
+#include "seastarx.hh"
+
 class user_types_metadata;
+class types_metadata;
+class keyspace_metadata;
 
 namespace db {
 namespace cql_type_parser {
diff --git a/db/legacy_schema_migrator.hh b/db/legacy_schema_migrator.hh
index a76920e99a..876b5b01f5 100644
--- a/db/legacy_schema_migrator.hh
+++ b/db/legacy_schema_migrator.hh
@@ -41,6 +41,9 @@
 #pragma once
 
 #include <seastar/core/future.hh>
+#include <seastar/core/sharded.hh>
+
+#include "seastarx.hh"
 
 class database;
 
diff --git a/db/size_estimates_virtual_reader.hh b/db/size_estimates_virtual_reader.hh
index 6d68c7c9e2..d1a12cd4e7 100644
--- a/db/size_estimates_virtual_reader.hh
+++ b/db/size_estimates_virtual_reader.hh
@@ -22,6 +22,7 @@
  */
 
 #include "mutation_reader.hh"
+#include "db/system_keyspace.hh"
 
 namespace db {
 
diff --git a/db/system_keyspace_view_types.hh b/db/system_keyspace_view_types.hh
index 60e7fde4dd..aa58c7d4a4 100644
--- a/db/system_keyspace_view_types.hh
+++ b/db/system_keyspace_view_types.hh
@@ -25,6 +25,7 @@
 #include <seastar/core/sstring.hh>
 #include <utility>
 #include <optional>
+#include "dht/token.hh"
 #include "seastarx.hh"
 
 namespace dht {
diff --git a/db/view/view_builder.hh b/db/view/view_builder.hh
index 041d2c964c..449ccfb66f 100644
--- a/db/view/view_builder.hh
+++ b/db/view/view_builder.hh
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "database_fwd.hh"
+#include "database.hh"
 #include "db/system_distributed_keyspace.hh"
 #include "dht/i_partitioner.hh"
 #include "keys.hh"
diff --git a/db/write_type.hh b/db/write_type.hh
index 6c343b2320..79f0ea9278 100644
--- a/db/write_type.hh
+++ b/db/write_type.hh
@@ -42,6 +42,7 @@
 
 #include <assert.h>
 #include <cstdint>
+#include <iosfwd>
 
 namespace db {
 
diff --git a/dht/token_range_endpoints.hh b/dht/token_range_endpoints.hh
index acc1bc2edf..ad1a0c5673 100644
--- a/dht/token_range_endpoints.hh
+++ b/dht/token_range_endpoints.hh
@@ -21,6 +21,9 @@
 
 #pragma once
 #include <vector>
+#include <seastar/core/sstring.hh>
+
+#include "seastarx.hh"
 
 namespace dht {
 struct endpoint_details {
diff --git a/digest_algorithm.hh b/digest_algorithm.hh
index ae52eb6a59..bc3da28209 100644
--- a/digest_algorithm.hh
+++ b/digest_algorithm.hh
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 namespace query {
 
 enum class digest_algorithm : uint8_t {
diff --git a/gms/failure_detector.hh b/gms/failure_detector.hh
index b55c8b27a4..32ed92bf58 100644
--- a/gms/failure_detector.hh
+++ b/gms/failure_detector.hh
@@ -48,9 +48,10 @@
 #include <map>
 #include <optional>
 
+#include "gms/inet_address.hh"
+
 
 namespace gms {
-class inet_address;
 class i_failure_detection_event_listener;
 class endpoint_state;
 
diff --git a/gms/feature.hh b/gms/feature.hh
index ca16aef2a8..414d6998b0 100644
--- a/gms/feature.hh
+++ b/gms/feature.hh
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include <any>
+
 #include <boost/signals2.hpp>
 #include <boost/signals2/dummy_mutex.hpp>
 
diff --git a/gms/feature_service.hh b/gms/feature_service.hh
index 9ff79332dd..6731a277c9 100644
--- a/gms/feature_service.hh
+++ b/gms/feature_service.hh
@@ -26,16 +26,17 @@
 #include <seastar/core/shared_future.hh>
 #include <unordered_map>
 #include <functional>
+#include <set>
+#include <any>
 #include "seastarx.hh"
 #include "db/schema_features.hh"
+#include "gms/feature.hh"
 
 namespace db { class config; }
 namespace service { class storage_service; }
 
 namespace gms {
 
-class feature;
-
 struct feature_config {
     bool enable_sstables_mc_format = false;
     bool enable_user_defined_functions = false;
diff --git a/imr/methods.hh b/imr/methods.hh
index f1d52dfbbf..297852000d 100644
--- a/imr/methods.hh
+++ b/imr/methods.hh
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include "compound.hh"
+
 namespace imr {
 namespace methods {
 
diff --git a/marshal_exception.hh b/marshal_exception.hh
index fbe8410415..244fffa4f3 100644
--- a/marshal_exception.hh
+++ b/marshal_exception.hh
@@ -22,6 +22,9 @@
 #pragma once
 
 #include <stdexcept>
+#include <seastar/core/sstring.hh>
+
+#include "seastarx.hh"
 
 class marshal_exception : public std::exception {
     sstring _why;
diff --git a/memtable-sstable.hh b/memtable-sstable.hh
index a22e0d9941..9346d80f6d 100644
--- a/memtable-sstable.hh
+++ b/memtable-sstable.hh
@@ -33,7 +33,10 @@
 #include <seastar/core/thread.hh>
 #include <seastar/core/shared_ptr.hh>
 
-namespace sstables { class sstables_manager; }
+namespace sstables {
+class sstables_manager;
+class sstable_writer_config;
+}
 
 future<>
 write_memtable_to_sstable(memtable& mt,
diff --git a/noexcept_traits.hh b/noexcept_traits.hh
index 15ebcbf7c7..7888356ef6 100644
--- a/noexcept_traits.hh
+++ b/noexcept_traits.hh
@@ -23,6 +23,8 @@
 #include <memory>
 #include <seastar/core/future.hh>
 
+#include "seastarx.hh"
+
 #pragma once
 
 //
diff --git a/redis/exceptions.hh b/redis/exceptions.hh
index 7e20036971..1632b42f87 100644
--- a/redis/exceptions.hh
+++ b/redis/exceptions.hh
@@ -24,6 +24,10 @@
 #include <stdexcept>
 #include <seastar/core/print.hh>
 
+#include "bytes.hh"
+
+#include "seastarx.hh"
+
 class redis_exception : public std::exception {
     sstring _message;
 public:
diff --git a/repair/row_level.hh b/repair/row_level.hh
index 6e3efbb00a..c80904d066 100644
--- a/repair/row_level.hh
+++ b/repair/row_level.hh
@@ -24,6 +24,7 @@
 #include <vector>
 #include "gms/inet_address.hh"
 #include "db/system_distributed_keyspace.hh"
+#include "repair/repair.hh"
 #include <seastar/core/distributed.hh>
 
 class row_level_repair_gossip_helper;
diff --git a/serializer.hh b/serializer.hh
index d31260562b..9fc8576e94 100644
--- a/serializer.hh
+++ b/serializer.hh
@@ -39,6 +39,7 @@
 #include <variant>
 
 #include <boost/range/algorithm/for_each.hpp>
+#include <boost/type.hpp>
 
 namespace ser {
 
diff --git a/service/cache_hitrate_calculator.hh b/service/cache_hitrate_calculator.hh
index c271fd4499..ff5b4f1882 100644
--- a/service/cache_hitrate_calculator.hh
+++ b/service/cache_hitrate_calculator.hh
@@ -22,6 +22,7 @@
 #pragma  once
 
 #include "database_fwd.hh"
+#include "utils/UUID.hh"
 #include <seastar/core/timer.hh>
 #include <seastar/core/sharded.hh>
 
diff --git a/service/migration_listener.hh b/service/migration_listener.hh
index 4dcc358547..534ff9a52c 100644
--- a/service/migration_listener.hh
+++ b/service/migration_listener.hh
@@ -57,6 +57,8 @@ using schema_ptr = seastar::lw_shared_ptr<const schema>;
 
 #include "timestamp.hh"
 
+#include "seastarx.hh"
+
 class mutation;
 class schema;
 
diff --git a/service/pager/query_pager.hh b/service/pager/query_pager.hh
index 33617a56ff..bc083c6c8d 100644
--- a/service/pager/query_pager.hh
+++ b/service/pager/query_pager.hh
@@ -45,6 +45,7 @@
 #include "cql3/result_set.hh"
 #include "cql3/selection/selection.hh"
 #include "service/storage_proxy.hh"
+#include "service/query_state.hh"
 
 namespace service {
 
diff --git a/sstables/component_type.hh b/sstables/component_type.hh
index 6bee06b7c9..5af1801895 100644
--- a/sstables/component_type.hh
+++ b/sstables/component_type.hh
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <iosfwd>
+
 namespace sstables {
 
 enum class component_type {
diff --git a/sstables/downsampling.hh b/sstables/downsampling.hh
index cd265041c7..61e6d27356 100644
--- a/sstables/downsampling.hh
+++ b/sstables/downsampling.hh
@@ -47,6 +47,7 @@
 #include <vector>
 #include <algorithm>
 #include <iterator>
+#include <cassert>
 
 namespace sstables {
 
diff --git a/sstables/exceptions.hh b/sstables/exceptions.hh
index 27bbc56900..f1186d6bde 100644
--- a/sstables/exceptions.hh
+++ b/sstables/exceptions.hh
@@ -24,6 +24,8 @@
 
 #include <seastar/core/print.hh>
 
+#include "seastarx.hh"
+
 namespace sstables {
 class malformed_sstable_exception : public std::exception {
     sstring _msg;
diff --git a/sstables/filter.hh b/sstables/filter.hh
index 22ecc65ce9..8fad265776 100644
--- a/sstables/filter.hh
+++ b/sstables/filter.hh
@@ -22,6 +22,8 @@
  */
 #pragma once
 
+#include <cstdint>
+
 namespace sstables {
 class sstable;
 }
diff --git a/sstables/hyperloglog.hh b/sstables/hyperloglog.hh
index 2488f40957..1f175beed8 100644
--- a/sstables/hyperloglog.hh
+++ b/sstables/hyperloglog.hh
@@ -63,6 +63,10 @@
 #include <stdexcept>
 #include <algorithm>
 #include <seastar/core/byteorder.hh>
+#include <seastar/core/temporary_buffer.hh>
+
+#include "seastarx.hh"
+
 #if 0
 #include "murmur3.h"
 #endif
diff --git a/sstables/random_access_reader.hh b/sstables/random_access_reader.hh
index f6b17a7188..12a8f3f835 100644
--- a/sstables/random_access_reader.hh
+++ b/sstables/random_access_reader.hh
@@ -26,8 +26,10 @@
 #include <seastar/core/gate.hh>
 #include <seastar/core/iostream.hh>
 #include <seastar/core/temporary_buffer.hh>
+#include <seastar/core/temporary_buffer.hh>
 
 #include "utils/disk-error-handler.hh"
+#include "log.hh"
 
 namespace sstables {
 
diff --git a/sstables/remove.hh b/sstables/remove.hh
index 9ed9aa7833..403afe6524 100644
--- a/sstables/remove.hh
+++ b/sstables/remove.hh
@@ -25,6 +25,10 @@
 #include <seastar/core/sstring.hh>
 #include <seastar/core/future.hh>
 
+#include "utils/disk-error-handler.hh"
+
+#include "seastarx.hh"
+
 namespace sstables {
 
 future<> remove_by_toc_name(sstring sstable_toc_name, const io_error_handler& error_handler = sstable_write_error_handler);
diff --git a/sstables/stats.hh b/sstables/stats.hh
index f5e8cb671c..d7f1845ea1 100644
--- a/sstables/stats.hh
+++ b/sstables/stats.hh
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 namespace sstables {
 
 class sstables_stats {
diff --git a/streaming/stream_mutation_fragments_cmd.hh b/streaming/stream_mutation_fragments_cmd.hh
index e86f11b46e..c8614458d4 100644
--- a/streaming/stream_mutation_fragments_cmd.hh
+++ b/streaming/stream_mutation_fragments_cmd.hh
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 namespace streaming {
 
 enum class stream_mutation_fragments_cmd : uint8_t {
diff --git a/streaming/stream_reason.hh b/streaming/stream_reason.hh
index 2d435db000..1d41033147 100644
--- a/streaming/stream_reason.hh
+++ b/streaming/stream_reason.hh
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 namespace streaming {
 
 enum class stream_reason : uint8_t {
diff --git a/test/boost/sstable_run_based_compaction_strategy_for_tests.hh b/test/boost/sstable_run_based_compaction_strategy_for_tests.hh
index 3865065a97..592c6179fe 100644
--- a/test/boost/sstable_run_based_compaction_strategy_for_tests.hh
+++ b/test/boost/sstable_run_based_compaction_strategy_for_tests.hh
@@ -25,6 +25,7 @@
 #include "sstables/compaction_strategy_impl.hh"
 #include "sstables/sstable_set.hh"
 #include "sstables/compaction.hh"
+#include "database.hh"
 
 namespace sstables {
 
diff --git a/test/lib/eventually.hh b/test/lib/eventually.hh
index 52b73b99f4..bbb35b4261 100644
--- a/test/lib/eventually.hh
+++ b/test/lib/eventually.hh
@@ -24,6 +24,8 @@
 #include <seastar/core/sleep.hh>
 #include <seastar/util/noncopyable_function.hh>
 
+#include "seastarx.hh"
+
 inline
 void eventually(noncopyable_function<void ()> f, size_t max_attempts = 17) {
     size_t attempts = 0;
diff --git a/test/lib/index_reader_assertions.hh b/test/lib/index_reader_assertions.hh
index ac2fd5ccf4..fe33c26799 100644
--- a/test/lib/index_reader_assertions.hh
+++ b/test/lib/index_reader_assertions.hh
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include <boost/test/unit_test.hpp>
+
 #include "dht/i_partitioner.hh"
 #include "schema.hh"
 #include "sstables/index_reader.hh"
diff --git a/test/lib/random_utils.hh b/test/lib/random_utils.hh
index f3b90b46fd..dd35ae3934 100644
--- a/test/lib/random_utils.hh
+++ b/test/lib/random_utils.hh
@@ -28,6 +28,8 @@
 
 #include <seastar/testing/test_runner.hh>
 
+#include "bytes.hh"
+
 namespace tests::random {
 
 inline std::default_random_engine& gen() {
diff --git a/test/lib/reader_lifecycle_policy.hh b/test/lib/reader_lifecycle_policy.hh
index 16b1af91d5..905dd3bf3f 100644
--- a/test/lib/reader_lifecycle_policy.hh
+++ b/test/lib/reader_lifecycle_policy.hh
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include "mutation_reader.hh"
+
 class test_reader_lifecycle_policy
         : public reader_lifecycle_policy
         , public enable_shared_from_this<test_reader_lifecycle_policy> {
diff --git a/thrift/utils.hh b/thrift/utils.hh
index 6ae58d465d..395b75aa2c 100644
--- a/thrift/utils.hh
+++ b/thrift/utils.hh
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include <utility>
+
 namespace thrift {
 
 template <typename Ex, typename... Args>
diff --git a/to_string.hh b/to_string.hh
index a17ef63cac..5ff24dad37 100644
--- a/to_string.hh
+++ b/to_string.hh
@@ -27,6 +27,7 @@
 #include <unordered_set>
 #include <set>
 #include <optional>
+#include <list>
 
 #include "seastarx.hh"
 #include "utils/chunked_vector.hh"
diff --git a/transport/messages/result_message_base.hh b/transport/messages/result_message_base.hh
index 0b6c96812b..0c5a26bde0 100644
--- a/transport/messages/result_message_base.hh
+++ b/transport/messages/result_message_base.hh
@@ -22,6 +22,11 @@
 
 #pragma once
 
+#include <vector>
+#include <seastar/core/sstring.hh>
+
+#include "seastarx.hh"
+
 namespace cql_transport {
 namespace messages {
 
diff --git a/utils/bounded_stats_deque.hh b/utils/bounded_stats_deque.hh
index 8c4db3ddff..d5f994d140 100644
--- a/utils/bounded_stats_deque.hh
+++ b/utils/bounded_stats_deque.hh
@@ -38,10 +38,10 @@
 
 #pragma once
 
-namespace utils {
-
 #include <deque>
 
+namespace utils {
+
 /**
  * bounded threadsafe deque
  */
diff --git a/utils/class_registrator.hh b/utils/class_registrator.hh
index 0420b059e0..9d76659d5d 100644
--- a/utils/class_registrator.hh
+++ b/utils/class_registrator.hh
@@ -23,8 +23,11 @@
 
 #include <memory>
 #include <seastar/core/shared_ptr.hh>
+#include <seastar/core/sstring.hh>
 #include <boost/range/algorithm/find_if.hpp>
 
+#include "seastarx.hh"
+
 class no_such_class : public std::runtime_error {
 public:
     using runtime_error::runtime_error;
diff --git a/utils/config_file.hh b/utils/config_file.hh
index e3a282d3bc..b7390f12ec 100644
--- a/utils/config_file.hh
+++ b/utils/config_file.hh
@@ -33,6 +33,7 @@
 #include <seastar/core/sstring.hh>
 #include <seastar/core/future.hh>
 #include <seastar/util/defer.hh>
+#include <seastar/util/log.hh>
 
 #include "utils/updateable_value.hh"
 
diff --git a/utils/coroutine.hh b/utils/coroutine.hh
index 37d078b420..552bee49f8 100644
--- a/utils/coroutine.hh
+++ b/utils/coroutine.hh
@@ -25,6 +25,8 @@
 #include <seastar/core/future-util.hh>
 #include <seastar/util/noncopyable_function.hh>
 
+#include "seastarx.hh"
+
 // Represents a deferring operation which defers cooperatively with the caller.
 //
 // The operation is started and resumed by calling run(), which returns
diff --git a/utils/directories.hh b/utils/directories.hh
index dc4b690e2d..1cf0c5c9fb 100644
--- a/utils/directories.hh
+++ b/utils/directories.hh
@@ -28,6 +28,10 @@
 
 using namespace seastar;
 
+namespace db {
+class config;
+}
+
 namespace utils {
 
 class directories {
diff --git a/utils/estimated_histogram.hh b/utils/estimated_histogram.hh
index 13300b4615..993fcca180 100644
--- a/utils/estimated_histogram.hh
+++ b/utils/estimated_histogram.hh
@@ -48,6 +48,10 @@
 #include <seastar/core/metrics_types.hh>
 #include <seastar/core/print.hh>
 
+#include <seastar/core/print.hh>
+
+#include "seastarx.hh"
+
 namespace utils {
 
 struct estimated_histogram {
diff --git a/utils/exponential_backoff_retry.hh b/utils/exponential_backoff_retry.hh
index 11f0d9cf3a..74ddefabde 100644
--- a/utils/exponential_backoff_retry.hh
+++ b/utils/exponential_backoff_retry.hh
@@ -24,6 +24,8 @@
 
 #include <seastar/core/abort_source.hh>
 #include <seastar/core/sleep.hh>
+#include <seastar/core/do_with.hh>
+#include <seastar/core/future-util.hh>
 #include "seastarx.hh"
 #include <chrono>
 
diff --git a/utils/flush_queue.hh b/utils/flush_queue.hh
index 81213ea721..4c484cbf98 100644
--- a/utils/flush_queue.hh
+++ b/utils/flush_queue.hh
@@ -27,6 +27,8 @@
 #include <seastar/core/gate.hh>
 #include <seastar/core/shared_future.hh>
 
+#include "seastarx.hh"
+
 namespace utils {
 
 /*
diff --git a/utils/int_range.hh b/utils/int_range.hh
index 3e57fdd772..14ad0c31ab 100644
--- a/utils/int_range.hh
+++ b/utils/int_range.hh
@@ -24,6 +24,8 @@
 #include "range.hh"
 #include <seastar/core/print.hh>
 
+#include "seastarx.hh"
+
 using int_range = nonwrapping_range<int>;
 
 inline
diff --git a/utils/joinpoint.hh b/utils/joinpoint.hh
index 5c617f862f..1cd39ff988 100644
--- a/utils/joinpoint.hh
+++ b/utils/joinpoint.hh
@@ -25,6 +25,9 @@
 #include <optional>
 #include <seastar/core/semaphore.hh>
 #include <seastar/core/shared_ptr.hh>
+#include <seastar/core/reactor.hh>
+
+#include "seastarx.hh"
 
 /**
  * Joinpoint:
diff --git a/utils/memory_data_sink.hh b/utils/memory_data_sink.hh
index 479a6ad38b..70a9473028 100644
--- a/utils/memory_data_sink.hh
+++ b/utils/memory_data_sink.hh
@@ -20,8 +20,11 @@
  */
 
 #include <seastar/core/iostream.hh>
+#include <seastar/core/temporary_buffer.hh>
 #include "utils/small_vector.hh"
 
+#include "seastarx.hh"
+
 #pragma once
 
 // Accumulates data sent to the memory_data_sink allowing it
diff --git a/utils/meta.hh b/utils/meta.hh
index de6c95ec63..268ef1224b 100644
--- a/utils/meta.hh
+++ b/utils/meta.hh
@@ -21,6 +21,11 @@
 
 #pragma once
 
+#include <sys/types.h>
+#include <cstddef>
+#include <type_traits>
+#include <utility>
+
 namespace meta {
 
 // Wrappers that allows returning a list of types. All helpers defined in this
diff --git a/utils/mutable_view.hh b/utils/mutable_view.hh
index 14ccd93f64..9a71627504 100644
--- a/utils/mutable_view.hh
+++ b/utils/mutable_view.hh
@@ -24,6 +24,8 @@
 #include <string_view>
 #include <seastar/core/sstring.hh>
 
+#include "seastarx.hh"
+
 template<typename CharT>
 class basic_mutable_view {
     CharT* _begin = nullptr;
diff --git a/utils/preempt.hh b/utils/preempt.hh
index 4619e0b682..496db7fd84 100644
--- a/utils/preempt.hh
+++ b/utils/preempt.hh
@@ -23,5 +23,7 @@
 
 #include <seastar/util/bool_class.hh>
 
+#include "seastarx.hh"
+
 class is_preemptible_tag;
 using is_preemptible = bool_class<is_preemptible_tag>;
diff --git a/utils/sequenced_set.hh b/utils/sequenced_set.hh
index b2d0e60d9a..5bf27d712d 100644
--- a/utils/sequenced_set.hh
+++ b/utils/sequenced_set.hh
@@ -19,6 +19,11 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
+#include <vector>
+#include <unordered_set>
+
 namespace utils {
 /**
  * This class implements an add-only vector that ensures that the elements are