From dc75de050d2558d688b421bdbd532ee50539b898 Mon Sep 17 00:00:00 2001
From: Mayukha Vadari <mvadari@gmail.com>
Date: Tue, 11 Aug 2026 14:29:56 -0400
Subject: [PATCH] fix clang-tidy

---
 include/xrpl/ledger/helpers/AMMEntry.h                    | 2 +-
 include/xrpl/ledger/helpers/AccountRootEntry.h            | 1 +
 include/xrpl/ledger/helpers/AmendmentsEntry.h             | 1 +
 include/xrpl/ledger/helpers/BridgeEntry.h                 | 1 +
 include/xrpl/ledger/helpers/CheckEntry.h                  | 2 +-
 include/xrpl/ledger/helpers/CredentialEntry.h             | 2 +-
 include/xrpl/ledger/helpers/CredentialHelpers.h           | 6 ------
 include/xrpl/ledger/helpers/DIDEntry.h                    | 1 +
 include/xrpl/ledger/helpers/DelegateEntry.h               | 1 +
 include/xrpl/ledger/helpers/DepositPreauthEntry.h         | 6 +-----
 include/xrpl/ledger/helpers/DirectoryNodeEntry.h          | 4 +---
 include/xrpl/ledger/helpers/EscrowEntry.h                 | 3 +--
 include/xrpl/ledger/helpers/EscrowHelpers.h               | 5 -----
 include/xrpl/ledger/helpers/FeeSettingsEntry.h            | 1 +
 include/xrpl/ledger/helpers/LedgerHashesEntry.h           | 1 +
 include/xrpl/ledger/helpers/LoanBrokerEntry.h             | 2 +-
 include/xrpl/ledger/helpers/LoanEntry.h                   | 3 +--
 include/xrpl/ledger/helpers/MPTokenEntry.h                | 4 +---
 include/xrpl/ledger/helpers/MPTokenIssuanceEntry.h        | 3 +--
 include/xrpl/ledger/helpers/NFTokenOfferEntry.h           | 2 +-
 include/xrpl/ledger/helpers/NFTokenPageEntry.h            | 3 +--
 include/xrpl/ledger/helpers/NegativeUNLEntry.h            | 1 +
 include/xrpl/ledger/helpers/OfferEntry.h                  | 2 +-
 include/xrpl/ledger/helpers/OracleEntry.h                 | 3 +--
 include/xrpl/ledger/helpers/PayChannelEntry.h             | 3 +--
 include/xrpl/ledger/helpers/PermissionedDomainEntry.h     | 2 +-
 include/xrpl/ledger/helpers/RippleStateEntry.h            | 1 +
 include/xrpl/ledger/helpers/SLEBase.h                     | 8 ++------
 include/xrpl/ledger/helpers/SignerListEntry.h             | 1 +
 include/xrpl/ledger/helpers/SponsorshipEntry.h            | 1 +
 include/xrpl/ledger/helpers/TicketEntry.h                 | 2 +-
 include/xrpl/ledger/helpers/VaultEntry.h                  | 2 +-
 include/xrpl/ledger/helpers/XChainOwnedClaimIDEntry.h     | 3 +--
 .../ledger/helpers/XChainOwnedCreateAccountClaimIDEntry.h | 3 +--
 34 files changed, 33 insertions(+), 53 deletions(-)

