diff --git a/include/xrpl/telemetry/Telemetry.h b/include/xrpl/telemetry/Telemetry.h
index 18f50fc5f1..8e4b23eb9c 100644
--- a/include/xrpl/telemetry/Telemetry.h
+++ b/include/xrpl/telemetry/Telemetry.h
@@ -100,6 +100,7 @@
 #include <opentelemetry/context/context.h>
 #include <opentelemetry/nostd/shared_ptr.h>
 #include <opentelemetry/trace/span.h>
+#include <opentelemetry/trace/span_metadata.h>
 #include <opentelemetry/trace/tracer.h>
 #endif
 
diff --git a/include/xrpl/telemetry/TraceContextPropagator.h b/include/xrpl/telemetry/TraceContextPropagator.h
index 0b7938cb23..8a33687613 100644
--- a/include/xrpl/telemetry/TraceContextPropagator.h
+++ b/include/xrpl/telemetry/TraceContextPropagator.h
@@ -20,9 +20,14 @@
 #include <xrpl/telemetry/TraceContextValidation.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>
 
diff --git a/src/libxrpl/telemetry/Redaction.cpp b/src/libxrpl/telemetry/Redaction.cpp
index d6bfe52ec3..7164c4dee6 100644
--- a/src/libxrpl/telemetry/Redaction.cpp
+++ b/src/libxrpl/telemetry/Redaction.cpp
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 #include <cctype>
-#include <ranges>
 #include <string>
 #include <string_view>
 
diff --git a/src/tests/libxrpl/telemetry/Redaction.cpp b/src/tests/libxrpl/telemetry/Redaction.cpp
index db1cc95135..2ef6ed377b 100644
--- a/src/tests/libxrpl/telemetry/Redaction.cpp
+++ b/src/tests/libxrpl/telemetry/Redaction.cpp
@@ -4,7 +4,6 @@
 
 #include <algorithm>
 #include <cctype>
-#include <ranges>
 #include <string>
 
 using namespace xrpl;
diff --git a/src/xrpld/consensus/Consensus.h b/src/xrpld/consensus/Consensus.h
index 240dd11560..c4fbc9d559 100644
--- a/src/xrpld/consensus/Consensus.h
+++ b/src/xrpld/consensus/Consensus.h
@@ -15,6 +15,7 @@
 #include <xrpl/json/json_writer.h>
 #include <xrpl/ledger/LedgerTiming.h>
 #include <xrpl/telemetry/SpanGuard.h>
+#include <xrpl/telemetry/SpanNames.h>
 
 #include <algorithm>
 #include <chrono>
diff --git a/src/xrpld/telemetry/ConsensusReceiveTracing.h b/src/xrpld/telemetry/ConsensusReceiveTracing.h
index 3c7ea42ca6..8a98e3cc39 100644
--- a/src/xrpld/telemetry/ConsensusReceiveTracing.h
+++ b/src/xrpld/telemetry/ConsensusReceiveTracing.h
@@ -40,8 +40,11 @@
 
 #include <xrpl/proto/xrpl.pb.h>
 #include <xrpl/telemetry/SpanGuard.h>
+#include <xrpl/telemetry/SpanNames.h>
 #include <xrpl/telemetry/TraceContextValidation.h>
 
+#include <cstdint>
+
 namespace xrpl::telemetry {
 
 /** Create a "consensus.proposal.receive" span for an incoming proposal.
diff --git a/src/xrpld/telemetry/TxTracing.h b/src/xrpld/telemetry/TxTracing.h
index 066c018601..a6633034d3 100644
--- a/src/xrpld/telemetry/TxTracing.h
+++ b/src/xrpld/telemetry/TxTracing.h
@@ -17,6 +17,8 @@
 #include <xrpl/telemetry/SpanGuard.h>
 #include <xrpl/telemetry/TraceContextValidation.h>
 
+#include <cstdint>
+
 namespace xrpl::telemetry {
 
 /** Create a "tx.receive" span for a transaction received from a peer.