pw_span: Explicitly specify pw_span dependencies in GN

Bug: b/235237667
Change-Id: I856854de6d3a89510bce6912f6567c2ab86977ce
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/99620
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Pigweed-Auto-Submit: Wyatt Hepler <hepler@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
diff --git a/pw_allocator/BUILD.gn b/pw_allocator/BUILD.gn
index c25bb4c..87161f9 100644
--- a/pw_allocator/BUILD.gn
+++ b/pw_allocator/BUILD.gn
@@ -45,8 +45,9 @@
   configs = [ ":enable_heap_poison" ]
   public = [ "public/pw_allocator/block.h" ]
   public_deps = [
-    "$dir_pw_assert",
-    "$dir_pw_status",
+    dir_pw_assert,
+    dir_pw_span,
+    dir_pw_status,
   ]
   sources = [ "block.cc" ]
 }
@@ -57,7 +58,8 @@
   public = [ "public/pw_allocator/freelist.h" ]
   public_deps = [
     "$dir_pw_containers:vector",
-    "$dir_pw_status",
+    dir_pw_span,
+    dir_pw_status,
   ]
   sources = [ "freelist.cc" ]
 }
@@ -71,8 +73,9 @@
     ":freelist",
   ]
   deps = [
-    "$dir_pw_assert",
-    "$dir_pw_log",
+    dir_pw_assert,
+    dir_pw_log,
+    dir_pw_span,
   ]
   sources = [ "freelist_heap.cc" ]
 }
diff --git a/pw_assert/BUILD.gn b/pw_assert/BUILD.gn
index 017d435..da8e9df 100644
--- a/pw_assert/BUILD.gn
+++ b/pw_assert/BUILD.gn
@@ -205,6 +205,7 @@
   ]
   deps = [
     ":pw_assert",
+    dir_pw_span,
     dir_pw_status,
     dir_pw_string,
   ]
diff --git a/pw_assert_tokenized/BUILD.gn b/pw_assert_tokenized/BUILD.gn
index 771d890..fc64ffe 100644
--- a/pw_assert_tokenized/BUILD.gn
+++ b/pw_assert_tokenized/BUILD.gn
@@ -103,6 +103,7 @@
     "$dir_pw_bytes",
     "$dir_pw_log",
     "$dir_pw_log_tokenized",
+    "$dir_pw_span",
   ]
   sources = [ "log_handler.cc" ]
 }
diff --git a/pw_base64/BUILD.gn b/pw_base64/BUILD.gn
index 07d9674..40030fa 100644
--- a/pw_base64/BUILD.gn
+++ b/pw_base64/BUILD.gn
@@ -25,6 +25,7 @@
 pw_source_set("pw_base64") {
   public_configs = [ ":default_config" ]
   public = [ "public/pw_base64/base64.h" ]
+  public_deps = [ dir_pw_span ]
   sources = [ "base64.cc" ]
 }
 
diff --git a/pw_blob_store/BUILD.gn b/pw_blob_store/BUILD.gn
index 1280b58..a6d3c9d 100644
--- a/pw_blob_store/BUILD.gn
+++ b/pw_blob_store/BUILD.gn
@@ -37,6 +37,7 @@
     dir_pw_bytes,
     dir_pw_kvs,
     dir_pw_preprocessor,
+    dir_pw_span,
     dir_pw_status,
     dir_pw_stream,
   ]
diff --git a/pw_bluetooth/BUILD.gn b/pw_bluetooth/BUILD.gn
index c6ceb1c..99eb687 100644
--- a/pw_bluetooth/BUILD.gn
+++ b/pw_bluetooth/BUILD.gn
@@ -54,6 +54,7 @@
     "$dir_pw_chrono:system_clock",
     dir_pw_containers,
     dir_pw_function,
+    dir_pw_span,
     dir_pw_status,
   ]
 }
diff --git a/pw_bluetooth_hci/BUILD.gn b/pw_bluetooth_hci/BUILD.gn
index bc2ae93..e4082fe 100644
--- a/pw_bluetooth_hci/BUILD.gn
+++ b/pw_bluetooth_hci/BUILD.gn
@@ -39,6 +39,7 @@
     dir_pw_assert,
     dir_pw_bytes,
     dir_pw_result,