diff --git a/include/xrpl/ledger/helpers/AMMEntry.h b/include/xrpl/ledger/helpers/AMMEntry.h
index 3ba1bd2810..09e4f91833 100644
--- a/include/xrpl/ledger/helpers/AMMEntry.h
+++ b/include/xrpl/ledger/helpers/AMMEntry.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/Asset.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/AccountRootEntry.h b/include/xrpl/ledger/helpers/AccountRootEntry.h
index 753dd7e1e6..a1ffab1c50 100644
--- a/include/xrpl/ledger/helpers/AccountRootEntry.h
+++ b/include/xrpl/ledger/helpers/AccountRootEntry.h
@@ -6,6 +6,7 @@
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/AmendmentsEntry.h b/include/xrpl/ledger/helpers/AmendmentsEntry.h
index 23fb04077a..ffba2d02c4 100644
--- a/include/xrpl/ledger/helpers/AmendmentsEntry.h
+++ b/include/xrpl/ledger/helpers/AmendmentsEntry.h
@@ -5,6 +5,7 @@
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/BridgeEntry.h b/include/xrpl/ledger/helpers/BridgeEntry.h
index a0074fb3dc..5bffb45bd0 100644
--- a/include/xrpl/ledger/helpers/BridgeEntry.h
+++ b/include/xrpl/ledger/helpers/BridgeEntry.h
@@ -5,6 +5,7 @@
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/STXChainBridge.h>
 
 namespace xrpl {
diff --git a/include/xrpl/ledger/helpers/CheckEntry.h b/include/xrpl/ledger/helpers/CheckEntry.h
index c39a2c6c26..4cc7da2a2c 100644
--- a/include/xrpl/ledger/helpers/CheckEntry.h
+++ b/include/xrpl/ledger/helpers/CheckEntry.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 #include <cstdint>
 
diff --git a/include/xrpl/ledger/helpers/CredentialEntry.h b/include/xrpl/ledger/helpers/CredentialEntry.h
index 0667611c64..7693acb3fb 100644
--- a/include/xrpl/ledger/helpers/CredentialEntry.h
+++ b/include/xrpl/ledger/helpers/CredentialEntry.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include <xrpl/basics/Slice.h>
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/CredentialHelpers.h b/include/xrpl/ledger/helpers/CredentialHelpers.h
index 8e78a00923..37bc19ac5b 100644
--- a/include/xrpl/ledger/helpers/CredentialHelpers.h
+++ b/include/xrpl/ledger/helpers/CredentialHelpers.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <xrpl/basics/Slice.h>
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/basics/chrono.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
@@ -11,11 +8,8 @@
 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/STVector256.h>
-#include <xrpl/protocol/TER.h>
 
 #include <memory>
-#include <set>
-#include <utility>
 
 namespace xrpl {
 namespace credentials {
diff --git a/include/xrpl/ledger/helpers/DIDEntry.h b/include/xrpl/ledger/helpers/DIDEntry.h
index 06af384164..d9994fa320 100644
--- a/include/xrpl/ledger/helpers/DIDEntry.h
+++ b/include/xrpl/ledger/helpers/DIDEntry.h
@@ -6,6 +6,7 @@
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/DelegateEntry.h b/include/xrpl/ledger/helpers/DelegateEntry.h
index 0ece4918be..ec742b860c 100644
--- a/include/xrpl/ledger/helpers/DelegateEntry.h
+++ b/include/xrpl/ledger/helpers/DelegateEntry.h
@@ -6,6 +6,7 @@
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/DepositPreauthEntry.h b/include/xrpl/ledger/helpers/DepositPreauthEntry.h
index 48d07d018e..0aca6d9f04 100644
--- a/include/xrpl/ledger/helpers/DepositPreauthEntry.h
+++ b/include/xrpl/ledger/helpers/DepositPreauthEntry.h
@@ -1,16 +1,12 @@
 #pragma once
 
-#include <xrpl/basics/Slice.h>
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
-
-#include <set>
-#include <utility>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/DirectoryNodeEntry.h b/include/xrpl/ledger/helpers/DirectoryNodeEntry.h
index 2bf09d8f8d..978d38e06e 100644
--- a/include/xrpl/ledger/helpers/DirectoryNodeEntry.h
+++ b/include/xrpl/ledger/helpers/DirectoryNodeEntry.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
-
-#include <cstdint>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/EscrowEntry.h b/include/xrpl/ledger/helpers/EscrowEntry.h
index 7a9b6a4ebf..382e5b5b40 100644
--- a/include/xrpl/ledger/helpers/EscrowEntry.h
+++ b/include/xrpl/ledger/helpers/EscrowEntry.h
@@ -6,8 +6,7 @@
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
-
-#include <cstdint>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/EscrowHelpers.h b/include/xrpl/ledger/helpers/EscrowHelpers.h
index 9f54e53769..bae7c35c90 100644
--- a/include/xrpl/ledger/helpers/EscrowHelpers.h
+++ b/include/xrpl/ledger/helpers/EscrowHelpers.h
@@ -4,17 +4,12 @@
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
-#include <xrpl/ledger/helpers/MPTokenHelpers.h>
-#include <xrpl/ledger/helpers/RippleStateHelpers.h>
-#include <xrpl/ledger/helpers/SponsorHelpers.h>
 #include <xrpl/ledger/helpers/TokenHelpers.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Concepts.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/MPTIssue.h>
 #include <xrpl/protocol/Rate.h>
 #include <xrpl/protocol/SField.h>
diff --git a/include/xrpl/ledger/helpers/FeeSettingsEntry.h b/include/xrpl/ledger/helpers/FeeSettingsEntry.h
index 773fbaf0c0..e042ebb3e5 100644
--- a/include/xrpl/ledger/helpers/FeeSettingsEntry.h
+++ b/include/xrpl/ledger/helpers/FeeSettingsEntry.h
@@ -5,6 +5,7 @@
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/LedgerHashesEntry.h b/include/xrpl/ledger/helpers/LedgerHashesEntry.h
index 3db29839e1..c931e0593f 100644
--- a/include/xrpl/ledger/helpers/LedgerHashesEntry.h
+++ b/include/xrpl/ledger/helpers/LedgerHashesEntry.h
@@ -5,6 +5,7 @@
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/LoanBrokerEntry.h b/include/xrpl/ledger/helpers/LoanBrokerEntry.h
index e750897f4a..d2877f7d7f 100644
--- a/include/xrpl/ledger/helpers/LoanBrokerEntry.h
+++ b/include/xrpl/ledger/helpers/LoanBrokerEntry.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 #include <cstdint>
 
diff --git a/include/xrpl/ledger/helpers/LoanEntry.h b/include/xrpl/ledger/helpers/LoanEntry.h
index f5a8353614..b4c81d55d7 100644
--- a/include/xrpl/ledger/helpers/LoanEntry.h
+++ b/include/xrpl/ledger/helpers/LoanEntry.h
@@ -1,11 +1,10 @@
 #pragma once
 
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 #include <cstdint>
 
diff --git a/include/xrpl/ledger/helpers/MPTokenEntry.h b/include/xrpl/ledger/helpers/MPTokenEntry.h
index 4d06cdf9fb..928fcaf4ee 100644
--- a/include/xrpl/ledger/helpers/MPTokenEntry.h
+++ b/include/xrpl/ledger/helpers/MPTokenEntry.h
@@ -1,13 +1,11 @@
 #pragma once
 
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/MPTokenIssuanceEntry.h b/include/xrpl/ledger/helpers/MPTokenIssuanceEntry.h
index e153d543bd..3b7af1e851 100644
--- a/include/xrpl/ledger/helpers/MPTokenIssuanceEntry.h
+++ b/include/xrpl/ledger/helpers/MPTokenIssuanceEntry.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 #include <cstdint>
 
diff --git a/include/xrpl/ledger/helpers/NFTokenOfferEntry.h b/include/xrpl/ledger/helpers/NFTokenOfferEntry.h
index 4b4076be74..236a731684 100644
--- a/include/xrpl/ledger/helpers/NFTokenOfferEntry.h
+++ b/include/xrpl/ledger/helpers/NFTokenOfferEntry.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 #include <cstdint>
 
diff --git a/include/xrpl/ledger/helpers/NFTokenPageEntry.h b/include/xrpl/ledger/helpers/NFTokenPageEntry.h
index 3f422557bb..131221146c 100644
--- a/include/xrpl/ledger/helpers/NFTokenPageEntry.h
+++ b/include/xrpl/ledger/helpers/NFTokenPageEntry.h
@@ -1,12 +1,11 @@
 #pragma once
 
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Keylet.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/NegativeUNLEntry.h b/include/xrpl/ledger/helpers/NegativeUNLEntry.h
index fc19d5b951..2d874b8cda 100644
--- a/include/xrpl/ledger/helpers/NegativeUNLEntry.h
+++ b/include/xrpl/ledger/helpers/NegativeUNLEntry.h
@@ -5,6 +5,7 @@
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/OfferEntry.h b/include/xrpl/ledger/helpers/OfferEntry.h
index a6df3ed183..e43968351e 100644
--- a/include/xrpl/ledger/helpers/OfferEntry.h
+++ b/include/xrpl/ledger/helpers/OfferEntry.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 #include <cstdint>
 
diff --git a/include/xrpl/ledger/helpers/OracleEntry.h b/include/xrpl/ledger/helpers/OracleEntry.h
index 78e2ee3120..57a98a996a 100644
--- a/include/xrpl/ledger/helpers/OracleEntry.h
+++ b/include/xrpl/ledger/helpers/OracleEntry.h
@@ -6,8 +6,7 @@
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
-
-#include <cstdint>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/PayChannelEntry.h b/include/xrpl/ledger/helpers/PayChannelEntry.h
index fe4f5d40b6..efb79b6807 100644
--- a/include/xrpl/ledger/helpers/PayChannelEntry.h
+++ b/include/xrpl/ledger/helpers/PayChannelEntry.h
@@ -6,8 +6,7 @@
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
-
-#include <cstdint>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/PermissionedDomainEntry.h b/include/xrpl/ledger/helpers/PermissionedDomainEntry.h
index e5526a3e84..da72823a8b 100644
--- a/include/xrpl/ledger/helpers/PermissionedDomainEntry.h
+++ b/include/xrpl/ledger/helpers/PermissionedDomainEntry.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 #include <cstdint>
 
diff --git a/include/xrpl/ledger/helpers/RippleStateEntry.h b/include/xrpl/ledger/helpers/RippleStateEntry.h
index 729f2cbb63..5b1364f10a 100644
--- a/include/xrpl/ledger/helpers/RippleStateEntry.h
+++ b/include/xrpl/ledger/helpers/RippleStateEntry.h
@@ -7,6 +7,7 @@
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/UintTypes.h>
 
 namespace xrpl {
diff --git a/include/xrpl/ledger/helpers/SLEBase.h b/include/xrpl/ledger/helpers/SLEBase.h
index fcc4a738da..b839e2d931 100644
--- a/include/xrpl/ledger/helpers/SLEBase.h
+++ b/include/xrpl/ledger/helpers/SLEBase.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/ledger/ApplyView.h>
@@ -10,9 +9,6 @@
 #include <xrpl/protocol/STLedgerEntry.h>
 
 #include <concepts>
-#include <memory>
-#include <type_traits>
-#include <utility>
 
 namespace xrpl {
 
@@ -426,7 +422,7 @@ public:
     }
 
 protected:
-    view_ref_type view_;
+    view_ref_type view_{} {};
 
     // Keylet is only meaningful for writable views, which need it to build an
     // SLE that does not exist yet; read-only wrappers derive it from the entry.
@@ -436,7 +432,7 @@ protected:
     // No default member initializer: Keylet is not default-constructible, so
     // every writable constructor must initialize key_ explicitly.
     [[no_unique_address]]
-    std::conditional_t<kIsWritable, Keylet, Empty> key_;
+    std::conditional_t<kIsWritable, Keylet, Empty> key_{} {};
 
     sle_ptr_type sle_{};
     beast::Journal j_;
diff --git a/include/xrpl/ledger/helpers/SignerListEntry.h b/include/xrpl/ledger/helpers/SignerListEntry.h
index 6c35cc6282..da453175a8 100644
--- a/include/xrpl/ledger/helpers/SignerListEntry.h
+++ b/include/xrpl/ledger/helpers/SignerListEntry.h
@@ -6,6 +6,7 @@
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/SponsorshipEntry.h b/include/xrpl/ledger/helpers/SponsorshipEntry.h
index f980a93aef..cebb8a3d9a 100644
--- a/include/xrpl/ledger/helpers/SponsorshipEntry.h
+++ b/include/xrpl/ledger/helpers/SponsorshipEntry.h
@@ -6,6 +6,7 @@
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 namespace xrpl {
 
diff --git a/include/xrpl/ledger/helpers/TicketEntry.h b/include/xrpl/ledger/helpers/TicketEntry.h
index 2210b5e316..520df92c4e 100644
--- a/include/xrpl/ledger/helpers/TicketEntry.h
+++ b/include/xrpl/ledger/helpers/TicketEntry.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/SeqProxy.h>
 
 #include <cstdint>
diff --git a/include/xrpl/ledger/helpers/VaultEntry.h b/include/xrpl/ledger/helpers/VaultEntry.h
index 7d82153d63..f3348cadc8 100644
--- a/include/xrpl/ledger/helpers/VaultEntry.h
+++ b/include/xrpl/ledger/helpers/VaultEntry.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 
 #include <cstdint>
 
diff --git a/include/xrpl/ledger/helpers/XChainOwnedClaimIDEntry.h b/include/xrpl/ledger/helpers/XChainOwnedClaimIDEntry.h
index 4dc46dc559..171415df32 100644
--- a/include/xrpl/ledger/helpers/XChainOwnedClaimIDEntry.h
+++ b/include/xrpl/ledger/helpers/XChainOwnedClaimIDEntry.h
@@ -5,10 +5,9 @@
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/STXChainBridge.h>
 
-#include <cstdint>
-
 namespace xrpl {
 
 template <typename ViewT>
diff --git a/include/xrpl/ledger/helpers/XChainOwnedCreateAccountClaimIDEntry.h b/include/xrpl/ledger/helpers/XChainOwnedCreateAccountClaimIDEntry.h
index 2e243520a6..8ccd4ec55c 100644
--- a/include/xrpl/ledger/helpers/XChainOwnedCreateAccountClaimIDEntry.h
+++ b/include/xrpl/ledger/helpers/XChainOwnedCreateAccountClaimIDEntry.h
@@ -5,10 +5,9 @@
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/SLEBase.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/STXChainBridge.h>
 
-#include <cstdint>
-
 namespace xrpl {
 
 template <typename ViewT>