chore: Enable clang-tidy include cleaner (#6947)

src/test/jtx/impl/AMM.cpp

@@ -1,13 +1,43 @@
 #include <test/jtx/AMM.h>
-#include <test/jtx/Env.h>
 
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/multisign.h>
+#include <test/jtx/seq.h>
+#include <test/jtx/ter.h>
+
+#include <xrpl/basics/Number.h>
+#include <xrpl/basics/contract.h>
 #include <xrpl/basics/safe_cast.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
 #include <xrpl/ledger/helpers/AMMHelpers.h>
+#include <xrpl/ledger/helpers/TokenHelpers.h>
 #include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/AmountConversions.h>
 #include <xrpl/protocol/ApiVersion.h>
+#include <xrpl/protocol/Asset.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/IOUAmount.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
 
+#include <algorithm>
+#include <cstdint>
+#include <iostream>
+#include <optional>
+#include <stdexcept>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/AMMTest.cpp

@@ -1,15 +1,32 @@
-#include <test/jtx/AMM.h>
 #include <test/jtx/AMMTest.h>
+
+#include <test/jtx/AMM.h>
+#include <test/jtx/Account.h>
 #include <test/jtx/CaptureLogs.h>
 #include <test/jtx/Env.h>
+#include <test/jtx/amount.h>
+#include <test/jtx/envconfig.h>
 #include <test/jtx/mpt.h>
 #include <test/jtx/pay.h>
+#include <test/jtx/ter.h>
 
-#include <xrpld/rpc/RPCHandler.h>
+#include <xrpld/core/Config.h>
 
-#include <xrpl/protocol/ApiVersion.h>
-#include <xrpl/protocol/STParsedJSON.h>
-#include <xrpl/resource/Fees.h>
+#include <xrpl/basics/Number.h>
+#include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/MPTIssue.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/XRPAmount.h>
+
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <utility>
+#include <vector>
 
 namespace xrpl {
 namespace test {

src/test/jtx/impl/Account.cpp

@@ -1,8 +1,24 @@
 #include <test/jtx/Account.h>
+
 #include <test/jtx/amount.h>
 
+#include <xrpl/basics/contract.h>
+#include <xrpl/beast/hash/uhash.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/KeyType.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Seed.h>
 #include <xrpl/protocol/UintTypes.h>
 
+#include <cassert>
+#include <optional>
+#include <stdexcept>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <utility>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/Env.cpp

@@ -1,25 +1,48 @@
 #include <test/jtx/Env.h>
+
+#include <test/jtx/Account.h>
 #include <test/jtx/JSONRPCClient.h>
+#include <test/jtx/JTx.h>
+#include <test/jtx/ManualTimeKeeper.h>
+#include <test/jtx/amount.h>
 #include <test/jtx/balance.h>
 #include <test/jtx/fee.h>
 #include <test/jtx/flags.h>
 #include <test/jtx/pay.h>
 #include <test/jtx/seq.h>
 #include <test/jtx/sig.h>
+#include <test/jtx/tags.h>
 #include <test/jtx/trust.h>
 #include <test/jtx/utility.h>
+#include <test/unit_test/SuiteJournal.h>
 
 #include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/main/Application.h>
+#include <xrpld/core/Config.h>
 #include <xrpld/rpc/RPCCall.h>
 
-#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/Number.h>
+#include <xrpl/basics/chrono.h>
 #include <xrpl/basics/contract.h>
+#include <xrpl/basics/safe_cast.h>
 #include <xrpl/basics/scope.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/beast/utility/Journal.h>
 #include <xrpl/core/NetworkIDService.h>
+#include <xrpl/core/ServiceRegistry.h>
 #include <xrpl/json/to_string.h>
 #include <xrpl/net/HTTPClient.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Asset.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/Keylet.h>
+#include <xrpl/protocol/MPTIssue.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
@@ -27,8 +50,20 @@
 #include <xrpl/protocol/jss.h>
 #include <xrpl/server/NetworkOPs.h>
 
+#include <cassert>
+#include <chrono>
+#include <cstdint>
+#include <iostream>
 #include <memory>
+#include <optional>
+#include <ostream>
 #include <source_location>
+#include <stdexcept>
+#include <string>
+#include <thread>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 namespace xrpl {
 namespace test {

src/test/jtx/impl/JSONRPCClient.cpp

@@ -1,17 +1,34 @@
 #include <test/jtx/JSONRPCClient.h>
 
+#include <test/jtx/AbstractClient.h>
+
+#include <xrpld/core/Config.h>
+
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/basics/contract.h>
 #include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_value.h>
 #include <xrpl/json/to_string.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/server/Port.h>
 
-#include <boost/asio.hpp>
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/ip/address_v4.hpp>
+#include <boost/asio/ip/address_v6.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/http/dynamic_body.hpp>
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/http/read.hpp>
 #include <boost/beast/http/string_body.hpp>
+#include <boost/beast/http/verb.hpp>
 #include <boost/beast/http/write.hpp>
 
+#include <iostream>
+#include <memory>
+#include <sstream>
+#include <stdexcept>
 #include <string>
 
 namespace xrpl {

src/test/jtx/impl/Oracle.cpp

@@ -1,11 +1,32 @@
 #include <test/jtx/Oracle.h>
 
+#include <test/jtx/Env.h>
+#include <test/jtx/multisign.h>
+#include <test/jtx/seq.h>
+#include <test/jtx/ter.h>
+
+#include <xrpl/basics/Number.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STObject.h>
 #include <xrpl/protocol/jss.h>
 
 #include <boost/lexical_cast/try_lexical_convert.hpp>
-#include <boost/regex.hpp>
+#include <boost/regex.hpp>  // IWYU pragma: keep
+#include <boost/regex/v5/regex_replace.hpp>
 
-#include <vector>
+#include <algorithm>
+#include <cassert>
+#include <chrono>
+#include <cstdint>
+#include <optional>
+#include <string>
+#include <variant>
 
 namespace xrpl {
 namespace test {

src/test/jtx/impl/TestHelpers.cpp

@@ -1,16 +1,65 @@
 #include <test/jtx/TestHelpers.h>
+
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/amount.h>
+#include <test/jtx/balance.h>  // IWYU pragma: keep
+#include <test/jtx/envconfig.h>
 #include <test/jtx/mpt.h>
 #include <test/jtx/offer.h>
 #include <test/jtx/owners.h>
 #include <test/jtx/rate.h>
 #include <test/jtx/trust.h>
 
+#include <xrpld/core/Config.h>
 #include <xrpld/rpc/RPCHandler.h>
+#include <xrpld/rpc/Role.h>
 
+#include <xrpl/basics/Number.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/core/Job.h>
+#include <xrpl/core/ServiceRegistry.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/DirectoryHelpers.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/ApiVersion.h>
+#include <xrpl/protocol/Book.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/MPTIssue.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/STParsedJSON.h>
-#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/STPathSet.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/XRPAmount.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/resource/Charge.h>
+#include <xrpl/resource/Consumer.h>
 #include <xrpl/resource/Fees.h>
+#include <xrpl/tx/paths/detail/Steps.h>
+
+#include <algorithm>
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <stdexcept>
+#include <tuple>
+#include <utility>
+#include <variant>
+#include <vector>
 
 namespace xrpl {
 namespace test {

src/test/jtx/impl/WSClient.cpp

@@ -1,20 +1,46 @@
-#include <test/jtx.h>
 #include <test/jtx/WSClient.h>
 
+#include <xrpld/core/Config.h>
+
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/basics/contract.h>
 #include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_value.h>
 #include <xrpl/json/to_string.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/server/Port.h>
 
+#include <boost/asio/bind_executor.hpp>
+#include <boost/asio/buffer.hpp>
 #include <boost/asio/executor_work_guard.hpp>
 #include <boost/asio/io_context.hpp>
+#include <boost/asio/ip/address_v4.hpp>
+#include <boost/asio/ip/address_v6.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/post.hpp>
 #include <boost/asio/strand.hpp>
 #include <boost/beast/core/multi_buffer.hpp>
-#include <boost/beast/websocket.hpp>
+#include <boost/beast/websocket/error.hpp>
+#include <boost/beast/websocket/rfc6455.hpp>
+#include <boost/beast/websocket/stream.hpp>
+#include <boost/beast/websocket/stream_base.hpp>
+#include <boost/system/detail/error_code.hpp>
+#include <boost/system/system_error.hpp>
 
+#include <chrono>
+#include <condition_variable>
+#include <exception>
+#include <functional>
 #include <iostream>
+#include <list>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <stdexcept>
 #include <string>
+#include <thread>
 #include <unordered_map>
+#include <utility>
 
 namespace xrpl {
 namespace test {

src/test/jtx/impl/account_txn_id.cpp

@@ -1,5 +1,10 @@
 #include <test/jtx/account_txn_id.h>
 
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+
+#include <xrpl/basics/strHex.h>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/acctdelete.cpp

@@ -1,8 +1,15 @@
-#include <test/jtx/Env.h>
 #include <test/jtx/acctdelete.h>
 
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+
+#include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/jss.h>
 
+#include <cstdint>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/amount.cpp

@@ -1,9 +1,20 @@
-#include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
 
-#include <xrpl/basics/safe_cast.h>
+#include <test/jtx/Account.h>
 
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/safe_cast.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/MPTIssue.h>
+#include <xrpl/protocol/UintTypes.h>
+
+#include <cassert>
+#include <cstdint>
 #include <iomanip>
+#include <ios>
+#include <ostream>
+#include <sstream>
+#include <string>
 
 namespace xrpl {
 namespace test {

src/test/jtx/impl/attester.cpp

@@ -1,10 +1,15 @@
 #include <test/jtx/attester.h>
 
+#include <xrpl/basics/Buffer.h>
 #include <xrpl/basics/Slice.h>
+#include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/SecretKey.h>
 #include <xrpl/protocol/XChainAttestations.h>
 
+#include <cstdint>
+#include <optional>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/balance.cpp

@@ -1,5 +1,16 @@
 #include <test/jtx/balance.h>
 
+#include <test/jtx/Env.h>
+
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/MPTIssue.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
+
+#include <variant>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/batch.cpp

@@ -1,13 +1,32 @@
 #include <test/jtx/batch.h>
+
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
 #include <test/jtx/utility.h>
 
+#include <xrpl/basics/Number.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
 #include <xrpl/protocol/Batch.h>
-#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/Sign.h>
+#include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/protocol/jss.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <optional>
-#include <sstream>
+#include <ostream>
+#include <utility>
 
 namespace xrpl {
 namespace test {

src/test/jtx/impl/check.cpp

@@ -1,6 +1,11 @@
 #include <test/jtx/check.h>
 
-#include <xrpl/protocol/TxFlags.h>
+#include <test/jtx/Account.h>
+
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/jss.h>
 
 namespace xrpl {

src/test/jtx/impl/creds.cpp

@@ -1,8 +1,15 @@
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
 #include <test/jtx/credentials.h>
 
-#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/jss.h>
 
+#include <string_view>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/delegate.cpp

@@ -1,7 +1,16 @@
 #include <test/jtx/delegate.h>
 
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/jss.h>
 
+#include <string>
+#include <vector>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/delivermin.cpp

@@ -1,5 +1,8 @@
 #include <test/jtx/delivermin.h>
 
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace xrpl {

src/test/jtx/impl/deposit.cpp

@@ -1,7 +1,14 @@
 #include <test/jtx/deposit.h>
 
+#include <test/jtx/Account.h>
+
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/jss.h>
 
+#include <utility>
+#include <vector>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/dids.cpp

@@ -1,6 +1,10 @@
+#include <test/jtx/Account.h>
 #include <test/jtx/did.h>
 
-#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/jss.h>
 
 namespace xrpl {

src/test/jtx/impl/directory.cpp

@@ -1,6 +1,22 @@
 #include <test/jtx/directory.h>
 
+#include <test/jtx/Env.h>
+
+#include <xrpl/basics/Expected.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/core/ServiceRegistry.h>
+#include <xrpl/ledger/ApplyView.h>
+#include <xrpl/ledger/OpenView.h>
 #include <xrpl/ledger/Sandbox.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Keylet.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/SField.h>
+
+#include <cstdint>
+#include <functional>
+#include <memory>
 
 namespace xrpl::test::jtx {
 

src/test/jtx/impl/domain.cpp

@@ -1,6 +1,10 @@
 #include <test/jtx/domain.h>
 
-#include <xrpl/protocol/jss.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/protocol/SField.h>
 
 namespace xrpl {
 namespace test {

src/test/jtx/impl/envconfig.cpp

@@ -1,8 +1,15 @@
-#include <test/jtx/amount.h>
 #include <test/jtx/envconfig.h>
 
+#include <test/jtx/amount.h>
+
+#include <xrpld/core/Config.h>
 #include <xrpld/core/ConfigSections.h>
 
+#include <atomic>
+#include <map>
+#include <memory>
+#include <vector>
+
 namespace xrpl {
 namespace test {
 

src/test/jtx/impl/escrow.cpp

@@ -1,8 +1,19 @@
 #include <test/jtx/escrow.h>
 
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Rate.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
 
+#include <cstdint>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/fee.cpp

@@ -1,6 +1,11 @@
 #include <test/jtx/fee.h>
 
-#include <xrpl/protocol/jss.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+
+#include <xrpl/protocol/SField.h>
+
+#include <cassert>
 
 namespace xrpl {
 namespace test {

src/test/jtx/impl/flags.cpp

@@ -1,7 +1,14 @@
 #include <test/jtx/flags.h>
 
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/jss.h>
 
+#include <cstdint>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/invoice_id.cpp

@@ -1,5 +1,10 @@
 #include <test/jtx/invoice_id.h>
 
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+
+#include <xrpl/basics/strHex.h>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/jtx_json.cpp

@@ -1,8 +1,15 @@
 #include <test/jtx/jtx_json.h>
+
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
 #include <test/jtx/utility.h>
 
 #include <xrpl/basics/contract.h>
 #include <xrpl/json/json_reader.h>
+#include <xrpl/json/json_value.h>
+
+#include <string>
+#include <utility>
 
 namespace xrpl {
 namespace test {

src/test/jtx/impl/last_ledger_sequence.cpp

@@ -1,5 +1,8 @@
 #include <test/jtx/last_ledger_sequence.h>
 
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/ledgerStateFixes.cpp

@@ -1,6 +1,8 @@
+#include <test/jtx/Account.h>
 #include <test/jtx/ledgerStateFix.h>
 
-#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/tx/transactors/system/LedgerStateFix.h>
 

src/test/jtx/impl/memo.cpp

@@ -1,5 +1,10 @@
 #include <test/jtx/memo.h>
 
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+
+#include <xrpl/basics/strHex.h>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/mpt.cpp

@@ -1,9 +1,42 @@
-#include <test/jtx.h>
 
+#include <test/jtx/mpt.h>
+
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/amount.h>
+#include <test/jtx/credentials.h>
+#include <test/jtx/owners.h>
+#include <test/jtx/pay.h>
+#include <test/jtx/ter.h>
+#include <test/jtx/trust.h>
+
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/json/json_value.h>
 #include <xrpl/ledger/helpers/TokenHelpers.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Asset.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/Rate.h>
 #include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/UintTypes.h>
 #include <xrpl/protocol/jss.h>
 
+#include <algorithm>
+#include <cstdint>
+#include <functional>
+#include <optional>
+#include <stdexcept>
+#include <string>
+#include <unordered_map>
+#include <variant>
+#include <vector>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/multisign.cpp

@@ -1,11 +1,29 @@
 #include <test/jtx/multisign.h>
+
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+#include <test/jtx/tags.h>
 #include <test/jtx/utility.h>
 
+#include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/contract.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/Sign.h>
 #include <xrpl/protocol/jss.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <optional>
+#include <ostream>
+#include <vector>
 
 namespace xrpl {
 namespace test {

src/test/jtx/impl/offer.cpp

@@ -1,7 +1,13 @@
 #include <test/jtx/offer.h>
 
+#include <test/jtx/Account.h>
+
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/jss.h>
 
+#include <cstdint>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/owners.cpp

@@ -1,6 +1,16 @@
 #include <test/jtx/owners.h>
 
+#include <test/jtx/Env.h>
+
+#include <xrpl/core/ServiceRegistry.h>
+#include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/DirectoryHelpers.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/SField.h>
+
+#include <cstdint>
+#include <memory>
 
 namespace xrpl {
 namespace detail {

src/test/jtx/impl/paths.cpp

@@ -1,9 +1,23 @@
 #include <test/jtx/paths.h>
 
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+#include <test/jtx/amount.h>
+
+#include <xrpld/rpc/detail/AssetCache.h>
 #include <xrpld/rpc/detail/Pathfinder.h>
 
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/MPTIssue.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/UintTypes.h>
 #include <xrpl/protocol/jss.h>
 
+#include <memory>
 #include <optional>
 
 namespace xrpl {

src/test/jtx/impl/pay.cpp

@@ -1,5 +1,10 @@
 #include <test/jtx/pay.h>
 
+#include <test/jtx/Account.h>
+#include <test/jtx/amount.h>
+
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
 

src/test/jtx/impl/permissioned_dex.cpp

@@ -1,9 +1,17 @@
-#include <test/jtx.h>
 
-#include <xrpl/beast/unit_test/suite.h>
-#include <xrpl/protocol/jss.h>
+#include <test/jtx/permissioned_dex.h>
 
-#include <exception>
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/amount.h>
+#include <test/jtx/credentials.h>
+#include <test/jtx/pay.h>
+#include <test/jtx/permissioned_domains.h>
+
+#include <xrpl/basics/base_uint.h>
+
+#include <string>
+#include <vector>
 
 namespace xrpl {
 namespace test {

src/test/jtx/impl/permissioned_domains.cpp

@@ -1,4 +1,26 @@
-#include <test/jtx.h>
+#include <test/jtx/permissioned_domains.h>
+
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/contract.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/jss.h>
+
+#include <map>
+#include <memory>
+#include <optional>
+#include <set>
+#include <stdexcept>
+#include <tuple>
+#include <unordered_map>
+#include <utility>
 
 namespace xrpl {
 namespace test {

src/test/jtx/impl/quality2.cpp

@@ -1,8 +1,13 @@
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
 #include <test/jtx/quality.h>
 
 #include <xrpl/protocol/Quality.h>
 #include <xrpl/protocol/SField.h>
 
+#include <cassert>
+#include <cstdint>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/rate.cpp

@@ -1,8 +1,12 @@
 #include <test/jtx/rate.h>
 
+#include <test/jtx/Account.h>
+
 #include <xrpl/basics/contract.h>
+#include <xrpl/json/json_value.h>
 #include <xrpl/protocol/jss.h>
 
+#include <cstdint>
 #include <stdexcept>
 
 namespace xrpl {

src/test/jtx/impl/regkey.cpp

@@ -1,5 +1,10 @@
 #include <test/jtx/regkey.h>
 
+#include <test/jtx/Account.h>
+#include <test/jtx/tags.h>
+
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/jss.h>
 
 namespace xrpl {

src/test/jtx/impl/sendmax.cpp

@@ -1,5 +1,8 @@
 #include <test/jtx/sendmax.h>
 
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace xrpl {

src/test/jtx/impl/seq.cpp

@@ -1,5 +1,8 @@
 #include <test/jtx/seq.h>
 
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace xrpl {

src/test/jtx/impl/sig.cpp

@@ -1,4 +1,7 @@
 #include <test/jtx/sig.h>
+
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
 #include <test/jtx/utility.h>
 
 namespace xrpl {

src/test/jtx/impl/tag.cpp

@@ -1,5 +1,8 @@
 #include <test/jtx/tag.h>
 
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/ticket.cpp

@@ -1,7 +1,15 @@
 #include <test/jtx/ticket.h>
 
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/jss.h>
 
+#include <cstdint>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/token.cpp

@@ -1,10 +1,22 @@
-#include <test/jtx/flags.h>
 #include <test/jtx/token.h>
 
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+#include <test/jtx/flags.h>
+
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/json/json_value.h>
 #include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/nft.h>
 #include <xrpl/tx/transactors/nft/NFTokenMint.h>
 
+#include <cstdint>
+#include <initializer_list>
+#include <vector>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/trust.cpp

@@ -1,8 +1,15 @@
 #include <test/jtx/trust.h>
 
+#include <test/jtx/Account.h>
+
 #include <xrpl/basics/contract.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/jss.h>
 
+#include <cstdint>
+#include <optional>
 #include <stdexcept>
 
 namespace xrpl {

src/test/jtx/impl/txflags.cpp

@@ -1,5 +1,8 @@
 #include <test/jtx/txflags.h>
 
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace xrpl {

src/test/jtx/impl/utility.cpp

@@ -1,15 +1,29 @@
 #include <test/jtx/utility.h>
 
+#include <test/jtx/Account.h>
+
 #include <xrpld/rpc/RPCCall.h>
 
 #include <xrpl/basics/contract.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/ledger/ReadView.h>
+#include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STObject.h>
 #include <xrpl/protocol/STParsedJSON.h>
-#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/protocol/jss.h>
 
+#include <utility>
+#include <vector>
+
 namespace xrpl {
 namespace test {
 namespace jtx {

src/test/jtx/impl/vault.cpp

@@ -1,11 +1,18 @@
-#include <test/jtx/Env.h>
 #include <test/jtx/vault.h>
 
+#include <test/jtx/Env.h>
+
+#include <xrpl/basics/base_uint.h>
 #include <xrpl/json/json_value.h>
-#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/Asset.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Keylet.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STBase.h>
 #include <xrpl/protocol/jss.h>
 
 #include <optional>
+#include <tuple>
 
 namespace xrpl {
 namespace test {

src/test/jtx/impl/xchain_bridge.cpp

@@ -1,17 +1,30 @@
-#include <test/jtx/Env.h>
-#include <test/jtx/attester.h>
 #include <test/jtx/xchain_bridge.h>
 
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/amount.h>
+#include <test/jtx/attester.h>
+#include <test/jtx/multisign.h>
+
+#include <xrpl/basics/strHex.h>
 #include <xrpl/json/json_value.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/KeyType.h>
 #include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/STBase.h>
 #include <xrpl/protocol/STInteger.h>
-#include <xrpl/protocol/STObject.h>
-#include <xrpl/protocol/TxFlags.h>
-#include <xrpl/protocol/XChainAttestations.h>
 #include <xrpl/protocol/jss.h>
 
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <optional>
+#include <string>
+#include <vector>
+
 namespace xrpl {
 namespace test {
 namespace jtx {