+    dir_pw_span,
   ]
   sources = [ "packet.cc" ]
   deps = [ dir_pw_status ]
@@ -53,6 +54,7 @@
     "$dir_pw_bytes:bit",
     dir_pw_bytes,
     dir_pw_function,
+    dir_pw_span,
     dir_pw_status,
   ]
 }
diff --git a/pw_bytes/BUILD.gn b/pw_bytes/BUILD.gn
index 26e257d..ab7e495 100644
--- a/pw_bytes/BUILD.gn
+++ b/pw_bytes/BUILD.gn
@@ -38,6 +38,7 @@
     "$dir_pw_bytes:bit",
     "$dir_pw_containers:iterator",
     dir_pw_preprocessor,
+    dir_pw_span,
     dir_pw_status,
   ]
 }
diff --git a/pw_checksum/BUILD.gn b/pw_checksum/BUILD.gn
index d1209af..048964c 100644
--- a/pw_checksum/BUILD.gn
+++ b/pw_checksum/BUILD.gn
@@ -32,7 +32,10 @@
     "crc16_ccitt.cc",
     "crc32.cc",
   ]
-  public_deps = [ dir_pw_bytes ]
+  public_deps = [
+    dir_pw_bytes,
+    dir_pw_span,
+  ]
 }
 
 pw_test_group("tests") {
diff --git a/pw_containers/BUILD.gn b/pw_containers/BUILD.gn
index 1e90fb0..75fa867 100644
--- a/pw_containers/BUILD.gn
+++ b/pw_containers/BUILD.gn
@@ -99,7 +99,7 @@
     ":algorithm",
     ":intrusive_list",
     ":vector",
-    "$dir_pw_polyfill:span",
+    dir_pw_span,
   ]
 }
 
@@ -108,6 +108,7 @@
   deps = [
     ":filtered_view",
     ":intrusive_list",
+    dir_pw_span,
   ]
 }
 
diff --git a/pw_cpu_exception/BUILD.gn b/pw_cpu_exception/BUILD.gn
index f81194d..2e773a3 100644
--- a/pw_cpu_exception/BUILD.gn
+++ b/pw_cpu_exception/BUILD.gn
@@ -100,7 +100,10 @@
 pw_facade("support") {
   backend = pw_cpu_exception_SUPPORT_BACKEND
   public_configs = [ ":public_include_path" ]
-  public_deps = [ ":entry" ]
+  public_deps = [
+    ":entry",
+    dir_pw_span,
+  ]
   public = [ "public/pw_cpu_exception/support.h" ]
 }
 
diff --git a/pw_cpu_exception_cortex_m/BUILD.gn b/pw_cpu_exception_cortex_m/BUILD.gn
index dd91dea..226a4da 100644
--- a/pw_cpu_exception_cortex_m/BUILD.gn
+++ b/pw_cpu_exception_cortex_m/BUILD.gn
@@ -55,6 +55,7 @@
     "$dir_pw_cpu_exception:support.facade",
     "$dir_pw_preprocessor:arch",
     dir_pw_log,
+    dir_pw_span,
     dir_pw_string,
   ]
   sources = [ "support.cc" ]
@@ -220,6 +221,7 @@
     "$dir_pw_cpu_exception:entry",
     "$dir_pw_cpu_exception:handler",
     "$dir_pw_cpu_exception:support",
+    dir_pw_span,
   ]
   sources = [ "exception_entry_test.cc" ]
 }
diff --git a/pw_file/BUILD.gn b/pw_file/BUILD.gn
index e36b182..f9ee8a6 100644
--- a/pw_file/BUILD.gn
+++ b/pw_file/BUILD.gn
@@ -36,6 +36,7 @@
     dir_pw_bytes,
     dir_pw_log,
     dir_pw_result,
+    dir_pw_span,
     dir_pw_status,
   ]
   public_configs = [ ":public_includes" ]
