diff --git a/.clang-format b/.clang-format
index 1d0f396dd8..9100396885 100644
--- a/.clang-format
+++ b/.clang-format
@@ -44,6 +44,7 @@ DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ Q_FOREACH,  BOOST_FOREACH ]
+IncludeBlocks:   Regroup
 IncludeCategories:
   - Regex:           '^<(test)/'
     Priority:        0
@@ -53,8 +54,12 @@ IncludeCategories:
     Priority:        2
   - Regex:           '^<(boost)/'
     Priority:        3
-  - Regex:           '.*'
+  - Regex:           '^.*/'
     Priority:        4
+  - Regex:           '^.*\.h'
+    Priority:        5
+  - Regex:           '.*'
+    Priority:        6
 IncludeIsMainRegex: '$'
 IndentCaseLabels: true
 IndentFunctionDeclarationAfterType: false
diff --git a/examples/example/src/example.cpp b/examples/example/src/example.cpp
index 7ff07f6ea4..8c3acdee07 100644
--- a/examples/example/src/example.cpp
+++ b/examples/example/src/example.cpp
@@ -1,7 +1,7 @@
-#include <cstdio>
-
 #include <xrpl/protocol/BuildInfo.h>
 
+#include <cstdio>
+
 int main(int argc, char const** argv) {
     std::printf("%s\n", ripple::BuildInfo::getVersionString().c_str());
     return 0;
diff --git a/include/xrpl/beast/hash/xxhasher.h b/include/xrpl/beast/hash/xxhasher.h
index 30af05ef0a..381980902a 100644
--- a/include/xrpl/beast/hash/xxhasher.h
+++ b/include/xrpl/beast/hash/xxhasher.h
@@ -21,6 +21,7 @@
 #define BEAST_HASH_XXHASHER_H_INCLUDED
 
 #include <boost/endian/conversion.hpp>
+
 #include <xxhash.h>
 
 #include <cstddef>
diff --git a/include/xrpl/protocol/STLedgerEntry.h b/include/xrpl/protocol/STLedgerEntry.h
index 6a57b32451..96b37af0b9 100644
--- a/include/xrpl/protocol/STLedgerEntry.h
+++ b/include/xrpl/protocol/STLedgerEntry.h
@@ -124,4 +124,4 @@ STLedgerEntry::getType() const
 
 }  // namespace ripple
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/libxrpl/basics/Archive.cpp b/src/libxrpl/basics/Archive.cpp
index c6c78a36c9..2ddbc8200c 100644
--- a/src/libxrpl/basics/Archive.cpp
+++ b/src/libxrpl/basics/Archive.cpp
@@ -25,6 +25,7 @@
 
 #include <archive.h>
 #include <archive_entry.h>
+
 #include <cstddef>
 #include <memory>
 #include <stdexcept>
diff --git a/src/libxrpl/basics/make_SSLContext.cpp b/src/libxrpl/basics/make_SSLContext.cpp
index 1b002e8e23..980f2d48a6 100644
--- a/src/libxrpl/basics/make_SSLContext.cpp
+++ b/src/libxrpl/basics/make_SSLContext.cpp
@@ -24,6 +24,7 @@
 #include <boost/asio/ssl/verify_mode.hpp>
 #include <boost/system/detail/error_code.hpp>
 #include <boost/system/detail/generic_category.hpp>
+
 #include <openssl/asn1.h>
 #include <openssl/bn.h>
 #include <openssl/evp.h>
diff --git a/src/libxrpl/protocol/PublicKey.cpp b/src/libxrpl/protocol/PublicKey.cpp
index e0f62fd61a..cdf646e0f8 100644
--- a/src/libxrpl/protocol/PublicKey.cpp
+++ b/src/libxrpl/protocol/PublicKey.cpp
@@ -30,6 +30,7 @@
 
 #include <boost/multiprecision/fwd.hpp>
 #include <boost/multiprecision/number.hpp>
+
 #include <ed25519.h>
 #include <secp256k1.h>
 
diff --git a/src/libxrpl/protocol/SecretKey.cpp b/src/libxrpl/protocol/SecretKey.cpp
index 8a68fd21ef..06b1061c1e 100644
--- a/src/libxrpl/protocol/SecretKey.cpp
+++ b/src/libxrpl/protocol/SecretKey.cpp
@@ -34,6 +34,7 @@
 #include <xrpl/protocol/tokens.h>
 
 #include <boost/utility/string_view.hpp>
+
 #include <ed25519.h>
 #include <secp256k1.h>
 
diff --git a/src/test/app/AMMCalc_test.cpp b/src/test/app/AMMCalc_test.cpp
index 058cdfd1d2..bebf2844b6 100644
--- a/src/test/app/AMMCalc_test.cpp
+++ b/src/test/app/AMMCalc_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/misc/AMMHelpers.h>
+
 #include <xrpl/protocol/Quality.h>
 
 #include <boost/regex.hpp>
diff --git a/src/test/app/AMMClawback_test.cpp b/src/test/app/AMMClawback_test.cpp
index 5a48d47571..878c570a12 100644
--- a/src/test/app/AMMClawback_test.cpp
+++ b/src/test/app/AMMClawback_test.cpp
@@ -19,6 +19,7 @@
 #include <test/jtx/AMM.h>
 #include <test/jtx/AMMTest.h>
 #include <test/jtx/trust.h>
+
 #include <xrpl/protocol/Feature.h>
 
 #include <initializer_list>
diff --git a/src/test/app/AMMExtended_test.cpp b/src/test/app/AMMExtended_test.cpp
index aed40288ec..ed9fa0f1f8 100644
--- a/src/test/app/AMMExtended_test.cpp
+++ b/src/test/app/AMMExtended_test.cpp
@@ -23,12 +23,14 @@
 #include <test/jtx/PathSet.h>
 #include <test/jtx/amount.h>
 #include <test/jtx/sendmax.h>
+
 #include <xrpld/app/misc/AMMUtils.h>
 #include <xrpld/app/paths/AMMContext.h>
 #include <xrpld/app/paths/AMMOffer.h>
 #include <xrpld/app/paths/Flow.h>
 #include <xrpld/app/paths/detail/StrandFlow.h>
 #include <xrpld/ledger/PaymentSandbox.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/STParsedJSON.h>
 
diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp
index a2be2a254e..9eee2b8805 100644
--- a/src/test/app/AMM_test.cpp
+++ b/src/test/app/AMM_test.cpp
@@ -22,9 +22,11 @@
 #include <test/jtx/AMMTest.h>
 #include <test/jtx/amount.h>
 #include <test/jtx/sendmax.h>
+
 #include <xrpld/app/misc/AMMHelpers.h>
 #include <xrpld/app/misc/AMMUtils.h>
 #include <xrpld/app/tx/detail/AMMBid.h>
+
 #include <xrpl/basics/Number.h>
 #include <xrpl/protocol/AMMCore.h>
 #include <xrpl/protocol/Feature.h>
diff --git a/src/test/app/AccountDelete_test.cpp b/src/test/app/AccountDelete_test.cpp
index f8d3cf4692..c903f95f77 100644
--- a/src/test/app/AccountDelete_test.cpp
+++ b/src/test/app/AccountDelete_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/app/AccountTxPaging_test.cpp b/src/test/app/AccountTxPaging_test.cpp
index 402e02209e..46a56f58e3 100644
--- a/src/test/app/AccountTxPaging_test.cpp
+++ b/src/test/app/AccountTxPaging_test.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx.h>
 #include <test/rpc/GRPCTestClientBase.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/app/AmendmentTable_test.cpp b/src/test/app/AmendmentTable_test.cpp
index 2f95fc0280..5ba820da95 100644
--- a/src/test/app/AmendmentTable_test.cpp
+++ b/src/test/app/AmendmentTable_test.cpp
@@ -19,8 +19,10 @@
 
 #include <test/jtx/Env.h>
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpld/app/misc/AmendmentTable.h>
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/chrono.h>
diff --git a/src/test/app/Check_test.cpp b/src/test/app/Check_test.cpp
index 2c4f44ce79..d27df46468 100644
--- a/src/test/app/Check_test.cpp
+++ b/src/test/app/Check_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/app/Clawback_test.cpp b/src/test/app/Clawback_test.cpp
index 9e21004602..d41f6de556 100644
--- a/src/test/app/Clawback_test.cpp
+++ b/src/test/app/Clawback_test.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx.h>
 #include <test/jtx/trust.h>
+
 #include <xrpl/protocol/Feature.h>
 
 namespace ripple {
diff --git a/src/test/app/Credentials_test.cpp b/src/test/app/Credentials_test.cpp
index daabdc31ab..24e656672d 100644
--- a/src/test/app/Credentials_test.cpp
+++ b/src/test/app/Credentials_test.cpp
@@ -18,8 +18,10 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/misc/CredentialHelpers.h>
 #include <xrpld/ledger/ApplyViewImpl.h>
+
 #include <xrpl/basics/strHex.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/test/app/CrossingLimits_test.cpp b/src/test/app/CrossingLimits_test.cpp
index 6f6a7eb3e7..1e19a178c2 100644
--- a/src/test/app/CrossingLimits_test.cpp
+++ b/src/test/app/CrossingLimits_test.cpp
@@ -16,6 +16,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/Feature.h>
 
diff --git a/src/test/app/DID_test.cpp b/src/test/app/DID_test.cpp
index 0990118ff1..3a2ed260c6 100644
--- a/src/test/app/DID_test.cpp
+++ b/src/test/app/DID_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
 
diff --git a/src/test/app/DNS_test.cpp b/src/test/app/DNS_test.cpp
index 7a39c5f079..7e209deb1c 100644
--- a/src/test/app/DNS_test.cpp
+++ b/src/test/app/DNS_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/misc/detail/WorkSSL.h>
+
 #include <xrpl/basics/StringUtilities.h>
 
 #include <condition_variable>
diff --git a/src/test/app/DeliverMin_test.cpp b/src/test/app/DeliverMin_test.cpp
index 3c62a47a4a..3c5fd43c18 100644
--- a/src/test/app/DeliverMin_test.cpp
+++ b/src/test/app/DeliverMin_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/Feature.h>
 
diff --git a/src/test/app/DepositAuth_test.cpp b/src/test/app/DepositAuth_test.cpp
index 463c606dc6..9e04c5e496 100644
--- a/src/test/app/DepositAuth_test.cpp
+++ b/src/test/app/DepositAuth_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/protocol/Feature.h>
 
 #include <algorithm>
diff --git a/src/test/app/Discrepancy_test.cpp b/src/test/app/Discrepancy_test.cpp
index 1eaa1ad86d..8e306282a7 100644
--- a/src/test/app/Discrepancy_test.cpp
+++ b/src/test/app/Discrepancy_test.cpp
@@ -20,6 +20,7 @@
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/PathSet.h>
+
 #include <xrpl/beast/core/LexicalCast.h>
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/Feature.h>
diff --git a/src/test/app/Escrow_test.cpp b/src/test/app/Escrow_test.cpp
index 714fc7734d..87da18ca9d 100644
--- a/src/test/app/Escrow_test.cpp
+++ b/src/test/app/Escrow_test.cpp
@@ -18,8 +18,10 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/tx/applySteps.h>
 #include <xrpld/ledger/Dir.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/test/app/FeeVote_test.cpp b/src/test/app/FeeVote_test.cpp
index 43b17265ee..bf293a93fb 100644
--- a/src/test/app/FeeVote_test.cpp
+++ b/src/test/app/FeeVote_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/basics/BasicConfig.h>
 
 namespace ripple {
diff --git a/src/test/app/FixNFTokenPageLinks_test.cpp b/src/test/app/FixNFTokenPageLinks_test.cpp
index f8db4df4f9..f87d70aacf 100644
--- a/src/test/app/FixNFTokenPageLinks_test.cpp
+++ b/src/test/app/FixNFTokenPageLinks_test.cpp
@@ -18,8 +18,10 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/tx/detail/ApplyContext.h>
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/app/Flow_test.cpp b/src/test/app/Flow_test.cpp
index a1bca2f544..aa7e819e07 100644
--- a/src/test/app/Flow_test.cpp
+++ b/src/test/app/Flow_test.cpp
@@ -19,11 +19,13 @@
 
 #include <test/jtx.h>
 #include <test/jtx/PathSet.h>
+
 #include <xrpld/app/paths/Flow.h>
 #include <xrpld/app/paths/detail/Steps.h>
 #include <xrpld/core/Config.h>
 #include <xrpld/ledger/PaymentSandbox.h>
 #include <xrpld/ledger/Sandbox.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/protocol/Feature.h>
 
diff --git a/src/test/app/Freeze_test.cpp b/src/test/app/Freeze_test.cpp
index aa54ee956a..36578cbc6b 100644
--- a/src/test/app/Freeze_test.cpp
+++ b/src/test/app/Freeze_test.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx.h>
 #include <test/jtx/AMM.h>
+
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/SField.h>
diff --git a/src/test/app/HashRouter_test.cpp b/src/test/app/HashRouter_test.cpp
index 1234bc5b9c..d8d7ca6851 100644
--- a/src/test/app/HashRouter_test.cpp
+++ b/src/test/app/HashRouter_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/misc/HashRouter.h>
+
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/unit_test.h>
 
diff --git a/src/test/app/LedgerHistory_test.cpp b/src/test/app/LedgerHistory_test.cpp
index 94425be6e3..7b1910bd4d 100644
--- a/src/test/app/LedgerHistory_test.cpp
+++ b/src/test/app/LedgerHistory_test.cpp
@@ -19,10 +19,12 @@
 
 #include <test/jtx.h>
 #include <test/jtx/CheckMessageLogs.h>
+
 #include <xrpld/app/ledger/LedgerHistory.h>
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/tx/apply.h>
 #include <xrpld/ledger/OpenView.h>
+
 #include <xrpl/beast/insight/NullCollector.h>
 #include <xrpl/beast/unit_test.h>
 
diff --git a/src/test/app/LedgerLoad_test.cpp b/src/test/app/LedgerLoad_test.cpp
index 2e1a67ae86..c151bc7b4a 100644
--- a/src/test/app/LedgerLoad_test.cpp
+++ b/src/test/app/LedgerLoad_test.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/beast/unit_test/suite.h>
 #include <xrpl/beast/utility/Journal.h>
diff --git a/src/test/app/LedgerMaster_test.cpp b/src/test/app/LedgerMaster_test.cpp
index d34f0f576d..a5517cccee 100644
--- a/src/test/app/LedgerMaster_test.cpp
+++ b/src/test/app/LedgerMaster_test.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
+
 #include <xrpld/app/ledger/LedgerMaster.h>
 
 namespace ripple {
diff --git a/src/test/app/LedgerReplay_test.cpp b/src/test/app/LedgerReplay_test.cpp
index 883aca7bce..15f51889bb 100644
--- a/src/test/app/LedgerReplay_test.cpp
+++ b/src/test/app/LedgerReplay_test.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx.h>
 #include <test/jtx/envconfig.h>
+
 #include <xrpld/app/ledger/BuildLedger.h>
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/ledger/LedgerReplay.h>
@@ -29,6 +30,7 @@
 #include <xrpld/app/ledger/detail/SkipListAcquire.h>
 #include <xrpld/overlay/PeerSet.h>
 #include <xrpld/overlay/detail/PeerImp.h>
+
 #include <xrpl/basics/Slice.h>
 
 #include <chrono>
diff --git a/src/test/app/LoadFeeTrack_test.cpp b/src/test/app/LoadFeeTrack_test.cpp
index fa7489bf1b..9b0cf2fa2d 100644
--- a/src/test/app/LoadFeeTrack_test.cpp
+++ b/src/test/app/LoadFeeTrack_test.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/misc/LoadFeeTrack.h>
 #include <xrpld/core/Config.h>
 #include <xrpld/ledger/ReadView.h>
+
 #include <xrpl/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/app/MPToken_test.cpp b/src/test/app/MPToken_test.cpp
index 9fd4927d5e..31e5368691 100644
--- a/src/test/app/MPToken_test.cpp
+++ b/src/test/app/MPToken_test.cpp
@@ -20,6 +20,7 @@
 #include <test/jtx.h>
 #include <test/jtx/trust.h>
 #include <test/jtx/xchain_bridge.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/app/Manifest_test.cpp b/src/test/app/Manifest_test.cpp
index 10d311ebb4..deaa2adbad 100644
--- a/src/test/app/Manifest_test.cpp
+++ b/src/test/app/Manifest_test.cpp
@@ -18,10 +18,12 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/main/DBInit.h>
 #include <xrpld/app/misc/Manifest.h>
 #include <xrpld/app/misc/ValidatorList.h>
 #include <xrpld/app/rdb/Wallet.h>
+
 #include <xrpl/basics/base64.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/protocol/STExchange.h>
diff --git a/src/test/app/MultiSign_test.cpp b/src/test/app/MultiSign_test.cpp
index 9648bed886..ecac8ac67b 100644
--- a/src/test/app/MultiSign_test.cpp
+++ b/src/test/app/MultiSign_test.cpp
@@ -16,7 +16,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/app/NFTokenBurn_test.cpp b/src/test/app/NFTokenBurn_test.cpp
index a56f0a4567..a970b11789 100644
--- a/src/test/app/NFTokenBurn_test.cpp
+++ b/src/test/app/NFTokenBurn_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/app/NFTokenDir_test.cpp b/src/test/app/NFTokenDir_test.cpp
index 23e4c67152..fe21e02739 100644
--- a/src/test/app/NFTokenDir_test.cpp
+++ b/src/test/app/NFTokenDir_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/protocol/nftPageMask.h>
diff --git a/src/test/app/NFToken_test.cpp b/src/test/app/NFToken_test.cpp
index ec1ee5111e..62a7b00da9 100644
--- a/src/test/app/NFToken_test.cpp
+++ b/src/test/app/NFToken_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
+
 #include <xrpl/basics/random.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/test/app/NetworkID_test.cpp b/src/test/app/NetworkID_test.cpp
index 9ec6a026a8..07a4641c0e 100644
--- a/src/test/app/NetworkID_test.cpp
+++ b/src/test/app/NetworkID_test.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/app/OfferStream_test.cpp b/src/test/app/OfferStream_test.cpp
index bf71250368..691d327cd8 100644
--- a/src/test/app/OfferStream_test.cpp
+++ b/src/test/app/OfferStream_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/tx/detail/OfferStream.h>
+
 #include <xrpl/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp
index 2b4245a1ae..8ba4113341 100644
--- a/src/test/app/Offer_test.cpp
+++ b/src/test/app/Offer_test.cpp
@@ -20,6 +20,7 @@
 #include <test/jtx.h>
 #include <test/jtx/PathSet.h>
 #include <test/jtx/WSClient.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Quality.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/test/app/Oracle_test.cpp b/src/test/app/Oracle_test.cpp
index 44eeb1c9f9..291349309a 100644
--- a/src/test/app/Oracle_test.cpp
+++ b/src/test/app/Oracle_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/Oracle.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/app/OversizeMeta_test.cpp b/src/test/app/OversizeMeta_test.cpp
index 2a2554992a..f6e4466bab 100644
--- a/src/test/app/OversizeMeta_test.cpp
+++ b/src/test/app/OversizeMeta_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/app/Path_test.cpp b/src/test/app/Path_test.cpp
index 9008dc50ab..b500014578 100644
--- a/src/test/app/Path_test.cpp
+++ b/src/test/app/Path_test.cpp
@@ -19,12 +19,14 @@
 
 #include <test/jtx.h>
 #include <test/jtx/envconfig.h>
+
 #include <xrpld/app/paths/AccountCurrencies.h>
 #include <xrpld/core/JobQueue.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/RPCHandler.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
 #include <xrpld/rpc/detail/Tuning.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/json/json_reader.h>
 #include <xrpl/protocol/STParsedJSON.h>
diff --git a/src/test/app/PayChan_test.cpp b/src/test/app/PayChan_test.cpp
index 71712b11fe..dc839f89ec 100644
--- a/src/test/app/PayChan_test.cpp
+++ b/src/test/app/PayChan_test.cpp
@@ -18,8 +18,10 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/ledger/Dir.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/basics/chrono.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/test/app/PayStrand_test.cpp b/src/test/app/PayStrand_test.cpp
index 832966f113..4d743d9d7c 100644
--- a/src/test/app/PayStrand_test.cpp
+++ b/src/test/app/PayStrand_test.cpp
@@ -17,11 +17,13 @@
 
 #include <test/jtx.h>
 #include <test/jtx/PathSet.h>
+
 #include <xrpld/app/paths/AMMContext.h>
 #include <xrpld/app/paths/RippleCalc.h>
 #include <xrpld/app/paths/detail/Steps.h>
 #include <xrpld/core/Config.h>
 #include <xrpld/ledger/PaymentSandbox.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/safe_cast.h>
 #include <xrpl/protocol/Feature.h>
diff --git a/src/test/app/PermissionedDomains_test.cpp b/src/test/app/PermissionedDomains_test.cpp
index 41493b146f..65f75897ae 100644
--- a/src/test/app/PermissionedDomains_test.cpp
+++ b/src/test/app/PermissionedDomains_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/tx/detail/PermissionedDomainSet.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/app/PseudoTx_test.cpp b/src/test/app/PseudoTx_test.cpp
index be867cebc2..d96828a50b 100644
--- a/src/test/app/PseudoTx_test.cpp
+++ b/src/test/app/PseudoTx_test.cpp
@@ -16,7 +16,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/tx/apply.h>
+
 #include <xrpl/protocol/Feature.h>
 
 #include <string>
diff --git a/src/test/app/RCLCensorshipDetector_test.cpp b/src/test/app/RCLCensorshipDetector_test.cpp
index 5e29230114..85ba0ab78d 100644
--- a/src/test/app/RCLCensorshipDetector_test.cpp
+++ b/src/test/app/RCLCensorshipDetector_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/consensus/RCLCensorshipDetector.h>
+
 #include <xrpl/beast/unit_test.h>
 
 #include <algorithm>
diff --git a/src/test/app/RCLValidations_test.cpp b/src/test/app/RCLValidations_test.cpp
index 9fdb751b66..31c38f23b1 100644
--- a/src/test/app/RCLValidations_test.cpp
+++ b/src/test/app/RCLValidations_test.cpp
@@ -18,8 +18,10 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/consensus/RCLValidations.h>
 #include <xrpld/app/ledger/Ledger.h>
+
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/unit_test.h>
 
diff --git a/src/test/app/ReducedOffer_test.cpp b/src/test/app/ReducedOffer_test.cpp
index a070051e43..5af06d594d 100644
--- a/src/test/app/ReducedOffer_test.cpp
+++ b/src/test/app/ReducedOffer_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Quality.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/test/app/Regression_test.cpp b/src/test/app/Regression_test.cpp
index da7f55e77a..ca8dcdf5e2 100644
--- a/src/test/app/Regression_test.cpp
+++ b/src/test/app/Regression_test.cpp
@@ -18,8 +18,10 @@
 #include <test/jtx.h>
 #include <test/jtx/check.h>
 #include <test/jtx/envconfig.h>
+
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/tx/apply.h>
+
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/json/json_reader.h>
diff --git a/src/test/app/SHAMapStore_test.cpp b/src/test/app/SHAMapStore_test.cpp
index 5fd3f79c9f..d3b5917434 100644
--- a/src/test/app/SHAMapStore_test.cpp
+++ b/src/test/app/SHAMapStore_test.cpp
@@ -19,12 +19,14 @@
 
 #include <test/jtx.h>
 #include <test/jtx/envconfig.h>
+
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/main/NodeStoreScheduler.h>
 #include <xrpld/app/misc/SHAMapStore.h>
 #include <xrpld/app/rdb/backend/SQLiteDatabase.h>
 #include <xrpld/core/ConfigSections.h>
 #include <xrpld/nodestore/detail/DatabaseRotatingImp.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/app/SetAuth_test.cpp b/src/test/app/SetAuth_test.cpp
index 3dd8ab590a..c531de2d75 100644
--- a/src/test/app/SetAuth_test.cpp
+++ b/src/test/app/SetAuth_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/app/SetRegularKey_test.cpp b/src/test/app/SetRegularKey_test.cpp
index a3445dde3a..6a3a5ff2a9 100644
--- a/src/test/app/SetRegularKey_test.cpp
+++ b/src/test/app/SetRegularKey_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/protocol/Feature.h>
 
 namespace ripple {
diff --git a/src/test/app/SetTrust_test.cpp b/src/test/app/SetTrust_test.cpp
index 6516419fe4..c99a1dafa1 100644
--- a/src/test/app/SetTrust_test.cpp
+++ b/src/test/app/SetTrust_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/app/Taker_test.cpp b/src/test/app/Taker_test.cpp
index c73d06b873..3b3f338625 100644
--- a/src/test/app/Taker_test.cpp
+++ b/src/test/app/Taker_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/tx/detail/Taker.h>
+
 #include <xrpl/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/app/TheoreticalQuality_test.cpp b/src/test/app/TheoreticalQuality_test.cpp
index bec61219d9..0269d206cc 100644
--- a/src/test/app/TheoreticalQuality_test.cpp
+++ b/src/test/app/TheoreticalQuality_test.cpp
@@ -19,11 +19,13 @@
 
 #include <test/jtx.h>
 #include <test/jtx/PathSet.h>
+
 #include <xrpld/app/paths/AMMContext.h>
 #include <xrpld/app/paths/Flow.h>
 #include <xrpld/app/paths/detail/Steps.h>
 #include <xrpld/app/paths/detail/StrandFlow.h>
 #include <xrpld/ledger/PaymentSandbox.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/random.h>
 #include <xrpl/protocol/Feature.h>
diff --git a/src/test/app/Ticket_test.cpp b/src/test/app/Ticket_test.cpp
index 9467390502..dd83e3036e 100644
--- a/src/test/app/Ticket_test.cpp
+++ b/src/test/app/Ticket_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/misc/Transaction.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/app/Transaction_ordering_test.cpp b/src/test/app/Transaction_ordering_test.cpp
index 3d7d492ed9..472d4e2ab8 100644
--- a/src/test/app/Transaction_ordering_test.cpp
+++ b/src/test/app/Transaction_ordering_test.cpp
@@ -16,6 +16,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/core/JobQueue.h>
 
 namespace ripple {
diff --git a/src/test/app/TrustAndBalance_test.cpp b/src/test/app/TrustAndBalance_test.cpp
index b438d79727..037a7e0d89 100644
--- a/src/test/app/TrustAndBalance_test.cpp
+++ b/src/test/app/TrustAndBalance_test.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/SField.h>
diff --git a/src/test/app/TxQ_test.cpp b/src/test/app/TxQ_test.cpp
index 025ba7c095..2bedee17ca 100644
--- a/src/test/app/TxQ_test.cpp
+++ b/src/test/app/TxQ_test.cpp
@@ -22,10 +22,12 @@
 #include <test/jtx/WSClient.h>
 #include <test/jtx/envconfig.h>
 #include <test/jtx/ticket.h>
+
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/LoadFeeTrack.h>
 #include <xrpld/app/misc/TxQ.h>
 #include <xrpld/app/tx/apply.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/protocol/st.h>
diff --git a/src/test/app/ValidatorKeys_test.cpp b/src/test/app/ValidatorKeys_test.cpp
index 9281ec4bd7..7c8584698e 100644
--- a/src/test/app/ValidatorKeys_test.cpp
+++ b/src/test/app/ValidatorKeys_test.cpp
@@ -18,10 +18,12 @@
 //==============================================================================
 
 #include <test/jtx/Env.h>
+
 #include <xrpld/app/misc/Manifest.h>
 #include <xrpld/app/misc/ValidatorKeys.h>
 #include <xrpld/core/Config.h>
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/basics/base64.h>
 #include <xrpl/beast/unit_test.h>
 
diff --git a/src/test/app/ValidatorList_test.cpp b/src/test/app/ValidatorList_test.cpp
index 465723b1a7..819340bfa4 100644
--- a/src/test/app/ValidatorList_test.cpp
+++ b/src/test/app/ValidatorList_test.cpp
@@ -18,8 +18,10 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/misc/ValidatorList.h>
 #include <xrpld/overlay/detail/ProtocolMessage.h>
+
 #include <xrpl/basics/Slice.h>
 #include <xrpl/basics/base64.h>
 #include <xrpl/basics/strHex.h>
diff --git a/src/test/app/ValidatorSite_test.cpp b/src/test/app/ValidatorSite_test.cpp
index 3be63aff45..f7db0463c1 100644
--- a/src/test/app/ValidatorSite_test.cpp
+++ b/src/test/app/ValidatorSite_test.cpp
@@ -20,7 +20,9 @@
 #include <test/jtx.h>
 #include <test/jtx/TrustedPublisherServer.h>
 #include <test/unit_test/FileDirGuard.h>
+
 #include <xrpld/app/misc/ValidatorSite.h>
+
 #include <xrpl/basics/strHex.h>
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/jss.h>
@@ -29,6 +31,7 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio.hpp>
 #include <boost/range/adaptor/transformed.hpp>
+
 #include <date/date.h>
 
 #include <chrono>
diff --git a/src/test/app/XChain_test.cpp b/src/test/app/XChain_test.cpp
index 8d44fd8354..777cd5a68f 100644
--- a/src/test/app/XChain_test.cpp
+++ b/src/test/app/XChain_test.cpp
@@ -22,6 +22,7 @@
 #include <test/jtx/attester.h>
 #include <test/jtx/multisign.h>
 #include <test/jtx/xchain_bridge.h>
+
 #include <xrpl/beast/unit_test/suite.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/test/app/tx/apply_test.cpp b/src/test/app/tx/apply_test.cpp
index df76e839a7..63fecde65f 100644
--- a/src/test/app/tx/apply_test.cpp
+++ b/src/test/app/tx/apply_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx/Env.h>
+
 #include <xrpld/app/tx/apply.h>
+
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/protocol/Feature.h>
 
diff --git a/src/test/basics/Expected_test.cpp b/src/test/basics/Expected_test.cpp
index 2fb876c418..d022d07461 100644
--- a/src/test/basics/Expected_test.cpp
+++ b/src/test/basics/Expected_test.cpp
@@ -24,7 +24,6 @@
 #if BOOST_VERSION >= 107500
 #include <boost/json.hpp>  // Not part of boost before version 1.75
 #endif                     // BOOST_VERSION
-
 #include <array>
 #include <cstdint>
 
diff --git a/src/test/basics/FileUtilities_test.cpp b/src/test/basics/FileUtilities_test.cpp
index 2b84998da7..b78173f35f 100644
--- a/src/test/basics/FileUtilities_test.cpp
+++ b/src/test/basics/FileUtilities_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/unit_test/FileDirGuard.h>
+
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/basics/FileUtilities.h>
 #include <xrpl/beast/unit_test.h>
diff --git a/src/test/basics/KeyCache_test.cpp b/src/test/basics/KeyCache_test.cpp
index 738fa4d439..d39fd4a716 100644
--- a/src/test/basics/KeyCache_test.cpp
+++ b/src/test/basics/KeyCache_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpl/basics/TaggedCache.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/clock/manual_clock.h>
diff --git a/src/test/basics/PerfLog_test.cpp b/src/test/basics/PerfLog_test.cpp
index ec3cb8adc1..7ec62a1701 100644
--- a/src/test/basics/PerfLog_test.cpp
+++ b/src/test/basics/PerfLog_test.cpp
@@ -19,8 +19,10 @@
 
 #include <test/jtx/Env.h>
 #include <test/jtx/TestHelpers.h>
+
 #include <xrpld/perflog/PerfLog.h>
 #include <xrpld/rpc/detail/Handler.h>
+
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/beast/utility/Journal.h>
diff --git a/src/test/basics/TaggedCache_test.cpp b/src/test/basics/TaggedCache_test.cpp
index 6fbba1a479..519bc235cd 100644
--- a/src/test/basics/TaggedCache_test.cpp
+++ b/src/test/basics/TaggedCache_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpl/basics/TaggedCache.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/clock/manual_clock.h>
diff --git a/src/test/basics/join_test.cpp b/src/test/basics/join_test.cpp
index 8d26ec3df6..1b09482824 100644
--- a/src/test/basics/join_test.cpp
+++ b/src/test/basics/join_test.cpp
@@ -18,6 +18,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //==============================================================================
 
 #include <test/jtx/Account.h>
+
 #include <xrpl/basics/join.h>
 #include <xrpl/beast/unit_test.h>
 
diff --git a/src/test/beast/IPEndpoint_test.cpp b/src/test/beast/IPEndpoint_test.cpp
index 316cd1ce61..7b3eba55f1 100644
--- a/src/test/beast/IPEndpoint_test.cpp
+++ b/src/test/beast/IPEndpoint_test.cpp
@@ -21,6 +21,7 @@
 // ../impl/IPAddressV6.cpp
 
 #include <test/beast/IPEndpointCommon.h>
+
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/net/IPEndpoint.h>
 #include <xrpl/beast/unit_test.h>
diff --git a/src/test/beast/SemanticVersion_test.cpp b/src/test/beast/SemanticVersion_test.cpp
index eb5061ccde..fb7a3e3e4f 100644
--- a/src/test/beast/SemanticVersion_test.cpp
+++ b/src/test/beast/SemanticVersion_test.cpp
@@ -281,4 +281,4 @@ public:
 };
 
 BEAST_DEFINE_TESTSUITE(SemanticVersion, beast_core, beast);
-}  // namespace beast
\ No newline at end of file
+}  // namespace beast
diff --git a/src/test/beast/beast_PropertyStream_test.cpp b/src/test/beast/beast_PropertyStream_test.cpp
index ccc2e409eb..bbbc2fc0e0 100644
--- a/src/test/beast/beast_PropertyStream_test.cpp
+++ b/src/test/beast/beast_PropertyStream_test.cpp
@@ -239,4 +239,4 @@ public:
 };
 
 BEAST_DEFINE_TESTSUITE(PropertyStream, utility, beast);
-}  // namespace beast
\ No newline at end of file
+}  // namespace beast
diff --git a/src/test/conditions/PreimageSha256_test.cpp b/src/test/conditions/PreimageSha256_test.cpp
index 98d822394b..820b005a3f 100644
--- a/src/test/conditions/PreimageSha256_test.cpp
+++ b/src/test/conditions/PreimageSha256_test.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/conditions/Condition.h>
 #include <xrpld/conditions/Fulfillment.h>
 #include <xrpld/conditions/detail/PreimageSha256.h>
