diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index 94271366ad..328563e4e8 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -357,6 +357,7 @@ libtint_source_set("libtint_syntax_tree_src") {
     "sem/array_count.h",
     "sem/behavior.h",
     "sem/binding_point.h",
+    "sem/block_statement.h",
     "sem/break_if_statement.h",
     "sem/builtin.h",
     "sem/builtin_type.h",
@@ -365,22 +366,26 @@ libtint_source_set("libtint_syntax_tree_src") {
     "sem/evaluation_stage.h",
     "sem/expression.h",
     "sem/for_loop_statement.h",
+    "sem/function.h",
     "sem/if_statement.h",
     "sem/index_accessor_expression.h",
     "sem/info.h",
     "sem/load.h",
     "sem/loop_statement.h",
     "sem/materialize.h",
+    "sem/member_accessor_expression.h",
     "sem/module.h",
     "sem/node.h",
     "sem/parameter_usage.h",
     "sem/pipeline_stage_set.h",
     "sem/sampler_texture_pair.h",
+    "sem/statement.h",
     "sem/struct.h",
     "sem/switch_statement.h",
     "sem/type_conversion.h",
     "sem/type_initializer.h",
     "sem/type_mappings.h",
+    "sem/variable.h",
     "sem/while_statement.h",
   ]
 
@@ -734,6 +739,7 @@ libtint_source_set("libtint_sem_src") {
     "sem/behavior.h",
     "sem/binding_point.h",
     "sem/block_statement.cc",
+    "sem/block_statement.h",
     "sem/break_if_statement.cc",
     "sem/break_if_statement.h",
     "sem/builtin.cc",
@@ -750,6 +756,7 @@ libtint_source_set("libtint_sem_src") {
     "sem/for_loop_statement.cc",
     "sem/for_loop_statement.h",
     "sem/function.cc",
+    "sem/function.h",
     "sem/if_statement.cc",
     "sem/if_statement.h",
     "sem/index_accessor_expression.cc",
@@ -763,6 +770,7 @@ libtint_source_set("libtint_sem_src") {
     "sem/materialize.cc",
     "sem/materialize.h",
     "sem/member_accessor_expression.cc",
+    "sem/member_accessor_expression.h",
     "sem/module.cc",
     "sem/module.h",
     "sem/node.cc",
@@ -770,7 +778,9 @@ libtint_source_set("libtint_sem_src") {
     "sem/parameter_usage.cc",
     "sem/parameter_usage.h",
     "sem/pipeline_stage_set.h",
+    "sem/sampler_texture_pair.h",
     "sem/statement.cc",
+    "sem/statement.h",
     "sem/struct.cc",
     "sem/struct.h",
     "sem/switch_statement.cc",
@@ -781,6 +791,7 @@ libtint_source_set("libtint_sem_src") {
     "sem/type_initializer.h",
     "sem/type_mappings.h",
     "sem/variable.cc",
+    "sem/variable.h",
     "sem/while_statement.cc",
     "sem/while_statement.h",
   ]
@@ -990,6 +1001,7 @@ libtint_source_set("libtint_spv_writer_src") {
   deps = [
     ":libtint_base_src",
     ":libtint_constant_src",
+    ":libtint_sem_src",
     ":libtint_syntax_tree_src",
     ":libtint_transform_src",
     ":libtint_type_src",
@@ -1047,6 +1059,7 @@ libtint_source_set("libtint_msl_writer_src") {
   deps = [
     ":libtint_base_src",
     ":libtint_constant_src",
+    ":libtint_sem_src",
     ":libtint_syntax_tree_src",
     ":libtint_transform_src",
     ":libtint_type_src",
@@ -1065,6 +1078,7 @@ libtint_source_set("libtint_hlsl_writer_src") {
   deps = [
     ":libtint_base_src",
     ":libtint_constant_src",
+    ":libtint_sem_src",
     ":libtint_syntax_tree_src",
     ":libtint_transform_src",
     ":libtint_type_src",
@@ -1083,6 +1097,7 @@ libtint_source_set("libtint_glsl_writer_src") {
   deps = [
     ":libtint_base_src",
     ":libtint_constant_src",
+    ":libtint_sem_src",
     ":libtint_syntax_tree_src",
     ":libtint_transform_src",
     ":libtint_type_src",