diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index 62b09b60a4..bf9fa3f3ba 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -448,8 +448,6 @@ libtint_source_set("libtint_core_all_src") {
     "symbol.h",
     "symbol_table.cc",
     "symbol_table.h",
-    "text/unicode.cc",
-    "text/unicode.h",
     "tint.cc",
     "traits.h",
     "type/abstract_float.h",
@@ -519,6 +517,15 @@ libtint_source_set("libtint_core_all_src") {
   } else {
     sources += [ "diagnostic/printer_other.cc" ]
   }
+
+  deps = [ ":libtint_text_src" ]
+}
+
+libtint_source_set("libtint_text_src") {
+  sources = [
+    "text/unicode.cc",
+    "text/unicode.h",
+  ]
 }
 
 libtint_source_set("libtint_transform_src") {
@@ -626,7 +633,10 @@ libtint_source_set("libtint_transform_src") {
     "transform/zero_init_workgroup_memory.cc",
     "transform/zero_init_workgroup_memory.h",
   ]
-  deps = [ ":libtint_core_all_src" ]
+  deps = [
+    ":libtint_core_all_src",
+    ":libtint_text_src",
+  ]
 }
 
 libtint_source_set("libtint_sem_src") {
@@ -791,6 +801,7 @@ libtint_source_set("libtint_core_src") {
     ":libtint_constant_src",
     ":libtint_core_all_src",
     ":libtint_sem_src",
+    ":libtint_text_src",
     ":libtint_transform_src",
     ":libtint_type_src",
     ":libtint_writer_src",
@@ -909,6 +920,7 @@ libtint_source_set("libtint_wgsl_reader_src") {
   deps = [
     ":libtint_core_all_src",
     ":libtint_reader_src",
+    ":libtint_text_src",
   ]
 }
 
@@ -1356,6 +1368,7 @@ if (tint_build_unittests) {
 
   tint_unittests_source_set("tint_unittests_text_src") {
     sources = [ "text/unicode_test.cc" ]
+    deps = [ ":libtint_text_src" ]
   }
 
   tint_unittests_source_set("tint_unittests_transform_src") {