diff --git a/mediapipe/framework/deps/BUILD b/mediapipe/framework/deps/BUILD
index 95ab21707..27bc105c8 100644
--- a/mediapipe/framework/deps/BUILD
+++ b/mediapipe/framework/deps/BUILD
@@ -20,7 +20,9 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
 licenses(["notice"])
 
-package(default_visibility = ["//visibility:private"])
+package(default_visibility = [
+    "//mediapipe:__subpackages__",
+])
 
 bzl_library(
     name = "expand_template_bzl",
@@ -50,13 +52,11 @@ mediapipe_proto_library(
 cc_library(
     name = "aligned_malloc_and_free",
     hdrs = ["aligned_malloc_and_free.h"],
-    visibility = ["//visibility:public"],
 )
 
 cc_library(
     name = "cleanup",
     hdrs = ["cleanup.h"],
-    visibility = ["//visibility:public"],
     deps = ["@com_google_absl//absl/base:core_headers"],
 )
 
@@ -86,7 +86,6 @@ cc_library(
     # Use this library through "mediapipe/framework/port:gtest_main".
     visibility = [
         "//mediapipe/framework/port:__pkg__",
-        "//third_party/visionai/algorithms/tracking:__pkg__",
     ],
     deps = [
         "//mediapipe/framework/port:core_proto",
@@ -108,7 +107,6 @@ cc_library(
     name = "file_helpers",
     srcs = ["file_helpers.cc"],
     hdrs = ["file_helpers.h"],
-    visibility = ["//visibility:public"],
     deps = [
         ":file_path",
         "//mediapipe/framework/port:status",
@@ -134,7 +132,6 @@ cc_library(
 cc_library(
     name = "image_resizer",
     hdrs = ["image_resizer.h"],
-    visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework/port:opencv_imgproc",
     ],
@@ -151,7 +148,9 @@ cc_library(
 cc_library(
     name = "mathutil",
     hdrs = ["mathutil.h"],
-    visibility = ["//visibility:public"],
+    visibility = [
+        "//mediapipe:__subpackages__",
+    ],
     deps = [
         "//mediapipe/framework/port:integral_types",
         "//mediapipe/framework/port:logging",
@@ -171,7 +170,6 @@ cc_library(
 cc_library(
     name = "no_destructor",
     hdrs = ["no_destructor.h"],
-    visibility = ["//visibility:public"],
 )
 
 cc_library(
@@ -190,7 +188,6 @@ cc_library(
 cc_library(
     name = "random",
     hdrs = ["random_base.h"],
-    visibility = ["//visibility:public"],
     deps = ["//mediapipe/framework/port:integral_types"],
 )
 
@@ -211,14 +208,12 @@ cc_library(
     name = "registration_token",
     srcs = ["registration_token.cc"],
     hdrs = ["registration_token.h"],
-    visibility = ["//visibility:public"],
 )
 
 cc_library(
     name = "registration",
     srcs = ["registration.cc"],
     hdrs = ["registration.h"],
-    visibility = ["//visibility:public"],
     deps = [
         ":registration_token",
         "//mediapipe/framework/port:logging",
@@ -279,7 +274,6 @@ cc_library(
     hdrs = [
         "re2.h",
     ],
-    visibility = ["//visibility:public"],
 )
 
 cc_library(
@@ -310,7 +304,6 @@ cc_library(
 cc_library(
     name = "thread_options",
     hdrs = ["thread_options.h"],
-    visibility = ["//visibility:public"],
 )
 
 cc_library(
@@ -356,7 +349,6 @@ cc_library(
 cc_test(
     name = "mathutil_unittest",
     srcs = ["mathutil_unittest.cc"],
-    visibility = ["//visibility:public"],
     deps = [
         ":mathutil",
         "//mediapipe/framework/port:benchmark",
@@ -368,7 +360,6 @@ cc_test(
     name = "registration_token_test",
     srcs = ["registration_token_test.cc"],
     linkstatic = 1,
-    visibility = ["//visibility:public"],
     deps = [
         ":registration_token",
         "//mediapipe/framework/port:gtest_main",
@@ -381,7 +372,6 @@ cc_test(
     timeout = "long",
     srcs = ["safe_int_test.cc"],
     linkstatic = 1,
-    visibility = ["//visibility:public"],
     deps = [
         ":intops",
         "//mediapipe/framework/port:gtest_main",
@@ -393,7 +383,6 @@ cc_test(
     name = "monotonic_clock_test",
     srcs = ["monotonic_clock_test.cc"],
     linkstatic = 1,
-    visibility = ["//visibility:public"],
     deps = [
         ":clock",
         "//mediapipe/framework/port:gtest_main",
diff --git a/mediapipe/framework/port/BUILD b/mediapipe/framework/port/BUILD
index e499ca3a6..1039dc1c6 100644
--- a/mediapipe/framework/port/BUILD
+++ b/mediapipe/framework/port/BUILD
@@ -18,7 +18,7 @@
 licenses(["notice"])
 
 package(
-    default_visibility = ["//visibility:private"],
+    default_visibility = ["//visibility:public"],
     features = ["-parse_headers"],
 )
 
@@ -28,7 +28,6 @@ config_setting(
     define_values = {
         "USE_MEDIAPIPE_THREADPOOL": "1",
     },
-    visibility = ["//visibility:public"],
 )
 
 #TODO : remove from OSS.
@@ -37,13 +36,11 @@ config_setting(
     define_values = {
         "USE_MEDIAPIPE_THREADPOOL": "0",
     },
-    visibility = ["//visibility:public"],
 )
 
 cc_library(
     name = "aligned_malloc_and_free",
     hdrs = ["aligned_malloc_and_free.h"],
-    visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework/deps:aligned_malloc_and_free",
         "@com_google_absl//absl/base:core_headers",
@@ -57,7 +54,6 @@ cc_library(
         "advanced_proto_inc.h",
         "proto_ns.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         ":advanced_proto_lite",
         ":core_proto",
@@ -72,7 +68,6 @@ cc_library(
         "advanced_proto_lite_inc.h",
         "proto_ns.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         ":core_proto",
         "//mediapipe/framework:port",
@@ -83,7 +78,6 @@ cc_library(
 cc_library(
     name = "any_proto",
     hdrs = ["any_proto.h"],
-    visibility = ["//visibility:public"],
     deps = [
         ":core_proto",
     ],
@@ -94,7 +88,6 @@ cc_library(
     hdrs = [
         "commandlineflags.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         "//third_party:glog",
         "@com_google_absl//absl/flags:flag",
@@ -107,7 +100,6 @@ cc_library(
         "core_proto_inc.h",
         "proto_ns.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework:port",
         "@com_google_protobuf//:protobuf",
@@ -117,7 +109,6 @@ cc_library(
 cc_library(
     name = "file_helpers",
     hdrs = ["file_helpers.h"],
-    visibility = ["//visibility:public"],
     deps = [
         ":status",
         "//mediapipe/framework/deps:file_helpers",
@@ -128,7 +119,6 @@ cc_library(
 cc_library(
     name = "image_resizer",
     hdrs = ["image_resizer.h"],
-    visibility = ["//visibility:public"],
     deps = select({
         "//conditions:default": [
             "//mediapipe/framework/deps:image_resizer",
@@ -140,14 +130,12 @@ cc_library(
 cc_library(
     name = "integral_types",
     hdrs = ["integral_types.h"],
-    visibility = ["//visibility:public"],
 )
 
 cc_library(
     name = "benchmark",
     testonly = 1,
     hdrs = ["benchmark.h"],
-    visibility = ["//visibility:public"],
     deps = [
         "@com_google_benchmark//:benchmark",
     ],
@@ -158,7 +146,6 @@ cc_library(
     hdrs = [
         "re2.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework/deps:re2",
     ],
@@ -173,7 +160,6 @@ cc_library(
         "gtest-spi.h",
         "status_matchers.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         ":status_matchers",
         "//mediapipe/framework/deps:message_matchers",
@@ -190,7 +176,6 @@ cc_library(
         "gtest-spi.h",
         "status_matchers.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         ":status_matchers",
         "//mediapipe/framework/deps:message_matchers",
@@ -204,7 +189,6 @@ cc_library(
     hdrs = [
         "logging.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework:port",
         "//third_party:glog",
@@ -217,7 +201,6 @@ cc_library(
     hdrs = [
         "map_util.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework:port",
         "//mediapipe/framework/deps:map_util",
@@ -227,7 +210,6 @@ cc_library(
 cc_library(
     name = "numbers",
     hdrs = ["numbers.h"],
-    visibility = ["//visibility:public"],
     deps = ["//mediapipe/framework/deps:numbers"],
 )
 
@@ -238,13 +220,11 @@ config_setting(
     define_values = {
         "MEDIAPIPE_DISABLE_OPENCV": "1",
     },
-    visibility = ["//visibility:public"],
 )
 
 cc_library(
     name = "opencv_core",
     hdrs = ["opencv_core_inc.h"],
-    visibility = ["//visibility:public"],
     deps = [
         "//third_party:opencv",
     ],
@@ -253,7 +233,6 @@ cc_library(
 cc_library(
     name = "opencv_imgproc",
     hdrs = ["opencv_imgproc_inc.h"],
-    visibility = ["//visibility:public"],
     deps = [
         ":opencv_core",
         "//third_party:opencv",
@@ -263,7 +242,6 @@ cc_library(
 cc_library(
     name = "opencv_imgcodecs",
     hdrs = ["opencv_imgcodecs_inc.h"],
-    visibility = ["//visibility:public"],
     deps = [
         ":opencv_core",
         "//third_party:opencv",
@@ -273,7 +251,6 @@ cc_library(
 cc_library(
     name = "opencv_highgui",
     hdrs = ["opencv_highgui_inc.h"],
-    visibility = ["//visibility:public"],
     deps = [
         ":opencv_core",
         "//third_party:opencv",
@@ -283,7 +260,6 @@ cc_library(
 cc_library(
     name = "opencv_video",
     hdrs = ["opencv_video_inc.h"],
-    visibility = ["//visibility:public"],
     deps = [
         ":opencv_core",
         "//mediapipe/framework:port",
@@ -294,7 +270,6 @@ cc_library(
 cc_library(
     name = "opencv_features2d",
     hdrs = ["opencv_features2d_inc.h"],
-    visibility = ["//visibility:public"],
     deps = [
         ":opencv_core",
         "//third_party:opencv",
@@ -304,7 +279,6 @@ cc_library(
 cc_library(
     name = "opencv_calib3d",
     hdrs = ["opencv_calib3d_inc.h"],
-    visibility = ["//visibility:public"],
     deps = [
         ":opencv_core",
         "//third_party:opencv",
@@ -314,7 +288,6 @@ cc_library(
 cc_library(
     name = "opencv_videoio",
     hdrs = ["opencv_videoio_inc.h"],
-    visibility = ["//visibility:public"],
     deps = [
         ":opencv_core",
         "//mediapipe/framework:port",
@@ -328,7 +301,6 @@ cc_library(
         "parse_text_proto.h",
         "proto_ns.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         ":core_proto",
         ":logging",
@@ -339,14 +311,12 @@ cc_library(
 cc_library(
     name = "point",
     hdrs = ["point2.h"],
-    visibility = ["//visibility:public"],
     deps = ["//mediapipe/framework/deps:point"],
 )
 
 cc_library(
     name = "port",
     hdrs = ["port.h"],
-    visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework:port",
         "@com_google_absl//absl/base:core_headers",
@@ -356,14 +326,12 @@ cc_library(
 cc_library(
     name = "rectangle",
     hdrs = ["rectangle.h"],
-    visibility = ["//visibility:public"],
     deps = ["//mediapipe/framework/deps:rectangle"],
 )
 
 cc_library(
     name = "ret_check",
     hdrs = ["ret_check.h"],
-    visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework:port",
         "//mediapipe/framework/deps:ret_check",
@@ -373,7 +341,6 @@ cc_library(
 cc_library(
     name = "singleton",
     hdrs = ["singleton.h"],
-    visibility = ["//visibility:public"],
     deps = ["//mediapipe/framework/deps:singleton"],
 )
 
@@ -382,7 +349,6 @@ cc_library(
     hdrs = [
         "source_location.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework:port",
         "//mediapipe/framework/deps:source_location",
@@ -397,7 +363,6 @@ cc_library(
         "status_builder.h",
         "status_macros.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         ":source_location",
         "//mediapipe/framework:port",
@@ -412,7 +377,6 @@ cc_library(
     hdrs = [
         "statusor.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework:port",
         "@com_google_absl//absl/status:statusor",
@@ -423,7 +387,6 @@ cc_library(
     name = "status_matchers",
     testonly = 1,
     hdrs = ["status_matchers.h"],
-    visibility = ["//visibility:private"],
     deps = [
         ":status",
         "@com_google_googletest//:gtest",
@@ -433,7 +396,6 @@ cc_library(
 cc_library(
     name = "threadpool",
     hdrs = ["threadpool.h"],
-    visibility = ["//visibility:public"],
     deps = select({
         "//conditions:default": [":threadpool_impl_default_to_google"],
         "//mediapipe:android": [":threadpool_impl_default_to_mediapipe"],
@@ -460,7 +422,6 @@ alias(
 cc_library(
     name = "topologicalsorter",
     hdrs = ["topologicalsorter.h"],
-    visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework:port",
         "//mediapipe/framework/deps:topologicalsorter",
@@ -470,6 +431,5 @@ cc_library(
 cc_library(
     name = "vector",
     hdrs = ["vector.h"],
-    visibility = ["//visibility:public"],
     deps = ["//mediapipe/framework/deps:vector"],
 )
diff --git a/mediapipe/framework/profiler/BUILD b/mediapipe/framework/profiler/BUILD
index b53a1ac39..2947b9844 100644
--- a/mediapipe/framework/profiler/BUILD
+++ b/mediapipe/framework/profiler/BUILD
@@ -140,7 +140,7 @@ cc_library(
     name = "circular_buffer",
     hdrs = ["circular_buffer.h"],
     visibility = [
-        "//visibility:public",
+        "//mediapipe:__subpackages__",
     ],
     deps = [
         "//mediapipe/framework/port:integral_types",
@@ -151,7 +151,6 @@ cc_test(
     name = "circular_buffer_test",
     size = "small",
     srcs = ["circular_buffer_test.cc"],
-    visibility = ["//visibility:public"],
     deps = [
         ":circular_buffer",
         "//mediapipe/framework/port:gtest_main",
@@ -164,7 +163,7 @@ cc_library(
     name = "trace_buffer",
     srcs = ["trace_buffer.h"],
     hdrs = ["trace_buffer.h"],
-    visibility = ["//visibility:public"],
+    visibility = ["//mediapipe/framework/profiler:__subpackages__"],
     deps = [
         ":circular_buffer",
         "//mediapipe/framework:calculator_profile_cc_proto",
diff --git a/mediapipe/framework/tool/testdata/BUILD b/mediapipe/framework/tool/testdata/BUILD
index 906688520..f9aab7b72 100644
--- a/mediapipe/framework/tool/testdata/BUILD
+++ b/mediapipe/framework/tool/testdata/BUILD
@@ -20,7 +20,9 @@ load(
 
 licenses(["notice"])
 
-package(default_visibility = ["//mediapipe:__subpackages__"])
+package(default_visibility = [
+    "//mediapipe:__subpackages__",
+])
 
 filegroup(
     name = "test_graph",
@@ -40,7 +42,6 @@ mediapipe_simple_subgraph(
     testonly = 1,
     graph = "dub_quad_test_subgraph.pbtxt",
     register_as = "DubQuadTestSubgraph",
-    visibility = ["//visibility:public"],
     deps = [
         "//mediapipe/framework:test_calculators",
     ],
@@ -51,7 +52,7 @@ mediapipe_simple_subgraph(
     testonly = 1,
     graph = "nested_test_subgraph.pbtxt",
     register_as = "NestedTestSubgraph",
-    visibility = ["//visibility:public"],
+    visibility = ["//mediapipe/framework:__subpackages__"],
     deps = [
         ":dub_quad_test_subgraph",
         "//mediapipe/framework:test_calculators",