diff --git a/alternator/executor.cc b/alternator/executor.cc
index 236f1b77c1..d7b023491e 100644
--- a/alternator/executor.cc
+++ b/alternator/executor.cc
@@ -23,6 +23,7 @@
 
 #include "base64.hh"
 
+#include <seastar/core/sleep.hh>
 #include "alternator/executor.hh"
 #include "log.hh"
 #include "schema_builder.hh"
diff --git a/database.cc b/database.cc
index 36fc312c63..ad1ed68ee8 100644
--- a/database.cc
+++ b/database.cc
@@ -22,82 +22,46 @@
 #include "log.hh"
 #include "lister.hh"
 #include "database.hh"
-#include "unimplemented.hh"
 #include <seastar/core/future-util.hh>
-#include "db/commitlog/commitlog_entry.hh"
 #include "db/system_keyspace.hh"
 #include "db/system_distributed_keyspace.hh"
 #include "db/commitlog/commitlog.hh"
 #include "db/config.hh"
 #include "to_string.hh"
-#include "query-result-writer.hh"
-#include "cql3/column_identifier.hh"
 #include "cql3/functions/functions.hh"
 #include <seastar/core/seastar.hh>
 #include <seastar/core/coroutine.hh>
 #include <seastar/core/reactor.hh>
-#include <seastar/core/sleep.hh>
-#include <seastar/core/rwlock.hh>
 #include <seastar/core/metrics.hh>
-#include <seastar/core/execution_stage.hh>
-#include <seastar/util/bool_class.hh>
 #include <seastar/util/defer.hh>
-#include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include "sstables/sstables.hh"
 #include "sstables/sstables_manager.hh"
 #include "sstables/compaction.hh"
-#include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/adaptor/map.hpp>
-#include "locator/simple_snitch.hh"
-#include <boost/algorithm/cxx11/all_of.hpp>
 #include <boost/algorithm/cxx11/any_of.hpp>
-#include <boost/function_output_iterator.hpp>
-#include <boost/range/algorithm/heap_algorithm.hpp>
-#include <boost/range/algorithm/remove_if.hpp>
-#include <boost/range/algorithm/find.hpp>
 #include <boost/range/algorithm/find_if.hpp>
 #include <boost/range/algorithm/sort.hpp>
-#include <boost/range/adaptor/map.hpp>
 #include <boost/container/static_vector.hpp>
 #include "frozen_mutation.hh"
 #include <seastar/core/do_with.hh>
 #include "service/migration_manager.hh"
 #include "message/messaging_service.hh"
-#include "mutation_query.hh"
-#include <seastar/core/fstream.hh>
-#include <seastar/core/enum.hh>
-#include "utils/latency.hh"
-#include "schema_registry.hh"
-#include "service/priority_manager.hh"
 #include "cell_locking.hh"
-#include "db/view/row_locking.hh"
 #include "view_info.hh"
-#include "memtable-sstable.hh"
 #include "db/schema_tables.hh"
-#include "db/query_context.hh"
 #include "sstables/compaction_manager.hh"
-#include "sstables/compaction_backlog_manager.hh"
-#include "sstables/progress_monitor.hh"
-#include "auth/common.hh"
-#include "tracing/trace_keyspace_helper.hh"
 #include "gms/feature_service.hh"
 
-#include "checked-file-impl.hh"
-#include "utils/disk-error-handler.hh"
 #include "utils/human_readable.hh"
 
 #include "db/timeout_clock.hh"
 #include "db/large_data_handler.hh"
 #include "db/data_listeners.hh"
-#include "distributed_loader.hh"
 
 #include "user_types_metadata.hh"
 #include <seastar/core/shared_ptr_incomplete.hh>
 #include <seastar/util/memory_diagnostics.hh>
-#include <seastar/core/coroutine.hh>
-
-#include "schema_builder.hh"
 
 using namespace std::chrono_literals;
 using namespace db;
diff --git a/database.hh b/database.hh
index 35de214483..589e9ea172 100644
--- a/database.hh
+++ b/database.hh
@@ -22,13 +22,12 @@
 #ifndef DATABASE_HH_
 #define DATABASE_HH_
 
-#include "dht/i_partitioner.hh"
 #include "locator/abstract_replication_strategy.hh"
 #include "index/secondary_index_manager.hh"