diff --git a/pw_fuzzer/BUILD.gn b/pw_fuzzer/BUILD.gn
index 91cbd08..cef173d 100644
--- a/pw_fuzzer/BUILD.gn
+++ b/pw_fuzzer/BUILD.gn
@@ -81,8 +81,9 @@
 pw_fuzzer("toy_fuzzer") {
   sources = [ "examples/toy_fuzzer.cc" ]
   deps = [
-    "$dir_pw_result",
-    "$dir_pw_string",
+    dir_pw_result,
+    dir_pw_span,
+    dir_pw_string,
   ]
 }
 
diff --git a/pw_hdlc/BUILD.gn b/pw_hdlc/BUILD.gn
index 7ee98c1..f1a2e51 100644
--- a/pw_hdlc/BUILD.gn
+++ b/pw_hdlc/BUILD.gn
@@ -46,6 +46,7 @@
     dir_pw_bytes,
     dir_pw_checksum,
     dir_pw_result,
+    dir_pw_span,
     dir_pw_status,
   ]
   deps = [ dir_pw_log ]
@@ -63,6 +64,7 @@
     ":common",
     dir_pw_bytes,
     dir_pw_checksum,
+    dir_pw_span,
     dir_pw_status,
     dir_pw_stream,
   ]
@@ -75,6 +77,7 @@
   public_deps = [
     ":pw_hdlc",
     "$dir_pw_rpc:server",
+    dir_pw_span,
   ]
 }
 
diff --git a/pw_hex_dump/BUILD.gn b/pw_hex_dump/BUILD.gn
index 7f0bb44..2ad280e 100644
--- a/pw_hex_dump/BUILD.gn
+++ b/pw_hex_dump/BUILD.gn
@@ -26,6 +26,7 @@
   public_configs = [ ":default_config" ]
   public_deps = [
     dir_pw_bytes,
+    dir_pw_span,
     dir_pw_status,
   ]
   deps = [ dir_pw_string ]
diff --git a/pw_i2c/BUILD.gn b/pw_i2c/BUILD.gn
index 7334b0c..700f8ed 100644
--- a/pw_i2c/BUILD.gn
+++ b/pw_i2c/BUILD.gn
@@ -50,6 +50,7 @@
     "$dir_pw_bytes",
     "$dir_pw_chrono:system_clock",
     "$dir_pw_status",
+    dir_pw_span,
   ]
 }
 
diff --git a/pw_kvs/BUILD.gn b/pw_kvs/BUILD.gn
index 00197d5..b3cdf60 100644
--- a/pw_kvs/BUILD.gn
+++ b/pw_kvs/BUILD.gn
@@ -65,6 +65,7 @@
     dir_pw_assert,
     dir_pw_bytes,
     dir_pw_containers,
+    dir_pw_span,
     dir_pw_status,
     dir_pw_stream,
   ]
@@ -87,6 +88,7 @@
   public_deps = [
     ":pw_kvs",
     dir_pw_checksum,
+    dir_pw_span,
   ]
 }
 
diff --git a/pw_log/BUILD.gn b/pw_log/BUILD.gn
index a4499d4..3ff928e 100644
--- a/pw_log/BUILD.gn
+++ b/pw_log/BUILD.gn
@@ -85,6 +85,7 @@
     "$dir_pw_log:protos.pwpb",
     "$dir_pw_log_tokenized:metadata",
     "$dir_pw_result",
+    dir_pw_span,
   ]
   deps = [ "$dir_pw_protobuf" ]
   sources = [ "proto_utils.cc" ]
diff --git a/pw_log_rpc/BUILD.gn b/pw_log_rpc/BUILD.gn
index bfe2f6a..66de202 100644
--- a/pw_log_rpc/BUILD.gn
+++ b/pw_log_rpc/BUILD.gn
@@ -88,6 +88,7 @@
     "$dir_pw_log:protos.pwpb",
     "$dir_pw_protobuf",
     "$dir_pw_status",
+    dir_pw_span,
   ]
 }
 
@@ -112,6 +113,7 @@
     "$dir_pw_status",
     "$dir_pw_sync:lock_annotations",
     "$dir_pw_sync:mutex",
+    dir_pw_span,
   ]
 }
 
