From 89028a2ec6b439f6dcf7d9fad86d55d15d05af07 Mon Sep 17 00:00:00 2001
From: Vito <5780819+Tapanito@users.noreply.github.com>
Date: Tue, 22 Sep 2026 15:48:20 +0200
Subject: [PATCH] style: Fix clang-tidy include-cleaner, braces, and
 return-move warnings

---
 include/xrpl/ledger/helpers/LendingHelpers.h               | 1 -
 .../tx/transactors/lending/LoanBrokerCoverClawback.cpp     | 4 ++--
 .../tx/transactors/lending/LoanBrokerCoverDeposit.cpp      | 7 ++++++-
 .../tx/transactors/lending/LoanBrokerCoverWithdraw.cpp     | 2 +-
 src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp       | 1 +
 src/test/app/lending/LendingHelpers_test.cpp               | 1 -
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/include/xrpl/ledger/helpers/LendingHelpers.h b/include/xrpl/ledger/helpers/LendingHelpers.h
index 148f995f5b..0112892ab5 100644
--- a/include/xrpl/ledger/helpers/LendingHelpers.h
+++ b/include/xrpl/ledger/helpers/LendingHelpers.h
@@ -10,7 +10,6 @@
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Asset.h>
 #include <xrpl/protocol/LedgerFormats.h>  // IWYU pragma: keep
-#include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STAmount.h>
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp
index 8b35214068..b04a36c41a 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp
@@ -191,7 +191,7 @@ determineClawAmount(
     // Use the vaultAsset here, because it will be the right type in all
     // circumstances. The amount may be an IOU indicating the pseudo-account's
     // asset, which is correct, but not what is needed here.
-    STAmount const requested = [&] {
+    STAmount requested = [&] {
         if (!amount || *amount == beast::kZero)
             return STAmount{vaultAsset, maxClawAmount};
         Number const magnitude{*amount};
@@ -204,7 +204,7 @@ determineClawAmount(
         return requested;
 
     // Negate so the posterior is CoverAvailable minus amount.
-    STAmount const rounded = -roundToPosteriorBrokerCoverScale(
+    STAmount rounded = -roundToPosteriorBrokerCoverScale(
         vaultSle, sleBroker, -requested, Number::RoundingMode::TowardsZero);
     if (rounded == beast::kZero)
         return std::unexpected(tecPRECISION_LOSS);
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp
index 2f8caeec04..6c7b1caad5 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp
@@ -8,6 +8,7 @@
 #include <xrpl/ledger/helpers/VaultHelpers.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/STLedgerEntry.h>
@@ -106,10 +107,12 @@ LoanBrokerCoverDeposit::preclaim(PreclaimContext const& ctx)
     // failing only in  doApply.
     auto const roundedAmount = [&]() -> STAmount {
         if (getVaultVersion(vault) == VaultVersion::FixedPrecision)
+        {
             return roundToPosteriorBrokerCoverScale(
                 vault, sleBroker, amount, Number::RoundingMode::TowardsZero);
+        }
         if (!fix320Enabled)
-            return amount;
+            return STAmount{amount};
 
         return roundToScale(
             amount,
@@ -165,8 +168,10 @@ LoanBrokerCoverDeposit::doApply()
     bool const fix320Enabled = view().rules().enabled(fixCleanup3_2_0);
     auto const amount = [&]() -> STAmount {
         if (getVaultVersion(vault) == VaultVersion::FixedPrecision)
+        {
             return roundToPosteriorBrokerCoverScale(
                 vault, broker, tx[sfAmount], Number::RoundingMode::TowardsZero);
+        }
         if (!fix320Enabled)
             return tx[sfAmount];
 
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
index b226b3c384..71c6648be0 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
@@ -106,7 +106,7 @@ LoanBrokerCoverWithdraw::preclaim(PreclaimContext const& ctx)
 
     auto const roundedAmount = [&] {
         if (getVaultVersion(vault) != VaultVersion::FixedPrecision)
-            return amount;
+            return STAmount{amount};
         // Negate so the posterior is CoverAvailable minus amount.
         return -roundToPosteriorBrokerCoverScale(
             vault, sleBroker, -amount, Number::RoundingMode::TowardsZero);
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
index cdfd3e1ef5..183534ccbe 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
@@ -14,6 +14,7 @@
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/STNumber.h>
 #include <xrpl/protocol/STTakesAsset.h>
diff --git a/src/test/app/lending/LendingHelpers_test.cpp b/src/test/app/lending/LendingHelpers_test.cpp
index e2ef5ba6a3..642986035c 100644
--- a/src/test/app/lending/LendingHelpers_test.cpp
+++ b/src/test/app/lending/LendingHelpers_test.cpp
@@ -24,7 +24,6 @@
 #include <xrpl/protocol/SeqProxy.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
-#include <xrpl/protocol/UintTypes.h>
 #include <xrpl/protocol/Units.h>
 
 #include <cstdint>