diff --git a/BUILD.bazel b/BUILD.bazel
index 11b2b84ce0..26fa22ebec 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_binary", "java_proto_library")
 load(
     "//:gapic_generator_java.bzl",
     "google_java_format",
diff --git a/src/main/java/com/google/api/generator/BUILD.bazel b/src/main/java/com/google/api/generator/BUILD.bazel
index 864fdfcf6f..33b265ab7d 100644
--- a/src/main/java/com/google/api/generator/BUILD.bazel
+++ b/src/main/java/com/google/api/generator/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library", "java_plugin")
+
 package(default_visibility = ["//visibility:public"])
 #package(default_visibility = ["//:__pkg__"])
 
diff --git a/src/main/java/com/google/api/generator/engine/BUILD.bazel b/src/main/java/com/google/api/generator/engine/BUILD.bazel
index 05770b768f..e24de9501a 100644
--- a/src/main/java/com/google/api/generator/engine/BUILD.bazel
+++ b/src/main/java/com/google/api/generator/engine/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
diff --git a/src/main/java/com/google/api/generator/engine/ast/BUILD.bazel b/src/main/java/com/google/api/generator/engine/ast/BUILD.bazel
index 42836cd641..3a8ff41fcf 100644
--- a/src/main/java/com/google/api/generator/engine/ast/BUILD.bazel
+++ b/src/main/java/com/google/api/generator/engine/ast/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
diff --git a/src/main/java/com/google/api/generator/engine/escaper/BUILD.bazel b/src/main/java/com/google/api/generator/engine/escaper/BUILD.bazel
index d67ab3debe..8a347061a5 100644
--- a/src/main/java/com/google/api/generator/engine/escaper/BUILD.bazel
+++ b/src/main/java/com/google/api/generator/engine/escaper/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
diff --git a/src/main/java/com/google/api/generator/engine/lexicon/BUILD.bazel b/src/main/java/com/google/api/generator/engine/lexicon/BUILD.bazel
index f9afe1c954..b1d81d4357 100644
--- a/src/main/java/com/google/api/generator/engine/lexicon/BUILD.bazel
+++ b/src/main/java/com/google/api/generator/engine/lexicon/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
diff --git a/src/main/java/com/google/api/generator/engine/writer/BUILD.bazel b/src/main/java/com/google/api/generator/engine/writer/BUILD.bazel
index 448ba1b9bb..6e8bf7ae3d 100644
--- a/src/main/java/com/google/api/generator/engine/writer/BUILD.bazel
+++ b/src/main/java/com/google/api/generator/engine/writer/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
diff --git a/src/main/java/com/google/api/generator/gapic/BUILD.bazel b/src/main/java/com/google/api/generator/gapic/BUILD.bazel
index 5ce5d285ef..986b6d595b 100644
--- a/src/main/java/com/google/api/generator/gapic/BUILD.bazel
+++ b/src/main/java/com/google/api/generator/gapic/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library", "java_proto_library")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
diff --git a/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel b/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel
index 0e19bf3dec..f90d35bd99 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel
+++ b/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
diff --git a/src/main/java/com/google/api/generator/gapic/model/BUILD.bazel b/src/main/java/com/google/api/generator/gapic/model/BUILD.bazel
index 9d9d3f7af8..5c2eea6a14 100644
--- a/src/main/java/com/google/api/generator/gapic/model/BUILD.bazel
+++ b/src/main/java/com/google/api/generator/gapic/model/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
diff --git a/src/main/java/com/google/api/generator/gapic/protoparser/BUILD.bazel b/src/main/java/com/google/api/generator/gapic/protoparser/BUILD.bazel
index e1cb8a9ad7..bc14e4a480 100644
--- a/src/main/java/com/google/api/generator/gapic/protoparser/BUILD.bazel
+++ b/src/main/java/com/google/api/generator/gapic/protoparser/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library", "java_proto_library")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
diff --git a/src/main/java/com/google/api/generator/gapic/protowriter/BUILD.bazel b/src/main/java/com/google/api/generator/gapic/protowriter/BUILD.bazel
index 6506ede13c..3094cc5fa3 100644
--- a/src/main/java/com/google/api/generator/gapic/protowriter/BUILD.bazel
+++ b/src/main/java/com/google/api/generator/gapic/protowriter/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
diff --git a/src/main/java/com/google/api/generator/gapic/utils/BUILD.bazel b/src/main/java/com/google/api/generator/gapic/utils/BUILD.bazel
index 934634f689..ee560c1955 100644
--- a/src/main/java/com/google/api/generator/gapic/utils/BUILD.bazel
+++ b/src/main/java/com/google/api/generator/gapic/utils/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
diff --git a/src/test/java/com/google/api/generator/engine/BUILD.bazel b/src/test/java/com/google/api/generator/engine/BUILD.bazel
index f1b9c96ae0..e52ef62387 100644
--- a/src/test/java/com/google/api/generator/engine/BUILD.bazel
+++ b/src/test/java/com/google/api/generator/engine/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_test")
 load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/test/java/com/google/api/generator/engine/ast/BUILD.bazel b/src/test/java/com/google/api/generator/engine/ast/BUILD.bazel
index dda0ab0ac3..7355b0b3d1 100644
--- a/src/test/java/com/google/api/generator/engine/ast/BUILD.bazel
+++ b/src/test/java/com/google/api/generator/engine/ast/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
 package(default_visibility = ["//visibility:public"])
 
 TESTS = [
diff --git a/src/test/java/com/google/api/generator/engine/lexicon/BUILD.bazel b/src/test/java/com/google/api/generator/engine/lexicon/BUILD.bazel
index 7c50d5293a..81e7555cb3 100644
--- a/src/test/java/com/google/api/generator/engine/lexicon/BUILD.bazel
+++ b/src/test/java/com/google/api/generator/engine/lexicon/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
 package(default_visibility = ["//visibility:public"])
 
 TESTS = [
diff --git a/src/test/java/com/google/api/generator/engine/writer/BUILD.bazel b/src/test/java/com/google/api/generator/engine/writer/BUILD.bazel
index 2ec12afdff..238745ce19 100644
--- a/src/test/java/com/google/api/generator/engine/writer/BUILD.bazel
+++ b/src/test/java/com/google/api/generator/engine/writer/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
 package(default_visibility = ["//visibility:public"])
 
 TESTS = [
diff --git a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel
index 9211d8b5a1..d04f29e1c9 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel
+++ b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
 load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/test/java/com/google/api/generator/gapic/model/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/model/BUILD.bazel
index 6c919246db..f2697b2efa 100644
--- a/src/test/java/com/google/api/generator/gapic/model/BUILD.bazel
+++ b/src/test/java/com/google/api/generator/gapic/model/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
 package(default_visibility = ["//visibility:public"])
 
 TESTS = [
diff --git a/src/test/java/com/google/api/generator/gapic/protoparser/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/protoparser/BUILD.bazel
index 83c0403098..cc3063d4db 100644
--- a/src/test/java/com/google/api/generator/gapic/protoparser/BUILD.bazel
+++ b/src/test/java/com/google/api/generator/gapic/protoparser/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
 package(default_visibility = ["//visibility:public"])
 
 TESTS = [
diff --git a/src/test/java/com/google/api/generator/gapic/testdata/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/testdata/BUILD.bazel
index 744138900f..a846eaf638 100644
--- a/src/test/java/com/google/api/generator/gapic/testdata/BUILD.bazel
+++ b/src/test/java/com/google/api/generator/gapic/testdata/BUILD.bazel
@@ -1,3 +1,6 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_proto_library")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
diff --git a/src/test/java/com/google/api/generator/gapic/utils/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/utils/BUILD.bazel
index 157800f105..27db522c54 100644
--- a/src/test/java/com/google/api/generator/gapic/utils/BUILD.bazel
+++ b/src/test/java/com/google/api/generator/gapic/utils/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
 package(default_visibility = ["//visibility:public"])
 
 TESTS = [
diff --git a/src/test/java/com/google/api/generator/test/framework/BUILD.bazel b/src/test/java/com/google/api/generator/test/framework/BUILD.bazel
index 5d167df4bb..c9f4b9ce74 100644
--- a/src/test/java/com/google/api/generator/test/framework/BUILD.bazel
+++ b/src/test/java/com/google/api/generator/test/framework/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 package(default_visibility = ["//visibility:public"])
 
 filegroup(