diff --git a/include/xrpl/telemetry/TraceContextPropagator.h b/include/xrpl/telemetry/TraceContextPropagator.h
index d699272810..95f77e6841 100644
--- a/include/xrpl/telemetry/TraceContextPropagator.h
+++ b/include/xrpl/telemetry/TraceContextPropagator.h
@@ -26,8 +26,7 @@
 
 #include <cstdint>
 
-namespace xrpl {
-namespace telemetry {
+namespace xrpl::telemetry {
 
 /** Extract OTel context from a protobuf TraceContext message.
 
@@ -92,7 +91,6 @@ injectToProtobuf(opentelemetry::context::Context const& ctx, protocol::TraceCont
     proto.set_trace_flags(spanCtx.trace_flags().flags());
 }
 
-}  // namespace telemetry
-}  // namespace xrpl
+}  // namespace xrpl::telemetry
 
 #endif  // XRPL_ENABLE_TELEMETRY
diff --git a/src/tests/libxrpl/telemetry/TraceContextPropagator.cpp b/src/tests/libxrpl/telemetry/TraceContextPropagator.cpp
index a8390bf768..67b4428b75 100644
--- a/src/tests/libxrpl/telemetry/TraceContextPropagator.cpp
+++ b/src/tests/libxrpl/telemetry/TraceContextPropagator.cpp
@@ -2,16 +2,22 @@
 
 #ifdef XRPL_ENABLE_TELEMETRY
 
+#include <xrpl/proto/xrpl.pb.h>
 #include <xrpl/telemetry/TraceContextPropagator.h>
 
 #include <opentelemetry/context/context.h>
+#include <opentelemetry/nostd/shared_ptr.h>
 #include <opentelemetry/nostd/span.h>
 #include <opentelemetry/trace/context.h>
 #include <opentelemetry/trace/default_span.h>
+#include <opentelemetry/trace/span.h>
 #include <opentelemetry/trace/span_context.h>
+#include <opentelemetry/trace/span_id.h>
+#include <opentelemetry/trace/span_metadata.h>
 #include <opentelemetry/trace/trace_flags.h>
 #include <opentelemetry/trace/trace_id.h>
 
+#include <cstdint>
 #include <cstring>
 
 namespace trace = opentelemetry::trace;
@@ -37,10 +43,11 @@ TEST(TraceContextPropagator, round_trip)
         0x10};
     std::uint8_t spanIdBuf[8] = {0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x11, 0x22};
 
-    trace::TraceId traceId(opentelemetry::nostd::span<uint8_t const, 16>(traceIdBuf, 16));
-    trace::SpanId spanId(opentelemetry::nostd::span<uint8_t const, 8>(spanIdBuf, 8));
-    trace::TraceFlags flags(trace::TraceFlags::kIsSampled);
-    trace::SpanContext spanCtx(traceId, spanId, flags, true);
+    trace::TraceId const traceId(
+        opentelemetry::nostd::span<std::uint8_t const, 16>(traceIdBuf, 16));
+    trace::SpanId const spanId(opentelemetry::nostd::span<std::uint8_t const, 8>(spanIdBuf, 8));
+    trace::TraceFlags const flags(trace::TraceFlags::kIsSampled);
+    trace::SpanContext const spanCtx(traceId, spanId, flags, true);
 
     auto ctx = opentelemetry::context::Context{}.SetValue(
         trace::kSpanKey,
@@ -53,7 +60,7 @@ TEST(TraceContextPropagator, round_trip)
     EXPECT_EQ(proto.trace_id().size(), 16u);
     EXPECT_TRUE(proto.has_span_id());
     EXPECT_EQ(proto.span_id().size(), 8u);
-    EXPECT_EQ(proto.trace_flags(), static_cast<uint32_t>(trace::TraceFlags::kIsSampled));
+    EXPECT_EQ(proto.trace_flags(), static_cast<std::uint32_t>(trace::TraceFlags::kIsSampled));
     EXPECT_EQ(std::memcmp(proto.trace_id().data(), traceIdBuf, 16), 0);
     EXPECT_EQ(std::memcmp(proto.span_id().data(), spanIdBuf, 8), 0);
 
@@ -71,7 +78,7 @@ TEST(TraceContextPropagator, round_trip)
 
 TEST(TraceContextPropagator, extract_empty_protobuf)
 {
-    protocol::TraceContext proto;
+    protocol::TraceContext const proto;
     auto ctx = xrpl::telemetry::extractFromProtobuf(proto);
     auto span = trace::GetSpan(ctx);
     if (span)
@@ -124,10 +131,10 @@ TEST(TraceContextPropagator, flags_preservation)
     std::uint8_t spanIdBuf[8] = {1, 2, 3, 4, 5, 6, 7, 8};
 
     // Test with flags NOT sampled (flags = 0)
-    trace::TraceFlags flags(0);
-    trace::SpanContext spanCtx(
-        trace::TraceId(opentelemetry::nostd::span<uint8_t const, 16>(traceIdBuf, 16)),
-        trace::SpanId(opentelemetry::nostd::span<uint8_t const, 8>(spanIdBuf, 8)),
+    trace::TraceFlags const flags(0);
+    trace::SpanContext const spanCtx(
+        trace::TraceId(opentelemetry::nostd::span<std::uint8_t const, 16>(traceIdBuf, 16)),
+        trace::SpanId(opentelemetry::nostd::span<std::uint8_t const, 8>(spanIdBuf, 8)),
         flags,
         true);