Fix most includes in headers (#1149)

Fixes #1146

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 {
 

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);

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 {
 

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>

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>

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>
 
 /*

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 {

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"

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 {

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 {

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 {
 
 /**

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 {

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

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 {
 
 /**

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"

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 {

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>
 

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&)
 {

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 {
 

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 {

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 {
 

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 {
 

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>

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 {
 
 /**

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 {

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 {
 

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 {
 
 /**

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 {

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 {
 
 /**

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"

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 {
 
 /**

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 {
 
 /**

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 {
 
 /**

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 {
 

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 {
 
 /**

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 {
 
 /**

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"

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"
 

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>
 

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 {
 
 /**

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 {
 
 /**

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 {
 
 /**

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 {

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 {
 
 /**

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_;

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 {
 

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>

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;

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 {
 
 /**

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>

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

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 {