diff --git a/include/xrpl/tx/invariants/MPTInvariant.h b/include/xrpl/tx/invariants/MPTInvariant.h
index 60c1a3c041..d24bd65f14 100644
--- a/include/xrpl/tx/invariants/MPTInvariant.h
+++ b/include/xrpl/tx/invariants/MPTInvariant.h
@@ -86,7 +86,7 @@ private:
      * returns true if reqAuth is false or lsfMPTAuthorized was set at deletion.
      * For existing MPTokens, returns the result of requireAuth()
      */
-    bool
+    [[nodiscard]] bool
     isAuthorized(
         ReadView const& view,
         MPTID const& mptid,
diff --git a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
index f57294a855..5e56a82712 100644
--- a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
@@ -27,6 +27,7 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/protocol/nft.h>
 #include <xrpl/protocol/nftPageMask.h>
+#include <xrpl/protocol/UintTypes.h>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/src/libxrpl/ledger/helpers/OfferHelpers.cpp b/src/libxrpl/ledger/helpers/OfferHelpers.cpp
index d57066cfe2..b667822dc3 100644
--- a/src/libxrpl/ledger/helpers/OfferHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/OfferHelpers.cpp
@@ -10,6 +10,7 @@
 #include <xrpl/protocol/STArray.h>  // IWYU pragma: keep
 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 #include <memory>
 
diff --git a/src/libxrpl/ledger/helpers/TokenHelpers.cpp b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
index c48b2c1940..db3e7cd7f3 100644
--- a/src/libxrpl/ledger/helpers/TokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
@@ -28,6 +28,7 @@
 
 #include <cstdint>
 #include <initializer_list>
+#include <limits>
 #include <string>
 #include <variant>
 
diff --git a/src/libxrpl/protocol/Quality.cpp b/src/libxrpl/protocol/Quality.cpp
index 5f38f2219b..e6703b9c34 100644
--- a/src/libxrpl/protocol/Quality.cpp
+++ b/src/libxrpl/protocol/Quality.cpp
@@ -3,8 +3,10 @@
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/protocol/Asset.h>
 #include <xrpl/protocol/STAmount.h>
+#include <xrpl/beast/utility/Zero.h>
 
 #include <cstdint>
+#include <limits>
 
 namespace xrpl {
 
diff --git a/src/libxrpl/protocol/STInteger.cpp b/src/libxrpl/protocol/STInteger.cpp
index 0530a784d9..db6ca03410 100644
--- a/src/libxrpl/protocol/STInteger.cpp
+++ b/src/libxrpl/protocol/STInteger.cpp
@@ -16,6 +16,7 @@
 #include <cstdint>
 #include <iterator>
 #include <string>
+#include <system_error>
 
 namespace xrpl {
 
diff --git a/src/libxrpl/protocol/STNumber.cpp b/src/libxrpl/protocol/STNumber.cpp
index 25aa9eaa05..5bef719b12 100644
--- a/src/libxrpl/protocol/STNumber.cpp
+++ b/src/libxrpl/protocol/STNumber.cpp
@@ -15,6 +15,7 @@
 #include <boost/regex/v5/regbase.hpp>
 #include <boost/regex/v5/regex.hpp>
 #include <boost/regex/v5/regex_match.hpp>
+#include <xrpl/protocol/Rules.h>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/src/libxrpl/protocol/STValidation.cpp b/src/libxrpl/protocol/STValidation.cpp
index 14349d3f85..2d7114ccb4 100644
--- a/src/libxrpl/protocol/STValidation.cpp
+++ b/src/libxrpl/protocol/STValidation.cpp
@@ -12,6 +12,7 @@
 #include <xrpl/protocol/STBase.h>
 #include <xrpl/protocol/STObject.h>
 #include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/KeyType.h>
 
 #include <cstddef>
 #include <utility>
diff --git a/src/libxrpl/tx/transactors/dex/AMMCreate.cpp b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
index c68be0c5d9..e75ec7ae4e 100644
--- a/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
@@ -308,7 +308,7 @@ applyCreate(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::J
                 auto const& mptIssue = issue;
                 auto const& mptID = mptIssue.getMptID();
                 // Implicitly authorize MPT asset for AMM pseudo-account.
-                std::uint32_t flags = lsfMPTAMM | lsfMPTAuthorized;
+                std::uint32_t const flags = lsfMPTAMM | lsfMPTAuthorized;
                 if (auto const err = requireAuth(sb, mptIssue, accountId, AuthType::WeakAuth);
                     !isTesSuccess(err))
                 {
diff --git a/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp b/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
index 0eeb166335..b28e4e5359 100644
--- a/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
@@ -21,7 +21,6 @@
 #include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
-#include <xrpl/protocol/TxFormats.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
 
diff --git a/src/test/app/ClawbackMPT_test.cpp b/src/test/app/ClawbackMPT_test.cpp
index 67b548fb6e..c966ba7fdc 100644
--- a/src/test/app/ClawbackMPT_test.cpp
+++ b/src/test/app/ClawbackMPT_test.cpp
@@ -1,6 +1,20 @@
-#include <test/jtx.h>
 
 #include <xrpl/protocol/Feature.h>
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/TestHelpers.h>
+#include <test/jtx/amount.h>
+#include <test/jtx/mpt.h>
+#include <test/jtx/ter.h>
+#include <test/jtx/ticket.h>
+#include <test/jtx/trust.h>
+#include <test/jtx/txflags.h>
+#include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
+#include <cstdint>
 
 namespace xrpl {
 
diff --git a/src/test/app/PayChan_test.cpp b/src/test/app/PayChan_test.cpp
index 1f4376a656..90c5547d70 100644
--- a/src/test/app/PayChan_test.cpp
+++ b/src/test/app/PayChan_test.cpp
@@ -38,6 +38,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
+#include <xrpl/beast/utility/Zero.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/test/jtx/impl/amount.cpp b/src/test/jtx/impl/amount.cpp
index 1a02e07bdf..0d889b14c8 100644
--- a/src/test/jtx/impl/amount.cpp
+++ b/src/test/jtx/impl/amount.cpp
@@ -12,6 +12,7 @@
 #include <cstdint>
 #include <iomanip>
 #include <ios>
+#include <limits>
 #include <ostream>
 #include <sstream>
 #include <string>
diff --git a/src/test/rpc/DepositAuthorized_test.cpp b/src/test/rpc/DepositAuthorized_test.cpp
index 900adb5c7e..21e3bea9ed 100644
--- a/src/test/rpc/DepositAuthorized_test.cpp
+++ b/src/test/rpc/DepositAuthorized_test.cpp
@@ -11,6 +11,7 @@
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
+#include <xrpl/protocol/Protocol.h>
 
 #include <cassert>
 #include <cstdint>
diff --git a/src/xrpld/app/ledger/detail/BuildLedger.cpp b/src/xrpld/app/ledger/detail/BuildLedger.cpp
index 8f5184336a..2f69c3fe45 100644
--- a/src/xrpld/app/ledger/detail/BuildLedger.cpp
+++ b/src/xrpld/app/ledger/detail/BuildLedger.cpp
@@ -16,6 +16,8 @@
 #include <xrpl/protocol/LedgerHeader.h>
 #include <xrpl/protocol/Protocol.h>
 #include <xrpl/tx/apply.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/SystemParameters.h>
 
 #include <cstddef>
 #include <exception>
diff --git a/src/xrpld/app/ledger/detail/InboundLedger.cpp b/src/xrpld/app/ledger/detail/InboundLedger.cpp
index a65fae2ff3..5522dd0243 100644
--- a/src/xrpld/app/ledger/detail/InboundLedger.cpp
+++ b/src/xrpld/app/ledger/detail/InboundLedger.cpp
@@ -30,6 +30,8 @@
 #include <xrpl/shamap/SHAMapSyncFilter.h>
 
 #include <boost/iterator/function_output_iterator.hpp>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/SystemParameters.h>
 
 #include <xrpl.pb.h>
 
diff --git a/src/xrpld/app/ledger/detail/LedgerPersistence.cpp b/src/xrpld/app/ledger/detail/LedgerPersistence.cpp
index 0edf425f13..013327c287 100644
--- a/src/xrpld/app/ledger/detail/LedgerPersistence.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerPersistence.cpp
@@ -10,6 +10,8 @@
 #include <xrpl/ledger/PendingSaves.h>
 #include <xrpl/protocol/Rules.h>
 #include <xrpl/rdb/RelationalDatabase.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/SystemParameters.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/xrpld/app/ledger/detail/OpenLedger.cpp b/src/xrpld/app/ledger/detail/OpenLedger.cpp
index 5db4e23e1e..c2fd3ac006 100644
--- a/src/xrpld/app/ledger/detail/OpenLedger.cpp
+++ b/src/xrpld/app/ledger/detail/OpenLedger.cpp
@@ -23,6 +23,7 @@
 #include <xrpl/tx/apply.h>
 
 #include <boost/range/adaptor/transformed.hpp>
+#include <xrpl/protocol/SField.h>
 
 #include <xrpl.pb.h>
 
diff --git a/src/xrpld/app/main/Application.cpp b/src/xrpld/app/main/Application.cpp
index 005586eaba..acae8489f1 100644
--- a/src/xrpld/app/main/Application.cpp
+++ b/src/xrpld/app/main/Application.cpp
@@ -108,6 +108,8 @@
 #include <boost/system/detail/error_code.hpp>
 #include <boost/system/system_error.hpp>
 
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/SystemParameters.h>
 #include <date/date.h>
 
 #include <algorithm>
diff --git a/src/xrpld/app/misc/FeeVoteImpl.cpp b/src/xrpld/app/misc/FeeVoteImpl.cpp
index f6c60bc572..3a101ea914 100644
--- a/src/xrpld/app/misc/FeeVoteImpl.cpp
+++ b/src/xrpld/app/misc/FeeVoteImpl.cpp
@@ -18,6 +18,7 @@
 #include <xrpl/shamap/SHAMap.h>
 #include <xrpl/shamap/SHAMapItem.h>
 #include <xrpl/shamap/SHAMapTreeNode.h>
+#include <xrpl/protocol/Protocol.h>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp b/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp
index c093c5fcf5..02f96ece07 100644
--- a/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp
@@ -23,6 +23,7 @@
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/jss.h>
 
+#include <xrpl/protocol/Feature.h>
 #include <date/date.h>
 
 #include <chrono>