+
 #include <xrpl/basics/Buffer.h>
 #include <xrpl/basics/Slice.h>
 #include <xrpl/basics/StringUtilities.h>
diff --git a/src/test/consensus/ByzantineFailureSim_test.cpp b/src/test/consensus/ByzantineFailureSim_test.cpp
index 4aeb0b69e0..b979943477 100644
--- a/src/test/consensus/ByzantineFailureSim_test.cpp
+++ b/src/test/consensus/ByzantineFailureSim_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/csf.h>
+
 #include <xrpl/beast/unit_test.h>
 
 #include <utility>
diff --git a/src/test/consensus/Consensus_test.cpp b/src/test/consensus/Consensus_test.cpp
index 0d08753492..50da44d410 100644
--- a/src/test/consensus/Consensus_test.cpp
+++ b/src/test/consensus/Consensus_test.cpp
@@ -19,7 +19,9 @@
 
 #include <test/csf.h>
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpld/consensus/Consensus.h>
+
 #include <xrpl/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/consensus/DistributedValidatorsSim_test.cpp b/src/test/consensus/DistributedValidatorsSim_test.cpp
index 513c06039e..2f6ed74c23 100644
--- a/src/test/consensus/DistributedValidatorsSim_test.cpp
+++ b/src/test/consensus/DistributedValidatorsSim_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/csf.h>
+
 #include <xrpl/beast/unit_test.h>
 
 #include <boost/algorithm/string/classification.hpp>
diff --git a/src/test/consensus/LedgerTiming_test.cpp b/src/test/consensus/LedgerTiming_test.cpp
index 917387a2c9..79c0f3f884 100644
--- a/src/test/consensus/LedgerTiming_test.cpp
+++ b/src/test/consensus/LedgerTiming_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/consensus/LedgerTiming.h>
+
 #include <xrpl/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/consensus/LedgerTrie_test.cpp b/src/test/consensus/LedgerTrie_test.cpp
index 80a9b77a83..f46fea8e6e 100644
--- a/src/test/consensus/LedgerTrie_test.cpp
+++ b/src/test/consensus/LedgerTrie_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/csf/ledgers.h>
+
 #include <xrpld/consensus/LedgerTrie.h>
+
 #include <xrpl/beast/unit_test.h>
 
 #include <random>
diff --git a/src/test/consensus/NegativeUNL_test.cpp b/src/test/consensus/NegativeUNL_test.cpp
index 141972d749..7eb05e68bb 100644
--- a/src/test/consensus/NegativeUNL_test.cpp
+++ b/src/test/consensus/NegativeUNL_test.cpp
@@ -18,12 +18,14 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/consensus/RCLValidations.h>
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/misc/NegativeUNLVote.h>
 #include <xrpld/app/misc/ValidatorList.h>
 #include <xrpld/app/tx/apply.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/consensus/ScaleFreeSim_test.cpp b/src/test/consensus/ScaleFreeSim_test.cpp
index e338283033..226cf5bfed 100644
--- a/src/test/consensus/ScaleFreeSim_test.cpp
+++ b/src/test/consensus/ScaleFreeSim_test.cpp
@@ -19,6 +19,7 @@
 
 #include <test/csf.h>
 #include <test/csf/random.h>
+
 #include <xrpl/beast/unit_test.h>
 
 #include <utility>
diff --git a/src/test/consensus/Validations_test.cpp b/src/test/consensus/Validations_test.cpp
index 5438b5d67a..4424d7619d 100644
--- a/src/test/consensus/Validations_test.cpp
+++ b/src/test/consensus/Validations_test.cpp
@@ -19,7 +19,9 @@
 
 #include <test/csf/Validation.h>
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpld/consensus/Validations.h>
+
 #include <xrpl/basics/tagged_integer.h>
 #include <xrpl/beast/clock/manual_clock.h>
 #include <xrpl/beast/unit_test.h>
diff --git a/src/test/core/ClosureCounter_test.cpp b/src/test/core/ClosureCounter_test.cpp
index 83d2fdb6e4..a426a4aea4 100644
--- a/src/test/core/ClosureCounter_test.cpp
+++ b/src/test/core/ClosureCounter_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx/Env.h>
+
 #include <xrpld/core/ClosureCounter.h>
+
 #include <xrpl/beast/unit_test.h>
 
 #include <atomic>
diff --git a/src/test/core/Config_test.cpp b/src/test/core/Config_test.cpp
index c64b7d4052..8b0fce1e20 100644
--- a/src/test/core/Config_test.cpp
+++ b/src/test/core/Config_test.cpp
@@ -19,8 +19,10 @@
 
 #include <test/jtx/TestSuite.h>
 #include <test/unit_test/FileDirGuard.h>
+
 #include <xrpld/core/Config.h>
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/beast/unit_test/suite.h>
 #include <xrpl/server/Port.h>
 
diff --git a/src/test/core/Coroutine_test.cpp b/src/test/core/Coroutine_test.cpp
index 30fe86d59f..8458da647d 100644
--- a/src/test/core/Coroutine_test.cpp
+++ b/src/test/core/Coroutine_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/core/JobQueue.h>
 
 #include <chrono>
diff --git a/src/test/core/CryptoPRNG_test.cpp b/src/test/core/CryptoPRNG_test.cpp
index 8ad214fadf..21924e582c 100644
--- a/src/test/core/CryptoPRNG_test.cpp
+++ b/src/test/core/CryptoPRNG_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/Env.h>
+
 #include <xrpl/beast/utility/temp_dir.h>
 #include <xrpl/crypto/csprng.h>
 
diff --git a/src/test/core/JobQueue_test.cpp b/src/test/core/JobQueue_test.cpp
index 42338063db..66f110be9c 100644
--- a/src/test/core/JobQueue_test.cpp
+++ b/src/test/core/JobQueue_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx/Env.h>
+
 #include <xrpld/core/JobQueue.h>
+
 #include <xrpl/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/core/SociDB_test.cpp b/src/test/core/SociDB_test.cpp
index 5b69cc96ef..8f2a3c6646 100644
--- a/src/test/core/SociDB_test.cpp
+++ b/src/test/core/SociDB_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx/TestSuite.h>
+
 #include <xrpld/core/SociDB.h>
+
 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/basics/contract.h>
 
diff --git a/src/test/core/Workers_test.cpp b/src/test/core/Workers_test.cpp
index cf3f5038af..e37f7a71f8 100644
--- a/src/test/core/Workers_test.cpp
+++ b/src/test/core/Workers_test.cpp
@@ -19,6 +19,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <xrpld/core/detail/Workers.h>
 #include <xrpld/perflog/PerfLog.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/json/json_value.h>
 
diff --git a/src/test/csf/BasicNetwork_test.cpp b/src/test/csf/BasicNetwork_test.cpp
index bb6284e566..4173db6502 100644
--- a/src/test/csf/BasicNetwork_test.cpp
+++ b/src/test/csf/BasicNetwork_test.cpp
@@ -19,6 +19,7 @@
 
 #include <test/csf/BasicNetwork.h>
 #include <test/csf/Scheduler.h>
+
 #include <xrpl/beast/unit_test.h>
 
 #include <set>
diff --git a/src/test/csf/Digraph_test.cpp b/src/test/csf/Digraph_test.cpp
index 12c0f463c6..0cc4be1976 100644
--- a/src/test/csf/Digraph_test.cpp
+++ b/src/test/csf/Digraph_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/csf/Digraph.h>
+
 #include <xrpl/beast/unit_test.h>
 
 #include <string>
diff --git a/src/test/csf/Histogram_test.cpp b/src/test/csf/Histogram_test.cpp
index ea8b864780..40274c9046 100644
--- a/src/test/csf/Histogram_test.cpp
+++ b/src/test/csf/Histogram_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/csf/Histogram.h>
+
 #include <xrpl/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/csf/Peer.h b/src/test/csf/Peer.h
index 01f3c16cc2..678924112e 100644
--- a/src/test/csf/Peer.h
+++ b/src/test/csf/Peer.h
@@ -27,8 +27,10 @@
 #include <test/csf/Validation.h>
 #include <test/csf/events.h>
 #include <test/csf/ledgers.h>
+
 #include <xrpld/consensus/Consensus.h>
 #include <xrpld/consensus/Validations.h>
+
 #include <xrpl/beast/utility/WrappedSink.h>
 #include <xrpl/protocol/PublicKey.h>
 
diff --git a/src/test/csf/Proposal.h b/src/test/csf/Proposal.h
index 3bc1a9a0d7..eae258a251 100644
--- a/src/test/csf/Proposal.h
+++ b/src/test/csf/Proposal.h
@@ -23,6 +23,7 @@
 #include <test/csf/Tx.h>
 #include <test/csf/Validation.h>
 #include <test/csf/ledgers.h>
+
 #include <xrpld/consensus/ConsensusProposal.h>
 
 namespace ripple {
@@ -37,4 +38,4 @@ using Proposal = ConsensusProposal<PeerID, Ledger::ID, TxSet::ID>;
 }  // namespace test
 }  // namespace ripple
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/test/csf/Scheduler_test.cpp b/src/test/csf/Scheduler_test.cpp
index 103201e250..1935e40236 100644
--- a/src/test/csf/Scheduler_test.cpp
+++ b/src/test/csf/Scheduler_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/csf/Scheduler.h>
+
 #include <xrpl/beast/unit_test.h>
 
 #include <set>
diff --git a/src/test/csf/Validation.h b/src/test/csf/Validation.h
index f46e40d591..e79222c84f 100644
--- a/src/test/csf/Validation.h
+++ b/src/test/csf/Validation.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_CSF_VALIDATION_H_INCLUDED
 
 #include <test/csf/ledgers.h>
+
 #include <xrpl/basics/tagged_integer.h>
 
 #include <memory>
diff --git a/src/test/csf/collectors.h b/src/test/csf/collectors.h
index 3e3f59a606..0494178ae9 100644
--- a/src/test/csf/collectors.h
+++ b/src/test/csf/collectors.h
@@ -23,6 +23,7 @@
 #include <test/csf/Histogram.h>
 #include <test/csf/SimTime.h>
 #include <test/csf/events.h>
+
 #include <xrpl/basics/UnorderedContainers.h>
 
 #include <chrono>
diff --git a/src/test/csf/ledgers.h b/src/test/csf/ledgers.h
index 663fce32b1..a02adb9c87 100644
--- a/src/test/csf/ledgers.h
+++ b/src/test/csf/ledgers.h
@@ -21,7 +21,9 @@
 #define RIPPLE_TEST_CSF_LEDGERS_H_INCLUDED
 
 #include <test/csf/Tx.h>
+
 #include <xrpld/consensus/LedgerTiming.h>
+
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/basics/comparators.h>
diff --git a/src/test/json/Object_test.cpp b/src/test/json/Object_test.cpp
index 4a64d6538a..94a9e96cf6 100644
--- a/src/test/json/Object_test.cpp
+++ b/src/test/json/Object_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/json/TestOutputSuite.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/json/Object.h>
 
diff --git a/src/test/json/Output_test.cpp b/src/test/json/Output_test.cpp
index ddc5f08992..2343843fe3 100644
--- a/src/test/json/Output_test.cpp
+++ b/src/test/json/Output_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/json/TestOutputSuite.h>
+
 #include <xrpl/json/json_reader.h>
 #include <xrpl/json/json_writer.h>
 
diff --git a/src/test/json/TestOutputSuite.h b/src/test/json/TestOutputSuite.h
index a4f36dac4e..44992df64b 100644
--- a/src/test/json/TestOutputSuite.h
+++ b/src/test/json/TestOutputSuite.h
@@ -21,6 +21,7 @@
 #define RIPPLE_RPC_TESTOUTPUTSUITE_H_INCLUDED
 
 #include <test/jtx/TestSuite.h>
+
 #include <xrpl/json/Output.h>
 #include <xrpl/json/Writer.h>
 
diff --git a/src/test/json/Writer_test.cpp b/src/test/json/Writer_test.cpp
index 524c63fddf..c5305876ff 100644
--- a/src/test/json/Writer_test.cpp
+++ b/src/test/json/Writer_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/json/TestOutputSuite.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/json/Writer.h>
 
diff --git a/src/test/jtx.h b/src/test/jtx.h
index f3c69ce33c..6b73ca63ec 100644
--- a/src/test/jtx.h
+++ b/src/test/jtx.h
@@ -69,6 +69,7 @@
 #include <test/jtx/trust.h>
 #include <test/jtx/txflags.h>
 #include <test/jtx/utility.h>
+
 #include <xrpl/json/to_string.h>
 
 #endif
diff --git a/src/test/jtx/AMM.h b/src/test/jtx/AMM.h
index 52039f74ae..71e2e5f34c 100644
--- a/src/test/jtx/AMM.h
+++ b/src/test/jtx/AMM.h
@@ -25,7 +25,9 @@
 #include <test/jtx/multisign.h>
 #include <test/jtx/seq.h>
 #include <test/jtx/ter.h>
+
 #include <xrpld/rpc/GRPCHandlers.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/test/jtx/AMMTest.h b/src/test/jtx/AMMTest.h
index bd43f2fc1a..5ff2d21a19 100644
--- a/src/test/jtx/AMMTest.h
+++ b/src/test/jtx/AMMTest.h
@@ -23,6 +23,7 @@
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
 #include <test/jtx/ter.h>
+
 #include <xrpl/beast/unit_test/suite.h>
 #include <xrpl/protocol/Feature.h>
 
diff --git a/src/test/jtx/CaptureLogs.h b/src/test/jtx/CaptureLogs.h
index 1f0e5a4a0a..a8afb521c3 100644
--- a/src/test/jtx/CaptureLogs.h
+++ b/src/test/jtx/CaptureLogs.h
@@ -96,4 +96,4 @@ public:
 }  // namespace test
 }  // namespace ripple
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/test/jtx/CheckMessageLogs.h b/src/test/jtx/CheckMessageLogs.h
index 1e5b4b3857..fd3915440e 100644
--- a/src/test/jtx/CheckMessageLogs.h
+++ b/src/test/jtx/CheckMessageLogs.h
@@ -84,4 +84,4 @@ public:
 }  // namespace test
 }  // namespace ripple
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/test/jtx/Env.h b/src/test/jtx/Env.h
index a8e573b933..4e8bb64f59 100644
--- a/src/test/jtx/Env.h
+++ b/src/test/jtx/Env.h
@@ -29,12 +29,14 @@
 #include <test/jtx/require.h>
 #include <test/jtx/tags.h>
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/ledger/OpenLedger.h>
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/paths/Pathfinder.h>
 #include <xrpld/core/Config.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/utility/Journal.h>
diff --git a/src/test/jtx/Env_test.cpp b/src/test/jtx/Env_test.cpp
index 9df5bf2881..622efe297d 100644
--- a/src/test/jtx/Env_test.cpp
+++ b/src/test/jtx/Env_test.cpp
@@ -18,8 +18,10 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/app/misc/TxQ.h>
+
 #include <xrpl/beast/hash/uhash.h>
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/Feature.h>
diff --git a/src/test/jtx/JSONRPCClient.h b/src/test/jtx/JSONRPCClient.h
index 31e0ce1229..3765893eb7 100644
--- a/src/test/jtx/JSONRPCClient.h
+++ b/src/test/jtx/JSONRPCClient.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_HTTPCLIENT_H_INCLUDED
 
 #include <test/jtx/AbstractClient.h>
+
 #include <xrpld/core/Config.h>
 
 #include <memory>
diff --git a/src/test/jtx/JTx.h b/src/test/jtx/JTx.h
index 81ba1b406a..198839dd28 100644
--- a/src/test/jtx/JTx.h
+++ b/src/test/jtx/JTx.h
@@ -22,6 +22,7 @@
 
 #include <test/jtx/basic_prop.h>
 #include <test/jtx/requires.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/STTx.h>
diff --git a/src/test/jtx/PathSet.h b/src/test/jtx/PathSet.h
index 0f4c4ddd3d..df9de540a1 100644
--- a/src/test/jtx/PathSet.h
+++ b/src/test/jtx/PathSet.h
@@ -21,6 +21,7 @@
 #define RIPPLE_LEDGER_TESTS_PATHSET_H_INCLUDED
 
 #include <test/jtx.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/TxFlags.h>
 
diff --git a/src/test/jtx/TestHelpers.h b/src/test/jtx/TestHelpers.h
index 30f45ab403..534419494d 100644
--- a/src/test/jtx/TestHelpers.h
+++ b/src/test/jtx/TestHelpers.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_JTX_TESTHELPERS_H_INCLUDED
 
 #include <test/jtx/Env.h>
+
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/AccountID.h>
diff --git a/src/test/jtx/TrustedPublisherServer.h b/src/test/jtx/TrustedPublisherServer.h
index 1ef31fdf39..6138673484 100644
--- a/src/test/jtx/TrustedPublisherServer.h
+++ b/src/test/jtx/TrustedPublisherServer.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_TRUSTED_PUBLISHER_SERVER_H_INCLUDED
 
 #include <test/jtx/envconfig.h>
+
 #include <xrpl/basics/base64.h>
 #include <xrpl/basics/random.h>
 #include <xrpl/basics/strHex.h>
diff --git a/src/test/jtx/WSClient.h b/src/test/jtx/WSClient.h
index d0356dbcbf..8a479f97c3 100644
--- a/src/test/jtx/WSClient.h
+++ b/src/test/jtx/WSClient.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_WSCLIENT_H_INCLUDED
 
 #include <test/jtx/AbstractClient.h>
+
 #include <xrpld/core/Config.h>
 
 #include <chrono>
diff --git a/src/test/jtx/WSClient_test.cpp b/src/test/jtx/WSClient_test.cpp
index 18dadb0bf9..471e6ff31b 100644
--- a/src/test/jtx/WSClient_test.cpp
+++ b/src/test/jtx/WSClient_test.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
+
 #include <xrpl/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/jtx/amount.h b/src/test/jtx/amount.h
index 5fdc8bc69b..589347b12c 100644
--- a/src/test/jtx/amount.h
+++ b/src/test/jtx/amount.h
@@ -23,6 +23,7 @@
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
 #include <test/jtx/tags.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/protocol/FeeUnits.h>
 #include <xrpl/protocol/Issue.h>
diff --git a/src/test/jtx/credentials.h b/src/test/jtx/credentials.h
index ddc2260f16..9161b7241d 100644
--- a/src/test/jtx/credentials.h
+++ b/src/test/jtx/credentials.h
@@ -102,4 +102,4 @@ ledgerEntry(jtx::Env& env, std::string const& credIdx);
 }  // namespace test
 }  // namespace ripple
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/test/jtx/delivermin.h b/src/test/jtx/delivermin.h
index 46e633dab2..f8b0da2c19 100644
--- a/src/test/jtx/delivermin.h
+++ b/src/test/jtx/delivermin.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_JTX_DELIVERMIN_H_INCLUDED
 
 #include <test/jtx/Env.h>
+
 #include <xrpl/protocol/STAmount.h>
 
 namespace ripple {
diff --git a/src/test/jtx/fee.h b/src/test/jtx/fee.h
index 4e29fad152..7d54804f87 100644
--- a/src/test/jtx/fee.h
+++ b/src/test/jtx/fee.h
@@ -22,6 +22,7 @@
 
 #include <test/jtx/Env.h>
 #include <test/jtx/tags.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/protocol/STAmount.h>
 
diff --git a/src/test/jtx/flags.h b/src/test/jtx/flags.h
index c8887cdee4..b5e8207803 100644
--- a/src/test/jtx/flags.h
+++ b/src/test/jtx/flags.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_JTX_FLAGS_H_INCLUDED
 
 #include <test/jtx/Env.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/test/jtx/impl/AMM.cpp b/src/test/jtx/impl/AMM.cpp
index 26db9a5c6a..3482e7e867 100644
--- a/src/test/jtx/impl/AMM.cpp
+++ b/src/test/jtx/impl/AMM.cpp
@@ -19,8 +19,10 @@
 
 #include <test/jtx/AMM.h>
 #include <test/jtx/Env.h>
+
 #include <xrpld/app/misc/AMMUtils.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/protocol/AMMCore.h>
 #include <xrpl/protocol/AmountConversions.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/test/jtx/impl/AMMTest.cpp b/src/test/jtx/impl/AMMTest.cpp
index 0f2e6bca2b..8555be01a9 100644
--- a/src/test/jtx/impl/AMMTest.cpp
+++ b/src/test/jtx/impl/AMMTest.cpp
@@ -21,8 +21,10 @@
 #include <test/jtx/AMMTest.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/pay.h>
+
 #include <xrpld/rpc/RPCHandler.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/protocol/STParsedJSON.h>
 #include <xrpl/resource/Fees.h>
 
diff --git a/src/test/jtx/impl/Account.cpp b/src/test/jtx/impl/Account.cpp
index 9d41456ef7..b61048e66f 100644
--- a/src/test/jtx/impl/Account.cpp
+++ b/src/test/jtx/impl/Account.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
+
 #include <xrpl/protocol/UintTypes.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/Env.cpp b/src/test/jtx/impl/Env.cpp
index 9fffa6747c..e006f268cf 100644
--- a/src/test/jtx/impl/Env.cpp
+++ b/src/test/jtx/impl/Env.cpp
@@ -27,10 +27,12 @@
 #include <test/jtx/sig.h>
 #include <test/jtx/trust.h>
 #include <test/jtx/utility.h>
+
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/net/HTTPClient.h>
 #include <xrpld/net/RPCCall.h>
+
 #include <xrpl/basics/Slice.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/json/to_string.h>
diff --git a/src/test/jtx/impl/JSONRPCClient.cpp b/src/test/jtx/impl/JSONRPCClient.cpp
index fc50c69bdc..4db13c95fd 100644
--- a/src/test/jtx/impl/JSONRPCClient.cpp
+++ b/src/test/jtx/impl/JSONRPCClient.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/JSONRPCClient.h>
+
 #include <xrpl/json/json_reader.h>
 #include <xrpl/json/to_string.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/test/jtx/impl/Oracle.cpp b/src/test/jtx/impl/Oracle.cpp
index 06ac215a0a..721a1c299d 100644
--- a/src/test/jtx/impl/Oracle.cpp
+++ b/src/test/jtx/impl/Oracle.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/Oracle.h>
+
 #include <xrpl/protocol/jss.h>
 
 #include <boost/lexical_cast/try_lexical_convert.hpp>
@@ -376,4 +377,4 @@ validDocumentID(AnyValue const& v)
 }  // namespace oracle
 }  // namespace jtx
 }  // namespace test
-}  // namespace ripple
\ No newline at end of file
+}  // namespace ripple
diff --git a/src/test/jtx/impl/TestHelpers.cpp b/src/test/jtx/impl/TestHelpers.cpp
index 1317441968..e5b136e9c0 100644
--- a/src/test/jtx/impl/TestHelpers.cpp
+++ b/src/test/jtx/impl/TestHelpers.cpp
@@ -20,6 +20,7 @@
 #include <test/jtx/TestHelpers.h>
 #include <test/jtx/offer.h>
 #include <test/jtx/owners.h>
+
 #include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/WSClient.cpp b/src/test/jtx/impl/WSClient.cpp
index f3459baddb..20cca3179a 100644
--- a/src/test/jtx/impl/WSClient.cpp
+++ b/src/test/jtx/impl/WSClient.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
+
 #include <xrpl/json/json_reader.h>
 #include <xrpl/json/to_string.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/test/jtx/impl/acctdelete.cpp b/src/test/jtx/impl/acctdelete.cpp
index d7f8f10e04..842eea7fc2 100644
--- a/src/test/jtx/impl/acctdelete.cpp
+++ b/src/test/jtx/impl/acctdelete.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/acctdelete.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/amount.cpp b/src/test/jtx/impl/amount.cpp
index 80a4549175..9134122da9 100644
--- a/src/test/jtx/impl/amount.cpp
+++ b/src/test/jtx/impl/amount.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
+
 #include <xrpl/basics/safe_cast.h>
 
 #include <iomanip>
diff --git a/src/test/jtx/impl/attester.cpp b/src/test/jtx/impl/attester.cpp
index 8bde7edb97..91abfc459b 100644
--- a/src/test/jtx/impl/attester.cpp
+++ b/src/test/jtx/impl/attester.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/attester.h>
+
 #include <xrpl/basics/Slice.h>
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/SecretKey.h>
diff --git a/src/test/jtx/impl/check.cpp b/src/test/jtx/impl/check.cpp
index 21af6c9cc3..f5aa76658c 100644
--- a/src/test/jtx/impl/check.cpp
+++ b/src/test/jtx/impl/check.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/check.h>
+
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/jtx/impl/credentials.cpp b/src/test/jtx/impl/credentials.cpp
index bc7ccf93cd..f29bc45e20 100644
--- a/src/test/jtx/impl/credentials.cpp
+++ b/src/test/jtx/impl/credentials.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/credentials.h>
+
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/jtx/impl/delivermin.cpp b/src/test/jtx/impl/delivermin.cpp
index 6e4838c7c0..fe9f4e8fe6 100644
--- a/src/test/jtx/impl/delivermin.cpp
+++ b/src/test/jtx/impl/delivermin.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/delivermin.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/deposit.cpp b/src/test/jtx/impl/deposit.cpp
index d91607c990..5f4ae6bdb3 100644
--- a/src/test/jtx/impl/deposit.cpp
+++ b/src/test/jtx/impl/deposit.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/deposit.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/did.cpp b/src/test/jtx/impl/did.cpp
index a9a6e974ef..67a523403c 100644
--- a/src/test/jtx/impl/did.cpp
+++ b/src/test/jtx/impl/did.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/did.h>
+
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/jtx/impl/envconfig.cpp b/src/test/jtx/impl/envconfig.cpp
index de829cfc23..8c565e8b1f 100644
--- a/src/test/jtx/impl/envconfig.cpp
+++ b/src/test/jtx/impl/envconfig.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx/amount.h>
 #include <test/jtx/envconfig.h>
+
 #include <xrpld/core/ConfigSections.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/fee.cpp b/src/test/jtx/impl/fee.cpp
index e390136a3c..71e3dd089a 100644
--- a/src/test/jtx/impl/fee.cpp
+++ b/src/test/jtx/impl/fee.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/fee.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/flags.cpp b/src/test/jtx/impl/flags.cpp
index 6658d3eba9..a6ddfc1d71 100644
--- a/src/test/jtx/impl/flags.cpp
+++ b/src/test/jtx/impl/flags.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/flags.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/jtx_json.cpp b/src/test/jtx/impl/jtx_json.cpp
index c9cf6636cf..b76ad2ef0c 100644
--- a/src/test/jtx/impl/jtx_json.cpp
+++ b/src/test/jtx/impl/jtx_json.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx/jtx_json.h>
 #include <test/jtx/utility.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/json/json_reader.h>
 
diff --git a/src/test/jtx/impl/ledgerStateFix.cpp b/src/test/jtx/impl/ledgerStateFix.cpp
index 87866928f3..8c78069191 100644
--- a/src/test/jtx/impl/ledgerStateFix.cpp
+++ b/src/test/jtx/impl/ledgerStateFix.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx/ledgerStateFix.h>
+
 #include <xrpld/app/tx/detail/LedgerStateFix.h>
+
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/jtx/impl/mpt.cpp b/src/test/jtx/impl/mpt.cpp
index 3e728037af..ead6a47c25 100644
--- a/src/test/jtx/impl/mpt.cpp
+++ b/src/test/jtx/impl/mpt.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/mpt.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/multisign.cpp b/src/test/jtx/impl/multisign.cpp
index 479135f954..a802528247 100644
--- a/src/test/jtx/impl/multisign.cpp
+++ b/src/test/jtx/impl/multisign.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx/multisign.h>
 #include <test/jtx/utility.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/protocol/Sign.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/test/jtx/impl/offer.cpp b/src/test/jtx/impl/offer.cpp
index 55a1af4bea..f48c0f2d21 100644
--- a/src/test/jtx/impl/offer.cpp
+++ b/src/test/jtx/impl/offer.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/offer.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/paths.cpp b/src/test/jtx/impl/paths.cpp
index 393e36e9d6..2a45909eb9 100644
--- a/src/test/jtx/impl/paths.cpp
+++ b/src/test/jtx/impl/paths.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx/paths.h>
+
 #include <xrpld/app/paths/Pathfinder.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/pay.cpp b/src/test/jtx/impl/pay.cpp
index 2a627223fd..82fe910e9b 100644
--- a/src/test/jtx/impl/pay.cpp
+++ b/src/test/jtx/impl/pay.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/pay.h>
+
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/jtx/impl/quality2.cpp b/src/test/jtx/impl/quality2.cpp
index dd10b3c611..46f36cb6d6 100644
--- a/src/test/jtx/impl/quality2.cpp
+++ b/src/test/jtx/impl/quality2.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/quality.h>
+
 #include <xrpl/protocol/Quality.h>
 #include <xrpl/protocol/SField.h>
 
diff --git a/src/test/jtx/impl/rate.cpp b/src/test/jtx/impl/rate.cpp
index e9c677fe60..0526cdc28f 100644
--- a/src/test/jtx/impl/rate.cpp
+++ b/src/test/jtx/impl/rate.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/rate.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/jtx/impl/regkey.cpp b/src/test/jtx/impl/regkey.cpp
index 9fc260d2d0..cff2de3e8e 100644
--- a/src/test/jtx/impl/regkey.cpp
+++ b/src/test/jtx/impl/regkey.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/regkey.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/sendmax.cpp b/src/test/jtx/impl/sendmax.cpp
index 9514b92316..168ce4659d 100644
--- a/src/test/jtx/impl/sendmax.cpp
+++ b/src/test/jtx/impl/sendmax.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/sendmax.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/seq.cpp b/src/test/jtx/impl/seq.cpp
index 3a3de002db..82f0e98b4c 100644
--- a/src/test/jtx/impl/seq.cpp
+++ b/src/test/jtx/impl/seq.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/seq.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/ticket.cpp b/src/test/jtx/impl/ticket.cpp
index 69bcab4d9f..ef1ffd416b 100644
--- a/src/test/jtx/impl/ticket.cpp
+++ b/src/test/jtx/impl/ticket.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/ticket.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/token.cpp b/src/test/jtx/impl/token.cpp
index 5e0d0e9292..bea974a016 100644
--- a/src/test/jtx/impl/token.cpp
+++ b/src/test/jtx/impl/token.cpp
@@ -19,7 +19,9 @@
 
 #include <test/jtx/flags.h>
 #include <test/jtx/token.h>
+
 #include <xrpld/app/tx/detail/NFTokenMint.h>
+
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/jtx/impl/trust.cpp b/src/test/jtx/impl/trust.cpp
index 639f410ebc..5e9eadca8d 100644
--- a/src/test/jtx/impl/trust.cpp
+++ b/src/test/jtx/impl/trust.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/trust.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/jtx/impl/txflags.cpp b/src/test/jtx/impl/txflags.cpp
index 7bc59876a9..77c46f35b3 100644
--- a/src/test/jtx/impl/txflags.cpp
+++ b/src/test/jtx/impl/txflags.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/txflags.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/jtx/impl/utility.cpp b/src/test/jtx/impl/utility.cpp
index 1f7b659b5f..afa7ee8f35 100644
--- a/src/test/jtx/impl/utility.cpp
+++ b/src/test/jtx/impl/utility.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx/utility.h>
+
 #include <xrpld/net/RPCCall.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/json/Object.h>
 #include <xrpl/protocol/ErrorCodes.h>
diff --git a/src/test/jtx/impl/xchain_bridge.cpp b/src/test/jtx/impl/xchain_bridge.cpp
index 20eb65d38d..c63734ee8f 100644
--- a/src/test/jtx/impl/xchain_bridge.cpp
+++ b/src/test/jtx/impl/xchain_bridge.cpp
@@ -20,6 +20,7 @@
 #include <test/jtx/Env.h>
 #include <test/jtx/attester.h>
 #include <test/jtx/xchain_bridge.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/Issue.h>
 #include <xrpl/protocol/SField.h>
diff --git a/src/test/jtx/jtx_json.h b/src/test/jtx/jtx_json.h
index 837d652476..47f5a3c223 100644
--- a/src/test/jtx/jtx_json.h
+++ b/src/test/jtx/jtx_json.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_JTX_JSON_H_INCLUDED
 
 #include <test/jtx/Env.h>
