diff --git a/include/xrpl/tx/transactors/vault/VaultDeposit.h b/include/xrpl/tx/transactors/vault/VaultDeposit.h
index 3131f1cf47..13738c4e21 100644
--- a/include/xrpl/tx/transactors/vault/VaultDeposit.h
+++ b/include/xrpl/tx/transactors/vault/VaultDeposit.h
@@ -9,6 +9,8 @@
 #include <xrpl/tx/ApplyContext.h>
 #include <xrpl/tx/Transactor.h>
 
+#include <cstdint>
+
 namespace xrpl {
 
 class VaultDeposit : public Transactor
diff --git a/include/xrpl/tx/transactors/vault/VaultSet.h b/include/xrpl/tx/transactors/vault/VaultSet.h
index 0d7664eb3b..c422227d59 100644
--- a/include/xrpl/tx/transactors/vault/VaultSet.h
+++ b/include/xrpl/tx/transactors/vault/VaultSet.h
@@ -9,6 +9,8 @@
 #include <xrpl/tx/ApplyContext.h>
 #include <xrpl/tx/Transactor.h>
 
+#include <cstdint>
+
 namespace xrpl {
 
 class VaultSet : public Transactor
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
index fe1ad23338..f2f916e145 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
@@ -12,6 +12,7 @@
 #include <xrpl/ledger/helpers/TokenHelpers.h>
 #include <xrpl/ledger/helpers/VaultHelpers.h>
 #include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Asset.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Protocol.h>
diff --git a/src/test/app/VaultDepositLossInvariantRounding_test.cpp b/src/test/app/VaultDepositLossInvariantRounding_test.cpp
index ae8ca54e19..0ddfb7d37d 100644
--- a/src/test/app/VaultDepositLossInvariantRounding_test.cpp
+++ b/src/test/app/VaultDepositLossInvariantRounding_test.cpp
@@ -1,4 +1,6 @@
+#include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
+#include <test/jtx/amount.h>
 #include <test/jtx/pay.h>
 #include <test/jtx/ter.h>
 #include <test/jtx/trust.h>
@@ -6,12 +8,13 @@
 
 #include <xrpl/basics/Number.h>
 #include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/OpenView.h>
 #include <xrpl/ledger/Sandbox.h>
-#include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Keylet.h>
 #include <xrpl/protocol/SField.h>
-#include <xrpl/protocol/STNumber.h>
+#include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
 
 namespace xrpl {
@@ -84,7 +87,7 @@ class VaultDepositLossInvariantRounding_test : public beast::unit_test::Suite
 
         // Seed so the vault has outstanding shares (a donation needs them), then force the
         // lawful loss pre-state.
-        Vault vault{env};
+        Vault const vault{env};
         auto const [tx, keylet] = vault.create({.owner = owner, .asset = asset.raw()});
         env(tx);
         env.close();
diff --git a/src/test/app/VaultDustDebit_test.cpp b/src/test/app/VaultDustDebit_test.cpp
index 2cff1b5e3b..1dc5e6fac6 100644
--- a/src/test/app/VaultDustDebit_test.cpp
+++ b/src/test/app/VaultDustDebit_test.cpp
@@ -1,5 +1,5 @@
 #include <test/jtx/Env.h>
-#include <test/jtx/fee.h>
+#include <test/jtx/amount.h>
 #include <test/jtx/flags.h>
 #include <test/jtx/pay.h>
 #include <test/jtx/ter.h>
@@ -13,7 +13,8 @@
 #include <xrpl/protocol/MPTIssue.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STAmount.h>
-#include <xrpl/protocol/STNumber.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
 
 #include <cstdint>
 #include <string>
@@ -34,8 +35,8 @@ class VaultDustDebit_test : public beast::unit_test::Suite
         Number assetsTotal;
         Number assetsAvailable;
         Number pseudoLine;  // vault pseudo-account trust line
-        std::uint64_t sharesTotal;
-        std::uint64_t holderShares;
+        std::uint64_t sharesTotal{};
+        std::uint64_t holderShares{};
     };
 
     static VaultData
@@ -96,7 +97,7 @@ class VaultDustDebit_test : public beast::unit_test::Suite
         env(pay(issuer, owner, asset(donation)));
         env.close();
 
-        Vault vault{env};
+        Vault const vault{env};
         auto const [tx, keylet] = vault.create({.owner = owner, .asset = asset.raw()});
         env(tx);
         env.close();
diff --git a/src/test/app/lending/LoanCashBasis_test.cpp b/src/test/app/lending/LoanCashBasis_test.cpp
index a5a6e2a6a0..8f65216c77 100644
--- a/src/test/app/lending/LoanCashBasis_test.cpp
+++ b/src/test/app/lending/LoanCashBasis_test.cpp
@@ -27,6 +27,7 @@
 #include <chrono>
 #include <cstdint>
 #include <functional>
+#include <optional>
 #include <string>
 #include <tuple>
 
diff --git a/src/test/app/lending/LoanSet_test.cpp b/src/test/app/lending/LoanSet_test.cpp
index ab21e46f99..5106fbc1d1 100644
--- a/src/test/app/lending/LoanSet_test.cpp
+++ b/src/test/app/lending/LoanSet_test.cpp
@@ -1152,9 +1152,13 @@ private:
 
             Number const destAfter = env.balance(borrower, usd.raw()).number();
             if (isTesSuccess(expected))
+            {
                 BEAST_EXPECT(destAfter == destBefore + Number{100});
+            }
             else
+            {
                 BEAST_EXPECT(destAfter == destBefore);
+            }
         };
 
         run(all_ - fixCleanup3_4_0, terNO_RIPPLE);
diff --git a/src/test/app/vault/VaultBlockDeposit_test.cpp b/src/test/app/vault/VaultBlockDeposit_test.cpp
index 929b575537..e392607689 100644
--- a/src/test/app/vault/VaultBlockDeposit_test.cpp
+++ b/src/test/app/vault/VaultBlockDeposit_test.cpp
@@ -4,12 +4,11 @@
 #include <test/jtx/amount.h>
 #include <test/jtx/pay.h>
 #include <test/jtx/ter.h>
-#include <test/jtx/trust.h>
 #include <test/jtx/vault.h>
 
 #include <xrpl/beast/unit_test/suite.h>
 #include <xrpl/protocol/Feature.h>
-#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Issue.h>
 #include <xrpl/protocol/Keylet.h>
 #include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/TER.h>
diff --git a/src/test/app/vault/VaultDonate_test.cpp b/src/test/app/vault/VaultDonate_test.cpp
index 8d0d5cc13d..de0b760ddf 100644
--- a/src/test/app/vault/VaultDonate_test.cpp
+++ b/src/test/app/vault/VaultDonate_test.cpp
@@ -9,9 +9,9 @@
 #include <xrpl/protocol/Asset.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Issue.h>
 #include <xrpl/protocol/Keylet.h>
 #include <xrpl/protocol/SField.h>
-#include <xrpl/protocol/STNumber.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>