diff --git a/src/xrpld/app/consensus/RCLConsensus.cpp b/src/xrpld/app/consensus/RCLConsensus.cpp
index 4a50cc696c..eb040f231f 100644
--- a/src/xrpld/app/consensus/RCLConsensus.cpp
+++ b/src/xrpld/app/consensus/RCLConsensus.cpp
@@ -62,7 +62,7 @@
 #include <xrpl/shamap/SHAMapItem.h>
 #include <xrpl/shamap/SHAMapMissingNode.h>
 #include <xrpl/shamap/SHAMapTreeNode.h>
-#include <xrpl/telemetry/TraceContextPropagator.h>
+#include <xrpl/telemetry/TraceContextPropagator.h>  // IWYU pragma: keep
 
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 
diff --git a/src/xrpld/app/misc/TxSpanNames.h b/src/xrpld/app/misc/TxSpanNames.h
index 2cfd6527d0..091213959e 100644
--- a/src/xrpld/app/misc/TxSpanNames.h
+++ b/src/xrpld/app/misc/TxSpanNames.h
@@ -17,9 +17,7 @@
 
 #include <xrpl/telemetry/SpanNames.h>
 
-namespace xrpl {
-namespace telemetry {
-namespace tx_span {
+namespace xrpl::telemetry::tx_span {
 
 // ===== Span prefixes =======================================================
 
@@ -72,6 +70,4 @@ inline constexpr auto async = makeStr("async");
 inline constexpr auto knownBad = makeStr("known_bad");
 }  // namespace val
 
-}  // namespace tx_span
-}  // namespace telemetry
-}  // namespace xrpl
+}  // namespace xrpl::telemetry::tx_span
diff --git a/src/xrpld/app/misc/detail/TxQ.cpp b/src/xrpld/app/misc/detail/TxQ.cpp
index 32842ab9ad..e263eba22a 100644
--- a/src/xrpld/app/misc/detail/TxQ.cpp
+++ b/src/xrpld/app/misc/detail/TxQ.cpp
@@ -6,6 +6,7 @@
 
 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/basics/Log.h>
+#include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/mulDiv.h>
 #include <xrpl/beast/utility/Zero.h>
@@ -30,7 +31,6 @@
 #include <xrpl/protocol/Units.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/protocol/jss.h>
-#include <xrpl/protocol/st.h>
 #include <xrpl/telemetry/SpanGuard.h>
 #include <xrpl/tx/apply.h>
 #include <xrpl/tx/applySteps.h>
@@ -532,7 +532,7 @@ TxQ::tryClearAccountQueueUpThruTx(
     beast::Journal j)
 {
     using namespace telemetry;
-    auto span = SpanGuard::span(
+    [[maybe_unused]] auto span = SpanGuard::span(
         TraceCategory::Transactions, txq_span::prefix::txq, txq_span::op::batchClear);
 
     SeqProxy const tSeqProx{tx.getSeqProxy()};
@@ -1681,7 +1681,7 @@ TxQ::tryDirectApply(
     beast::Journal j)
 {
     using namespace telemetry;
-    auto span = SpanGuard::span(
+    [[maybe_unused]] auto span = SpanGuard::span(
         TraceCategory::Transactions, txq_span::prefix::txq, txq_span::op::applyDirect);
 
     auto const account = (*tx)[sfAccount];
diff --git a/src/xrpld/app/misc/detail/TxQSpanNames.h b/src/xrpld/app/misc/detail/TxQSpanNames.h
index 6989674341..4f18e82ae7 100644
--- a/src/xrpld/app/misc/detail/TxQSpanNames.h
+++ b/src/xrpld/app/misc/detail/TxQSpanNames.h
@@ -48,9 +48,7 @@
 
 #include <xrpl/telemetry/SpanNames.h>
 
-namespace xrpl {
-namespace telemetry {
-namespace txq_span {
+namespace xrpl::telemetry::txq_span {
 
 // ===== Span prefixes =======================================================
 
@@ -110,6 +108,4 @@ inline constexpr auto failed = makeStr("failed");
 inline constexpr auto retried = makeStr("retried");
 }  // namespace val
 
-}  // namespace txq_span
-}  // namespace telemetry
-}  // namespace xrpl
+}  // namespace xrpl::telemetry::txq_span
diff --git a/src/xrpld/telemetry/ConsensusReceiveTracing.h b/src/xrpld/telemetry/ConsensusReceiveTracing.h
index a53f2685f8..6da9900fab 100644
--- a/src/xrpld/telemetry/ConsensusReceiveTracing.h
+++ b/src/xrpld/telemetry/ConsensusReceiveTracing.h
@@ -39,8 +39,7 @@
 #include <xrpl/proto/xrpl.pb.h>
 #include <xrpl/telemetry/SpanGuard.h>
 
-namespace xrpl {
-namespace telemetry {
+namespace xrpl::telemetry {
 
 // Inline span name constants for consensus receive spans.
 // Phase 4 will provide these via ConsensusSpanNames.h; these are
@@ -123,5 +122,4 @@ validationReceiveSpan([[maybe_unused]] protocol::TMValidation const& msg)
     return SpanGuard::span(TraceCategory::Consensus, "consensus", "validation.receive");
 }
 
-}  // namespace telemetry
-}  // namespace xrpl
+}  // namespace xrpl::telemetry
diff --git a/src/xrpld/telemetry/PropagationHelpers.h b/src/xrpld/telemetry/PropagationHelpers.h
index c051026b74..44959ae039 100644
--- a/src/xrpld/telemetry/PropagationHelpers.h
+++ b/src/xrpld/telemetry/PropagationHelpers.h
@@ -32,8 +32,7 @@
 #include <xrpl/proto/xrpl.pb.h>
 #include <xrpl/telemetry/SpanGuard.h>
 
-namespace xrpl {
-namespace telemetry {
+namespace xrpl::telemetry {
 
 /** Inject trace context from an active SpanGuard into a protobuf
  *  TraceContext message for cross-node propagation.
@@ -58,5 +57,4 @@ injectSpanContext(SpanGuard const& span, protocol::TraceContext& proto)
     proto.set_trace_flags(bytes.traceFlags);
 }
 
-}  // namespace telemetry
-}  // namespace xrpl
+}  // namespace xrpl::telemetry
diff --git a/src/xrpld/telemetry/TxTracing.h b/src/xrpld/telemetry/TxTracing.h
index e466c45a6c..68b4903f88 100644
--- a/src/xrpld/telemetry/TxTracing.h
+++ b/src/xrpld/telemetry/TxTracing.h
@@ -16,8 +16,7 @@
 #include <xrpl/proto/xrpl.pb.h>
 #include <xrpl/telemetry/SpanGuard.h>
 
-namespace xrpl {
-namespace telemetry {
+namespace xrpl::telemetry {
 
 /** Create a "tx.receive" span for a transaction received from a peer.
  *  trace_id is derived from txID[0:16]. If the incoming message carries
@@ -59,5 +58,4 @@ txProcessSpan(uint256 const& txID)
         TraceCategory::Transactions, tx_span::process, txID.data(), txID.bytes);
 }
 
-}  // namespace telemetry
-}  // namespace xrpl
+}  // namespace xrpl::telemetry