diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec
index 7a13eb84ef36..04dcdf8b2de2 100644
--- a/packages/react-native/ReactCommon/React-Fabric.podspec
+++ b/packages/react-native/ReactCommon/React-Fabric.podspec
@@ -44,6 +44,7 @@ Pod::Spec.new do |s|
   s.dependency "React-debug"
   s.dependency "React-cxxstableapi"
   s.dependency "React-featureflags"
+  s.dependency "React-timing"
   s.dependency "React-runtimescheduler"
   s.dependency "React-cxxreact"
   s.dependency "React-bridging"
diff --git a/packages/react-native/ReactCommon/React-FabricComponents.podspec b/packages/react-native/ReactCommon/React-FabricComponents.podspec
index ae7adc6ace19..93e329c6ee22 100644
--- a/packages/react-native/ReactCommon/React-FabricComponents.podspec
+++ b/packages/react-native/ReactCommon/React-FabricComponents.podspec
@@ -41,6 +41,7 @@ if ENV['USE_FRAMEWORKS']
       "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view\"",
       "\"$(PODS_TARGET_SRCROOT)/react/renderer/core\"",
       "\"$(PODS_TARGET_SRCROOT)/react/renderer/debug\"",
+      "\"$(PODS_TARGET_SRCROOT)/react/renderer/graphics\"",
       "\"$(PODS_TARGET_SRCROOT)/react/utils\"",
     ]
   end
diff --git a/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt
index 80f0d5364492..d5ea3badd3d2 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt
+++ b/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt
@@ -25,6 +25,7 @@ target_link_libraries(react_renderer_core
         react_renderer_graphics
         react_renderer_mapbuffer
         react_renderer_runtimescheduler
+        react_timing
         react_utils
         runtimeexecutor
         yoga)
diff --git a/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h
index bf552e0e67e1..4f98387c77ab 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h
@@ -12,8 +12,9 @@
 #include <memory>
 #include <vector>
 
-#include <react/debug/react_native_assert.h>
-#include <react/featureflags/ReactNativeFeatureFlags.h>
+#include <React/Debug.h>
+#include <React/FeatureFlags.h>
+#include <React/Graphics.h>
 #include <react/renderer/core/ComponentDescriptor.h>
 #include <react/renderer/core/EventDispatcher.h>
 #include <react/renderer/core/Props.h>
@@ -21,7 +22,6 @@
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/ShadowNodeFragment.h>
 #include <react/renderer/core/State.h>
-#include <react/renderer/graphics/Float.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/core/ConcreteShadowNode.h b/packages/react-native/ReactCommon/react/renderer/core/ConcreteShadowNode.h
index d7d47377c761..d758d39a472e 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/ConcreteShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/ConcreteShadowNode.h
@@ -9,7 +9,7 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
-#include <react/debug/react_native_assert.h>
+#include <React/Debug.h>
 #include <react/renderer/core/ConcreteState.h>
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/PropsParserContext.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h b/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h
index f74a8c9f2416..f115b358b709 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h
@@ -12,13 +12,12 @@
 #include <functional>
 #include <memory>
 
-#include <react/debug/react_native_assert.h>
+#include <React/Debug.h>
 #include <react/renderer/core/State.h>
 
 #ifdef RN_SERIALIZABLE_STATE
+#include <React/MapBuffer.h>
 #include <fbjni/fbjni.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h b/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h
index f1313960d7d1..619f1bc52cf1 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h
@@ -12,13 +12,13 @@
 #include <memory>
 #include <mutex>
 
+#include <React/Timing.h>
 #include <folly/dynamic.h>
 #include <react/renderer/core/EventDispatcher.h>
 #include <react/renderer/core/EventPayload.h>
 #include <react/renderer/core/EventTarget.h>
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/core/ValueFactoryEventPayload.h>
-#include <react/timing/primitives.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventLogger.h b/packages/react-native/ReactCommon/react/renderer/core/EventLogger.h
index f9d797f02a84..2b637eb6edb6 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/EventLogger.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/EventLogger.h
@@ -9,8 +9,8 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
+#include <React/Timing.h>
 #include <react/renderer/core/EventTarget.h>
-#include <react/timing/primitives.h>
 
 #include <optional>
 #include <string_view>
diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventPipe.h b/packages/react-native/ReactCommon/react/renderer/core/EventPipe.h
index 43e7d7161d84..0178f1c07521 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/EventPipe.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/EventPipe.h
@@ -12,12 +12,12 @@
 #include <functional>
 #include <string>
 
+#include <React/Timing.h>
 #include <jsi/jsi.h>
 #include <react/renderer/core/EventPayload.h>
 #include <react/renderer/core/EventTarget.h>
 #include <react/renderer/core/ReactEventPriority.h>
 #include <react/renderer/core/ValueFactory.h>
-#include <react/timing/primitives.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h b/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h
index 865ad7ccb7ff..87f3d246f04a 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h
@@ -11,9 +11,9 @@
 
 #include <limits>
 
+#include <React/Graphics.h>
+#include <React/Utils.h>
 #include <react/renderer/core/LayoutPrimitives.h>
-#include <react/renderer/graphics/Size.h>
-#include <react/utils/hash_combine.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h b/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h
index ff9c41ee44f8..1287da4feec8 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h
@@ -9,12 +9,10 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
+#include <React/Graphics.h>
+#include <React/RendererDebug.h>
+#include <React/Utils.h>
 #include <react/renderer/core/LayoutPrimitives.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/debug/flags.h>
-#include <react/renderer/graphics/Rect.h>
-#include <react/renderer/graphics/RectangleEdges.h>
-#include <react/utils/hash_combine.h>
 #include <algorithm>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h b/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h
index a7a4ea33f076..8655de5f396e 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h
@@ -14,12 +14,12 @@
 #include <memory>
 #include <vector>
 
-#include <react/debug/react_native_assert.h>
+#include <React/Debug.h>
+#include <React/Graphics.h>
+#include <React/RendererDebug.h>
 #include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/ShadowNodeFragment.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Transform.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/core/Props.h b/packages/react-native/ReactCommon/react/renderer/core/Props.h
index e5c0cba8dae0..c717e3182a05 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/Props.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/Props.h
@@ -9,16 +9,16 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
+#include <React/RendererDebug.h>
 #include <react/renderer/core/PropsMacros.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/core/Sealable.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 #ifdef ANDROID
+#include <React/MapBuffer.h>
 #include <folly/dynamic.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/core/PropsMacros.h b/packages/react-native/ReactCommon/react/renderer/core/PropsMacros.h
index 42f386ad618e..cb1ad5bb93ef 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/PropsMacros.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/PropsMacros.h
@@ -9,8 +9,8 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
+#include <React/Utils.h>
 #include <react/renderer/core/RawPropsPrimitives.h>
-#include <react/utils/fnv1a.h>
 #include <functional>
 
 // We need to use clang pragmas inside of a macro below,
diff --git a/packages/react-native/ReactCommon/react/renderer/core/PropsParserContext.h b/packages/react-native/ReactCommon/react/renderer/core/PropsParserContext.h
index dab268aab282..7ff760a0219d 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/PropsParserContext.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/PropsParserContext.h
@@ -11,8 +11,8 @@
 
 #include <optional>
 
+#include <React/Utils.h>
 #include <react/renderer/core/ReactPrimitives.h>
-#include <react/utils/ContextContainer.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawEvent.h b/packages/react-native/ReactCommon/react/renderer/core/RawEvent.h
index e6b798053fd3..2b082a5c473c 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/RawEvent.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/RawEvent.h
@@ -12,10 +12,10 @@
 #include <memory>
 #include <string>
 
+#include <React/Timing.h>
 #include <react/renderer/core/EventLogger.h>
 #include <react/renderer/core/EventPayload.h>
 #include <react/renderer/core/EventTarget.h>
-#include <react/timing/primitives.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawValue.h b/packages/react-native/ReactCommon/react/renderer/core/RawValue.h
index 176ca8ce00b0..e96d25328aa0 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/RawValue.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/RawValue.h
@@ -18,7 +18,7 @@
 
 #include <react/renderer/core/RawPropsPrimitives.h>
 
-#include <react/debug/react_native_assert.h>
+#include <React/Debug.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/core/Sealable.h b/packages/react-native/ReactCommon/react/renderer/core/Sealable.h
index a18904ba98b6..74e13041c686 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/Sealable.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/Sealable.h
@@ -11,7 +11,7 @@
 
 #include <atomic>
 
