diff --git a/include/xrpl/ledger/helpers/AccountRootHelpers.h b/include/xrpl/ledger/helpers/AccountRootHelpers.h
index 26f5e0d918..bfc43f2b31 100644
--- a/include/xrpl/ledger/helpers/AccountRootHelpers.h
+++ b/include/xrpl/ledger/helpers/AccountRootHelpers.h
@@ -51,7 +51,7 @@ adjustOwnerCount(
     std::int32_t amount,
     beast::Journal j)
 {
-    return adjustOwnerCount(
+    adjustOwnerCount(
         view,
         view.peek(keylet::account(account)),
         sponsor ? view.peek(keylet::account(*sponsor)) : std::shared_ptr<SLE>(),
diff --git a/include/xrpl/ledger/helpers/SponsorHelpers.h b/include/xrpl/ledger/helpers/SponsorHelpers.h
index 3b9ae39a57..74cbbd069c 100644
--- a/include/xrpl/ledger/helpers/SponsorHelpers.h
+++ b/include/xrpl/ledger/helpers/SponsorHelpers.h
@@ -13,7 +13,7 @@ namespace xrpl {
 inline bool
 isReserveSponsored(STTx const& tx)
 {
-    return tx.getFieldU32(sfSponsorFlags) & spfSponsorReserve;
+    return (tx.getFieldU32(sfSponsorFlags) & spfSponsorReserve) != 0u;
 }
 
 inline bool
diff --git a/include/xrpl/tx/invariants/SponsorshipInvariant.h b/include/xrpl/tx/invariants/SponsorshipInvariant.h
index 15088eda00..fbe3cd2aaa 100644
--- a/include/xrpl/tx/invariants/SponsorshipInvariant.h
+++ b/include/xrpl/tx/invariants/SponsorshipInvariant.h
@@ -29,7 +29,7 @@ public:
     visitEntry(bool, std::shared_ptr<SLE const> const&, std::shared_ptr<SLE const> const&);
 
     bool
-    finalize(STTx const&, TER const, XRPAmount const, ReadView const&, beast::Journal const&);
+    finalize(STTx const&, TER const, XRPAmount const, ReadView const&, beast::Journal const&) const;
 };
 
 /**
@@ -50,7 +50,7 @@ public:
     visitEntry(bool, std::shared_ptr<SLE const> const&, std::shared_ptr<SLE const> const&);
 
     bool
-    finalize(STTx const&, TER const, XRPAmount const, ReadView const&, beast::Journal const&);
+    finalize(STTx const&, TER const, XRPAmount const, ReadView const&, beast::Journal const&) const;
 };
 
 }  // namespace xrpl
diff --git a/src/libxrpl/ledger/View.cpp b/src/libxrpl/ledger/View.cpp
index 88bd68a498..cdd781c072 100644
--- a/src/libxrpl/ledger/View.cpp
+++ b/src/libxrpl/ledger/View.cpp
@@ -30,6 +30,7 @@
 #include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
+#include <xrpl/protocol/Fees.h>
 
 #include <cstdint>
 #include <memory>
@@ -339,9 +340,10 @@ checkInsufficientReserve(
         auto const sle = view.read(
             keylet::sponsor(sponsorSle->getAccountID(sfAccount), accSle->getAccountID(sfAccount)));
 
-        if (!isCoSigning && !sle)
+        if (!isCoSigning && !sle) {
             // prefunded sponsor should have a sponsorship entry
             return tecINTERNAL;  // LCOV_EXCL_LINE
+}
 
         if (sle)
         {
diff --git a/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp b/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
index 0d916255e7..3de6f98f7f 100644
--- a/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
@@ -146,10 +146,11 @@ adjustSponsorOwnerCountHlp(
     std::uint32_t const current{(sle)->getFieldU32(sfield)};
     std::uint32_t const adjusted = confineOwnerCount(current, amount, accID, j);
     view.adjustOwnerCountHook(accID, current, adjusted);
-    if (adjusted == 0)
+    if (adjusted == 0) {
         sle->makeFieldAbsent(sfield);
-    else
+    } else {
         sle->setFieldU32(sfield, adjusted);
+}
     view.update(sle);
 }
 
@@ -185,10 +186,11 @@ adjustOwnerCount(
             // payback (+)
             std::uint32_t const adjusted =
                 confineOwnerCount(currentReserveCount, -amount, sponsorAccountID, j);
-            if (adjusted == 0)
+            if (adjusted == 0) {
                 sponsorObjSle->makeFieldAbsent(sfReserveCount);
-            else
+            } else {
                 sponsorObjSle->setFieldU32(sfReserveCount, adjusted);
+}
             view.update(sponsorObjSle);
         }
     }
diff --git a/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp b/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp
index a2a1b48eed..3920db6dda 100644
--- a/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp
@@ -3,7 +3,6 @@
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/beast/utility/Journal.h>
-#include <xrpl/beast/utility/Zero.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
@@ -29,6 +28,7 @@
 #include <xrpl/protocol/TxFormats.h>
 #include <xrpl/protocol/UintTypes.h>
 #include <xrpl/protocol/XRPAmount.h>
+#include <xrpl/protocol/STTx.h>
 
 #include <cstdint>
 #include <initializer_list>
diff --git a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
index 8635a94d9b..cce41ccda2 100644
--- a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
@@ -28,6 +28,9 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/protocol/nft.h>
 #include <xrpl/protocol/nftPageMask.h>
+#include <xrpl/basics/Expected.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/protocol/STTx.h>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
index 826224af94..3061a7f0ff 100644
--- a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
@@ -25,6 +25,8 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/UintTypes.h>
 #include <xrpl/protocol/XRPAmount.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/protocol/STTx.h>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/src/libxrpl/ledger/helpers/TokenHelpers.cpp b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
index 33f830a419..5d5fdfd68a 100644
--- a/src/libxrpl/ledger/helpers/TokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
@@ -26,21 +26,18 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/UintTypes.h>
 #include <xrpl/protocol/XRPAmount.h>
+#include <xrpl/protocol/STTx.h>
 
 #include <cstdint>
 #include <initializer_list>
+#include <optional>
 #include <string>
 #include <variant>
 
 namespace xrpl {
 
 // Forward declaration for function that remains in View.h/cpp
-bool
-isLPTokenFrozen(
-    ReadView const& view,
-    AccountID const& account,
-    Asset const& asset,
-    Asset const& asset2);
+
 
 //------------------------------------------------------------------------------
 //
@@ -475,10 +472,11 @@ removeEmptyHolding(
 {
     return std::visit(
         [&]<ValidIssueType TIss>(TIss const& issue) -> TER {
-            if constexpr (std::is_same_v<TIss, Issue>)
+            if constexpr (std::is_same_v<TIss, Issue>) {
                 return removeEmptyHolding(view, accountID, issue, journal);
-            else
+            } else {
                 return removeEmptyHolding(view, tx, accountID, issue, journal);
+}
         },
         asset.value());
 }
@@ -713,9 +711,10 @@ directSendNoLimitIOU(
     TER terResult =
         directSendNoFeeIOU(view, issuer, uReceiverID, saAmount, true, sponsorAccountID, j);
 
-    if (tesSUCCESS == terResult)
+    if (tesSUCCESS == terResult) {
         terResult =
             directSendNoFeeIOU(view, uSenderID, issuer, saActual, true, sponsorAccountID, j);
+}
 
     return terResult;
 }
diff --git a/src/libxrpl/tx/Transactor.cpp b/src/libxrpl/tx/Transactor.cpp
index 07ebaa661a..c989b76ff1 100644
--- a/src/libxrpl/tx/Transactor.cpp
+++ b/src/libxrpl/tx/Transactor.cpp
@@ -27,7 +27,6 @@
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/SField.h>
-#include <xrpl/protocol/STAccount.h>
 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/Serializer.h>  // IWYU pragma: keep
@@ -41,7 +40,10 @@
 #include <xrpl/tx/SignerEntries.h>
 #include <xrpl/tx/apply.h>
 #include <xrpl/tx/applySteps.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
+#include <algorithm>
 #include <cstddef>
 #include <cstdint>
 #include <exception>
@@ -187,7 +189,7 @@ Transactor::preflight1(PreflightContext const& ctx, std::uint32_t flagMask)
         return temDISABLED;
 
     if (hasSponsorFlags &&
-        ctx.tx.getFieldU32(sfSponsorFlags) & ~(spfSponsorFee | spfSponsorReserve))
+        ((ctx.tx.getFieldU32(sfSponsorFlags) & ~(spfSponsorFee | spfSponsorReserve)) != 0u))
     {
         JLOG(ctx.j.debug()) << "preflight1: invalid sponsor flags";
         return temINVALID_FLAG;
@@ -210,7 +212,7 @@ Transactor::preflight1(PreflightContext const& ctx, std::uint32_t flagMask)
     else if (hasSponsorFlags)
     {
         auto const sponsorFlags = ctx.tx.getFieldU32(sfSponsorFlags);
-        if ((sponsorFlags & ~(spfSponsorFee | spfSponsorReserve)) || sponsorFlags == 0)
+        if (((sponsorFlags & ~(spfSponsorFee | spfSponsorReserve)) != 0u) || sponsorFlags == 0)
         {
             JLOG(ctx.j.debug()) << "preflight1: invalid sponsor flags";
             return temINVALID_FLAG;
@@ -374,10 +376,10 @@ Transactor::checkSponsor(ReadView const& view, STTx const& tx)
 
     auto const sponsorFlags = tx.getFieldU32(sfSponsorFlags);
 
-    if (sponsorFlags & spfSponsorFee && sponsorSle->isFlag(lsfSponsorshipRequireSignForFee))
+    if (((sponsorFlags & spfSponsorFee) != 0u) && sponsorSle->isFlag(lsfSponsorshipRequireSignForFee))
         return terNO_SPONSORSHIP;
 
-    if (sponsorFlags & spfSponsorReserve && sponsorSle->isFlag(lsfSponsorshipRequireSignForReserve))
+    if (((sponsorFlags & spfSponsorReserve) != 0u) && sponsorSle->isFlag(lsfSponsorshipRequireSignForReserve))
         return terNO_SPONSORSHIP;
 
     return tesSUCCESS;
@@ -482,9 +484,10 @@ Transactor::checkFee(PreclaimContext const& ctx, XRPAmount baseFee)
 
     if (!payerSle)
     {
-        if (payer.type == FeePayerType::SponsorPreFunded)
+        if (payer.type == FeePayerType::SponsorPreFunded) {
             // Sanity check: already checked in checkSponsor
             return tefINTERNAL;  // LCOV_EXCL_LINE
+}
 
         return terNO_ACCOUNT;
     }
@@ -560,11 +563,12 @@ Transactor::payFee()
 
     auto const feeAmountAfter = sle->getFieldAmount(payer.balanceField) - feePaid;
 
-    if (feeAmountAfter == beast::zero && payer.balanceField == sfFeeAmount)
+    if (feeAmountAfter == beast::zero && payer.balanceField == sfFeeAmount) {
         // Because ltSponsorship.sfFeeAmount is soeOptional
         sle->makeFieldAbsent(payer.balanceField);
-    else
+    } else {
         sle->setFieldAmount(payer.balanceField, feeAmountAfter);
+}
 
     view().update(sle);
 
@@ -1251,11 +1255,12 @@ Transactor::reset(XRPAmount fee)
     // then the ledger is corrupted.  Rather than make things worse we
     // reject the transaction.
     auto const feeAmountAfter = balance - fee;
-    if (feeAmountAfter == beast::zero && payer.balanceField == sfFeeAmount)
+    if (feeAmountAfter == beast::zero && payer.balanceField == sfFeeAmount) {
         // Because ltSponsorship.sfFeeAmount is soeOptional
         payerSle->makeFieldAbsent(payer.balanceField);
-    else
+    } else {
         payerSle->setFieldAmount(payer.balanceField, feeAmountAfter);
+}
 
     TER const ter{consumeSeqProxy(txnAcct)};
     XRPL_ASSERT(isTesSuccess(ter), "xrpl::Transactor::reset : result is tesSUCCESS");
@@ -1273,7 +1278,7 @@ Transactor::reset(XRPAmount fee)
 FeePayer
 Transactor::getFeePayer(ReadView const& view, STTx const& tx)
 {
-    if (tx.isFieldPresent(sfSponsor) && (tx.getFieldU32(sfSponsorFlags) & spfSponsorFee))
+    if (tx.isFieldPresent(sfSponsor) && ((tx.getFieldU32(sfSponsorFlags) & spfSponsorFee) != 0u))
     {
         auto const sponsorAccountID = tx.getAccountID(sfSponsor);
         auto const sponseeAccountID = tx.getAccountID(sfAccount);
@@ -1281,20 +1286,21 @@ Transactor::getFeePayer(ReadView const& view, STTx const& tx)
         auto const sponsorshipKeylet = keylet::sponsor(sponsorAccountID, sponseeAccountID);
 
         // if pre-funded sponsorship exists, prefer it
-        if (hasSponsorSignature && !view.exists(sponsorshipKeylet))
+        if (hasSponsorSignature && !view.exists(sponsorshipKeylet)) {
             // co-signed
             return FeePayer{
-                keylet::account(sponsorAccountID), sfBalance, FeePayerType::SponsorCoSigned};
+                .entry=keylet::account(sponsorAccountID), .balanceField=sfBalance, .type=FeePayerType::SponsorCoSigned};
+}
 
         // pre funded
-        return FeePayer{sponsorshipKeylet, sfFeeAmount, FeePayerType::SponsorPreFunded};
+        return FeePayer{.entry=sponsorshipKeylet, .balanceField=sfFeeAmount, .type=FeePayerType::SponsorPreFunded};
     }
 
     auto const payerAccountKeylet = keylet::account(tx.getFeePayer());
     auto const payerType =
         tx.isFieldPresent(sfDelegate) ? FeePayerType::Delegate : FeePayerType::Account;
 
-    return FeePayer{payerAccountKeylet, sfBalance, payerType};
+    return FeePayer{.entry=payerAccountKeylet, .balanceField=sfBalance, .type=payerType};
 }
 
 // The sole purpose of this function is to provide a convenient, named
diff --git a/src/libxrpl/tx/invariants/SponsorshipInvariant.cpp b/src/libxrpl/tx/invariants/SponsorshipInvariant.cpp
index c429a00455..e49749abf8 100644
--- a/src/libxrpl/tx/invariants/SponsorshipInvariant.cpp
+++ b/src/libxrpl/tx/invariants/SponsorshipInvariant.cpp
@@ -3,6 +3,16 @@
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/STArray.h>
 #include <xrpl/tx/transactors/oracle/OracleSet.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/core/ServiceRegistry.h>
+#include <xrpl/ledger/ReadView.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/XRPAmount.h>
+#include <cstdint>
+#include <memory>
 
 namespace xrpl {
 
@@ -96,7 +106,7 @@ SponsorshipOwnerCountsMatch::finalize(
     TER const,
     XRPAmount const,
     ReadView const&,
-    beast::Journal const& j)
+    beast::Journal const& j) const
 {
     if (deltaSponsoredOwnerCount_ != deltaSponsoringOwnerCount_)
     {
@@ -153,7 +163,7 @@ SponsorshipAccountCountMatchesField::finalize(
     TER const,
     XRPAmount const,
     ReadView const&,
-    beast::Journal const& j)
+    beast::Journal const& j) const
 {
     if (deltaSponsoringAccountCount_ != deltaSponsorFieldPresence_)
     {
diff --git a/src/libxrpl/tx/transactors/Sponsor/SponsorshipSet.cpp b/src/libxrpl/tx/transactors/Sponsor/SponsorshipSet.cpp
index a8f056bbd6..683a4e7623 100644
--- a/src/libxrpl/tx/transactors/Sponsor/SponsorshipSet.cpp
+++ b/src/libxrpl/tx/transactors/Sponsor/SponsorshipSet.cpp
@@ -6,6 +6,20 @@
 #include <xrpl/ledger/helpers/DirectoryHelpers.h>
 #include <xrpl/ledger/helpers/SponsorHelpers.h>
 #include <xrpl/protocol/TxFlags.h>
+#include <xrpl/beast/utility/Zero.h>
+#include <xrpl/core/ServiceRegistry.h>
+#include <xrpl/ledger/ReadView.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/Permissions.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFormats.h>
+#include <xrpl/tx/Transactor.h>
+#include <cstdint>
+#include <memory>
+#include <unordered_set>
 
 namespace xrpl {
 
@@ -20,11 +34,11 @@ SponsorshipSet::preflight(PreflightContext const& ctx)
 {
     auto const flags = ctx.tx.getFlags();
 
-    if ((flags & tfSponsorshipSetRequireSignForFee) &&
-        (flags & tfSponsorshipClearRequireSignForFee))
+    if (((flags & tfSponsorshipSetRequireSignForFee) != 0u) &&
+        ((flags & tfSponsorshipClearRequireSignForFee) != 0u))
         return temINVALID_FLAG;
-    if ((flags & tfSponsorshipSetRequireSignForReserve) &&
-        (flags & tfSponsorshipClearRequireSignForReserve))
+    if (((flags & tfSponsorshipSetRequireSignForReserve) != 0u) &&
+        ((flags & tfSponsorshipClearRequireSignForReserve) != 0u))
         return temINVALID_FLAG;
 
     auto const account = ctx.tx.getAccountID(sfAccount);
@@ -48,7 +62,7 @@ SponsorshipSet::preflight(PreflightContext const& ctx)
             tfSponsorshipSetRequireSignForReserve | tfSponsorshipClearRequireSignForFee |
             tfSponsorshipClearRequireSignForReserve;
 
-        if (flags & modifyFlags)
+        if ((flags & modifyFlags) != 0u)
             return temINVALID_FLAG;
 
         // can not include these fields when deleting
@@ -109,17 +123,17 @@ SponsorshipSet::checkPermission(ReadView const& view, STTx const& tx)
 
     // this is added in case more flags will be added for SponsorshipSet
     // in the future. Currently unreachable.
-    if (txFlags & tfSponsorshipSetPermissionMask)
+    if ((txFlags & tfSponsorshipSetPermissionMask) != 0u)
         return terNO_DELEGATE_PERMISSION;
 
     std::unordered_set<GranularPermissionType> granularPermissions;
     loadGranularPermission(sle, ttSPONSORSHIP_SET, granularPermissions);
 
     auto const sponsoringFee = tx.isFieldPresent(sfFeeAmount) || tx.isFieldPresent(sfMaxFee) ||
-        (txFlags & (tfSponsorshipSetRequireSignForFee | tfSponsorshipClearRequireSignForFee));
+        ((txFlags & (tfSponsorshipSetRequireSignForFee | tfSponsorshipClearRequireSignForFee)) != 0u);
     auto const sponsoringReserve = tx.isFieldPresent(sfReserveCount) ||
-        (txFlags &
-         (tfSponsorshipSetRequireSignForReserve | tfSponsorshipClearRequireSignForReserve));
+        ((txFlags &
+         (tfSponsorshipSetRequireSignForReserve | tfSponsorshipClearRequireSignForReserve)) != 0u);
 
     if (sponsoringFee && !granularPermissions.contains(SponsorFee))
         return terNO_DELEGATE_PERMISSION;
@@ -292,10 +306,11 @@ SponsorshipSet::doApply()
         {
             (*sponsorAccSle)[sfBalance] -= feeAmountDelta;
 
-            if (*feeAmount == XRPAmount(0))
+            if (*feeAmount == XRPAmount(0)) {
                 (*sponsorObjSle).makeFieldAbsent(sfFeeAmount);
-            else
+            } else {
                 (*sponsorObjSle).setFieldAmount(sfFeeAmount, *feeAmount);
+}
 
             if (auto const ret = checkInsufficientReserve(
                     ctx_.view(),
@@ -311,18 +326,20 @@ SponsorshipSet::doApply()
 
     if (maxFee)
     {
-        if (*maxFee == XRPAmount(0))
+        if (*maxFee == XRPAmount(0)) {
             (*sponsorObjSle).makeFieldAbsent(sfMaxFee);
-        else
+        } else {
             (*sponsorObjSle)[sfMaxFee] = *maxFee;
+}
     }
 
     if (reserveCount)
     {
-        if (*reserveCount == 0)
+        if (*reserveCount == 0) {
             (*sponsorObjSle).makeFieldAbsent(sfReserveCount);
-        else
+        } else {
             (*sponsorObjSle)[sfReserveCount] = *reserveCount;
+}
     }
 
     // update Flags
diff --git a/src/libxrpl/tx/transactors/Sponsor/SponsorshipTransfer.cpp b/src/libxrpl/tx/transactors/Sponsor/SponsorshipTransfer.cpp
index 3fa29237e4..135a79f8f7 100644
--- a/src/libxrpl/tx/transactors/Sponsor/SponsorshipTransfer.cpp
+++ b/src/libxrpl/tx/transactors/Sponsor/SponsorshipTransfer.cpp
@@ -2,14 +2,25 @@
 
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/View.h>
-#include <xrpl/protocol/Asset.h>
-#include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/SField.h>
-#include <xrpl/protocol/STNumber.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/tx/transactors/oracle/OracleSet.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/beast/utility/instrumentation.h>
+#include <xrpl/core/ServiceRegistry.h>
+#include <xrpl/ledger/ApplyView.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/XRPAmount.h>
+#include <xrpl/tx/Transactor.h>
+#include <bit>
+#include <cstdint>
+#include <memory>
+#include <optional>
 
 namespace xrpl {
 
@@ -30,7 +41,7 @@ SponsorshipTransfer::preflight(PreflightContext const& ctx)
         return temINVALID_FLAG;
     }
 
-    if (flags & tfSponsorshipCreate)
+    if ((flags & tfSponsorshipCreate) != 0u)
     {
         if (!isReserveSponsored(ctx.tx))
         {
@@ -45,7 +56,7 @@ SponsorshipTransfer::preflight(PreflightContext const& ctx)
             return temMALFORMED;
         }
     }
-    if (flags & tfSponsorshipReassign)
+    if ((flags & tfSponsorshipReassign) != 0u)
     {
         if (!isReserveSponsored(ctx.tx))
         {
@@ -60,7 +71,7 @@ SponsorshipTransfer::preflight(PreflightContext const& ctx)
             return temMALFORMED;
         }
     }
-    if (flags & tfSponsorshipEnd)
+    if ((flags & tfSponsorshipEnd) != 0u)
     {
         if (isReserveSponsored(ctx.tx))
         {
@@ -243,7 +254,7 @@ SponsorshipTransfer::preclaim(PreclaimContext const& ctx)
 
         auto const& sponsorField = getLedgerEntrySponsorField(sle, *owner);
 
-        if (flags & tfSponsorshipCreate)
+        if ((flags & tfSponsorshipCreate) != 0u)
         {
             if (!newSponsor)
                 return tecNO_PERMISSION;
@@ -252,7 +263,7 @@ SponsorshipTransfer::preclaim(PreclaimContext const& ctx)
             if (sle->isFieldPresent(sponsorField))
                 return tecNO_PERMISSION;
         }
-        else if (flags & tfSponsorshipReassign)
+        else if ((flags & tfSponsorshipReassign) != 0u)
         {
             if (!newSponsor)
                 return tecNO_PERMISSION;
@@ -261,7 +272,7 @@ SponsorshipTransfer::preclaim(PreclaimContext const& ctx)
             if (!sle->isFieldPresent(sponsorField))
                 return tecNO_PERMISSION;
         }
-        else if (flags & tfSponsorshipEnd)
+        else if ((flags & tfSponsorshipEnd) != 0u)
         {
             if (newSponsor)
                 return tecNO_PERMISSION;
@@ -289,7 +300,7 @@ SponsorshipTransfer::preclaim(PreclaimContext const& ctx)
     }
     else
     {
-        if (flags & tfSponsorshipCreate)
+        if ((flags & tfSponsorshipCreate) != 0u)
         {
             if (!newSponsor)
                 return tecNO_PERMISSION;
@@ -298,7 +309,7 @@ SponsorshipTransfer::preclaim(PreclaimContext const& ctx)
             if (sponseeSle->isFieldPresent(sfSponsor))
                 return tecNO_PERMISSION;
         }
-        else if (flags & tfSponsorshipReassign)
+        else if ((flags & tfSponsorshipReassign) != 0u)
         {
             if (!newSponsor)
                 return tecNO_PERMISSION;
@@ -307,7 +318,7 @@ SponsorshipTransfer::preclaim(PreclaimContext const& ctx)
             if (!sponseeSle->isFieldPresent(sfSponsor))
                 return tecNO_PERMISSION;
         }
-        else if (flags & tfSponsorshipEnd)
+        else if ((flags & tfSponsorshipEnd) != 0u)
         {
             if (newSponsor)
                 return tecNO_PERMISSION;
@@ -423,7 +434,7 @@ SponsorshipTransfer::doApply()
 
         auto const& sponsorField = getLedgerEntrySponsorField(objSle, *ownerAccountID);
 
-        if (flags & tfSponsorshipCreate)
+        if ((flags & tfSponsorshipCreate) != 0u)
         {
             auto const newSponsorAccountID = tx.getAccountID(sfSponsor);
             XRPL_ASSERT(!!newSponsorAccountID, "New sponsor is required when creating sponsorship");
@@ -452,7 +463,7 @@ SponsorshipTransfer::doApply()
                     return ter;
             }
         }
-        else if (flags & tfSponsorshipReassign)
+        else if ((flags & tfSponsorshipReassign) != 0u)
         {
             auto const newSponsorAccountID = tx.getAccountID(sfSponsor);
             XRPL_ASSERT(
@@ -500,7 +511,7 @@ SponsorshipTransfer::doApply()
                     return ter;
             }
         }
-        else if (flags & tfSponsorshipEnd)
+        else if ((flags & tfSponsorshipEnd) != 0u)
         {
             auto const oldSponsorAccountID = objSle->getAccountID(sponsorField);
             XRPL_ASSERT(!!oldSponsorAccountID, "Old sponsor is required when ending sponsorship");
@@ -535,7 +546,7 @@ SponsorshipTransfer::doApply()
     }
     else
     {
-        if (flags & tfSponsorshipCreate)
+        if ((flags & tfSponsorshipCreate) != 0u)
         {
             // create account sponsor
             // increment new sponsoring count
@@ -550,7 +561,7 @@ SponsorshipTransfer::doApply()
             sponseeSle->setAccountID(sfSponsor, newSponsorAccountID);
             view().update(sponseeSle);
         }
-        else if (flags & tfSponsorshipReassign)
+        else if ((flags & tfSponsorshipReassign) != 0u)
         {
             // reassign account sponsor
             // increment new sponsoring count
@@ -573,7 +584,7 @@ SponsorshipTransfer::doApply()
             sponseeSle->setAccountID(sfSponsor, newSponsorAccountID);
             view().update(sponseeSle);
         }
-        else if (flags & tfSponsorshipEnd)
+        else if ((flags & tfSponsorshipEnd) != 0u)
         {
             // dissolve account sponsor
             auto const oldSponsorAccountID = sponseeSle->getAccountID(sfSponsor);
diff --git a/src/libxrpl/tx/transactors/account/AccountDelete.cpp b/src/libxrpl/tx/transactors/account/AccountDelete.cpp
index a9c3fd2cc9..23833d1073 100644
--- a/src/libxrpl/tx/transactors/account/AccountDelete.cpp
+++ b/src/libxrpl/tx/transactors/account/AccountDelete.cpp
@@ -30,7 +30,6 @@
 #include <xrpl/tx/transactors/did/DIDDelete.h>
 #include <xrpl/tx/transactors/oracle/OracleDelete.h>
 #include <xrpl/tx/transactors/payment/DepositPreauth.h>
-#include <xrpl/tx/transactors/sponsor/SponsorshipSet.h>
 
 #include <cstdint>
 #include <memory>
@@ -417,16 +416,18 @@ AccountDelete::doApply()
 
         auto const sponsoringAccountCount = sponsorSle->getFieldU32(sfSponsoringAccountCount);
 
-        if (sponsoringAccountCount == 0)
+        if (sponsoringAccountCount == 0) {
             // sanity check
             // Since sfSponsoringAccountCount is set to soeDEFAULT, the field will not be
             // populated with a value of 0.
             return tefINTERNAL;  // LCOV_EXCL_LINE
+}
 
-        if (sponsoringAccountCount == 1)
+        if (sponsoringAccountCount == 1) {
             sponsorSle->makeFieldAbsent(sfSponsoringAccountCount);
-        else
+        } else {
             sponsorSle->setFieldU32(sfSponsoringAccountCount, sponsoringAccountCount - 1);
+}
         view().update(sponsorSle);
 
         // Following line might look redundant, but without it, sfSponsor
diff --git a/src/libxrpl/tx/transactors/account/SignerListSet.cpp b/src/libxrpl/tx/transactors/account/SignerListSet.cpp
index 3a096b7925..75a9e0cc7a 100644
--- a/src/libxrpl/tx/transactors/account/SignerListSet.cpp
+++ b/src/libxrpl/tx/transactors/account/SignerListSet.cpp
@@ -23,6 +23,8 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/SignerEntries.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
index a731e75405..4b294af8b5 100644
--- a/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
+++ b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
@@ -38,6 +38,8 @@
 #include <xrpl/tx/Transactor.h>
 #include <xrpl/tx/paths/Flow.h>
 #include <xrpl/tx/paths/detail/Steps.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <cstdint>
 #include <limits>
diff --git a/src/libxrpl/tx/transactors/check/CheckCancel.cpp b/src/libxrpl/tx/transactors/check/CheckCancel.cpp
index 99a8c2fa40..69a8b54b6a 100644
--- a/src/libxrpl/tx/transactors/check/CheckCancel.cpp
+++ b/src/libxrpl/tx/transactors/check/CheckCancel.cpp
@@ -12,6 +12,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/libxrpl/tx/transactors/check/CheckCash.cpp b/src/libxrpl/tx/transactors/check/CheckCash.cpp
index 59640b6250..ae6a912e0c 100644
--- a/src/libxrpl/tx/transactors/check/CheckCash.cpp
+++ b/src/libxrpl/tx/transactors/check/CheckCash.cpp
@@ -28,9 +28,9 @@
 #include <xrpl/tx/Transactor.h>
 #include <xrpl/tx/paths/Flow.h>
 #include <xrpl/tx/paths/detail/Steps.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <algorithm>
-#include <cstdint>
 #include <memory>
 #include <optional>
 
diff --git a/src/libxrpl/tx/transactors/check/CheckCreate.cpp b/src/libxrpl/tx/transactors/check/CheckCreate.cpp
index 2ce045f40a..93069232ea 100644
--- a/src/libxrpl/tx/transactors/check/CheckCreate.cpp
+++ b/src/libxrpl/tx/transactors/check/CheckCreate.cpp
@@ -23,6 +23,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp b/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp
index 6eb6a39d4e..b957b0ed31 100644
--- a/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp
+++ b/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp
@@ -18,6 +18,8 @@
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp b/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp
index 6c8b6a15da..b4a2b73c25 100644
--- a/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp
+++ b/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp
@@ -20,6 +20,8 @@
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <chrono>
 #include <cstdint>
diff --git a/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp b/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
index 14c110bce5..a85b9d7f1d 100644
--- a/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
+++ b/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
@@ -15,6 +15,8 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/libxrpl/tx/transactors/dex/AMMCreate.cpp b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
index f4a190a9e7..bef09c155d 100644
--- a/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
@@ -30,6 +30,7 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/ApplyContext.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp b/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
index 1f0fa57f0a..ee4cb06395 100644
--- a/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
@@ -24,6 +24,7 @@
 #include <xrpl/protocol/TxFormats.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <bit>
 #include <cstdint>
diff --git a/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp b/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp
index a4344cba00..4957f0017a 100644
--- a/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp
@@ -29,6 +29,8 @@
 #include <xrpl/protocol/TxFormats.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <algorithm>
 #include <bit>
diff --git a/src/libxrpl/tx/transactors/dex/OfferCreate.cpp b/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
index c8f9c2c923..f04a7b5534 100644
--- a/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
+++ b/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
@@ -41,6 +41,7 @@
 #include <xrpl/tx/applySteps.h>
 #include <xrpl/tx/paths/Flow.h>
 #include <xrpl/tx/paths/detail/Steps.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/src/libxrpl/tx/transactors/did/DIDDelete.cpp b/src/libxrpl/tx/transactors/did/DIDDelete.cpp
index eaeeb56c91..893f75f301 100644
--- a/src/libxrpl/tx/transactors/did/DIDDelete.cpp
+++ b/src/libxrpl/tx/transactors/did/DIDDelete.cpp
@@ -15,6 +15,7 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/ApplyContext.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 
diff --git a/src/libxrpl/tx/transactors/did/DIDSet.cpp b/src/libxrpl/tx/transactors/did/DIDSet.cpp
index fbbd540ae6..29026841d6 100644
--- a/src/libxrpl/tx/transactors/did/DIDSet.cpp
+++ b/src/libxrpl/tx/transactors/did/DIDSet.cpp
@@ -17,6 +17,8 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/ApplyContext.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <cstddef>
 #include <memory>
diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp
index 732f2d991c..2e543b2bd6 100644
--- a/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp
+++ b/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp
@@ -22,6 +22,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 #include <variant>
diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
index 77c6b8c769..276b8b01e7 100644
--- a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
+++ b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
@@ -31,6 +31,7 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
 #include <xrpl/tx/applySteps.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 #include <system_error>
diff --git a/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp b/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp
index cbfd2b9535..bbd6fdf2a5 100644
--- a/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp
+++ b/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp
@@ -29,6 +29,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 #include <system_error>
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
index 11104fc5f0..f455778865 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
@@ -16,6 +16,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
index 4f562316e4..b246544eff 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
@@ -19,6 +19,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 #include <vector>
diff --git a/src/libxrpl/tx/transactors/lending/LoanDelete.cpp b/src/libxrpl/tx/transactors/lending/LoanDelete.cpp
index f41f47c9ee..713c370912 100644
--- a/src/libxrpl/tx/transactors/lending/LoanDelete.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanDelete.cpp
@@ -15,6 +15,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 
diff --git a/src/libxrpl/tx/transactors/lending/LoanSet.cpp b/src/libxrpl/tx/transactors/lending/LoanSet.cpp
index d3031737a9..567c56b92e 100644
--- a/src/libxrpl/tx/transactors/lending/LoanSet.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanSet.cpp
@@ -26,6 +26,7 @@
 #include <xrpl/protocol/Units.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
index f011755820..9d6f03984b 100644
--- a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
+++ b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
@@ -19,6 +19,7 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/protocol/nft.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp b/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp
index 50de974245..2f3654ac7a 100644
--- a/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp
+++ b/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp
@@ -22,6 +22,7 @@
 #include <xrpl/tx/Transactor.h>
 
 #include <boost/endian/conversion.hpp>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <array>
 #include <cstdint>
diff --git a/src/libxrpl/tx/transactors/oracle/OracleDelete.cpp b/src/libxrpl/tx/transactors/oracle/OracleDelete.cpp
index 173912dc33..db24999ecd 100644
--- a/src/libxrpl/tx/transactors/oracle/OracleDelete.cpp
+++ b/src/libxrpl/tx/transactors/oracle/OracleDelete.cpp
@@ -12,6 +12,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 
diff --git a/src/libxrpl/tx/transactors/oracle/OracleSet.cpp b/src/libxrpl/tx/transactors/oracle/OracleSet.cpp
index 33121f7d0d..80eb80c93e 100644
--- a/src/libxrpl/tx/transactors/oracle/OracleSet.cpp
+++ b/src/libxrpl/tx/transactors/oracle/OracleSet.cpp
@@ -18,6 +18,8 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/ApplyContext.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <chrono>
 #include <cstddef>
@@ -163,10 +165,11 @@ OracleSet::preclaim(PreclaimContext const& ctx)
         auto const currentSponsor = getLedgerEntryReserveSponsorAccountID(sle);
         auto const newSponsor = getTxReserveSponsorAccountID(ctx.tx);
         if ((!currentSponsor && !newSponsor) ||
-            (currentSponsor && newSponsor && *currentSponsor == *newSponsor))
+            (currentSponsor && newSponsor && *currentSponsor == *newSponsor)) {
             adjustReserve = newCount - oldCount;
-        else
+        } else {
             adjustReserve = newCount;
+}
     }
     else
     {
diff --git a/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp b/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp
index 67616282da..a39182e0f9 100644
--- a/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp
+++ b/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp
@@ -20,6 +20,8 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/libxrpl/tx/transactors/payment/Payment.cpp b/src/libxrpl/tx/transactors/payment/Payment.cpp
index c4288c9e56..82849bf8b1 100644
--- a/src/libxrpl/tx/transactors/payment/Payment.cpp
+++ b/src/libxrpl/tx/transactors/payment/Payment.cpp
@@ -36,9 +36,12 @@
 #include <xrpl/tx/Transactor.h>
 #include <xrpl/tx/applySteps.h>
 #include <xrpl/tx/paths/RippleCalc.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <algorithm>
 #include <cstdint>
+#include <limits>
 #include <memory>
 #include <optional>
 #include <unordered_set>
diff --git a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp
index fa77711d7a..f4786339c3 100644
--- a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp
+++ b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp
@@ -20,6 +20,7 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
 #include <xrpl/tx/applySteps.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 
diff --git a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp
index 4cb8aad230..2d79b50f25 100644
--- a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp
+++ b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp
@@ -17,6 +17,8 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
 #include <xrpl/tx/applySteps.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 
diff --git a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp
index a82d618811..47ce12d226 100644
--- a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp
+++ b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp
@@ -11,6 +11,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 
diff --git a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp
index 2bd79b43ef..549577869e 100644
--- a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp
+++ b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp
@@ -16,6 +16,8 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 #include <utility>
diff --git a/src/libxrpl/tx/transactors/system/Batch.cpp b/src/libxrpl/tx/transactors/system/Batch.cpp
index 10af4b99f8..84190d9830 100644
--- a/src/libxrpl/tx/transactors/system/Batch.cpp
+++ b/src/libxrpl/tx/transactors/system/Batch.cpp
@@ -216,7 +216,7 @@ Batch::preflight(PreflightContext const& ctx)
     if (ctx.tx.isFieldPresent(sfSponsorFlags))
     {
         auto const sponsorFlags = ctx.tx.getFieldU32(sfSponsorFlags);
-        if (sponsorFlags & spfSponsorReserve)
+        if ((sponsorFlags & spfSponsorReserve) != 0u)
         {
             JLOG(ctx.j.debug()) << "BatchTrace[" << parentBatchId << "]:"
                                 << "spfSponsorReserve is not allowed on outer Batch.";
diff --git a/src/libxrpl/tx/transactors/system/TicketCreate.cpp b/src/libxrpl/tx/transactors/system/TicketCreate.cpp
index 67b2297cb1..17da80e9ac 100644
--- a/src/libxrpl/tx/transactors/system/TicketCreate.cpp
+++ b/src/libxrpl/tx/transactors/system/TicketCreate.cpp
@@ -15,6 +15,8 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
 #include <xrpl/tx/applySteps.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
index d161493615..6eaac19719 100644
--- a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
+++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
@@ -19,6 +19,8 @@
 #include <xrpl/protocol/UintTypes.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp
index 3311c6c96b..a1ed15da74 100644
--- a/src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp
+++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp
@@ -8,6 +8,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 
diff --git a/src/libxrpl/tx/transactors/token/TrustSet.cpp b/src/libxrpl/tx/transactors/token/TrustSet.cpp
index 87fe1eff2c..c32383d316 100644
--- a/src/libxrpl/tx/transactors/token/TrustSet.cpp
+++ b/src/libxrpl/tx/transactors/token/TrustSet.cpp
@@ -25,6 +25,8 @@
 #include <xrpl/protocol/UintTypes.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/View.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/libxrpl/tx/transactors/vault/VaultCreate.cpp b/src/libxrpl/tx/transactors/vault/VaultCreate.cpp
index 1cb44eebbb..e12766d739 100644
--- a/src/libxrpl/tx/transactors/vault/VaultCreate.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultCreate.cpp
@@ -24,6 +24,7 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
 #include <xrpl/tx/transactors/token/MPTokenIssuanceCreate.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/libxrpl/tx/transactors/vault/VaultDelete.cpp b/src/libxrpl/tx/transactors/vault/VaultDelete.cpp
index e398e3babf..4431c685c9 100644
--- a/src/libxrpl/tx/transactors/vault/VaultDelete.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultDelete.cpp
@@ -16,6 +16,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 
diff --git a/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp b/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp
index 59a7898111..5d16ecae45 100644
--- a/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp
@@ -19,8 +19,10 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
+#include <optional>
 #include <stdexcept>
 
 namespace xrpl {
diff --git a/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp b/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp
index 3b9818c905..95e697ca92 100644
--- a/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp
@@ -20,6 +20,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
+#include <xrpl/ledger/helpers/SponsorHelpers.h>
 
 #include <memory>
 #include <stdexcept>
diff --git a/src/test/app/Invariants_test.cpp b/src/test/app/Invariants_test.cpp
index 068060d139..51d6a26dbc 100644
--- a/src/test/app/Invariants_test.cpp
+++ b/src/test/app/Invariants_test.cpp
@@ -1771,20 +1771,20 @@ class Invariants_test : public beast::unit_test::suite
                 .func = [](SLE::pointer& sle) { sle->at(sfRegularKey) = Account("regular").id(); },
             },
             {
-                "pseudo-account has a sponsorship field",
-                [](SLE::pointer& sle) { sle->at(sfSponsoredOwnerCount) = 1; },
+                .expectedFailure="pseudo-account has a sponsorship field",
+                .func=[](SLE::pointer& sle) { sle->at(sfSponsoredOwnerCount) = 1; },
             },
             {
-                "pseudo-account has a sponsorship field",
-                [](SLE::pointer& sle) { sle->at(sfSponsoringOwnerCount) = 1; },
+                .expectedFailure="pseudo-account has a sponsorship field",
+                .func=[](SLE::pointer& sle) { sle->at(sfSponsoringOwnerCount) = 1; },
             },
             {
-                "pseudo-account has a sponsorship field",
-                [](SLE::pointer& sle) { sle->at(sfSponsoringAccountCount) = 1; },
+                .expectedFailure="pseudo-account has a sponsorship field",
+                .func=[](SLE::pointer& sle) { sle->at(sfSponsoringAccountCount) = 1; },
             },
             {
-                "pseudo-account has a sponsorship field",
-                [](SLE::pointer& sle) { sle->at(sfSponsor) = Account("sponsor").id(); },
+                .expectedFailure="pseudo-account has a sponsorship field",
+                .func=[](SLE::pointer& sle) { sle->at(sfSponsor) = Account("sponsor").id(); },
             },
         });
 
diff --git a/src/test/app/Oracle_test.cpp b/src/test/app/Oracle_test.cpp
index 62a8f61e27..5dab84a6b9 100644
--- a/src/test/app/Oracle_test.cpp
+++ b/src/test/app/Oracle_test.cpp
@@ -26,6 +26,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 #include <chrono>
 #include <cstdint>
diff --git a/src/test/app/Sponsor_test.cpp b/src/test/app/Sponsor_test.cpp
index fea76a7bac..6d7ac1a9cf 100644
--- a/src/test/app/Sponsor_test.cpp
+++ b/src/test/app/Sponsor_test.cpp
@@ -1,4 +1,3 @@
-#include <test/jtx.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/check.h>
 #include <test/jtx/did.h>
@@ -9,9 +8,63 @@
 
 #include <xrpl/basics/strHex.h>
 #include <xrpl/protocol/Feature.h>
+#include <test/jtx/AMM.h>
+#include <test/jtx/Account.h>
+#include <test/jtx/Oracle.h>
+#include <test/jtx/TestHelpers.h>
+#include <test/jtx/acctdelete.h>
+#include <test/jtx/amount.h>
+#include <test/jtx/batch.h>
+#include <test/jtx/credentials.h>
+#include <test/jtx/delegate.h>
+#include <test/jtx/deposit.h>
+#include <test/jtx/envconfig.h>
+#include <test/jtx/escrow.h>
+#include <test/jtx/fee.h>
+#include <test/jtx/flags.h>
+#include <test/jtx/mpt.h>
+#include <test/jtx/noop.h>
+#include <test/jtx/offer.h>
+#include <test/jtx/pay.h>
+#include <test/jtx/permissioned_domains.h>
+#include <test/jtx/tags.h>
+#include <test/jtx/ter.h>
+#include <test/jtx/token.h>
+#include <test/jtx/trust.h>
+#include <test/jtx/txflags.h>
+#include <test/jtx/vault.h>
+#include <xrpl/basics/Number.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/chrono.h>
+#include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/beast/utility/instrumentation.h>
+#include <xrpl/core/ServiceRegistry.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Asset.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpld/core/Config.h>
+#include <chrono>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
 
-namespace xrpl {
-namespace test {
+
+namespace xrpl::test {
 
 static STAmount
 accountReserve(jtx::Env& env, std::uint32_t count = 1)
@@ -35,13 +88,14 @@ adjustAccountXRPBalance(jtx::Env& env, jtx::Account const& account, STAmount con
         return;
 
     auto const baseFee = env.current()->fees().base;
-    if (currentBalance > balanceTo)
+    if (currentBalance > balanceTo) {
         env(pay(account, env.master, currentBalance - (balanceTo)),
             fee(XRP(1)),
             sponsor::as(env.master, spfSponsorFee),
             sig(sfSponsorSignature, env.master));
-    else
+    } else {
         env(pay(env.master, account, balanceTo - currentBalance), fee(baseFee));
+}
 
     env.close();
 }
@@ -1966,10 +2020,11 @@ public:
 
         auto submit = [&](TER _ter) {
             return [&, _ter](Json::Value const& jv, auto const&... fN) {
-                if (sponsorSig)
+                if (sponsorSig) {
                     env(jv, fN..., sponsor::as(sponsor, spfSponsorReserve), *sponsorSig, ter(_ter));
-                else
+                } else {
                     env(jv, fN..., sponsor::as(sponsor, spfSponsorReserve), ter(_ter));
+}
             };
         };
 
@@ -1991,13 +2046,14 @@ public:
                     env.close();
                 }
 
-                if (sponsorReserveCount - 1 > 0)
+                if (sponsorReserveCount - 1 > 0) {
                     env(sponsor::set(sponsor, 0, sponsorReserveCount - 1, XRP(1)),
                         sponsor::sponseeAcc(sponsee));
-                else
+                } else {
                     // just create sponsor object
                     env(sponsor::set(sponsor, 0, std::nullopt, XRP(1)),
                         sponsor::sponseeAcc(sponsee));
+}
                 env.close();
             }
             callback(env, submit(insufficientReserveResult));
@@ -2030,9 +2086,9 @@ public:
             }
         }
 
-        if (expected)
+        if (expected) {
             (*expected)();
-        else
+        } else
         {
             BEAST_EXPECT(ownerCount(env, sponsee) - sponseeOwnerCountBefore == reserveCount);
             BEAST_EXPECT(
@@ -2195,7 +2251,7 @@ public:
             env(pay(gw, bob, USD(1000)));
             env.close();
 
-            AMM amm(env, bob, XRP(1000), USD(100));
+            AMM const amm(env, bob, XRP(1000), USD(100));
 
             // alice has 1 owner object (USD trust line); give her reserve + 5 XRP liquid
             adjustAccountXRPBalance(env, alice, reserve(env, ownerCount(env, alice)) + XRP(5));
@@ -5864,5 +5920,5 @@ BEAST_DEFINE_TESTSUITE(Sponsor, app, xrpl);
 BEAST_DEFINE_TESTSUITE(SponsorTxCosigning, app, xrpl);
 BEAST_DEFINE_TESTSUITE(SponsorTxPrefunded, app, xrpl);
 
-}  // namespace test
-}  // namespace xrpl
+} // namespace xrpl::test
+
diff --git a/src/test/jtx/impl/sponsor.cpp b/src/test/jtx/impl/sponsor.cpp
index be550a36f1..57a9cc32e6 100644
--- a/src/test/jtx/impl/sponsor.cpp
+++ b/src/test/jtx/impl/sponsor.cpp
@@ -1,16 +1,24 @@
 #include <test/jtx/sponsor.h>
 
-#include <test/jtx/utility.h>
 
-#include <xrpl/protocol/Sign.h>
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
+#include <cstdint>
+#include <optional>
 
-namespace xrpl {
-namespace test {
-namespace jtx {
 
-namespace sponsor {
+
+
+
+namespace xrpl::test::jtx::sponsor {
 
 Json::Value
 set(jtx::Account const& account,
@@ -122,7 +130,7 @@ ledgerEntry(jtx::Env& env, jtx::Account const& sponsor, jtx::Account const& spon
     return env.rpc("json", "ledger_entry", to_string(jvParams));
 }
 
-}  // namespace sponsor
-}  // namespace jtx
-}  // namespace test
-}  // namespace xrpl
+} // namespace xrpl::test::jtx::sponsor
+
+
+
diff --git a/src/test/jtx/owners.h b/src/test/jtx/owners.h
index e912b95378..56512c30b1 100644
--- a/src/test/jtx/owners.h
+++ b/src/test/jtx/owners.h
@@ -71,7 +71,7 @@ private:
     std::uint32_t value_;
 
 public:
-    sponsored_owners(Account const& account, std::uint32_t value) : account_(account), value_(value)
+    sponsored_owners(Account  account, std::uint32_t value) : account_(std::move(account)), value_(value)
     {
     }
 
@@ -87,8 +87,8 @@ private:
     std::uint32_t value_;
 
 public:
-    sponsoring_owners(Account const& account, std::uint32_t value)
-        : account_(account), value_(value)
+    sponsoring_owners(Account  account, std::uint32_t value)
+        : account_(std::move(account)), value_(value)
     {
     }
 
@@ -104,8 +104,8 @@ private:
     std::uint32_t value_;
 
 public:
-    sponsoring_account_count(Account const& account, std::uint32_t value)
-        : account_(account), value_(value)
+    sponsoring_account_count(Account  account, std::uint32_t value)
+        : account_(std::move(account)), value_(value)
     {
     }
 
diff --git a/src/test/jtx/sponsor.h b/src/test/jtx/sponsor.h
index 8c7b01569a..9dc99e4e19 100644
--- a/src/test/jtx/sponsor.h
+++ b/src/test/jtx/sponsor.h
@@ -4,11 +4,13 @@
 #include <test/jtx/Env.h>
 #include <test/jtx/SignerUtils.h>
 
-namespace xrpl {
-namespace test {
-namespace jtx {
+#include <utility>
 
-namespace sponsor {
+
+
+
+
+namespace xrpl::test::jtx::sponsor {
 
 Json::Value
 set(jtx::Account const& account,
@@ -45,7 +47,7 @@ private:
     jtx::Account sponsor_;
 
 public:
-    counterpartySponsor(jtx::Account const& account) : sponsor_(account)
+    counterpartySponsor(jtx::Account  account) : sponsor_(std::move(account))
     {
     }
 
@@ -59,7 +61,7 @@ private:
     jtx::Account sponsee_;
 
 public:
-    sponseeAcc(jtx::Account const& account) : sponsee_(account)
+    sponseeAcc(jtx::Account  account) : sponsee_(std::move(account))
     {
     }
 
@@ -74,7 +76,7 @@ private:
     std::uint32_t flags;
 
 public:
-    as(jtx::Account const& account, std::uint32_t flags = 0) : sponsor_(account), flags(flags)
+    as(jtx::Account  account, std::uint32_t flags = 0) : sponsor_(std::move(account)), flags(flags)
     {
     }
 
@@ -85,7 +87,7 @@ public:
 Json::Value
 ledgerEntry(jtx::Env& env, jtx::Account const& sponsor, jtx::Account const& sponsee);
 
-}  // namespace sponsor
-}  // namespace jtx
-}  // namespace test
-}  // namespace xrpl
+} // namespace xrpl::test::jtx::sponsor
+
+
+
diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp
index 6c7a421739..d68dcd3f4a 100644
--- a/src/test/rpc/AccountObjects_test.cpp
+++ b/src/test/rpc/AccountObjects_test.cpp
@@ -31,6 +31,7 @@
 #include <xrpl/protocol/jss.h>
 #include <xrpl/protocol/nft.h>
 #include <xrpl/tx/transactors/nft/NFTokenMint.h>
+#include <xrpl/protocol/Indexes.h>
 
 #include <algorithm>
 #include <cstdint>