diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index 848e8b7e77..77b1d927ab 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -137,12 +137,6 @@ source_set("tint_val") {
 ###############################################################################
 # Library - Tint core and optional modules of libtint
 ###############################################################################
-# libtint source sets are divided into a non-optional core in :libtint_core_src
-# and optional :libtint_*_src subsets, because ninja does not like having
-# multiple source files with the same name, like function.cc, in the same
-# source set
-# target.
-#
 # Targets that want to use tint as a library should depend on ":libtint" and
 # use the build flags to control what is included, instead of trying to specify
 # the subsets that they want.
@@ -795,21 +789,6 @@ libtint_source_set("libtint_constant_src") {
   ]
 }
 
-libtint_source_set("libtint_core_src") {
-  public_deps = [
-    ":libtint_base_src",
-    ":libtint_constant_src",
-    ":libtint_initializer_src",
-    ":libtint_inspector_src",
-    ":libtint_sem_src",
-    ":libtint_syntax_tree_src",
-    ":libtint_text_src",
-    ":libtint_transform_src",
-    ":libtint_type_src",
-    ":libtint_writer_src",
-  ]
-}
-
 libtint_source_set("libtint_reader_src") {
   sources = [
     "reader/reader.cc",
@@ -908,8 +887,10 @@ libtint_source_set("libtint_spv_writer_src") {
 
   deps = [
     ":libtint_base_src",
-    ":libtint_core_src",
+    ":libtint_constant_src",
+    ":libtint_syntax_tree_src",
     ":libtint_transform_src",
+    ":libtint_type_src",
     ":libtint_writer_src",
   ]
 }
@@ -932,7 +913,6 @@ libtint_source_set("libtint_wgsl_reader_src") {
   deps = [
     ":libtint_base_src",
     ":libtint_reader_src",
-    ":libtint_syntax_tree_src",
     ":libtint_text_src",
     ":libtint_type_src",
   ]
@@ -948,7 +928,8 @@ libtint_source_set("libtint_wgsl_writer_src") {
 
   deps = [
     ":libtint_base_src",
-    ":libtint_core_src",
+    ":libtint_syntax_tree_src",
+    ":libtint_type_src",
     ":libtint_writer_src",
   ]
 }
@@ -963,8 +944,10 @@ libtint_source_set("libtint_msl_writer_src") {
 
   deps = [
     ":libtint_base_src",
-    ":libtint_core_src",
+    ":libtint_constant_src",
+    ":libtint_syntax_tree_src",
     ":libtint_transform_src",
+    ":libtint_type_src",
     ":libtint_writer_src",
   ]
 }
@@ -979,8 +962,10 @@ libtint_source_set("libtint_hlsl_writer_src") {
 
   deps = [
     ":libtint_base_src",
-    ":libtint_core_src",
+    ":libtint_constant_src",
+    ":libtint_syntax_tree_src",
     ":libtint_transform_src",
+    ":libtint_type_src",
     ":libtint_writer_src",
   ]
 }
@@ -995,14 +980,27 @@ libtint_source_set("libtint_glsl_writer_src") {
 
   deps = [
     ":libtint_base_src",
-    ":libtint_core_src",
+    ":libtint_constant_src",
+    ":libtint_syntax_tree_src",
     ":libtint_transform_src",
+    ":libtint_type_src",
     ":libtint_writer_src",
   ]
 }
 
 source_set("libtint") {
-  public_deps = [ ":libtint_core_src" ]
+  public_deps = [
+    ":libtint_base_src",
+    ":libtint_constant_src",
+    ":libtint_initializer_src",
+    ":libtint_inspector_src",
+    ":libtint_sem_src",
+    ":libtint_syntax_tree_src",
+    ":libtint_text_src",
+    ":libtint_transform_src",
+    ":libtint_type_src",
+    ":libtint_writer_src",
+  ]
 
   if (tint_build_spv_reader) {
     public_deps += [ ":libtint_spv_reader_src" ]