diff --git a/pw_log_tokenized/BUILD.gn b/pw_log_tokenized/BUILD.gn
index 2109673..200a91a 100644
--- a/pw_log_tokenized/BUILD.gn
+++ b/pw_log_tokenized/BUILD.gn
@@ -91,6 +91,7 @@
     "$dir_pw_stream:sys_io_stream",
     "$dir_pw_tokenizer:base64",
     "$dir_pw_tokenizer:global_handler_with_payload.facade",
+    dir_pw_span,
   ]
 }
 
diff --git a/pw_malloc_freelist/BUILD.gn b/pw_malloc_freelist/BUILD.gn
index dfb642b..117b820 100644
--- a/pw_malloc_freelist/BUILD.gn
+++ b/pw_malloc_freelist/BUILD.gn
@@ -31,6 +31,7 @@
     "$dir_pw_allocator:freelist_heap",
     "$dir_pw_malloc:facade",
     "$dir_pw_preprocessor",
+    dir_pw_span,
   ]
   sources = [ "freelist_malloc.cc" ]
 }
@@ -44,6 +45,7 @@
   deps = [
     "$dir_pw_allocator",
     "$dir_pw_malloc",
+    dir_pw_span,
   ]
   sources = [ "freelist_malloc_test.cc" ]
 }
diff --git a/pw_metric/BUILD.gn b/pw_metric/BUILD.gn
index 3fc335c..f504172 100644
--- a/pw_metric/BUILD.gn
+++ b/pw_metric/BUILD.gn
@@ -36,6 +36,7 @@
     dir_pw_log,
     dir_pw_tokenizer,
   ]
+  deps = [ dir_pw_span ]
 }
 
 # This gives access to the "PW_METRIC_GLOBAL()" macros, for globally-registered
@@ -66,6 +67,7 @@
     public_deps = [
       ":metric_service_proto.nanopb_rpc",
       ":pw_metric",
+      dir_pw_span,
     ]
     public = [ "public/pw_metric/metric_service_nanopb.h" ]
     deps = [
diff --git a/pw_minimal_cpp_stdlib/BUILD.gn b/pw_minimal_cpp_stdlib/BUILD.gn
index bda4178..cc2a5e9 100644
--- a/pw_minimal_cpp_stdlib/BUILD.gn
+++ b/pw_minimal_cpp_stdlib/BUILD.gn
@@ -67,6 +67,7 @@
     "public/internal/type_traits.h",
     "public/internal/utility.h",
   ]
+  public_deps = [ dir_pw_polyfill ]
 }
 
 pw_test_group("tests") {
diff --git a/pw_persistent_ram/BUILD.gn b/pw_persistent_ram/BUILD.gn
index 7df09ca..cf35ba9 100644
--- a/pw_persistent_ram/BUILD.gn
+++ b/pw_persistent_ram/BUILD.gn
@@ -36,6 +36,7 @@
     dir_pw_bytes,
     dir_pw_checksum,
     dir_pw_preprocessor,
+    dir_pw_span,
     dir_pw_stream,
   ]
 }
diff --git a/pw_protobuf/BUILD.gn b/pw_protobuf/BUILD.gn
index 2943ea7..fed9051 100644
--- a/pw_protobuf/BUILD.gn
+++ b/pw_protobuf/BUILD.gn
@@ -54,6 +54,7 @@
     dir_pw_function,
     dir_pw_log,
     dir_pw_result,
+    dir_pw_span,
     dir_pw_status,
     dir_pw_stream,
     dir_pw_varint,
diff --git a/pw_random/BUILD.gn b/pw_random/BUILD.gn
index 8a440f8..1328a05 100644
--- a/pw_random/BUILD.gn
+++ b/pw_random/BUILD.gn
@@ -30,6 +30,7 @@
   ]
   public_deps = [
     dir_pw_bytes,
+    dir_pw_span,
     dir_pw_status,
   ]
 }
diff --git a/pw_ring_buffer/BUILD.gn b/pw_ring_buffer/BUILD.gn
index 88db5bd..56e7c36 100644
--- a/pw_ring_buffer/BUILD.gn
+++ b/pw_ring_buffer/BUILD.gn
@@ -35,6 +35,7 @@
   deps = [
     "$dir_pw_assert:pw_assert",
     "$dir_pw_varint",
+    dir_pw_span,
   ]
 }
 
