From a1dcddd300c9e56b60eb047d6441ccdd606f250e Mon Sep 17 00:00:00 2001
From: Kefu Chai <kefu.chai@scylladb.com>
Date: Sun, 14 Jan 2024 12:04:41 +0800
Subject: [PATCH] utils: do not include unused headers

these unused includes were identified by clangd. see
https://clangd.llvm.org/guides/include-cleaner#unused-include-warning
for more details on the "Unused include" warning.

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>

Closes scylladb/scylladb#16833
---
 message/messaging_service.hh        | 1 +
 test/boost/UUID_test.cc             | 1 +
 test/boost/double_decker_test.cc    | 1 +
 types/types.hh                      | 1 +
 utils/UUID_gen.hh                   | 2 --
 utils/amortized_reserve.hh          | 1 -
 utils/base64.cc                     | 1 -
 utils/big_decimal.hh                | 1 -
 utils/bloom_filter.cc               | 2 +-
 utils/bloom_filter.hh               | 3 ---
 utils/bptree.hh                     | 3 ++-
 utils/cached_file.hh                | 3 +--
 utils/coroutine.hh                  | 3 +--
 utils/crc.hh                        | 1 -
 utils/directories.cc                | 1 -
 utils/disk-error-handler.cc         | 1 +
 utils/disk-error-handler.hh         | 1 -
 utils/error_injection.hh            | 2 --
 utils/exceptions.cc                 | 3 ---
 utils/hashing.hh                    | 4 +---
 utils/i_filter.cc                   | 1 +
 utils/i_filter.hh                   | 1 -
 utils/lister.cc                     | 1 +
 utils/lsa/chunked_managed_vector.hh | 1 -
 utils/reusable_buffer.hh            | 1 -
 utils/rjson.hh                      | 2 +-
 utils/serialization.hh              | 6 +-----
 utils/tagged_integer.hh             | 3 ---
 utils/top_k.hh                      | 1 -
 utils/uuid.cc                       | 1 -
 30 files changed, 15 insertions(+), 39 deletions(-)

diff --git a/message/messaging_service.hh b/message/messaging_service.hh
index 16eef6e7cf..98c38ebea5 100644
--- a/message/messaging_service.hh
+++ b/message/messaging_service.hh
@@ -16,6 +16,7 @@
 #include "gms/inet_address.hh"
 #include <seastar/rpc/rpc_types.hh>
 #include <unordered_map>
+#include "gc_clock.hh"
 #include "range.hh"
 #include "schema/schema_fwd.hh"
 #include "streaming/stream_fwd.hh"
diff --git a/test/boost/UUID_test.cc b/test/boost/UUID_test.cc
index 1e0f1708d5..eccc05d4dd 100644
--- a/test/boost/UUID_test.cc
+++ b/test/boost/UUID_test.cc
@@ -12,6 +12,7 @@
 #include <utility>
 #include "utils/UUID_gen.hh"
 #include "utils/lexicographical_compare.hh"
