diff --git a/include/xrpl/telemetry/TraceContextPropagator.h b/include/xrpl/telemetry/TraceContextPropagator.h
index 3f400860fb..0430b38f37 100644
--- a/include/xrpl/telemetry/TraceContextPropagator.h
+++ b/include/xrpl/telemetry/TraceContextPropagator.h
@@ -27,8 +27,7 @@
 
 #include <cstdint>
 
-namespace xrpl {
-namespace telemetry {
+namespace xrpl::telemetry {
 
 /** Extract OTel context from a protobuf TraceContext message.
 
@@ -101,7 +100,6 @@ injectToProtobuf(opentelemetry::context::Context const& ctx, protocol::TraceCont
     // Wire trace_state through inject/extract once the consumer lands.
 }
 
-}  // namespace telemetry
-}  // namespace xrpl
+}  // namespace xrpl::telemetry
 
 #endif  // XRPL_ENABLE_TELEMETRY
diff --git a/src/libxrpl/telemetry/NullTelemetry.cpp b/src/libxrpl/telemetry/NullTelemetry.cpp
index 8fcc2e0f52..26a5f58f24 100644
--- a/src/libxrpl/telemetry/NullTelemetry.cpp
+++ b/src/libxrpl/telemetry/NullTelemetry.cpp
@@ -19,6 +19,8 @@
 #include <opentelemetry/trace/span.h>
 #include <opentelemetry/trace/span_metadata.h>
 #include <opentelemetry/trace/tracer.h>
+
+#include <string_view>
 #endif
 
 #include <memory>
diff --git a/src/libxrpl/telemetry/SpanGuard.cpp b/src/libxrpl/telemetry/SpanGuard.cpp
index 047e8b9535..c504b9f905 100644
--- a/src/libxrpl/telemetry/SpanGuard.cpp
+++ b/src/libxrpl/telemetry/SpanGuard.cpp
@@ -28,7 +28,6 @@
 #include <xrpl/telemetry/Telemetry.h>
 #include <xrpl/telemetry/TraceContextPropagator.h>
 
-#include <opentelemetry/common/attribute_value.h>
 #include <opentelemetry/context/context.h>
 #include <opentelemetry/context/runtime_context.h>
 #include <opentelemetry/nostd/shared_ptr.h>
@@ -47,12 +46,11 @@
 #include <cstdint>
 #include <cstring>
 #include <exception>
+#include <initializer_list>
 #include <memory>
-#include <string>
 #include <string_view>
 #include <typeinfo>
 #include <utility>
-#include <vector>
 
 namespace xrpl::telemetry {
 
diff --git a/src/libxrpl/telemetry/Telemetry.cpp b/src/libxrpl/telemetry/Telemetry.cpp
index e381b759be..251c300d90 100644
--- a/src/libxrpl/telemetry/Telemetry.cpp
+++ b/src/libxrpl/telemetry/Telemetry.cpp
@@ -208,7 +208,7 @@ public:
         return false;
     }
 
-    std::string const&
+    [[nodiscard]] std::string const&
     getConsensusTraceStrategy() const override
     {
         return setup_.consensusTraceStrategy;
@@ -388,7 +388,7 @@ public:
         return setup_.traceLedger;
     }
 
-    std::string const&
+    [[nodiscard]] std::string const&
     getConsensusTraceStrategy() const override
     {
         return setup_.consensusTraceStrategy;