-#include <react/debug/flags.h>
+#include <React/Debug.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h
index 3c016db8334d..2426c9065fc8 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h
@@ -15,6 +15,7 @@
 #include <type_traits>
 #include <vector>
 
+#include <React/RendererDebug.h>
 #include <react/renderer/core/EventEmitter.h>
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/ReactPrimitives.h>
@@ -22,7 +23,6 @@
 #include <react/renderer/core/ShadowNodeFamily.h>
 #include <react/renderer/core/ShadowNodeTraits.h>
 #include <react/renderer/core/State.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/core/State.h b/packages/react-native/ReactCommon/react/renderer/core/State.h
index 437409a119ef..7a07bc268060 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/State.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/State.h
@@ -10,9 +10,9 @@
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
 #ifdef RN_SERIALIZABLE_STATE
+#include <React/MapBuffer.h>
 #include <fbjni/fbjni.h>
 #include <folly/dynamic.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
 #endif
 
 #include <react/renderer/core/ShadowNodeFamily.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h b/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h
index 725ad9ec674d..6b77ed7a209b 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h
@@ -12,19 +12,12 @@
 #include <array>
 #include <unordered_map>
 
+#include <React/Debug.h>
+#include <React/Graphics.h>
+#include <React/RendererDebug.h>
 #include <glog/logging.h>
-#include <react/debug/react_native_expect.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawProps.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Float.h>
-#include <react/renderer/graphics/PlatformColorParser.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/graphics/Rect.h>
-#include <react/renderer/graphics/RectangleCorners.h>
-#include <react/renderer/graphics/RectangleEdges.h>
-#include <react/renderer/graphics/Size.h>
 
 #ifdef RN_SERIALIZABLE_STATE
 #include <yoga/Yoga.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSColorFunction.h b/packages/react-native/ReactCommon/react/renderer/css/CSSColorFunction.h
index 8eee0bbe20df..c3abc7f2de13 100644
--- a/packages/react-native/ReactCommon/react/renderer/css/CSSColorFunction.h
+++ b/packages/react-native/ReactCommon/react/renderer/css/CSSColorFunction.h
@@ -34,7 +34,7 @@ constexpr uint8_t clamp255Component(float f)
   // be rounded towards +∞.
   // https://www.w3.org/TR/css-color-4/#rgb-functions
   auto i = static_cast<int32_t>(f);
-  auto ceiled = f > i ? i + 1 : i;
+  auto ceiled = f > static_cast<float>(i) ? i + 1 : i;
   return static_cast<uint8_t>(std::clamp(ceiled, 0, 255));
 }
 
diff --git a/packages/react-native/ReactCommon/react/renderer/debug/React/RendererDebug.h b/packages/react-native/ReactCommon/react/renderer/debug/React/RendererDebug.h
index 7780c7af94ba..549ea9b75386 100644
--- a/packages/react-native/ReactCommon/react/renderer/debug/React/RendererDebug.h
+++ b/packages/react-native/ReactCommon/react/renderer/debug/React/RendererDebug.h
@@ -32,7 +32,6 @@
 
 #include <react/renderer/debug/DebugStringConvertible.h>
 #include <react/renderer/debug/DebugStringConvertibleItem.h>
-#include <react/renderer/debug/debugStringConvertibleUtils.h>
 #include <react/renderer/debug/flags.h>
 
 #undef RN_UMBRELLA_CONTEXT
diff --git a/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h b/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h
index e723e7ae7dae..b95d5b3685af 100644
--- a/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h
+++ b/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/PrivateGuard.h>
 
 #include <memory>
 #include <optional>
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/React/Graphics.h b/packages/react-native/ReactCommon/react/renderer/graphics/React/Graphics.h
index 1301e24a9d4d..fc097b2fe9b7 100644
--- a/packages/react-native/ReactCommon/react/renderer/graphics/React/Graphics.h
+++ b/packages/react-native/ReactCommon/react/renderer/graphics/React/Graphics.h
@@ -53,15 +53,6 @@
 #include <react/renderer/graphics/ValueUnit.h>
 #include <react/renderer/graphics/Vector.h>
 #include <react/renderer/graphics/fromRawValueShared.h>