+
 #include <xrpl/json/json_value.h>
 
 namespace ripple {
diff --git a/src/test/jtx/mpt.h b/src/test/jtx/mpt.h
index 2278c78ccd..12b9d74d27 100644
--- a/src/test/jtx/mpt.h
+++ b/src/test/jtx/mpt.h
@@ -23,6 +23,7 @@
 #include <test/jtx.h>
 #include <test/jtx/ter.h>
 #include <test/jtx/txflags.h>
+
 #include <xrpl/protocol/UintTypes.h>
 
 namespace ripple {
diff --git a/src/test/jtx/offer.h b/src/test/jtx/offer.h
index 3951f4f934..260b734ddd 100644
--- a/src/test/jtx/offer.h
+++ b/src/test/jtx/offer.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_JTX_OFFER_H_INCLUDED
 
 #include <test/jtx/Account.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/STAmount.h>
 
diff --git a/src/test/jtx/owners.h b/src/test/jtx/owners.h
index 129c0ed153..fc904f9e87 100644
--- a/src/test/jtx/owners.h
+++ b/src/test/jtx/owners.h
@@ -21,7 +21,9 @@
 #define RIPPLE_TEST_JTX_OWNERS_H_INCLUDED
 
 #include <test/jtx/Env.h>
+
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/UintTypes.h>
 
diff --git a/src/test/jtx/paths.h b/src/test/jtx/paths.h
index f85666382b..d1d5f5849a 100644
--- a/src/test/jtx/paths.h
+++ b/src/test/jtx/paths.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_JTX_PATHS_H_INCLUDED
 
 #include <test/jtx/Env.h>
+
 #include <xrpl/protocol/Issue.h>
 
 #include <type_traits>
diff --git a/src/test/jtx/pay.h b/src/test/jtx/pay.h
index 6294b5b308..f9d8822f53 100644
--- a/src/test/jtx/pay.h
+++ b/src/test/jtx/pay.h
@@ -22,6 +22,7 @@
 
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
+
 #include <xrpl/json/json_value.h>
 
 namespace ripple {
diff --git a/src/test/jtx/permissioned_domains.h b/src/test/jtx/permissioned_domains.h
index dd22a7e166..ee80c6a69f 100644
--- a/src/test/jtx/permissioned_domains.h
+++ b/src/test/jtx/permissioned_domains.h
@@ -71,4 +71,4 @@ getNewDomain(std::shared_ptr<STObject const> const& meta);
 }  // namespace test
 }  // namespace ripple
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/test/jtx/rate.h b/src/test/jtx/rate.h
index 0f8186accf..6fb8c9a8e9 100644
--- a/src/test/jtx/rate.h
+++ b/src/test/jtx/rate.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_JTX_RATE_H_INCLUDED
 
 #include <test/jtx/Account.h>
+
 #include <xrpl/json/json_value.h>
 
 namespace ripple {
diff --git a/src/test/jtx/regkey.h b/src/test/jtx/regkey.h
index 7d021e4f27..ce87c9b259 100644
--- a/src/test/jtx/regkey.h
+++ b/src/test/jtx/regkey.h
@@ -22,6 +22,7 @@
 
 #include <test/jtx/Account.h>
 #include <test/jtx/tags.h>
+
 #include <xrpl/json/json_value.h>
 
 namespace ripple {
diff --git a/src/test/jtx/sendmax.h b/src/test/jtx/sendmax.h
index 495c61c33b..54a1c25e2f 100644
--- a/src/test/jtx/sendmax.h
+++ b/src/test/jtx/sendmax.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_JTX_SENDMAX_H_INCLUDED
 
 #include <test/jtx/Env.h>
+
 #include <xrpl/protocol/STAmount.h>
 
 namespace ripple {
diff --git a/src/test/jtx/token.h b/src/test/jtx/token.h
index 9ce487d0cf..f22a1a01da 100644
--- a/src/test/jtx/token.h
+++ b/src/test/jtx/token.h
@@ -23,6 +23,7 @@
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/owners.h>
+
 #include <xrpl/basics/strHex.h>
 
 #include <initializer_list>
diff --git a/src/test/jtx/trust.h b/src/test/jtx/trust.h
index 0d02c6e76c..5f0cebcbef 100644
--- a/src/test/jtx/trust.h
+++ b/src/test/jtx/trust.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TEST_JTX_TRUST_H_INCLUDED
 
 #include <test/jtx/Account.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/STAmount.h>
 
diff --git a/src/test/jtx/utility.h b/src/test/jtx/utility.h
index 510e9544c0..2c21fbd3ff 100644
--- a/src/test/jtx/utility.h
+++ b/src/test/jtx/utility.h
@@ -21,8 +21,10 @@
 #define RIPPLE_TEST_JTX_UTILITY_H_INCLUDED
 
 #include <test/jtx/Account.h>
+
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/STObject.h>
 
diff --git a/src/test/jtx/xchain_bridge.h b/src/test/jtx/xchain_bridge.h
index 9968317c8d..8ff19bd508 100644
--- a/src/test/jtx/xchain_bridge.h
+++ b/src/test/jtx/xchain_bridge.h
@@ -23,6 +23,7 @@
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
 #include <test/jtx/multisign.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/XChainAttestations.h>
diff --git a/src/test/ledger/BookDirs_test.cpp b/src/test/ledger/BookDirs_test.cpp
index b50f4381f4..19a1b5d272 100644
--- a/src/test/ledger/BookDirs_test.cpp
+++ b/src/test/ledger/BookDirs_test.cpp
@@ -16,7 +16,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/ledger/BookDirs.h>
+
 #include <xrpl/protocol/Feature.h>
 
 namespace ripple {
diff --git a/src/test/ledger/Directory_test.cpp b/src/test/ledger/Directory_test.cpp
index db936b24d0..825d7ff340 100644
--- a/src/test/ledger/Directory_test.cpp
+++ b/src/test/ledger/Directory_test.cpp
@@ -16,8 +16,10 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/ledger/BookDirs.h>
 #include <xrpld/ledger/Sandbox.h>
+
 #include <xrpl/basics/random.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Protocol.h>
diff --git a/src/test/ledger/Invariants_test.cpp b/src/test/ledger/Invariants_test.cpp
index 4d79099c83..18b037cbbe 100644
--- a/src/test/ledger/Invariants_test.cpp
+++ b/src/test/ledger/Invariants_test.cpp
@@ -20,8 +20,10 @@
 #include <test/jtx.h>
 #include <test/jtx/AMM.h>
 #include <test/jtx/Env.h>
+
 #include <xrpld/app/tx/apply.h>
 #include <xrpld/app/tx/detail/ApplyContext.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/InnerObjectFormats.h>
 #include <xrpl/protocol/STLedgerEntry.h>
diff --git a/src/test/ledger/PaymentSandbox_test.cpp b/src/test/ledger/PaymentSandbox_test.cpp
index dd9b5c5d88..303e700f40 100644
--- a/src/test/ledger/PaymentSandbox_test.cpp
+++ b/src/test/ledger/PaymentSandbox_test.cpp
@@ -18,9 +18,11 @@
 //==============================================================================
 
 #include <test/jtx/PathSet.h>
+
 #include <xrpld/ledger/ApplyViewImpl.h>
 #include <xrpld/ledger/PaymentSandbox.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/AmountConversions.h>
 #include <xrpl/protocol/Feature.h>
 
diff --git a/src/test/ledger/PendingSaves_test.cpp b/src/test/ledger/PendingSaves_test.cpp
index 1bd42a64a6..e2a43eb585 100644
--- a/src/test/ledger/PendingSaves_test.cpp
+++ b/src/test/ledger/PendingSaves_test.cpp
@@ -16,6 +16,7 @@
 //==============================================================================
 
 #include <xrpld/app/ledger/PendingSaves.h>
+
 #include <xrpl/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/ledger/SkipList_test.cpp b/src/test/ledger/SkipList_test.cpp
index 5dda90accb..c2088d77cf 100644
--- a/src/test/ledger/SkipList_test.cpp
+++ b/src/test/ledger/SkipList_test.cpp
@@ -18,8 +18,10 @@
 //==============================================================================
 
 #include <test/jtx/Env.h>
+
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/ledger/View_test.cpp b/src/test/ledger/View_test.cpp
index a7ed7b6d9a..a9af8e2a40 100644
--- a/src/test/ledger/View_test.cpp
+++ b/src/test/ledger/View_test.cpp
@@ -18,12 +18,14 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/core/ConfigSections.h>
 #include <xrpld/ledger/ApplyViewImpl.h>
 #include <xrpld/ledger/OpenView.h>
 #include <xrpld/ledger/PaymentSandbox.h>
 #include <xrpld/ledger/Sandbox.h>
+
 #include <xrpl/protocol/Feature.h>
 
 #include <type_traits>
diff --git a/src/test/nodestore/Backend_test.cpp b/src/test/nodestore/Backend_test.cpp
index 7e6414ab47..488370fbe9 100644
--- a/src/test/nodestore/Backend_test.cpp
+++ b/src/test/nodestore/Backend_test.cpp
@@ -19,9 +19,11 @@
 
 #include <test/nodestore/TestBase.h>
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpld/nodestore/DummyScheduler.h>
 #include <xrpld/nodestore/Manager.h>
 #include <xrpld/unity/rocksdb.h>
+
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/beast/utility/temp_dir.h>
 
diff --git a/src/test/nodestore/Basics_test.cpp b/src/test/nodestore/Basics_test.cpp
index 9fd7026793..62a66c9dce 100644
--- a/src/test/nodestore/Basics_test.cpp
+++ b/src/test/nodestore/Basics_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/nodestore/TestBase.h>
+
 #include <xrpld/nodestore/detail/DecodedBlob.h>
 #include <xrpld/nodestore/detail/EncodedBlob.h>
 
diff --git a/src/test/nodestore/Database_test.cpp b/src/test/nodestore/Database_test.cpp
index 59557f3c79..bbf6381ee5 100644
--- a/src/test/nodestore/Database_test.cpp
+++ b/src/test/nodestore/Database_test.cpp
@@ -22,9 +22,11 @@
 #include <test/jtx/envconfig.h>
 #include <test/nodestore/TestBase.h>
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpld/core/DatabaseCon.h>
 #include <xrpld/nodestore/DummyScheduler.h>
 #include <xrpld/nodestore/Manager.h>
+
 #include <xrpl/beast/utility/temp_dir.h>
 
 namespace ripple {
diff --git a/src/test/nodestore/TestBase.h b/src/test/nodestore/TestBase.h
index becd006578..634f2bf005 100644
--- a/src/test/nodestore/TestBase.h
+++ b/src/test/nodestore/TestBase.h
@@ -23,6 +23,7 @@
 #include <xrpld/nodestore/Backend.h>
 #include <xrpld/nodestore/Database.h>
 #include <xrpld/nodestore/Types.h>
+
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/unit_test.h>
diff --git a/src/test/nodestore/Timing_test.cpp b/src/test/nodestore/Timing_test.cpp
index 6299137e31..3df18eee66 100644
--- a/src/test/nodestore/Timing_test.cpp
+++ b/src/test/nodestore/Timing_test.cpp
@@ -19,8 +19,10 @@
 
 #include <test/nodestore/TestBase.h>
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpld/nodestore/DummyScheduler.h>
 #include <xrpld/nodestore/Manager.h>
+
 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/basics/safe_cast.h>
diff --git a/src/test/nodestore/import_test.cpp b/src/test/nodestore/import_test.cpp
index 8d748c089e..d7865a20fc 100644
--- a/src/test/nodestore/import_test.cpp
+++ b/src/test/nodestore/import_test.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/nodestore/detail/codec.h>
 #include <xrpld/unity/rocksdb.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/beast/clock/basic_seconds_clock.h>
 #include <xrpl/beast/core/LexicalCast.h>
@@ -27,6 +28,7 @@
 
 #include <boost/beast/core/string.hpp>
 #include <boost/regex.hpp>
+
 #include <nudb/create.hpp>
 #include <nudb/detail/format.hpp>
 #include <nudb/xxhasher.hpp>
diff --git a/src/test/nodestore/varint_test.cpp b/src/test/nodestore/varint_test.cpp
index a1d1c85207..4f6d3c141c 100644
--- a/src/test/nodestore/varint_test.cpp
+++ b/src/test/nodestore/varint_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/nodestore/detail/varint.h>
+
 #include <xrpl/beast/unit_test.h>
 
 #include <array>
diff --git a/src/test/overlay/ProtocolVersion_test.cpp b/src/test/overlay/ProtocolVersion_test.cpp
index dfc0ee70b8..da976f8901 100644
--- a/src/test/overlay/ProtocolVersion_test.cpp
+++ b/src/test/overlay/ProtocolVersion_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/overlay/detail/ProtocolVersion.h>
+
 #include <xrpl/beast/unit_test.h>
 
 namespace ripple {
diff --git a/src/test/overlay/cluster_test.cpp b/src/test/overlay/cluster_test.cpp
index a80d966a15..76bbc9d4e3 100644
--- a/src/test/overlay/cluster_test.cpp
+++ b/src/test/overlay/cluster_test.cpp
@@ -19,7 +19,9 @@
 
 #include <test/jtx/TestSuite.h>
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpld/overlay/Cluster.h>
+
 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/protocol/SecretKey.h>
 
diff --git a/src/test/overlay/compression_test.cpp b/src/test/overlay/compression_test.cpp
index f70ff2a119..76c38fd59b 100644
--- a/src/test/overlay/compression_test.cpp
+++ b/src/test/overlay/compression_test.cpp
@@ -22,6 +22,7 @@
 #include <test/jtx/WSClient.h>
 #include <test/jtx/amount.h>
 #include <test/jtx/pay.h>
+
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/overlay/Compression.h>
@@ -30,6 +31,7 @@
 #include <xrpld/overlay/detail/ProtocolMessage.h>
 #include <xrpld/overlay/detail/ZeroCopyStream.h>
 #include <xrpld/shamap/SHAMapNodeID.h>
+
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/beast/utility/Journal.h>
diff --git a/src/test/overlay/handshake_test.cpp b/src/test/overlay/handshake_test.cpp
index 93038e522a..2d5155aaee 100644
--- a/src/test/overlay/handshake_test.cpp
+++ b/src/test/overlay/handshake_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/overlay/detail/Handshake.h>
+
 #include <xrpl/beast/unit_test.h>
 
 namespace ripple {
@@ -61,4 +62,4 @@ public:
 BEAST_DEFINE_TESTSUITE(handshake, ripple_data, ripple);
 
 }  // namespace test
-}  // namespace ripple
\ No newline at end of file
+}  // namespace ripple
diff --git a/src/test/overlay/reduce_relay_test.cpp b/src/test/overlay/reduce_relay_test.cpp
index fc50ab9909..9fc105262b 100644
--- a/src/test/overlay/reduce_relay_test.cpp
+++ b/src/test/overlay/reduce_relay_test.cpp
@@ -18,11 +18,13 @@
 //==============================================================================
 
 #include <test/jtx/Env.h>
+
 #include <xrpld/overlay/Message.h>
 #include <xrpld/overlay/Peer.h>
 #include <xrpld/overlay/Slot.h>
 #include <xrpld/overlay/Squelch.h>
 #include <xrpld/overlay/detail/Handshake.h>
+
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/SecretKey.h>
diff --git a/src/test/overlay/short_read_test.cpp b/src/test/overlay/short_read_test.cpp
index 34f7815b27..739d7ea954 100644
--- a/src/test/overlay/short_read_test.cpp
+++ b/src/test/overlay/short_read_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx/envconfig.h>
+
 #include <xrpl/basics/make_SSLContext.h>
 #include <xrpl/beast/core/CurrentThreadName.h>
 #include <xrpl/beast/unit_test.h>
diff --git a/src/test/overlay/tx_reduce_relay_test.cpp b/src/test/overlay/tx_reduce_relay_test.cpp
index afaaf72170..07ff2bb14a 100644
--- a/src/test/overlay/tx_reduce_relay_test.cpp
+++ b/src/test/overlay/tx_reduce_relay_test.cpp
@@ -19,9 +19,11 @@
 
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
+
 #include <xrpld/overlay/detail/OverlayImpl.h>
 #include <xrpld/overlay/detail/PeerImp.h>
 #include <xrpld/peerfinder/detail/SlotImp.h>
+
 #include <xrpl/basics/make_SSLContext.h>
 #include <xrpl/beast/unit_test.h>
 
@@ -284,4 +286,4 @@ private:
 
 BEAST_DEFINE_TESTSUITE(tx_reduce_relay, ripple_data, ripple);
 }  // namespace test
-}  // namespace ripple
\ No newline at end of file
+}  // namespace ripple
diff --git a/src/test/peerfinder/Livecache_test.cpp b/src/test/peerfinder/Livecache_test.cpp
index f8648e380e..a150f02f05 100644
--- a/src/test/peerfinder/Livecache_test.cpp
+++ b/src/test/peerfinder/Livecache_test.cpp
@@ -19,7 +19,9 @@
 
 #include <test/beast/IPEndpointCommon.h>
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpld/peerfinder/detail/Livecache.h>
+
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/clock/manual_clock.h>
 #include <xrpl/beast/unit_test.h>
diff --git a/src/test/peerfinder/PeerFinder_test.cpp b/src/test/peerfinder/PeerFinder_test.cpp
index 11946335cf..9006b8c1c7 100644
--- a/src/test/peerfinder/PeerFinder_test.cpp
+++ b/src/test/peerfinder/PeerFinder_test.cpp
@@ -18,8 +18,10 @@
 //==============================================================================
 
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpld/core/Config.h>
 #include <xrpld/peerfinder/detail/Logic.h>
+
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/unit_test/suite.h>
 #include <xrpl/protocol/PublicKey.h>
diff --git a/src/test/protocol/Hooks_test.cpp b/src/test/protocol/Hooks_test.cpp
index 9eed2cfc48..0637b52efa 100644
--- a/src/test/protocol/Hooks_test.cpp
+++ b/src/test/protocol/Hooks_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/protocol/Feature.h>
 
 #include <functional>
diff --git a/src/test/protocol/InnerObjectFormats_test.cpp b/src/test/protocol/InnerObjectFormats_test.cpp
index a42b59fa04..f4d9722392 100644
--- a/src/test/protocol/InnerObjectFormats_test.cpp
+++ b/src/test/protocol/InnerObjectFormats_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/json/json_reader.h>       // Json::Reader
diff --git a/src/test/protocol/Memo_test.cpp b/src/test/protocol/Memo_test.cpp
index 22a902527f..a7fa846a4d 100644
--- a/src/test/protocol/Memo_test.cpp
+++ b/src/test/protocol/Memo_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/basics/strHex.h>
 
 namespace ripple {
diff --git a/src/test/protocol/STIssue_test.cpp b/src/test/protocol/STIssue_test.cpp
index 4c9eeb0ba1..6e8d37331b 100644
--- a/src/test/protocol/STIssue_test.cpp
+++ b/src/test/protocol/STIssue_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/STIssue.h>
 
@@ -161,4 +162,4 @@ public:
 BEAST_DEFINE_TESTSUITE(STIssue, ripple_data, ripple);
 
 }  // namespace test
-}  // namespace ripple
\ No newline at end of file
+}  // namespace ripple
diff --git a/src/test/protocol/STObject_test.cpp b/src/test/protocol/STObject_test.cpp
index 071a5f4f63..e02cfeeea4 100644
--- a/src/test/protocol/STObject_test.cpp
+++ b/src/test/protocol/STObject_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/json/json_reader.h>
 #include <xrpl/json/to_string.h>
diff --git a/src/test/protocol/STValidation_test.cpp b/src/test/protocol/STValidation_test.cpp
index 779a15943a..784fc43c24 100644
--- a/src/test/protocol/STValidation_test.cpp
+++ b/src/test/protocol/STValidation_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/beast/xor_shift_engine.h>
diff --git a/src/test/resource/Logic_test.cpp b/src/test/resource/Logic_test.cpp
index 24b4f899c7..49326e7dc5 100644
--- a/src/test/resource/Logic_test.cpp
+++ b/src/test/resource/Logic_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpl/basics/chrono.h>
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/unit_test.h>
diff --git a/src/test/rpc/AMMInfo_test.cpp b/src/test/rpc/AMMInfo_test.cpp
index 992f0f2520..a0985ea104 100644
--- a/src/test/rpc/AMMInfo_test.cpp
+++ b/src/test/rpc/AMMInfo_test.cpp
@@ -20,6 +20,7 @@
 #include <test/jtx.h>
 #include <test/jtx/AMM.h>
 #include <test/jtx/AMMTest.h>
+
 #include <xrpl/protocol/jss.h>
 
 #include <unordered_map>
diff --git a/src/test/rpc/AccountCurrencies_test.cpp b/src/test/rpc/AccountCurrencies_test.cpp
index 7d16ca48a9..3ccb89c471 100644
--- a/src/test/rpc/AccountCurrencies_test.cpp
+++ b/src/test/rpc/AccountCurrencies_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/rpc/AccountInfo_test.cpp b/src/test/rpc/AccountInfo_test.cpp
index 0839176822..238b739611 100644
--- a/src/test/rpc/AccountInfo_test.cpp
+++ b/src/test/rpc/AccountInfo_test.cpp
@@ -20,6 +20,7 @@
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
 #include <test/rpc/GRPCTestClientBase.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/rpc/AccountLines_test.cpp b/src/test/rpc/AccountLines_test.cpp
index 72d63bd0cf..79e4bf214f 100644
--- a/src/test/rpc/AccountLines_test.cpp
+++ b/src/test/rpc/AccountLines_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp
index 232a091114..b723095aeb 100644
--- a/src/test/rpc/AccountObjects_test.cpp
+++ b/src/test/rpc/AccountObjects_test.cpp
@@ -20,7 +20,9 @@
 #include <test/jtx.h>
 #include <test/jtx/AMM.h>
 #include <test/jtx/xchain_bridge.h>
+
 #include <xrpld/app/tx/detail/NFTokenMint.h>
+
 #include <xrpl/json/json_reader.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/json/to_string.h>
diff --git a/src/test/rpc/AccountOffers_test.cpp b/src/test/rpc/AccountOffers_test.cpp
index da6acc97e9..2aa85ac9b9 100644
--- a/src/test/rpc/AccountOffers_test.cpp
+++ b/src/test/rpc/AccountOffers_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/rpc/AccountSet_test.cpp b/src/test/rpc/AccountSet_test.cpp
index 1412d7bf55..7bca51ae96 100644
--- a/src/test/rpc/AccountSet_test.cpp
+++ b/src/test/rpc/AccountSet_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/protocol/AmountConversions.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Quality.h>
diff --git a/src/test/rpc/AccountTx_test.cpp b/src/test/rpc/AccountTx_test.cpp
index f6a9225ec4..f10b5b8387 100644
--- a/src/test/rpc/AccountTx_test.cpp
+++ b/src/test/rpc/AccountTx_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/test/rpc/AmendmentBlocked_test.cpp b/src/test/rpc/AmendmentBlocked_test.cpp
index 2fd194cf45..bea9cdf57d 100644
--- a/src/test/rpc/AmendmentBlocked_test.cpp
+++ b/src/test/rpc/AmendmentBlocked_test.cpp
@@ -19,8 +19,10 @@
 
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
+
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/rpc/Book_test.cpp b/src/test/rpc/Book_test.cpp
index 6bcc0c2080..79e3f940f8 100644
--- a/src/test/rpc/Book_test.cpp
+++ b/src/test/rpc/Book_test.cpp
@@ -17,7 +17,9 @@
 
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
+
 #include <xrpld/rpc/detail/Tuning.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/test/rpc/Connect_test.cpp b/src/test/rpc/Connect_test.cpp
index 8f3fe26adb..cc021ba08f 100644
--- a/src/test/rpc/Connect_test.cpp
+++ b/src/test/rpc/Connect_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/rpc/DeliveredAmount_test.cpp b/src/test/rpc/DeliveredAmount_test.cpp
index 57f5b4863b..9a63f24842 100644
--- a/src/test/rpc/DeliveredAmount_test.cpp
+++ b/src/test/rpc/DeliveredAmount_test.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/rpc/DepositAuthorized_test.cpp b/src/test/rpc/DepositAuthorized_test.cpp
index 46637d421e..2ccad9d779 100644
--- a/src/test/rpc/DepositAuthorized_test.cpp
+++ b/src/test/rpc/DepositAuthorized_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/rpc/Feature_test.cpp b/src/test/rpc/Feature_test.cpp
index 12d4b27745..bc789f9a74 100644
--- a/src/test/rpc/Feature_test.cpp
+++ b/src/test/rpc/Feature_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/misc/AmendmentTable.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/rpc/GRPCTestClientBase.h b/src/test/rpc/GRPCTestClientBase.h
index 7ac97fb6e1..06531ef552 100644
--- a/src/test/rpc/GRPCTestClientBase.h
+++ b/src/test/rpc/GRPCTestClientBase.h
@@ -21,6 +21,7 @@
 #define RIPPLED_GRPCTESTCLIENTBASE_H
 
 #include <test/jtx/envconfig.h>
+
 #include <xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
 
 #include <grpcpp/grpcpp.h>
diff --git a/src/test/rpc/GatewayBalances_test.cpp b/src/test/rpc/GatewayBalances_test.cpp
index 4e847c8dbd..730d58bcca 100644
--- a/src/test/rpc/GatewayBalances_test.cpp
+++ b/src/test/rpc/GatewayBalances_test.cpp
@@ -17,7 +17,9 @@
 
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
+
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/test/rpc/GetAggregatePrice_test.cpp b/src/test/rpc/GetAggregatePrice_test.cpp
index aad3c9be99..1e09219f57 100644
--- a/src/test/rpc/GetAggregatePrice_test.cpp
+++ b/src/test/rpc/GetAggregatePrice_test.cpp
@@ -19,7 +19,9 @@
 
 #include <test/jtx.h>
 #include <test/jtx/Oracle.h>
+
 #include <xrpld/app/ledger/LedgerMaster.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/rpc/GetCounts_test.cpp b/src/test/rpc/GetCounts_test.cpp
index 132ed93d7b..d0b3404781 100644
--- a/src/test/rpc/GetCounts_test.cpp
+++ b/src/test/rpc/GetCounts_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/SField.h>
diff --git a/src/test/rpc/Handler_test.cpp b/src/test/rpc/Handler_test.cpp
index 9dbeb8f0b9..4883cf664f 100644
--- a/src/test/rpc/Handler_test.cpp
+++ b/src/test/rpc/Handler_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/rpc/detail/Handler.h>
+
 #include <xrpl/beast/unit_test.h>
 
 #include <chrono>
diff --git a/src/test/rpc/JSONRPC_test.cpp b/src/test/rpc/JSONRPC_test.cpp
index 9b6a5ef985..03f206707b 100644
--- a/src/test/rpc/JSONRPC_test.cpp
+++ b/src/test/rpc/JSONRPC_test.cpp
@@ -19,10 +19,12 @@
 
 #include <test/jtx.h>
 #include <test/jtx/envconfig.h>
+
 #include <xrpld/app/misc/LoadFeeTrack.h>
 #include <xrpld/app/misc/TxQ.h>
 #include <xrpld/core/ConfigSections.h>
 #include <xrpld/rpc/detail/TransactionSign.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/json/json_reader.h>
diff --git a/src/test/rpc/KeyGeneration_test.cpp b/src/test/rpc/KeyGeneration_test.cpp
index 735e55c51a..07ebd93dd3 100644
--- a/src/test/rpc/KeyGeneration_test.cpp
+++ b/src/test/rpc/KeyGeneration_test.cpp
@@ -18,8 +18,10 @@
 //==============================================================================
 
 #include <test/jtx/TestSuite.h>
+
 #include <xrpld/rpc/detail/RPCHelpers.h>
 #include <xrpld/rpc/handlers/WalletPropose.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/json/json_writer.h>
 #include <xrpl/protocol/ErrorCodes.h>
diff --git a/src/test/rpc/LedgerClosed_test.cpp b/src/test/rpc/LedgerClosed_test.cpp
index c3f7f900e3..b0a2216b1f 100644
--- a/src/test/rpc/LedgerClosed_test.cpp
+++ b/src/test/rpc/LedgerClosed_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/rpc/LedgerData_test.cpp b/src/test/rpc/LedgerData_test.cpp
index 1e4f97a935..b56cb241dd 100644
--- a/src/test/rpc/LedgerData_test.cpp
+++ b/src/test/rpc/LedgerData_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/rpc/LedgerHeader_test.cpp b/src/test/rpc/LedgerHeader_test.cpp
index d8fe738b88..a80f706b6f 100644
--- a/src/test/rpc/LedgerHeader_test.cpp
+++ b/src/test/rpc/LedgerHeader_test.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx/Env.h>
 #include <test/jtx/envconfig.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/rpc/LedgerRPC_test.cpp b/src/test/rpc/LedgerRPC_test.cpp
index 78b15baf3a..4a55a79eef 100644
--- a/src/test/rpc/LedgerRPC_test.cpp
+++ b/src/test/rpc/LedgerRPC_test.cpp
@@ -22,7 +22,9 @@
 #include <test/jtx/attester.h>
 #include <test/jtx/multisign.h>
 #include <test/jtx/xchain_bridge.h>
+
 #include <xrpld/app/misc/TxQ.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/AccountID.h>
diff --git a/src/test/rpc/LedgerRequestRPC_test.cpp b/src/test/rpc/LedgerRequestRPC_test.cpp
index 61905c99c1..221f639819 100644
--- a/src/test/rpc/LedgerRequestRPC_test.cpp
+++ b/src/test/rpc/LedgerRequestRPC_test.cpp
@@ -18,8 +18,10 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/test/rpc/ManifestRPC_test.cpp b/src/test/rpc/ManifestRPC_test.cpp
index fcf47a5745..d040ed5632 100644
--- a/src/test/rpc/ManifestRPC_test.cpp
+++ b/src/test/rpc/ManifestRPC_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/rpc/NoRippleCheck_test.cpp b/src/test/rpc/NoRippleCheck_test.cpp
index 9ff84fd080..6cd566e144 100644
--- a/src/test/rpc/NoRippleCheck_test.cpp
+++ b/src/test/rpc/NoRippleCheck_test.cpp
@@ -19,8 +19,10 @@
 
 #include <test/jtx.h>
 #include <test/jtx/envconfig.h>
+
 #include <xrpld/app/misc/TxQ.h>
 #include <xrpld/rpc/detail/Tuning.h>
+
 #include <xrpl/beast/utility/temp_dir.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/resource/ResourceManager.h>
diff --git a/src/test/rpc/NoRipple_test.cpp b/src/test/rpc/NoRipple_test.cpp
index aa5e6e1efe..5c41f25128 100644
--- a/src/test/rpc/NoRipple_test.cpp
+++ b/src/test/rpc/NoRipple_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/rpc/OwnerInfo_test.cpp b/src/test/rpc/OwnerInfo_test.cpp
index 8375dd6198..8d9f9c401f 100644
--- a/src/test/rpc/OwnerInfo_test.cpp
+++ b/src/test/rpc/OwnerInfo_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/STAmount.h>
diff --git a/src/test/rpc/Peers_test.cpp b/src/test/rpc/Peers_test.cpp
index cf0a0fc18d..d325da12c3 100644
--- a/src/test/rpc/Peers_test.cpp
+++ b/src/test/rpc/Peers_test.cpp
@@ -19,8 +19,10 @@
 
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
+
 #include <xrpld/overlay/Cluster.h>
 #include <xrpld/overlay/Overlay.h>
+
 #include <xrpl/protocol/jss.h>
 
 #include <unordered_map>
diff --git a/src/test/rpc/RPCCall_test.cpp b/src/test/rpc/RPCCall_test.cpp
index b812740fb3..8438ef533d 100644
--- a/src/test/rpc/RPCCall_test.cpp
+++ b/src/test/rpc/RPCCall_test.cpp
@@ -17,8 +17,10 @@
 
 #include <test/jtx.h>
 #include <test/jtx/utility.h>
+
 #include <xrpld/net/RPCCall.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/json/json_reader.h>
 #include <xrpl/protocol/ErrorCodes.h>
diff --git a/src/test/rpc/RPCHelpers_test.cpp b/src/test/rpc/RPCHelpers_test.cpp
index 11a0ef787d..531649b8af 100644
--- a/src/test/rpc/RPCHelpers_test.cpp
+++ b/src/test/rpc/RPCHelpers_test.cpp
@@ -16,6 +16,7 @@
 //==============================================================================
 
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/rpc/RPCOverload_test.cpp b/src/test/rpc/RPCOverload_test.cpp
index c3328fb0b2..efe69496fb 100644
--- a/src/test/rpc/RPCOverload_test.cpp
+++ b/src/test/rpc/RPCOverload_test.cpp
@@ -18,7 +18,9 @@
 #include <test/jtx.h>
 #include <test/jtx/JSONRPCClient.h>
 #include <test/jtx/WSClient.h>
+
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/rpc/RobustTransaction_test.cpp b/src/test/rpc/RobustTransaction_test.cpp
index b0506224f7..ccef6e297e 100644
--- a/src/test/rpc/RobustTransaction_test.cpp
+++ b/src/test/rpc/RobustTransaction_test.cpp
@@ -19,7 +19,9 @@
 
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
+
 #include <xrpld/core/JobQueue.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/rpc/Roles_test.cpp b/src/test/rpc/Roles_test.cpp
index 603b505fb6..5ac8654330 100644
--- a/src/test/rpc/Roles_test.cpp
+++ b/src/test/rpc/Roles_test.cpp
@@ -19,6 +19,7 @@
 
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
+
 #include <xrpl/beast/unit_test.h>
 
 #include <string>
diff --git a/src/test/rpc/ServerInfo_test.cpp b/src/test/rpc/ServerInfo_test.cpp
index 5e202f275a..21312ef8ff 100644
--- a/src/test/rpc/ServerInfo_test.cpp
+++ b/src/test/rpc/ServerInfo_test.cpp
@@ -18,8 +18,10 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/rpc/Simulate_test.cpp b/src/test/rpc/Simulate_test.cpp
index 656e5f0577..089c444e11 100644
--- a/src/test/rpc/Simulate_test.cpp
+++ b/src/test/rpc/Simulate_test.cpp
@@ -20,8 +20,10 @@
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/envconfig.h>
+
 #include <xrpld/app/rdb/backend/SQLiteDatabase.h>
 #include <xrpld/rpc/CTID.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/STBase.h>
 #include <xrpl/protocol/STParsedJSON.h>
diff --git a/src/test/rpc/Status_test.cpp b/src/test/rpc/Status_test.cpp
index b272b45b57..e37fe2dabd 100644
--- a/src/test/rpc/Status_test.cpp
+++ b/src/test/rpc/Status_test.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/rpc/Status.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/beast/unit_test.h>
 
diff --git a/src/test/rpc/Subscribe_test.cpp b/src/test/rpc/Subscribe_test.cpp
index 0d70122b43..2c6bf2322d 100644
--- a/src/test/rpc/Subscribe_test.cpp
+++ b/src/test/rpc/Subscribe_test.cpp
@@ -18,10 +18,12 @@
 #include <test/jtx.h>
 #include <test/jtx/WSClient.h>
 #include <test/jtx/envconfig.h>
+
 #include <xrpld/app/main/LoadManager.h>
 #include <xrpld/app/misc/LoadFeeTrack.h>
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/Feature.h>
diff --git a/src/test/rpc/TransactionEntry_test.cpp b/src/test/rpc/TransactionEntry_test.cpp
index 09423ed25d..bafb01f5ff 100644
--- a/src/test/rpc/TransactionEntry_test.cpp
+++ b/src/test/rpc/TransactionEntry_test.cpp
@@ -19,7 +19,9 @@
 
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
+
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/json/json_reader.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/test/rpc/TransactionHistory_test.cpp b/src/test/rpc/TransactionHistory_test.cpp
index 62f73e2130..d5b1b27a35 100644
--- a/src/test/rpc/TransactionHistory_test.cpp
+++ b/src/test/rpc/TransactionHistory_test.cpp
@@ -20,6 +20,7 @@
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/envconfig.h>
+
 #include <xrpl/protocol/jss.h>
 
 #include <boost/container/static_vector.hpp>
diff --git a/src/test/rpc/Transaction_test.cpp b/src/test/rpc/Transaction_test.cpp
index 2bd20eb370..6aef32dbf3 100644
--- a/src/test/rpc/Transaction_test.cpp
+++ b/src/test/rpc/Transaction_test.cpp
@@ -20,8 +20,10 @@
 #include <test/jtx.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/envconfig.h>
