diff --git a/bazel/BUILD b/bazel/BUILD
index 279c7c9e..4b582bb8 100644
--- a/bazel/BUILD
+++ b/bazel/BUILD
@@ -1,7 +1,7 @@
-licenses(["notice"])  # Apache 2
-
 load("@io_bazel_rules_go//proto:compiler.bzl", "go_proto_compiler")
 
+licenses(["notice"])  # Apache 2
+
 go_proto_compiler(
     name = "pgv_plugin_go",
     options = ["lang=go"],
diff --git a/bazel/api_build_system.bzl b/bazel/api_build_system.bzl
index 7e88ab2b..e9119b32 100644
--- a/bazel/api_build_system.bzl
+++ b/bazel/api_build_system.bzl
@@ -1,7 +1,8 @@
+load("@rules_cc//cc:defs.bzl", "cc_test")
 load("@com_envoyproxy_protoc_gen_validate//bazel:pgv_proto_library.bzl", "pgv_cc_proto_library")
 load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
 load("@com_google_protobuf//:protobuf.bzl", _py_proto_library = "py_proto_library")
-load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library", "go_proto_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_test")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load(
@@ -138,7 +139,7 @@ def api_cc_py_proto_library(
         _api_cc_grpc_library(name = cc_grpc_name, proto = relative_name, deps = cc_proto_deps)
 
 def api_cc_test(name, **kwargs):
-    native.cc_test(
+    cc_test(
         name = name,
         **kwargs
     )
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index af1f1133..a64e733c 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -1,4 +1,3 @@
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load(":envoy_http_archive.bzl", "envoy_http_archive")
 load(":repository_locations.bzl", "REPOSITORY_LOCATIONS")
 
diff --git a/envoy/service/auth/v2alpha/BUILD b/envoy/service/auth/v2alpha/BUILD
index 0bd31fdc..c75dabe1 100644
--- a/envoy/service/auth/v2alpha/BUILD
+++ b/envoy/service/auth/v2alpha/BUILD
@@ -1,9 +1,9 @@
+load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
+
 licenses(["notice"])  # Apache 2
 
 # DO NOT EDIT. This file is generated by tools/proto_sync.py.
 
-load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
-
 api_proto_package(
     has_services = True,
     deps = ["//envoy/service/auth/v2:pkg"],
diff --git a/test/build/BUILD b/test/build/BUILD
index 59f0a364..2dae9fa0 100644
--- a/test/build/BUILD
+++ b/test/build/BUILD
@@ -1,7 +1,7 @@
-licenses(["notice"])  # Apache 2
-
 load("@envoy_api//bazel:api_build_system.bzl", "api_cc_test", "api_go_test")
 
+licenses(["notice"])  # Apache 2
+
 api_cc_test(
     name = "build_test",
     srcs = ["build_test.cc"],
diff --git a/test/validate/BUILD b/test/validate/BUILD
index 4398672c..c9a7ba70 100644
--- a/test/validate/BUILD
+++ b/test/validate/BUILD
@@ -1,7 +1,7 @@
-licenses(["notice"])  # Apache 2
-
 load("@envoy_api//bazel:api_build_system.bzl", "api_cc_test")
 
+licenses(["notice"])  # Apache 2
+
 api_cc_test(
     name = "pgv_test",
     srcs = ["pgv_test.cc"],
diff --git a/tools/BUILD b/tools/BUILD
index 8d2207b9..2273a9b9 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -1,3 +1,5 @@
+load("@rules_python//python:defs.bzl", "py_binary", "py_test")
+
 licenses(["notice"])  # Apache 2
 
 py_binary(
diff --git a/versioning/BUILD b/versioning/BUILD
index 1bc4b512..ccea9008 100644
--- a/versioning/BUILD
+++ b/versioning/BUILD
@@ -1,9 +1,9 @@
 # DO NOT EDIT. This file is generated by tools/proto_format/active_protos_gen.py.
 
-licenses(["notice"])  # Apache 2
-
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
+licenses(["notice"])  # Apache 2
+
 # This tracks active development versions of protos.
 proto_library(
     name = "active_protos",