-#include <react/renderer/graphics/rounding.h>
-
-#ifdef ANDROID
-#include <react/renderer/graphics/configurePlatformColorCacheInvalidationHook.h>
-#endif
-
-#if defined(__APPLE__) && defined(__OBJC__)
-#include <react/renderer/graphics/RCTPlatformColorUtils.h>
-#endif
 
 #undef RN_UMBRELLA_CONTEXT
 #pragma pop_macro("RN_UMBRELLA_CONTEXT")
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h b/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h
index bfd96f122819..b0fe8547cd09 100644
--- a/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h
+++ b/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #import <UIKit/UIKit.h>
 #import <vector>
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/rounding.h b/packages/react-native/ReactCommon/react/renderer/graphics/rounding.h
index b5f93f2891f5..eea8010b503a 100644
--- a/packages/react-native/ReactCommon/react/renderer/graphics/rounding.h
+++ b/packages/react-native/ReactCommon/react/renderer/graphics/rounding.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/PrivateGuard.h>
 
 #include <react/renderer/graphics/Float.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h
index b80911286e66..4bac2ed24369 100644
--- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h
+++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h
@@ -9,8 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/ReactPrimitives.h>
-#include <react/renderer/graphics/Float.h>
+#include <React/Graphics.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutManagerExtended.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutManagerExtended.h
index acb7a068e2d5..a0aaf283b597 100644
--- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutManagerExtended.h
+++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutManagerExtended.h
@@ -12,9 +12,9 @@
 #include <glog/logging.h>
 #include <cstddef>
 
+#include <React/Graphics.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
-#include <react/renderer/graphics/Size.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
 #include <react/renderer/textlayoutmanager/TextMeasureCache.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h
index 9840fa850736..3ce94eef03a3 100644
--- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h
+++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h
@@ -9,12 +9,10 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
-#include <react/renderer/core/LayoutConstraints.h>
-#include <react/utils/FloatComparison.h>
-#include <react/utils/SimpleThreadSafeCache.h>
-#include <react/utils/hash_combine.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasurementRounding.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasurementRounding.h
index 56d30c39f44b..d42c96893f85 100644
--- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasurementRounding.h
+++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasurementRounding.h
@@ -11,7 +11,7 @@
 
 #include <cmath>
 
-#include <react/renderer/graphics/Size.h>
+#include <React/Graphics.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h
index 51936a111e10..97b878dcec96 100644
--- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h
+++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h
@@ -9,14 +9,14 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 #include <react/jni/SafeReleaseJniRef.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
-#include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/textlayoutmanager/JPreparedLayout.h>
 #include <react/renderer/textlayoutmanager/TextLayoutContext.h>
 #include <react/renderer/textlayoutmanager/TextMeasureCache.h>
-#include <react/utils/ContextContainer.h>
 
 #include <fbjni/fbjni.h>
 #include <memory>
diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.h
index 2fc306d3bd60..9cf9543b6282 100644
--- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.h
+++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.h
@@ -9,12 +9,12 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
-#include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/textlayoutmanager/TextLayoutContext.h>
 #include <react/renderer/textlayoutmanager/TextMeasureCache.h>
-#include <react/utils/ContextContainer.h>
 #include <memory>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.h
index e0f30b8499a7..d30a3e3a4707 100644
--- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.h
+++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.h
@@ -9,9 +9,9 @@
 
 #import <UIKit/UIKit.h>
 
+#import <React/RendererCore.h>
 #import <react/renderer/attributedstring/AttributedString.h>
 #import <react/renderer/attributedstring/ParagraphAttributes.h>
-#import <react/renderer/core/LayoutConstraints.h>
 #import <react/renderer/textlayoutmanager/TextLayoutContext.h>
 #import <react/renderer/textlayoutmanager/TextMeasureCache.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h
index 8e873550637d..45a96051850b 100644
--- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h
+++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h
@@ -9,6 +9,7 @@
 
 #import <UIKit/UIKit.h>
 
+#include <React/Graphics.h>
 #include <react/renderer/graphics/RCTPlatformColorUtils.h>
 #include <react/renderer/textlayoutmanager/RCTFontProperties.h>
 #include <react/renderer/textlayoutmanager/RCTFontUtils.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h
index 71100221f09a..c97994b6068b 100644
--- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h
+++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h
@@ -9,12 +9,12 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
-#include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/textlayoutmanager/TextLayoutContext.h>
 #include <react/renderer/textlayoutmanager/TextMeasureCache.h>
-#include <react/utils/ContextContainer.h>
 #include <memory>
 
 namespace facebook::react {