+
 #include <xrpld/app/rdb/backend/SQLiteDatabase.h>
 #include <xrpld/rpc/CTID.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/STBase.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/test/rpc/ValidatorInfo_test.cpp b/src/test/rpc/ValidatorInfo_test.cpp
index 5ca1af7a3c..4904923e0b 100644
--- a/src/test/rpc/ValidatorInfo_test.cpp
+++ b/src/test/rpc/ValidatorInfo_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/test/rpc/ValidatorRPC_test.cpp b/src/test/rpc/ValidatorRPC_test.cpp
index 2d72070fcd..d03cbbf841 100644
--- a/src/test/rpc/ValidatorRPC_test.cpp
+++ b/src/test/rpc/ValidatorRPC_test.cpp
@@ -19,9 +19,11 @@
 
 #include <test/jtx.h>
 #include <test/jtx/TrustedPublisherServer.h>
+
 #include <xrpld/app/main/BasicApp.h>
 #include <xrpld/app/misc/ValidatorSite.h>
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/test/rpc/Version_test.cpp b/src/test/rpc/Version_test.cpp
index b66e502b9f..c0bc5d450b 100644
--- a/src/test/rpc/Version_test.cpp
+++ b/src/test/rpc/Version_test.cpp
@@ -18,7 +18,9 @@
 //==============================================================================
 
 #include <test/jtx.h>
+
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp
index 4b9d718c29..bcd355e301 100644
--- a/src/test/server/ServerStatus_test.cpp
+++ b/src/test/server/ServerStatus_test.cpp
@@ -21,10 +21,12 @@
 #include <test/jtx/JSONRPCClient.h>
 #include <test/jtx/WSClient.h>
 #include <test/jtx/envconfig.h>
+
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/misc/LoadFeeTrack.h>
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/rpc/ServerHandler.h>
+
 #include <xrpl/basics/base64.h>
 #include <xrpl/beast/test/yield_to.h>
 #include <xrpl/json/json_reader.h>
diff --git a/src/test/server/Server_test.cpp b/src/test/server/Server_test.cpp
index fc73329806..f8895ae7e9 100644
--- a/src/test/server/Server_test.cpp
+++ b/src/test/server/Server_test.cpp
@@ -21,7 +21,9 @@
 #include <test/jtx/CaptureLogs.h>
 #include <test/jtx/envconfig.h>
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/basics/make_SSLContext.h>
 #include <xrpl/beast/rfc2616.h>
 #include <xrpl/beast/unit_test.h>
diff --git a/src/test/shamap/FetchPack_test.cpp b/src/test/shamap/FetchPack_test.cpp
index aa0808f4e2..04385f9441 100644
--- a/src/test/shamap/FetchPack_test.cpp
+++ b/src/test/shamap/FetchPack_test.cpp
@@ -19,8 +19,10 @@
 
 #include <test/shamap/common.h>
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpld/shamap/SHAMap.h>
 #include <xrpld/shamap/SHAMapSyncFilter.h>
+
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/random.h>
diff --git a/src/test/shamap/SHAMapSync_test.cpp b/src/test/shamap/SHAMapSync_test.cpp
index 6db8542c09..c3af07f036 100644
--- a/src/test/shamap/SHAMapSync_test.cpp
+++ b/src/test/shamap/SHAMapSync_test.cpp
@@ -19,8 +19,10 @@
 
 #include <test/shamap/common.h>
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpld/shamap/SHAMap.h>
 #include <xrpld/shamap/SHAMapItem.h>
+
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/beast/xor_shift_engine.h>
diff --git a/src/test/shamap/SHAMap_test.cpp b/src/test/shamap/SHAMap_test.cpp
index c8c877935f..3197e0944d 100644
--- a/src/test/shamap/SHAMap_test.cpp
+++ b/src/test/shamap/SHAMap_test.cpp
@@ -19,7 +19,9 @@
 
 #include <test/shamap/common.h>
 #include <test/unit_test/SuiteJournal.h>
+
 #include <xrpld/shamap/SHAMap.h>
+
 #include <xrpl/basics/Blob.h>
 #include <xrpl/basics/Buffer.h>
 #include <xrpl/beast/unit_test.h>
diff --git a/src/test/shamap/common.h b/src/test/shamap/common.h
index db5a2c40ac..47308a82f8 100644
--- a/src/test/shamap/common.h
+++ b/src/test/shamap/common.h
@@ -23,6 +23,7 @@
 #include <xrpld/nodestore/DummyScheduler.h>
 #include <xrpld/nodestore/Manager.h>
 #include <xrpld/shamap/Family.h>
