diff --git a/cdc/split.cc b/cdc/split.cc index 96df0a267a..6aca05c350 100644 --- a/cdc/split.cc +++ b/cdc/split.cc @@ -15,7 +15,7 @@ #include "mutation/tombstone.hh" #include "schema/schema.hh" -#include "seastar/core/sstring.hh" +#include #include "types/concrete_types.hh" #include "types/types.hh" #include "types/user.hh" diff --git a/cql3/statements/alter_keyspace_statement.cc b/cql3/statements/alter_keyspace_statement.cc index 0e8e52334d..b47c2fb435 100644 --- a/cql3/statements/alter_keyspace_statement.cc +++ b/cql3/statements/alter_keyspace_statement.cc @@ -19,7 +19,7 @@ #include "locator/abstract_replication_strategy.hh" #include "mutation/canonical_mutation.hh" #include "prepared_statement.hh" -#include "seastar/coroutine/exception.hh" +#include #include "service/migration_manager.hh" #include "service/storage_proxy.hh" #include "service/topology_mutation.hh" diff --git a/cql3/statements/ks_prop_defs.cc b/cql3/statements/ks_prop_defs.cc index b3893ddcc6..c474c504f0 100644 --- a/cql3/statements/ks_prop_defs.cc +++ b/cql3/statements/ks_prop_defs.cc @@ -8,8 +8,8 @@ * SPDX-License-Identifier: (LicenseRef-ScyllaDB-Source-Available-1.0 and Apache-2.0) */ -#include "seastar/core/format.hh" -#include "seastar/core/sstring.hh" +#include +#include #include "utils/assert.hh" #include "cql3/statements/ks_prop_defs.hh" #include "cql3/statements/request_validations.hh" diff --git a/db/view/view.cc b/db/view/view.cc index 1e9e276b4f..210a69518f 100644 --- a/db/view/view.cc +++ b/db/view/view.cc @@ -57,7 +57,7 @@ #include "locator/network_topology_strategy.hh" #include "mutation/mutation.hh" #include "mutation/mutation_partition.hh" -#include "seastar/core/on_internal_error.hh" +#include #include "service/migration_manager.hh" #include "service/raft/raft_group0_client.hh" #include "service/storage_proxy.hh" diff --git a/db/view/view_building_worker.hh b/db/view/view_building_worker.hh index a7bda41767..66718d8c67 100644 --- a/db/view/view_building_worker.hh +++ b/db/view/view_building_worker.hh @@ -17,7 +17,7 @@ #include "locator/abstract_replication_strategy.hh" #include "locator/tablets.hh" #include "raft/raft.hh" -#include "seastar/core/gate.hh" +#include #include "db/view/view_building_state.hh" #include "sstables/shared_sstable.hh" #include "utils/UUID.hh" diff --git a/index/secondary_index_manager.hh b/index/secondary_index_manager.hh index 46118fa717..6c3b9a17ba 100644 --- a/index/secondary_index_manager.hh +++ b/index/secondary_index_manager.hh @@ -15,8 +15,8 @@ #include "data_dictionary/data_dictionary.hh" #include "cql3/statements/index_target.hh" #include "cql3/statements/index_prop_defs.hh" -#include "seastar/core/metrics.hh" -#include "seastar/core/shared_ptr.hh" +#include +#include #include "utils/estimated_histogram.hh" #include diff --git a/service/direct_failure_detector/failure_detector.cc b/service/direct_failure_detector/failure_detector.cc index 8e121accb4..38ed5ed06f 100644 --- a/service/direct_failure_detector/failure_detector.cc +++ b/service/direct_failure_detector/failure_detector.cc @@ -6,7 +6,7 @@ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0 */ -#include "seastar/core/scheduling.hh" +#include #include "utils/assert.hh" #include diff --git a/service/migration_manager.cc b/service/migration_manager.cc index 20513c982d..7e596a750c 100644 --- a/service/migration_manager.cc +++ b/service/migration_manager.cc @@ -18,7 +18,7 @@ #include "locator/host_id.hh" #include "schema/schema_registry.hh" #include "service/migration_manager.hh" -#include "seastar/core/on_internal_error.hh" +#include #include "service/storage_proxy.hh" #include "service/raft/group0_state_machine.hh" diff --git a/service/raft/raft_group_registry.cc b/service/raft/raft_group_registry.cc index 6ef3259275..2b4c164b3d 100644 --- a/service/raft/raft_group_registry.cc +++ b/service/raft/raft_group_registry.cc @@ -16,7 +16,7 @@ #include "idl/raft.dist.hh" #include "utils/composite_abort_source.hh" #include "utils/error_injection.hh" -#include "seastar/core/shared_future.hh" +#include #include #include diff --git a/test/boost/bti_index_test.cc b/test/boost/bti_index_test.cc index a1394bc6db..c0c9935c76 100644 --- a/test/boost/bti_index_test.cc +++ b/test/boost/bti_index_test.cc @@ -16,10 +16,10 @@ #include #include #include -#include "seastar/core/fstream.hh" -#include "seastar/core/seastar.hh" -#include "seastar/util/closeable.hh" -#include "seastar/util/defer.hh" +#include +#include +#include +#include #include "sstables/mx/types.hh" #include "sstables/trie/bti_index.hh" #include "sstables/trie/bti_index_internal.hh" diff --git a/test/boost/bti_key_translation_test.cc b/test/boost/bti_key_translation_test.cc index 579c44e050..a65ef43d9d 100644 --- a/test/boost/bti_key_translation_test.cc +++ b/test/boost/bti_key_translation_test.cc @@ -9,7 +9,7 @@ #define BOOST_TEST_MODULE core #include -#include "seastar/util/defer.hh" +#include #include "schema/schema_builder.hh" #include "sstables/trie/bti_key_translation.hh" #include "test/lib/key_utils.hh" diff --git a/test/boost/tablets_test.cc b/test/boost/tablets_test.cc index 81b22e4ba4..e0d35cc931 100644 --- a/test/boost/tablets_test.cc +++ b/test/boost/tablets_test.cc @@ -20,7 +20,7 @@ #include "service/storage_service.hh" #include #include -#include "seastar/testing/on_internal_error.hh" +#include #include "test/lib/cql_test_env.hh" #include "test/lib/log.hh" #include "test/lib/simple_schema.hh" diff --git a/test/boost/token_metadata_test.cc b/test/boost/token_metadata_test.cc index 4885a6e691..d9fb0ef019 100644 --- a/test/boost/token_metadata_test.cc +++ b/test/boost/token_metadata_test.cc @@ -11,8 +11,8 @@ #include #include #include -#include "seastar/core/future.hh" -#include "seastar/core/sleep.hh" +#include +#include #include "test/lib/scylla_test_case.hh" #include "test/lib/test_utils.hh" #include "locator/token_metadata.hh" diff --git a/test/vector_search/client_test.cc b/test/vector_search/client_test.cc index 9c5d98b4a2..24672c50a7 100644 --- a/test/vector_search/client_test.cc +++ b/test/vector_search/client_test.cc @@ -6,7 +6,7 @@ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0 */ -#include "seastar/http/common.hh" +#include #include "vector_search/client.hh" #include "vector_search/utils.hh" #include "vs_mock_server.hh" diff --git a/test/vector_search/vector_store_client_test.cc b/test/vector_search/vector_store_client_test.cc index 1a63d140f1..8dfa8b9f36 100644 --- a/test/vector_search/vector_store_client_test.cc +++ b/test/vector_search/vector_store_client_test.cc @@ -12,8 +12,8 @@ #include "vs_mock_server.hh" #include "unavailable_server.hh" #include "certificates.hh" -#include "seastar/core/future.hh" -#include "seastar/core/when_all.hh" +#include +#include #include "db/config.hh" #include "exceptions/exceptions.hh" #include "cql3/statements/select_statement.hh" diff --git a/test/vector_search/vs_mock_server.hh b/test/vector_search/vs_mock_server.hh index b3a1da7bc1..a61b5f8916 100644 --- a/test/vector_search/vs_mock_server.hh +++ b/test/vector_search/vs_mock_server.hh @@ -10,7 +10,7 @@ #include "utils.hh" #include "utils/rjson.hh" -#include "seastar/http/request.hh" +#include #include #include #include diff --git a/transport/server.cc b/transport/server.cc index a42b058e02..185d33d762 100644 --- a/transport/server.cc +++ b/transport/server.cc @@ -12,7 +12,7 @@ #include "cql3/statements/modification_statement.hh" #include #include -#include "seastar/coroutine/switch_to.hh" +#include #include "types/collection.hh" #include "types/list.hh" #include "types/set.hh" diff --git a/utils/lru_string_map.hh b/utils/lru_string_map.hh index 040734192c..11da900084 100644 --- a/utils/lru_string_map.hh +++ b/utils/lru_string_map.hh @@ -13,12 +13,12 @@ #include #include #include -#include "seastar/core/loop.hh" +#include #include "seastarx.hh" #include #include #include -#include "seastar/coroutine/maybe_yield.hh" +#include #include "utils/log.hh" // A simple LRU cache, mapping strings to values of type Value. diff --git a/utils/s3/default_aws_retry_strategy.cc b/utils/s3/default_aws_retry_strategy.cc index 46e937b191..0508ee8936 100644 --- a/utils/s3/default_aws_retry_strategy.cc +++ b/utils/s3/default_aws_retry_strategy.cc @@ -8,9 +8,9 @@ #include "default_aws_retry_strategy.hh" #include "aws_error.hh" -#include "seastar/core/sleep.hh" -#include "seastar/http/exception.hh" -#include "seastar/util/short_streams.hh" +#include +#include +#include #include "utils/log.hh" namespace seastar::http::experimental { diff --git a/vector_search/clients.hh b/vector_search/clients.hh index 824ef37281..de71039f3f 100644 --- a/vector_search/clients.hh +++ b/vector_search/clients.hh @@ -11,7 +11,7 @@ #include "client.hh" #include "dns.hh" #include "truststore.hh" -#include "seastar/core/future.hh" +#include #include "uri.hh" #include "utils/sequential_producer.hh" #include "vector_search/error.hh" diff --git a/vector_search/load_balancer.hh b/vector_search/load_balancer.hh index db02a73140..501020f279 100644 --- a/vector_search/load_balancer.hh +++ b/vector_search/load_balancer.hh @@ -8,7 +8,7 @@ #pragma once -#include "seastar/core/shared_ptr.hh" +#include #include namespace vector_search {