diff --git a/packages/react-native/ReactAndroid/build.gradle.kts b/packages/react-native/ReactAndroid/build.gradle.kts
index 3d04af49ff47..d79851520376 100644
--- a/packages/react-native/ReactAndroid/build.gradle.kts
+++ b/packages/react-native/ReactAndroid/build.gradle.kts
@@ -188,10 +188,6 @@ val preparePrefab by
                           "../ReactCommon/react/renderer/components/root/",
                           "react/renderer/components/root/",
                       ),
-                      Pair(
-                          "../ReactCommon/react/renderer/components/root/React/",
-                          "React/",
-                      ),
                       // runtimeexecutor
                       Pair("../ReactCommon/runtimeexecutor/", ""),
                       // react_renderer_textlayoutmanager
@@ -205,10 +201,6 @@ val preparePrefab by
                           "../ReactCommon/react/renderer/components/text/",
                           "react/renderer/components/text/",
                       ),
-                      Pair(
-                          "../ReactCommon/react/renderer/components/text/React/",
-                          "React/",
-                      ),
                       Pair("../ReactCommon/react/renderer/components/text/platform/android/", ""),
                       Pair(
                           "../ReactCommon/react/renderer/attributedstring",
diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec
index bb7c16f10bea..030f82bb58c6 100644
--- a/packages/react-native/ReactCommon/React-Fabric.podspec
+++ b/packages/react-native/ReactCommon/React-Fabric.podspec
@@ -134,16 +134,10 @@ Pod::Spec.new do |s|
   s.subspec "components" do |ss|
     ss.subspec "root" do |sss|
       sss.source_files         = podspec_sources("react/renderer/components/root/**/*.{m,mm,cpp,h}", "react/renderer/components/root/**/*.{h}")
-      sss.exclude_files        = ["react/renderer/components/root/tests", "react/renderer/components/root/React"]
+      sss.exclude_files        = "react/renderer/components/root/tests"
       sss.header_dir           = "react/renderer/components/root"
     end
 
-    ss.subspec "rootUmbrella" do |sss|
-      sss.source_files         = "react/renderer/components/root/React/*.h"
-      sss.header_dir           = ""
-      sss.header_mappings_dir  = "react/renderer/components/root"
-    end
-
     ss.subspec "view" do |sss|
       sss.dependency             "React-renderercss"
       sss.dependency             "Yoga"
@@ -160,13 +154,7 @@ Pod::Spec.new do |s|
     ss.subspec "scrollview" do |sss|
       sss.source_files         = podspec_sources("react/renderer/components/scrollview/**/*.{m,mm,cpp,h}", "react/renderer/components/scrollview/**/*.{h}")
       sss.header_dir           = "react/renderer/components/scrollview"
-      sss.exclude_files        = "react/renderer/components/scrollview/tests", "react/renderer/components/scrollview/platform/android", "react/renderer/components/scrollview/React"
-    end
-
-    ss.subspec "scrollviewUmbrella" do |sss|
-      sss.source_files         = "react/renderer/components/scrollview/React/*.h"
-      sss.header_dir           = ""
-      sss.header_mappings_dir  = "react/renderer/components/scrollview"
+      sss.exclude_files        = "react/renderer/components/scrollview/tests", "react/renderer/components/scrollview/platform/android"
     end
 
     ss.subspec "legacyviewmanagerinterop" do |sss|
diff --git a/packages/react-native/ReactCommon/React-FabricComponents.podspec b/packages/react-native/ReactCommon/React-FabricComponents.podspec
index 6cbe42390275..6f550a031b57 100644
--- a/packages/react-native/ReactCommon/React-FabricComponents.podspec
+++ b/packages/react-native/ReactCommon/React-FabricComponents.podspec
@@ -95,12 +95,6 @@ Pod::Spec.new do |s|
       sss.header_dir           = "react/renderer/components/modal"
     end
 
-    ss.subspec "modalUmbrella" do |sss|
-      sss.source_files         = "react/renderer/components/modal/React/*.h"
-      sss.header_dir           = ""
-      sss.header_mappings_dir  = "react/renderer/components/modal"
-    end
-
     ss.subspec "safeareaview" do |sss|
       sss.source_files         = podspec_sources("react/renderer/components/safeareaview/**/*.{m,mm,cpp,h}", "react/renderer/components/safeareaview/**/*.h")
       # Exclude tests to avoid conflicts with the react-native-safe-area-context package
@@ -116,12 +110,6 @@ Pod::Spec.new do |s|
       sss.header_dir           = "react/renderer/components/text"
     end
 
-    ss.subspec "textUmbrella" do |sss|
-      sss.source_files         = "react/renderer/components/text/React/*.h"
-      sss.header_dir           = ""
-      sss.header_mappings_dir  = "react/renderer/components/text"
-    end
-
     ss.subspec "iostextinput" do |sss|
       sss.source_files         = podspec_sources(["react/renderer/components/textinput/*.{m,mm,cpp,h}",
                                   "react/renderer/components/textinput/platform/ios/**/*.{m,mm,cpp,h}"],
diff --git a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h
index 4de147053a82..095c60b26432 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <glog/logging.h>
 #include <react/renderer/components/modal/ModalHostViewShadowNode.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h
index f2d447362296..0219d44ca775 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/FBReactNativeSpec/EventEmitters.h>
 #include <react/renderer/components/FBReactNativeSpec/Props.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h
index c3e8f4de7cf2..4b12b0539692 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/graphics/Float.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewUtils.h b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewUtils.h
index 9631bcc42707..0174a4154cf6 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewUtils.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewUtils.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/graphics/Size.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/modal/React/Modal.h b/packages/react-native/ReactCommon/react/renderer/components/modal/React/Modal.h
deleted file mode 100644
index c763e4d9ffb3..000000000000
--- a/packages/react-native/ReactCommon/react/renderer/components/modal/React/Modal.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-// =============================================================================
-// Umbrella header for the `react/renderer/components/modal` module - public
-// entry point.
-//
-//   #include <React/Modal.h>
-//
-// Re-exports the module's public interface headers. React Native's own code
-// should keep using the fine-grained `<react/renderer/components/modal/...>`
-// includes; only outside consumers use this umbrella.
-// =============================================================================
-
-// Marks that the following headers are pulled in through the umbrella, so their
-// shared guard (<react/cxxstableapi/UmbrellaGuard.h>) accepts them. The marker
-// is saved and restored rather than defined and undefined: the scope ends at
-// this block, so later *direct* includes in the same TU are still caught, and
-// it nests inside an enclosing umbrella rather than disarming it.
-#pragma push_macro("RN_UMBRELLA_CONTEXT")
-#undef RN_UMBRELLA_CONTEXT
-#define RN_UMBRELLA_CONTEXT 1
-
-#include <react/renderer/components/modal/ModalHostViewComponentDescriptor.h>
-#include <react/renderer/components/modal/ModalHostViewShadowNode.h>
-#include <react/renderer/components/modal/ModalHostViewState.h>
-#include <react/renderer/components/modal/ModalHostViewUtils.h>
-
-#undef RN_UMBRELLA_CONTEXT
-#pragma pop_macro("RN_UMBRELLA_CONTEXT")
diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/React/Root.h b/packages/react-native/ReactCommon/react/renderer/components/root/React/Root.h
deleted file mode 100644
index c81a6d623464..000000000000
--- a/packages/react-native/ReactCommon/react/renderer/components/root/React/Root.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-// =============================================================================
-// Umbrella header for the `react/renderer/components/root` module - public
-// entry point.
-//
-//   #include <React/Root.h>
-//
-// Re-exports the module's public interface headers. React Native's own code
-// should keep using the fine-grained `<react/renderer/components/root/...>`
-// includes; only outside consumers use this umbrella.
-// =============================================================================
-
-// Marks that the following headers are pulled in through the umbrella, so their
-// shared guard (<react/cxxstableapi/UmbrellaGuard.h>) accepts them. The marker
-// is saved and restored rather than defined and undefined: the scope ends at
-// this block, so later *direct* includes in the same TU are still caught, and
-// it nests inside an enclosing umbrella rather than disarming it.
-#pragma push_macro("RN_UMBRELLA_CONTEXT")
-#undef RN_UMBRELLA_CONTEXT
-#define RN_UMBRELLA_CONTEXT 1
-
-#include <react/renderer/components/root/RootComponentDescriptor.h>
-#include <react/renderer/components/root/RootProps.h>
-#include <react/renderer/components/root/RootShadowNode.h>
-
-#undef RN_UMBRELLA_CONTEXT
-#pragma pop_macro("RN_UMBRELLA_CONTEXT")
diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/RootComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/root/RootComponentDescriptor.h
index aa1213d51676..07309a87af5d 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/root/RootComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/root/RootComponentDescriptor.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/root/RootShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h b/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h
index c862b6977ee5..5a43e19ac606 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <memory>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.h
index 0b1465a3a448..fa980b713d23 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <memory>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.h
index 2084d291299b..3decdb6a6251 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/scrollview/primitives.h>
 #include <react/renderer/components/view/ViewProps.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/React/ScrollView.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/React/ScrollView.h
deleted file mode 100644
index d382ee45a3d7..000000000000
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/React/ScrollView.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-// =============================================================================
-// Umbrella header for the `react/renderer/components/scrollview` module -
-// public entry point.
-//
-//   #include <React/ScrollView.h>
-//
-// Re-exports the module's public interface headers. React Native's own code
-// should keep using the fine-grained
-// `<react/renderer/components/scrollview/...>` includes; only outside
-// consumers use this umbrella.
-// =============================================================================
-
-// Marks that the following headers are pulled in through the umbrella, so their
-// shared guard (<react/cxxstableapi/UmbrellaGuard.h>) accepts them. The marker
-// is saved and restored rather than defined and undefined: the scope ends at
-// this block, so later *direct* includes in the same TU are still caught, and
-// it nests inside an enclosing umbrella rather than disarming it.
-#pragma push_macro("RN_UMBRELLA_CONTEXT")
-#undef RN_UMBRELLA_CONTEXT
-#define RN_UMBRELLA_CONTEXT 1
-
-#include <react/renderer/components/scrollview/BaseScrollViewProps.h>
-#include <react/renderer/components/scrollview/HostPlatformScrollViewProps.h>
-#include <react/renderer/components/scrollview/ScrollEvent.h>
-#include <react/renderer/components/scrollview/ScrollViewComponentDescriptor.h>
-#include <react/renderer/components/scrollview/ScrollViewEventEmitter.h>
-#include <react/renderer/components/scrollview/ScrollViewProps.h>
-#include <react/renderer/components/scrollview/ScrollViewShadowNode.h>
-#include <react/renderer/components/scrollview/ScrollViewState.h>
-#include <react/renderer/components/scrollview/conversions.h>
-#include <react/renderer/components/scrollview/primitives.h>
-
-#ifdef ANDROID
-#include <react/renderer/components/scrollview/AndroidHorizontalScrollContentViewComponentDescriptor.h>
-#include <react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h>
-#endif
-
-#undef RN_UMBRELLA_CONTEXT
-#pragma pop_macro("RN_UMBRELLA_CONTEXT")
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h
index e03d7c440b2b..43fdec8dc0f3 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <folly/dynamic.h>
 #include <react/renderer/core/EventPayload.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewComponentDescriptor.h
index 837b5efe8fe0..9f19c24fa192 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewComponentDescriptor.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/scrollview/ScrollViewShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h
index 4b1147d80105..b23ced993a51 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <memory>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h
index 1e0775196558..cdfb5933076c 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/scrollview/HostPlatformScrollViewProps.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h
index df15f66378f3..559bba5a1527 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/scrollview/ScrollViewEventEmitter.h>
 #include <react/renderer/components/scrollview/ScrollViewProps.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h
index aac50b28541c..0e977df29d63 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/graphics/Float.h>
 #include <react/renderer/graphics/Point.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/conversions.h
index bd239c2b500d..78e799feee06 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/conversions.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/conversions.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/scrollview/primitives.h>
 #include <react/renderer/core/PropsParserContext.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewComponentDescriptor.h
index e642a63b0664..781312e1a2ef 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewComponentDescriptor.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h
index b0b80fd8d76d..820d403af374 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/scrollview/ScrollViewEventEmitter.h>
 #include <react/renderer/components/scrollview/ScrollViewState.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h
index 65ce4338fbd2..cf52e0d41ca5 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/scrollview/BaseScrollViewProps.h>
 #include <react/renderer/components/scrollview/primitives.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/cxx/react/renderer/components/scrollview/HostPlatformScrollViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/cxx/react/renderer/components/scrollview/HostPlatformScrollViewProps.h
index ddfaf1bd00c7..30929a4359c5 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/cxx/react/renderer/components/scrollview/HostPlatformScrollViewProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/cxx/react/renderer/components/scrollview/HostPlatformScrollViewProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/scrollview/BaseScrollViewProps.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/primitives.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/primitives.h
index e67fab404421..77c07a5e2da5 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/primitives.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/primitives.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <optional>
 #include <tuple>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphComponentDescriptor.h
index 553ee1909936..0685a5e8eb60 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphComponentDescriptor.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphProps.h
index 63fac5e94b34..d5bb11aeb258 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <limits>
 #include <memory>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h
index 8d65e9d24309..ac8cfc0931cb 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/core/Props.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextShadowNode.h
index f583de995da6..030af7a73be2 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextShadowNode.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h
index b2461269f869..4daf0d189f87 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/text/BaseParagraphComponentDescriptor.h>
 #include <react/renderer/components/text/ParagraphShadowNode.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h
index 97ed8e8272af..a24323496b22 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/view/ViewEventEmitter.h>
 #include <react/renderer/textlayoutmanager/TextMeasureCache.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.h
index dcb82a445794..e0b912b06115 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/text/HostPlatformParagraphProps.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h
index e6f410ac86af..adc375d94de0 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/text/BaseTextShadowNode.h>
 #include <react/renderer/components/text/ParagraphEventEmitter.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextComponentDescriptor.h
index 4c242a061869..cca375e86f37 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextComponentDescriptor.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/text/RawTextShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.h
index f350702dce94..5e01570b4f2d 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <memory>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextShadowNode.h
index 08eceac345e6..d30e4e92bf6d 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextShadowNode.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/text/RawTextProps.h>
 #include <react/renderer/core/ConcreteShadowNode.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/React/Text.h b/packages/react-native/ReactCommon/react/renderer/components/text/React/Text.h
deleted file mode 100644
index 183a9e557892..000000000000
--- a/packages/react-native/ReactCommon/react/renderer/components/text/React/Text.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-// =============================================================================
-// Umbrella header for the `react/renderer/components/text` module - public
-// entry point.
-//
-//   #include <React/Text.h>
-//
-// Re-exports the module's public interface headers. React Native's own code
-// should keep using the fine-grained `<react/renderer/components/text/...>`
-// includes; only outside consumers use this umbrella.
-// =============================================================================
-
-// Marks that the following headers are pulled in through the umbrella, so their
-// shared guard (<react/cxxstableapi/UmbrellaGuard.h>) accepts them. The marker
-// is saved and restored rather than defined and undefined: the scope ends at
-// this block, so later *direct* includes in the same TU are still caught, and
-// it nests inside an enclosing umbrella rather than disarming it.
-#pragma push_macro("RN_UMBRELLA_CONTEXT")
-#undef RN_UMBRELLA_CONTEXT
-#define RN_UMBRELLA_CONTEXT 1
-
-#include <react/renderer/components/text/BaseParagraphComponentDescriptor.h>
-#include <react/renderer/components/text/BaseParagraphProps.h>
-#include <react/renderer/components/text/BaseTextProps.h>
-#include <react/renderer/components/text/BaseTextShadowNode.h>
-#include <react/renderer/components/text/HostPlatformParagraphProps.h>
-#include <react/renderer/components/text/ParagraphComponentDescriptor.h>
-#include <react/renderer/components/text/ParagraphEventEmitter.h>
-#include <react/renderer/components/text/ParagraphProps.h>
-#include <react/renderer/components/text/ParagraphShadowNode.h>
-#include <react/renderer/components/text/ParagraphState.h>
-#include <react/renderer/components/text/RawTextComponentDescriptor.h>
-#include <react/renderer/components/text/RawTextProps.h>
-#include <react/renderer/components/text/RawTextShadowNode.h>
-#include <react/renderer/components/text/SelectableParagraphComponentDescriptor.h>
-#include <react/renderer/components/text/SelectableParagraphShadowNode.h>
-#include <react/renderer/components/text/TextComponentDescriptor.h>
-#include <react/renderer/components/text/TextEffectComponentDescriptor.h>
-#include <react/renderer/components/text/TextEffectProps.h>
-#include <react/renderer/components/text/TextEffectShadowNode.h>
-#include <react/renderer/components/text/TextProps.h>
-#include <react/renderer/components/text/TextShadowNode.h>
-#include <react/renderer/components/text/stateConversions.h>
-
-#ifdef ANDROID
-#include <react/renderer/components/text/conversions.h>
-#include <react/renderer/components/text/primitives.h>
-#endif
-
-#undef RN_UMBRELLA_CONTEXT
-#pragma pop_macro("RN_UMBRELLA_CONTEXT")
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/SelectableParagraphComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/text/SelectableParagraphComponentDescriptor.h
index 182e5c7af9c6..f7a4005fa628 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/SelectableParagraphComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/SelectableParagraphComponentDescriptor.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/text/BaseParagraphComponentDescriptor.h>
 #include <react/renderer/components/text/SelectableParagraphShadowNode.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/SelectableParagraphShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/text/SelectableParagraphShadowNode.h
index 4e1417476efc..c82e457e9dfa 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/SelectableParagraphShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/SelectableParagraphShadowNode.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/text/ParagraphShadowNode.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextComponentDescriptor.h
index e072df2f5751..589f2cbb721a 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/TextComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextComponentDescriptor.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/text/TextShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectComponentDescriptor.h
index c5970c859b57..51b3b6bd666c 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectComponentDescriptor.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/text/TextEffectShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectProps.h
index d1d503af5f40..b3129b903a73 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <folly/dynamic.h>
 #include <react/renderer/core/Props.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectShadowNode.h
index 39a980d2a37c..a23f3fe8a2e6 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextEffectShadowNode.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/text/TextEffectProps.h>
 #include <react/renderer/components/view/ViewEventEmitter.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.h
index 17a9e6c7ca92..eba82ae0f678 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/components/text/BaseTextProps.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextShadowNode.h
index 168a6ddc79ad..3b01c7f5d6e6 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/TextShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextShadowNode.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <limits>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/HostPlatformParagraphProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/HostPlatformParagraphProps.h
index 6cb286ef0efb..f3e30191b30e 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/HostPlatformParagraphProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/HostPlatformParagraphProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <limits>
 #include <memory>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/ParagraphState.h b/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/ParagraphState.h
index 6b6ff366c132..1f79987a1d84 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/ParagraphState.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/ParagraphState.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/attributedstring/AttributedString.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/conversions.h
index e88c8ce8f191..0e8c8dd560a8 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/conversions.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/conversions.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/text/primitives.h>
 #include <react/renderer/core/PropsParserContext.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/primitives.h b/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/primitives.h
index 213c6e9783ce..22241c7b7f36 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/primitives.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/primitives.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/platform/cxx/react/renderer/components/text/HostPlatformParagraphProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/platform/cxx/react/renderer/components/text/HostPlatformParagraphProps.h
index 48f82a5f79c6..3d88cc6439ce 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/platform/cxx/react/renderer/components/text/HostPlatformParagraphProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/platform/cxx/react/renderer/components/text/HostPlatformParagraphProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/components/text/BaseParagraphProps.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/platform/cxx/react/renderer/components/text/ParagraphState.h b/packages/react-native/ReactCommon/react/renderer/components/text/platform/cxx/react/renderer/components/text/ParagraphState.h
index b48650195ddc..3b351aee9843 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/platform/cxx/react/renderer/components/text/ParagraphState.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/platform/cxx/react/renderer/components/text/ParagraphState.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/attributedstring/AttributedString.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/stateConversions.h b/packages/react-native/ReactCommon/react/renderer/components/text/stateConversions.h
index 58e555b34f3a..510bd2fe0c0a 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/text/stateConversions.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/text/stateConversions.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/components/text/ParagraphState.h>
diff --git a/packages/react-native/scripts/ios-prebuild/headers-config.js b/packages/react-native/scripts/ios-prebuild/headers-config.js
index 78e72e95d615..e73418c0a353 100644
--- a/packages/react-native/scripts/ios-prebuild/headers-config.js
+++ b/packages/react-native/scripts/ios-prebuild/headers-config.js
@@ -110,18 +110,9 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
           {
             name: 'root',
             headerPatterns: ['react/renderer/components/root/**/*.h'],
-            excludePatterns: [
-              'react/renderer/components/root/tests',
-              'react/renderer/components/root/React',
-            ],
+            excludePatterns: ['react/renderer/components/root/tests'],
             headerDir: 'react/renderer/components/root',
           },
-
-          {
-            name: 'rootUmbrella',
-            headerPatterns: ['react/renderer/components/root/React/*.h'],
-            headerDir: 'React',
-          },
           {
             name: 'view',
             headerPatterns: [
@@ -144,16 +135,9 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
             excludePatterns: [
               'react/renderer/components/scrollview/tests',
               'react/renderer/components/scrollview/platform/android',
-              'react/renderer/components/scrollview/React',
             ],
           },
 
-          {
-            name: 'scrollviewUmbrella',
-            headerPatterns: ['react/renderer/components/scrollview/React/*.h'],
-            headerDir: 'React',
-          },
-
           {
             name: 'legacyviewmanagerinterop',
             headerPatterns: [
@@ -357,12 +341,6 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
             headerDir: 'react/renderer/components/modal',
           },
 
-          {
-            name: 'modalUmbrella',
-            headerPatterns: ['react/renderer/components/modal/React/*.h'],
-            headerDir: 'React',
-          },
-
           {
             name: 'safeareaview',
             headerPatterns: ['react/renderer/components/safeareaview/**/*.h'],
@@ -389,12 +367,6 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
             headerDir: 'react/renderer/components/text',
           },
 
-          {
-            name: 'textUmbrella',
-            headerPatterns: ['react/renderer/components/text/React/*.h'],
-            headerDir: 'React',
-          },
-
           {
             name: 'iostextinput',
             headerPatterns: [