+
 #include <xrpl/basics/chrono.h>
 
 namespace ripple {
diff --git a/src/test/unit_test/FileDirGuard.h b/src/test/unit_test/FileDirGuard.h
index c9ca555879..d247ae3015 100644
--- a/src/test/unit_test/FileDirGuard.h
+++ b/src/test/unit_test/FileDirGuard.h
@@ -21,6 +21,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define TEST_UNIT_TEST_DIRGUARD_H
 
 #include <test/jtx/TestSuite.h>
+
 #include <xrpl/basics/contract.h>
 
 #include <boost/filesystem.hpp>
diff --git a/src/test/unit_test/multi_runner.cpp b/src/test/unit_test/multi_runner.cpp
index 5933ec0fda..0b7d08c5ae 100644
--- a/src/test/unit_test/multi_runner.cpp
+++ b/src/test/unit_test/multi_runner.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <test/unit_test/multi_runner.h>
+
 #include <xrpl/beast/unit_test/amount.h>
 
 #include <boost/lexical_cast.hpp>
diff --git a/src/xrpld/app/consensus/RCLCensorshipDetector.h b/src/xrpld/app/consensus/RCLCensorshipDetector.h
index b39b99bf87..7cdf15949d 100644
--- a/src/xrpld/app/consensus/RCLCensorshipDetector.h
+++ b/src/xrpld/app/consensus/RCLCensorshipDetector.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_CONSENSUS_RCLCENSORSHIPDETECTOR_H_INCLUDED
 
 #include <xrpld/shamap/SHAMap.h>
+
 #include <xrpl/basics/algorithm.h>
 
 #include <algorithm>
diff --git a/src/xrpld/app/consensus/RCLConsensus.cpp b/src/xrpld/app/consensus/RCLConsensus.cpp
index fe368a69a6..0a5cee4121 100644
--- a/src/xrpld/app/consensus/RCLConsensus.cpp
+++ b/src/xrpld/app/consensus/RCLConsensus.cpp
@@ -37,6 +37,7 @@
 #include <xrpld/consensus/LedgerTiming.h>
 #include <xrpld/overlay/Overlay.h>
 #include <xrpld/overlay/predicates.h>
+
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/core/LexicalCast.h>
 #include <xrpl/beast/utility/instrumentation.h>
diff --git a/src/xrpld/app/consensus/RCLConsensus.h b/src/xrpld/app/consensus/RCLConsensus.h
index 943e7599e3..735c67fd01 100644
--- a/src/xrpld/app/consensus/RCLConsensus.h
+++ b/src/xrpld/app/consensus/RCLConsensus.h
@@ -29,6 +29,7 @@
 #include <xrpld/consensus/Consensus.h>
 #include <xrpld/core/JobQueue.h>
 #include <xrpld/shamap/SHAMap.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/RippleLedgerHash.h>
 
diff --git a/src/xrpld/app/consensus/RCLCxLedger.h b/src/xrpld/app/consensus/RCLCxLedger.h
index 5d25c875c9..cd14c30a94 100644
--- a/src/xrpld/app/consensus/RCLCxLedger.h
+++ b/src/xrpld/app/consensus/RCLCxLedger.h
@@ -23,6 +23,7 @@
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/ledger/LedgerToJson.h>
 #include <xrpld/ledger/ReadView.h>
+
 #include <xrpl/protocol/RippleLedgerHash.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/consensus/RCLCxPeerPos.cpp b/src/xrpld/app/consensus/RCLCxPeerPos.cpp
index 31e443e434..83847b2e9e 100644
--- a/src/xrpld/app/consensus/RCLCxPeerPos.cpp
+++ b/src/xrpld/app/consensus/RCLCxPeerPos.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/consensus/RCLCxPeerPos.h>
+
 #include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/xrpld/app/consensus/RCLCxPeerPos.h b/src/xrpld/app/consensus/RCLCxPeerPos.h
index c93f93e540..63cfde8700 100644
--- a/src/xrpld/app/consensus/RCLCxPeerPos.h
+++ b/src/xrpld/app/consensus/RCLCxPeerPos.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_CONSENSUS_RCLCXPEERPOS_H_INCLUDED
 
 #include <xrpld/consensus/ConsensusProposal.h>
+
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/hash/hash_append.h>
 #include <xrpl/json/json_value.h>
diff --git a/src/xrpld/app/consensus/RCLValidations.cpp b/src/xrpld/app/consensus/RCLValidations.cpp
index b1e0fba0ec..a04047c78a 100644
--- a/src/xrpld/app/consensus/RCLValidations.cpp
+++ b/src/xrpld/app/consensus/RCLValidations.cpp
@@ -26,6 +26,7 @@
 #include <xrpld/core/JobQueue.h>
 #include <xrpld/core/TimeKeeper.h>
 #include <xrpld/perflog/PerfLog.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/chrono.h>
 
diff --git a/src/xrpld/app/consensus/RCLValidations.h b/src/xrpld/app/consensus/RCLValidations.h
index 9d0de3a706..a9f872bee9 100644
--- a/src/xrpld/app/consensus/RCLValidations.h
+++ b/src/xrpld/app/consensus/RCLValidations.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/consensus/Validations.h>
+
 #include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/RippleLedgerHash.h>
 #include <xrpl/protocol/STValidation.h>
diff --git a/src/xrpld/app/ledger/AcceptedLedgerTx.cpp b/src/xrpld/app/ledger/AcceptedLedgerTx.cpp
index 6bdb602fd8..7944578f77 100644
--- a/src/xrpld/app/ledger/AcceptedLedgerTx.cpp
+++ b/src/xrpld/app/ledger/AcceptedLedgerTx.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/ledger/AcceptedLedgerTx.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/protocol/UintTypes.h>
diff --git a/src/xrpld/app/ledger/AcceptedLedgerTx.h b/src/xrpld/app/ledger/AcceptedLedgerTx.h
index ed21111733..efa16371a7 100644
--- a/src/xrpld/app/ledger/AcceptedLedgerTx.h
+++ b/src/xrpld/app/ledger/AcceptedLedgerTx.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_LEDGER_ACCEPTEDLEDGERTX_H_INCLUDED
 
 #include <xrpld/app/ledger/Ledger.h>
+
 #include <xrpl/protocol/AccountID.h>
 
 #include <boost/container/flat_set.hpp>
diff --git a/src/xrpld/app/ledger/BookListeners.h b/src/xrpld/app/ledger/BookListeners.h
index 6ac52de28e..ca58bf3058 100644
--- a/src/xrpld/app/ledger/BookListeners.h
+++ b/src/xrpld/app/ledger/BookListeners.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_LEDGER_BOOKLISTENERS_H_INCLUDED
 
 #include <xrpld/net/InfoSub.h>
+
 #include <xrpl/protocol/MultiApiJson.h>
 
 #include <memory>
diff --git a/src/xrpld/app/ledger/BuildLedger.h b/src/xrpld/app/ledger/BuildLedger.h
index 0d889da0e1..0805db6c8d 100644
--- a/src/xrpld/app/ledger/BuildLedger.h
+++ b/src/xrpld/app/ledger/BuildLedger.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_LEDGER_BUILD_LEDGER_H_INCLUDED
 
 #include <xrpld/ledger/ApplyView.h>
+
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/utility/Journal.h>
 
diff --git a/src/xrpld/app/ledger/ConsensusTransSetSF.cpp b/src/xrpld/app/ledger/ConsensusTransSetSF.cpp
index 58670521fd..e62426b720 100644
--- a/src/xrpld/app/ledger/ConsensusTransSetSF.cpp
+++ b/src/xrpld/app/ledger/ConsensusTransSetSF.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/app/misc/Transaction.h>
 #include <xrpld/core/JobQueue.h>
 #include <xrpld/nodestore/Database.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/digest.h>
diff --git a/src/xrpld/app/ledger/ConsensusTransSetSF.h b/src/xrpld/app/ledger/ConsensusTransSetSF.h
index 857f2b8eae..4a68f577ad 100644
--- a/src/xrpld/app/ledger/ConsensusTransSetSF.h
+++ b/src/xrpld/app/ledger/ConsensusTransSetSF.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/app/main/Application.h>
 #include <xrpld/shamap/SHAMapSyncFilter.h>
+
 #include <xrpl/basics/TaggedCache.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/ledger/InboundLedger.h b/src/xrpld/app/ledger/InboundLedger.h
index 55b46b0756..e8f244bfc0 100644
--- a/src/xrpld/app/ledger/InboundLedger.h
+++ b/src/xrpld/app/ledger/InboundLedger.h
@@ -24,6 +24,7 @@
 #include <xrpld/app/ledger/detail/TimeoutCounter.h>
 #include <xrpld/app/main/Application.h>
 #include <xrpld/overlay/PeerSet.h>
+
 #include <xrpl/basics/CountedObject.h>
 
 #include <mutex>
diff --git a/src/xrpld/app/ledger/InboundLedgers.h b/src/xrpld/app/ledger/InboundLedgers.h
index da4d71be32..037897392f 100644
--- a/src/xrpld/app/ledger/InboundLedgers.h
+++ b/src/xrpld/app/ledger/InboundLedgers.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_LEDGER_INBOUNDLEDGERS_H_INCLUDED
 
 #include <xrpld/app/ledger/InboundLedger.h>
+
 #include <xrpl/protocol/RippleLedgerHash.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/ledger/InboundTransactions.h b/src/xrpld/app/ledger/InboundTransactions.h
index 28a36f878c..6feee44004 100644
--- a/src/xrpld/app/ledger/InboundTransactions.h
+++ b/src/xrpld/app/ledger/InboundTransactions.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/overlay/Peer.h>
 #include <xrpld/shamap/SHAMap.h>
+
 #include <xrpl/beast/clock/abstract_clock.h>
 
 #include <memory>
diff --git a/src/xrpld/app/ledger/Ledger.cpp b/src/xrpld/app/ledger/Ledger.cpp
index 705af4cd83..c4965cded2 100644
--- a/src/xrpld/app/ledger/Ledger.cpp
+++ b/src/xrpld/app/ledger/Ledger.cpp
@@ -30,6 +30,7 @@
 #include <xrpld/core/SociDB.h>
 #include <xrpld/nodestore/Database.h>
 #include <xrpld/nodestore/detail/DatabaseNodeImp.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/beast/utility/instrumentation.h>
diff --git a/src/xrpld/app/ledger/Ledger.h b/src/xrpld/app/ledger/Ledger.h
index 483c714379..81c26526e5 100644
--- a/src/xrpld/app/ledger/Ledger.h
+++ b/src/xrpld/app/ledger/Ledger.h
@@ -25,6 +25,7 @@
 #include <xrpld/ledger/CachedView.h>
 #include <xrpld/ledger/View.h>
 #include <xrpld/shamap/SHAMap.h>
+
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/xrpld/app/ledger/LedgerCleaner.h b/src/xrpld/app/ledger/LedgerCleaner.h
index 415ddcf544..b086e02134 100644
--- a/src/xrpld/app/ledger/LedgerCleaner.h
+++ b/src/xrpld/app/ledger/LedgerCleaner.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_LEDGER_LEDGERCLEANER_H_INCLUDED
 
 #include <xrpld/app/main/Application.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/beast/utility/PropertyStream.h>
 #include <xrpl/json/json_value.h>
diff --git a/src/xrpld/app/ledger/LedgerHistory.cpp b/src/xrpld/app/ledger/LedgerHistory.cpp
index ed0b11723b..bf866abf3f 100644
--- a/src/xrpld/app/ledger/LedgerHistory.cpp
+++ b/src/xrpld/app/ledger/LedgerHistory.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/ledger/LedgerHistory.h>
 #include <xrpld/app/ledger/LedgerToJson.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/basics/contract.h>
diff --git a/src/xrpld/app/ledger/LedgerHistory.h b/src/xrpld/app/ledger/LedgerHistory.h
index 0175ac9dc2..33f8bf1d96 100644
--- a/src/xrpld/app/ledger/LedgerHistory.h
+++ b/src/xrpld/app/ledger/LedgerHistory.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/main/Application.h>
+
 #include <xrpl/beast/insight/Collector.h>
 #include <xrpl/protocol/RippleLedgerHash.h>
 
diff --git a/src/xrpld/app/ledger/LedgerMaster.h b/src/xrpld/app/ledger/LedgerMaster.h
index ea3a0b130d..f8d726ec8e 100644
--- a/src/xrpld/app/ledger/LedgerMaster.h
+++ b/src/xrpld/app/ledger/LedgerMaster.h
@@ -28,6 +28,7 @@
 #include <xrpld/app/ledger/LedgerReplay.h>
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/CanonicalTXSet.h>
+
 #include <xrpl/basics/RangeSet.h>
 #include <xrpl/basics/UptimeClock.h>
 #include <xrpl/basics/chrono.h>
diff --git a/src/xrpld/app/ledger/LedgerReplayer.h b/src/xrpld/app/ledger/LedgerReplayer.h
index ee065c8fba..b00430303a 100644
--- a/src/xrpld/app/ledger/LedgerReplayer.h
+++ b/src/xrpld/app/ledger/LedgerReplayer.h
@@ -23,6 +23,7 @@
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/ledger/LedgerReplayTask.h>
 #include <xrpld/app/main/Application.h>
+
 #include <xrpl/beast/utility/Journal.h>
 
 #include <mutex>
diff --git a/src/xrpld/app/ledger/LedgerToJson.h b/src/xrpld/app/ledger/LedgerToJson.h
index b02242ed2a..40be57fc9c 100644
--- a/src/xrpld/app/ledger/LedgerToJson.h
+++ b/src/xrpld/app/ledger/LedgerToJson.h
@@ -24,6 +24,7 @@
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/misc/TxQ.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/basics/chrono.h>
 #include <xrpl/json/Object.h>
 #include <xrpl/protocol/serialize.h>
diff --git a/src/xrpld/app/ledger/OpenLedger.h b/src/xrpld/app/ledger/OpenLedger.h
index 7e6d631491..9fe56ff488 100644
--- a/src/xrpld/app/ledger/OpenLedger.h
+++ b/src/xrpld/app/ledger/OpenLedger.h
@@ -25,6 +25,7 @@
 #include <xrpld/core/Config.h>
 #include <xrpld/ledger/CachedSLEs.h>
 #include <xrpld/ledger/OpenView.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/beast/utility/Journal.h>
diff --git a/src/xrpld/app/ledger/OrderBookDB.cpp b/src/xrpld/app/ledger/OrderBookDB.cpp
index 265e0b6290..5d3616ce20 100644
--- a/src/xrpld/app/ledger/OrderBookDB.cpp
+++ b/src/xrpld/app/ledger/OrderBookDB.cpp
@@ -24,6 +24,7 @@
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/core/Config.h>
 #include <xrpld/core/JobQueue.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Indexes.h>
 
diff --git a/src/xrpld/app/ledger/OrderBookDB.h b/src/xrpld/app/ledger/OrderBookDB.h
index ce0d9f0faf..d120f43aea 100644
--- a/src/xrpld/app/ledger/OrderBookDB.h
+++ b/src/xrpld/app/ledger/OrderBookDB.h
@@ -23,6 +23,7 @@
 #include <xrpld/app/ledger/AcceptedLedgerTx.h>
 #include <xrpld/app/ledger/BookListeners.h>
 #include <xrpld/app/main/Application.h>
+
 #include <xrpl/protocol/MultiApiJson.h>
 
 #include <mutex>
diff --git a/src/xrpld/app/ledger/TransactionMaster.h b/src/xrpld/app/ledger/TransactionMaster.h
index c181afb5bc..ffbbe4ae09 100644
--- a/src/xrpld/app/ledger/TransactionMaster.h
+++ b/src/xrpld/app/ledger/TransactionMaster.h
@@ -23,6 +23,7 @@
 #include <xrpld/app/misc/Transaction.h>
 #include <xrpld/shamap/SHAMapItem.h>
 #include <xrpld/shamap/SHAMapTreeNode.h>
+
 #include <xrpl/basics/RangeSet.h>
 #include <xrpl/basics/TaggedCache.h>
 #include <xrpl/protocol/ErrorCodes.h>
diff --git a/src/xrpld/app/ledger/detail/BuildLedger.cpp b/src/xrpld/app/ledger/detail/BuildLedger.cpp
index 85d2a8b354..3f099cd2ea 100644
--- a/src/xrpld/app/ledger/detail/BuildLedger.cpp
+++ b/src/xrpld/app/ledger/detail/BuildLedger.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/app/ledger/OpenLedger.h>
 #include <xrpld/app/misc/CanonicalTXSet.h>
 #include <xrpld/app/tx/apply.h>
+
 #include <xrpl/protocol/Feature.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/ledger/detail/InboundLedger.cpp b/src/xrpld/app/ledger/detail/InboundLedger.cpp
index 6855fdbc42..c1eed3a9f3 100644
--- a/src/xrpld/app/ledger/detail/InboundLedger.cpp
+++ b/src/xrpld/app/ledger/detail/InboundLedger.cpp
@@ -26,6 +26,7 @@
 #include <xrpld/core/JobQueue.h>
 #include <xrpld/overlay/Overlay.h>
 #include <xrpld/shamap/SHAMapNodeID.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/app/ledger/detail/InboundLedgers.cpp b/src/xrpld/app/ledger/detail/InboundLedgers.cpp
index bec3d619cc..b05268f65b 100644
--- a/src/xrpld/app/ledger/detail/InboundLedgers.cpp
+++ b/src/xrpld/app/ledger/detail/InboundLedgers.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/core/JobQueue.h>
 #include <xrpld/perflog/PerfLog.h>
+
 #include <xrpl/basics/DecayingSample.h>
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/scope.h>
diff --git a/src/xrpld/app/ledger/detail/InboundTransactions.cpp b/src/xrpld/app/ledger/detail/InboundTransactions.cpp
index d02e2c9471..54477ccaed 100644
--- a/src/xrpld/app/ledger/detail/InboundTransactions.cpp
+++ b/src/xrpld/app/ledger/detail/InboundTransactions.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/core/JobQueue.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/RippleLedgerHash.h>
 #include <xrpl/resource/Fees.h>
diff --git a/src/xrpld/app/ledger/detail/LedgerCleaner.cpp b/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
index 27322e302c..7c0dccfb9b 100644
--- a/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/ledger/LedgerCleaner.h>
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/misc/LoadFeeTrack.h>
+
 #include <xrpl/beast/core/CurrentThreadName.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h
index 0eeb9e5718..2435964766 100644
--- a/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h
+++ b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h
@@ -23,6 +23,7 @@
 #include <xrpld/app/ledger/InboundLedger.h>
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/ledger/detail/TimeoutCounter.h>
+
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/basics/base_uint.h>
 
diff --git a/src/xrpld/app/ledger/detail/LedgerMaster.cpp b/src/xrpld/app/ledger/detail/LedgerMaster.cpp
index 6bc894da48..0c6a5e786c 100644
--- a/src/xrpld/app/ledger/detail/LedgerMaster.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerMaster.cpp
@@ -40,6 +40,7 @@
 #include <xrpld/core/TimeKeeper.h>
 #include <xrpld/overlay/Overlay.h>
 #include <xrpld/overlay/Peer.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/MathUtilities.h>
 #include <xrpl/basics/TaggedCache.h>
diff --git a/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp b/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp
index 7b9d881d54..5bfad61bf4 100644
--- a/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/ledger/LedgerReplayer.h>
 #include <xrpld/app/ledger/detail/LedgerReplayMsgHandler.h>
 #include <xrpld/app/main/Application.h>
+
 #include <xrpl/protocol/LedgerHeader.h>
 
 #include <memory>
diff --git a/src/xrpld/app/ledger/detail/LedgerToJson.cpp b/src/xrpld/app/ledger/detail/LedgerToJson.cpp
index 6491edf0f4..5f1e47e8b3 100644
--- a/src/xrpld/app/ledger/detail/LedgerToJson.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerToJson.cpp
@@ -24,6 +24,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/DeliveredAmount.h>
 #include <xrpld/rpc/MPTokenIssuanceID.h>
+
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/protocol/ApiVersion.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/app/ledger/detail/LocalTxs.cpp b/src/xrpld/app/ledger/detail/LocalTxs.cpp
index 8445dfa062..b6bfc8f850 100644
--- a/src/xrpld/app/ledger/detail/LocalTxs.cpp
+++ b/src/xrpld/app/ledger/detail/LocalTxs.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/ledger/LocalTxs.h>
+
 #include <xrpl/protocol/Indexes.h>
 
 /*
diff --git a/src/xrpld/app/ledger/detail/TimeoutCounter.h b/src/xrpld/app/ledger/detail/TimeoutCounter.h
index 7c404ac4a9..85ce6fc3b4 100644
--- a/src/xrpld/app/ledger/detail/TimeoutCounter.h
+++ b/src/xrpld/app/ledger/detail/TimeoutCounter.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/app/main/Application.h>
 #include <xrpld/core/Job.h>
+
 #include <xrpl/beast/utility/Journal.h>
 
 #include <boost/asio/basic_waitable_timer.hpp>
diff --git a/src/xrpld/app/ledger/detail/TransactionMaster.cpp b/src/xrpld/app/ledger/detail/TransactionMaster.cpp
index e2e1213a37..7acc3579b0 100644
--- a/src/xrpld/app/ledger/detail/TransactionMaster.cpp
+++ b/src/xrpld/app/ledger/detail/TransactionMaster.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/ledger/TransactionMaster.h>
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/Transaction.h>
+
 #include <xrpl/basics/chrono.h>
 #include <xrpl/protocol/STTx.h>
 
diff --git a/src/xrpld/app/main/Application.cpp b/src/xrpld/app/main/Application.cpp
index bf87d83cfa..3088c0d56f 100644
--- a/src/xrpld/app/main/Application.cpp
+++ b/src/xrpld/app/main/Application.cpp
@@ -56,6 +56,7 @@
 #include <xrpld/perflog/PerfLog.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
 #include <xrpld/shamap/NodeFamily.h>
+
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/basics/ResolverAsio.h>
 #include <xrpl/basics/random.h>
@@ -72,6 +73,7 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio/steady_timer.hpp>
 #include <boost/system/error_code.hpp>
+
 #include <date/date.h>
 
 #include <chrono>
diff --git a/src/xrpld/app/main/Application.h b/src/xrpld/app/main/Application.h
index df3096f88a..27d1840766 100644
--- a/src/xrpld/app/main/Application.h
+++ b/src/xrpld/app/main/Application.h
@@ -23,6 +23,7 @@
 #include <xrpld/core/Config.h>
 #include <xrpld/overlay/PeerReservationTable.h>
 #include <xrpld/shamap/TreeNodeCache.h>
+
 #include <xrpl/basics/TaggedCache.h>
 #include <xrpl/beast/utility/PropertyStream.h>
 #include <xrpl/protocol/Protocol.h>
diff --git a/src/xrpld/app/main/BasicApp.cpp b/src/xrpld/app/main/BasicApp.cpp
index 504309d083..a4b1a74685 100644
--- a/src/xrpld/app/main/BasicApp.cpp
+++ b/src/xrpld/app/main/BasicApp.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/main/BasicApp.h>
+
 #include <xrpl/beast/core/CurrentThreadName.h>
 
 BasicApp::BasicApp(std::size_t numberOfThreads)
diff --git a/src/xrpld/app/main/GRPCServer.cpp b/src/xrpld/app/main/GRPCServer.cpp
index 0219f1b527..2ee811dc19 100644
--- a/src/xrpld/app/main/GRPCServer.cpp
+++ b/src/xrpld/app/main/GRPCServer.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/main/GRPCServer.h>
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/beast/core/CurrentThreadName.h>
 #include <xrpl/beast/net/IPAddressConversion.h>
 #include <xrpl/resource/Fees.h>
diff --git a/src/xrpld/app/main/GRPCServer.h b/src/xrpld/app/main/GRPCServer.h
index 8671b0fe71..2ecbd5e7da 100644
--- a/src/xrpld/app/main/GRPCServer.h
+++ b/src/xrpld/app/main/GRPCServer.h
@@ -28,6 +28,7 @@
 #include <xrpld/rpc/Role.h>
 #include <xrpld/rpc/detail/Handler.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
 #include <xrpl/resource/Charge.h>
 
diff --git a/src/xrpld/app/main/LoadManager.cpp b/src/xrpld/app/main/LoadManager.cpp
index d2e4fc1a4c..d4cd3572cc 100644
--- a/src/xrpld/app/main/LoadManager.cpp
+++ b/src/xrpld/app/main/LoadManager.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/main/LoadManager.h>
 #include <xrpld/app/misc/LoadFeeTrack.h>
 #include <xrpld/app/misc/NetworkOPs.h>
+
 #include <xrpl/beast/core/CurrentThreadName.h>
 #include <xrpl/json/to_string.h>
 
diff --git a/src/xrpld/app/main/Main.cpp b/src/xrpld/app/main/Main.cpp
index e4cd643637..2fa0f68df4 100644
--- a/src/xrpld/app/main/Main.cpp
+++ b/src/xrpld/app/main/Main.cpp
@@ -23,17 +23,19 @@
 #include <xrpld/core/ConfigSections.h>
 #include <xrpld/core/TimeKeeper.h>
 #include <xrpld/net/RPCCall.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/beast/core/CurrentThreadName.h>
 #include <xrpl/protocol/BuildInfo.h>
 
 #ifdef ENABLE_TESTS
 #include <test/unit_test/multi_runner.h>
+
 #include <xrpl/beast/unit_test/match.h>
 #endif  // ENABLE_TESTS
-
 #include <boost/process.hpp>
 #include <boost/program_options.hpp>
+
 #include <google/protobuf/stubs/common.h>
 
 #include <cstdlib>
diff --git a/src/xrpld/app/main/NodeIdentity.h b/src/xrpld/app/main/NodeIdentity.h
index 6b7d792394..3616255c13 100644
--- a/src/xrpld/app/main/NodeIdentity.h
+++ b/src/xrpld/app/main/NodeIdentity.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_MAIN_NODEIDENTITY_H_INCLUDED
 
 #include <xrpld/app/main/Application.h>
+
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/SecretKey.h>
 
diff --git a/src/xrpld/app/misc/AMMUtils.h b/src/xrpld/app/misc/AMMUtils.h
index 420e7705ee..ebc2834109 100644
--- a/src/xrpld/app/misc/AMMUtils.h
+++ b/src/xrpld/app/misc/AMMUtils.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_MISC_AMMUTILS_H_INLCUDED
 
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Expected.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/STAmount.h>
diff --git a/src/xrpld/app/misc/AmendmentTable.h b/src/xrpld/app/misc/AmendmentTable.h
index d6193adca2..deb0386236 100644
--- a/src/xrpld/app/misc/AmendmentTable.h
+++ b/src/xrpld/app/misc/AmendmentTable.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/STValidation.h>
diff --git a/src/xrpld/app/misc/CredentialHelpers.cpp b/src/xrpld/app/misc/CredentialHelpers.cpp
index a18cd40336..dcc5975b34 100644
--- a/src/xrpld/app/misc/CredentialHelpers.cpp
+++ b/src/xrpld/app/misc/CredentialHelpers.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/misc/CredentialHelpers.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/digest.h>
 
 #include <unordered_set>
diff --git a/src/xrpld/app/misc/CredentialHelpers.h b/src/xrpld/app/misc/CredentialHelpers.h
index 4010093155..8b52acf54e 100644
--- a/src/xrpld/app/misc/CredentialHelpers.h
+++ b/src/xrpld/app/misc/CredentialHelpers.h
@@ -80,4 +80,4 @@ verifyDepositPreauth(
 
 }  // namespace ripple
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/xrpld/app/misc/FeeVote.h b/src/xrpld/app/misc/FeeVote.h
index eea741ab19..35f723aa02 100644
--- a/src/xrpld/app/misc/FeeVote.h
+++ b/src/xrpld/app/misc/FeeVote.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/shamap/SHAMap.h>
+
 #include <xrpl/protocol/STValidation.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/misc/FeeVoteImpl.cpp b/src/xrpld/app/misc/FeeVoteImpl.cpp
index f447e313c3..f9d5fbc58c 100644
--- a/src/xrpld/app/misc/FeeVoteImpl.cpp
+++ b/src/xrpld/app/misc/FeeVoteImpl.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/misc/FeeVote.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/STValidation.h>
 #include <xrpl/protocol/st.h>
diff --git a/src/xrpld/app/misc/NegativeUNLVote.h b/src/xrpld/app/misc/NegativeUNLVote.h
index f0284f267a..72ed965717 100644
--- a/src/xrpld/app/misc/NegativeUNLVote.h
+++ b/src/xrpld/app/misc/NegativeUNLVote.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_MISC_NEGATIVEUNLVOTE_H_INCLUDED
 
 #include <xrpld/app/ledger/Ledger.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/PublicKey.h>
diff --git a/src/xrpld/app/misc/NetworkOPs.cpp b/src/xrpld/app/misc/NetworkOPs.cpp
index 3cdabe265c..550f6e4485 100644
--- a/src/xrpld/app/misc/NetworkOPs.cpp
+++ b/src/xrpld/app/misc/NetworkOPs.cpp
@@ -49,6 +49,7 @@
 #include <xrpld/rpc/DeliveredAmount.h>
 #include <xrpld/rpc/MPTokenIssuanceID.h>
 #include <xrpld/rpc/ServerHandler.h>
+
 #include <xrpl/basics/UptimeClock.h>
 #include <xrpl/basics/mulDiv.h>
 #include <xrpl/basics/safe_cast.h>
diff --git a/src/xrpld/app/misc/NetworkOPs.h b/src/xrpld/app/misc/NetworkOPs.h
index f8ae1d5612..e353552213 100644
--- a/src/xrpld/app/misc/NetworkOPs.h
+++ b/src/xrpld/app/misc/NetworkOPs.h
@@ -25,6 +25,7 @@
 #include <xrpld/core/JobQueue.h>
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/net/InfoSub.h>
+
 #include <xrpl/protocol/STValidation.h>
 #include <xrpl/protocol/messages.h>
 
diff --git a/src/xrpld/app/misc/SHAMapStoreImp.cpp b/src/xrpld/app/misc/SHAMapStoreImp.cpp
index 3f32f97308..52ea40cf94 100644
--- a/src/xrpld/app/misc/SHAMapStoreImp.cpp
+++ b/src/xrpld/app/misc/SHAMapStoreImp.cpp
@@ -26,6 +26,7 @@
 #include <xrpld/nodestore/Scheduler.h>
 #include <xrpld/nodestore/detail/DatabaseRotatingImp.h>
 #include <xrpld/shamap/SHAMapMissingNode.h>
+
 #include <xrpl/beast/core/CurrentThreadName.h>
 
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/src/xrpld/app/misc/TxQ.h b/src/xrpld/app/misc/TxQ.h
index 4f2a9f75cb..6fc61055f1 100644
--- a/src/xrpld/app/misc/TxQ.h
+++ b/src/xrpld/app/misc/TxQ.h
@@ -23,6 +23,7 @@
 #include <xrpld/app/tx/applySteps.h>
 #include <xrpld/ledger/ApplyView.h>
 #include <xrpld/ledger/OpenView.h>
+
 #include <xrpl/protocol/RippleLedgerHash.h>
 #include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/SeqProxy.h>
diff --git a/src/xrpld/app/misc/ValidatorList.h b/src/xrpld/app/misc/ValidatorList.h
index 07b3a1fd03..4e18aa5db3 100644
--- a/src/xrpld/app/misc/ValidatorList.h
+++ b/src/xrpld/app/misc/ValidatorList.h
@@ -23,6 +23,7 @@
 #include <xrpld/app/misc/Manifest.h>
 #include <xrpld/core/TimeKeeper.h>
 #include <xrpld/overlay/Message.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/crypto/csprng.h>
diff --git a/src/xrpld/app/misc/ValidatorSite.h b/src/xrpld/app/misc/ValidatorSite.h
index 382cd8f427..88e30e28ab 100644
--- a/src/xrpld/app/misc/ValidatorSite.h
+++ b/src/xrpld/app/misc/ValidatorSite.h
@@ -23,6 +23,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/ValidatorList.h>
 #include <xrpld/app/misc/detail/Work.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/json/json_value.h>
diff --git a/src/xrpld/app/misc/detail/AMMUtils.cpp b/src/xrpld/app/misc/detail/AMMUtils.cpp
index 18ec6c2edb..5078049a4a 100644
--- a/src/xrpld/app/misc/detail/AMMUtils.cpp
+++ b/src/xrpld/app/misc/detail/AMMUtils.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/misc/AMMUtils.h>
 #include <xrpld/ledger/Sandbox.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/AMMCore.h>
 #include <xrpl/protocol/STObject.h>
diff --git a/src/xrpld/app/misc/detail/AccountTxPaging.cpp b/src/xrpld/app/misc/detail/AccountTxPaging.cpp
index cb6e3b8672..278680581e 100644
--- a/src/xrpld/app/misc/detail/AccountTxPaging.cpp
+++ b/src/xrpld/app/misc/detail/AccountTxPaging.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/Transaction.h>
 #include <xrpld/app/misc/detail/AccountTxPaging.h>
+
 #include <xrpl/protocol/Serializer.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/misc/detail/AmendmentTable.cpp b/src/xrpld/app/misc/detail/AmendmentTable.cpp
index 24daa8192e..ae41a2aa7e 100644
--- a/src/xrpld/app/misc/detail/AmendmentTable.cpp
+++ b/src/xrpld/app/misc/detail/AmendmentTable.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/misc/AmendmentTable.h>
 #include <xrpld/app/rdb/Wallet.h>
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/STValidation.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/xrpld/app/misc/detail/DeliverMax.cpp b/src/xrpld/app/misc/detail/DeliverMax.cpp
index d4fc682b60..58a2359972 100644
--- a/src/xrpld/app/misc/detail/DeliverMax.cpp
+++ b/src/xrpld/app/misc/detail/DeliverMax.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/misc/DeliverMax.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/misc/detail/LoadFeeTrack.cpp b/src/xrpld/app/misc/detail/LoadFeeTrack.cpp
index ce97ddf477..96e7555401 100644
--- a/src/xrpld/app/misc/detail/LoadFeeTrack.cpp
+++ b/src/xrpld/app/misc/detail/LoadFeeTrack.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/misc/LoadFeeTrack.h>
 #include <xrpld/ledger/ReadView.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/safe_cast.h>
diff --git a/src/xrpld/app/misc/detail/Manifest.cpp b/src/xrpld/app/misc/detail/Manifest.cpp
index 04c8523aec..c42256495e 100644
--- a/src/xrpld/app/misc/detail/Manifest.cpp
+++ b/src/xrpld/app/misc/detail/Manifest.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/misc/Manifest.h>
 #include <xrpld/app/rdb/Wallet.h>
 #include <xrpld/core/DatabaseCon.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/basics/base64.h>
diff --git a/src/xrpld/app/misc/detail/Transaction.cpp b/src/xrpld/app/misc/detail/Transaction.cpp
index aff4b28581..89bf1a7202 100644
--- a/src/xrpld/app/misc/detail/Transaction.cpp
+++ b/src/xrpld/app/misc/detail/Transaction.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/app/misc/Transaction.h>
 #include <xrpld/app/rdb/backend/SQLiteDatabase.h>
 #include <xrpld/app/tx/apply.h>
+
 #include <xrpl/basics/safe_cast.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/app/misc/detail/TxQ.cpp b/src/xrpld/app/misc/detail/TxQ.cpp
index 266f03edc4..11d81fb8ae 100644
--- a/src/xrpld/app/misc/detail/TxQ.cpp
+++ b/src/xrpld/app/misc/detail/TxQ.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/TxQ.h>
 #include <xrpld/app/tx/apply.h>
+
 #include <xrpl/basics/mulDiv.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/app/misc/detail/ValidatorKeys.cpp b/src/xrpld/app/misc/detail/ValidatorKeys.cpp
index 4856076d30..8227c5bcdb 100644
--- a/src/xrpld/app/misc/detail/ValidatorKeys.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorKeys.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/misc/ValidatorKeys.h>
 #include <xrpld/core/Config.h>
 #include <xrpld/core/ConfigSections.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/base64.h>
 
diff --git a/src/xrpld/app/misc/detail/ValidatorList.cpp b/src/xrpld/app/misc/detail/ValidatorList.cpp
index 91ee58e8d3..282c3c9e19 100644
--- a/src/xrpld/app/misc/detail/ValidatorList.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorList.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/app/misc/ValidatorList.h>
 #include <xrpld/overlay/Overlay.h>
+
 #include <xrpl/basics/FileUtilities.h>
 #include <xrpl/basics/Slice.h>
 #include <xrpl/basics/StringUtilities.h>
diff --git a/src/xrpld/app/misc/detail/ValidatorSite.cpp b/src/xrpld/app/misc/detail/ValidatorSite.cpp
index 4284024a52..799689ef25 100644
--- a/src/xrpld/app/misc/detail/ValidatorSite.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorSite.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/app/misc/detail/WorkFile.h>
 #include <xrpld/app/misc/detail/WorkPlain.h>
 #include <xrpld/app/misc/detail/WorkSSL.h>
+
 #include <xrpl/json/json_reader.h>
 #include <xrpl/protocol/digest.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/app/misc/detail/WorkBase.h b/src/xrpld/app/misc/detail/WorkBase.h
index a823691f72..a2b852edfd 100644
--- a/src/xrpld/app/misc/detail/WorkBase.h
+++ b/src/xrpld/app/misc/detail/WorkBase.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_MISC_DETAIL_WORKBASE_H_INCLUDED
 
 #include <xrpld/app/misc/detail/Work.h>
+
 #include <xrpl/basics/random.h>
 #include <xrpl/protocol/BuildInfo.h>
 
diff --git a/src/xrpld/app/misc/detail/WorkFile.h b/src/xrpld/app/misc/detail/WorkFile.h
index 9e8e66b9ee..51fd6db78c 100644
--- a/src/xrpld/app/misc/detail/WorkFile.h
+++ b/src/xrpld/app/misc/detail/WorkFile.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_MISC_DETAIL_WORKFILE_H_INCLUDED
 
 #include <xrpld/app/misc/detail/Work.h>
+
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/basics/FileUtilities.h>
 #include <xrpl/beast/utility/instrumentation.h>
diff --git a/src/xrpld/app/misc/detail/WorkSSL.h b/src/xrpld/app/misc/detail/WorkSSL.h
index 31f9447bff..2d423a9e50 100644
--- a/src/xrpld/app/misc/detail/WorkSSL.h
+++ b/src/xrpld/app/misc/detail/WorkSSL.h
@@ -23,6 +23,7 @@
 #include <xrpld/app/misc/detail/WorkBase.h>
 #include <xrpld/core/Config.h>
 #include <xrpld/net/HTTPClientSSLContext.h>
+
 #include <xrpl/basics/contract.h>
 
 #include <boost/asio/ssl.hpp>
diff --git a/src/xrpld/app/paths/AMMLiquidity.h b/src/xrpld/app/paths/AMMLiquidity.h
index db1094cbb8..b41e26ac84 100644
--- a/src/xrpld/app/paths/AMMLiquidity.h
+++ b/src/xrpld/app/paths/AMMLiquidity.h
@@ -25,6 +25,7 @@
 #include <xrpld/app/paths/AMMContext.h>
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Quality.h>
 
diff --git a/src/xrpld/app/paths/AMMOffer.h b/src/xrpld/app/paths/AMMOffer.h
index e90a5b8611..9241ba2057 100644
--- a/src/xrpld/app/paths/AMMOffer.h
+++ b/src/xrpld/app/paths/AMMOffer.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/ledger/ApplyView.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/Quality.h>
 #include <xrpl/protocol/TER.h>
 
diff --git a/src/xrpld/app/paths/AccountCurrencies.h b/src/xrpld/app/paths/AccountCurrencies.h
index 26282e742c..566fad9104 100644
--- a/src/xrpld/app/paths/AccountCurrencies.h
+++ b/src/xrpld/app/paths/AccountCurrencies.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_PATHS_ACCOUNTCURRENCIES_H_INCLUDED
 
 #include <xrpld/app/paths/RippleLineCache.h>
+
 #include <xrpl/protocol/UintTypes.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/paths/Credit.cpp b/src/xrpld/app/paths/Credit.cpp
index e027949e76..ca721e4edf 100644
--- a/src/xrpld/app/paths/Credit.cpp
+++ b/src/xrpld/app/paths/Credit.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/ledger/ReadView.h>
+
 #include <xrpl/protocol/AmountConversions.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/STAmount.h>
diff --git a/src/xrpld/app/paths/Credit.h b/src/xrpld/app/paths/Credit.h
index b71ec057ae..0ea2d687dd 100644
--- a/src/xrpld/app/paths/Credit.h
+++ b/src/xrpld/app/paths/Credit.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_PATHS_CREDIT_H_INCLUDED
 
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/IOUAmount.h>
 #include <xrpl/protocol/STAmount.h>
 
diff --git a/src/xrpld/app/paths/Flow.cpp b/src/xrpld/app/paths/Flow.cpp
index 13ce5d8343..66793fc74c 100644
--- a/src/xrpld/app/paths/Flow.cpp
+++ b/src/xrpld/app/paths/Flow.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/app/paths/detail/AmountSpec.h>
 #include <xrpld/app/paths/detail/Steps.h>
 #include <xrpld/app/paths/detail/StrandFlow.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/IOUAmount.h>
 #include <xrpl/protocol/XRPAmount.h>
diff --git a/src/xrpld/app/paths/Flow.h b/src/xrpld/app/paths/Flow.h
index 5390394b7f..048b8785f1 100644
--- a/src/xrpld/app/paths/Flow.h
+++ b/src/xrpld/app/paths/Flow.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/app/paths/RippleCalc.h>
 #include <xrpld/app/paths/detail/Steps.h>
+
 #include <xrpl/protocol/Quality.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/paths/PathRequest.cpp b/src/xrpld/app/paths/PathRequest.cpp
index 1045ff866f..dc2868eaf2 100644
--- a/src/xrpld/app/paths/PathRequest.cpp
+++ b/src/xrpld/app/paths/PathRequest.cpp
@@ -27,6 +27,7 @@
 #include <xrpld/app/paths/detail/PathfinderUtils.h>
 #include <xrpld/core/Config.h>
 #include <xrpld/rpc/detail/Tuning.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/beast/core/LexicalCast.h>
 #include <xrpl/protocol/ErrorCodes.h>
diff --git a/src/xrpld/app/paths/PathRequest.h b/src/xrpld/app/paths/PathRequest.h
index 190a0a15a1..3fdbecf7ed 100644
--- a/src/xrpld/app/paths/PathRequest.h
+++ b/src/xrpld/app/paths/PathRequest.h
@@ -24,6 +24,7 @@
 #include <xrpld/app/paths/Pathfinder.h>
 #include <xrpld/app/paths/RippleLineCache.h>
 #include <xrpld/net/InfoSub.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/UintTypes.h>
 
diff --git a/src/xrpld/app/paths/PathRequests.cpp b/src/xrpld/app/paths/PathRequests.cpp
index f602a20f74..9ada526751 100644
--- a/src/xrpld/app/paths/PathRequests.cpp
+++ b/src/xrpld/app/paths/PathRequests.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/paths/PathRequests.h>
 #include <xrpld/core/JobQueue.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
diff --git a/src/xrpld/app/paths/Pathfinder.cpp b/src/xrpld/app/paths/Pathfinder.cpp
index 5053b4860f..379bb07e4b 100644
--- a/src/xrpld/app/paths/Pathfinder.cpp
+++ b/src/xrpld/app/paths/Pathfinder.cpp
@@ -25,6 +25,7 @@
 #include <xrpld/app/paths/detail/PathfinderUtils.h>
 #include <xrpld/core/JobQueue.h>
 #include <xrpld/ledger/PaymentSandbox.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/join.h>
 #include <xrpl/json/to_string.h>
diff --git a/src/xrpld/app/paths/Pathfinder.h b/src/xrpld/app/paths/Pathfinder.h
index 01556a3c63..973fda8855 100644
--- a/src/xrpld/app/paths/Pathfinder.h
+++ b/src/xrpld/app/paths/Pathfinder.h
@@ -23,6 +23,7 @@
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/paths/RippleLineCache.h>
 #include <xrpld/core/LoadEvent.h>
+
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/STPathSet.h>
diff --git a/src/xrpld/app/paths/RippleCalc.cpp b/src/xrpld/app/paths/RippleCalc.cpp
index c7b2e1f01e..c783bb8e9f 100644
--- a/src/xrpld/app/paths/RippleCalc.cpp
+++ b/src/xrpld/app/paths/RippleCalc.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/paths/RippleCalc.h>
 #include <xrpld/app/paths/detail/FlowDebugInfo.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 
diff --git a/src/xrpld/app/paths/RippleCalc.h b/src/xrpld/app/paths/RippleCalc.h
index 9e03da9c90..45f68725cc 100644
--- a/src/xrpld/app/paths/RippleCalc.h
+++ b/src/xrpld/app/paths/RippleCalc.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_PATHS_RIPPLECALC_H_INCLUDED
 
 #include <xrpld/ledger/PaymentSandbox.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/TER.h>
diff --git a/src/xrpld/app/paths/RippleLineCache.h b/src/xrpld/app/paths/RippleLineCache.h
index dbb9b87a83..5a3188c810 100644
--- a/src/xrpld/app/paths/RippleLineCache.h
+++ b/src/xrpld/app/paths/RippleLineCache.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/paths/TrustLine.h>
+
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/basics/hardened_hash.h>
 
diff --git a/src/xrpld/app/paths/TrustLine.cpp b/src/xrpld/app/paths/TrustLine.cpp
index d0d86b3e06..28572b899e 100644
--- a/src/xrpld/app/paths/TrustLine.cpp
+++ b/src/xrpld/app/paths/TrustLine.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/paths/TrustLine.h>
+
 #include <xrpl/protocol/STAmount.h>
 
 #include <memory>
diff --git a/src/xrpld/app/paths/TrustLine.h b/src/xrpld/app/paths/TrustLine.h
index 4189f7ff48..37cdc750f3 100644
--- a/src/xrpld/app/paths/TrustLine.h
+++ b/src/xrpld/app/paths/TrustLine.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_PATHS_RIPPLESTATE_H_INCLUDED
 
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/protocol/Rate.h>
 #include <xrpl/protocol/STAmount.h>
diff --git a/src/xrpld/app/paths/detail/AMMOffer.cpp b/src/xrpld/app/paths/detail/AMMOffer.cpp
index 93eb687e14..c719c0a92d 100644
--- a/src/xrpld/app/paths/detail/AMMOffer.cpp
+++ b/src/xrpld/app/paths/detail/AMMOffer.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/paths/AMMLiquidity.h>
 #include <xrpld/app/paths/AMMOffer.h>
+
 #include <xrpl/protocol/QualityFunction.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/paths/detail/BookStep.cpp b/src/xrpld/app/paths/detail/BookStep.cpp
index 1d35f80b18..5e650230fe 100644
--- a/src/xrpld/app/paths/detail/BookStep.cpp
+++ b/src/xrpld/app/paths/detail/BookStep.cpp
@@ -24,6 +24,7 @@
 #include <xrpld/app/paths/detail/Steps.h>
 #include <xrpld/app/tx/detail/OfferStream.h>
 #include <xrpld/ledger/PaymentSandbox.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/beast/utility/instrumentation.h>
diff --git a/src/xrpld/app/paths/detail/DirectStep.cpp b/src/xrpld/app/paths/detail/DirectStep.cpp
index ffd500009e..4e5ccea3f1 100644
--- a/src/xrpld/app/paths/detail/DirectStep.cpp
+++ b/src/xrpld/app/paths/detail/DirectStep.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/paths/detail/StepChecks.h>
 #include <xrpld/app/paths/detail/Steps.h>
 #include <xrpld/ledger/PaymentSandbox.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/IOUAmount.h>
diff --git a/src/xrpld/app/paths/detail/FlowDebugInfo.h b/src/xrpld/app/paths/detail/FlowDebugInfo.h
index 4c3ea5faf1..e28b34f5d1 100644
--- a/src/xrpld/app/paths/detail/FlowDebugInfo.h
+++ b/src/xrpld/app/paths/detail/FlowDebugInfo.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/app/paths/detail/AmountSpec.h>
 #include <xrpld/ledger/PaymentSandbox.h>
+
 #include <xrpl/protocol/IOUAmount.h>
 #include <xrpl/protocol/XRPAmount.h>
 
diff --git a/src/xrpld/app/paths/detail/PaySteps.cpp b/src/xrpld/app/paths/detail/PaySteps.cpp
index ffef005ca3..99f212d548 100644
--- a/src/xrpld/app/paths/detail/PaySteps.cpp
+++ b/src/xrpld/app/paths/detail/PaySteps.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/paths/detail/Steps.h>
 #include <xrpld/ledger/ReadView.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/json/json_writer.h>
 #include <xrpl/protocol/IOUAmount.h>
diff --git a/src/xrpld/app/paths/detail/StepChecks.h b/src/xrpld/app/paths/detail/StepChecks.h
index d4fda2bfe6..4acafd1b9a 100644
--- a/src/xrpld/app/paths/detail/StepChecks.h
+++ b/src/xrpld/app/paths/detail/StepChecks.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/AccountID.h>
diff --git a/src/xrpld/app/paths/detail/Steps.h b/src/xrpld/app/paths/detail/Steps.h
index e0894adc26..bb9abf6545 100644
--- a/src/xrpld/app/paths/detail/Steps.h
+++ b/src/xrpld/app/paths/detail/Steps.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_PATHS_IMPL_PAYSTEPS_H_INCLUDED
 
 #include <xrpld/app/paths/detail/AmountSpec.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Quality.h>
 #include <xrpl/protocol/QualityFunction.h>
diff --git a/src/xrpld/app/paths/detail/StrandFlow.h b/src/xrpld/app/paths/detail/StrandFlow.h
index cb46e794d6..47037c5f5e 100644
--- a/src/xrpld/app/paths/detail/StrandFlow.h
+++ b/src/xrpld/app/paths/detail/StrandFlow.h
@@ -28,6 +28,7 @@
 #include <xrpld/app/paths/detail/FlatSets.h>
 #include <xrpld/app/paths/detail/FlowDebugInfo.h>
 #include <xrpld/app/paths/detail/Steps.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/IOUAmount.h>
diff --git a/src/xrpld/app/paths/detail/XRPEndpointStep.cpp b/src/xrpld/app/paths/detail/XRPEndpointStep.cpp
index 0d135a7208..4f38a7b422 100644
--- a/src/xrpld/app/paths/detail/XRPEndpointStep.cpp
+++ b/src/xrpld/app/paths/detail/XRPEndpointStep.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/app/paths/detail/StepChecks.h>
 #include <xrpld/app/paths/detail/Steps.h>
 #include <xrpld/ledger/PaymentSandbox.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/IOUAmount.h>
diff --git a/src/xrpld/app/rdb/RelationalDatabase.h b/src/xrpld/app/rdb/RelationalDatabase.h
index a6bbfd9ca6..927b08d385 100644
--- a/src/xrpld/app/rdb/RelationalDatabase.h
+++ b/src/xrpld/app/rdb/RelationalDatabase.h
@@ -26,6 +26,7 @@
 #include <xrpld/core/Config.h>
 #include <xrpld/core/DatabaseCon.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/beast/utility/instrumentation.h>
 
 #include <boost/filesystem.hpp>
diff --git a/src/xrpld/app/rdb/backend/detail/Node.cpp b/src/xrpld/app/rdb/backend/detail/Node.cpp
index 2e5a2361c3..a230eac6e3 100644
--- a/src/xrpld/app/rdb/backend/detail/Node.cpp
+++ b/src/xrpld/app/rdb/backend/detail/Node.cpp
@@ -26,11 +26,13 @@
 #include <xrpld/app/rdb/backend/detail/Node.h>
 #include <xrpld/core/DatabaseCon.h>
 #include <xrpld/core/SociDB.h>
+
 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/json/to_string.h>
 
 #include <boost/range/adaptor/transformed.hpp>
+
 #include <soci/sqlite3/soci-sqlite3.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp b/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp
index 70d8b99858..edd1fb2174 100644
--- a/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp
+++ b/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp
@@ -24,6 +24,7 @@
 #include <xrpld/app/rdb/backend/detail/Node.h>
 #include <xrpld/core/DatabaseCon.h>
 #include <xrpld/core/SociDB.h>
+
 #include <xrpl/basics/StringUtilities.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/apply.h b/src/xrpld/app/tx/apply.h
index 578d9570d8..101f9a946d 100644
--- a/src/xrpld/app/tx/apply.h
+++ b/src/xrpld/app/tx/apply.h
@@ -23,6 +23,7 @@
 #include <xrpld/app/tx/applySteps.h>
 #include <xrpld/core/Config.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/STTx.h>
 
diff --git a/src/xrpld/app/tx/applySteps.h b/src/xrpld/app/tx/applySteps.h
index c1eb17c992..2a5557ff4b 100644
--- a/src/xrpld/app/tx/applySteps.h
+++ b/src/xrpld/app/tx/applySteps.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TX_APPLYSTEPS_H_INCLUDED
 
 #include <xrpld/ledger/ApplyViewImpl.h>
+
 #include <xrpl/beast/utility/Journal.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/AMMBid.cpp b/src/xrpld/app/tx/detail/AMMBid.cpp
index 42548cbe51..6fec46be90 100644
--- a/src/xrpld/app/tx/detail/AMMBid.cpp
+++ b/src/xrpld/app/tx/detail/AMMBid.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/app/tx/detail/AMMBid.h>
 #include <xrpld/ledger/Sandbox.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/AMMCore.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/TER.h>
diff --git a/src/xrpld/app/tx/detail/AMMClawback.cpp b/src/xrpld/app/tx/detail/AMMClawback.cpp
index 8867a549e3..64a42374ec 100644
--- a/src/xrpld/app/tx/detail/AMMClawback.cpp
+++ b/src/xrpld/app/tx/detail/AMMClawback.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/app/tx/detail/AMMWithdraw.h>
 #include <xrpld/ledger/Sandbox.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/xrpld/app/tx/detail/AMMCreate.cpp b/src/xrpld/app/tx/detail/AMMCreate.cpp
index 31ca89c2a9..deafa6f27a 100644
--- a/src/xrpld/app/tx/detail/AMMCreate.cpp
+++ b/src/xrpld/app/tx/detail/AMMCreate.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/app/tx/detail/AMMCreate.h>
 #include <xrpld/ledger/Sandbox.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/AMMCore.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/STIssue.h>
diff --git a/src/xrpld/app/tx/detail/AMMDelete.cpp b/src/xrpld/app/tx/detail/AMMDelete.cpp
index 6e8eb88a4c..28d56eab98 100644
--- a/src/xrpld/app/tx/detail/AMMDelete.cpp
+++ b/src/xrpld/app/tx/detail/AMMDelete.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/misc/AMMUtils.h>
 #include <xrpld/app/tx/detail/AMMDelete.h>
 #include <xrpld/ledger/Sandbox.h>
+
 #include <xrpl/protocol/AMMCore.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/xrpld/app/tx/detail/AMMDeposit.cpp b/src/xrpld/app/tx/detail/AMMDeposit.cpp
index 9b2a5b42aa..6a718a3f04 100644
--- a/src/xrpld/app/tx/detail/AMMDeposit.cpp
+++ b/src/xrpld/app/tx/detail/AMMDeposit.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/app/tx/detail/AMMDeposit.h>
 #include <xrpld/ledger/Sandbox.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/AMMCore.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/xrpld/app/tx/detail/AMMVote.cpp b/src/xrpld/app/tx/detail/AMMVote.cpp
index 82b36c35b7..84d0905a22 100644
--- a/src/xrpld/app/tx/detail/AMMVote.cpp
+++ b/src/xrpld/app/tx/detail/AMMVote.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/misc/AMMUtils.h>
 #include <xrpld/app/tx/detail/AMMVote.h>
 #include <xrpld/ledger/Sandbox.h>
+
 #include <xrpl/protocol/AMMCore.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.cpp b/src/xrpld/app/tx/detail/AMMWithdraw.cpp
index 3c3920548b..586f453c6f 100644
--- a/src/xrpld/app/tx/detail/AMMWithdraw.cpp
+++ b/src/xrpld/app/tx/detail/AMMWithdraw.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/misc/AMMUtils.h>
 #include <xrpld/app/tx/detail/AMMWithdraw.h>
 #include <xrpld/ledger/Sandbox.h>
+
 #include <xrpl/basics/Number.h>
 #include <xrpl/protocol/AMMCore.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/xrpld/app/tx/detail/ApplyContext.cpp b/src/xrpld/app/tx/detail/ApplyContext.cpp
index 18fdf06494..71fe246f15 100644
--- a/src/xrpld/app/tx/detail/ApplyContext.cpp
+++ b/src/xrpld/app/tx/detail/ApplyContext.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/tx/detail/ApplyContext.h>
 #include <xrpld/app/tx/detail/InvariantCheck.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/json/to_string.h>
diff --git a/src/xrpld/app/tx/detail/ApplyContext.h b/src/xrpld/app/tx/detail/ApplyContext.h
index e7311c131b..715d4ea471 100644
--- a/src/xrpld/app/tx/detail/ApplyContext.h
+++ b/src/xrpld/app/tx/detail/ApplyContext.h
@@ -23,6 +23,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/core/Config.h>
 #include <xrpld/ledger/ApplyViewImpl.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/XRPAmount.h>
diff --git a/src/xrpld/app/tx/detail/BookTip.h b/src/xrpld/app/tx/detail/BookTip.h
index 39ff443d46..f215cdb620 100644
--- a/src/xrpld/app/tx/detail/BookTip.h
+++ b/src/xrpld/app/tx/detail/BookTip.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_BOOK_BOOKTIP_H_INCLUDED
 
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Quality.h>
 
diff --git a/src/xrpld/app/tx/detail/CancelCheck.cpp b/src/xrpld/app/tx/detail/CancelCheck.cpp
index 2b7be8428f..cfa3bd10e2 100644
--- a/src/xrpld/app/tx/detail/CancelCheck.cpp
+++ b/src/xrpld/app/tx/detail/CancelCheck.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/tx/detail/CancelCheck.h>
 #include <xrpld/ledger/ApplyView.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/xrpld/app/tx/detail/CancelOffer.cpp b/src/xrpld/app/tx/detail/CancelOffer.cpp
index 30e955a828..6d8c077a62 100644
--- a/src/xrpld/app/tx/detail/CancelOffer.cpp
+++ b/src/xrpld/app/tx/detail/CancelOffer.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/tx/detail/CancelOffer.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/st.h>
 
diff --git a/src/xrpld/app/tx/detail/CancelOffer.h b/src/xrpld/app/tx/detail/CancelOffer.h
index ddb6f10101..0813dd0aef 100644
--- a/src/xrpld/app/tx/detail/CancelOffer.h
+++ b/src/xrpld/app/tx/detail/CancelOffer.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TX_CANCELOFFER_H_INCLUDED
 
 #include <xrpld/app/tx/detail/Transactor.h>
+
 #include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/CashCheck.cpp b/src/xrpld/app/tx/detail/CashCheck.cpp
index d16bbd9b3c..468adbd209 100644
--- a/src/xrpld/app/tx/detail/CashCheck.cpp
+++ b/src/xrpld/app/tx/detail/CashCheck.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/paths/Flow.h>
 #include <xrpld/app/tx/detail/CashCheck.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/scope.h>
 #include <xrpl/protocol/Feature.h>
diff --git a/src/xrpld/app/tx/detail/Change.cpp b/src/xrpld/app/tx/detail/Change.cpp
index c8475a7a08..760d5b3d98 100644
--- a/src/xrpld/app/tx/detail/Change.cpp
+++ b/src/xrpld/app/tx/detail/Change.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/app/tx/detail/Change.h>
 #include <xrpld/ledger/Sandbox.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/xrpld/app/tx/detail/Clawback.cpp b/src/xrpld/app/tx/detail/Clawback.cpp
index 5bada34dc3..e58faf2286 100644
--- a/src/xrpld/app/tx/detail/Clawback.cpp
+++ b/src/xrpld/app/tx/detail/Clawback.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/tx/detail/Clawback.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/MPTAmount.h>
diff --git a/src/xrpld/app/tx/detail/CreateCheck.cpp b/src/xrpld/app/tx/detail/CreateCheck.cpp
index 4aa64a6fd9..19ef28b843 100644
--- a/src/xrpld/app/tx/detail/CreateCheck.cpp
+++ b/src/xrpld/app/tx/detail/CreateCheck.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/tx/detail/CreateCheck.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/xrpld/app/tx/detail/CreateOffer.cpp b/src/xrpld/app/tx/detail/CreateOffer.cpp
index 5ebda5a154..92ba54f077 100644
--- a/src/xrpld/app/tx/detail/CreateOffer.cpp
+++ b/src/xrpld/app/tx/detail/CreateOffer.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/paths/Flow.h>
 #include <xrpld/app/tx/detail/CreateOffer.h>
 #include <xrpld/ledger/PaymentSandbox.h>
+
 #include <xrpl/beast/utility/WrappedSink.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Quality.h>
diff --git a/src/xrpld/app/tx/detail/CreateTicket.cpp b/src/xrpld/app/tx/detail/CreateTicket.cpp
index 2d0ca2c0f6..594335f489 100644
--- a/src/xrpld/app/tx/detail/CreateTicket.cpp
+++ b/src/xrpld/app/tx/detail/CreateTicket.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/tx/detail/CreateTicket.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/xrpld/app/tx/detail/Credentials.cpp b/src/xrpld/app/tx/detail/Credentials.cpp
index f3c2a8bbc3..73c397cf37 100644
--- a/src/xrpld/app/tx/detail/Credentials.cpp
+++ b/src/xrpld/app/tx/detail/Credentials.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/tx/detail/Credentials.h>
 #include <xrpld/ledger/ApplyView.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/xrpld/app/tx/detail/Credentials.h b/src/xrpld/app/tx/detail/Credentials.h
index b5d69eb447..5b4acb3998 100644
--- a/src/xrpld/app/tx/detail/Credentials.h
+++ b/src/xrpld/app/tx/detail/Credentials.h
@@ -87,4 +87,4 @@ public:
 
 }  // namespace ripple
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/xrpld/app/tx/detail/DID.cpp b/src/xrpld/app/tx/detail/DID.cpp
index fc42d24c8f..31ce7c8770 100644
--- a/src/xrpld/app/tx/detail/DID.cpp
+++ b/src/xrpld/app/tx/detail/DID.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/tx/detail/DID.h>
 #include <xrpld/ledger/ApplyView.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/xrpld/app/tx/detail/DeleteAccount.cpp b/src/xrpld/app/tx/detail/DeleteAccount.cpp
index d26b600ab5..d562069460 100644
--- a/src/xrpld/app/tx/detail/DeleteAccount.cpp
+++ b/src/xrpld/app/tx/detail/DeleteAccount.cpp
@@ -25,6 +25,7 @@
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
 #include <xrpld/app/tx/detail/SetSignerList.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/mulDiv.h>
 #include <xrpl/beast/utility/instrumentation.h>
diff --git a/src/xrpld/app/tx/detail/DeleteOracle.cpp b/src/xrpld/app/tx/detail/DeleteOracle.cpp
index 2689e63084..78e3d55230 100644
--- a/src/xrpld/app/tx/detail/DeleteOracle.cpp
+++ b/src/xrpld/app/tx/detail/DeleteOracle.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/tx/detail/DeleteOracle.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/xrpld/app/tx/detail/DepositPreauth.cpp b/src/xrpld/app/tx/detail/DepositPreauth.cpp
index d91fdf5102..f10f09b38f 100644
--- a/src/xrpld/app/tx/detail/DepositPreauth.cpp
+++ b/src/xrpld/app/tx/detail/DepositPreauth.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/misc/CredentialHelpers.h>
 #include <xrpld/app/tx/detail/DepositPreauth.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/xrpld/app/tx/detail/Escrow.cpp b/src/xrpld/app/tx/detail/Escrow.cpp
index 14d9b0aab1..5cf5e8740b 100644
--- a/src/xrpld/app/tx/detail/Escrow.cpp
+++ b/src/xrpld/app/tx/detail/Escrow.cpp
@@ -24,6 +24,7 @@
 #include <xrpld/conditions/Fulfillment.h>
 #include <xrpld/ledger/ApplyView.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/protocol/Feature.h>
diff --git a/src/xrpld/app/tx/detail/InvariantCheck.cpp b/src/xrpld/app/tx/detail/InvariantCheck.cpp
index 2dec4b1dbc..b97a0c02ee 100644
--- a/src/xrpld/app/tx/detail/InvariantCheck.cpp
+++ b/src/xrpld/app/tx/detail/InvariantCheck.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/app/tx/detail/PermissionedDomainSet.h>
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/FeeUnits.h>
diff --git a/src/xrpld/app/tx/detail/LedgerStateFix.cpp b/src/xrpld/app/tx/detail/LedgerStateFix.cpp
index bc1812a679..008d9b6ae7 100644
--- a/src/xrpld/app/tx/detail/LedgerStateFix.cpp
+++ b/src/xrpld/app/tx/detail/LedgerStateFix.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/tx/detail/LedgerStateFix.h>
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/xrpld/app/tx/detail/MPTokenAuthorize.cpp b/src/xrpld/app/tx/detail/MPTokenAuthorize.cpp
index 8042c9c698..cfc098ab0f 100644
--- a/src/xrpld/app/tx/detail/MPTokenAuthorize.cpp
+++ b/src/xrpld/app/tx/detail/MPTokenAuthorize.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/tx/detail/MPTokenAuthorize.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/st.h>
diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp b/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp
index a7bab80e39..1bd3fcadd7 100644
--- a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp
+++ b/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/tx/detail/MPTokenIssuanceCreate.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/TxFlags.h>
 
diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp b/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp
index fd0dfc1721..ed5d3c4f96 100644
--- a/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp
+++ b/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/tx/detail/MPTokenIssuanceDestroy.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/TxFlags.h>
 
diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp b/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp
index 5a0732074e..12208dba1b 100644
--- a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp
+++ b/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/tx/detail/MPTokenIssuanceSet.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/TxFlags.h>
 
diff --git a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp
index 4b53df5ea2..4c5fdb7683 100644
--- a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/tx/detail/NFTokenAcceptOffer.h>
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Rate.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/xrpld/app/tx/detail/NFTokenBurn.cpp b/src/xrpld/app/tx/detail/NFTokenBurn.cpp
index 08936cd578..947a663f92 100644
--- a/src/xrpld/app/tx/detail/NFTokenBurn.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenBurn.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/tx/detail/NFTokenBurn.h>
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp b/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp
index 532729501f..f6072bc953 100644
--- a/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/tx/detail/NFTokenCancelOffer.h>
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/TxFlags.h>
 
diff --git a/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp b/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp
index dd52b62298..8e1a026415 100644
--- a/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/tx/detail/NFTokenCreateOffer.h>
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/TxFlags.h>
 
diff --git a/src/xrpld/app/tx/detail/NFTokenMint.cpp b/src/xrpld/app/tx/detail/NFTokenMint.cpp
index e2498a860a..42b551b3a4 100644
--- a/src/xrpld/app/tx/detail/NFTokenMint.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenMint.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/tx/detail/NFTokenMint.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Expected.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/InnerObjectFormats.h>
diff --git a/src/xrpld/app/tx/detail/NFTokenMint.h b/src/xrpld/app/tx/detail/NFTokenMint.h
index c95fd5944e..f606120c54 100644
--- a/src/xrpld/app/tx/detail/NFTokenMint.h
+++ b/src/xrpld/app/tx/detail/NFTokenMint.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
 #include <xrpld/app/tx/detail/Transactor.h>
+
 #include <xrpl/protocol/nft.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/NFTokenModify.cpp b/src/xrpld/app/tx/detail/NFTokenModify.cpp
index 93554c3760..a3803c423b 100644
--- a/src/xrpld/app/tx/detail/NFTokenModify.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenModify.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/tx/detail/NFTokenModify.h>
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/TxFlags.h>
 
diff --git a/src/xrpld/app/tx/detail/NFTokenUtils.cpp b/src/xrpld/app/tx/detail/NFTokenUtils.cpp
index e6ffe2a287..9c9754aa95 100644
--- a/src/xrpld/app/tx/detail/NFTokenUtils.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenUtils.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
 #include <xrpld/ledger/Dir.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/algorithm.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/STArray.h>
diff --git a/src/xrpld/app/tx/detail/NFTokenUtils.h b/src/xrpld/app/tx/detail/NFTokenUtils.h
index 5b69a33451..38ced59e9c 100644
--- a/src/xrpld/app/tx/detail/NFTokenUtils.h
+++ b/src/xrpld/app/tx/detail/NFTokenUtils.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/app/tx/detail/Transactor.h>
 #include <xrpld/ledger/ApplyView.h>
+
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/TER.h>
diff --git a/src/xrpld/app/tx/detail/Offer.h b/src/xrpld/app/tx/detail/Offer.h
index 1eff73cdac..abc0212335 100644
--- a/src/xrpld/app/tx/detail/Offer.h
+++ b/src/xrpld/app/tx/detail/Offer.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_BOOK_OFFER_H_INCLUDED
 
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/protocol/Quality.h>
 #include <xrpl/protocol/Rules.h>
diff --git a/src/xrpld/app/tx/detail/OfferStream.cpp b/src/xrpld/app/tx/detail/OfferStream.cpp
index 4e1cdd9b23..7640cca206 100644
--- a/src/xrpld/app/tx/detail/OfferStream.cpp
+++ b/src/xrpld/app/tx/detail/OfferStream.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/tx/detail/OfferStream.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 
diff --git a/src/xrpld/app/tx/detail/OfferStream.h b/src/xrpld/app/tx/detail/OfferStream.h
index ecce708dda..cf6c1c3d2d 100644
--- a/src/xrpld/app/tx/detail/OfferStream.h
+++ b/src/xrpld/app/tx/detail/OfferStream.h
@@ -23,6 +23,7 @@
 #include <xrpld/app/tx/detail/BookTip.h>
 #include <xrpld/app/tx/detail/Offer.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/utility/Journal.h>
diff --git a/src/xrpld/app/tx/detail/PayChan.cpp b/src/xrpld/app/tx/detail/PayChan.cpp
index 122ec241ab..fa5d44fb00 100644
--- a/src/xrpld/app/tx/detail/PayChan.cpp
+++ b/src/xrpld/app/tx/detail/PayChan.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/tx/detail/PayChan.h>
 #include <xrpld/ledger/ApplyView.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/protocol/Feature.h>
diff --git a/src/xrpld/app/tx/detail/Payment.cpp b/src/xrpld/app/tx/detail/Payment.cpp
index 12ce3899b2..c2b7b23a6a 100644
--- a/src/xrpld/app/tx/detail/Payment.cpp
+++ b/src/xrpld/app/tx/detail/Payment.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/paths/RippleCalc.h>
 #include <xrpld/app/tx/detail/Payment.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Quality.h>
diff --git a/src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp b/src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp
index 4c2bd6f8d8..64c498b68b 100644
--- a/src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp
+++ b/src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/tx/detail/PermissionedDomainDelete.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp b/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp
index a5141523b3..6e2df2a082 100644
--- a/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp
+++ b/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/misc/CredentialHelpers.h>
 #include <xrpld/app/tx/detail/PermissionedDomainSet.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/STObject.h>
 #include <xrpl/protocol/TxFlags.h>
 
diff --git a/src/xrpld/app/tx/detail/PermissionedDomainSet.h b/src/xrpld/app/tx/detail/PermissionedDomainSet.h
index 59a19423c4..502d576e32 100644
--- a/src/xrpld/app/tx/detail/PermissionedDomainSet.h
+++ b/src/xrpld/app/tx/detail/PermissionedDomainSet.h
@@ -46,4 +46,4 @@ public:
 
 }  // namespace ripple
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/xrpld/app/tx/detail/SetAccount.cpp b/src/xrpld/app/tx/detail/SetAccount.cpp
index c0e115c249..d871cc3280 100644
--- a/src/xrpld/app/tx/detail/SetAccount.cpp
+++ b/src/xrpld/app/tx/detail/SetAccount.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/tx/detail/SetAccount.h>
 #include <xrpld/core/Config.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/xrpld/app/tx/detail/SetAccount.h b/src/xrpld/app/tx/detail/SetAccount.h
index 1336d79d96..4604a11a6c 100644
--- a/src/xrpld/app/tx/detail/SetAccount.h
+++ b/src/xrpld/app/tx/detail/SetAccount.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TX_SETACCOUNT_H_INCLUDED
 
 #include <xrpld/app/tx/detail/Transactor.h>
+
 #include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/SetOracle.cpp b/src/xrpld/app/tx/detail/SetOracle.cpp
index 6b10014808..8559c3e7b9 100644
--- a/src/xrpld/app/tx/detail/SetOracle.cpp
+++ b/src/xrpld/app/tx/detail/SetOracle.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/tx/detail/SetOracle.h>
 #include <xrpld/ledger/Sandbox.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/InnerObjectFormats.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/xrpld/app/tx/detail/SetRegularKey.cpp b/src/xrpld/app/tx/detail/SetRegularKey.cpp
index 9f165612f3..92d130a15a 100644
--- a/src/xrpld/app/tx/detail/SetRegularKey.cpp
+++ b/src/xrpld/app/tx/detail/SetRegularKey.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/tx/detail/SetRegularKey.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/xrpld/app/tx/detail/SetSignerList.cpp b/src/xrpld/app/tx/detail/SetSignerList.cpp
index 83ade664cc..4a1ee703a0 100644
--- a/src/xrpld/app/tx/detail/SetSignerList.cpp
+++ b/src/xrpld/app/tx/detail/SetSignerList.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/ledger/Ledger.h>
 #include <xrpld/app/tx/detail/SetSignerList.h>
 #include <xrpld/ledger/ApplyView.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/xrpld/app/tx/detail/SetSignerList.h b/src/xrpld/app/tx/detail/SetSignerList.h
index 9588a4aec6..1827aca975 100644
--- a/src/xrpld/app/tx/detail/SetSignerList.h
+++ b/src/xrpld/app/tx/detail/SetSignerList.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/app/tx/detail/SignerEntries.h>
 #include <xrpld/app/tx/detail/Transactor.h>
+
 #include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/STTx.h>
 
diff --git a/src/xrpld/app/tx/detail/SetTrust.cpp b/src/xrpld/app/tx/detail/SetTrust.cpp
index 11956a8eac..93abcdc4c4 100644
--- a/src/xrpld/app/tx/detail/SetTrust.cpp
+++ b/src/xrpld/app/tx/detail/SetTrust.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/tx/detail/SetTrust.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/AMMCore.h>
 #include <xrpl/protocol/Feature.h>
diff --git a/src/xrpld/app/tx/detail/SetTrust.h b/src/xrpld/app/tx/detail/SetTrust.h
index 5e2c8130cb..7a5394c684 100644
--- a/src/xrpld/app/tx/detail/SetTrust.h
+++ b/src/xrpld/app/tx/detail/SetTrust.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TX_SETTRUST_H_INCLUDED
 
 #include <xrpld/app/tx/detail/Transactor.h>
+
 #include <xrpl/protocol/TxFlags.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/SignerEntries.cpp b/src/xrpld/app/tx/detail/SignerEntries.cpp
index 13fe8f030a..e5e159862a 100644
--- a/src/xrpld/app/tx/detail/SignerEntries.cpp
+++ b/src/xrpld/app/tx/detail/SignerEntries.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/tx/detail/SignerEntries.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/STArray.h>
 #include <xrpl/protocol/STObject.h>
diff --git a/src/xrpld/app/tx/detail/SignerEntries.h b/src/xrpld/app/tx/detail/SignerEntries.h
index 4a47e2a148..bd16398f56 100644
--- a/src/xrpld/app/tx/detail/SignerEntries.h
+++ b/src/xrpld/app/tx/detail/SignerEntries.h
@@ -21,10 +21,11 @@
 #define RIPPLE_TX_IMPL_SIGNER_ENTRIES_H_INCLUDED
 
 #include <xrpld/app/tx/detail/Transactor.h>  // NotTEC
-#include <xrpl/basics/Expected.h>            //
-#include <xrpl/beast/utility/Journal.h>      // beast::Journal
-#include <xrpl/protocol/TER.h>               // temMALFORMED
-#include <xrpl/protocol/UintTypes.h>         // AccountID
+
+#include <xrpl/basics/Expected.h>        //
+#include <xrpl/beast/utility/Journal.h>  // beast::Journal
+#include <xrpl/protocol/TER.h>           // temMALFORMED
+#include <xrpl/protocol/UintTypes.h>     // AccountID
 
 #include <optional>
 #include <string_view>
diff --git a/src/xrpld/app/tx/detail/Taker.cpp b/src/xrpld/app/tx/detail/Taker.cpp
index e98d65fd11..9bfd6dc1d3 100644
--- a/src/xrpld/app/tx/detail/Taker.cpp
+++ b/src/xrpld/app/tx/detail/Taker.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/app/tx/detail/Taker.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/contract.h>
 
diff --git a/src/xrpld/app/tx/detail/Taker.h b/src/xrpld/app/tx/detail/Taker.h
index 9deadde9b9..3702a30deb 100644
--- a/src/xrpld/app/tx/detail/Taker.h
+++ b/src/xrpld/app/tx/detail/Taker.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/app/tx/detail/Offer.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/Quality.h>
 #include <xrpl/protocol/Rate.h>
diff --git a/src/xrpld/app/tx/detail/Transactor.cpp b/src/xrpld/app/tx/detail/Transactor.cpp
index def2079e8b..2e49794c2d 100644
--- a/src/xrpld/app/tx/detail/Transactor.cpp
+++ b/src/xrpld/app/tx/detail/Transactor.cpp
@@ -26,6 +26,7 @@
 #include <xrpld/app/tx/detail/Transactor.h>
 #include <xrpld/core/Config.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/json/to_string.h>
diff --git a/src/xrpld/app/tx/detail/Transactor.h b/src/xrpld/app/tx/detail/Transactor.h
index a4ba3bfed2..e98269c38a 100644
--- a/src/xrpld/app/tx/detail/Transactor.h
+++ b/src/xrpld/app/tx/detail/Transactor.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/app/tx/applySteps.h>
 #include <xrpld/app/tx/detail/ApplyContext.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/XRPAmount.h>
 
diff --git a/src/xrpld/app/tx/detail/XChainBridge.cpp b/src/xrpld/app/tx/detail/XChainBridge.cpp
index 5eb9f27f8d..5fa03557e5 100644
--- a/src/xrpld/app/tx/detail/XChainBridge.cpp
+++ b/src/xrpld/app/tx/detail/XChainBridge.cpp
@@ -24,6 +24,7 @@
 #include <xrpld/ledger/ApplyView.h>
 #include <xrpld/ledger/PaymentSandbox.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/Number.h>
 #include <xrpl/basics/chrono.h>
diff --git a/src/xrpld/app/tx/detail/XChainBridge.h b/src/xrpld/app/tx/detail/XChainBridge.h
index fd6f66285c..82b64cc0e3 100644
--- a/src/xrpld/app/tx/detail/XChainBridge.h
+++ b/src/xrpld/app/tx/detail/XChainBridge.h
@@ -21,6 +21,7 @@
 #define RIPPLE_TX_XCHAINBRIDGE_H_INCLUDED
 
 #include <xrpld/app/tx/detail/Transactor.h>
+
 #include <xrpl/protocol/XChainAttestations.h>
 
 namespace ripple {
diff --git a/src/xrpld/app/tx/detail/apply.cpp b/src/xrpld/app/tx/detail/apply.cpp
index 03b0c3d74d..615fd6a92d 100644
--- a/src/xrpld/app/tx/detail/apply.cpp
+++ b/src/xrpld/app/tx/detail/apply.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/misc/HashRouter.h>
 #include <xrpld/app/tx/apply.h>
 #include <xrpld/app/tx/applySteps.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 
diff --git a/src/xrpld/app/tx/detail/applySteps.cpp b/src/xrpld/app/tx/detail/applySteps.cpp
index 95cc3521a9..4cb505db50 100644
--- a/src/xrpld/app/tx/detail/applySteps.cpp
+++ b/src/xrpld/app/tx/detail/applySteps.cpp
@@ -61,6 +61,7 @@
 #include <xrpld/app/tx/detail/SetSignerList.h>
 #include <xrpld/app/tx/detail/SetTrust.h>
 #include <xrpld/app/tx/detail/XChainBridge.h>
+
 #include <xrpl/protocol/TxFormats.h>
 
 #include <stdexcept>
diff --git a/src/xrpld/conditions/Condition.h b/src/xrpld/conditions/Condition.h
index 10343bc574..52408127ec 100644
--- a/src/xrpld/conditions/Condition.h
+++ b/src/xrpld/conditions/Condition.h
@@ -21,6 +21,7 @@
 #define RIPPLE_CONDITIONS_CONDITION_H
 
 #include <xrpld/conditions/detail/utils.h>
+
 #include <xrpl/basics/Buffer.h>
 #include <xrpl/basics/Slice.h>
 
diff --git a/src/xrpld/conditions/Fulfillment.h b/src/xrpld/conditions/Fulfillment.h
index 0d52d2574e..8e770352a9 100644
--- a/src/xrpld/conditions/Fulfillment.h
+++ b/src/xrpld/conditions/Fulfillment.h
@@ -21,6 +21,7 @@
 #define RIPPLE_CONDITIONS_FULFILLMENT_H
 
 #include <xrpld/conditions/Condition.h>
+
 #include <xrpl/basics/Buffer.h>
 #include <xrpl/basics/Slice.h>
 
diff --git a/src/xrpld/conditions/detail/Fulfillment.cpp b/src/xrpld/conditions/detail/Fulfillment.cpp
index 16141f4c98..47fde969a3 100644
--- a/src/xrpld/conditions/detail/Fulfillment.cpp
+++ b/src/xrpld/conditions/detail/Fulfillment.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/conditions/Fulfillment.h>
 #include <xrpld/conditions/detail/PreimageSha256.h>
 #include <xrpld/conditions/detail/utils.h>
+
 #include <xrpl/basics/safe_cast.h>
 
 namespace ripple {
diff --git a/src/xrpld/conditions/detail/PreimageSha256.h b/src/xrpld/conditions/detail/PreimageSha256.h
index 2f60426209..273a29d653 100644
--- a/src/xrpld/conditions/detail/PreimageSha256.h
+++ b/src/xrpld/conditions/detail/PreimageSha256.h
@@ -23,6 +23,7 @@
 #include <xrpld/conditions/Condition.h>
 #include <xrpld/conditions/Fulfillment.h>
 #include <xrpld/conditions/detail/error.h>
+
 #include <xrpl/basics/Buffer.h>
 #include <xrpl/basics/Slice.h>
 #include <xrpl/protocol/digest.h>
diff --git a/src/xrpld/conditions/detail/error.cpp b/src/xrpld/conditions/detail/error.cpp
index fab4bda61a..10a3a43921 100644
--- a/src/xrpld/conditions/detail/error.cpp
+++ b/src/xrpld/conditions/detail/error.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/conditions/detail/error.h>
+
 #include <xrpl/basics/safe_cast.h>
 
 #include <string>
diff --git a/src/xrpld/conditions/detail/utils.h b/src/xrpld/conditions/detail/utils.h
index 4d68cb0713..28943bd640 100644
--- a/src/xrpld/conditions/detail/utils.h
+++ b/src/xrpld/conditions/detail/utils.h
@@ -21,6 +21,7 @@
 #define RIPPLE_CONDITIONS_UTILS_H
 
 #include <xrpld/conditions/detail/error.h>
+
 #include <xrpl/basics/Buffer.h>
 #include <xrpl/basics/Slice.h>
 
diff --git a/src/xrpld/consensus/Consensus.cpp b/src/xrpld/consensus/Consensus.cpp
index 3720062fdb..0071e1d614 100644
--- a/src/xrpld/consensus/Consensus.cpp
+++ b/src/xrpld/consensus/Consensus.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/consensus/Consensus.h>
+
 #include <xrpl/basics/Log.h>
 
 namespace ripple {
diff --git a/src/xrpld/consensus/Consensus.h b/src/xrpld/consensus/Consensus.h
index 3343ee6110..ac595c1d1d 100644
--- a/src/xrpld/consensus/Consensus.h
+++ b/src/xrpld/consensus/Consensus.h
@@ -25,6 +25,7 @@
 #include <xrpld/consensus/ConsensusTypes.h>
 #include <xrpld/consensus/DisputedTx.h>
 #include <xrpld/consensus/LedgerTiming.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/utility/Journal.h>
diff --git a/src/xrpld/consensus/ConsensusTypes.h b/src/xrpld/consensus/ConsensusTypes.h
index 1e2b47fdca..dc7fb69bf4 100644
--- a/src/xrpld/consensus/ConsensusTypes.h
+++ b/src/xrpld/consensus/ConsensusTypes.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/consensus/ConsensusProposal.h>
 #include <xrpld/consensus/DisputedTx.h>
+
 #include <xrpl/basics/chrono.h>
 
 #include <chrono>
diff --git a/src/xrpld/consensus/DisputedTx.h b/src/xrpld/consensus/DisputedTx.h
index 5cea21c595..cd7e17d653 100644
--- a/src/xrpld/consensus/DisputedTx.h
+++ b/src/xrpld/consensus/DisputedTx.h
@@ -21,6 +21,7 @@
 #define RIPPLE_APP_CONSENSUS_IMPL_DISPUTEDTX_H_INCLUDED
 
 #include <xrpld/consensus/ConsensusParms.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/json/json_writer.h>
diff --git a/src/xrpld/consensus/Validations.h b/src/xrpld/consensus/Validations.h
index 582d36cbcd..c333aeaefd 100644
--- a/src/xrpld/consensus/Validations.h
+++ b/src/xrpld/consensus/Validations.h
@@ -21,6 +21,7 @@
 #define RIPPLE_CONSENSUS_VALIDATIONS_H_INCLUDED
 
 #include <xrpld/consensus/LedgerTrie.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/basics/chrono.h>
diff --git a/src/xrpld/core/Job.h b/src/xrpld/core/Job.h
index 1fc4e9b85c..66048f4f21 100644
--- a/src/xrpld/core/Job.h
+++ b/src/xrpld/core/Job.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/core/ClosureCounter.h>
 #include <xrpld/core/LoadMonitor.h>
+
 #include <xrpl/basics/CountedObject.h>
 
 #include <functional>
diff --git a/src/xrpld/core/JobQueue.h b/src/xrpld/core/JobQueue.h
index a8957f48f5..051c298251 100644
--- a/src/xrpld/core/JobQueue.h
+++ b/src/xrpld/core/JobQueue.h
@@ -24,6 +24,7 @@
 #include <xrpld/core/JobTypeData.h>
 #include <xrpld/core/JobTypes.h>
 #include <xrpld/core/detail/Workers.h>
+
 #include <xrpl/basics/LocalValue.h>
 #include <xrpl/json/json_value.h>
 
diff --git a/src/xrpld/core/JobTypeData.h b/src/xrpld/core/JobTypeData.h
index 43d63895d8..89532c15d9 100644
--- a/src/xrpld/core/JobTypeData.h
+++ b/src/xrpld/core/JobTypeData.h
@@ -21,6 +21,7 @@
 #define RIPPLE_CORE_JOBTYPEDATA_H_INCLUDED
 
 #include <xrpld/core/JobTypeInfo.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/beast/insight/Collector.h>
 
diff --git a/src/xrpld/core/LoadMonitor.h b/src/xrpld/core/LoadMonitor.h
index ee21de34fc..c65a0e6870 100644
--- a/src/xrpld/core/LoadMonitor.h
+++ b/src/xrpld/core/LoadMonitor.h
@@ -21,6 +21,7 @@
 #define RIPPLE_CORE_LOADMONITOR_H_INCLUDED
 
 #include <xrpld/core/LoadEvent.h>
+
 #include <xrpl/basics/UptimeClock.h>
 #include <xrpl/beast/utility/Journal.h>
 
diff --git a/src/xrpld/core/SociDB.h b/src/xrpld/core/SociDB.h
index 167922941b..a741504e97 100644
--- a/src/xrpld/core/SociDB.h
+++ b/src/xrpld/core/SociDB.h
@@ -34,11 +34,13 @@
 #endif
 
 #include <xrpld/core/JobQueue.h>
+
 #include <xrpl/basics/Log.h>
 
 #define SOCI_USE_BOOST
-#include <cstdint>
 #include <soci/soci.h>
+
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/src/xrpld/core/detail/Config.cpp b/src/xrpld/core/detail/Config.cpp
index a06c6d5b3c..60a359b580 100644
--- a/src/xrpld/core/detail/Config.cpp
+++ b/src/xrpld/core/detail/Config.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/core/Config.h>
 #include <xrpld/core/ConfigSections.h>
 #include <xrpld/net/HTTPClient.h>
+
 #include <xrpl/basics/FileUtilities.h>
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/StringUtilities.h>
diff --git a/src/xrpld/core/detail/DatabaseCon.cpp b/src/xrpld/core/detail/DatabaseCon.cpp
index 6d49c647a6..89e4daf90e 100644
--- a/src/xrpld/core/detail/DatabaseCon.cpp
+++ b/src/xrpld/core/detail/DatabaseCon.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/core/DatabaseCon.h>
 #include <xrpld/core/SociDB.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/contract.h>
 
diff --git a/src/xrpld/core/detail/Job.cpp b/src/xrpld/core/detail/Job.cpp
index 8f49ea3ff7..d62f49ff49 100644
--- a/src/xrpld/core/detail/Job.cpp
+++ b/src/xrpld/core/detail/Job.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/core/Job.h>
+
 #include <xrpl/beast/core/CurrentThreadName.h>
 
 namespace ripple {
diff --git a/src/xrpld/core/detail/JobQueue.cpp b/src/xrpld/core/detail/JobQueue.cpp
index b35922fd9a..1ea1df51ab 100644
--- a/src/xrpld/core/detail/JobQueue.cpp
+++ b/src/xrpld/core/detail/JobQueue.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/core/JobQueue.h>
 #include <xrpld/perflog/PerfLog.h>
+
 #include <xrpl/basics/contract.h>
 
 #include <mutex>
diff --git a/src/xrpld/core/detail/LoadEvent.cpp b/src/xrpld/core/detail/LoadEvent.cpp
index 7421ad16cc..bee2a14579 100644
--- a/src/xrpld/core/detail/LoadEvent.cpp
+++ b/src/xrpld/core/detail/LoadEvent.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/core/LoadEvent.h>
 #include <xrpld/core/LoadMonitor.h>
+
 #include <xrpl/beast/utility/instrumentation.h>
 
 namespace ripple {
diff --git a/src/xrpld/core/detail/LoadMonitor.cpp b/src/xrpld/core/detail/LoadMonitor.cpp
index 80b08bbdfc..98fa959d6c 100644
--- a/src/xrpld/core/detail/LoadMonitor.cpp
+++ b/src/xrpld/core/detail/LoadMonitor.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/core/LoadMonitor.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/UptimeClock.h>
 
diff --git a/src/xrpld/core/detail/SociDB.cpp b/src/xrpld/core/detail/SociDB.cpp
index 837a8bcd13..96b1f97977 100644
--- a/src/xrpld/core/detail/SociDB.cpp
+++ b/src/xrpld/core/detail/SociDB.cpp
@@ -25,10 +25,12 @@
 #include <xrpld/core/Config.h>
 #include <xrpld/core/DatabaseCon.h>
 #include <xrpld/core/SociDB.h>
+
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/basics/contract.h>
 
 #include <boost/filesystem.hpp>
+
 #include <soci/sqlite3/soci-sqlite3.h>
 
 #include <memory>
diff --git a/src/xrpld/core/detail/Workers.cpp b/src/xrpld/core/detail/Workers.cpp
index 7286f378e8..53b5944ac0 100644
--- a/src/xrpld/core/detail/Workers.cpp
+++ b/src/xrpld/core/detail/Workers.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/core/detail/Workers.h>
 #include <xrpld/perflog/PerfLog.h>
+
 #include <xrpl/beast/core/CurrentThreadName.h>
 #include <xrpl/beast/utility/instrumentation.h>
 
diff --git a/src/xrpld/core/detail/Workers.h b/src/xrpld/core/detail/Workers.h
index b62146b49f..3f41e382b0 100644
--- a/src/xrpld/core/detail/Workers.h
+++ b/src/xrpld/core/detail/Workers.h
@@ -21,6 +21,7 @@
 #define RIPPLE_CORE_WORKERS_H_INCLUDED
 
 #include <xrpld/core/detail/semaphore.h>
+
 #include <xrpl/beast/core/LockFreeStack.h>
 
 #include <atomic>
diff --git a/src/xrpld/ledger/ApplyView.h b/src/xrpld/ledger/ApplyView.h
index e99e8b2976..1abff33be0 100644
--- a/src/xrpld/ledger/ApplyView.h
+++ b/src/xrpld/ledger/ApplyView.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/ledger/RawView.h>
 #include <xrpld/ledger/ReadView.h>
+
 #include <xrpl/basics/safe_cast.h>
 #include <xrpl/beast/utility/instrumentation.h>
 
diff --git a/src/xrpld/ledger/ApplyViewImpl.h b/src/xrpld/ledger/ApplyViewImpl.h
index 74ee290829..1c282565b1 100644
--- a/src/xrpld/ledger/ApplyViewImpl.h
+++ b/src/xrpld/ledger/ApplyViewImpl.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/ledger/OpenView.h>
 #include <xrpld/ledger/detail/ApplyViewBase.h>
+
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/TER.h>
 
diff --git a/src/xrpld/ledger/BookDirs.h b/src/xrpld/ledger/BookDirs.h
index 805037ff37..dc58905c5a 100644
--- a/src/xrpld/ledger/BookDirs.h
+++ b/src/xrpld/ledger/BookDirs.h
@@ -21,6 +21,7 @@
 #define RIPPLE_LEDGER_BOOK_DIRS_H_INCLUDED
 
 #include <xrpld/ledger/ReadView.h>
+
 #include <xrpl/beast/utility/Journal.h>
 
 namespace ripple {
diff --git a/src/xrpld/ledger/CachedView.h b/src/xrpld/ledger/CachedView.h
index 83e50c6aec..ae59312f98 100644
--- a/src/xrpld/ledger/CachedView.h
+++ b/src/xrpld/ledger/CachedView.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/ledger/CachedSLEs.h>
 #include <xrpld/ledger/ReadView.h>
+
 #include <xrpl/basics/hardened_hash.h>
 
 #include <mutex>
diff --git a/src/xrpld/ledger/Dir.h b/src/xrpld/ledger/Dir.h
index 0e92d7dbca..d3a52558fd 100644
--- a/src/xrpld/ledger/Dir.h
+++ b/src/xrpld/ledger/Dir.h
@@ -21,6 +21,7 @@
 #define RIPPLE_LEDGER_DIR_H_INCLUDED
 
 #include <xrpld/ledger/ReadView.h>
+
 #include <xrpl/protocol/Indexes.h>
 
 namespace ripple {
diff --git a/src/xrpld/ledger/OpenView.h b/src/xrpld/ledger/OpenView.h
index c8e1911bf9..ecc618e185 100644
--- a/src/xrpld/ledger/OpenView.h
+++ b/src/xrpld/ledger/OpenView.h
@@ -23,6 +23,7 @@
 #include <xrpld/ledger/RawView.h>
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/ledger/detail/RawStateTable.h>
+
 #include <xrpl/protocol/XRPAmount.h>
 
 #include <boost/container/pmr/monotonic_buffer_resource.hpp>
diff --git a/src/xrpld/ledger/PaymentSandbox.h b/src/xrpld/ledger/PaymentSandbox.h
index a764506b92..a41a0211a2 100644
--- a/src/xrpld/ledger/PaymentSandbox.h
+++ b/src/xrpld/ledger/PaymentSandbox.h
@@ -23,6 +23,7 @@
 #include <xrpld/ledger/RawView.h>
 #include <xrpld/ledger/Sandbox.h>
 #include <xrpld/ledger/detail/ApplyViewBase.h>
+
 #include <xrpl/protocol/AccountID.h>
 
 #include <map>
diff --git a/src/xrpld/ledger/RawView.h b/src/xrpld/ledger/RawView.h
index 906f122721..fb6dcffe06 100644
--- a/src/xrpld/ledger/RawView.h
+++ b/src/xrpld/ledger/RawView.h
@@ -21,6 +21,7 @@
 #define RIPPLE_LEDGER_RAWVIEW_H_INCLUDED
 
 #include <xrpld/ledger/ReadView.h>
+
 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/Serializer.h>
 
diff --git a/src/xrpld/ledger/ReadView.h b/src/xrpld/ledger/ReadView.h
index aef94a57e4..53e12083f3 100644
--- a/src/xrpld/ledger/ReadView.h
+++ b/src/xrpld/ledger/ReadView.h
@@ -21,6 +21,7 @@
 #define RIPPLE_LEDGER_READVIEW_H_INCLUDED
 
 #include <xrpld/ledger/detail/ReadViewFwdRange.h>
+
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/hash/uhash.h>
 #include <xrpl/protocol/Fees.h>
diff --git a/src/xrpld/ledger/View.h b/src/xrpld/ledger/View.h
index 40d584f270..85aa02f1b4 100644
--- a/src/xrpld/ledger/View.h
+++ b/src/xrpld/ledger/View.h
@@ -23,6 +23,7 @@
 #include <xrpld/ledger/ApplyView.h>
 #include <xrpld/ledger/OpenView.h>
 #include <xrpld/ledger/ReadView.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/MPTIssue.h>
 #include <xrpl/protocol/Protocol.h>
diff --git a/src/xrpld/ledger/detail/ApplyStateTable.cpp b/src/xrpld/ledger/detail/ApplyStateTable.cpp
index 2c76b9b587..c11a72d782 100644
--- a/src/xrpld/ledger/detail/ApplyStateTable.cpp
+++ b/src/xrpld/ledger/detail/ApplyStateTable.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/ledger/detail/ApplyStateTable.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/json/to_string.h>
diff --git a/src/xrpld/ledger/detail/ApplyStateTable.h b/src/xrpld/ledger/detail/ApplyStateTable.h
index 0e80cc6a1d..b1bac733fc 100644
--- a/src/xrpld/ledger/detail/ApplyStateTable.h
+++ b/src/xrpld/ledger/detail/ApplyStateTable.h
@@ -23,6 +23,7 @@
 #include <xrpld/ledger/OpenView.h>
 #include <xrpld/ledger/RawView.h>
 #include <xrpld/ledger/ReadView.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxMeta.h>
diff --git a/src/xrpld/ledger/detail/ApplyView.cpp b/src/xrpld/ledger/detail/ApplyView.cpp
index 8b491bdcb2..3191b47cbb 100644
--- a/src/xrpld/ledger/detail/ApplyView.cpp
+++ b/src/xrpld/ledger/detail/ApplyView.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/ledger/ApplyView.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/protocol/Protocol.h>
diff --git a/src/xrpld/ledger/detail/ApplyViewBase.h b/src/xrpld/ledger/detail/ApplyViewBase.h
index abbea25be6..f9c9c80af0 100644
--- a/src/xrpld/ledger/detail/ApplyViewBase.h
+++ b/src/xrpld/ledger/detail/ApplyViewBase.h
@@ -23,6 +23,7 @@
 #include <xrpld/ledger/ApplyView.h>
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/ledger/detail/ApplyStateTable.h>
+
 #include <xrpl/protocol/XRPAmount.h>
 
 namespace ripple {
diff --git a/src/xrpld/ledger/detail/BookDirs.cpp b/src/xrpld/ledger/detail/BookDirs.cpp
index f584db89e8..41a14945a6 100644
--- a/src/xrpld/ledger/detail/BookDirs.cpp
+++ b/src/xrpld/ledger/detail/BookDirs.cpp
@@ -20,6 +20,7 @@
 
 #include <xrpld/ledger/BookDirs.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/protocol/Indexes.h>
 
 namespace ripple {
diff --git a/src/xrpld/ledger/detail/OpenView.cpp b/src/xrpld/ledger/detail/OpenView.cpp
index 619006161f..5c62d8cef8 100644
--- a/src/xrpld/ledger/detail/OpenView.cpp
+++ b/src/xrpld/ledger/detail/OpenView.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/ledger/OpenView.h>
+
 #include <xrpl/basics/contract.h>
 
 namespace ripple {
diff --git a/src/xrpld/ledger/detail/PaymentSandbox.cpp b/src/xrpld/ledger/detail/PaymentSandbox.cpp
index 35c87fee1a..3eab845472 100644
--- a/src/xrpld/ledger/detail/PaymentSandbox.cpp
+++ b/src/xrpld/ledger/detail/PaymentSandbox.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/paths/detail/AmountSpec.h>
 #include <xrpld/ledger/PaymentSandbox.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/protocol/SField.h>
 
diff --git a/src/xrpld/ledger/detail/RawStateTable.cpp b/src/xrpld/ledger/detail/RawStateTable.cpp
index b93fc4a2aa..f19eed8297 100644
--- a/src/xrpld/ledger/detail/RawStateTable.cpp
+++ b/src/xrpld/ledger/detail/RawStateTable.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/ledger/detail/RawStateTable.h>
+
 #include <xrpl/basics/contract.h>
 
 namespace ripple {
diff --git a/src/xrpld/ledger/detail/View.cpp b/src/xrpld/ledger/detail/View.cpp
index 1fa4577204..1860f61445 100644
--- a/src/xrpld/ledger/detail/View.cpp
+++ b/src/xrpld/ledger/detail/View.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/ledger/View.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/utility/instrumentation.h>
diff --git a/src/xrpld/net/HTTPClient.h b/src/xrpld/net/HTTPClient.h
index b78859212e..2a33500aa4 100644
--- a/src/xrpld/net/HTTPClient.h
+++ b/src/xrpld/net/HTTPClient.h
@@ -21,6 +21,7 @@
 #define RIPPLE_NET_HTTPCLIENT_H_INCLUDED
 
 #include <xrpld/core/Config.h>
+
 #include <xrpl/basics/ByteUtilities.h>
 
 #include <boost/asio/io_service.hpp>
diff --git a/src/xrpld/net/HTTPClientSSLContext.h b/src/xrpld/net/HTTPClientSSLContext.h
index 235e855625..2da5ac38de 100644
--- a/src/xrpld/net/HTTPClientSSLContext.h
+++ b/src/xrpld/net/HTTPClientSSLContext.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/core/Config.h>
 #include <xrpld/net/RegisterSSLCerts.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/contract.h>
 
diff --git a/src/xrpld/net/InfoSub.h b/src/xrpld/net/InfoSub.h
index 2ef17ca525..c8762c31fd 100644
--- a/src/xrpld/net/InfoSub.h
+++ b/src/xrpld/net/InfoSub.h
@@ -21,6 +21,7 @@
 #define RIPPLE_NET_INFOSUB_H_INCLUDED
 
 #include <xrpld/app/misc/Manifest.h>
+
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/Book.h>
diff --git a/src/xrpld/net/RPCCall.h b/src/xrpld/net/RPCCall.h
index bd2f3629c0..612d80c663 100644
--- a/src/xrpld/net/RPCCall.h
+++ b/src/xrpld/net/RPCCall.h
@@ -21,6 +21,7 @@
 #define RIPPLE_NET_RPCCALL_H_INCLUDED
 
 #include <xrpld/core/Config.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/json/json_value.h>
 
diff --git a/src/xrpld/net/detail/HTTPClient.cpp b/src/xrpld/net/detail/HTTPClient.cpp
index bcb5da724b..0ead4cf0dc 100644
--- a/src/xrpld/net/detail/HTTPClient.cpp
+++ b/src/xrpld/net/detail/HTTPClient.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/net/AutoSocket.h>
 #include <xrpld/net/HTTPClient.h>
 #include <xrpld/net/HTTPClientSSLContext.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/beast/core/LexicalCast.h>
 
diff --git a/src/xrpld/net/detail/RPCCall.cpp b/src/xrpld/net/detail/RPCCall.cpp
index 19f534baa5..814ea362e4 100644
--- a/src/xrpld/net/detail/RPCCall.cpp
+++ b/src/xrpld/net/detail/RPCCall.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/net/RPCCall.h>
 #include <xrpld/rpc/ServerHandler.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/StringUtilities.h>
diff --git a/src/xrpld/net/detail/RPCSub.cpp b/src/xrpld/net/detail/RPCSub.cpp
index d575070a9f..96f91cdcf5 100644
--- a/src/xrpld/net/detail/RPCSub.cpp
+++ b/src/xrpld/net/detail/RPCSub.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/net/RPCCall.h>
 #include <xrpld/net/RPCSub.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/basics/contract.h>
diff --git a/src/xrpld/net/detail/RegisterSSLCerts.cpp b/src/xrpld/net/detail/RegisterSSLCerts.cpp
index b3529d584c..0dbf036e01 100644
--- a/src/xrpld/net/detail/RegisterSSLCerts.cpp
+++ b/src/xrpld/net/detail/RegisterSSLCerts.cpp
@@ -22,12 +22,14 @@
 #if BOOST_OS_WINDOWS
 #include <boost/asio/ssl/error.hpp>
 #include <boost/system/error_code.hpp>
+
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
 
-#include <memory>
 #include <wincrypt.h>
+
+#include <memory>
 #endif
 
 namespace ripple {
diff --git a/src/xrpld/nodestore/Database.h b/src/xrpld/nodestore/Database.h
index 95082b0867..e1aa801c44 100644
--- a/src/xrpld/nodestore/Database.h
+++ b/src/xrpld/nodestore/Database.h
@@ -23,6 +23,7 @@
 #include <xrpld/nodestore/Backend.h>
 #include <xrpld/nodestore/NodeObject.h>
 #include <xrpld/nodestore/Scheduler.h>
+
 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/SystemParameters.h>
diff --git a/src/xrpld/nodestore/Factory.h b/src/xrpld/nodestore/Factory.h
index c91916ea87..b0768907da 100644
--- a/src/xrpld/nodestore/Factory.h
+++ b/src/xrpld/nodestore/Factory.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/nodestore/Backend.h>
 #include <xrpld/nodestore/Scheduler.h>
+
 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/beast/utility/Journal.h>
 
diff --git a/src/xrpld/nodestore/backend/MemoryFactory.cpp b/src/xrpld/nodestore/backend/MemoryFactory.cpp
index 6e07c0f6fb..dc3106cc91 100644
--- a/src/xrpld/nodestore/backend/MemoryFactory.cpp
+++ b/src/xrpld/nodestore/backend/MemoryFactory.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/nodestore/Factory.h>
 #include <xrpld/nodestore/Manager.h>
+
 #include <xrpl/basics/contract.h>
 
 #include <boost/beast/core/string.hpp>
diff --git a/src/xrpld/nodestore/backend/NuDBFactory.cpp b/src/xrpld/nodestore/backend/NuDBFactory.cpp
index 06d73e67dc..2f4e9d502e 100644
--- a/src/xrpld/nodestore/backend/NuDBFactory.cpp
+++ b/src/xrpld/nodestore/backend/NuDBFactory.cpp
@@ -22,10 +22,12 @@
 #include <xrpld/nodestore/detail/DecodedBlob.h>
 #include <xrpld/nodestore/detail/EncodedBlob.h>
 #include <xrpld/nodestore/detail/codec.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/beast/utility/instrumentation.h>
 
 #include <boost/filesystem.hpp>
+
 #include <nudb/nudb.hpp>
 
 #include <chrono>
diff --git a/src/xrpld/nodestore/backend/RocksDBFactory.cpp b/src/xrpld/nodestore/backend/RocksDBFactory.cpp
index 7c75781513..c6533e82d6 100644
--- a/src/xrpld/nodestore/backend/RocksDBFactory.cpp
+++ b/src/xrpld/nodestore/backend/RocksDBFactory.cpp
@@ -26,6 +26,7 @@
 #include <xrpld/nodestore/detail/BatchWriter.h>
 #include <xrpld/nodestore/detail/DecodedBlob.h>
 #include <xrpld/nodestore/detail/EncodedBlob.h>
+
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/safe_cast.h>
diff --git a/src/xrpld/nodestore/detail/Database.cpp b/src/xrpld/nodestore/detail/Database.cpp
index dbcfba8e0a..4edafcddca 100644
--- a/src/xrpld/nodestore/detail/Database.cpp
+++ b/src/xrpld/nodestore/detail/Database.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/nodestore/Database.h>
+
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/core/CurrentThreadName.h>
 #include <xrpl/json/json_value.h>
diff --git a/src/xrpld/nodestore/detail/DatabaseNodeImp.h b/src/xrpld/nodestore/detail/DatabaseNodeImp.h
index d90f02ce87..160bf92d5e 100644
--- a/src/xrpld/nodestore/detail/DatabaseNodeImp.h
+++ b/src/xrpld/nodestore/detail/DatabaseNodeImp.h
@@ -21,6 +21,7 @@
 #define RIPPLE_NODESTORE_DATABASENODEIMP_H_INCLUDED
 
 #include <xrpld/nodestore/Database.h>
+
 #include <xrpl/basics/TaggedCache.h>
 #include <xrpl/basics/chrono.h>
 
diff --git a/src/xrpld/nodestore/detail/DecodedBlob.cpp b/src/xrpld/nodestore/detail/DecodedBlob.cpp
index 9dd50ae2b6..adec27a68f 100644
--- a/src/xrpld/nodestore/detail/DecodedBlob.cpp
+++ b/src/xrpld/nodestore/detail/DecodedBlob.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/nodestore/detail/DecodedBlob.h>
+
 #include <xrpl/basics/safe_cast.h>
 #include <xrpl/beast/utility/instrumentation.h>
 
diff --git a/src/xrpld/nodestore/detail/EncodedBlob.h b/src/xrpld/nodestore/detail/EncodedBlob.h
index d17f214d7a..a238f2b856 100644
--- a/src/xrpld/nodestore/detail/EncodedBlob.h
+++ b/src/xrpld/nodestore/detail/EncodedBlob.h
@@ -21,6 +21,7 @@
 #define RIPPLE_NODESTORE_ENCODEDBLOB_H_INCLUDED
 
 #include <xrpld/nodestore/NodeObject.h>
+
 #include <xrpl/beast/utility/instrumentation.h>
 
 #include <boost/align/align_up.hpp>
diff --git a/src/xrpld/nodestore/detail/codec.h b/src/xrpld/nodestore/detail/codec.h
index bcc9ebca9c..7bc3ab2caa 100644
--- a/src/xrpld/nodestore/detail/codec.h
+++ b/src/xrpld/nodestore/detail/codec.h
@@ -25,13 +25,15 @@
 
 #include <xrpld/nodestore/NodeObject.h>
 #include <xrpld/nodestore/detail/varint.h>
+
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/safe_cast.h>
 #include <xrpl/protocol/HashPrefix.h>
 
-#include <lz4.h>
 #include <nudb/detail/field.hpp>
 
+#include <lz4.h>
+
 #include <cstddef>
 #include <cstring>
 #include <string>
diff --git a/src/xrpld/overlay/Cluster.h b/src/xrpld/overlay/Cluster.h
index f5a7acd173..a2fd7f9c53 100644
--- a/src/xrpld/overlay/Cluster.h
+++ b/src/xrpld/overlay/Cluster.h
@@ -21,6 +21,7 @@
 #define RIPPLE_OVERLAY_CLUSTER_H_INCLUDED
 
 #include <xrpld/overlay/ClusterNode.h>
+
 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/utility/Journal.h>
diff --git a/src/xrpld/overlay/Message.h b/src/xrpld/overlay/Message.h
index 48ae118ab4..92e2824327 100644
--- a/src/xrpld/overlay/Message.h
+++ b/src/xrpld/overlay/Message.h
@@ -21,6 +21,7 @@
 #define RIPPLE_OVERLAY_MESSAGE_H_INCLUDED
 
 #include <xrpld/overlay/Compression.h>
+
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/messages.h>
diff --git a/src/xrpld/overlay/Overlay.h b/src/xrpld/overlay/Overlay.h
index 8ef7ade1dd..7f5c858f67 100644
--- a/src/xrpld/overlay/Overlay.h
+++ b/src/xrpld/overlay/Overlay.h
@@ -21,6 +21,7 @@
 #define RIPPLE_OVERLAY_OVERLAY_H_INCLUDED
 
 #include <xrpld/overlay/Peer.h>
+
 #include <xrpl/beast/utility/PropertyStream.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/server/Handoff.h>
diff --git a/src/xrpld/overlay/Peer.h b/src/xrpld/overlay/Peer.h
index 2646b24a3e..9a5bd7136b 100644
--- a/src/xrpld/overlay/Peer.h
+++ b/src/xrpld/overlay/Peer.h
@@ -21,6 +21,7 @@
 #define RIPPLE_OVERLAY_PEER_H_INCLUDED
 
 #include <xrpld/overlay/Message.h>
+
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/net/IPEndpoint.h>
 #include <xrpl/json/json_value.h>
diff --git a/src/xrpld/overlay/ReduceRelayCommon.h b/src/xrpld/overlay/ReduceRelayCommon.h
index 8289e467e6..01d7dc597f 100644
--- a/src/xrpld/overlay/ReduceRelayCommon.h
+++ b/src/xrpld/overlay/ReduceRelayCommon.h
@@ -62,4 +62,4 @@ static constexpr std::size_t MAX_TX_QUEUE_SIZE = 10000;
 
 }  // namespace ripple
 
-#endif  // RIPPLED_REDUCERELAYCOMMON_H_INCLUDED
\ No newline at end of file
+#endif  // RIPPLED_REDUCERELAYCOMMON_H_INCLUDED
diff --git a/src/xrpld/overlay/Slot.h b/src/xrpld/overlay/Slot.h
index b10a02bbf2..b2db772f5b 100644
--- a/src/xrpld/overlay/Slot.h
+++ b/src/xrpld/overlay/Slot.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/overlay/Peer.h>
 #include <xrpld/overlay/ReduceRelayCommon.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/basics/random.h>
diff --git a/src/xrpld/overlay/Squelch.h b/src/xrpld/overlay/Squelch.h
index fc68f2660c..0507bd4d2d 100644
--- a/src/xrpld/overlay/Squelch.h
+++ b/src/xrpld/overlay/Squelch.h
@@ -21,6 +21,7 @@
 #define RIPPLE_OVERLAY_SQUELCH_H_INCLUDED
 
 #include <xrpld/overlay/ReduceRelayCommon.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/PublicKey.h>
 
diff --git a/src/xrpld/overlay/detail/Cluster.cpp b/src/xrpld/overlay/detail/Cluster.cpp
index 64b3595667..b4e5b6fc50 100644
--- a/src/xrpld/overlay/detail/Cluster.cpp
+++ b/src/xrpld/overlay/detail/Cluster.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/core/TimeKeeper.h>
 #include <xrpld/overlay/Cluster.h>
 #include <xrpld/overlay/ClusterNode.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/protocol/tokens.h>
diff --git a/src/xrpld/overlay/detail/ConnectAttempt.cpp b/src/xrpld/overlay/detail/ConnectAttempt.cpp
index 4bb76369c4..30763b1357 100644
--- a/src/xrpld/overlay/detail/ConnectAttempt.cpp
+++ b/src/xrpld/overlay/detail/ConnectAttempt.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/overlay/detail/ConnectAttempt.h>
 #include <xrpld/overlay/detail/PeerImp.h>
 #include <xrpld/overlay/detail/ProtocolVersion.h>
+
 #include <xrpl/json/json_reader.h>
 
 namespace ripple {
diff --git a/src/xrpld/overlay/detail/Handshake.cpp b/src/xrpld/overlay/detail/Handshake.cpp
index 97ce85910e..657d28072f 100644
--- a/src/xrpld/overlay/detail/Handshake.cpp
+++ b/src/xrpld/overlay/detail/Handshake.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/main/Application.h>
 #include <xrpld/overlay/detail/Handshake.h>
+
 #include <xrpl/basics/base64.h>
 #include <xrpl/beast/core/LexicalCast.h>
 #include <xrpl/beast/rfc2616.h>
diff --git a/src/xrpld/overlay/detail/Handshake.h b/src/xrpld/overlay/detail/Handshake.h
index 48989b8a6e..37f138b88b 100644
--- a/src/xrpld/overlay/detail/Handshake.h
+++ b/src/xrpld/overlay/detail/Handshake.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/app/main/Application.h>
 #include <xrpld/overlay/detail/ProtocolVersion.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/protocol/BuildInfo.h>
 
diff --git a/src/xrpld/overlay/detail/OverlayImpl.cpp b/src/xrpld/overlay/detail/OverlayImpl.cpp
index 33adb27351..b3a3395eed 100644
--- a/src/xrpld/overlay/detail/OverlayImpl.cpp
+++ b/src/xrpld/overlay/detail/OverlayImpl.cpp
@@ -31,6 +31,7 @@
 #include <xrpld/peerfinder/make_Manager.h>
 #include <xrpld/rpc/handlers/GetCounts.h>
 #include <xrpld/rpc/json_body.h>
+
 #include <xrpl/basics/base64.h>
 #include <xrpl/basics/make_SSLContext.h>
 #include <xrpl/basics/random.h>
diff --git a/src/xrpld/overlay/detail/OverlayImpl.h b/src/xrpld/overlay/detail/OverlayImpl.h
index cfaaf8d75f..4112e6dfd9 100644
--- a/src/xrpld/overlay/detail/OverlayImpl.h
+++ b/src/xrpld/overlay/detail/OverlayImpl.h
@@ -30,6 +30,7 @@
 #include <xrpld/overlay/detail/TxMetrics.h>
 #include <xrpld/peerfinder/PeerfinderManager.h>
 #include <xrpld/rpc/ServerHandler.h>
+
 #include <xrpl/basics/Resolver.h>
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/basics/chrono.h>
diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp
index 8989f89fb3..6df9b78df8 100644
--- a/src/xrpld/overlay/detail/PeerImp.cpp
+++ b/src/xrpld/overlay/detail/PeerImp.cpp
@@ -32,6 +32,7 @@
 #include <xrpld/overlay/detail/PeerImp.h>
 #include <xrpld/overlay/detail/Tuning.h>
 #include <xrpld/perflog/PerfLog.h>
+
 #include <xrpl/basics/UptimeClock.h>
 #include <xrpl/basics/base64.h>
 #include <xrpl/basics/random.h>
diff --git a/src/xrpld/overlay/detail/PeerImp.h b/src/xrpld/overlay/detail/PeerImp.h
index d8d07a20d1..459b359ffb 100644
--- a/src/xrpld/overlay/detail/PeerImp.h
+++ b/src/xrpld/overlay/detail/PeerImp.h
@@ -26,6 +26,7 @@
 #include <xrpld/overlay/detail/OverlayImpl.h>
 #include <xrpld/overlay/detail/ProtocolVersion.h>
 #include <xrpld/peerfinder/PeerfinderManager.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/beast/utility/WrappedSink.h>
diff --git a/src/xrpld/overlay/detail/PeerReservationTable.cpp b/src/xrpld/overlay/detail/PeerReservationTable.cpp
index fda1ce8ee7..1a2842591c 100644
--- a/src/xrpld/overlay/detail/PeerReservationTable.cpp
+++ b/src/xrpld/overlay/detail/PeerReservationTable.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/rdb/RelationalDatabase.h>
 #include <xrpld/app/rdb/Wallet.h>
 #include <xrpld/overlay/PeerReservationTable.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/overlay/detail/ProtocolMessage.h b/src/xrpld/overlay/detail/ProtocolMessage.h
index 5e0b785c64..26c83055a3 100644
--- a/src/xrpld/overlay/detail/ProtocolMessage.h
+++ b/src/xrpld/overlay/detail/ProtocolMessage.h
@@ -23,6 +23,7 @@
 #include <xrpld/overlay/Compression.h>
 #include <xrpld/overlay/Message.h>
 #include <xrpld/overlay/detail/ZeroCopyStream.h>
+
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/protocol/messages.h>
 
diff --git a/src/xrpld/overlay/detail/ProtocolVersion.cpp b/src/xrpld/overlay/detail/ProtocolVersion.cpp
index a02aeb22df..9da1d6416e 100644
--- a/src/xrpld/overlay/detail/ProtocolVersion.cpp
+++ b/src/xrpld/overlay/detail/ProtocolVersion.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/overlay/detail/ProtocolVersion.h>
+
 #include <xrpl/beast/core/LexicalCast.h>
 #include <xrpl/beast/rfc2616.h>
 
diff --git a/src/xrpld/overlay/detail/TxMetrics.cpp b/src/xrpld/overlay/detail/TxMetrics.cpp
index 8759e0122e..bd493d7467 100644
--- a/src/xrpld/overlay/detail/TxMetrics.cpp
+++ b/src/xrpld/overlay/detail/TxMetrics.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/overlay/detail/TxMetrics.h>
+
 #include <xrpl/protocol/jss.h>
 
 #include <numeric>
diff --git a/src/xrpld/overlay/detail/TxMetrics.h b/src/xrpld/overlay/detail/TxMetrics.h
index eda7f1bb1b..7f369cdda8 100644
--- a/src/xrpld/overlay/detail/TxMetrics.h
+++ b/src/xrpld/overlay/detail/TxMetrics.h
@@ -138,4 +138,4 @@ struct TxMetrics
 
 }  // namespace ripple
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/xrpld/overlay/detail/ZeroCopyStream.h b/src/xrpld/overlay/detail/ZeroCopyStream.h
index f0e076daf8..41d94578b0 100644
--- a/src/xrpld/overlay/detail/ZeroCopyStream.h
+++ b/src/xrpld/overlay/detail/ZeroCopyStream.h
@@ -23,6 +23,7 @@
 #include <xrpl/beast/utility/instrumentation.h>
 
 #include <boost/asio/buffer.hpp>
+
 #include <google/protobuf/io/zero_copy_stream.h>
 
 namespace ripple {
diff --git a/src/xrpld/overlay/make_Overlay.h b/src/xrpld/overlay/make_Overlay.h
index fb501863b5..3476026562 100644
--- a/src/xrpld/overlay/make_Overlay.h
+++ b/src/xrpld/overlay/make_Overlay.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/overlay/Overlay.h>
 #include <xrpld/rpc/ServerHandler.h>
+
 #include <xrpl/basics/Resolver.h>
 
 #include <boost/asio/io_service.hpp>
diff --git a/src/xrpld/peerfinder/PeerfinderManager.h b/src/xrpld/peerfinder/PeerfinderManager.h
index c305ac69d8..a670fb8780 100644
--- a/src/xrpld/peerfinder/PeerfinderManager.h
+++ b/src/xrpld/peerfinder/PeerfinderManager.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/core/Config.h>
 #include <xrpld/peerfinder/Slot.h>
+
 #include <xrpl/beast/clock/abstract_clock.h>
 #include <xrpl/beast/utility/PropertyStream.h>
 
diff --git a/src/xrpld/peerfinder/detail/Bootcache.cpp b/src/xrpld/peerfinder/detail/Bootcache.cpp
index 1af5f0e1c9..9652d55802 100644
--- a/src/xrpld/peerfinder/detail/Bootcache.cpp
+++ b/src/xrpld/peerfinder/detail/Bootcache.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/peerfinder/detail/Bootcache.h>
 #include <xrpld/peerfinder/detail/Tuning.h>
 #include <xrpld/peerfinder/detail/iosformat.h>
+
 #include <xrpl/basics/Log.h>
 
 namespace ripple {
diff --git a/src/xrpld/peerfinder/detail/Bootcache.h b/src/xrpld/peerfinder/detail/Bootcache.h
index 2d1be373e0..4a5d95fd41 100644
--- a/src/xrpld/peerfinder/detail/Bootcache.h
+++ b/src/xrpld/peerfinder/detail/Bootcache.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/peerfinder/PeerfinderManager.h>
 #include <xrpld/peerfinder/detail/Store.h>
+
 #include <xrpl/basics/comparators.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/beast/utility/PropertyStream.h>
diff --git a/src/xrpld/peerfinder/detail/Counts.h b/src/xrpld/peerfinder/detail/Counts.h
index 6e9a250169..c91b27b026 100644
--- a/src/xrpld/peerfinder/detail/Counts.h
+++ b/src/xrpld/peerfinder/detail/Counts.h
@@ -23,6 +23,7 @@
 #include <xrpld/peerfinder/PeerfinderManager.h>
 #include <xrpld/peerfinder/Slot.h>
 #include <xrpld/peerfinder/detail/Tuning.h>
+
 #include <xrpl/basics/random.h>
 
 namespace ripple {
diff --git a/src/xrpld/peerfinder/detail/Handouts.h b/src/xrpld/peerfinder/detail/Handouts.h
index 5714add66f..4c30af4805 100644
--- a/src/xrpld/peerfinder/detail/Handouts.h
+++ b/src/xrpld/peerfinder/detail/Handouts.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/peerfinder/detail/SlotImp.h>
 #include <xrpld/peerfinder/detail/Tuning.h>
+
 #include <xrpl/beast/container/aged_set.h>
 #include <xrpl/beast/utility/instrumentation.h>
 
diff --git a/src/xrpld/peerfinder/detail/Livecache.h b/src/xrpld/peerfinder/detail/Livecache.h
index 547f6047ee..503ea0161a 100644
--- a/src/xrpld/peerfinder/detail/Livecache.h
+++ b/src/xrpld/peerfinder/detail/Livecache.h
@@ -23,6 +23,7 @@
 #include <xrpld/peerfinder/PeerfinderManager.h>
 #include <xrpld/peerfinder/detail/Tuning.h>
 #include <xrpld/peerfinder/detail/iosformat.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/container/aged_map.h>
diff --git a/src/xrpld/peerfinder/detail/Logic.h b/src/xrpld/peerfinder/detail/Logic.h
index 1467d9d469..b3922f63b3 100644
--- a/src/xrpld/peerfinder/detail/Logic.h
+++ b/src/xrpld/peerfinder/detail/Logic.h
@@ -30,6 +30,7 @@
 #include <xrpld/peerfinder/detail/Source.h>
 #include <xrpld/peerfinder/detail/Store.h>
 #include <xrpld/peerfinder/detail/iosformat.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/random.h>
diff --git a/src/xrpld/peerfinder/detail/SlotImp.h b/src/xrpld/peerfinder/detail/SlotImp.h
index df553f99f0..e5d8b1e6c5 100644
--- a/src/xrpld/peerfinder/detail/SlotImp.h
+++ b/src/xrpld/peerfinder/detail/SlotImp.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/peerfinder/PeerfinderManager.h>
 #include <xrpld/peerfinder/Slot.h>
+
 #include <xrpl/beast/container/aged_unordered_map.h>
 
 #include <atomic>
diff --git a/src/xrpld/perflog/PerfLog.h b/src/xrpld/perflog/PerfLog.h
index 95718d22f3..58df185e09 100644
--- a/src/xrpld/perflog/PerfLog.h
+++ b/src/xrpld/perflog/PerfLog.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/core/Config.h>
 #include <xrpld/core/JobTypes.h>
+
 #include <xrpl/json/json_value.h>
 
 #include <boost/filesystem.hpp>
diff --git a/src/xrpld/perflog/detail/PerfLogImp.cpp b/src/xrpld/perflog/detail/PerfLogImp.cpp
index afa986a1f0..a34faf885c 100644
--- a/src/xrpld/perflog/detail/PerfLogImp.cpp
+++ b/src/xrpld/perflog/detail/PerfLogImp.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/core/JobTypes.h>
 #include <xrpld/perflog/detail/PerfLogImp.h>
+
 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/beast/core/CurrentThreadName.h>
 #include <xrpl/beast/utility/Journal.h>
diff --git a/src/xrpld/perflog/detail/PerfLogImp.h b/src/xrpld/perflog/detail/PerfLogImp.h
index 2f1c45c748..d9354471f1 100644
--- a/src/xrpld/perflog/detail/PerfLogImp.h
+++ b/src/xrpld/perflog/detail/PerfLogImp.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/perflog/PerfLog.h>
 #include <xrpld/rpc/detail/Handler.h>
+
 #include <xrpl/beast/utility/Journal.h>
 
 #include <boost/asio/ip/host_name.hpp>
diff --git a/src/xrpld/rpc/Context.h b/src/xrpld/rpc/Context.h
index 2014bc657c..32a7cca653 100644
--- a/src/xrpld/rpc/Context.h
+++ b/src/xrpld/rpc/Context.h
@@ -23,6 +23,7 @@
 #include <xrpld/core/JobQueue.h>
 #include <xrpld/net/InfoSub.h>
 #include <xrpld/rpc/Role.h>
+
 #include <xrpl/beast/utility/Journal.h>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/GRPCHandlers.h b/src/xrpld/rpc/GRPCHandlers.h
index 21abff630e..29e3b1b9ca 100644
--- a/src/xrpld/rpc/GRPCHandlers.h
+++ b/src/xrpld/rpc/GRPCHandlers.h
@@ -21,6 +21,7 @@
 #define RIPPLE_RPC_GRPCHANDLER_H_INCLUDED
 
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.pb.h>
 
 #include <grpcpp/grpcpp.h>
diff --git a/src/xrpld/rpc/ServerHandler.h b/src/xrpld/rpc/ServerHandler.h
index 3382253886..5f72673313 100644
--- a/src/xrpld/rpc/ServerHandler.h
+++ b/src/xrpld/rpc/ServerHandler.h
@@ -24,6 +24,7 @@
 #include <xrpld/app/main/CollectorManager.h>
 #include <xrpld/core/JobQueue.h>
 #include <xrpld/rpc/detail/WSInfoSub.h>
+
 #include <xrpl/json/Output.h>
 #include <xrpl/server/Server.h>
 #include <xrpl/server/Session.h>
diff --git a/src/xrpld/rpc/detail/DeliveredAmount.cpp b/src/xrpld/rpc/detail/DeliveredAmount.cpp
index 14a4f62b3f..9a6d0e9dc8 100644
--- a/src/xrpld/rpc/detail/DeliveredAmount.cpp
+++ b/src/xrpld/rpc/detail/DeliveredAmount.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/app/misc/Transaction.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/DeliveredAmount.h>
+
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/RPCErr.h>
 
diff --git a/src/xrpld/rpc/detail/Handler.cpp b/src/xrpld/rpc/detail/Handler.cpp
index 7414a4b088..abdfa921bb 100644
--- a/src/xrpld/rpc/detail/Handler.cpp
+++ b/src/xrpld/rpc/detail/Handler.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/rpc/detail/RPCHelpers.h>
 #include <xrpld/rpc/handlers/Handlers.h>
 #include <xrpld/rpc/handlers/Version.h>
+
 #include <xrpl/basics/contract.h>
 
 #include <map>
diff --git a/src/xrpld/rpc/detail/RPCHandler.cpp b/src/xrpld/rpc/detail/RPCHandler.cpp
index ba79312502..c261666eb9 100644
--- a/src/xrpld/rpc/detail/RPCHandler.cpp
+++ b/src/xrpld/rpc/detail/RPCHandler.cpp
@@ -31,6 +31,7 @@
 #include <xrpld/rpc/Role.h>
 #include <xrpld/rpc/detail/Handler.h>
 #include <xrpld/rpc/detail/Tuning.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/json/to_string.h>
 #include <xrpl/protocol/ErrorCodes.h>
diff --git a/src/xrpld/rpc/detail/RPCHelpers.cpp b/src/xrpld/rpc/detail/RPCHelpers.cpp
index 75ac8fba63..3449a744d6 100644
--- a/src/xrpld/rpc/detail/RPCHelpers.cpp
+++ b/src/xrpld/rpc/detail/RPCHelpers.cpp
@@ -28,6 +28,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/DeliveredAmount.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/RPCErr.h>
 #include <xrpl/protocol/nftPageMask.h>
diff --git a/src/xrpld/rpc/detail/RPCHelpers.h b/src/xrpld/rpc/detail/RPCHelpers.h
index e4adeaa0d5..89af005292 100644
--- a/src/xrpld/rpc/detail/RPCHelpers.h
+++ b/src/xrpld/rpc/detail/RPCHelpers.h
@@ -25,6 +25,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/Status.h>
 #include <xrpld/rpc/detail/Tuning.h>
+
 #include <xrpl/beast/core/SemanticVersion.h>
 #include <xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.pb.h>
 #include <xrpl/protocol/ApiVersion.h>
diff --git a/src/xrpld/rpc/detail/ServerHandler.cpp b/src/xrpld/rpc/detail/ServerHandler.cpp
index 9980d2cfeb..a5aca59657 100644
--- a/src/xrpld/rpc/detail/ServerHandler.cpp
+++ b/src/xrpld/rpc/detail/ServerHandler.cpp
@@ -27,6 +27,7 @@
 #include <xrpld/rpc/detail/RPCHelpers.h>
 #include <xrpld/rpc/detail/Tuning.h>
 #include <xrpld/rpc/json_body.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/base64.h>
 #include <xrpl/basics/contract.h>
diff --git a/src/xrpld/rpc/detail/TransactionSign.cpp b/src/xrpld/rpc/detail/TransactionSign.cpp
index 30b8f8289d..2a7807f8ca 100644
--- a/src/xrpld/rpc/detail/TransactionSign.cpp
+++ b/src/xrpld/rpc/detail/TransactionSign.cpp
@@ -28,6 +28,7 @@
 #include <xrpld/rpc/detail/LegacyPathFind.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
 #include <xrpld/rpc/detail/TransactionSign.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/mulDiv.h>
 #include <xrpl/json/json_writer.h>
diff --git a/src/xrpld/rpc/detail/WSInfoSub.h b/src/xrpld/rpc/detail/WSInfoSub.h
index 01609e7339..1652617455 100644
--- a/src/xrpld/rpc/detail/WSInfoSub.h
+++ b/src/xrpld/rpc/detail/WSInfoSub.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/net/InfoSub.h>
 #include <xrpld/rpc/Role.h>
+
 #include <xrpl/beast/net/IPAddressConversion.h>
 #include <xrpl/json/json_writer.h>
 #include <xrpl/server/WSSession.h>
diff --git a/src/xrpld/rpc/handlers/AMMInfo.cpp b/src/xrpld/rpc/handlers/AMMInfo.cpp
index 29ee4327c0..b312264f90 100644
--- a/src/xrpld/rpc/handlers/AMMInfo.cpp
+++ b/src/xrpld/rpc/handlers/AMMInfo.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/AMMCore.h>
 #include <xrpl/protocol/Issue.h>
diff --git a/src/xrpld/rpc/handlers/AccountChannels.cpp b/src/xrpld/rpc/handlers/AccountChannels.cpp
index e56755c75a..5d810d61a0 100644
--- a/src/xrpld/rpc/handlers/AccountChannels.cpp
+++ b/src/xrpld/rpc/handlers/AccountChannels.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
 #include <xrpld/rpc/detail/Tuning.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/RPCErr.h>
diff --git a/src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp b/src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp
index bbb5ccc4b6..2d08561ec9 100644
--- a/src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp
+++ b/src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/rpc/handlers/AccountInfo.cpp b/src/xrpld/rpc/handlers/AccountInfo.cpp
index 21915d00cd..6416309e2e 100644
--- a/src/xrpld/rpc/handlers/AccountInfo.cpp
+++ b/src/xrpld/rpc/handlers/AccountInfo.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/GRPCHandlers.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/Indexes.h>
diff --git a/src/xrpld/rpc/handlers/AccountLines.cpp b/src/xrpld/rpc/handlers/AccountLines.cpp
index 0913be6d87..7afb00c8de 100644
--- a/src/xrpld/rpc/handlers/AccountLines.cpp
+++ b/src/xrpld/rpc/handlers/AccountLines.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
 #include <xrpld/rpc/detail/Tuning.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/rpc/handlers/AccountObjects.cpp b/src/xrpld/rpc/handlers/AccountObjects.cpp
index c56a420e9e..03ea427b12 100644
--- a/src/xrpld/rpc/handlers/AccountObjects.cpp
+++ b/src/xrpld/rpc/handlers/AccountObjects.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
 #include <xrpld/rpc/detail/Tuning.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/LedgerFormats.h>
diff --git a/src/xrpld/rpc/handlers/AccountOffers.cpp b/src/xrpld/rpc/handlers/AccountOffers.cpp
index b6f54f2950..bc575d2d86 100644
--- a/src/xrpld/rpc/handlers/AccountOffers.cpp
+++ b/src/xrpld/rpc/handlers/AccountOffers.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
 #include <xrpld/rpc/detail/Tuning.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
diff --git a/src/xrpld/rpc/handlers/AccountTx.cpp b/src/xrpld/rpc/handlers/AccountTx.cpp
index 5bc9c48439..26c8065edf 100644
--- a/src/xrpld/rpc/handlers/AccountTx.cpp
+++ b/src/xrpld/rpc/handlers/AccountTx.cpp
@@ -27,6 +27,7 @@
 #include <xrpld/rpc/DeliveredAmount.h>
 #include <xrpld/rpc/MPTokenIssuanceID.h>
 #include <xrpld/rpc/Role.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/NFTSyntheticSerializer.h>
diff --git a/src/xrpld/rpc/handlers/BlackList.cpp b/src/xrpld/rpc/handlers/BlackList.cpp
index 3e887ff730..ee8326a3d6 100644
--- a/src/xrpld/rpc/handlers/BlackList.cpp
+++ b/src/xrpld/rpc/handlers/BlackList.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/main/Application.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/protocol/jss.h>
 #include <xrpl/resource/ResourceManager.h>
 
diff --git a/src/xrpld/rpc/handlers/BookOffers.cpp b/src/xrpld/rpc/handlers/BookOffers.cpp
index dccc03de5b..bede01b927 100644
--- a/src/xrpld/rpc/handlers/BookOffers.cpp
+++ b/src/xrpld/rpc/handlers/BookOffers.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/rpc/BookChanges.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
diff --git a/src/xrpld/rpc/handlers/CanDelete.cpp b/src/xrpld/rpc/handlers/CanDelete.cpp
index db29e215dd..b7056e7439 100644
--- a/src/xrpld/rpc/handlers/CanDelete.cpp
+++ b/src/xrpld/rpc/handlers/CanDelete.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/SHAMapStore.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/beast/core/LexicalCast.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/rpc/handlers/Connect.cpp b/src/xrpld/rpc/handlers/Connect.cpp
index eb4f67e76f..81a85fd5ae 100644
--- a/src/xrpld/rpc/handlers/Connect.cpp
+++ b/src/xrpld/rpc/handlers/Connect.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/overlay/Overlay.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/Handler.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
 #include <xrpl/protocol/SystemParameters.h>
diff --git a/src/xrpld/rpc/handlers/ConsensusInfo.cpp b/src/xrpld/rpc/handlers/ConsensusInfo.cpp
index 0ac4422d23..113a2f2815 100644
--- a/src/xrpld/rpc/handlers/ConsensusInfo.cpp
+++ b/src/xrpld/rpc/handlers/ConsensusInfo.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/rpc/handlers/DepositAuthorized.cpp b/src/xrpld/rpc/handlers/DepositAuthorized.cpp
index 50aa9ef289..1bb480544d 100644
--- a/src/xrpld/rpc/handlers/DepositAuthorized.cpp
+++ b/src/xrpld/rpc/handlers/DepositAuthorized.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/RPCErr.h>
diff --git a/src/xrpld/rpc/handlers/Feature1.cpp b/src/xrpld/rpc/handlers/Feature1.cpp
index 615e459df6..b2c8098ad1 100644
--- a/src/xrpld/rpc/handlers/Feature1.cpp
+++ b/src/xrpld/rpc/handlers/Feature1.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/AmendmentTable.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/rpc/handlers/Fee1.cpp b/src/xrpld/rpc/handlers/Fee1.cpp
index c2273f6a29..6d15a4d95f 100644
--- a/src/xrpld/rpc/handlers/Fee1.cpp
+++ b/src/xrpld/rpc/handlers/Fee1.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/app/misc/TxQ.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/GRPCHandlers.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/handlers/FetchInfo.cpp b/src/xrpld/rpc/handlers/FetchInfo.cpp
index 2e47f5eb5d..1e0fa82480 100644
--- a/src/xrpld/rpc/handlers/FetchInfo.cpp
+++ b/src/xrpld/rpc/handlers/FetchInfo.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/rpc/handlers/GatewayBalances.cpp b/src/xrpld/rpc/handlers/GatewayBalances.cpp
index b5fa73017a..e8b95bd75c 100644
--- a/src/xrpld/rpc/handlers/GatewayBalances.cpp
+++ b/src/xrpld/rpc/handlers/GatewayBalances.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
diff --git a/src/xrpld/rpc/handlers/GetAggregatePrice.cpp b/src/xrpld/rpc/handlers/GetAggregatePrice.cpp
index 7467b94b63..8001071f85 100644
--- a/src/xrpld/rpc/handlers/GetAggregatePrice.cpp
+++ b/src/xrpld/rpc/handlers/GetAggregatePrice.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/rpc/handlers/GetCounts.cpp b/src/xrpld/rpc/handlers/GetCounts.cpp
index 1a988a8056..9f57f08a24 100644
--- a/src/xrpld/rpc/handlers/GetCounts.cpp
+++ b/src/xrpld/rpc/handlers/GetCounts.cpp
@@ -25,6 +25,7 @@
 #include <xrpld/app/rdb/backend/SQLiteDatabase.h>
 #include <xrpld/nodestore/Database.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/basics/UptimeClock.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
diff --git a/src/xrpld/rpc/handlers/GetCounts.h b/src/xrpld/rpc/handlers/GetCounts.h
index dacf93fa91..57b43e44bd 100644
--- a/src/xrpld/rpc/handlers/GetCounts.h
+++ b/src/xrpld/rpc/handlers/GetCounts.h
@@ -21,6 +21,7 @@
 #define RIPPLE_RPC_HANDLERS_GETCOUNTS_H_INCLUDED
 
 #include <xrpld/app/main/Application.h>
+
 #include <xrpl/json/Object.h>
 
 namespace ripple {
@@ -30,4 +31,4 @@ getCountsJson(Application& app, int minObjectCount);
 
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/xrpld/rpc/handlers/LedgerAccept.cpp b/src/xrpld/rpc/handlers/LedgerAccept.cpp
index d0a4c2f36e..8784513363 100644
--- a/src/xrpld/rpc/handlers/LedgerAccept.cpp
+++ b/src/xrpld/rpc/handlers/LedgerAccept.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/core/Config.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp b/src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp
index 48f024c051..943065e522 100644
--- a/src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp
+++ b/src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/Handler.h>
+
 #include <xrpl/json/json_value.h>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/handlers/LedgerClosed.cpp b/src/xrpld/rpc/handlers/LedgerClosed.cpp
index b5644d9910..9a18870046 100644
--- a/src/xrpld/rpc/handlers/LedgerClosed.cpp
+++ b/src/xrpld/rpc/handlers/LedgerClosed.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/xrpld/rpc/handlers/LedgerCurrent.cpp b/src/xrpld/rpc/handlers/LedgerCurrent.cpp
index aafddb04ba..8927e44953 100644
--- a/src/xrpld/rpc/handlers/LedgerCurrent.cpp
+++ b/src/xrpld/rpc/handlers/LedgerCurrent.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/xrpld/rpc/handlers/LedgerData.cpp b/src/xrpld/rpc/handlers/LedgerData.cpp
index ad26b83b43..31baede65e 100644
--- a/src/xrpld/rpc/handlers/LedgerData.cpp
+++ b/src/xrpld/rpc/handlers/LedgerData.cpp
@@ -24,6 +24,7 @@
 #include <xrpld/rpc/Role.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
 #include <xrpld/rpc/detail/Tuning.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/rpc/handlers/LedgerEntry.cpp b/src/xrpld/rpc/handlers/LedgerEntry.cpp
index 90e9a1cef1..9839a08367 100644
--- a/src/xrpld/rpc/handlers/LedgerEntry.cpp
+++ b/src/xrpld/rpc/handlers/LedgerEntry.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/GRPCHandlers.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/basics/strHex.h>
 #include <xrpl/beast/core/LexicalCast.h>
diff --git a/src/xrpld/rpc/handlers/LedgerHandler.cpp b/src/xrpld/rpc/handlers/LedgerHandler.cpp
index 29602be4aa..4015bb9fcc 100644
--- a/src/xrpld/rpc/handlers/LedgerHandler.cpp
+++ b/src/xrpld/rpc/handlers/LedgerHandler.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/rpc/GRPCHandlers.h>
 #include <xrpld/rpc/Role.h>
 #include <xrpld/rpc/handlers/LedgerHandler.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/resource/Fees.h>
diff --git a/src/xrpld/rpc/handlers/LedgerHandler.h b/src/xrpld/rpc/handlers/LedgerHandler.h
index 0a1ba2b427..0e47164ad3 100644
--- a/src/xrpld/rpc/handlers/LedgerHandler.h
+++ b/src/xrpld/rpc/handlers/LedgerHandler.h
@@ -29,6 +29,7 @@
 #include <xrpld/rpc/Status.h>
 #include <xrpld/rpc/detail/Handler.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/json/Object.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/xrpld/rpc/handlers/LedgerHeader.cpp b/src/xrpld/rpc/handlers/LedgerHeader.cpp
index b73ee260d4..1815c8db56 100644
--- a/src/xrpld/rpc/handlers/LedgerHeader.cpp
+++ b/src/xrpld/rpc/handlers/LedgerHeader.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/ledger/LedgerToJson.h>
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/basics/strHex.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/xrpld/rpc/handlers/LedgerRequest.cpp b/src/xrpld/rpc/handlers/LedgerRequest.cpp
index 4630dde459..fed89daaf2 100644
--- a/src/xrpld/rpc/handlers/LedgerRequest.cpp
+++ b/src/xrpld/rpc/handlers/LedgerRequest.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/ledger/LedgerToJson.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/xrpld/rpc/handlers/LogLevel.cpp b/src/xrpld/rpc/handlers/LogLevel.cpp
index 6f5dec9649..0fc266569e 100644
--- a/src/xrpld/rpc/handlers/LogLevel.cpp
+++ b/src/xrpld/rpc/handlers/LogLevel.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/main/Application.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
diff --git a/src/xrpld/rpc/handlers/LogRotate.cpp b/src/xrpld/rpc/handlers/LogRotate.cpp
index b7a887b0e2..959c77d718 100644
--- a/src/xrpld/rpc/handlers/LogRotate.cpp
+++ b/src/xrpld/rpc/handlers/LogRotate.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/perflog/PerfLog.h>
 #include <xrpld/rpc/detail/Handler.h>
+
 #include <xrpl/basics/Log.h>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/handlers/Manifest.cpp b/src/xrpld/rpc/handlers/Manifest.cpp
index f139cc75df..4d783c1d3b 100644
--- a/src/xrpld/rpc/handlers/Manifest.cpp
+++ b/src/xrpld/rpc/handlers/Manifest.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/main/Application.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/basics/base64.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
diff --git a/src/xrpld/rpc/handlers/NFTOffers.cpp b/src/xrpld/rpc/handlers/NFTOffers.cpp
index 9e1effc445..52a5c69ab0 100644
--- a/src/xrpld/rpc/handlers/NFTOffers.cpp
+++ b/src/xrpld/rpc/handlers/NFTOffers.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
 #include <xrpld/rpc/detail/Tuning.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
diff --git a/src/xrpld/rpc/handlers/NoRippleCheck.cpp b/src/xrpld/rpc/handlers/NoRippleCheck.cpp
index 94830a4f39..a6007e9eab 100644
--- a/src/xrpld/rpc/handlers/NoRippleCheck.cpp
+++ b/src/xrpld/rpc/handlers/NoRippleCheck.cpp
@@ -24,6 +24,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
 #include <xrpld/rpc/detail/Tuning.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
 #include <xrpl/protocol/TxFlags.h>
diff --git a/src/xrpld/rpc/handlers/OwnerInfo.cpp b/src/xrpld/rpc/handlers/OwnerInfo.cpp
index 45fb27e140..36c14cecaf 100644
--- a/src/xrpld/rpc/handlers/OwnerInfo.cpp
+++ b/src/xrpld/rpc/handlers/OwnerInfo.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
diff --git a/src/xrpld/rpc/handlers/PathFind.cpp b/src/xrpld/rpc/handlers/PathFind.cpp
index 498c263208..29304227c2 100644
--- a/src/xrpld/rpc/handlers/PathFind.cpp
+++ b/src/xrpld/rpc/handlers/PathFind.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/paths/PathRequests.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/rpc/handlers/PayChanClaim.cpp b/src/xrpld/rpc/handlers/PayChanClaim.cpp
index 5f899ec6d7..aaa559895c 100644
--- a/src/xrpld/rpc/handlers/PayChanClaim.cpp
+++ b/src/xrpld/rpc/handlers/PayChanClaim.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/PayChan.h>
diff --git a/src/xrpld/rpc/handlers/Peers.cpp b/src/xrpld/rpc/handlers/Peers.cpp
index 5fa976d422..33f3af27e6 100644
--- a/src/xrpld/rpc/handlers/Peers.cpp
+++ b/src/xrpld/rpc/handlers/Peers.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/overlay/Cluster.h>
 #include <xrpld/overlay/Overlay.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/xrpld/rpc/handlers/Ping.cpp b/src/xrpld/rpc/handlers/Ping.cpp
index cb0dabcb9d..e96ff19054 100644
--- a/src/xrpld/rpc/handlers/Ping.cpp
+++ b/src/xrpld/rpc/handlers/Ping.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/Role.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/xrpld/rpc/handlers/Print.cpp b/src/xrpld/rpc/handlers/Print.cpp
index df50124088..d9a7f3484e 100644
--- a/src/xrpld/rpc/handlers/Print.cpp
+++ b/src/xrpld/rpc/handlers/Print.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/main/Application.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/json/JsonPropertyStream.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/rpc/handlers/Reservations.cpp b/src/xrpld/rpc/handlers/Reservations.cpp
index 1ff2d506af..b19b948469 100644
--- a/src/xrpld/rpc/handlers/Reservations.cpp
+++ b/src/xrpld/rpc/handlers/Reservations.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/handlers/Handlers.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/PublicKey.h>
diff --git a/src/xrpld/rpc/handlers/RipplePathFind.cpp b/src/xrpld/rpc/handlers/RipplePathFind.cpp
index 80c336004b..abe1b3b9bb 100644
--- a/src/xrpld/rpc/handlers/RipplePathFind.cpp
+++ b/src/xrpld/rpc/handlers/RipplePathFind.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/LegacyPathFind.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/protocol/RPCErr.h>
 #include <xrpl/resource/Fees.h>
 
diff --git a/src/xrpld/rpc/handlers/ServerInfo.cpp b/src/xrpld/rpc/handlers/ServerInfo.cpp
index 3fdc1a6d0b..b303402e2d 100644
--- a/src/xrpld/rpc/handlers/ServerInfo.cpp
+++ b/src/xrpld/rpc/handlers/ServerInfo.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/Role.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/json/json_writer.h>
 #include <xrpl/protocol/LedgerFormats.h>
diff --git a/src/xrpld/rpc/handlers/ServerState.cpp b/src/xrpld/rpc/handlers/ServerState.cpp
index 9136e1b217..dbe80c6599 100644
--- a/src/xrpld/rpc/handlers/ServerState.cpp
+++ b/src/xrpld/rpc/handlers/ServerState.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/misc/NetworkOPs.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/Role.h>
+
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/xrpld/rpc/handlers/SignFor.cpp b/src/xrpld/rpc/handlers/SignFor.cpp
index 40923406d1..5a26450dbe 100644
--- a/src/xrpld/rpc/handlers/SignFor.cpp
+++ b/src/xrpld/rpc/handlers/SignFor.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/TransactionSign.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/resource/Fees.h>
 
diff --git a/src/xrpld/rpc/handlers/SignHandler.cpp b/src/xrpld/rpc/handlers/SignHandler.cpp
index 2547ef8ead..f6b068ddd3 100644
--- a/src/xrpld/rpc/handlers/SignHandler.cpp
+++ b/src/xrpld/rpc/handlers/SignHandler.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/TransactionSign.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/resource/Fees.h>
 
diff --git a/src/xrpld/rpc/handlers/Simulate.cpp b/src/xrpld/rpc/handlers/Simulate.cpp
index 8b795cffaa..3c7340ece3 100644
--- a/src/xrpld/rpc/handlers/Simulate.cpp
+++ b/src/xrpld/rpc/handlers/Simulate.cpp
@@ -26,6 +26,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/GRPCHandlers.h>
 #include <xrpld/rpc/detail/TransactionSign.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
 #include <xrpl/protocol/STParsedJSON.h>
diff --git a/src/xrpld/rpc/handlers/Stop.cpp b/src/xrpld/rpc/handlers/Stop.cpp
index ea0c25a33f..03e73fb6b7 100644
--- a/src/xrpld/rpc/handlers/Stop.cpp
+++ b/src/xrpld/rpc/handlers/Stop.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/app/main/Application.h>
 #include <xrpld/rpc/detail/Handler.h>
+
 #include <xrpl/json/json_value.h>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/handlers/Submit.cpp b/src/xrpld/rpc/handlers/Submit.cpp
index 75e648855e..b0ea437cf1 100644
--- a/src/xrpld/rpc/handlers/Submit.cpp
+++ b/src/xrpld/rpc/handlers/Submit.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/app/tx/apply.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/TransactionSign.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
 #include <xrpl/resource/Fees.h>
diff --git a/src/xrpld/rpc/handlers/SubmitMultiSigned.cpp b/src/xrpld/rpc/handlers/SubmitMultiSigned.cpp
index 50a36cc5c4..48ac8245e8 100644
--- a/src/xrpld/rpc/handlers/SubmitMultiSigned.cpp
+++ b/src/xrpld/rpc/handlers/SubmitMultiSigned.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/TransactionSign.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/resource/Fees.h>
 
diff --git a/src/xrpld/rpc/handlers/Subscribe.cpp b/src/xrpld/rpc/handlers/Subscribe.cpp
index 66fe89dea0..35b82edb3f 100644
--- a/src/xrpld/rpc/handlers/Subscribe.cpp
+++ b/src/xrpld/rpc/handlers/Subscribe.cpp
@@ -25,6 +25,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/Role.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
diff --git a/src/xrpld/rpc/handlers/TransactionEntry.cpp b/src/xrpld/rpc/handlers/TransactionEntry.cpp
index 7f98fdab34..c94e95063b 100644
--- a/src/xrpld/rpc/handlers/TransactionEntry.cpp
+++ b/src/xrpld/rpc/handlers/TransactionEntry.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/ledger/ReadView.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/handlers/Tx.cpp b/src/xrpld/rpc/handlers/Tx.cpp
index 043ace43ae..c3b3305af7 100644
--- a/src/xrpld/rpc/handlers/Tx.cpp
+++ b/src/xrpld/rpc/handlers/Tx.cpp
@@ -29,6 +29,7 @@
 #include <xrpld/rpc/GRPCHandlers.h>
 #include <xrpld/rpc/MPTokenIssuanceID.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/basics/ToString.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/NFTSyntheticSerializer.h>
diff --git a/src/xrpld/rpc/handlers/TxHistory.cpp b/src/xrpld/rpc/handlers/TxHistory.cpp
index 960b785809..786f7c6398 100644
--- a/src/xrpld/rpc/handlers/TxHistory.cpp
+++ b/src/xrpld/rpc/handlers/TxHistory.cpp
@@ -24,6 +24,7 @@
 #include <xrpld/app/rdb/RelationalDatabase.h>
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/Role.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
 #include <xrpl/protocol/jss.h>
diff --git a/src/xrpld/rpc/handlers/TxReduceRelay.cpp b/src/xrpld/rpc/handlers/TxReduceRelay.cpp
index d8c21b3fa4..665e78f4de 100644
--- a/src/xrpld/rpc/handlers/TxReduceRelay.cpp
+++ b/src/xrpld/rpc/handlers/TxReduceRelay.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/overlay/Overlay.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/json/json_value.h>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/handlers/UnlList.cpp b/src/xrpld/rpc/handlers/UnlList.cpp
index 60a80da7b8..4edb86b7b3 100644
--- a/src/xrpld/rpc/handlers/UnlList.cpp
+++ b/src/xrpld/rpc/handlers/UnlList.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/ValidatorList.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
 
diff --git a/src/xrpld/rpc/handlers/Unsubscribe.cpp b/src/xrpld/rpc/handlers/Unsubscribe.cpp
index bab0d99744..c890de593a 100644
--- a/src/xrpld/rpc/handlers/Unsubscribe.cpp
+++ b/src/xrpld/rpc/handlers/Unsubscribe.cpp
@@ -21,6 +21,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/Role.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
diff --git a/src/xrpld/rpc/handlers/ValidationCreate.cpp b/src/xrpld/rpc/handlers/ValidationCreate.cpp
index ebfa382951..6690e7f284 100644
--- a/src/xrpld/rpc/handlers/ValidationCreate.cpp
+++ b/src/xrpld/rpc/handlers/ValidationCreate.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
 #include <xrpl/protocol/Seed.h>
diff --git a/src/xrpld/rpc/handlers/ValidatorInfo.cpp b/src/xrpld/rpc/handlers/ValidatorInfo.cpp
index d1a6337198..638aeb7842 100644
--- a/src/xrpld/rpc/handlers/ValidatorInfo.cpp
+++ b/src/xrpld/rpc/handlers/ValidatorInfo.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/ValidatorKeys.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/basics/base64.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
diff --git a/src/xrpld/rpc/handlers/ValidatorListSites.cpp b/src/xrpld/rpc/handlers/ValidatorListSites.cpp
index e5fe9d5148..fc24107233 100644
--- a/src/xrpld/rpc/handlers/ValidatorListSites.cpp
+++ b/src/xrpld/rpc/handlers/ValidatorListSites.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/ValidatorSite.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/handlers/Validators.cpp b/src/xrpld/rpc/handlers/Validators.cpp
index 4cf696a92d..4d8318d194 100644
--- a/src/xrpld/rpc/handlers/Validators.cpp
+++ b/src/xrpld/rpc/handlers/Validators.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/ValidatorList.h>
 #include <xrpld/rpc/Context.h>
+
 #include <xrpl/protocol/ErrorCodes.h>
 
 namespace ripple {
diff --git a/src/xrpld/rpc/handlers/WalletPropose.cpp b/src/xrpld/rpc/handlers/WalletPropose.cpp
index 63d0196bf8..2c9cadcbba 100644
--- a/src/xrpld/rpc/handlers/WalletPropose.cpp
+++ b/src/xrpld/rpc/handlers/WalletPropose.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/rpc/Context.h>
 #include <xrpld/rpc/detail/RPCHelpers.h>
 #include <xrpld/rpc/handlers/WalletPropose.h>
+
 #include <xrpl/basics/strHex.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/KeyType.h>
diff --git a/src/xrpld/shamap/Family.h b/src/xrpld/shamap/Family.h
index f0781afab8..eb04df05e4 100644
--- a/src/xrpld/shamap/Family.h
+++ b/src/xrpld/shamap/Family.h
@@ -23,6 +23,7 @@
 #include <xrpld/nodestore/Database.h>
 #include <xrpld/shamap/FullBelowCache.h>
 #include <xrpld/shamap/TreeNodeCache.h>
+
 #include <xrpl/beast/utility/Journal.h>
 
 #include <cstdint>
diff --git a/src/xrpld/shamap/SHAMap.h b/src/xrpld/shamap/SHAMap.h
index 5acb83318b..e63245b51c 100644
--- a/src/xrpld/shamap/SHAMap.h
+++ b/src/xrpld/shamap/SHAMap.h
@@ -29,6 +29,7 @@
 #include <xrpld/shamap/SHAMapLeafNode.h>
 #include <xrpld/shamap/SHAMapMissingNode.h>
 #include <xrpld/shamap/SHAMapTreeNode.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/beast/utility/instrumentation.h>
 
diff --git a/src/xrpld/shamap/SHAMapAccountStateLeafNode.h b/src/xrpld/shamap/SHAMapAccountStateLeafNode.h
index 7a75c990c3..1069c363ec 100644
--- a/src/xrpld/shamap/SHAMapAccountStateLeafNode.h
+++ b/src/xrpld/shamap/SHAMapAccountStateLeafNode.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/shamap/SHAMapItem.h>
 #include <xrpld/shamap/SHAMapLeafNode.h>
+
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/digest.h>
diff --git a/src/xrpld/shamap/SHAMapMissingNode.h b/src/xrpld/shamap/SHAMapMissingNode.h
index 1afe51c2d4..73ffe0090a 100644
--- a/src/xrpld/shamap/SHAMapMissingNode.h
+++ b/src/xrpld/shamap/SHAMapMissingNode.h
@@ -21,6 +21,7 @@
 #define RIPPLE_SHAMAP_SHAMAPMISSINGNODE_H_INCLUDED
 
 #include <xrpld/shamap/SHAMapTreeNode.h>
+
 #include <xrpl/basics/base_uint.h>
 
 #include <iosfwd>
diff --git a/src/xrpld/shamap/SHAMapTreeNode.h b/src/xrpld/shamap/SHAMapTreeNode.h
index 62c8c9e4de..6f209d13d7 100644
--- a/src/xrpld/shamap/SHAMapTreeNode.h
+++ b/src/xrpld/shamap/SHAMapTreeNode.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/shamap/SHAMapItem.h>
 #include <xrpld/shamap/SHAMapNodeID.h>
+
 #include <xrpl/basics/SHAMapHash.h>
 #include <xrpl/protocol/Serializer.h>
 
diff --git a/src/xrpld/shamap/SHAMapTxLeafNode.h b/src/xrpld/shamap/SHAMapTxLeafNode.h
index 29be8de137..7444e61813 100644
--- a/src/xrpld/shamap/SHAMapTxLeafNode.h
+++ b/src/xrpld/shamap/SHAMapTxLeafNode.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/shamap/SHAMapItem.h>
 #include <xrpld/shamap/SHAMapLeafNode.h>
+
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/digest.h>
diff --git a/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h b/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h
index a44b4c5f82..78cc919b4e 100644
--- a/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h
+++ b/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h
@@ -22,6 +22,7 @@
 
 #include <xrpld/shamap/SHAMapItem.h>
 #include <xrpld/shamap/SHAMapLeafNode.h>
+
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/digest.h>
diff --git a/src/xrpld/shamap/TreeNodeCache.h b/src/xrpld/shamap/TreeNodeCache.h
index 4fe18dc92f..3eead799a3 100644
--- a/src/xrpld/shamap/TreeNodeCache.h
+++ b/src/xrpld/shamap/TreeNodeCache.h
@@ -21,6 +21,7 @@
 #define RIPPLE_SHAMAP_TREENODECACHE_H_INCLUDED
 
 #include <xrpld/shamap/SHAMapTreeNode.h>
+
 #include <xrpl/basics/TaggedCache.h>
 
 namespace ripple {
diff --git a/src/xrpld/shamap/detail/SHAMap.cpp b/src/xrpld/shamap/detail/SHAMap.cpp
index 09a546be14..7c3fadbec9 100644
--- a/src/xrpld/shamap/detail/SHAMap.cpp
+++ b/src/xrpld/shamap/detail/SHAMap.cpp
@@ -23,6 +23,7 @@
 #include <xrpld/shamap/SHAMapSyncFilter.h>
 #include <xrpld/shamap/SHAMapTxLeafNode.h>
 #include <xrpld/shamap/SHAMapTxPlusMetaLeafNode.h>
+
 #include <xrpl/basics/contract.h>
 
 namespace ripple {
diff --git a/src/xrpld/shamap/detail/SHAMapDelta.cpp b/src/xrpld/shamap/detail/SHAMapDelta.cpp
index baabd4ef13..a6c54b6f22 100644
--- a/src/xrpld/shamap/detail/SHAMapDelta.cpp
+++ b/src/xrpld/shamap/detail/SHAMapDelta.cpp
@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <xrpld/shamap/SHAMap.h>
+
 #include <xrpl/basics/contract.h>
 
 #include <array>
diff --git a/src/xrpld/shamap/detail/SHAMapInnerNode.cpp b/src/xrpld/shamap/detail/SHAMapInnerNode.cpp
index 44c2eaed90..7d3c3c8fb2 100644
--- a/src/xrpld/shamap/detail/SHAMapInnerNode.cpp
+++ b/src/xrpld/shamap/detail/SHAMapInnerNode.cpp
@@ -20,6 +20,7 @@
 #include <xrpld/shamap/SHAMapInnerNode.h>
 #include <xrpld/shamap/SHAMapTreeNode.h>
 #include <xrpld/shamap/detail/TaggedPointer.ipp>
+
 #include <xrpl/basics/Slice.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/spinlock.h>
diff --git a/src/xrpld/shamap/detail/SHAMapNodeID.cpp b/src/xrpld/shamap/detail/SHAMapNodeID.cpp
index c6c4cbea5e..efe4f95936 100644
--- a/src/xrpld/shamap/detail/SHAMapNodeID.cpp
+++ b/src/xrpld/shamap/detail/SHAMapNodeID.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/shamap/SHAMap.h>
 #include <xrpld/shamap/SHAMapNodeID.h>
+
 #include <xrpl/beast/core/LexicalCast.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/protocol/Serializer.h>
diff --git a/src/xrpld/shamap/detail/SHAMapSync.cpp b/src/xrpld/shamap/detail/SHAMapSync.cpp
index 4f93825751..092b1efc5a 100644
--- a/src/xrpld/shamap/detail/SHAMapSync.cpp
+++ b/src/xrpld/shamap/detail/SHAMapSync.cpp
@@ -19,6 +19,7 @@
 
 #include <xrpld/shamap/SHAMap.h>
 #include <xrpld/shamap/SHAMapSyncFilter.h>
+
 #include <xrpl/basics/random.h>
 
 namespace ripple {
diff --git a/src/xrpld/shamap/detail/SHAMapTreeNode.cpp b/src/xrpld/shamap/detail/SHAMapTreeNode.cpp
index 392db74c0f..c50683213c 100644
--- a/src/xrpld/shamap/detail/SHAMapTreeNode.cpp
+++ b/src/xrpld/shamap/detail/SHAMapTreeNode.cpp
@@ -22,6 +22,7 @@
 #include <xrpld/shamap/SHAMapTreeNode.h>
 #include <xrpld/shamap/SHAMapTxLeafNode.h>
 #include <xrpld/shamap/SHAMapTxPlusMetaLeafNode.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/Slice.h>
 #include <xrpl/basics/contract.h>
diff --git a/src/xrpld/shamap/detail/TaggedPointer.ipp b/src/xrpld/shamap/detail/TaggedPointer.ipp
index 1a59f2fa43..bed821b5c9 100644
--- a/src/xrpld/shamap/detail/TaggedPointer.ipp
+++ b/src/xrpld/shamap/detail/TaggedPointer.ipp
@@ -19,6 +19,7 @@
 
 #include <xrpld/shamap/SHAMapInnerNode.h>
 #include <xrpld/shamap/detail/TaggedPointer.h>
+
 #include <xrpl/basics/ByteUtilities.h>
 
 #include <boost/pool/pool_alloc.hpp>