diff --git a/pw_router/BUILD.gn b/pw_router/BUILD.gn
index 503ff41..48d46bc 100644
--- a/pw_router/BUILD.gn
+++ b/pw_router/BUILD.gn
@@ -30,6 +30,7 @@
     ":egress",
     ":packet_parser",
     dir_pw_metric,
+    dir_pw_span,
   ]
   public = [ "public/pw_router/static_router.h" ]
   sources = [ "static_router.cc" ]
@@ -41,13 +42,17 @@
   public_deps = [
     ":packet_parser",
     dir_pw_bytes,
+    dir_pw_span,
   ]
 }
 
 pw_source_set("packet_parser") {
   public_configs = [ ":public_include_path" ]
   public = [ "public/pw_router/packet_parser.h" ]
-  public_deps = [ dir_pw_bytes ]
+  public_deps = [
+    dir_pw_bytes,
+    dir_pw_span,
+  ]
 }
 
 pw_source_set("egress_function") {
@@ -56,6 +61,7 @@
   public_deps = [
     ":egress",
     dir_pw_function,
+    dir_pw_span,
   ]
 }
 
diff --git a/pw_rpc/BUILD.gn b/pw_rpc/BUILD.gn
index ed27e43..1a4e636 100644
--- a/pw_rpc/BUILD.gn
+++ b/pw_rpc/BUILD.gn
@@ -101,6 +101,7 @@
   public_deps = [
     ":common",
     dir_pw_result,
+    dir_pw_span,
   ]
   deps = [
     ":log_config",
@@ -153,6 +154,7 @@
     dir_pw_assert,
     dir_pw_bytes,
     dir_pw_function,
+    dir_pw_span,
     dir_pw_status,
   ]
 
diff --git a/pw_rpc/nanopb/BUILD.gn b/pw_rpc/nanopb/BUILD.gn
index dc9fffb..eb265b9 100644
--- a/pw_rpc/nanopb/BUILD.gn
+++ b/pw_rpc/nanopb/BUILD.gn
@@ -43,6 +43,7 @@
     "..:config",
     "..:server",
     dir_pw_bytes,
+    dir_pw_span,
   ]
   deps = [
     "..:log_config",
@@ -121,7 +122,7 @@
 
 pw_source_set("internal_test_utils") {
   public = [ "pw_rpc_nanopb_private/internal_test_utils.h" ]
-  public_deps = []
+  public_deps = [ dir_pw_span ]
   if (dir_pw_third_party_nanopb != "") {
     public_deps += [ "$dir_pw_third_party/nanopb" ]
   }
diff --git a/pw_rpc/pwpb/BUILD.gn b/pw_rpc/pwpb/BUILD.gn
index fc7c46f..956df3b 100644
--- a/pw_rpc/pwpb/BUILD.gn
+++ b/pw_rpc/pwpb/BUILD.gn
@@ -61,6 +61,7 @@
   public_deps = [
     "..:common",
     dir_pw_bytes,
+    dir_pw_span,
   ]
   public_configs = [ ":public" ]
   deps = [
diff --git a/pw_snapshot/BUILD.gn b/pw_snapshot/BUILD.gn
index 7bd7e40..14db8f1 100644
--- a/pw_snapshot/BUILD.gn
+++ b/pw_snapshot/BUILD.gn
@@ -30,6 +30,7 @@
   public_deps = [
     dir_pw_bytes,
     dir_pw_result,
+    dir_pw_span,
     dir_pw_status,
   ]
   deps = [
diff --git a/pw_stream/BUILD.gn b/pw_stream/BUILD.gn
index ed29059..e224783 100644
--- a/pw_stream/BUILD.gn
+++ b/pw_stream/BUILD.gn
@@ -38,6 +38,7 @@
     dir_pw_bytes,
     dir_pw_polyfill,
     dir_pw_result,
+    dir_pw_span,
     dir_pw_status,
   ]
 }
diff --git a/pw_string/BUILD.gn b/pw_string/BUILD.gn
index 0a77588..30c2c65 100644
--- a/pw_string/BUILD.gn
+++ b/pw_string/BUILD.gn
@@ -62,6 +62,7 @@
     ":to_string",
     ":util",
     dir_pw_preprocessor,
+    dir_pw_span,
     dir_pw_status,
   ]
 }
