diff --git a/packages/compiler-cli/src/ngtsc/file_system/BUILD.bazel b/packages/compiler-cli/src/ngtsc/file_system/BUILD.bazel
index 00aad64ac8..b40ffa15fb 100644
--- a/packages/compiler-cli/src/ngtsc/file_system/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/file_system/BUILD.bazel
@@ -1,14 +1,13 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "file_system",
     srcs = ["index.ts"] + glob([
-        "src/*.ts",
+        "src/**/*.ts",
     ]),
     deps = [
-        "//packages:types",
         "@npm//@types/fs-extra",
         "@npm//@types/node",
         "@npm//fs-extra",
diff --git a/packages/compiler-cli/src/ngtsc/file_system/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/file_system/test/BUILD.bazel
index 36575562ed..ed75bf3eda 100644
--- a/packages/compiler-cli/src/ngtsc/file_system/test/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/file_system/test/BUILD.bazel
@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
+package(default_visibility = ["//visibility:public"])
+
 ts_library(
     name = "test_lib",
     testonly = True,
@@ -9,7 +9,6 @@ ts_library(
         "**/*.ts",
     ]),
     deps = [
-        "//packages:types",
         "//packages/compiler-cli/src/ngtsc/file_system",
         "//packages/compiler-cli/src/ngtsc/file_system/testing",
         "@npm//@types/fs-extra",