diff --git a/src/credentials/BUILD.gn b/src/credentials/BUILD.gn
index b6a7b0d081eae2..2e1f9ed657649e 100644
--- a/src/credentials/BUILD.gn
+++ b/src/credentials/BUILD.gn
@@ -132,10 +132,7 @@ source_set("test_paa_store") {
     "attestation_verifier/CHIPAttCert_test_paa_store.h",
   ]
 
-  public_deps = [
-    "${chip_root}/src/lib/core:chip_config_header",  # for lib/support/Span.h
-    "${nlassert_root}:nlassert",  # for lib/support/Span.h
-  ]
+  public_deps = [ "${chip_root}/src/lib/support:span" ]
 }
 
 static_library("default_attestation_verifier") {
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index 68b39ebb0a802b..a543691a85451a 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -79,6 +79,15 @@ source_set("chip_version_header") {
   deps = [ ":gen_chip_version" ]
 }
 
+source_set("span") {
+  sources = [ "Span.h" ]
+
+  deps = [ "${nlassert_root}:nlassert" ]
+  if (chip_pw_tokenizer_logging) {
+    deps += [ "${dir_pw_tokenizer}" ]
+  }
+}
+
 static_library("support") {
   output_name = "libSupportLayer"
 
@@ -171,6 +180,7 @@ static_library("support") {
     ":attributes",
     ":chip_version_header",
     ":logging_constants",
+    ":span",
     "${chip_root}/src/lib/core:chip_config_header",
     "${chip_root}/src/platform:platform_buildconfig",
     "${chip_root}/src/platform/logging:headers",