@@ -72,6 +73,7 @@
   sources = [ "format.cc" ]
   public_deps = [
     dir_pw_preprocessor,
+    dir_pw_span,
     dir_pw_status,
   ]
 }
@@ -87,6 +89,7 @@
     ":config",
     ":format",
     ":util",
+    dir_pw_span,
     dir_pw_status,
   ]
 }
@@ -98,6 +101,7 @@
   public_deps = [
     dir_pw_assert,
     dir_pw_result,
+    dir_pw_span,
     dir_pw_status,
   ]
 }
@@ -109,6 +113,7 @@
     ":pw_string",
     "$dir_pw_containers:vector",
     "$dir_pw_status",
+    dir_pw_span,
   ]
 }
 
diff --git a/pw_sys_io/BUILD.gn b/pw_sys_io/BUILD.gn
index a15e999..2b9ff9b 100644
--- a/pw_sys_io/BUILD.gn
+++ b/pw_sys_io/BUILD.gn
@@ -26,7 +26,10 @@
 pw_facade("pw_sys_io") {
   backend = pw_sys_io_BACKEND
   public_configs = [ ":public_include_path" ]
-  public_deps = [ dir_pw_status ]
+  public_deps = [
+    dir_pw_span,
+    dir_pw_status,
+  ]
   public = [ "public/pw_sys_io/sys_io.h" ]
 }
 
diff --git a/pw_thread_embos/BUILD.gn b/pw_thread_embos/BUILD.gn
index 1b48750..1b95c58 100644
--- a/pw_thread_embos/BUILD.gn
+++ b/pw_thread_embos/BUILD.gn
@@ -115,6 +115,7 @@
     "$dir_pw_third_party/embos",
     "$dir_pw_thread:id",
     "$dir_pw_thread:thread.facade",
+    dir_pw_span,
   ]
   public = [
     "public/pw_thread_embos/context.h",
diff --git a/pw_thread_freertos/BUILD.gn b/pw_thread_freertos/BUILD.gn
index c1027cc..1badfcb 100644
--- a/pw_thread_freertos/BUILD.gn
+++ b/pw_thread_freertos/BUILD.gn
@@ -117,6 +117,7 @@
     "$dir_pw_third_party/freertos",
     "$dir_pw_thread:id",
     "$dir_pw_thread:thread.facade",
+    dir_pw_span,
   ]
   public = [
     "public/pw_thread_freertos/context.h",
@@ -153,6 +154,7 @@
   public_deps = [
     "$dir_pw_third_party/freertos",
     dir_pw_function,
+    dir_pw_span,
     dir_pw_status,
   ]
   public = [ "public/pw_thread_freertos/util.h" ]
diff --git a/pw_thread_threadx/BUILD.gn b/pw_thread_threadx/BUILD.gn
index 2917147..a9eed82 100644
--- a/pw_thread_threadx/BUILD.gn
+++ b/pw_thread_threadx/BUILD.gn
@@ -113,6 +113,7 @@
     "$dir_pw_third_party/threadx",
     "$dir_pw_thread:id",
     "$dir_pw_thread:thread.facade",
+    dir_pw_span,
   ]
   public = [
     "public/pw_thread_threadx/context.h",
diff --git a/pw_tokenizer/BUILD.gn b/pw_tokenizer/BUILD.gn
index 9734d47..ea0d1c2 100644
--- a/pw_tokenizer/BUILD.gn
+++ b/pw_tokenizer/BUILD.gn
@@ -77,6 +77,7 @@
     "$dir_pw_containers:to_array",
     dir_pw_polyfill,
     dir_pw_preprocessor,
+    dir_pw_span,
   ]
   deps = [ dir_pw_varint ]
   public = [
@@ -153,6 +154,7 @@
   deps = [
     "$dir_pw_bytes:bit",
     dir_pw_bytes,
+    dir_pw_span,
     dir_pw_varint,
   ]
   public = [
@@ -222,7 +224,10 @@
 
 pw_test("base64_test") {
   sources = [ "base64_test.cc" ]
-  deps = [ ":base64" ]
+  deps = [
+    ":base64",
+    dir_pw_span,
+  ]
 }
 
 pw_test("decode_test") {
@@ -305,6 +310,7 @@
     ":decoder",
     "$dir_pw_fuzzer",
     "$dir_pw_preprocessor",
+    dir_pw_span,
   ]
 }
 
@@ -349,6 +355,7 @@
     ":decoder",
     "$dir_pw_preprocessor",
   ]
