diff --git a/BUILD.bazel b/BUILD.bazel
index 97d1ef84b9..dd72688602 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -2,7 +2,6 @@
 
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
 load("@rules_license//rules:license.bzl", "license")
-load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
 load("//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
 load("//bazel:java_proto_library.bzl", "java_proto_library")
diff --git a/bazel/java_lite_proto_library.bzl b/bazel/java_lite_proto_library.bzl
index f3ed40803a..52a2e56471 100644
--- a/bazel/java_lite_proto_library.bzl
+++ b/bazel/java_lite_proto_library.bzl
@@ -13,4 +13,4 @@ def java_lite_proto_library(**kwattrs):
     if not hasattr(native, "java_lite_proto_library"):
         _java_lite_proto_library(**kwattrs)
     else:
-        native.java_lite_proto_library(**kwattrs)
+        native.java_lite_proto_library(**kwattrs)  # buildifier: disable=native-java-lite-proto
diff --git a/bazel/java_proto_library.bzl b/bazel/java_proto_library.bzl
index 57af8c48f3..31746e9808 100644
--- a/bazel/java_proto_library.bzl
+++ b/bazel/java_proto_library.bzl
@@ -13,4 +13,4 @@ def java_proto_library(**kwattrs):
     if not hasattr(native, "java_proto_library"):
         _java_proto_library(**kwattrs)
     else:
-        native.java_proto_library(**kwattrs)
+        native.java_proto_library(**kwattrs)  # buildifier: disable=native-java-proto
diff --git a/bazel/private/toolchains/BUILD.bazel b/bazel/private/toolchains/BUILD.bazel
index b21e462767..1449b61d52 100644
--- a/bazel/private/toolchains/BUILD.bazel
+++ b/bazel/private/toolchains/BUILD.bazel
@@ -1,4 +1,3 @@
-load("//bazel/toolchains:proto_lang_toolchain.bzl", "proto_lang_toolchain")
 load("//bazel/toolchains:proto_toolchain.bzl", "proto_toolchain")
 
 # Keep this file as small as possible and free of any unnecessary loads
diff --git a/bazel/proto_library.bzl b/bazel/proto_library.bzl
index 336623067d..339fe16f14 100644
--- a/bazel/proto_library.bzl
+++ b/bazel/proto_library.bzl
@@ -17,4 +17,4 @@ def proto_library(**kwattrs):
         _proto_library(**kwattrs)
     else:
         # On older Bazel versions keep using native rules, so that mismatch in ProtoInfo doesn't happen
-        native.proto_library(**kwattrs)
+        native.proto_library(**kwattrs)  # buildifier: disable=native-proto
diff --git a/bazel/toolchains/proto_lang_toolchain.bzl b/bazel/toolchains/proto_lang_toolchain.bzl
index 4c1666530e..7332af86be 100644
--- a/bazel/toolchains/proto_lang_toolchain.bzl
+++ b/bazel/toolchains/proto_lang_toolchain.bzl
@@ -35,7 +35,7 @@ def proto_lang_toolchain(*, name, toolchain_type = None, exec_compatible_with =
         _proto_lang_toolchain_rule(name = name, **attrs)
     else:
         # On older Bazel versions keep using native rules, so that mismatch in ProtoInfo doesn't happen
-        native.proto_lang_toolchain(name = name, **attrs)
+        native.proto_lang_toolchain(name = name, **attrs)  # buildifier: disable=native-proto-lang-toolchain
 
     if toolchain_type:
         native.toolchain(
diff --git a/compatibility/BUILD.bazel b/compatibility/BUILD.bazel
index 1888a2ffb0..c1af07a80c 100644
--- a/compatibility/BUILD.bazel
+++ b/compatibility/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@rules_buf//buf:defs.bzl", "buf_breaking_test")
+load("@rules_java//java:java_library.bzl", "java_library")
 
 # Simple build tests for compatibility of gencode from previous major versions
 # with the current runtime.
diff --git a/conformance/BUILD.bazel b/conformance/BUILD.bazel
index 3430b0eb19..85773fa217 100644
--- a/conformance/BUILD.bazel
+++ b/conformance/BUILD.bazel
@@ -8,6 +8,7 @@
 # Conformance testing for Protobuf.
 
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "objc_library")
+load("@rules_java//java:java_binary.bzl", "java_binary")
 load(
     "@rules_pkg//pkg:mappings.bzl",
     "pkg_filegroup",
diff --git a/conformance/test_protos/BUILD.bazel b/conformance/test_protos/BUILD.bazel
index c3033bda1f..27cbda4940 100644
--- a/conformance/test_protos/BUILD.bazel
+++ b/conformance/test_protos/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@rules_cc//cc:defs.bzl", "objc_library")
 load("//:protobuf.bzl", "internal_csharp_proto_library", "internal_objc_proto_library", "internal_py_proto_library")
 load("//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
diff --git a/editions/BUILD b/editions/BUILD
index 3d383d9cd3..be76db2835 100644
--- a/editions/BUILD
+++ b/editions/BUILD
@@ -4,7 +4,6 @@ load("//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
 load("//bazel:java_proto_library.bzl", "java_proto_library")
 load("//bazel:proto_library.bzl", "proto_library")
-load("//bazel:py_proto_library.bzl", "py_proto_library")
 load("//bazel:upb_proto_library.bzl", "upb_c_proto_library", "upb_proto_reflection_library")
 load(":defaults.bzl", "compile_edition_defaults", "embed_edition_defaults")
 
diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel
index 83ccefd078..6bd7524b8d 100644
--- a/examples/BUILD.bazel
+++ b/examples/BUILD.bazel
@@ -5,11 +5,13 @@
 # example.
 
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
 load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
 load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
 load("@rules_cc//cc:defs.bzl", "cc_binary")
+load("@rules_java//java:java_binary.bzl", "java_binary")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
 load("@rules_python//python:py_binary.bzl", "py_binary")
 
diff --git a/java/internal/BUILD.bazel b/java/internal/BUILD.bazel
index 413360533c..f349e5a6a1 100644
--- a/java/internal/BUILD.bazel
+++ b/java/internal/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_java//java:java_test.bzl", "java_test")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
 
 package(default_visibility = ["//java:__subpackages__"])
diff --git a/java/kotlin-lite/BUILD.bazel b/java/kotlin-lite/BUILD.bazel
index 8570268a14..6f3d01b6d4 100644
--- a/java/kotlin-lite/BUILD.bazel
+++ b/java/kotlin-lite/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_java//java:java_test.bzl", "java_test")
 load("@rules_jvm_external//:kt_defs.bzl", "kt_jvm_export")
 load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
diff --git a/java/kotlin/BUILD.bazel b/java/kotlin/BUILD.bazel
index 1d9cb5f82d..2a19e01a94 100644
--- a/java/kotlin/BUILD.bazel
+++ b/java/kotlin/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_java//java:java_test.bzl", "java_test")
 load("@rules_jvm_external//:kt_defs.bzl", "kt_jvm_export")
 load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
diff --git a/java/lite/BUILD.bazel b/java/lite/BUILD.bazel
index b4df648f6b..c67cb767cb 100644
--- a/java/lite/BUILD.bazel
+++ b/java/lite/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
-load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
 load("//bazel/toolchains:proto_lang_toolchain.bzl", "proto_lang_toolchain")
 load("//conformance:defs.bzl", "conformance_test")
 load("//java/internal:testing.bzl", "junit_tests")
diff --git a/java/util/BUILD.bazel b/java/util/BUILD.bazel
index b17aa69477..3d1db383cb 100644
--- a/java/util/BUILD.bazel
+++ b/java/util/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_java//java:java_library.bzl", "java_library")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
 load("//:protobuf_version.bzl", "PROTOBUF_JAVA_VERSION")
 load("//bazel:java_proto_library.bzl", "java_proto_library")
diff --git a/lua/BUILD.bazel b/lua/BUILD.bazel
index 692d6708fb..04383a533d 100644
--- a/lua/BUILD.bazel
+++ b/lua/BUILD.bazel
@@ -5,6 +5,7 @@
 # license that can be found in the LICENSE file or at
 # https://developers.google.com/open-source/licenses/bsd
 
+load("//bazel:proto_library.bzl", "proto_library")
 load(
     "//lua:lua_proto_library.bzl",
     "lua_proto_library",
diff --git a/protobuf.bzl b/protobuf.bzl
index 283c858507..4c8a5d5252 100644
--- a/protobuf.bzl
+++ b/protobuf.bzl
@@ -89,13 +89,13 @@ def _proto_gen_impl(ctx):
     if source_dir:
         has_sources = any([src.is_source for src in srcs])
         if has_sources:
-            import_flags += ["-I" + source_dir]
+            import_flags.append("-I" + source_dir)
     else:
-        import_flags += ["-I."]
+        import_flags.append("-I.")
 
     has_generated = any([not src.is_source for src in srcs])
     if has_generated:
-        import_flags += ["-I" + gen_dir]
+        import_flags.append("-I" + gen_dir)
 
     if ctx.attr.includes:
         for include in ctx.attr.includes:
@@ -103,7 +103,7 @@ def _proto_gen_impl(ctx):
                 # This is effectively source_dir, which has already been handled,
                 # and may be generated incorrectly here.
                 continue
-            import_flags += ["-I" + _GetPath(ctx, include)]
+            import_flags.append("-I" + _GetPath(ctx, include))
 
     import_flags = depset(direct = import_flags)
 
@@ -160,7 +160,7 @@ def _proto_gen_impl(ctx):
                 outs.extend(_RubyOuts([src.basename]))
 
             # Otherwise, rely on user-supplied outs.
-            args += [("--%s_out=" + path_tpl) % (lang, gen_dir)]
+            args.append(("--%s_out=" + path_tpl) % (lang, gen_dir))
 
         if ctx.attr.outs:
             outs.extend(ctx.attr.outs)
@@ -181,8 +181,8 @@ def _proto_gen_impl(ctx):
 
             if ctx.attr.plugin_options:
                 outdir = ",".join(ctx.attr.plugin_options) + ":" + outdir
-            args += [("--plugin=protoc-gen-%s=" + path_tpl) % (lang, plugin.path)]
-            args += ["--%s_out=%s" % (lang, outdir)]
+            args.append(("--plugin=protoc-gen-%s=" + path_tpl) % (lang, plugin.path))
+            args.append("--%s_out=%s" % (lang, outdir))
             tools.append(plugin)
 
         if not in_gen_dir:
diff --git a/python/BUILD.bazel b/python/BUILD.bazel
index 4ccb437f3b..3a13a97e37 100644
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@@ -7,7 +7,6 @@
 
 load("@bazel_skylib//lib:selects.bzl", "selects")
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
-load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 load("//python:build_targets.bzl", "build_targets")
 load("//python:py_extension.bzl", "py_extension")
 load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
diff --git a/ruby/lib/google/BUILD.bazel b/ruby/lib/google/BUILD.bazel
index e5aaceab91..5530bb17b0 100644
--- a/ruby/lib/google/BUILD.bazel
+++ b/ruby/lib/google/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_java//java:java_binary.bzl", "java_binary")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
 load("@rules_ruby//ruby:defs.bzl", "ruby_library")
 
diff --git a/rust/BUILD b/rust/BUILD
index 99c1c95b5d..e4759961a3 100644
--- a/rust/BUILD
+++ b/rust/BUILD
@@ -4,7 +4,6 @@ load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
 load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")
 load("//bazel/toolchains:proto_lang_toolchain.bzl", "proto_lang_toolchain")
-load("//rust:dist.bzl", "pkg_cross_compiled_binaries")
 
 licenses(["notice"])
 
diff --git a/rust/defs.bzl b/rust/defs.bzl
index 6a3c2a64c9..cace2d8d13 100644
--- a/rust/defs.bzl
+++ b/rust/defs.bzl
@@ -89,6 +89,12 @@ def _rust_proto_library_impl(ctx):
     dep = deps[0]
     rust_proto_info = dep[RustProtoInfo]
 
+    proto_common.check_collocated(
+        ctx.label,
+        dep[ProtoInfo],
+        ctx.attr._proto_lang_toolchain[proto_common.ProtoLangToolchainInfo],
+    )
+
     if len(rust_proto_info.dep_variant_infos) != 1:
         fail(
             "{}: rust_proto_library does not support src-less proto_library targets."
diff --git a/rust/test/cpp/interop/BUILD b/rust/test/cpp/interop/BUILD
index 9517649b19..4482bee141 100644
--- a/rust/test/cpp/interop/BUILD
+++ b/rust/test/cpp/interop/BUILD
@@ -2,6 +2,7 @@
 
 load("@rules_rust//rust:defs.bzl", "rust_test")
 load("//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("//bazel:proto_library.bzl", "proto_library")
 load(
     "//rust:defs.bzl",
     "rust_cc_proto_library",
diff --git a/upb/bazel/BUILD b/upb/bazel/BUILD
index f83de7b75a..bedc0c1aa9 100644
--- a/upb/bazel/BUILD
+++ b/upb/bazel/BUILD
@@ -8,10 +8,6 @@
 load("@bazel_skylib//lib:selects.bzl", "selects")
 load("@rules_python//python:defs.bzl", "py_binary")
 
-package(default_applicable_licenses = ["//:license"])
-
-licenses(["notice"])
-
 py_binary(
     name = "amalgamate",
     srcs = ["amalgamate.py"],
diff --git a/upb/cmake/BUILD.bazel b/upb/cmake/BUILD.bazel
index f5a9469d70..348c557c94 100644
--- a/upb/cmake/BUILD.bazel
+++ b/upb/cmake/BUILD.bazel
@@ -6,10 +6,6 @@
 # https://developers.google.com/open-source/licenses/bsd
 
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
-load(
-    "//upb/bazel:build_defs.bzl",
-    "make_shell_script",
-)
 load(
     ":build_defs.bzl",
     "staleness_test",