diff --git a/BUILD.bazel b/BUILD.bazel
index 4ed9e200e..dbb228827 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -44,3 +44,5 @@ cc_library(
         "//vendor:wagyu",
     ],
 )
+
+exports_files(["LICENSE.md"], visibility = ["//visibility:public"])
diff --git a/platform/darwin/BUILD.bazel b/platform/darwin/BUILD.bazel
index 17b0428a8..2e47b3043 100644
--- a/platform/darwin/BUILD.bazel
+++ b/platform/darwin/BUILD.bazel
@@ -17,7 +17,7 @@ objc_library(
     includes = [
         "include",
     ],
-    visibility = ["//visibility:public"],
+    visibility = ["//platform/ios:__pkg__"],
     deps = [
         "//:mbgl-core",
         "//platform/default:mbgl-default",
@@ -57,7 +57,7 @@ objc_library(
         "CoreText",
         "ImageIO",
     ],
-    visibility = ["//visibility:public"],
+    visibility = ["//platform/ios:__pkg__"],
     deps = [
         "//:mbgl-core",
         "//platform/default:mbgl-default",
@@ -78,7 +78,7 @@ objc_library(
         "OpenGLES",
         "SystemConfiguration",
     ],
-    visibility = ["//visibility:public"],
+    visibility = ["//platform/default:__pkg__"],
     deps = [
         "//:mbgl-core",
     ],
diff --git a/platform/default/BUILD.bazel b/platform/default/BUILD.bazel
index 42818bfcf..69e49ce3c 100644
--- a/platform/default/BUILD.bazel
+++ b/platform/default/BUILD.bazel
@@ -48,7 +48,10 @@ cc_library(
     includes = [
         "include",
     ],
-    visibility = ["//visibility:public"],
+    visibility = [
+        "//platform/darwin:__pkg__",
+        "//platform/ios:__pkg__",
+    ],
     deps = [
         "//:mbgl-core",
         "//platform/darwin:darwin-loop",
diff --git a/platform/ios/BUILD.bazel b/platform/ios/BUILD.bazel
index c20338085..f538cf2c4 100644
--- a/platform/ios/BUILD.bazel
+++ b/platform/ios/BUILD.bazel
@@ -96,6 +96,7 @@ apple_static_xcframework(
     minimum_os_versions = {"ios": "9.0"},
     public_hdrs = _PUBLIC_HEADERS,
     umbrella_header = "platform/ios/src/Mapbox.h",
+    visibility = ["//visibility:public"],
     deps = ["sdk"],
 )
 
@@ -113,6 +114,7 @@ apple_xcframework(
     minimum_os_versions = {"ios": "9.0"},
     public_hdrs = _PUBLIC_HEADERS,
     umbrella_header = "platform/ios/src/Mapbox.h",
+    visibility = ["//visibility:public"],
     deps = ["sdk"],
 )
 
@@ -249,7 +251,6 @@ objc_library(
         "OpenGLES",
         "QuartzCore",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         "objc-headers",
         "//:mbgl-core",
@@ -301,7 +302,6 @@ objc_library(
     includes = [
         "platform/darwin/include",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         "objc-headers",
         "//:mbgl-core",
diff --git a/platform/ios/platform/ios/vendor/BUILD.bazel b/platform/ios/platform/ios/vendor/BUILD.bazel
index bb0626ec5..126f0bbd2 100644
--- a/platform/ios/platform/ios/vendor/BUILD.bazel
+++ b/platform/ios/platform/ios/vendor/BUILD.bazel
@@ -18,5 +18,5 @@ objc_library(
     ),
     copts = WARNING_FLAGS,
     includes = ["SMCalloutView"],
-    visibility = ["//visibility:public"],
+    visibility = ["//platform/ios:__pkg__"],
 )