+#include "marshal_exception.hh"
 
 BOOST_AUTO_TEST_CASE(test_generation_of_name_based_UUID) {
     auto uuid = utils::UUID_gen::get_name_UUID("systembatchlog");
diff --git a/test/boost/double_decker_test.cc b/test/boost/double_decker_test.cc
index 86e8fc8a95..80554e809f 100644
--- a/test/boost/double_decker_test.cc
+++ b/test/boost/double_decker_test.cc
@@ -15,6 +15,7 @@
 #include <string>
 
 #include "utils/double-decker.hh"
+#include "utils/logalloc.hh"
 #include "test/lib/random_utils.hh"
 
 class compound_key {
diff --git a/types/types.hh b/types/types.hh
index a80997507e..4e62075f6c 100644
--- a/types/types.hh
+++ b/types/types.hh
@@ -13,6 +13,7 @@
 #include <iosfwd>
 #include <sstream>
 #include <initializer_list>
+#include <unordered_set>
 
 #include <seastar/core/sstring.hh>
 #include <seastar/core/shared_ptr.hh>
diff --git a/utils/UUID_gen.hh b/utils/UUID_gen.hh
index 4d0648b5c6..e7a18b793e 100644
--- a/utils/UUID_gen.hh
+++ b/utils/UUID_gen.hh
@@ -12,13 +12,11 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include <memory>
 #include <chrono>
 #include <random>
 #include <limits>
 
 #include "UUID.hh"
-#include "db_clock.hh"
 
 namespace utils {
 
diff --git a/utils/amortized_reserve.hh b/utils/amortized_reserve.hh
index ebdc965ed3..f3357357a9 100644
--- a/utils/amortized_reserve.hh
+++ b/utils/amortized_reserve.hh
@@ -10,7 +10,6 @@
 
 #include <concepts>
 #include <vector>
-#include <memory>
 
 /// Represents a container which can preallocate space for future insertions
 /// which can be used to reduce the number of overall memory re-allocation and item movement.
diff --git a/utils/base64.cc b/utils/base64.cc
index 0f6011ae73..0d33f64677 100644
--- a/utils/base64.cc
+++ b/utils/base64.cc
@@ -8,7 +8,6 @@
 
 #include "base64.hh"
 
-#include <ctype.h>
 #include <seastar/core/print.hh>
 
 // Arrays for quickly converting to and from an integer between 0 and 63,
diff --git a/utils/big_decimal.hh b/utils/big_decimal.hh
index 7a17bc7781..59a4fcc878 100644
--- a/utils/big_decimal.hh
+++ b/utils/big_decimal.hh
@@ -10,7 +10,6 @@
 
 #include "multiprecision_int.hh"
 #include <boost/multiprecision/cpp_int.hpp>
-#include <ostream>
 #include <compare>
 #include <concepts>
 
diff --git a/utils/bloom_filter.cc b/utils/bloom_filter.cc
index bd0fa26f4d..0a7c642760 100644
--- a/utils/bloom_filter.cc
+++ b/utils/bloom_filter.cc
@@ -10,13 +10,13 @@
 
 #include "i_filter.hh"
 #include "bytes.hh"
-#include "utils/murmur_hash.hh"
 #include <seastar/core/shared_ptr.hh>
 #include <seastar/core/align.hh>
 #include <seastar/core/loop.hh>
 #include "utils/large_bitset.hh"
 #include <array>
 #include <cstdlib>
+#include "utils/bloom_calculations.hh"
 #include "bloom_filter.hh"
 
 namespace utils {
diff --git a/utils/bloom_filter.hh b/utils/bloom_filter.hh
index 6960901881..75001946ee 100644
--- a/utils/bloom_filter.hh
+++ b/utils/bloom_filter.hh
@@ -12,11 +12,8 @@
  */
 #pragma once
 #include "i_filter.hh"
-#include "utils/murmur_hash.hh"
 #include "utils/large_bitset.hh"
 
-#include <vector>
-
 namespace utils {
 namespace filter {
 
diff --git a/utils/bptree.hh b/utils/bptree.hh
index 4f8187abda..2c80ea1e10 100644
--- a/utils/bptree.hh
+++ b/utils/bptree.hh
@@ -11,7 +11,8 @@
 #include <boost/intrusive/parent_from_member.hpp>
 #include <seastar/util/defer.hh>
 #include <cassert>
-#include "utils/logalloc.hh"
+#include <vector>
+#include "utils/allocation_strategy.hh"
 #include "utils/collection-concepts.hh"
 #include "utils/neat-object-id.hh"
 #include "utils/array-search.hh"
diff --git a/utils/cached_file.hh b/utils/cached_file.hh
index 6ca82ba5e1..50034f97ed 100644
--- a/utils/cached_file.hh
+++ b/utils/cached_file.hh
@@ -11,6 +11,7 @@
 #include "reader_permit.hh"
 #include "utils/div_ceil.hh"
 #include "utils/bptree.hh"
+#include "utils/logalloc.hh"
 #include "utils/lru.hh"
 #include "utils/error_injection.hh"
 #include "tracing/trace_state.hh"
@@ -20,8 +21,6 @@
 #include <seastar/core/coroutine.hh>
 #include <seastar/coroutine/maybe_yield.hh>
 
-#include <map>
-
 using namespace seastar;
 
 /// \brief A read-through cache of a file.
diff --git a/utils/coroutine.hh b/utils/coroutine.hh
index d13be71753..c551ed6b13 100644
--- a/utils/coroutine.hh
+++ b/utils/coroutine.hh
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include <functional>
 #include <seastar/core/future-util.hh>
 #include <seastar/util/noncopyable_function.hh>
 
@@ -49,4 +48,4 @@ coroutine make_empty_coroutine() {
     return coroutine([] { return stop_iteration::yes; });
 }
 
-}
\ No newline at end of file
+}
diff --git a/utils/crc.hh b/utils/crc.hh
index ced95592a2..a5e9748155 100644
--- a/utils/crc.hh
+++ b/utils/crc.hh
@@ -12,7 +12,6 @@
 #pragma once
 
 #include <cstdint>
-#include <type_traits>
 #include <seastar/net/byteorder.hh>
 #include <seastar/core/byteorder.hh>
 
diff --git a/utils/directories.cc b/utils/directories.cc
index 79e55bfa2f..c516ffe3f4 100644
--- a/utils/directories.cc
+++ b/utils/directories.cc
@@ -13,7 +13,6 @@
 #include "directories.hh"
 #include "utils/disk-error-handler.hh"
 #include "utils/fmt-compat.hh"
-#include "db/config.hh"
 #include "utils/lister.hh"
 
 namespace utils {
diff --git a/utils/disk-error-handler.cc b/utils/disk-error-handler.cc
index 98558879fe..72fb0076da 100644
--- a/utils/disk-error-handler.cc
+++ b/utils/disk-error-handler.cc
@@ -6,6 +6,7 @@
  */
 
 #include "utils/disk-error-handler.hh"
+#include "utils/exceptions.hh"
 
 thread_local disk_error_signal_type commit_error;
 thread_local disk_error_signal_type general_disk_error;
diff --git a/utils/disk-error-handler.hh b/utils/disk-error-handler.hh
index 3d81fa812a..d6f508715a 100644
--- a/utils/disk-error-handler.hh
+++ b/utils/disk-error-handler.hh
@@ -12,7 +12,6 @@
 #include <type_traits>
 #include <concepts>
 
-#include "utils/exceptions.hh"
 #include <seastar/core/future.hh>
 
 #include "seastarx.hh"
diff --git a/utils/error_injection.hh b/utils/error_injection.hh
index 680d144a50..78e63c46a7 100644
--- a/utils/error_injection.hh
+++ b/utils/error_injection.hh
@@ -20,9 +20,7 @@
 
 #include <algorithm>
 #include <chrono>
-#include <set>
 #include <type_traits>
-#include <concepts>
 #include <optional>
 #include <unordered_map>
 
diff --git a/utils/exceptions.cc b/utils/exceptions.cc
index 7065a420bb..208678bdc1 100644
--- a/utils/exceptions.cc
+++ b/utils/exceptions.cc
@@ -13,12 +13,9 @@
 
 #include <exception>
 #include <system_error>
-#include <atomic>
 #include "exceptions.hh"
 #include "utils/abi/eh_ia64.hh"
 
-#include <iostream>
-
 bool check_exception(system_error_lambda_t f)
 {
     auto e = std::current_exception();
diff --git a/utils/hashing.hh b/utils/hashing.hh
index 53a3141b2e..8d4ad71696 100644
--- a/utils/hashing.hh
+++ b/utils/hashing.hh
@@ -8,10 +8,8 @@
 
 #pragma once
 
-#include <chrono>
-#include <map>
-#include <optional>
 #include <concepts>
+#include <map>
 #include <seastar/core/byteorder.hh>
 #include <seastar/core/sstring.hh>
 #include "seastarx.hh"
diff --git a/utils/i_filter.cc b/utils/i_filter.cc
index 1e72360ee4..4820d55bf9 100644
--- a/utils/i_filter.cc
+++ b/utils/i_filter.cc
@@ -10,6 +10,7 @@
 #include "log.hh"
 #include "bloom_filter.hh"
 #include "bloom_calculations.hh"
+#include "utils/murmur_hash.hh"
 #include <seastar/core/thread.hh>
 
 namespace utils {
diff --git a/utils/i_filter.hh b/utils/i_filter.hh
index 6ea08f6c75..d222050104 100644
--- a/utils/i_filter.hh
+++ b/utils/i_filter.hh
@@ -10,7 +10,6 @@
 #pragma once
 
 #include "bytes.hh"
-#include "bloom_calculations.hh"
 
 namespace utils {
 
diff --git a/utils/lister.cc b/utils/lister.cc
index e978c46e1d..821ed621fe 100644
--- a/utils/lister.cc
+++ b/utils/lister.cc
@@ -1,6 +1,7 @@
 #include <seastar/core/coroutine.hh>
 #include <seastar/core/print.hh>
 #include <seastar/core/seastar.hh>
+#include <seastar/core/on_internal_error.hh>
 #include <seastar/util/log.hh>
 #include "utils/lister.hh"
 #include "checked-file-impl.hh"
diff --git a/utils/lsa/chunked_managed_vector.hh b/utils/lsa/chunked_managed_vector.hh
index d9d4421781..5e0144a691 100644
--- a/utils/lsa/chunked_managed_vector.hh
+++ b/utils/lsa/chunked_managed_vector.hh
@@ -19,7 +19,6 @@
 #include <boost/range/algorithm/equal.hpp>
 #include <boost/algorithm/clamp.hpp>
 #include <boost/version.hpp>
-#include <memory>
 #include <type_traits>
 #include <iterator>
 #include <utility>
diff --git a/utils/reusable_buffer.hh b/utils/reusable_buffer.hh
index 4012e996b3..1a40a62b16 100644
--- a/utils/reusable_buffer.hh
+++ b/utils/reusable_buffer.hh
@@ -11,7 +11,6 @@
 #include "utils/fragmented_temporary_buffer.hh"
 #include <seastar/core/timer.hh>
 #include <seastar/core/memory.hh>
-#include <chrono>
 #include <bit>
 
 namespace utils {
diff --git a/utils/rjson.hh b/utils/rjson.hh
index e3c784b339..65a6b03bef 100644
--- a/utils/rjson.hh
+++ b/utils/rjson.hh
@@ -27,7 +27,7 @@
  */
 
 #include <string>
-#include <stdexcept>
+#include <string_view>
 #include "utils/base64.hh"
 
 #include <seastar/core/future.hh>
diff --git a/utils/serialization.hh b/utils/serialization.hh
index 4f03561961..a90ff1a6a0 100644
--- a/utils/serialization.hh
+++ b/utils/serialization.hh
@@ -29,11 +29,7 @@
 
 #include <seastar/core/sstring.hh>
 #include <seastar/net/byteorder.hh>
-#include "bytes.hh"
-#include "fragment_range.hh"
-#include <iosfwd>
-#include <iterator>
-
+#include "seastarx.hh"
 
 class UTFDataFormatException { };
 class EOFException { };
diff --git a/utils/tagged_integer.hh b/utils/tagged_integer.hh
index 38ce428fc6..dd432cdef2 100644
--- a/utils/tagged_integer.hh
+++ b/utils/tagged_integer.hh
@@ -8,10 +8,7 @@
 
 #pragma once
 
-#include <cstdint>
-#include <compare>
 #include <iostream>
-#include <type_traits>
 
 #include <fmt/core.h>
 
diff --git a/utils/top_k.hh b/utils/top_k.hh
index fb174cb98f..bd0d39a390 100644
--- a/utils/top_k.hh
+++ b/utils/top_k.hh
@@ -46,7 +46,6 @@
 #include <cstdio>
 #include <list>
 #include <unordered_map>
-#include <memory>
 #include <tuple>
 #include <assert.h>
 
diff --git a/utils/uuid.cc b/utils/uuid.cc
index 70a2352fc5..cf1c7e04de 100644
--- a/utils/uuid.cc
+++ b/utils/uuid.cc
@@ -14,7 +14,6 @@
 #include <boost/algorithm/string.hpp>
 #include <string>
 #include <seastar/core/sstring.hh>
-#include "utils/serialization.hh"
 #include "marshal_exception.hh"
 
 namespace utils {