diff --git a/db/view/build_progress_virtual_reader.hh b/db/view/build_progress_virtual_reader.hh
index 37c188bff6..3acb3af476 100644
--- a/db/view/build_progress_virtual_reader.hh
+++ b/db/view/build_progress_virtual_reader.hh
@@ -14,13 +14,14 @@
 #include "mutation/mutation_fragment.hh"
 #include "query-request.hh"
 #include "schema/schema_fwd.hh"
-#include "tracing/tracing.hh"
 
 #include <boost/range/iterator_range.hpp>
 
 #include <iterator>
 #include <memory>
 
+namespace tracing { class trace_state_ptr; }
+
 namespace db::view {
 
 // Allows a user to query the views_builds_in_progress system table
diff --git a/index/built_indexes_virtual_reader.hh b/index/built_indexes_virtual_reader.hh
index b7a3b1b636..b80573001b 100644
--- a/index/built_indexes_virtual_reader.hh
+++ b/index/built_indexes_virtual_reader.hh
@@ -13,11 +13,12 @@
 #include "query-request.hh"
 #include "schema/schema_fwd.hh"
 #include "secondary_index_manager.hh"
-#include "tracing/tracing.hh"
 #include "view_info.hh"
 
 #include <memory>
 
+namespace tracing { class trace_state_ptr; }
+
 namespace db::index {
 
 class built_indexes_virtual_reader {
diff --git a/replica/database.hh b/replica/database.hh
index efb2a9ce4f..8d93e71d53 100644
--- a/replica/database.hh
+++ b/replica/database.hh
@@ -41,7 +41,6 @@
 #include "compaction/compaction_strategy.hh"
 #include "utils/estimated_histogram.hh"
 #include <seastar/core/metrics_registration.hh>
-#include "tracing/trace_state.hh"
 #include "db/view/view_stats.hh"
 #include "db/view/view_update_backlog.hh"
 #include "db/view/row_locking.hh"
@@ -75,6 +74,7 @@ class mutation;
 class frozen_mutation;
 class reconcilable_result;
 
+namespace tracing { class trace_state_ptr; }
 namespace s3 { struct endpoint_config; }
 
 namespace service {
diff --git a/row_cache.hh b/row_cache.hh
index 10ecd35df3..97cf8f92dc 100644
--- a/row_cache.hh
+++ b/row_cache.hh
@@ -19,7 +19,6 @@
 #include "utils/phased_barrier.hh"
 #include "utils/histogram.hh"
 #include "mutation/partition_version.hh"
-#include "tracing/trace_state.hh"
 #include <seastar/core/metrics_registration.hh>
 #include "mutation/mutation_cleaner.hh"
 #include "utils/double-decker.hh"
@@ -37,6 +36,8 @@ namespace replica {
 class memtable_entry;
 }
 
+namespace tracing { class trace_state_ptr; }
+
 namespace cache {
 
 class autoupdating_underlying_reader;
diff --git a/service/forward_service.hh b/service/forward_service.hh
index 8cd60fc15d..a286349ae6 100644
--- a/service/forward_service.hh
+++ b/service/forward_service.hh
@@ -16,7 +16,11 @@
 #include "message/messaging_service_fwd.hh"
 #include "query-request.hh"
 #include "replica/database_fwd.hh"
-#include "tracing/trace_state.hh"
+
+namespace tracing {
+class trace_state_ptr;
+class trace_info;
+}
 
 namespace service {
 
diff --git a/sstables/mx/partition_reversing_data_source.hh b/sstables/mx/partition_reversing_data_source.hh
index 4e26c2182c..c2836bd725 100644
--- a/sstables/mx/partition_reversing_data_source.hh
+++ b/sstables/mx/partition_reversing_data_source.hh
@@ -12,7 +12,8 @@
 #include "reader_permit.hh"
 #include "sstables/index_reader.hh"
 #include "sstables/shared_sstable.hh"
-#include "tracing/trace_state.hh"
+
+namespace tracing { class trace_state_ptr; }
 
 namespace sstables {
 namespace mx {