+  deps = [ dir_pw_span ]
 }
 
 pw_doc_group("docs") {
diff --git a/pw_tool/BUILD.gn b/pw_tool/BUILD.gn
index 522ae3a..0bee3f3 100644
--- a/pw_tool/BUILD.gn
+++ b/pw_tool/BUILD.gn
@@ -20,6 +20,7 @@
   deps = [
     "$dir_pw_log",
     "$dir_pw_polyfill",
+    dir_pw_span,
   ]
   sources = [ "main.cc" ]
 }
diff --git a/pw_trace_tokenized/BUILD.gn b/pw_trace_tokenized/BUILD.gn
index e248c8e..2aa8c46 100644
--- a/pw_trace_tokenized/BUILD.gn
+++ b/pw_trace_tokenized/BUILD.gn
@@ -106,6 +106,7 @@
     "$dir_pw_ring_buffer",
     "$dir_pw_tokenizer",
     "$dir_pw_varint",
+    dir_pw_span,
   ]
   sources = [ "trace_buffer.cc" ]
   public_configs = [
@@ -163,6 +164,7 @@
   public_deps = [
     "$dir_pw_status",
     "$dir_pw_tokenizer",
+    dir_pw_span,
   ]
   deps = [
     ":config",
diff --git a/pw_transfer/BUILD.gn b/pw_transfer/BUILD.gn
index a56fb20..1a5f320 100644
--- a/pw_transfer/BUILD.gn
+++ b/pw_transfer/BUILD.gn
@@ -89,6 +89,7 @@
     dir_pw_assert,
     dir_pw_bytes,
     dir_pw_result,
+    dir_pw_span,
     dir_pw_status,
     dir_pw_stream,
   ]
diff --git a/pw_unit_test/BUILD.gn b/pw_unit_test/BUILD.gn
index 73d22b0..9b4be0f 100644
--- a/pw_unit_test/BUILD.gn
+++ b/pw_unit_test/BUILD.gn
@@ -79,6 +79,7 @@
     ":event_handler",
     dir_pw_polyfill,
     dir_pw_preprocessor,
+    dir_pw_span,
   ]
 
   # If C++17 is supported, depend on StringBuilder.
@@ -128,6 +129,7 @@
     ":pw_unit_test",
     ":simple_printing_event_handler",
     "$dir_pw_sys_io",
+    dir_pw_span,
   ]
   sources = [ "simple_printing_main.cc" ]
 }
diff --git a/pw_varint/BUILD.gn b/pw_varint/BUILD.gn
index 0633afb..03f4c57 100644
--- a/pw_varint/BUILD.gn
+++ b/pw_varint/BUILD.gn
@@ -24,7 +24,10 @@
 
 pw_source_set("pw_varint") {
   public_configs = [ ":default_config" ]
-  public_deps = [ dir_pw_preprocessor ]
+  public_deps = [
+    dir_pw_preprocessor,
+    dir_pw_span,
+  ]
   sources = [ "varint.cc" ]
   public = [ "public/pw_varint/varint.h" ]
 }
@@ -37,7 +40,10 @@
   ]
   public = [ "public/pw_varint/stream.h" ]
   sources = [ "stream.cc" ]
-  deps = [ ":pw_varint" ]
+  deps = [
+    ":pw_varint",
+    dir_pw_span,
+  ]
 }
 
 pw_test_group("tests") {
diff --git a/pw_work_queue/BUILD.gn b/pw_work_queue/BUILD.gn
index 08fd679..a84e30a 100644
--- a/pw_work_queue/BUILD.gn
+++ b/pw_work_queue/BUILD.gn
@@ -38,6 +38,7 @@
     "$dir_pw_thread:thread",
     dir_pw_function,
     dir_pw_metric,
+    dir_pw_span,
     dir_pw_status,
   ]
   sources = [ "work_queue.cc" ]