+#include <seastar/core/abort_source.hh>
 #include <seastar/core/sstring.hh>
 #include <seastar/core/shared_ptr.hh>
 #include <seastar/core/execution_stage.hh>
-#include <seastar/net/byteorder.hh>
 #include "utils/UUID.hh"
 #include "utils/hash.hh"
 #include "db_clock.hh"
@@ -36,51 +35,32 @@
 #include <chrono>
 #include <seastar/core/distributed.hh>
 #include <functional>
-#include <cstdint>
 #include <unordered_map>
 #include <map>
 #include <set>
-#include <iosfwd>
 #include <boost/functional/hash.hpp>
 #include <boost/range/algorithm/find.hpp>
 #include <optional>
 #include <string.h>
 #include "types.hh"
-#include "compound.hh"
 #include <seastar/core/future.hh>
 #include <seastar/core/gate.hh>
-#include "cql3/column_specification.hh"
 #include "db/commitlog/replay_position.hh"
 #include <limits>
-#include <cstddef>
 #include "schema_fwd.hh"
 #include "db/view/view.hh"
-#include "db/schema_features.hh"
 #include "gms/feature.hh"
-#include "timestamp.hh"
-#include "tombstone.hh"
-#include "atomic_cell.hh"
-#include "query-request.hh"
-#include "keys.hh"
 #include "memtable.hh"
-#include <list>
 #include "mutation_reader.hh"
 #include "row_cache.hh"
 #include "compaction_strategy.hh"
-#include "utils/exponential_backoff_retry.hh"
-#include "utils/histogram.hh"
 #include "utils/estimated_histogram.hh"
 #include "sstables/sstable_set.hh"
-#include "sstables/progress_monitor.hh"
-#include "sstables/version.hh"
-#include <seastar/core/rwlock.hh>
-#include <seastar/core/shared_future.hh>
 #include <seastar/core/metrics_registration.hh>
 #include "tracing/trace_state.hh"
 #include "db/view/view_stats.hh"
 #include "db/view/view_update_backlog.hh"
 #include "db/view/row_locking.hh"
-#include "lister.hh"
 #include "utils/phased_barrier.hh"
 #include "backlog_controller.hh"
 #include "dirty_memory_manager.hh"
@@ -95,7 +75,6 @@
 #include "user_types_metadata.hh"
 #include "query_class_config.hh"
 #include "absl-flat_hash_map.hh"
-#include "utils/updateable_value.hh"
 
 class cell_locker;
 class cell_locker_stats;
diff --git a/dht/range_streamer.cc b/dht/range_streamer.cc
index f68366d08f..8b26316b8d 100644
--- a/dht/range_streamer.cc
+++ b/dht/range_streamer.cc
@@ -36,6 +36,7 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <seastar/core/sleep.hh>
 #include "dht/range_streamer.hh"
 #include "utils/fb_utilities.hh"
 #include "locator/snitch_base.hh"
diff --git a/service/migration_manager.cc b/service/migration_manager.cc
index 33dfae8443..b725286e72 100644
--- a/service/migration_manager.cc
+++ b/service/migration_manager.cc
@@ -39,6 +39,7 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <seastar/core/sleep.hh>
 #include "schema_registry.hh"
 #include "service/migration_manager.hh"
 
diff --git a/service/misc_services.cc b/service/misc_services.cc
index 0a44bde607..089b1d4971 100644
--- a/service/misc_services.cc
+++ b/service/misc_services.cc
@@ -38,6 +38,7 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <seastar/core/sleep.hh>
 #include "load_meter.hh"
 #include "load_broadcaster.hh"
 #include "cache_hitrate_calculator.hh"
diff --git a/test/boost/sstable_move_test.cc b/test/boost/sstable_move_test.cc
index 3dcd42db28..98b397af92 100644
--- a/test/boost/sstable_move_test.cc
+++ b/test/boost/sstable_move_test.cc
@@ -23,6 +23,7 @@
 #include <seastar/testing/test_case.hh>
 #include <seastar/testing/thread_test_case.hh>
 
+#include "lister.hh"
 #include "test/lib/tmpdir.hh"
 #include "test/lib/sstable_test_env.hh"
 #include "sstable_test.hh"