diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index 7abd81508b..848e8b7e77 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -113,10 +113,7 @@ source_set("tint_utils_io") {
     sources += [ "utils/io/tmpfile_other.cc" ]
   }
 
-  deps = [
-    ":libtint_base_src",
-    ":libtint_core_all_src",
-  ]
+  deps = [ ":libtint_base_src" ]
 }
 
 ###############################################################################
@@ -132,7 +129,7 @@ source_set("tint_val") {
   ]
   deps = [
     ":libtint_base_src",
-    ":libtint_core_all_src",
+    ":libtint_syntax_tree_src",
     ":tint_utils_io",
   ]
 }
@@ -244,7 +241,7 @@ libtint_source_set("libtint_base_src") {
   deps = [ ":libtint_text_src" ]
 }
 
-libtint_source_set("libtint_core_all_src") {
+libtint_source_set("libtint_syntax_tree_src") {
   sources = [
     "ast/alias.cc",
     "ast/alias.h",
@@ -508,7 +505,7 @@ libtint_source_set("libtint_inspector_src") {
   ]
   deps = [
     ":libtint_base_src",
-    ":libtint_core_all_src",
+    ":libtint_syntax_tree_src",
     ":libtint_type_src",
   ]
 }
@@ -627,7 +624,7 @@ libtint_source_set("libtint_transform_src") {
   ]
   deps = [
     ":libtint_base_src",
-    ":libtint_core_all_src",
+    ":libtint_syntax_tree_src",
     ":libtint_text_src",
     ":libtint_type_src",
   ]
@@ -695,7 +692,7 @@ libtint_source_set("libtint_sem_src") {
   deps = [
     ":libtint_base_src",
     ":libtint_constant_src",
-    ":libtint_core_all_src",
+    ":libtint_syntax_tree_src",
     ":libtint_type_src",
   ]
 }
@@ -802,10 +799,10 @@ libtint_source_set("libtint_core_src") {
   public_deps = [
     ":libtint_base_src",
     ":libtint_constant_src",
-    ":libtint_core_all_src",
     ":libtint_initializer_src",
     ":libtint_inspector_src",
     ":libtint_sem_src",
+    ":libtint_syntax_tree_src",
     ":libtint_text_src",
     ":libtint_transform_src",
     ":libtint_type_src",
@@ -819,8 +816,10 @@ libtint_source_set("libtint_reader_src") {
     "reader/reader.h",
   ]
 
-  deps = [ ":libtint_core_all_src" ]
-  public_deps = [ ":libtint_transform_src" ]
+  public_deps = [
+    ":libtint_syntax_tree_src",
+    ":libtint_transform_src",
+  ]
 }
 
 libtint_source_set("libtint_spv_reader_src") {
@@ -848,8 +847,8 @@ libtint_source_set("libtint_spv_reader_src") {
 
   deps = [
     ":libtint_base_src",
-    ":libtint_core_all_src",
     ":libtint_reader_src",
+    ":libtint_syntax_tree_src",
     ":libtint_type_src",
     "${tint_spirv_tools_dir}/:spvtools_opt",
   ]
@@ -881,8 +880,8 @@ libtint_source_set("libtint_writer_src") {
 
   deps = [
     ":libtint_base_src",
-    ":libtint_core_all_src",
     ":libtint_inspector_src",
+    ":libtint_syntax_tree_src",
     ":libtint_transform_src",
     ":libtint_type_src",
   ]
@@ -932,8 +931,8 @@ libtint_source_set("libtint_wgsl_reader_src") {
 
   deps = [
     ":libtint_base_src",
-    ":libtint_core_all_src",
     ":libtint_reader_src",
+    ":libtint_syntax_tree_src",
     ":libtint_text_src",
     ":libtint_type_src",
   ]