diff --git a/pkg/BUILD b/pkg/BUILD
index 97b7ea03f96..da105e0cf47 100644
--- a/pkg/BUILD
+++ b/pkg/BUILD
@@ -86,7 +86,8 @@ filegroup(
         "//pkg/util:all-srcs",
         "//pkg/version:all-srcs",
         "//pkg/volume:all-srcs",
-        "//pkg/watch:all-srcs",
+        "//pkg/watch/json:all-srcs",
+        "//pkg/watch/versioned:all-srcs",
     ],
     tags = ["automanaged"],
 )
diff --git a/pkg/api/BUILD b/pkg/api/BUILD
index 08619f646d9..ae324f2cce6 100644
--- a/pkg/api/BUILD
+++ b/pkg/api/BUILD
@@ -102,7 +102,6 @@ filegroup(
     srcs = [
         ":package-srcs",
         "//pkg/api/endpoints:all-srcs",
-        "//pkg/api/errors:all-srcs",
         "//pkg/api/events:all-srcs",
         "//pkg/api/fuzzer:all-srcs",
         "//pkg/api/helper:all-srcs",
diff --git a/pkg/api/errors/BUILD b/pkg/api/errors/BUILD
deleted file mode 100644
index df044c0ebf9..00000000000
--- a/pkg/api/errors/BUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["doc.go"],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/pkg/watch/BUILD b/pkg/watch/BUILD
deleted file mode 100644
index 79e41daa4b8..00000000000
--- a/pkg/watch/BUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["doc.go"],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//pkg/watch/json:all-srcs",
-        "//pkg/watch/versioned:all-srcs",
-    ],
-    tags = ["automanaged"],
-)