diff --git a/DEPS b/DEPS
index b3b270d5831baf..b9457df6d40c6c 100644
--- a/DEPS
+++ b/DEPS
@@ -95,7 +95,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling build tools
   # and whatever else without interference from each other.
-  'buildtools_revision': 'f115f4786771afdfacb18a2299541b23e21f4792',
+  'buildtools_revision': '2637e7e911524502ea862870f52c36ed2723a25f',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
diff --git a/build/config/ios/rules.gni b/build/config/ios/rules.gni
index 95f72f72f53794..f820ef36e26c14 100644
--- a/build/config/ios/rules.gni
+++ b/build/config/ios/rules.gni
@@ -1274,7 +1274,9 @@ template("ios_framework_bundle") {
       deps = []
     }
     deps += [ ":$_arch_shared_library_source" ]
-
+    if (_has_public_headers) {
+      deps += [ ":$_framework_headers_target($default_toolchain)" ]
+    }
     if (!defined(ldflags)) {
       ldflags = []
     }
@@ -1399,9 +1401,11 @@ template("ios_framework_bundle") {
         forward_variables_from(invoker, [ "testonly" ])
         deps = [
           ":$_compile_headers_map_target",
-          ":$_copy_public_headers_target",
           ":$_create_module_map_target",
         ]
+        public_deps = [
+          ":$_copy_public_headers_target",
+        ]
       }
     }
 
@@ -1633,7 +1637,9 @@ template("ios_xctest_bundle") {
       if (ios_automatically_manage_certs) {
         # Use a fixed bundle identifier for EarlGrey tests when using Xcode to
         # manage the certificates as the number of free certs is limited.
-        extra_substitutions = [ "MODULE_BUNDLE_ID=gtest.${ios_generic_test_bundle_id_suffix}-module" ]
+        extra_substitutions = [
+          "MODULE_BUNDLE_ID=gtest.${ios_generic_test_bundle_id_suffix}-module",
+        ]
       } else {
         extra_substitutions = [ "MODULE_BUNDLE_ID=gtest.$_output_name" ]
       }
diff --git a/chromecast/public/media/BUILD.gn b/chromecast/public/media/BUILD.gn
index 0e67c1f70811f7..2a43094ef284a4 100644
--- a/chromecast/public/media/BUILD.gn
+++ b/chromecast/public/media/BUILD.gn
@@ -18,6 +18,9 @@ cast_source_set("media") {
   ]
 
   public_configs = [ ":public_headers" ]
+  public_deps = [
+    "//chromecast/public",
+  ]
 }
 
 # Any target which includes headers in ":media" should include it in its deps
diff --git a/components/cronet/native/BUILD.gn b/components/cronet/native/BUILD.gn
index 9f3eeb12a16803..36ed5dac1e7012 100644
--- a/components/cronet/native/BUILD.gn
+++ b/components/cronet/native/BUILD.gn
@@ -12,9 +12,29 @@ config("cronet_native_include_config") {
   ]
 }
 
+source_set("cronet_native_headers") {
+  deps = [
+    "//base",
+  ]
+
+  configs += [ ":cronet_native_include_config" ]
+  public_configs = [ ":cronet_native_include_config" ]
+
+  public = [
+    "include/cronet_c.h",
+    "include/cronet_export.h",
+
+    # Generated from cronet.idl.
+    "generated/cronet.idl_c.h",
+    "generated/cronet.idl_impl_interface.h",
+    "generated/cronet.idl_impl_struct.h",
+  ]
+}
+
 # Cronet native API implementation.
 source_set("cronet_native_impl") {
   deps = [
+    ":cronet_native_headers",
     "//base",
     "//components/cronet:cronet_common",
     "//components/cronet:cronet_version_header",
@@ -23,21 +43,20 @@ source_set("cronet_native_impl") {
 
   configs += [ ":cronet_native_include_config" ]
   public_configs = [ ":cronet_native_include_config" ]
+  public_deps = [
+    ":cronet_native_headers",
+  ]
 
   sources = [
     "buffer.cc",
     "engine.cc",
     "engine.h",
-    "include/cronet_c.h",
     "runnables.cc",
     "runnables.h",
 
     # Generated from cronet.idl.
-    "generated/cronet.idl_c.h",
     "generated/cronet.idl_impl_interface.cc",
-    "generated/cronet.idl_impl_interface.h",
     "generated/cronet.idl_impl_struct.cc",
-    "generated/cronet.idl_impl_struct.h",
   ]
 }
 
@@ -46,6 +65,7 @@ source_set("cronet_native_testutil") {
   testonly = true
 
   deps = [
+    ":cronet_native_headers",
     "//base",
   ]
 
@@ -86,6 +106,7 @@ source_set("cronet_native_tests") {
   testonly = true
 
   deps = [
+    ":cronet_native_headers",
     ":cronet_native_testutil",
     "//base",
     "//base/test:test_support",
diff --git a/ios/web_view/test/BUILD.gn b/ios/web_view/test/BUILD.gn
index 7ac3327efea0bd..d6578a84000bcf 100644
--- a/ios/web_view/test/BUILD.gn
+++ b/ios/web_view/test/BUILD.gn
@@ -48,6 +48,7 @@ source_set("test_support") {
   sources = [
     # Explicitly reference imported headers from web_view library to avoid
     # depending on the framework (as it is statically linked).
+    "//ios/web_view/public/cwv_export.h",
     "//ios/web_view/public/cwv_web_view.h",
     "//ios/web_view/public/cwv_web_view_configuration.h",
     "observer.h",
diff --git a/testing/gtest/BUILD.gn b/testing/gtest/BUILD.gn
index c105fb1fd7e042..ae1f711305085a 100644
--- a/testing/gtest/BUILD.gn
+++ b/testing/gtest/BUILD.gn
@@ -39,7 +39,7 @@ static_library("gtest") {
     #    Android. https://codereview.chromium.org/2852613002/#ps20001
     "empty.cc",
   ]
-  deps = [
+  public_deps = [
     "//third_party/googletest:gtest",
   ]
 
@@ -75,7 +75,9 @@ static_library("gtest") {
       "../coverage_util_ios.h",
       "../coverage_util_ios.mm",
     ]
-    deps += [ ":ios_enable_coverage" ]
+    deps = [
+      ":ios_enable_coverage",
+    ]
   }
 }