diff --git a/BUILD b/BUILD
index daca02f49b..0bd74b41c8 100644
--- a/BUILD
+++ b/BUILD
@@ -77,7 +77,7 @@ cc_library(
         "upb/port_def.inc",
         "upb/port_undef.inc",
     ],
-    visibility = ["//tests:__pkg__"],
+    visibility = ["//:__subpackages__"],
 )
 
 cc_library(
diff --git a/upb/util/BUILD b/upb/util/BUILD
index ab21209224..2562140b14 100644
--- a/upb/util/BUILD
+++ b/upb/util/BUILD
@@ -14,7 +14,7 @@ cc_library(
     hdrs = ["def_to_proto.h"],
     visibility = ["//visibility:public"],
     deps = [
-        "//:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+        "//:port",
         "//:reflection",
     ],
 )
@@ -61,7 +61,7 @@ cc_library(
     hdrs = ["required_fields.h"],
     visibility = ["//visibility:public"],
     deps = [
-        "//:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+        "//:port",
         "//:reflection",
     ],
 )
@@ -104,7 +104,7 @@ cc_library(
     hdrs = ["compare.h"],
     visibility = ["//visibility:public"],
     deps = [
-        "//:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+        "//:port",
         "//:reflection",
     ],
 )