react · j-piasecki · Sep 24, 2026 · Sep 24, 2026 · Sep 24, 2026 · Sep 24, 2026
diff --git a/packages/react-native/Package.swift b/packages/react-native/Package.swift
@@ -136,7 +136,8 @@ let reactFeatureFlags = RNTarget(
 let reactPerfLogger = RNTarget(
   name: .reactPerfLogger,
   path: "ReactCommon/reactperflogger",
-  excludedPaths: ["fusebox"]
+  excludedPaths: ["fusebox"],
+  dependencies: [.reactDebug, .reactNativeDependencies]
 )
 
 /// React-logger.podspec

diff --git 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/jserrorhandler/CMakeLists.txt b/packages/react-native/ReactCommon/jserrorhandler/CMakeLists.txt
@@ -22,6 +22,7 @@ target_link_libraries(jserrorhandler
         folly_runtime
         ${mapbufferjni}
         react_cxxstableapi
+        react_debug
         react_featureflags
 )
 target_compile_reactnative_options(jserrorhandler PRIVATE)
diff --git a/packages/react-native/ReactCommon/jsitooling/CMakeLists.txt b/packages/react-native/ReactCommon/jsitooling/CMakeLists.txt
@@ -21,7 +21,8 @@ target_link_libraries(jsitooling
         folly_runtime
         glog
         jsi
-        react_cxxstableapi)
+        react_cxxstableapi
+        react_timing)
 
 target_compile_reactnative_options(jsitooling PRIVATE)
 target_compile_options(jsitooling PRIVATE -Wpedantic)
diff --git 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
@@ -12,16 +12,16 @@
 #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>
 #include <react/renderer/core/PropsParserContext.h>
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/React/RawValue.h b/packages/react-native/ReactCommon/react/renderer/core/React/RawValue.h
@@ -0,0 +1,44 @@
+/*
+ * 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 `rawValue` module - public entry point.
+//
+//   #include <React/RawValue.h>
+//
+// `rawValue` is the slice of `react/renderer/core` that `react/renderer/graphics`
+// depends on. It is built as its own target so the two modules do not form a
+// dependency cycle; <React/RendererCore.h> re-exports it, so consumers that want
+// the whole renderer core still only need that one umbrella.
+//
+// Re-exports the module's public interface headers. React Native's own code
+// should keep using the fine-grained `<react/renderer/core/...>` includes,
+// except in headers it exports to consumers: those are preprocessed in the
+// consumer's translation unit, where the fine-grained include hits this
+// module's <react/cxxstableapi/UmbrellaGuard.h>. `RN_ALLOW_FRAMEWORKS` does not
+// suppress that guard, so a "for frameworks" header must reach this module
+// through the 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 a later *direct* include of a guarded header the umbrella did
+// not already pull in is still caught, and it nests inside an enclosing
+// umbrella rather than disarming it. The headers below are `#pragma once`, so
+// re-including one of them directly is a silent no-op, not a guard hit.
+#pragma push_macro("RN_UMBRELLA_CONTEXT")
+#undef RN_UMBRELLA_CONTEXT
+#define RN_UMBRELLA_CONTEXT 1
+
+#include <react/renderer/core/RawPropsPrimitives.h>
+#include <react/renderer/core/RawValue.h>
+
+#undef RN_UMBRELLA_CONTEXT
+#pragma pop_macro("RN_UMBRELLA_CONTEXT")
diff --git a/packages/react-native/ReactCommon/react/renderer/core/React/RendererCore.h b/packages/react-native/ReactCommon/react/renderer/core/React/RendererCore.h
@@ -12,7 +12,8 @@
 //
 //   #include <React/RendererCore.h>
 //
-// Re-exports the module's public interface headers. React Native's own code
+// Re-exports the module's public interface headers, including those of the
+// `rawValue` target via <React/RawValue.h>. React Native's own code
 // should keep using the fine-grained `<react/renderer/core/...>` includes,
 // except in headers it exports to consumers: those are preprocessed in the
 // consumer's translation unit, where the fine-grained include hits this
@@ -24,12 +25,15 @@
 // 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.
+// this block, so a later *direct* include of a guarded header the umbrella did
+// not already pull in is still caught, and it nests inside an enclosing
+// umbrella rather than disarming it. The headers below are `#pragma once`, so
+// re-including one of them directly is a silent no-op, not a guard hit.
 #pragma push_macro("RN_UMBRELLA_CONTEXT")
 #undef RN_UMBRELLA_CONTEXT
 #define RN_UMBRELLA_CONTEXT 1
 
+#include <React/RawValue.h>
 #include <react/renderer/core/ComponentDescriptor.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include <react/renderer/core/ConcreteShadowNode.h>
@@ -61,8 +65,6 @@
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsKeyMap.h>
 #include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/RawPropsPrimitives.h>
-#include <react/renderer/core/RawValue.h>
 #include <react/renderer/core/ReactEventPriority.h>
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/core/ReactRootViewTagGenerator.h>

diff --git 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
@@ -15,14 +15,14 @@
 #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>
 #include <react/renderer/core/Sealable.h>
 #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
@@ -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
@@ -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/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/timing/primitives.h b/packages/react-native/ReactCommon/react/timing/primitives.h
@@ -9,7 +9,7 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
-#include <react/debug/flags.h>
+#include <React/Debug.h>
 #include <chrono>
 #include <cmath>
 #include <functional>

diff --git a/packages/react-native/scripts/cocoapods/utils.rb b/packages/react-native/scripts/cocoapods/utils.rb
@@ -424,6 +424,7 @@ def self.update_search_paths(installer)
                     .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-featureflags", "React_featureflags", []))
                     .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-renderercss", "React_renderercss", []))
                     .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-cxxstableapi", "React_cxxstableapi", []))
+                    .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-debug", "React_debug", []))
                     .each{ |search_path|
                         header_search_paths = self.add_search_path_if_not_included(header_search_paths, search_path)
                     }