diff --git a/go/platform/BUILD.bazel b/go/platform/BUILD.bazel
index 2fc649a48a..c471ee646a 100644
--- a/go/platform/BUILD.bazel
+++ b/go/platform/BUILD.bazel
@@ -36,3 +36,8 @@ bzl_library(
     name = "apple",
     srcs = ["apple.bzl"],
 )
+
+bzl_library(
+    name = "crosstool",
+    srcs = ["crosstool.bzl"],
+)
diff --git a/go/private/BUILD.bazel b/go/private/BUILD.bazel
index 2d09edb668..5317be93dc 100644
--- a/go/private/BUILD.bazel
+++ b/go/private/BUILD.bazel
@@ -137,3 +137,9 @@ bzl_library(
         "//proto:__pkg__",  # keep
     ],
 )
+
+bzl_library(
+    name = "rpath",
+    srcs = ["rpath.bzl"],
+    visibility = ["//go:__subpackages__"],
+)
diff --git a/go/private/actions/BUILD.bazel b/go/private/actions/BUILD.bazel
index 40d8ef107a..7ae5712cad 100644
--- a/go/private/actions/BUILD.bazel
+++ b/go/private/actions/BUILD.bazel
@@ -75,8 +75,10 @@ bzl_library(
     srcs = ["link.bzl"],
     visibility = ["//go:__subpackages__"],
     deps = [
+        "@bazel_skylib//lib:collections",
         "@io_bazel_rules_go//go/private:common",
         "@io_bazel_rules_go//go/private:mode",
+        "@io_bazel_rules_go//go/private:rpath",
     ],
 )
 
diff --git a/go/private/context.bzl b/go/private/context.bzl
index e5cef027a7..c65220e740 100644
--- a/go/private/context.bzl
+++ b/go/private/context.bzl
@@ -346,7 +346,8 @@ def _infer_importpath(ctx):
 def go_context(ctx, attr = None):
     """Returns an API used to build Go code.
 
-    See /go/toolchains.rst#go-context"""
+    See /go/toolchains.rst#go-context
+    """
     if not attr:
         attr = ctx.attr
     toolchain = ctx.toolchains["@io_bazel_rules_go//go:toolchain"]
diff --git a/go/private/repositories.bzl b/go/private/repositories.bzl
index 8560d67f0e..aa8cac3c89 100644
--- a/go/private/repositories.bzl
+++ b/go/private/repositories.bzl
@@ -316,6 +316,7 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 bzl_library(
     name = "def",
     srcs = ["def.bzl"],
+    visibility = ["//visibility:public"],
 )
 """
     ctx.file("BUILD.bazel", build_content)
diff --git a/go/private/rules/BUILD.bazel b/go/private/rules/BUILD.bazel
index ebc8aa814c..de23f47c5a 100644
--- a/go/private/rules/BUILD.bazel
+++ b/go/private/rules/BUILD.bazel
@@ -115,12 +115,13 @@ bzl_library(
         "//go:__subpackages__",
         "//proto:__pkg__",
     ],
-    # Don't list dependency on @io_bazel_rules_go_name_hack//:def
     deps = [
+        "@io_bazel_rules_go//go/platform:crosstool",
         "@io_bazel_rules_go//go/private:mode",
         "@io_bazel_rules_go//go/private:platforms",
         "@io_bazel_rules_go//go/private:providers",
-    ],  # keep
+        "@io_bazel_rules_go_name_hack//:def",
+    ],
 )
 
 bzl_library(