diff --git a/mediapipe/framework/profiler/BUILD b/mediapipe/framework/profiler/BUILD
index 2947b9844..3b6976fc8 100644
--- a/mediapipe/framework/profiler/BUILD
+++ b/mediapipe/framework/profiler/BUILD
@@ -291,9 +291,7 @@ cc_library(
             "-ObjC++",
         ],
     }),
-    visibility = [
-        "//mediapipe/framework:mediapipe_internal",
-    ],
+    visibility = ["//visibility:private"],
     deps = [
         "@com_google_absl//absl/flags:flag",
         "//mediapipe/framework/port:logging",
diff --git a/mediapipe/framework/tool/BUILD b/mediapipe/framework/tool/BUILD
index 52d04b4b1..453b5a0e8 100644
--- a/mediapipe/framework/tool/BUILD
+++ b/mediapipe/framework/tool/BUILD
@@ -90,7 +90,7 @@ mediapipe_proto_library(
     name = "packet_generator_wrapper_calculator_proto",
     srcs = ["packet_generator_wrapper_calculator.proto"],
     def_py_proto = False,
-    visibility = ["//mediapipe/framework:mediapipe_internal"],
+    visibility = ["//mediapipe/framework:__subpackages__"],
     deps = [
         "//mediapipe/framework:calculator_options_proto",
         "//mediapipe/framework:packet_generator_proto",
@@ -120,13 +120,13 @@ cc_library(
     name = "fill_packet_set",
     srcs = ["fill_packet_set.cc"],
     hdrs = ["fill_packet_set.h"],
-    visibility = ["//mediapipe/framework:mediapipe_internal"],
+    visibility = ["//mediapipe/framework:__subpackages__"],
     deps = [
+        ":status_util",
         "//mediapipe/framework:packet_set",
         "//mediapipe/framework:packet_type",
         "//mediapipe/framework/port:status",
         "//mediapipe/framework/port:statusor",
-        "//mediapipe/framework/tool:status_util",
         "@com_google_absl//absl/memory",
     ],
 )
@@ -162,7 +162,6 @@ cc_library(
 cc_test(
     name = "executor_util_test",
     srcs = ["executor_util_test.cc"],
-    visibility = ["//mediapipe/framework:mediapipe_internal"],
     deps = [
         ":executor_util",
         "//mediapipe/framework/port:gtest_main",
@@ -173,7 +172,7 @@ cc_test(
 cc_library(
     name = "options_map",
     hdrs = ["options_map.h"],
-    visibility = ["//mediapipe/framework:mediapipe_internal"],
+    visibility = ["//mediapipe:__subpackages__"],
     deps = [
         ":type_util",
         "//mediapipe/framework:calculator_cc_proto",
@@ -193,7 +192,7 @@ cc_library(
     name = "options_field_util",
     srcs = ["options_field_util.cc"],
     hdrs = ["options_field_util.h"],
-    visibility = ["//mediapipe/framework:mediapipe_internal"],
+    visibility = ["//visibility:private"],
     deps = [
         ":field_data_cc_proto",
         ":name_util",
@@ -216,7 +215,7 @@ cc_library(
     name = "options_syntax_util",
     srcs = ["options_syntax_util.cc"],
     hdrs = ["options_syntax_util.h"],
-    visibility = ["//mediapipe/framework:mediapipe_internal"],
+    visibility = ["//visibility:private"],
     deps = [
         ":name_util",
         ":options_field_util",
@@ -235,8 +234,9 @@ cc_library(
     name = "options_util",
     srcs = ["options_util.cc"],
     hdrs = ["options_util.h"],
-    visibility = ["//mediapipe/framework:mediapipe_internal"],
+    visibility = ["//visibility:public"],
     deps = [
+        ":name_util",
         ":options_field_util",
         ":options_map",
         ":options_registry",
@@ -254,7 +254,6 @@ cc_library(
         "//mediapipe/framework/port:advanced_proto",
         "//mediapipe/framework/port:any_proto",
         "//mediapipe/framework/port:status",
-        "//mediapipe/framework/tool:name_util",
         "@com_google_absl//absl/strings",
     ],
 )
@@ -323,7 +322,7 @@ mediapipe_cc_test(
 cc_library(
     name = "packet_generator_wrapper_calculator",
     srcs = ["packet_generator_wrapper_calculator.cc"],
-    visibility = ["//mediapipe/framework:mediapipe_internal"],
+    visibility = ["//mediapipe/framework:__subpackages__"],
     deps = [
         ":packet_generator_wrapper_calculator_cc_proto",
         "//mediapipe/framework:calculator_base",