diff --git a/src/data/BackendCounters.h b/src/data/BackendCounters.h
index 20197ba3..fdb652f4 100644
--- a/src/data/BackendCounters.h
+++ b/src/data/BackendCounters.h
@@ -19,14 +19,17 @@
 
 #pragma once
 
-#include "util/prometheus/Prometheus.h"
+#include "util/prometheus/Counter.h"
+#include "util/prometheus/Gauge.h"
+#include "util/prometheus/Histogram.h"
 
 #include <boost/json/object.hpp>
 
-#include <atomic>
+#include <chrono>
+#include <cstdint>
 #include <functional>
 #include <memory>
-#include <utility>
+#include <string>
 
 namespace data {
 
diff --git a/src/data/BackendFactory.h b/src/data/BackendFactory.h
index 15e3ddb2..0cd7ffbf 100644
--- a/src/data/BackendFactory.h
+++ b/src/data/BackendFactory.h
@@ -21,10 +21,16 @@
 
 #include "data/BackendInterface.h"
 #include "data/CassandraBackend.h"
+#include "data/cassandra/SettingsProvider.h"
 #include "util/config/Config.h"
 #include "util/log/Logger.h"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+
+#include <memory>
+#include <stdexcept>
+#include <string>
 
 namespace data {
 
diff --git a/src/data/BackendInterface.h b/src/data/BackendInterface.h
index 9b049666..5d77d66d 100644
--- a/src/data/BackendInterface.h
+++ b/src/data/BackendInterface.h
@@ -22,16 +22,29 @@
 #include "data/DBHelpers.h"
 #include "data/LedgerCache.h"
 #include "data/Types.h"
-#include "util/config/Config.h"
 #include "util/log/Logger.h"
 
+#include <boost/asio/executor_work_guard.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/spawn.hpp>
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
+#include <boost/utility/result_of.hpp>
+#include <ripple/basics/base_uint.h>
+#include <ripple/protocol/AccountID.h>
 #include <ripple/protocol/Fees.h>
 #include <ripple/protocol/LedgerHeader.h>
 
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <exception>
+#include <optional>
+#include <shared_mutex>
+#include <string>
 #include <thread>
 #include <type_traits>
+#include <vector>
 
 namespace data {
 
diff --git a/src/data/CassandraBackend.h b/src/data/CassandraBackend.h
index d9d3ede8..31a26638 100644
--- a/src/data/CassandraBackend.h
+++ b/src/data/CassandraBackend.h
@@ -20,10 +20,13 @@
 #pragma once
 
 #include "data/BackendInterface.h"
+#include "data/DBHelpers.h"
+#include "data/Types.h"
 #include "data/cassandra/Concepts.h"
 #include "data/cassandra/Handle.h"
 #include "data/cassandra/Schema.h"
 #include "data/cassandra/SettingsProvider.h"
+#include "data/cassandra/Types.h"
 #include "data/cassandra/impl/ExecutionStrategy.h"
 #include "util/Assert.h"
 #include "util/LedgerUtils.h"
@@ -31,9 +34,28 @@
 #include "util/log/Logger.h"
 
 #include <boost/asio/spawn.hpp>
+#include <boost/json/object.hpp>
+#include <cassandra.h>
+#include <ripple/basics/Blob.h>
+#include <ripple/basics/base_uint.h>
+#include <ripple/basics/strHex.h>
+#include <ripple/protocol/AccountID.h>
 #include <ripple/protocol/LedgerHeader.h>
 #include <ripple/protocol/nft.h>
 
+#include <atomic>
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
+#include <limits>
+#include <optional>
+#include <stdexcept>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+
 namespace data::cassandra {
 
 /**
diff --git a/src/data/DBHelpers.h b/src/data/DBHelpers.h
index 3d4362eb..8dc4e4df 100644
--- a/src/data/DBHelpers.h
+++ b/src/data/DBHelpers.h
@@ -20,16 +20,25 @@
 /** @file */
 #pragma once
 
-#include "data/Types.h"
 #include "util/Assert.h"
 
 #include <boost/container/flat_set.hpp>
+#include <ripple/basics/Blob.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/StringUtilities.h>
+#include <ripple/basics/base_uint.h>
+#include <ripple/protocol/AccountID.h>
 #include <ripple/protocol/SField.h>
 #include <ripple/protocol/STAccount.h>
+#include <ripple/protocol/STLedgerEntry.h>
+#include <ripple/protocol/Serializer.h>
 #include <ripple/protocol/TxMeta.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <optional>
+#include <string>
+
 /**
  * @brief Struct used to keep track of what to write to account_transactions/account_tx tables.
  */
diff --git a/src/data/LedgerCache.h b/src/data/LedgerCache.h
index 6188a468..c570dbd9 100644
--- a/src/data/LedgerCache.h
+++ b/src/data/LedgerCache.h
@@ -20,16 +20,22 @@
 #pragma once
 
 #include "data/Types.h"
+#include "util/prometheus/Counter.h"
+#include "util/prometheus/Label.h"
 #include "util/prometheus/Prometheus.h"
 
 #include <ripple/basics/base_uint.h>
 #include <ripple/basics/hardened_hash.h>
 
+#include <atomic>
 #include <condition_variable>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <map>
-#include <mutex>
+#include <optional>
 #include <shared_mutex>
-#include <utility>
+#include <unordered_set>
 #include <vector>
 
 namespace data {
diff --git a/src/data/Types.h b/src/data/Types.h
index b7c2926e..8975ac01 100644
--- a/src/data/Types.h
+++ b/src/data/Types.h
@@ -22,9 +22,10 @@
 #include <ripple/basics/base_uint.h>
 #include <ripple/protocol/AccountID.h>
 
+#include <cstdint>
 #include <optional>
-#include <string>
 #include <string_view>
+#include <tuple>
 #include <utility>
 #include <vector>
 
diff --git a/src/data/cassandra/Concepts.h b/src/data/cassandra/Concepts.h
index 8020ae5b..f77de665 100644
--- a/src/data/cassandra/Concepts.h
+++ b/src/data/cassandra/Concepts.h
@@ -21,13 +21,18 @@
 
 #include "data/cassandra/Types.h"
 
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/spawn.hpp>
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
 
 #include <chrono>
 #include <concepts>
+#include <cstdint>
 #include <optional>
 #include <string>
+#include <utility>
+#include <vector>
 
 namespace data::cassandra {
 
diff --git a/src/data/cassandra/Error.h b/src/data/cassandra/Error.h
index a16f560a..2f37638d 100644
--- a/src/data/cassandra/Error.h
+++ b/src/data/cassandra/Error.h
@@ -21,6 +21,8 @@
 
 #include <cassandra.h>
 
+#include <cstdint>
+#include <ostream>
 #include <string>
 #include <utility>
 
diff --git a/src/data/cassandra/Handle.h b/src/data/cassandra/Handle.h
index c1a63a5f..6095e1e8 100644
--- a/src/data/cassandra/Handle.h
+++ b/src/data/cassandra/Handle.h
@@ -28,13 +28,11 @@
 #include "data/cassandra/impl/Result.h"
 #include "data/cassandra/impl/Session.h"
 #include "data/cassandra/impl/Statement.h"
-#include "util/Expected.h"
 
 #include <cassandra.h>
 
-#include <chrono>
-#include <compare>
-#include <iterator>
+#include <functional>
+#include <string_view>
 #include <vector>
 
 namespace data::cassandra {
diff --git a/src/data/cassandra/Schema.h b/src/data/cassandra/Schema.h
index f8b07d55..a4f1fee7 100644
--- a/src/data/cassandra/Schema.h
+++ b/src/data/cassandra/Schema.h
@@ -21,14 +21,17 @@
 
 #include "data/cassandra/Concepts.h"
 #include "data/cassandra/Handle.h"
-#include "data/cassandra/SettingsProvider.h"
 #include "data/cassandra/Types.h"
-#include "util/Expected.h"
-#include "util/config/Config.h"
 #include "util/log/Logger.h"
 
 #include <fmt/compile.h>
 
+#include <functional>
+#include <memory>
+#include <string>
+#include <string_view>
+#include <vector>
+
 namespace data::cassandra {
 
 template <SomeSettingsProvider SettingsProviderType>
diff --git a/src/data/cassandra/SettingsProvider.h b/src/data/cassandra/SettingsProvider.h
index 737dfd22..c7901929 100644
--- a/src/data/cassandra/SettingsProvider.h
+++ b/src/data/cassandra/SettingsProvider.h
@@ -21,10 +21,13 @@
 
 #include "data/cassandra/Handle.h"
 #include "data/cassandra/Types.h"
-#include "util/Expected.h"
 #include "util/config/Config.h"
 #include "util/log/Logger.h"
 
+#include <cstdint>
+#include <optional>
+#include <string>
+
 namespace data::cassandra {
 
 /**
diff --git a/src/data/cassandra/Types.h b/src/data/cassandra/Types.h
index 2f9cf872..f42da1af 100644
--- a/src/data/cassandra/Types.h
+++ b/src/data/cassandra/Types.h
@@ -21,7 +21,7 @@
 
 #include "util/Expected.h"
 
-#include <string>
+#include <cstdint>
 
 namespace data::cassandra {
 
diff --git a/src/data/cassandra/impl/AsyncExecutor.h b/src/data/cassandra/impl/AsyncExecutor.h
index e3d0b0a0..cb633f5c 100644
--- a/src/data/cassandra/impl/AsyncExecutor.h
+++ b/src/data/cassandra/impl/AsyncExecutor.h
@@ -23,13 +23,16 @@
 #include "data/cassandra/Handle.h"
 #include "data/cassandra/Types.h"
 #include "data/cassandra/impl/RetryPolicy.h"
-#include "util/Expected.h"
 #include "util/log/Logger.h"
 
 #include <boost/asio.hpp>
+#include <boost/asio/io_context.hpp>
 
 #include <functional>
 #include <memory>
+#include <mutex>
+#include <optional>
+#include <utility>
 
 namespace data::cassandra::detail {
 
diff --git a/src/data/cassandra/impl/Batch.h b/src/data/cassandra/impl/Batch.h
index 8d9d1fa6..d4aba869 100644
--- a/src/data/cassandra/impl/Batch.h
+++ b/src/data/cassandra/impl/Batch.h
@@ -24,6 +24,8 @@
 
 #include <cassandra.h>
 
+#include <vector>
+
 namespace data::cassandra::detail {
 
 struct Batch : public ManagedObject<CassBatch> {
diff --git a/src/data/cassandra/impl/Collection.h b/src/data/cassandra/impl/Collection.h
index 808dc4d6..7a7f1784 100644
--- a/src/data/cassandra/impl/Collection.h
+++ b/src/data/cassandra/impl/Collection.h
@@ -24,8 +24,11 @@
 #include <cassandra.h>
 #include <ripple/basics/base_uint.h>
 
+#include <cstdint>
+#include <stdexcept>
 #include <string>
 #include <string_view>
+#include <vector>
 
 namespace data::cassandra::detail {
 
diff --git a/src/data/cassandra/impl/ExecutionStrategy.h b/src/data/cassandra/impl/ExecutionStrategy.h
index 75cb5ac3..3b425f3f 100644
--- a/src/data/cassandra/impl/ExecutionStrategy.h
+++ b/src/data/cassandra/impl/ExecutionStrategy.h
@@ -26,19 +26,28 @@
 #include "data/cassandra/impl/AsyncExecutor.h"
 #include "util/Assert.h"
 #include "util/Batching.h"
-#include "util/Expected.h"
 #include "util/log/Logger.h"
 
 #include <boost/asio.hpp>
+#include <boost/asio/associated_executor.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 #include <boost/asio/spawn.hpp>
+#include <boost/json/object.hpp>
 
 #include <atomic>
+#include <chrono>
 #include <condition_variable>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <mutex>
 #include <optional>
+#include <stdexcept>
 #include <thread>
+#include <type_traits>
+#include <vector>
 
 namespace data::cassandra::detail {
 
diff --git a/src/data/cassandra/impl/Future.h b/src/data/cassandra/impl/Future.h
index dfa134f3..ae6b40ad 100644
--- a/src/data/cassandra/impl/Future.h
+++ b/src/data/cassandra/impl/Future.h
@@ -24,6 +24,9 @@
 
 #include <cassandra.h>
 
+#include <functional>
+#include <memory>
+
 namespace data::cassandra::detail {
 
 struct Future : public ManagedObject<CassFuture> {
diff --git a/src/data/cassandra/impl/ManagedObject.h b/src/data/cassandra/impl/ManagedObject.h
index ff7ec2e7..198d6c16 100644
--- a/src/data/cassandra/impl/ManagedObject.h
+++ b/src/data/cassandra/impl/ManagedObject.h
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <memory>
+#include <stdexcept>
 
 namespace data::cassandra::detail {
 
diff --git a/src/data/cassandra/impl/Result.h b/src/data/cassandra/impl/Result.h
index 52062b95..26551d18 100644
--- a/src/data/cassandra/impl/Result.h
+++ b/src/data/cassandra/impl/Result.h
@@ -21,15 +21,23 @@
 
 #include "data/cassandra/impl/ManagedObject.h"
 #include "data/cassandra/impl/Tuple.h"
-#include "util/Expected.h"
 
 #include <cassandra.h>
 #include <ripple/basics/base_uint.h>
 #include <ripple/protocol/AccountID.h>
 
-#include <compare>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <iterator>
+#include <optional>
+#include <stdexcept>
+#include <string>
+#include <string_view>
 #include <tuple>
+#include <type_traits>
+#include <utility>
+#include <vector>
 
 namespace data::cassandra::detail {
 
diff --git a/src/data/cassandra/impl/Statement.h b/src/data/cassandra/impl/Statement.h
index c718c099..2b839aef 100644
--- a/src/data/cassandra/impl/Statement.h
+++ b/src/data/cassandra/impl/Statement.h
@@ -23,16 +23,21 @@
 #include "data/cassandra/impl/Collection.h"
 #include "data/cassandra/impl/ManagedObject.h"
 #include "data/cassandra/impl/Tuple.h"
-#include "util/Expected.h"
 
 #include <cassandra.h>
 #include <fmt/core.h>
 #include <ripple/basics/base_uint.h>
+#include <ripple/protocol/AccountID.h>
 #include <ripple/protocol/STAccount.h>
 
-#include <chrono>
-#include <compare>
-#include <iterator>
+#include <cstddef>
+#include <cstdint>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <tuple>
+#include <type_traits>
+#include <vector>
 
 namespace data::cassandra::detail {
 
diff --git a/src/data/cassandra/impl/Tuple.h b/src/data/cassandra/impl/Tuple.h
index b6529be4..f55d97a4 100644
--- a/src/data/cassandra/impl/Tuple.h
+++ b/src/data/cassandra/impl/Tuple.h
@@ -24,10 +24,14 @@
 #include <cassandra.h>
 #include <ripple/basics/base_uint.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <functional>
+#include <stdexcept>
 #include <string>
 #include <string_view>
 #include <tuple>
+#include <type_traits>
 
 namespace data::cassandra::detail {
 
diff --git a/src/etl/ETLHelpers.h b/src/etl/ETLHelpers.h
index 9f4c7486..b8ef2d67 100644
--- a/src/etl/ETLHelpers.h
+++ b/src/etl/ETLHelpers.h
@@ -24,11 +24,15 @@
 
 #include <ripple/basics/base_uint.h>
 
+#include <chrono>
 #include <condition_variable>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <mutex>
 #include <optional>
 #include <queue>
-#include <sstream>
+#include <vector>
 
 namespace etl {
 /**
diff --git a/src/etl/ETLService.h b/src/etl/ETLService.h
index 3ddf70ed..a3384c07 100644
--- a/src/etl/ETLService.h
+++ b/src/etl/ETLService.h
@@ -21,6 +21,8 @@
 
 #include "data/BackendInterface.h"
 #include "data/LedgerCache.h"
+#include "etl/ETLHelpers.h"
+#include "etl/ETLState.h"
 #include "etl/LoadBalancer.h"
 #include "etl/Source.h"
 #include "etl/SystemState.h"
@@ -35,11 +37,19 @@
 #include "feed/SubscriptionManager.h"
 #include "util/log/Logger.h"
 
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/steady_timer.hpp>
+#include <boost/json/object.hpp>
 #include <grpcpp/grpcpp.h>
+#include <org/xrpl/rpc/v1/get_ledger.pb.h>
 #include <ripple/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <memory>
+#include <optional>
+#include <string>
+#include <thread>
 
 struct AccountTransactionsData;
 struct NFTTransactionsData;
diff --git a/src/etl/ETLState.h b/src/etl/ETLState.h
index 618f3995..a18369d5 100644
--- a/src/etl/ETLState.h
+++ b/src/etl/ETLState.h
@@ -22,6 +22,9 @@
 #include "data/BackendInterface.h"
 
 #include <boost/json.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <boost/json/value_to.hpp>
 
 #include <cstdint>
 #include <optional>
diff --git a/src/etl/LoadBalancer.h b/src/etl/LoadBalancer.h
index 2caf0a4b..9968324c 100644
--- a/src/etl/LoadBalancer.h
+++ b/src/etl/LoadBalancer.h
@@ -27,9 +27,22 @@
 #include "util/log/Logger.h"
 
 #include <boost/asio.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/spawn.hpp>
+#include <boost/json/object.hpp>
+#include <boost/json/value.hpp>
 #include <grpcpp/grpcpp.h>
+#include <org/xrpl/rpc/v1/get_ledger.pb.h>
+#include <org/xrpl/rpc/v1/ledger.pb.h>
 #include <ripple/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
 
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace etl {
 class Source;
 class ProbingSource;
diff --git a/src/etl/NFTHelpers.h b/src/etl/NFTHelpers.h
index 21eab458..a1f49fd2 100644
--- a/src/etl/NFTHelpers.h
+++ b/src/etl/NFTHelpers.h
@@ -25,6 +25,12 @@
 #include <ripple/protocol/STTx.h>
 #include <ripple/protocol/TxMeta.h>
 
+#include <cstdint>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace etl {
 
 /**
@@ -48,4 +54,4 @@ getNFTDataFromTx(ripple::TxMeta const& txMeta, ripple::STTx const& sttx);
 std::vector<NFTsData>
 getNFTDataFromObj(std::uint32_t seq, std::string const& key, std::string const& blob);
 
-}  // namespace etl
\ No newline at end of file
+}  // namespace etl
diff --git a/src/etl/ProbingSource.h b/src/etl/ProbingSource.h
index 3449e51d..fc596457 100644
--- a/src/etl/ProbingSource.h
+++ b/src/etl/ProbingSource.h
@@ -19,17 +19,33 @@
 
 #pragma once
 
+#include "data/BackendInterface.h"
+#include "etl/ETLHelpers.h"
+#include "etl/LoadBalancer.h"
 #include "etl/Source.h"
 #include "util/config/Config.h"
 #include "util/log/Logger.h"
 
 #include <boost/asio.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/spawn.hpp>
+#include <boost/asio/ssl/context.hpp>
 #include <boost/beast/core.hpp>
 #include <boost/beast/core/string.hpp>
 #include <boost/beast/ssl.hpp>
 #include <boost/beast/websocket.hpp>
+#include <boost/json/object.hpp>
+#include <boost/uuid/uuid.hpp>
+#include <grpcpp/support/status.h>
+#include <org/xrpl/rpc/v1/get_ledger.pb.h>
 
+#include <cstdint>
+#include <memory>
 #include <mutex>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace etl {
 
diff --git a/src/etl/Source.h b/src/etl/Source.h
index f7197085..74af10f3 100644
--- a/src/etl/Source.h
+++ b/src/etl/Source.h
@@ -30,17 +30,66 @@
 #include "util/log/Logger.h"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
 #include <boost/asio.hpp>
+#include <boost/asio/associated_executor.hpp>
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/error.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/ip/address.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/spawn.hpp>
+#include <boost/asio/ssl/context.hpp>
+#include <boost/asio/ssl/error.hpp>
+#include <boost/asio/steady_timer.hpp>
+#include <boost/asio/strand.hpp>
 #include <boost/beast/core.hpp>
+#include <boost/beast/core/buffers_to_string.hpp>
+#include <boost/beast/core/error.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
 #include <boost/beast/core/string.hpp>
+#include <boost/beast/core/tcp_stream.hpp>
+#include <boost/beast/http/field.hpp>
 #include <boost/beast/ssl.hpp>
+#include <boost/beast/ssl/ssl_stream.hpp>
+#include <boost/beast/version.hpp>
 #include <boost/beast/websocket.hpp>
+#include <boost/beast/websocket/rfc6455.hpp>
+#include <boost/beast/websocket/stream.hpp>
+#include <boost/beast/websocket/stream_base.hpp>
+#include <boost/json/object.hpp>
+#include <boost/json/parse.hpp>
+#include <boost/json/serialize.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/uuid/random_generator.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_generators.hpp>
+#include <grpcpp/client_context.h>
 #include <grpcpp/grpcpp.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/channel_arguments.h>
+#include <grpcpp/support/status.h>
+#include <openssl/err.h>
+#include <org/xrpl/rpc/v1/get_ledger.pb.h>
+#include <ripple/basics/base_uint.h>
 #include <ripple/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
 
+#include <algorithm>
+#include <atomic>
+#include <chrono>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <exception>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <sstream>
+#include <string>
 #include <utility>
+#include <vector>
 
 namespace feed {
 class SubscriptionManager;
diff --git a/src/etl/impl/AsyncData.h b/src/etl/impl/AsyncData.h
index 7118b849..b73fe6e9 100644
--- a/src/etl/impl/AsyncData.h
+++ b/src/etl/impl/AsyncData.h
@@ -20,13 +20,26 @@
 #pragma once
 
 #include "data/BackendInterface.h"
+#include "data/Types.h"
 #include "etl/NFTHelpers.h"
 #include "util/Assert.h"
 #include "util/log/Logger.h"
 
+#include <grpcpp/client_context.h>
 #include <grpcpp/grpcpp.h>
+#include <grpcpp/support/status.h>
+#include <org/xrpl/rpc/v1/get_ledger_data.pb.h>
+#include <ripple/basics/base_uint.h>
+#include <ripple/basics/strHex.h>
 #include <ripple/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
 
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace etl::detail {
 
 class AsyncCallData {
diff --git a/src/etl/impl/CacheLoader.h b/src/etl/impl/CacheLoader.h
index cd19e932..e4578ab5 100644
--- a/src/etl/impl/CacheLoader.h
+++ b/src/etl/impl/CacheLoader.h
@@ -20,19 +20,47 @@
 #pragma once
 
 #include "data/BackendInterface.h"
+#include "data/Types.h"
+#include "util/Assert.h"
 #include "util/log/Logger.h"
 
+#include <boost/algorithm/hex.hpp>
 #include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/spawn.hpp>
 #include <boost/beast/core.hpp>
+#include <boost/beast/core/buffers_to_string.hpp>
+#include <boost/beast/core/error.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
 #include <boost/beast/core/string.hpp>
+#include <boost/beast/core/tcp_stream.hpp>
 #include <boost/beast/websocket.hpp>
+#include <boost/beast/websocket/stream.hpp>
+#include <boost/json/object.hpp>
+#include <boost/json/parse.hpp>
+#include <boost/json/value.hpp>
 #include <grpcpp/grpcpp.h>
+#include <ripple/basics/base_uint.h>
+#include <ripple/basics/strHex.h>
 #include <ripple/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
 
+#include <atomic>
 #include <chrono>
-#include <mutex>
+#include <cstddef>
+#include <cstdint>
+#include <exception>
+#include <functional>
+#include <iterator>
+#include <memory>
+#include <optional>
+#include <random>
+#include <sstream>
+#include <string>
 #include <thread>
+#include <utility>
+#include <vector>
 
 namespace etl::detail {
 
diff --git a/src/etl/impl/ExtractionDataPipe.h b/src/etl/impl/ExtractionDataPipe.h
index 91424cc7..b6b9bc35 100644
--- a/src/etl/impl/ExtractionDataPipe.h
+++ b/src/etl/impl/ExtractionDataPipe.h
@@ -22,7 +22,10 @@
 #include "etl/ETLHelpers.h"
 #include "util/log/Logger.h"
 
+#include <cstddef>
+#include <cstdint>
 #include <memory>
+#include <optional>
 #include <vector>
 
 namespace etl::detail {
diff --git a/src/etl/impl/Extractor.h b/src/etl/impl/Extractor.h
index 70eece6e..e115bddb 100644
--- a/src/etl/impl/Extractor.h
+++ b/src/etl/impl/Extractor.h
@@ -27,7 +27,10 @@
 #include <ripple/beast/core/CurrentThreadName.h>
 
 #include <chrono>
-#include <mutex>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <optional>
 #include <thread>
 #include <utility>
 
diff --git a/src/etl/impl/ForwardCache.h b/src/etl/impl/ForwardCache.h
index 77900580..05a4dceb 100644
--- a/src/etl/impl/ForwardCache.h
+++ b/src/etl/impl/ForwardCache.h
@@ -19,16 +19,19 @@
 
 #pragma once
 
-#include "data/BackendInterface.h"
-#include "etl/ETLHelpers.h"
 #include "util/config/Config.h"
 #include "util/log/Logger.h"
 
 #include <boost/asio.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/strand.hpp>
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
 
-#include <atomic>
-#include <mutex>
+#include <cstdint>
+#include <optional>
+#include <shared_mutex>
+#include <string>
 #include <unordered_map>
 
 namespace etl {
diff --git a/src/etl/impl/LedgerFetcher.h b/src/etl/impl/LedgerFetcher.h
index 4f8e58bd..62055cf6 100644
--- a/src/etl/impl/LedgerFetcher.h
+++ b/src/etl/impl/LedgerFetcher.h
@@ -20,13 +20,13 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "etl/Source.h"
 #include "util/log/Logger.h"
 
 #include <grpcpp/grpcpp.h>
 #include <ripple/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
 
-#include <optional>
+#include <cstdint>
+#include <memory>
 #include <utility>
 
 namespace etl::detail {
diff --git a/src/etl/impl/LedgerLoader.h b/src/etl/impl/LedgerLoader.h
index b765df95..10a47455 100644
--- a/src/etl/impl/LedgerLoader.h
+++ b/src/etl/impl/LedgerLoader.h
@@ -20,6 +20,8 @@
 #pragma once
 
 #include "data/BackendInterface.h"
+#include "data/DBHelpers.h"
+#include "data/Types.h"
 #include "etl/NFTHelpers.h"
 #include "etl/SystemState.h"
 #include "etl/impl/LedgerFetcher.h"
@@ -28,10 +30,23 @@
 #include "util/Profiler.h"
 #include "util/log/Logger.h"
 
+#include <ripple/basics/base_uint.h>
+#include <ripple/basics/strHex.h>
 #include <ripple/beast/core/CurrentThreadName.h>
+#include <ripple/protocol/LedgerHeader.h>
+#include <ripple/protocol/STTx.h>
+#include <ripple/protocol/Serializer.h>
+#include <ripple/protocol/TxMeta.h>
 
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <memory>
+#include <optional>
+#include <string>
 #include <utility>
+#include <vector>
 
 /**
  * @brief Account transactions, NFT transactions and NFT data bundled togeher.
diff --git a/src/etl/impl/LedgerPublisher.h b/src/etl/impl/LedgerPublisher.h
index aacfcd95..85cb8061 100644
--- a/src/etl/impl/LedgerPublisher.h
+++ b/src/etl/impl/LedgerPublisher.h
@@ -20,16 +20,33 @@
 #pragma once
 
 #include "data/BackendInterface.h"
+#include "data/DBHelpers.h"
+#include "data/Types.h"
 #include "etl/SystemState.h"
-#include "feed/SubscriptionManager.h"
 #include "util/Assert.h"
-#include "util/LedgerUtils.h"
 #include "util/log/Logger.h"
 
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/strand.hpp>
+#include <ripple/basics/chrono.h>
+#include <ripple/protocol/Fees.h>
 #include <ripple/protocol/LedgerHeader.h>
+#include <ripple/protocol/SField.h>
+#include <ripple/protocol/STObject.h>
+#include <ripple/protocol/Serializer.h>
 
 #include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <shared_mutex>
+#include <string>
+#include <thread>
 #include <utility>
+#include <vector>
 
 namespace etl::detail {
 
diff --git a/src/etl/impl/Transformer.h b/src/etl/impl/Transformer.h
index f211799a..4e6faf9c 100644
--- a/src/etl/impl/Transformer.h
+++ b/src/etl/impl/Transformer.h
@@ -20,6 +20,8 @@
 #pragma once
 
 #include "data/BackendInterface.h"
+#include "data/DBHelpers.h"
+#include "data/Types.h"
 #include "etl/SystemState.h"
 #include "etl/impl/AmendmentBlock.h"
 #include "etl/impl/LedgerLoader.h"
@@ -29,13 +31,23 @@
 #include "util/log/Logger.h"
 
 #include <grpcpp/grpcpp.h>
+#include <ripple/basics/base_uint.h>
+#include <ripple/basics/strHex.h>
 #include <ripple/beast/core/CurrentThreadName.h>
 #include <ripple/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
+#include <ripple/protocol/LedgerHeader.h>
 
 #include <chrono>
+#include <cstdint>
+#include <functional>
 #include <memory>
+#include <optional>
+#include <set>
+#include <stdexcept>
+#include <string>
 #include <thread>
 #include <utility>
+#include <vector>
 
 namespace etl::detail {
 
diff --git a/src/rpc/AMMHelpers.h b/src/rpc/AMMHelpers.h
index cd978ee8..328a9324 100644
--- a/src/rpc/AMMHelpers.h
+++ b/src/rpc/AMMHelpers.h
@@ -20,7 +20,16 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "rpc/RPCHelpers.h"
+
+#include <boost/asio/spawn.hpp>
+#include <ripple/protocol/AccountID.h>
+#include <ripple/protocol/Issue.h>
+#include <ripple/protocol/STAmount.h>
+#include <ripple/protocol/STLedgerEntry.h>
+#include <ripple/protocol/UintTypes.h>
+
+#include <cstdint>
+#include <utility>
 
 namespace rpc {
 
diff --git a/src/rpc/Amendments.h b/src/rpc/Amendments.h
index 2e695309..7002ea7b 100644
--- a/src/rpc/Amendments.h
+++ b/src/rpc/Amendments.h
@@ -19,9 +19,12 @@
 
 #pragma once
 
+#include <ripple/basics/Slice.h>
 #include <ripple/basics/base_uint.h>
 #include <ripple/protocol/digest.h>
 
+#include <string_view>
+
 namespace rpc {
 
 #define REGISTER_AMENDMENT(name) inline static const ripple::uint256 name = GetAmendmentId(#name);
diff --git a/src/rpc/BookChangesHelper.h b/src/rpc/BookChangesHelper.h
index 0e5f98f1..72b47927 100644
--- a/src/rpc/BookChangesHelper.h
+++ b/src/rpc/BookChangesHelper.h
@@ -20,9 +20,35 @@
 /** @file */
 #pragma once
 
+#include "data/Types.h"
+#include "rpc/JS.h"
 #include "rpc/RPCHelpers.h"
 
+#include <boost/json/conversion.hpp>
+#include <boost/json/object.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/basics/IOUAmount.h>
+#include <ripple/basics/XRPAmount.h>
+#include <ripple/beast/utility/Zero.h>
+#include <ripple/protocol/Issue.h>
+#include <ripple/protocol/LedgerFormats.h>
+#include <ripple/protocol/LedgerHeader.h>
+#include <ripple/protocol/SField.h>
+#include <ripple/protocol/STAmount.h>
+#include <ripple/protocol/STObject.h>
+#include <ripple/protocol/STTx.h>
+#include <ripple/protocol/TxFormats.h>
+#include <ripple/protocol/jss.h>
+
+#include <algorithm>
+#include <cstdint>
+#include <iterator>
+#include <map>
+#include <memory>
+#include <optional>
 #include <set>
+#include <string>
+#include <vector>
 
 namespace rpc {
 
diff --git a/src/rpc/Counters.h b/src/rpc/Counters.h
index 7405fea2..3f1308f6 100644
--- a/src/rpc/Counters.h
+++ b/src/rpc/Counters.h
@@ -20,11 +20,13 @@
 #pragma once
 
 #include "rpc/WorkQueue.h"
-#include "util/prometheus/Prometheus.h"
+#include "util/prometheus/Counter.h"
 
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
 
 #include <chrono>
+#include <functional>
 #include <mutex>
 #include <string>
 #include <unordered_map>
diff --git a/src/rpc/Errors.h b/src/rpc/Errors.h
index 82e81d28..21dc5e1f 100644
--- a/src/rpc/Errors.h
+++ b/src/rpc/Errors.h
@@ -23,6 +23,7 @@
 #include <boost/json/object.hpp>
 #include <ripple/protocol/ErrorCodes.h>
 
+#include <exception>
 #include <optional>
 #include <string>
 #include <string_view>
diff --git a/src/rpc/Factories.h b/src/rpc/Factories.h
index 178ad531..836e6166 100644
--- a/src/rpc/Factories.h
+++ b/src/rpc/Factories.h
@@ -19,17 +19,20 @@
 
 #pragma once
 
-#include "data/BackendInterface.h"
+#include "data/Types.h"
 #include "rpc/Errors.h"
 #include "rpc/common/APIVersion.h"
 #include "util/Expected.h"
+#include "util/Taggable.h"
 #include "web/Context.h"
 #include "web/interface/ConnectionBase.h"
 
 #include <boost/asio/spawn.hpp>
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
 
-#include <optional>
+#include <functional>
+#include <memory>
 #include <string>
 
 /*
diff --git a/src/rpc/RPCEngine.h b/src/rpc/RPCEngine.h
index 6b8f7eea..8134e3bc 100644
--- a/src/rpc/RPCEngine.h
+++ b/src/rpc/RPCEngine.h
@@ -20,15 +20,12 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "etl/Source.h"
 #include "rpc/Counters.h"
 #include "rpc/Errors.h"
-#include "rpc/RPCHelpers.h"
-#include "rpc/common/AnyHandler.h"
+#include "rpc/WorkQueue.h"
+#include "rpc/common/HandlerProvider.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/impl/ForwardingProxy.h"
-#include "util/Taggable.h"
-#include "util/config/Config.h"
 #include "util/log/Logger.h"
 #include "web/Context.h"
 #include "web/DOSGuard.h"
@@ -36,11 +33,13 @@
 #include <boost/asio/spawn.hpp>
 #include <boost/json.hpp>
 #include <fmt/core.h>
+#include <ripple/protocol/ErrorCodes.h>
 
-#include <optional>
+#include <chrono>
+#include <exception>
+#include <functional>
+#include <memory>
 #include <string>
-#include <unordered_map>
-#include <variant>
 
 // forward declarations
 namespace feed {
diff --git a/src/rpc/RPCHelpers.h b/src/rpc/RPCHelpers.h
index 77bf158a..42bab9e7 100644
--- a/src/rpc/RPCHelpers.h
+++ b/src/rpc/RPCHelpers.h
@@ -26,9 +26,7 @@
 
 #include "data/BackendInterface.h"
 #include "data/Types.h"
-#include "rpc/Amendments.h"
 #include "rpc/Errors.h"
-#include "rpc/JS.h"
 #include "rpc/common/Types.h"
 #include "util/JsonUtils.h"
 #include "util/log/Logger.h"
diff --git a/src/rpc/WorkQueue.h b/src/rpc/WorkQueue.h
index f932ece1..f96cd73f 100644
--- a/src/rpc/WorkQueue.h
+++ b/src/rpc/WorkQueue.h
@@ -21,16 +21,19 @@
 
 #include "util/config/Config.h"
 #include "util/log/Logger.h"
-#include "util/prometheus/Prometheus.h"
+#include "util/prometheus/Counter.h"
+#include "util/prometheus/Gauge.h"
 
 #include <boost/asio.hpp>
 #include <boost/asio/spawn.hpp>
+#include <boost/asio/thread_pool.hpp>
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
 
-#include <memory>
-#include <optional>
-#include <queue>
-#include <shared_mutex>
+#include <chrono>
+#include <cstdint>
+#include <functional>
+#include <limits>
 #include <thread>
 
 namespace rpc {
diff --git a/src/rpc/common/APIVersion.h b/src/rpc/common/APIVersion.h
index 4c77498c..e07da33a 100644
--- a/src/rpc/common/APIVersion.h
+++ b/src/rpc/common/APIVersion.h
@@ -19,11 +19,12 @@
 
 #pragma once
 
-#include "rpc/common/Types.h"
 #include "util/Expected.h"
 
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
 
+#include <cstdint>
 #include <string>
 
 namespace rpc {
diff --git a/src/rpc/common/AnyHandler.h b/src/rpc/common/AnyHandler.h
index 6c69f9ef..1078053a 100644
--- a/src/rpc/common/AnyHandler.h
+++ b/src/rpc/common/AnyHandler.h
@@ -23,6 +23,10 @@
 #include "rpc/common/Types.h"
 #include "rpc/common/impl/Processors.h"
 
+#include <boost/json/value.hpp>
+
+#include <memory>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/common/Concepts.h b/src/rpc/common/Concepts.h
index 569b0b63..e76453f3 100644
--- a/src/rpc/common/Concepts.h
+++ b/src/rpc/common/Concepts.h
@@ -21,9 +21,11 @@
 
 #include "rpc/common/Types.h"
 
+#include <boost/json/value.hpp>
 #include <boost/json/value_from.hpp>
 #include <boost/json/value_to.hpp>
 
+#include <cstdint>
 #include <string>
 
 namespace rpc {
diff --git a/src/rpc/common/HandlerProvider.h b/src/rpc/common/HandlerProvider.h
new file mode 100644
index 00000000..4b7fd235
--- /dev/null
+++ b/src/rpc/common/HandlerProvider.h
@@ -0,0 +1,46 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of clio: https://github.com/XRPLF/clio
+    Copyright (c) 2024, the clio developers.
+
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL,  DIRECT,  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#pragma once
+
+#include "rpc/common/AnyHandler.h"
+
+#include <optional>
+#include <string>
+
+namespace rpc {
+
+/**
+ * @brief Interface for the provider of RPC handlers.
+ */
+class HandlerProvider {
+public:
+    virtual ~HandlerProvider() = default;
+
+    virtual bool
+    contains(std::string const& method) const = 0;
+
+    virtual std::optional<AnyHandler>
+    getHandler(std::string const& command) const = 0;
+
+    virtual bool
+    isClioOnly(std::string const& command) const = 0;
+};
+
+}  // namespace rpc
diff --git a/src/rpc/common/JsonBool.h b/src/rpc/common/JsonBool.h
index a1378b2a..8b63ab03 100644
--- a/src/rpc/common/JsonBool.h
+++ b/src/rpc/common/JsonBool.h
@@ -1,7 +1,31 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of clio: https://github.com/XRPLF/clio
+    Copyright (c) 2023, the clio developers.
+
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL,  DIRECT,  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
 #pragma once
 
+#include <boost/json/conversion.hpp>
+#include <boost/json/kind.hpp>
+#include <boost/json/value.hpp>
 #include <boost/json/value_to.hpp>
 
+#include <stdexcept>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/common/MetaProcessors.h b/src/rpc/common/MetaProcessors.h
index 95f0afc7..fd2a888b 100644
--- a/src/rpc/common/MetaProcessors.h
+++ b/src/rpc/common/MetaProcessors.h
@@ -20,6 +20,7 @@
 #pragma once
 
 #include "rpc/Errors.h"
+#include "rpc/common/Concepts.h"
 #include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
diff --git a/src/rpc/common/Modifiers.h b/src/rpc/common/Modifiers.h
index 0b5c0fbb..6e860e15 100644
--- a/src/rpc/common/Modifiers.h
+++ b/src/rpc/common/Modifiers.h
@@ -19,11 +19,11 @@
 
 #pragma once
 
-#include "rpc/common/Concepts.h"
-#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "util/JsonUtils.h"
 
+#include <boost/json/value.hpp>
+
 #include <string_view>
 
 namespace rpc::modifiers {
diff --git a/src/rpc/common/Specs.h b/src/rpc/common/Specs.h
index 70b293eb..035c8af7 100644
--- a/src/rpc/common/Specs.h
+++ b/src/rpc/common/Specs.h
@@ -23,6 +23,10 @@
 #include "rpc/common/Types.h"
 #include "rpc/common/impl/Factories.h"
 
+#include <boost/json/value.hpp>
+
+#include <functional>
+#include <initializer_list>
 #include <string>
 #include <vector>
 
diff --git a/src/rpc/common/Types.h b/src/rpc/common/Types.h
index 165e4d4d..ecbf720a 100644
--- a/src/rpc/common/Types.h
+++ b/src/rpc/common/Types.h
@@ -23,9 +23,17 @@
 #include "util/Expected.h"
 
 #include <boost/asio/spawn.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/object.hpp>
 #include <boost/json/value.hpp>
 #include <boost/json/value_from.hpp>
 #include <ripple/basics/base_uint.h>
+#include <ripple/basics/strHex.h>
+
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <variant>
 
 namespace etl {
 class LoadBalancer;
@@ -42,7 +50,6 @@ namespace rpc {
 class Counters;
 struct RpcSpec;
 struct FieldSpec;
-class AnyHandler;
 
 /**
  * @brief Return type used for Validators that can return error but don't have
@@ -112,23 +119,6 @@ struct AccountCursor {
     }
 };
 
-/**
- * @brief Interface for the provider of RPC handlers.
- */
-class HandlerProvider {
-public:
-    virtual ~HandlerProvider() = default;
-
-    virtual bool
-    contains(std::string const& method) const = 0;
-
-    virtual std::optional<AnyHandler>
-    getHandler(std::string const& command) const = 0;
-
-    virtual bool
-    isClioOnly(std::string const& command) const = 0;
-};
-
 inline void
 tag_invoke(boost::json::value_from_tag, boost::json::value& jv, VoidOutput const&)
 {
diff --git a/src/rpc/common/Validators.h b/src/rpc/common/Validators.h
index 6555939a..3e2c28d6 100644
--- a/src/rpc/common/Validators.h
+++ b/src/rpc/common/Validators.h
@@ -19,13 +19,22 @@
 
 #pragma once
 
-#include "rpc/common/Concepts.h"
-#include "rpc/common/Specs.h"
+#include "rpc/Errors.h"
 #include "rpc/common/Types.h"
 
+#include <boost/json/array.hpp>
+#include <boost/json/object.hpp>
+#include <boost/json/value.hpp>
 #include <fmt/core.h>
+#include <ripple/protocol/ErrorCodes.h>
 
+#include <cstdint>
+#include <functional>
+#include <initializer_list>
+#include <string>
+#include <string_view>
 #include <utility>
+#include <vector>
 
 namespace rpc::validation {
 
diff --git a/src/rpc/common/impl/APIVersionParser.h b/src/rpc/common/impl/APIVersionParser.h
index daa25d9d..19df8b22 100644
--- a/src/rpc/common/impl/APIVersionParser.h
+++ b/src/rpc/common/impl/APIVersionParser.h
@@ -24,7 +24,10 @@
 #include "util/config/Config.h"
 #include "util/log/Logger.h"
 
+#include <boost/json/object.hpp>
+
 #include <algorithm>
+#include <cstdint>
 #include <string>
 
 namespace rpc::detail {
diff --git a/src/rpc/common/impl/Factories.h b/src/rpc/common/impl/Factories.h
index 3597c42c..b641e670 100644
--- a/src/rpc/common/impl/Factories.h
+++ b/src/rpc/common/impl/Factories.h
@@ -19,12 +19,14 @@
 
 #pragma once
 
+#include "rpc/Errors.h"
 #include "rpc/common/Concepts.h"
 #include "rpc/common/Types.h"
 
 #include <boost/json/value.hpp>
 
 #include <optional>
+#include <string>
 
 namespace rpc::detail {
 
diff --git a/src/rpc/common/impl/ForwardingProxy.h b/src/rpc/common/impl/ForwardingProxy.h
index abbe0a28..aa7ebc41 100644
--- a/src/rpc/common/impl/ForwardingProxy.h
+++ b/src/rpc/common/impl/ForwardingProxy.h
@@ -19,16 +19,18 @@
 
 #pragma once
 
-#include "etl/LoadBalancer.h"
-#include "etl/Source.h"
-#include "rpc/Counters.h"
+#include "rpc/Errors.h"
 #include "rpc/RPCHelpers.h"
 #include "rpc/common/Types.h"
 #include "util/log/Logger.h"
 #include "web/Context.h"
 
+#include <ripple/protocol/ErrorCodes.h>
+
+#include <functional>
 #include <memory>
 #include <string>
+#include <unordered_set>
 
 namespace rpc::detail {
 
diff --git a/src/rpc/common/impl/HandlerProvider.h b/src/rpc/common/impl/HandlerProvider.h
index b3c05ab1..13e1dc05 100644
--- a/src/rpc/common/impl/HandlerProvider.h
+++ b/src/rpc/common/impl/HandlerProvider.h
@@ -22,8 +22,11 @@
 #include "data/BackendInterface.h"
 #include "feed/SubscriptionManager.h"
 #include "rpc/common/AnyHandler.h"
+#include "rpc/common/HandlerProvider.h"
 #include "rpc/common/Types.h"
+#include "util/config/Config.h"
 
+#include <memory>
 #include <optional>
 #include <string>
 #include <unordered_map>
diff --git a/src/rpc/handlers/AMMInfo.h b/src/rpc/handlers/AMMInfo.h
index 6f9d2b91..42d6f567 100644
--- a/src/rpc/handlers/AMMInfo.h
+++ b/src/rpc/handlers/AMMInfo.h
@@ -22,6 +22,17 @@
 #include "data/BackendInterface.h"
 #include "rpc/common/Types.h"
 
+#include <boost/json/array.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/AccountID.h>
+#include <ripple/protocol/Issue.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/handlers/AccountChannels.h b/src/rpc/handlers/AccountChannels.h
index 30589cfd..cbdf46ea 100644
--- a/src/rpc/handlers/AccountChannels.h
+++ b/src/rpc/handlers/AccountChannels.h
@@ -22,9 +22,19 @@
 #include "data/BackendInterface.h"
 #include "rpc/JS.h"
 #include "rpc/common/Modifiers.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/STLedgerEntry.h>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
 #include <vector>
 
 namespace rpc {
diff --git a/src/rpc/handlers/AccountCurrencies.h b/src/rpc/handlers/AccountCurrencies.h
index 8e0b669b..2fb16696 100644
--- a/src/rpc/handlers/AccountCurrencies.h
+++ b/src/rpc/handlers/AccountCurrencies.h
@@ -20,12 +20,20 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "rpc/RPCHelpers.h"
-#include "rpc/common/MetaProcessors.h"
+#include "rpc/JS.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
 #include <set>
+#include <string>
 
 namespace rpc {
 
diff --git a/src/rpc/handlers/AccountInfo.h b/src/rpc/handlers/AccountInfo.h
index 927e7157..174309fe 100644
--- a/src/rpc/handlers/AccountInfo.h
+++ b/src/rpc/handlers/AccountInfo.h
@@ -20,12 +20,24 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "rpc/RPCHelpers.h"
+#include "rpc/JS.h"
 #include "rpc/common/JsonBool.h"
-#include "rpc/common/MetaProcessors.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/STLedgerEntry.h>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/handlers/AccountLines.h b/src/rpc/handlers/AccountLines.h
index be5a7021..2a579fa1 100644
--- a/src/rpc/handlers/AccountLines.h
+++ b/src/rpc/handlers/AccountLines.h
@@ -20,12 +20,24 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "rpc/RPCHelpers.h"
+#include "rpc/Errors.h"
+#include "rpc/JS.h"
 #include "rpc/common/MetaProcessors.h"
 #include "rpc/common/Modifiers.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/AccountID.h>
+#include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/STLedgerEntry.h>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
 #include <vector>
 
 namespace rpc {
diff --git a/src/rpc/handlers/AccountNFTs.h b/src/rpc/handlers/AccountNFTs.h
index 6683d0c6..4c28b8c4 100644
--- a/src/rpc/handlers/AccountNFTs.h
+++ b/src/rpc/handlers/AccountNFTs.h
@@ -20,11 +20,22 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "rpc/RPCHelpers.h"
+#include "rpc/JS.h"
 #include "rpc/common/Modifiers.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
+#include <boost/json/array.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/handlers/AccountObjects.h b/src/rpc/handlers/AccountObjects.h
index af6e4b8d..dccd19ae 100644
--- a/src/rpc/handlers/AccountObjects.h
+++ b/src/rpc/handlers/AccountObjects.h
@@ -22,6 +22,7 @@
 #include "data/BackendInterface.h"
 #include "rpc/JS.h"
 #include "rpc/common/Modifiers.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 #include "util/LedgerUtils.h"
diff --git a/src/rpc/handlers/AccountOffers.h b/src/rpc/handlers/AccountOffers.h
index 68fb4fc8..cca56a6d 100644
--- a/src/rpc/handlers/AccountOffers.h
+++ b/src/rpc/handlers/AccountOffers.h
@@ -20,12 +20,24 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "rpc/RPCHelpers.h"
-#include "rpc/common/MetaProcessors.h"
+#include "rpc/JS.h"
 #include "rpc/common/Modifiers.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/STAmount.h>
+#include <ripple/protocol/STLedgerEntry.h>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/handlers/BookChanges.h b/src/rpc/handlers/BookChanges.h
index 35716b69..4ef3bc0e 100644
--- a/src/rpc/handlers/BookChanges.h
+++ b/src/rpc/handlers/BookChanges.h
@@ -21,10 +21,21 @@
 
 #include "data/BackendInterface.h"
 #include "rpc/BookChangesHelper.h"
-#include "rpc/RPCHelpers.h"
+#include "rpc/JS.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/handlers/BookOffers.h b/src/rpc/handlers/BookOffers.h
index f8457501..8a0f2072 100644
--- a/src/rpc/handlers/BookOffers.h
+++ b/src/rpc/handlers/BookOffers.h
@@ -20,13 +20,28 @@
 #pragma once
 
 #include "data/BackendInterface.h"
+#include "rpc/Errors.h"
 #include "rpc/JS.h"
 #include "rpc/common/MetaProcessors.h"
 #include "rpc/common/Modifiers.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
+#include "rpc/common/Validators.h"
 
+#include <boost/json/array.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/object.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/AccountID.h>
+#include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/UintTypes.h>
 #include <ripple/protocol/jss.h>
 
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/handlers/DepositAuthorized.h b/src/rpc/handlers/DepositAuthorized.h
index 24405fcc..acf0780d 100644
--- a/src/rpc/handlers/DepositAuthorized.h
+++ b/src/rpc/handlers/DepositAuthorized.h
@@ -21,10 +21,18 @@
 
 #include "data/BackendInterface.h"
 #include "rpc/JS.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
-#include <vector>
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
 
 namespace rpc {
 
diff --git a/src/rpc/handlers/GatewayBalances.h b/src/rpc/handlers/GatewayBalances.h
index 7f3d3b0f..d35bdb7f 100644
--- a/src/rpc/handlers/GatewayBalances.h
+++ b/src/rpc/handlers/GatewayBalances.h
@@ -20,11 +20,32 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "rpc/RPCHelpers.h"
-#include "rpc/common/MetaProcessors.h"
+#include "rpc/Errors.h"
+#include "rpc/JS.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
+#include <boost/json/array.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/AccountID.h>
+#include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/PublicKey.h>
+#include <ripple/protocol/STAmount.h>
+#include <ripple/protocol/UintTypes.h>
+#include <ripple/protocol/jss.h>
+#include <ripple/protocol/tokens.h>
+
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <optional>
+#include <set>
+#include <string>
+#include <string_view>
+#include <vector>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/handlers/Ledger.h b/src/rpc/handlers/Ledger.h
index a887b6da..715eb3e9 100644
--- a/src/rpc/handlers/Ledger.h
+++ b/src/rpc/handlers/Ledger.h
@@ -20,10 +20,21 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "rpc/RPCHelpers.h"
+#include "rpc/JS.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
+#include <boost/json/conversion.hpp>
+#include <boost/json/object.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/handlers/LedgerData.h b/src/rpc/handlers/LedgerData.h
index ac5f3bbe..3d4a8e23 100644
--- a/src/rpc/handlers/LedgerData.h
+++ b/src/rpc/handlers/LedgerData.h
@@ -23,6 +23,7 @@
 #include "rpc/Errors.h"
 #include "rpc/JS.h"
 #include "rpc/common/MetaProcessors.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 #include "util/LedgerUtils.h"
diff --git a/src/rpc/handlers/LedgerEntry.h b/src/rpc/handlers/LedgerEntry.h
index 2bf4aeed..4fdd139a 100644
--- a/src/rpc/handlers/LedgerEntry.h
+++ b/src/rpc/handlers/LedgerEntry.h
@@ -23,6 +23,7 @@
 #include "rpc/Errors.h"
 #include "rpc/JS.h"
 #include "rpc/common/MetaProcessors.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
diff --git a/src/rpc/handlers/LedgerRange.h b/src/rpc/handlers/LedgerRange.h
index cb5b7ed5..79bf66cb 100644
--- a/src/rpc/handlers/LedgerRange.h
+++ b/src/rpc/handlers/LedgerRange.h
@@ -20,9 +20,12 @@
 #pragma once
 
 #include "data/BackendInterface.h"
+#include "data/Types.h"
 #include "rpc/common/Types.h"
 
 #include <boost/json.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
 
 #include <memory>
 
diff --git a/src/rpc/handlers/NFTBuyOffers.h b/src/rpc/handlers/NFTBuyOffers.h
index b4559e9a..5f563feb 100644
--- a/src/rpc/handlers/NFTBuyOffers.h
+++ b/src/rpc/handlers/NFTBuyOffers.h
@@ -20,8 +20,11 @@
 #pragma once
 
 #include "data/BackendInterface.h"
+#include "rpc/common/Types.h"
 #include "rpc/handlers/NFTOffersCommon.h"
 
+#include <memory>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/handlers/NFTHistory.h b/src/rpc/handlers/NFTHistory.h
index 9647e9c8..6a4be99e 100644
--- a/src/rpc/handlers/NFTHistory.h
+++ b/src/rpc/handlers/NFTHistory.h
@@ -20,13 +20,27 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "rpc/RPCHelpers.h"
+#include "rpc/Errors.h"
+#include "rpc/JS.h"
 #include "rpc/common/MetaProcessors.h"
 #include "rpc/common/Modifiers.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 #include "util/log/Logger.h"
 
+#include <boost/json/array.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/object.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/handlers/NFTInfo.h b/src/rpc/handlers/NFTInfo.h
index 613b08d8..55f9bffa 100644
--- a/src/rpc/handlers/NFTInfo.h
+++ b/src/rpc/handlers/NFTInfo.h
@@ -20,10 +20,20 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "rpc/RPCHelpers.h"
+#include "rpc/JS.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/handlers/NFTOffersCommon.h b/src/rpc/handlers/NFTOffersCommon.h
index c26865e4..4faa5674 100644
--- a/src/rpc/handlers/NFTOffersCommon.h
+++ b/src/rpc/handlers/NFTOffersCommon.h
@@ -20,11 +20,26 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "rpc/RPCHelpers.h"
+#include "rpc/JS.h"
 #include "rpc/common/Modifiers.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
+#include <boost/asio/spawn.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/basics/base_uint.h>
+#include <ripple/protocol/Keylet.h>
+#include <ripple/protocol/STLedgerEntry.h>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
+
 namespace rpc {
 
 class NFTOffersHandlerBase {
diff --git a/src/rpc/handlers/NFTSellOffers.h b/src/rpc/handlers/NFTSellOffers.h
index 4e9d4329..4659e175 100644
--- a/src/rpc/handlers/NFTSellOffers.h
+++ b/src/rpc/handlers/NFTSellOffers.h
@@ -20,8 +20,11 @@
 #pragma once
 
 #include "data/BackendInterface.h"
+#include "rpc/common/Types.h"
 #include "rpc/handlers/NFTOffersCommon.h"
 
+#include <memory>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/handlers/NFTsByIssuer.h b/src/rpc/handlers/NFTsByIssuer.h
index 2309a55c..a7c98c6f 100644
--- a/src/rpc/handlers/NFTsByIssuer.h
+++ b/src/rpc/handlers/NFTsByIssuer.h
@@ -22,9 +22,20 @@
 #include "data/BackendInterface.h"
 #include "rpc/JS.h"
 #include "rpc/common/Modifiers.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
+#include <boost/json/array.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+
 namespace rpc {
 class NFTsByIssuerHandler {
     std::shared_ptr<BackendInterface> sharedPtrBackend_;
diff --git a/src/rpc/handlers/NoRippleCheck.h b/src/rpc/handlers/NoRippleCheck.h
index f2098b51..fa7bfb89 100644
--- a/src/rpc/handlers/NoRippleCheck.h
+++ b/src/rpc/handlers/NoRippleCheck.h
@@ -20,14 +20,26 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "rpc/RPCHelpers.h"
+#include "rpc/Errors.h"
+#include "rpc/JS.h"
 #include "rpc/common/JsonBool.h"
 #include "rpc/common/MetaProcessors.h"
 #include "rpc/common/Modifiers.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
-#include <set>
+#include <boost/json/array.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
 
 namespace rpc {
 
diff --git a/src/rpc/handlers/Random.h b/src/rpc/handlers/Random.h
index 39f68fb7..1c83132b 100644
--- a/src/rpc/handlers/Random.h
+++ b/src/rpc/handlers/Random.h
@@ -21,6 +21,7 @@
 
 #include "rpc/common/Types.h"
 
+#include <boost/json/conversion.hpp>
 #include <boost/json/value.hpp>
 
 #include <string>
diff --git a/src/rpc/handlers/ServerInfo.h b/src/rpc/handlers/ServerInfo.h
index d85b65a7..bb213003 100644
--- a/src/rpc/handlers/ServerInfo.h
+++ b/src/rpc/handlers/ServerInfo.h
@@ -23,15 +23,29 @@
 #include "data/DBHelpers.h"
 #include "main/Build.h"
 #include "rpc/Errors.h"
-#include "rpc/RPCHelpers.h"
+#include "rpc/JS.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
-#include "rpc/common/Validators.h"
 
+#include <boost/json/conversion.hpp>
+#include <boost/json/object.hpp>
+#include <boost/json/value.hpp>
 #include <fmt/core.h>
 #include <ripple/basics/chrono.h>
+#include <ripple/basics/strHex.h>
 #include <ripple/protocol/BuildInfo.h>
+#include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/Fees.h>
+#include <ripple/protocol/Protocol.h>
+#include <ripple/protocol/jss.h>
 
 #include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <string>
 
 namespace etl {
 class ETLService;
diff --git a/src/rpc/handlers/TransactionEntry.h b/src/rpc/handlers/TransactionEntry.h
index ea189699..2cb141cf 100644
--- a/src/rpc/handlers/TransactionEntry.h
+++ b/src/rpc/handlers/TransactionEntry.h
@@ -20,11 +20,24 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "rpc/RPCHelpers.h"
+#include "rpc/Errors.h"
+#include "rpc/JS.h"
 #include "rpc/common/MetaProcessors.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 
+#include <boost/json/conversion.hpp>
+#include <boost/json/object.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/LedgerHeader.h>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+
 namespace rpc {
 
 /**
diff --git a/src/rpc/handlers/Tx.h b/src/rpc/handlers/Tx.h
index b21b8a11..a5067a0e 100644
--- a/src/rpc/handlers/Tx.h
+++ b/src/rpc/handlers/Tx.h
@@ -20,13 +20,34 @@
 #pragma once
 
 #include "data/BackendInterface.h"
+#include "data/Types.h"
 #include "etl/ETLService.h"
+#include "rpc/Errors.h"
+#include "rpc/JS.h"
 #include "rpc/RPCHelpers.h"
 #include "rpc/common/JsonBool.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 #include "util/JsonUtils.h"
 
+#include <boost/asio/spawn.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/object.hpp>
+#include <boost/json/value.hpp>
+#include <boost/json/value_to.hpp>
+#include <ripple/basics/base_uint.h>
+#include <ripple/basics/strHex.h>
+#include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/LedgerHeader.h>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+#include <utility>
+
 namespace rpc {
 
 template <typename ETLServiceType>
diff --git a/src/rpc/handlers/Unsubscribe.h b/src/rpc/handlers/Unsubscribe.h
index 44e2892c..4a1377b3 100644
--- a/src/rpc/handlers/Unsubscribe.h
+++ b/src/rpc/handlers/Unsubscribe.h
@@ -20,11 +20,28 @@
 #pragma once
 
 #include "data/BackendInterface.h"
+#include "rpc/Errors.h"
+#include "rpc/JS.h"
 #include "rpc/RPCHelpers.h"
+#include "rpc/common/Specs.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 #include "util/Assert.h"
 
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+#include <ripple/protocol/Book.h>
+#include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/jss.h>
+
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <variant>
+#include <vector>
+
 namespace feed {
 class SubscriptionManager;
 }  // namespace feed
diff --git a/src/rpc/handlers/VersionHandler.h b/src/rpc/handlers/VersionHandler.h
index baa9251d..d32e24e0 100644
--- a/src/rpc/handlers/VersionHandler.h
+++ b/src/rpc/handlers/VersionHandler.h
@@ -19,11 +19,15 @@
 
 #pragma once
 
-#include "rpc/Errors.h"
-#include "rpc/RPCHelpers.h"
 #include "rpc/common/APIVersion.h"
 #include "rpc/common/Types.h"
 #include "rpc/common/impl/APIVersionParser.h"
+#include "util/config/Config.h"
+
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
+
+#include <cstdint>
 
 namespace rpc {
 
diff --git a/src/util/Batching.h b/src/util/Batching.h
index f0931246..b96724c1 100644
--- a/src/util/Batching.h
+++ b/src/util/Batching.h
@@ -21,10 +21,9 @@
 
 #include "util/Assert.h"
 
-#include <algorithm>
+#include <cstddef>
 #include <functional>
 #include <iterator>
-#include <ranges>
 
 namespace util {
 
diff --git a/src/util/Concepts.h b/src/util/Concepts.h
index 6db150c9..050ac8a2 100644
--- a/src/util/Concepts.h
+++ b/src/util/Concepts.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <concepts>
+#include <type_traits>
 
 namespace util {
 
diff --git a/src/util/Expected.h b/src/util/Expected.h
index 895d7c57..bb3b8f40 100644
--- a/src/util/Expected.h
+++ b/src/util/Expected.h
@@ -33,8 +33,12 @@
 #pragma once
 
 #include <boost/outcome.hpp>
+#include <boost/outcome/policy/base.hpp>
+#include <boost/outcome/result.hpp>
+#include <boost/outcome/success_failure.hpp>
 #include <ripple/basics/contract.h>
 
+#include <cstddef>
 #include <stdexcept>
 #include <type_traits>
 
diff --git a/src/util/JsonUtils.h b/src/util/JsonUtils.h
index 803f139e..aed09c25 100644
--- a/src/util/JsonUtils.h
+++ b/src/util/JsonUtils.h
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
 
 #include <algorithm>
 #include <cctype>
diff --git a/src/util/LedgerUtils.h b/src/util/LedgerUtils.h
index f7090b11..e82f0b7b 100644
--- a/src/util/LedgerUtils.h
+++ b/src/util/LedgerUtils.h
@@ -22,6 +22,7 @@
 #include <fmt/core.h>
 #include <ripple/basics/Slice.h>
 #include <ripple/basics/StringUtilities.h>
+#include <ripple/basics/strHex.h>
 #include <ripple/protocol/LedgerFormats.h>
 #include <ripple/protocol/LedgerHeader.h>
 #include <ripple/protocol/jss.h>
diff --git a/src/util/SourceLocation.h b/src/util/SourceLocation.h
index ed906858..2d1895cf 100644
--- a/src/util/SourceLocation.h
+++ b/src/util/SourceLocation.h
@@ -27,10 +27,12 @@
 // this is used by clang on linux where source_location is still not out of
 // experimental headers
 #include <experimental/source_location>
-#endif
 
-#include <optional>
-#include <string>
+#else
+
+#include <cstddef>
+#include <string_view>
+#endif
 
 namespace util {
 
diff --git a/src/util/Taggable.h b/src/util/Taggable.h
index 15e204d8..99072a97 100644
--- a/src/util/Taggable.h
+++ b/src/util/Taggable.h
@@ -23,13 +23,17 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/json.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_io.hpp>
 
+#include <atomic>
+#include <functional>
 #include <memory>
 #include <optional>
 #include <ostream>
-#include <string>
+#include <stdexcept>
 
 namespace util {
 namespace detail {
diff --git a/src/util/TxUtils.cpp b/src/util/TxUtils.cpp
index ad0817c7..8b8ae0f2 100644
--- a/src/util/TxUtils.cpp
+++ b/src/util/TxUtils.cpp
@@ -28,7 +28,7 @@
 
 namespace util {
 
-std::unordered_set<std::string> const&
+[[nodiscard]] std::unordered_set<std::string> const&
 getTxTypesInLowercase()
 {
     static std::unordered_set<std::string> const typesKeysInLowercase = []() {
diff --git a/src/util/TxUtils.h b/src/util/TxUtils.h
index 115880e9..1412fefe 100644
--- a/src/util/TxUtils.h
+++ b/src/util/TxUtils.h
@@ -23,6 +23,6 @@
 #include <unordered_set>
 
 namespace util {
-std::unordered_set<std::string> const&
+[[nodiscard]] std::unordered_set<std::string> const&
 getTxTypesInLowercase();
 }  // namespace util
diff --git a/src/util/config/Config.h b/src/util/config/Config.h
index 61402c73..ff2f5927 100644
--- a/src/util/config/Config.h
+++ b/src/util/config/Config.h
@@ -22,11 +22,20 @@
 #include "util/config/detail/Helpers.h"
 
 #include <boost/json.hpp>
+#include <boost/json/kind.hpp>
+#include <boost/json/object.hpp>
+#include <boost/json/value.hpp>
 
+#include <cstdint>
+#include <exception>
 #include <filesystem>
+#include <functional>
 #include <optional>
+#include <stdexcept>
 #include <string>
 #include <string_view>
+#include <utility>
+#include <vector>
 
 namespace util {
 
diff --git a/src/util/log/Logger.h b/src/util/log/Logger.h
index db0ac08d..ef350b96 100644
--- a/src/util/log/Logger.h
+++ b/src/util/log/Logger.h
@@ -24,8 +24,14 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/json.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
 #include <boost/log/core/core.hpp>
+#include <boost/log/core/record.hpp>
+#include <boost/log/expressions/keyword.hpp>
 #include <boost/log/expressions/predicates/channel_severity_filter.hpp>
+#include <boost/log/keywords/channel.hpp>
+#include <boost/log/keywords/severity.hpp>
 #include <boost/log/sinks/unlocked_frontend.hpp>
 #include <boost/log/sources/record_ostream.hpp>
 #include <boost/log/sources/severity_channel_logger.hpp>
@@ -37,6 +43,11 @@
 #include <boost/log/utility/setup/file.hpp>
 #include <boost/log/utility/setup/formatter_parser.hpp>
 
+#include <cstddef>
+#include <optional>
+#include <ostream>
+#include <string>
+
 namespace util {
 
 class Config;
diff --git a/src/util/prometheus/Counter.h b/src/util/prometheus/Counter.h
index d89f195b..7c54f2ef 100644
--- a/src/util/prometheus/Counter.h
+++ b/src/util/prometheus/Counter.h
@@ -21,8 +21,14 @@
 
 #include "util/Assert.h"
 #include "util/prometheus/MetricBase.h"
+#include "util/prometheus/OStream.h"
 #include "util/prometheus/impl/AnyCounterBase.h"
 
+#include <cstdint>
+#include <string>
+#include <type_traits>
+#include <utility>
+
 namespace util::prometheus {
 
 /**
diff --git a/src/util/prometheus/Gauge.h b/src/util/prometheus/Gauge.h
index add39156..f04e4789 100644
--- a/src/util/prometheus/Gauge.h
+++ b/src/util/prometheus/Gauge.h
@@ -20,8 +20,14 @@
 #pragma once
 
 #include "util/prometheus/MetricBase.h"
+#include "util/prometheus/OStream.h"
 #include "util/prometheus/impl/AnyCounterBase.h"
 
+#include <cstdint>
+#include <string>
+#include <type_traits>
+#include <utility>
+
 namespace util::prometheus {
 
 /**
diff --git a/src/util/prometheus/Histogram.h b/src/util/prometheus/Histogram.h
index e04c9911..350ac03c 100644
--- a/src/util/prometheus/Histogram.h
+++ b/src/util/prometheus/Histogram.h
@@ -21,8 +21,16 @@
 
 #include "util/Assert.h"
 #include "util/prometheus/MetricBase.h"
+#include "util/prometheus/OStream.h"
 #include "util/prometheus/impl/HistogramImpl.h"
 
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
 namespace util::prometheus {
 
 /**
diff --git a/src/util/prometheus/Http.h b/src/util/prometheus/Http.h
index 714b35b2..4a49545c 100644
--- a/src/util/prometheus/Http.h
+++ b/src/util/prometheus/Http.h
@@ -19,9 +19,11 @@
 
 #pragma once
 
-#include "util/prometheus/Prometheus.h"
-
 #include <boost/beast/http.hpp>
+#include <boost/beast/http/message.hpp>
+#include <boost/beast/http/string_body.hpp>
+
+#include <optional>
 
 namespace util::prometheus {
 
diff --git a/src/util/prometheus/MetricBase.h b/src/util/prometheus/MetricBase.h
index 00191e7e..e8a3b195 100644
--- a/src/util/prometheus/MetricBase.h
+++ b/src/util/prometheus/MetricBase.h
@@ -19,10 +19,9 @@
 
 #pragma once
 
-#include "util/prometheus/Label.h"
 #include "util/prometheus/OStream.h"
 
-#include <cstdint>
+#include <string>
 
 namespace util::prometheus {
 
diff --git a/src/util/prometheus/MetricBuilder.h b/src/util/prometheus/MetricBuilder.h
index 13894712..8826b95f 100644
--- a/src/util/prometheus/MetricBuilder.h
+++ b/src/util/prometheus/MetricBuilder.h
@@ -21,6 +21,11 @@
 
 #include "util/prometheus/MetricBase.h"
 
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace util::prometheus {
 
 /**
diff --git a/src/util/prometheus/MetricsFamily.h b/src/util/prometheus/MetricsFamily.h
index 6b9af2d7..6300bcfb 100644
--- a/src/util/prometheus/MetricsFamily.h
+++ b/src/util/prometheus/MetricsFamily.h
@@ -19,10 +19,17 @@
 
 #pragma once
 
+#include "util/prometheus/Label.h"
+#include "util/prometheus/MetricBase.h"
 #include "util/prometheus/MetricBuilder.h"
+#include "util/prometheus/OStream.h"
 
+#include <cstdint>
+#include <memory>
 #include <optional>
+#include <string>
 #include <unordered_map>
+#include <vector>
 
 namespace util::prometheus {
 
diff --git a/src/util/prometheus/Prometheus.h b/src/util/prometheus/Prometheus.h
index ad7a118c..579ad575 100644
--- a/src/util/prometheus/Prometheus.h
+++ b/src/util/prometheus/Prometheus.h
@@ -23,8 +23,17 @@
 #include "util/prometheus/Counter.h"
 #include "util/prometheus/Gauge.h"
 #include "util/prometheus/Histogram.h"
+#include "util/prometheus/Label.h"
+#include "util/prometheus/MetricBase.h"
 #include "util/prometheus/MetricsFamily.h"
 
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 namespace util::prometheus {
 
 class PrometheusInterface {
diff --git a/src/util/prometheus/impl/AnyCounterBase.h b/src/util/prometheus/impl/AnyCounterBase.h
index c93977f5..cb13495b 100644
--- a/src/util/prometheus/impl/AnyCounterBase.h
+++ b/src/util/prometheus/impl/AnyCounterBase.h
@@ -22,6 +22,7 @@
 #include "util/prometheus/impl/CounterImpl.h"
 
 #include <memory>
+#include <type_traits>
 
 namespace util::prometheus::detail {
 
diff --git a/src/util/prometheus/impl/CounterImpl.h b/src/util/prometheus/impl/CounterImpl.h
index c3b58c2c..f0a44815 100644
--- a/src/util/prometheus/impl/CounterImpl.h
+++ b/src/util/prometheus/impl/CounterImpl.h
@@ -19,11 +19,9 @@
 
 #pragma once
 
-#include "util/Assert.h"
 #include "util/Atomic.h"
 
-#include <atomic>
-#include <concepts>
+#include <type_traits>
 
 namespace util::prometheus::detail {
 
diff --git a/src/util/prometheus/impl/HistogramImpl.h b/src/util/prometheus/impl/HistogramImpl.h
index 1254423c..ebe775f5 100644
--- a/src/util/prometheus/impl/HistogramImpl.h
+++ b/src/util/prometheus/impl/HistogramImpl.h
@@ -23,7 +23,14 @@
 #include "util/Concepts.h"
 #include "util/prometheus/OStream.h"
 
+#include <cstdint>
+#include <limits>
+#include <memory>
 #include <mutex>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
 
 namespace util::prometheus::detail {
 
diff --git a/src/web/Context.h b/src/web/Context.h
index 8000260b..2375e725 100644
--- a/src/web/Context.h
+++ b/src/web/Context.h
@@ -19,14 +19,16 @@
 
 #pragma once
 
-#include "data/BackendInterface.h"
+#include "data/Types.h"
 #include "util/Taggable.h"
 #include "util/log/Logger.h"
 #include "web/interface/ConnectionBase.h"
 
 #include <boost/asio/spawn.hpp>
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/src/web/DOSGuard.h b/src/web/DOSGuard.h
index e831715d..a2ece05f 100644
--- a/src/web/DOSGuard.h
+++ b/src/web/DOSGuard.h
@@ -29,9 +29,14 @@
 #include <boost/iterator/transform_iterator.hpp>
 #include <boost/system/error_code.hpp>
 
-#include <algorithm>
-#include <chrono>
-#include <ctime>
+#include <cstdint>
+#include <functional>
+#include <iterator>
+#include <mutex>
+#include <string>
+#include <string_view>
+#include <unordered_map>
+#include <unordered_set>
 
 namespace web {
 
diff --git a/src/web/HttpSession.h b/src/web/HttpSession.h
index 31968ac2..edd6d7e6 100644
--- a/src/web/HttpSession.h
+++ b/src/web/HttpSession.h
@@ -19,8 +19,21 @@
 
 #pragma once
 
+#include "util/Taggable.h"
+#include "web/DOSGuard.h"
 #include "web/PlainWsSession.h"
 #include "web/impl/HttpBase.h"
+#include "web/interface/ConnectionBase.h"
+
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/beast/core/error.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
+#include <boost/beast/core/tcp_stream.hpp>
+
+#include <functional>
+#include <memory>
+#include <string>
+#include <utility>
 
 namespace web {
 
diff --git a/src/web/IntervalSweepHandler.h b/src/web/IntervalSweepHandler.h
index a047c8fd..941ef834 100644
--- a/src/web/IntervalSweepHandler.h
+++ b/src/web/IntervalSweepHandler.h
@@ -22,8 +22,11 @@
 #include "util/config/Config.h"
 
 #include <boost/asio.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/steady_timer.hpp>
 
 #include <chrono>
+#include <functional>
 
 namespace web {
 
diff --git a/src/web/PlainWsSession.h b/src/web/PlainWsSession.h
index b21fc4e8..c4c56466 100644
--- a/src/web/PlainWsSession.h
+++ b/src/web/PlainWsSession.h
@@ -19,8 +19,25 @@
 
 #pragma once
 
+#include "util/Taggable.h"
+#include "web/DOSGuard.h"
 #include "web/impl/WsBase.h"
+#include "web/interface/ConnectionBase.h"
 
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
+#include <boost/beast/core/stream_traits.hpp>
+#include <boost/beast/core/tcp_stream.hpp>
+#include <boost/beast/http/message.hpp>
+#include <boost/beast/http/parser.hpp>
+#include <boost/beast/http/string_body.hpp>
+#include <boost/beast/websocket/stream.hpp>
+#include <boost/optional/optional.hpp>
+
+#include <chrono>
+#include <functional>
+#include <memory>
+#include <string>
 #include <utility>
 
 namespace web {
diff --git a/src/web/RPCServerHandler.h b/src/web/RPCServerHandler.h
index 6e56f267..79ccb7b1 100644
--- a/src/web/RPCServerHandler.h
+++ b/src/web/RPCServerHandler.h
@@ -20,7 +20,6 @@
 #pragma once
 
 #include "data/BackendInterface.h"
-#include "feed/SubscriptionManager.h"
 #include "rpc/Errors.h"
 #include "rpc/Factories.h"
 #include "rpc/JS.h"
diff --git a/src/web/Resolver.h b/src/web/Resolver.h
index 03060713..eb32c309 100644
--- a/src/web/Resolver.h
+++ b/src/web/Resolver.h
@@ -20,9 +20,12 @@
 #pragma once
 
 #include <boost/asio.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/ip/tcp.hpp>
 
 #include <concepts>
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace web {
diff --git a/src/web/Server.h b/src/web/Server.h
index c72815e9..bc5d0997 100644
--- a/src/web/Server.h
+++ b/src/web/Server.h
@@ -19,13 +19,35 @@
 
 #pragma once
 
+#include "util/Taggable.h"
 #include "util/log/Logger.h"
+#include "web/DOSGuard.h"
 #include "web/HttpSession.h"
 #include "web/SslHttpSession.h"
 #include "web/interface/Concepts.h"
 
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/ip/address.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/socket_base.hpp>
+#include <boost/asio/ssl/context.hpp>
+#include <boost/asio/ssl/error.hpp>
+#include <boost/asio/strand.hpp>
+#include <boost/beast/core/error.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
+#include <boost/beast/core/stream_traits.hpp>
+#include <boost/beast/core/tcp_stream.hpp>
 #include <fmt/core.h>
 
+#include <chrono>
+#include <exception>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <stdexcept>
+#include <string>
+#include <utility>
+
 /**
  * @brief This namespace implements the web server and related components.
  *
diff --git a/src/web/SslHttpSession.h b/src/web/SslHttpSession.h
index b3c61e2f..d2b035c3 100644
--- a/src/web/SslHttpSession.h
+++ b/src/web/SslHttpSession.h
@@ -19,8 +19,27 @@
 
 #pragma once
 
+#include "util/Taggable.h"
+#include "web/DOSGuard.h"
 #include "web/SslWsSession.h"
 #include "web/impl/HttpBase.h"
+#include "web/interface/ConnectionBase.h"
+
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/ssl/context.hpp>
+#include <boost/asio/ssl/stream_base.hpp>
+#include <boost/beast/core/error.hpp>
+#include <boost/beast/core/flat_buffer.hpp>
+#include <boost/beast/core/stream_traits.hpp>
+#include <boost/beast/core/tcp_stream.hpp>
+#include <boost/beast/ssl/ssl_stream.hpp>
+
+#include <chrono>
+#include <cstddef>
+#include <functional>
+#include <memory>
+#include <string>
+#include <utility>
 
 namespace web {
 
diff --git a/src/web/SslWsSession.h b/src/web/SslWsSession.h
index 72ce43de..ce849055 100644
--- a/src/web/SslWsSession.h
+++ b/src/web/SslWsSession.h
@@ -19,10 +19,26 @@
 
 #pragma once
 
+#include "util/Taggable.h"
+#include "web/DOSGuard.h"
 #include "web/impl/WsBase.h"
+#include "web/interface/ConnectionBase.h"
 
+#include <boost/beast/core/flat_buffer.hpp>
+#include <boost/beast/core/stream_traits.hpp>
+#include <boost/beast/core/tcp_stream.hpp>
+#include <boost/beast/http/message.hpp>
+#include <boost/beast/http/parser.hpp>
+#include <boost/beast/http/string_body.hpp>
 #include <boost/beast/ssl.hpp>
+#include <boost/beast/ssl/ssl_stream.hpp>
+#include <boost/beast/websocket/stream.hpp>
+#include <boost/optional/optional.hpp>
 
+#include <chrono>
+#include <functional>
+#include <memory>
+#include <string>
 #include <utility>
 
 namespace web {
diff --git a/src/web/WhitelistHandler.h b/src/web/WhitelistHandler.h
index b8f8529b..f6824d09 100644
--- a/src/web/WhitelistHandler.h
+++ b/src/web/WhitelistHandler.h
@@ -23,13 +23,21 @@
 #include "web/Resolver.h"
 
 #include <boost/asio.hpp>
+#include <boost/asio/ip/address.hpp>
+#include <boost/asio/ip/network_v4.hpp>
+#include <boost/asio/ip/network_v6.hpp>
 #include <boost/iterator/transform_iterator.hpp>
 #include <fmt/core.h>
 
+#include <algorithm>
+#include <functional>
 #include <regex>
+#include <stdexcept>
 #include <string>
+#include <string_view>
 #include <unordered_map>
 #include <unordered_set>
+#include <vector>
 
 namespace web {
 
diff --git a/src/web/impl/AdminVerificationStrategy.h b/src/web/impl/AdminVerificationStrategy.h
index cfa58a79..5d6f79db 100644
--- a/src/web/impl/AdminVerificationStrategy.h
+++ b/src/web/impl/AdminVerificationStrategy.h
@@ -20,7 +20,11 @@
 #pragma once
 
 #include <boost/beast/http.hpp>
+#include <boost/beast/http/message.hpp>
+#include <boost/beast/http/string_body.hpp>
 
+#include <memory>
+#include <optional>
 #include <string>
 #include <string_view>
 
diff --git a/src/web/impl/ErrorHandling.h b/src/web/impl/ErrorHandling.h
index b58915ad..18508f44 100644
--- a/src/web/impl/ErrorHandling.h
+++ b/src/web/impl/ErrorHandling.h
@@ -20,6 +20,7 @@
 #pragma once
 
 #include "rpc/Errors.h"
+#include "rpc/JS.h"
 #include "util/Assert.h"
 #include "web/interface/ConnectionBase.h"
 
@@ -32,7 +33,6 @@
 #include <memory>
 #include <optional>
 #include <string>
-#include <string_view>
 #include <utility>
 #include <variant>
 
diff --git a/src/web/impl/HttpBase.h b/src/web/impl/HttpBase.h
index 33018116..747aacbb 100644
--- a/src/web/impl/HttpBase.h
+++ b/src/web/impl/HttpBase.h
@@ -50,6 +50,7 @@
 #include <boost/json/serialize.hpp>
 #include <ripple/protocol/ErrorCodes.h>
 
+#include <chrono>
 #include <cstddef>
 #include <exception>
 #include <functional>
diff --git a/src/web/interface/Concepts.h b/src/web/interface/Concepts.h
index 8a101864..25fd0689 100644
--- a/src/web/interface/Concepts.h
+++ b/src/web/interface/Concepts.h
@@ -22,8 +22,10 @@
 #include "web/interface/ConnectionBase.h"
 
 #include <boost/beast.hpp>
+#include <boost/beast/core/error.hpp>
 
 #include <memory>
+#include <string>
 
 namespace web {
 
diff --git a/src/web/interface/ConnectionBase.h b/src/web/interface/ConnectionBase.h
index 9d7a7417..555dd8ad 100644
--- a/src/web/interface/ConnectionBase.h
+++ b/src/web/interface/ConnectionBase.h
@@ -22,8 +22,14 @@
 #include "util/Taggable.h"
 
 #include <boost/beast/http.hpp>
+#include <boost/beast/http/status.hpp>
 #include <boost/signals2.hpp>
+#include <boost/signals2/variadic_signal.hpp>
 
+#include <cstdint>
+#include <memory>
+#include <stdexcept>
+#include <string>
 #include <utility>
 
 namespace web {
diff --git a/unittests/data/cassandra/impl/FakesAndMocks.h b/unittests/data/cassandra/impl/FakesAndMocks.h
index 31df196c..140f6ac0 100644
--- a/unittests/data/cassandra/impl/FakesAndMocks.h
+++ b/unittests/data/cassandra/impl/FakesAndMocks.h
@@ -20,8 +20,13 @@
 #include "data/cassandra/Error.h"
 #include "data/cassandra/impl/AsyncExecutor.h"
 
+#include <boost/asio/io_context.hpp>
+#include <cassandra.h>
 #include <gmock/gmock.h>
 
+#include <chrono>
+#include <cstdint>
+#include <functional>
 #include <vector>
 
 using namespace data::cassandra;
diff --git a/unittests/rpc/handlers/impl/FakesAndMocks.h b/unittests/rpc/handlers/impl/FakesAndMocks.h
index 2f3c4817..83838483 100644
--- a/unittests/rpc/handlers/impl/FakesAndMocks.h
+++ b/unittests/rpc/handlers/impl/FakesAndMocks.h
@@ -19,16 +19,19 @@
 
 #pragma once
 
-#include "rpc/Factories.h"
+#include "rpc/Errors.h"
 #include "rpc/common/Specs.h"
+#include "rpc/common/Types.h"
 #include "rpc/common/Validators.h"
 #include "web/DOSGuard.h"
 
+#include <boost/json/conversion.hpp>
 #include <boost/json/value.hpp>
 #include <boost/json/value_from.hpp>
 #include <boost/json/value_to.hpp>
 #include <gmock/gmock.h>
 
+#include <cstdint>
 #include <optional>
 #include <string>
 
diff --git a/unittests/util/FakeAmendmentBlockAction.h b/unittests/util/FakeAmendmentBlockAction.h
index 639f9f7b..cc89eb3b 100644
--- a/unittests/util/FakeAmendmentBlockAction.h
+++ b/unittests/util/FakeAmendmentBlockAction.h
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <cstddef>
 #include <functional>
 
 struct FakeAmendmentBlockAction {
diff --git a/unittests/util/FakeFetchResponse.h b/unittests/util/FakeFetchResponse.h
index 12a5fd3e..100ec669 100644
--- a/unittests/util/FakeFetchResponse.h
+++ b/unittests/util/FakeFetchResponse.h
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <cstddef>
+#include <cstdint>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/unittests/util/Fixtures.h b/unittests/util/Fixtures.h
index baf8b3e7..f73b6916 100644
--- a/unittests/util/Fixtures.h
+++ b/unittests/util/Fixtures.h
@@ -37,6 +37,7 @@
 #include <boost/log/utility/setup/common_attributes.hpp>
 #include <boost/log/utility/setup/console.hpp>
 #include <boost/log/utility/setup/formatter_parser.hpp>
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <memory>
diff --git a/unittests/util/MockBackend.h b/unittests/util/MockBackend.h
index 3dfd44d5..fe3b52ec 100644
--- a/unittests/util/MockBackend.h
+++ b/unittests/util/MockBackend.h
@@ -20,8 +20,21 @@
 #pragma once
 
 #include "data/BackendInterface.h"
+#include "data/DBHelpers.h"
+#include "data/Types.h"
+#include "util/config/Config.h"
 
+#include <boost/asio/spawn.hpp>
+#include <boost/json/object.hpp>
 #include <gmock/gmock.h>
+#include <ripple/basics/base_uint.h>
+#include <ripple/protocol/AccountID.h>
+#include <ripple/protocol/LedgerHeader.h>
+
+#include <cstdint>
+#include <optional>
+#include <string>
+#include <vector>
 
 using namespace data;
 
diff --git a/unittests/util/MockCache.h b/unittests/util/MockCache.h
index fcbd4f3e..11485090 100644
--- a/unittests/util/MockCache.h
+++ b/unittests/util/MockCache.h
@@ -22,6 +22,12 @@
 #include "data/Types.h"
 
 #include <gmock/gmock.h>
+#include <ripple/basics/base_uint.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <optional>
+#include <vector>
 
 struct MockCache {
     virtual ~MockCache() = default;
diff --git a/unittests/util/MockCounters.h b/unittests/util/MockCounters.h
index cf72d4c8..e8d5dd5c 100644
--- a/unittests/util/MockCounters.h
+++ b/unittests/util/MockCounters.h
@@ -20,9 +20,11 @@
 #pragma once
 
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
 #include <gmock/gmock.h>
 
 #include <chrono>
+#include <string>
 
 struct MockCounters {
     MOCK_METHOD(void, rpcFailed, (std::string const&), ());
diff --git a/unittests/util/MockETLService.h b/unittests/util/MockETLService.h
index 38f63aa3..4c04f201 100644
--- a/unittests/util/MockETLService.h
+++ b/unittests/util/MockETLService.h
@@ -22,9 +22,12 @@
 #include "etl/ETLState.h"
 
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
 #include <gmock/gmock.h>
 
 #include <chrono>
+#include <cstdint>
+#include <optional>
 
 struct MockETLService {
     MOCK_METHOD(boost::json::object, getInfo, (), (const));
diff --git a/unittests/util/MockExtractionDataPipe.h b/unittests/util/MockExtractionDataPipe.h
index f0555af4..2805a342 100644
--- a/unittests/util/MockExtractionDataPipe.h
+++ b/unittests/util/MockExtractionDataPipe.h
@@ -19,9 +19,12 @@
 
 #pragma once
 
+#include "util/FakeFetchResponse.h"
+
 #include <gmock/gmock.h>
 
-#include <chrono>
+#include <cstdint>
+#include <optional>
 
 struct MockExtractionDataPipe {
     MOCK_METHOD(void, push, (uint32_t, std::optional<FakeFetchResponse>&&), ());
diff --git a/unittests/util/MockHandlerProvider.h b/unittests/util/MockHandlerProvider.h
index 067e6118..cb1d93c4 100644
--- a/unittests/util/MockHandlerProvider.h
+++ b/unittests/util/MockHandlerProvider.h
@@ -20,10 +20,13 @@
 #pragma once
 
 #include "rpc/common/AnyHandler.h"
-#include "rpc/common/Types.h"
+#include "rpc/common/HandlerProvider.h"
 
 #include <gmock/gmock.h>
 
+#include <optional>
+#include <string>
+
 struct MockHandlerProvider : public rpc::HandlerProvider {
 public:
     MOCK_METHOD(bool, contains, (std::string const&), (const, override));
diff --git a/unittests/util/MockLedgerFetcher.h b/unittests/util/MockLedgerFetcher.h
index 9b96ab0c..fb5666f0 100644
--- a/unittests/util/MockLedgerFetcher.h
+++ b/unittests/util/MockLedgerFetcher.h
@@ -23,6 +23,7 @@
 
 #include <gmock/gmock.h>
 
+#include <cstdint>
 #include <optional>
 
 struct MockLedgerFetcher {
diff --git a/unittests/util/MockLedgerLoader.h b/unittests/util/MockLedgerLoader.h
index 5d30c8d9..17122672 100644
--- a/unittests/util/MockLedgerLoader.h
+++ b/unittests/util/MockLedgerLoader.h
@@ -20,9 +20,12 @@
 #pragma once
 
 #include "etl/impl/LedgerLoader.h"
+#include "util/FakeFetchResponse.h"
 
 #include <gmock/gmock.h>
+#include <ripple/protocol/LedgerHeader.h>
 
+#include <cstdint>
 #include <optional>
 
 struct MockLedgerLoader {
diff --git a/unittests/util/MockLedgerPublisher.h b/unittests/util/MockLedgerPublisher.h
index d3c78efc..2c18ee89 100644
--- a/unittests/util/MockLedgerPublisher.h
+++ b/unittests/util/MockLedgerPublisher.h
@@ -20,7 +20,10 @@
 #pragma once
 
 #include <gmock/gmock.h>
+#include <ripple/protocol/LedgerHeader.h>
 
+#include <chrono>
+#include <cstdint>
 #include <optional>
 
 struct MockLedgerPublisher {
diff --git a/unittests/util/MockLoadBalancer.h b/unittests/util/MockLoadBalancer.h
index a23aa0e3..c3f6c4d9 100644
--- a/unittests/util/MockLoadBalancer.h
+++ b/unittests/util/MockLoadBalancer.h
@@ -24,9 +24,13 @@
 
 #include <boost/asio/spawn.hpp>
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
+#include <boost/json/value.hpp>
 #include <gmock/gmock.h>
 
+#include <cstdint>
 #include <optional>
+#include <string>
 
 struct MockLoadBalancer {
     using RawLedgerObjectType = FakeLedgerObject;
diff --git a/unittests/util/MockNetworkValidatedLedgers.h b/unittests/util/MockNetworkValidatedLedgers.h
index f03cfe55..47052836 100644
--- a/unittests/util/MockNetworkValidatedLedgers.h
+++ b/unittests/util/MockNetworkValidatedLedgers.h
@@ -21,6 +21,7 @@
 
 #include <gmock/gmock.h>
 
+#include <cstdint>
 #include <optional>
 
 struct MockNetworkValidatedLedgers {
diff --git a/unittests/util/MockPrometheus.h b/unittests/util/MockPrometheus.h
index d9eb67a1..9912f837 100644
--- a/unittests/util/MockPrometheus.h
+++ b/unittests/util/MockPrometheus.h
@@ -19,12 +19,31 @@
 
 #pragma once
 
+#include "util/Assert.h"
+#include "util/config/Config.h"
+#include "util/prometheus/Counter.h"
+#include "util/prometheus/Gauge.h"
+#include "util/prometheus/Histogram.h"
+#include "util/prometheus/Label.h"
+#include "util/prometheus/MetricBase.h"
+#include "util/prometheus/OStream.h"
 #include "util/prometheus/Prometheus.h"
 
+#include <boost/json/object.hpp>
+#include <boost/json/value.hpp>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <concepts>
+#include <cstdint>
+#include <iostream>
+#include <memory>
+#include <optional>
 #include <stdexcept>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 namespace util::prometheus {
 
diff --git a/unittests/util/MockRPCEngine.h b/unittests/util/MockRPCEngine.h
index a53e9e73..d80dc0cb 100644
--- a/unittests/util/MockRPCEngine.h
+++ b/unittests/util/MockRPCEngine.h
@@ -22,8 +22,12 @@
 #include "web/Context.h"
 
 #include <boost/asio.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/spawn.hpp>
 #include <gtest/gtest.h>
 
+#include <chrono>
+#include <functional>
 #include <string>
 
 struct MockAsyncRPCEngine {
diff --git a/unittests/util/MockSource.h b/unittests/util/MockSource.h
index d76be334..6d3572be 100644
--- a/unittests/util/MockSource.h
+++ b/unittests/util/MockSource.h
@@ -20,7 +20,18 @@
 
 #include "etl/Source.h"
 
+#include <boost/asio/spawn.hpp>
+#include <boost/json/object.hpp>
+#include <boost/uuid/uuid.hpp>
 #include <gmock/gmock.h>
+#include <grpcpp/support/status.h>
+#include <org/xrpl/rpc/v1/get_ledger.pb.h>
+
+#include <cstdint>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
 
 class MockSource : public etl::Source {
 public:
diff --git a/unittests/util/MockSubscriptionManager.h b/unittests/util/MockSubscriptionManager.h
index 95b51886..37ac33c7 100644
--- a/unittests/util/MockSubscriptionManager.h
+++ b/unittests/util/MockSubscriptionManager.h
@@ -19,11 +19,21 @@
 
 #pragma once
 
+#include "data/Types.h"
 #include "web/interface/ConnectionBase.h"
 
 #include <boost/asio/spawn.hpp>
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
 #include <gmock/gmock.h>
+#include <ripple/protocol/AccountID.h>
+#include <ripple/protocol/Fees.h>
+#include <ripple/protocol/LedgerHeader.h>
+
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
 
 struct MockSubscriptionManager {
 public:
diff --git a/unittests/util/TestObject.h b/unittests/util/TestObject.h
index 7a54088d..ede7cb2b 100644
--- a/unittests/util/TestObject.h
+++ b/unittests/util/TestObject.h
@@ -21,14 +21,25 @@
 
 #include "data/Types.h"
 
+#include <ripple/basics/Blob.h>
+#include <ripple/basics/base_uint.h>
+#include <ripple/protocol/AccountID.h>
+#include <ripple/protocol/Issue.h>
 #include <ripple/protocol/LedgerHeader.h>
 #include <ripple/protocol/Protocol.h>
+#include <ripple/protocol/STAmount.h>
 #include <ripple/protocol/STBase.h>
+#include <ripple/protocol/STObject.h>
 #include <ripple/protocol/STTx.h>
 #include <ripple/protocol/TxMeta.h>
+#include <ripple/protocol/UintTypes.h>
 
+#include <cstdint>
 #include <optional>
+#include <string>
 #include <string_view>
+#include <utility>
+#include <vector>
 
 /*
  * Create AccountID object with string
diff --git a/unittests/util/TmpFile.h b/unittests/util/TmpFile.h
index 592a1d96..71292ed3 100644
--- a/unittests/util/TmpFile.h
+++ b/unittests/util/TmpFile.h
@@ -22,6 +22,9 @@
 #include <cstdio>
 #include <filesystem>
 #include <fstream>
+#include <ios>
+#include <string>
+#include <string_view>
 
 struct TmpFile {
     std::string const path;