diff --git a/BUILD.bazel b/BUILD.bazel
index 0a143e52..5b907f47 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,5 +1,4 @@
 load("@bazel_gazelle//:def.bzl", "DEFAULT_LANGUAGES", "gazelle", "gazelle_binary")
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
 
 buildifier(
diff --git a/java/gazelle/BUILD.bazel b/java/gazelle/BUILD.bazel
index dead601f..12eafeb9 100644
--- a/java/gazelle/BUILD.bazel
+++ b/java/gazelle/BUILD.bazel
@@ -23,13 +23,13 @@ go_library(
         "//java/gazelle/private/sorted_multiset",
         "//java/gazelle/private/sorted_set",
         "//java/gazelle/private/types",
-        "@bazel_gazelle//config:go_default_library",
-        "@bazel_gazelle//label:go_default_library",
-        "@bazel_gazelle//language:go_default_library",
-        "@bazel_gazelle//language/proto:go_default_library",
-        "@bazel_gazelle//repo:go_default_library",
-        "@bazel_gazelle//resolve:go_default_library",
-        "@bazel_gazelle//rule:go_default_library",
+        "@bazel_gazelle//config",
+        "@bazel_gazelle//label",
+        "@bazel_gazelle//language",
+        "@bazel_gazelle//language/proto",
+        "@bazel_gazelle//repo",
+        "@bazel_gazelle//resolve",
+        "@bazel_gazelle//rule",
         "@com_github_bazelbuild_buildtools//build",
         "@com_github_hashicorp_golang_lru//:golang-lru",
         "@com_github_rs_zerolog//:zerolog",
@@ -50,16 +50,16 @@ go_test(
         "//java/gazelle/javaconfig",
         "//java/gazelle/private/sorted_set",
         "//java/gazelle/private/types",
-        "@bazel_gazelle//config:go_default_library",
-        "@bazel_gazelle//label:go_default_library",
-        "@bazel_gazelle//language:go_default_library",
-        "@bazel_gazelle//language/proto:go_default_library",
-        "@bazel_gazelle//pathtools:go_default_library",
-        "@bazel_gazelle//repo:go_default_library",
-        "@bazel_gazelle//resolve:go_default_library",
-        "@bazel_gazelle//rule:go_default_library",
-        "@bazel_gazelle//testtools:go_default_library",
-        "@bazel_gazelle//walk:go_default_library",
+        "@bazel_gazelle//config",
+        "@bazel_gazelle//label",
+        "@bazel_gazelle//language",
+        "@bazel_gazelle//language/proto",
+        "@bazel_gazelle//pathtools",
+        "@bazel_gazelle//repo",
+        "@bazel_gazelle//resolve",
+        "@bazel_gazelle//rule",
+        "@bazel_gazelle//testtools",
+        "@bazel_gazelle//walk",
         "@com_github_bazelbuild_buildtools//build",
         "@com_github_google_go_cmp//cmp",
         "@com_github_rs_zerolog//:zerolog",
diff --git a/java/gazelle/private/javaparser/BUILD.bazel b/java/gazelle/private/javaparser/BUILD.bazel
index 00697b25..780b1466 100644
--- a/java/gazelle/private/javaparser/BUILD.bazel
+++ b/java/gazelle/private/javaparser/BUILD.bazel
@@ -7,7 +7,7 @@ go_library(
     visibility = ["//java/gazelle:__subpackages__"],
     deps = [
         "//java/gazelle/private/java",
-        "//java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0:javaparser",
+        "//java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0:gazelle_java_build_v0_go_proto",
         "//java/gazelle/private/servermanager",
         "//java/gazelle/private/sorted_multiset",
         "//java/gazelle/private/sorted_set",
diff --git a/java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0/BUILD.bazel b/java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0/BUILD.bazel
index 8a189b7d..93338e0b 100644
--- a/java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0/BUILD.bazel
+++ b/java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0/BUILD.bazel
@@ -1,6 +1,5 @@
-load("@rules_go//go:def.bzl", "go_library")
-load("@rules_go//proto:def.bzl", "go_proto_library")
 load("@grpc-java//:java_grpc_library.bzl", "java_grpc_library")
+load("@rules_go//proto:def.bzl", "go_proto_library")
 load("@rules_java//java:defs.bzl", "java_library", "java_proto_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
@@ -20,12 +19,6 @@ go_proto_library(
     proto = ":gazelle_java_build_v0_proto",
 )
 
-go_library(
-    name = "javaparser",
-    embed = [":gazelle_java_build_v0_go_proto"],
-    importpath = "github.com/bazel-contrib/rules_jvm/java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0",
-)
-
 java_proto_library(
     name = "gazelle_java_build_v0_java_proto",
     deps = [":gazelle_java_build_v0_proto"],
diff --git a/java/gazelle/private/maven/BUILD.bazel b/java/gazelle/private/maven/BUILD.bazel
index 3ca41cc6..8426d570 100644
--- a/java/gazelle/private/maven/BUILD.bazel
+++ b/java/gazelle/private/maven/BUILD.bazel
@@ -14,7 +14,7 @@ go_library(
         "//java/gazelle/private/bazel",
         "//java/gazelle/private/maven/multiset",
         "//java/gazelle/private/types",
-        "@bazel_gazelle//label:go_default_library",
+        "@bazel_gazelle//label",
         "@com_github_rs_zerolog//:zerolog",
     ],
 )
@@ -31,7 +31,7 @@ go_test(
     embed = [":maven"],
     deps = [
         "//java/gazelle/private/types",
-        "@bazel_gazelle//label:go_default_library",
+        "@bazel_gazelle//label",
         "@com_github_rs_zerolog//:zerolog",
         "@com_github_stretchr_testify//require",
     ],
diff --git a/java/gazelle/private/servermanager/BUILD.bazel b/java/gazelle/private/servermanager/BUILD.bazel
index a4e8afb3..44ad2482 100644
--- a/java/gazelle/private/servermanager/BUILD.bazel
+++ b/java/gazelle/private/servermanager/BUILD.bazel
@@ -7,8 +7,8 @@ go_library(
     importpath = "github.com/bazel-contrib/rules_jvm/java/gazelle/private/servermanager",
     visibility = ["//java/gazelle:__subpackages__"],
     deps = [
-        "//java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0:javaparser",
-        "@rules_go//go/runfiles:go_default_library",
+        "//java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0:gazelle_java_build_v0_go_proto",
         "@org_golang_google_grpc//:grpc",
+        "@rules_go//go/runfiles",
     ],
 )