diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec
index a80ef92ba6a..a5033590847 100644
--- a/packages/react-native/ReactCommon/React-Fabric.podspec
+++ b/packages/react-native/ReactCommon/React-Fabric.podspec
@@ -105,6 +105,7 @@ Pod::Spec.new do |s|
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view\"",
+        "\"$(PODS_TARGET_SRCROOT)/react/renderer/componentregistry\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/core\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/debug\"",
       ]
@@ -208,6 +209,7 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "mounting" do |ss|
+    ss.dependency             "React-Fabric/coreUmbrella"
     ss.dependency             "React-jsinspectortracing"
     ss.source_files         = podspec_sources("react/renderer/mounting/**/*.{m,mm,cpp,h}", "react/renderer/mounting/**/*.h")
     ss.exclude_files        = "react/renderer/mounting/tests"
@@ -259,6 +261,9 @@ Pod::Spec.new do |s|
     end
 
     ss.dependency             "React-rendererconsistency"
+    ss.dependency             "React-Fabric/coreUmbrella"
+    ss.dependency             "React-Fabric/componentregistryUmbrella"
+    ss.dependency             "React-Fabric/components/viewUmbrella"
     ss.source_files         = podspec_sources("react/renderer/uimanager/*.{m,mm,cpp,h}", "react/renderer/uimanager/*.h")
     ss.header_dir           = "react/renderer/uimanager"
   end
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.h b/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.h
index e0ecb4cfca5..8ba9f99c64d 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.h
@@ -9,7 +9,7 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/ShadowNode.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.h b/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.h
index 561a74b8292..c520508cb06 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.h
@@ -13,7 +13,7 @@
 #include <condition_variable>
 #include <optional>
 
-#include <react/renderer/debug/flags.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/Differentiator.h>
 #include <react/renderer/mounting/MountingOverrideDelegate.h>
 #include <react/renderer/mounting/MountingTransaction.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h
index 4eeb85abcee..457f9a56e3a 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h
@@ -13,14 +13,12 @@
 #include <mutex>
 #include <shared_mutex>
 
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 #include <react/renderer/components/root/RootShadowNode.h>
-#include <react/renderer/core/LayoutConstraints.h>
-#include <react/renderer/core/ReactPrimitives.h>
-#include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/mounting/MountingCoordinator.h>
 #include <react/renderer/mounting/ShadowTreeDelegate.h>
 #include <react/renderer/mounting/ShadowTreeRevision.h>
-#include <react/utils/ContextContainer.h>
 #include "MountingOverrideDelegate.h"
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h
index bfe843ebf8f..d6597442356 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h
@@ -12,7 +12,7 @@
 #include <shared_mutex>
 #include <unordered_map>
 
-#include <react/renderer/core/ReactPrimitives.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/ShadowTree.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.h
index e9a51fdf836..e0dd7d4afc3 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.h
@@ -9,13 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/EventEmitter.h>
-#include <react/renderer/core/LayoutMetrics.h>
-#include <react/renderer/core/Props.h>
-#include <react/renderer/core/ReactPrimitives.h>
-#include <react/renderer/core/ShadowNode.h>
-#include <react/renderer/debug/flags.h>
-#include <react/utils/hash_combine.h>
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/internal/CullingContext.h b/packages/react-native/ReactCommon/react/renderer/mounting/internal/CullingContext.h
index 1057b7ab538..30cc5f4792b 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/internal/CullingContext.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/internal/CullingContext.h
@@ -9,8 +9,7 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/graphics/Rect.h>
-#include <react/renderer/graphics/Transform.h>
+#include <React/Graphics.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/internal/ShadowViewNodePair.h b/packages/react-native/ReactCommon/react/renderer/mounting/internal/ShadowViewNodePair.h
index 899deb52703..a5904bb32f8 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/internal/ShadowViewNodePair.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/internal/ShadowViewNodePair.h
@@ -9,8 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/ShadowNode.h>
-#include <react/renderer/graphics/Point.h>
+#include <React/Graphics.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/ShadowView.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubView.h b/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubView.h
index ffd166a0b0d..c6507521e5e 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubView.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubView.h
@@ -12,9 +12,7 @@
 #include <memory>
 #include <vector>
 
-#include <react/renderer/core/LayoutMetrics.h>
-#include <react/renderer/core/State.h>
-#include <react/renderer/debug/debugStringConvertibleUtils.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/ShadowView.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/stubs/stubs.h b/packages/react-native/ReactCommon/react/renderer/mounting/stubs/stubs.h
index cd5199c03b3..3948aa4eefc 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/stubs/stubs.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/stubs/stubs.h
@@ -9,7 +9,7 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/ShadowNode.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/stubs/StubView.h>
 #include <react/renderer/mounting/stubs/StubViewTree.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/updateMountedFlag.h b/packages/react-native/ReactCommon/react/renderer/mounting/updateMountedFlag.h
index 0f8f8b96875..4ce08d2288a 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/updateMountedFlag.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/updateMountedFlag.h
@@ -9,7 +9,7 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/ShadowNode.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/ShadowTree.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/AppRegistryBinding.h b/packages/react-native/ReactCommon/react/renderer/uimanager/AppRegistryBinding.h
index 7822930848b..65cc30251b0 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/AppRegistryBinding.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/AppRegistryBinding.h
@@ -9,9 +9,12 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
+
 #include <folly/dynamic.h>
 #include <jsi/jsi.h>
-#include <react/renderer/core/ReactPrimitives.h>
+
+#include <string>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt
index f8e0b076c86..d6afbf677d5 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt
@@ -14,6 +14,7 @@ add_library(react_renderer_uimanager OBJECT ${react_renderer_uimanager_SRC})
 target_include_directories(react_renderer_uimanager PUBLIC ${REACT_COMMON_DIR})
 
 target_link_libraries(react_renderer_uimanager
+        callinvoker
         glog
         folly_runtime
         jsi
@@ -32,6 +33,8 @@ target_link_libraries(react_renderer_uimanager
         react_renderer_leakchecker
         react_renderer_runtimescheduler
         react_renderer_mounting
+        react_timing
+        react_utils
         rrc_root
         rrc_view
         runtimeexecutor
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h
index 9ad3d13a639..cf0755f42c1 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h
@@ -11,6 +11,8 @@
 
 #include <react/renderer/uimanager/UIManagerCommitHook.h>
 
+#include <vector>
+
 namespace facebook::react {
 
 /*
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h
index d92055e7869..8f6fdf1a783 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h
@@ -9,7 +9,11 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <cstdint>
 #include <functional>
+#include <memory>
+#include <string>
+#include <unordered_map>
 
 #include <jsi/jsi.h>
 #include <react/renderer/uimanager/PointerHoverTracker.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerHoverTracker.h b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerHoverTracker.h
index d0381f8db2a..5472a537f89 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerHoverTracker.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerHoverTracker.h
@@ -9,13 +9,15 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
+#include <React/View.h>
+
 #include <functional>
 #include <initializer_list>
 #include <memory>
+#include <tuple>
+#include <vector>
 
-#include <react/renderer/components/view/primitives.h>
-#include <react/renderer/core/ReactPrimitives.h>
-#include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/uimanager/UIManager.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h
index 1dc650dc01c..aaf758bcdf6 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h
@@ -9,17 +9,14 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
+#include <React/RuntimeExecutor.h>
+#include <React/Utils.h>
+
 #include <folly/dynamic.h>
 #include <jsi/jsi.h>
 
-#include <ReactCommon/RuntimeExecutor.h>
-#include <shared_mutex>
-
-#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
-#include <react/renderer/core/InstanceHandle.h>
-#include <react/renderer/core/RawValue.h>
-#include <react/renderer/core/ShadowNode.h>
-#include <react/renderer/core/StateData.h>
 #include <react/renderer/mounting/ShadowTree.h>
 #include <react/renderer/mounting/ShadowTreeDelegate.h>
 #include <react/renderer/mounting/ShadowTreeRegistry.h>
@@ -29,7 +26,12 @@
 #include <react/renderer/uimanager/UIManagerNativeAnimatedDelegate.h>
 #include <react/renderer/uimanager/UIManagerViewTransitionDelegate.h>
 #include <react/renderer/uimanager/primitives.h>
-#include <react/utils/ContextContainer.h>
+#include <functional>
+#include <memory>
+#include <shared_mutex>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationBackend.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationBackend.h
index d291ce2fe17..d57f1e772ca 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationBackend.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationBackend.h
@@ -9,9 +9,11 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <ReactCommon/CallInvoker.h>
-#include <react/renderer/core/ReactPrimitives.h>
+#include <React/CallInvoker.h>
+#include <React/RendererCore.h>
+
 #include <chrono>
+#include <cstdint>
 #include <functional>
 #include <memory>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
index 67981d35d9d..c4a25b38f28 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
@@ -9,10 +9,10 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <jsi/jsi.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
-#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
-#include <react/renderer/core/RawValue.h>
+#include <jsi/jsi.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
index 4b20f29e347..90cc0ce0fd1 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
@@ -9,12 +9,15 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/Timing.h>
+
 #include <jsi/jsi.h>
-#include <react/renderer/core/RawValue.h>
+
+#include <memory>
+#include <string>
+
 #include <react/renderer/uimanager/PointerEventsProcessor.h>
 #include <react/renderer/uimanager/UIManager.h>
-#include <react/renderer/uimanager/primitives.h>
-#include <react/timing/primitives.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h
index b10f9da7905..8ec991bb1d9 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h
@@ -9,6 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <vector>
+
 #include <react/renderer/components/root/RootShadowNode.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
index aa439eadd50..579989d8e01 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
@@ -9,8 +9,13 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/ReactPrimitives.h>
-#include <react/renderer/core/ShadowNode.h>
+#include <React/RendererCore.h>
+
+#include <functional>
+#include <memory>
+#include <string>
+#include <unordered_map>
+
 #include <react/renderer/mounting/MountingCoordinator.h>
 #include <react/renderer/mounting/ShadowTree.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerMountHook.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerMountHook.h
index b05ab8e4dfe..59a65567bae 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerMountHook.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerMountHook.h
@@ -9,8 +9,10 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
+#include <React/Timing.h>
+
 #include <react/renderer/components/root/RootShadowNode.h>
-#include "UIManager.h"
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerNativeAnimatedDelegate.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerNativeAnimatedDelegate.h
index 85217a2e6b5..cff6aa3edd8 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerNativeAnimatedDelegate.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerNativeAnimatedDelegate.h
@@ -9,11 +9,6 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <jsi/jsi.h>
-
-#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
-#include <react/renderer/core/RawValue.h>
-
 namespace facebook::react {
 
 class UIManagerNativeAnimatedDelegate {
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h
index 53f796a808f..85921394a57 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h
@@ -9,10 +9,14 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/ShadowNode.h>
-#include <react/renderer/graphics/Float.h>
+#include <React/RendererCore.h>
+
 #include <functional>
+#include <memory>
 #include <optional>
+#include <string>
+
+#include <react/renderer/graphics/Float.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/primitives.h b/packages/react-native/ReactCommon/react/renderer/uimanager/primitives.h
index adb078351e7..0a3d8e5f57c 100644
--- a/packages/react-native/ReactCommon/react/renderer/uimanager/primitives.h
+++ b/packages/react-native/ReactCommon/react/renderer/uimanager/primitives.h
@@ -9,12 +9,21 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/Debug.h>
+#include <React/RendererCore.h>
+
 #include <folly/dynamic.h>
 #include <jsi/JSIDynamic.h>
 #include <jsi/jsi.h>
-#include <react/debug/react_native_assert.h>
+
+#include <cstddef>
+#include <functional>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <react/renderer/bridging/bridging.h>
-#include <react/renderer/core/ShadowNode.h>
 
 namespace facebook::react {