diff --git a/packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GenerateComponentDescriptorH-test.js.snap b/packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GenerateComponentDescriptorH-test.js.snap
index 6d4e694d14d5..7aa44d182665 100644
--- a/packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GenerateComponentDescriptorH-test.js.snap
+++ b/packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GenerateComponentDescriptorH-test.js.snap
@@ -16,7 +16,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -46,7 +46,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -76,7 +76,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -106,7 +106,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -136,7 +136,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -166,7 +166,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -196,7 +196,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -226,7 +226,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -256,7 +256,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -286,7 +286,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -316,7 +316,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -346,7 +346,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -376,7 +376,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -406,7 +406,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -436,7 +436,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -466,7 +466,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -496,7 +496,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -526,7 +526,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GeneratePropsCpp-test.js.snap b/packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GeneratePropsCpp-test.js.snap
index adbf0eb81071..27bb4f53ac0e 100644
--- a/packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GeneratePropsCpp-test.js.snap
+++ b/packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GeneratePropsCpp-test.js.snap
@@ -13,10 +13,9 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
 
 namespace facebook::react {
 
@@ -128,8 +127,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -186,8 +184,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -239,9 +236,8 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
 
 namespace facebook::react {
 
@@ -293,8 +289,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -343,8 +338,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -401,8 +395,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -454,8 +447,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -507,8 +499,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -590,9 +581,8 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -644,8 +634,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -707,8 +696,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -760,9 +748,8 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <React/RendererCore.h>
 #include <folly/dynamic.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
 
 namespace facebook::react {
 
@@ -814,9 +801,8 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -883,8 +869,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -933,9 +918,8 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -997,8 +981,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1050,8 +1033,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap b/packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap
index f41b85833b98..602e57d6327a 100644
--- a/packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap
+++ b/packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap
@@ -13,16 +13,11 @@ Object {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
 #include <cinttypes>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/graphics/RectangleEdges.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 #include <yoga/Yoga.h>
 
@@ -228,9 +223,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -271,10 +265,9 @@ Object {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
 
 namespace facebook::react {
 
@@ -314,10 +307,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 #include <yoga/Yoga.h>
 
 namespace facebook::react {
@@ -358,9 +349,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -400,9 +390,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -515,9 +504,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -557,9 +545,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -599,9 +586,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -647,10 +633,9 @@ Object {
  */
 #pragma once
 
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook::react {
 
@@ -690,9 +675,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -734,9 +718,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -776,9 +759,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -818,12 +800,10 @@ Object {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook::react {
 
@@ -866,9 +846,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -908,14 +887,11 @@ Object {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/Image.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 
 namespace facebook::react {
@@ -1160,10 +1136,9 @@ Object {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Point.h>
 
 namespace facebook::react {
 
@@ -1203,9 +1178,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/e2e/deep_imports/__tests__/modules/__snapshots__/GenerateModuleH-test.js.snap b/packages/react-native-codegen/e2e/deep_imports/__tests__/modules/__snapshots__/GenerateModuleH-test.js.snap
index 949adb2e9789..06a9e883b713 100644
--- a/packages/react-native-codegen/e2e/deep_imports/__tests__/modules/__snapshots__/GenerateModuleH-test.js.snap
+++ b/packages/react-native-codegen/e2e/deep_imports/__tests__/modules/__snapshots__/GenerateModuleH-test.js.snap
@@ -12,8 +12,8 @@ exports[`GenerateModuleH can generate a header file NativeModule specs 1`] = `
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
@@ -1609,8 +1609,8 @@ exports[`GenerateModuleH can generate a header file NativeModule specs with assu
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GenerateComponentDescriptorH-test.js.snap b/packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GenerateComponentDescriptorH-test.js.snap
index 94010f4fdbe3..7b5a45cb0ce6 100644
--- a/packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GenerateComponentDescriptorH-test.js.snap
+++ b/packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GenerateComponentDescriptorH-test.js.snap
@@ -16,7 +16,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -46,7 +46,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -76,7 +76,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -106,7 +106,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -136,7 +136,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -166,7 +166,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -196,7 +196,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -226,7 +226,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -256,7 +256,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -286,7 +286,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -316,7 +316,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -346,7 +346,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -376,7 +376,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -406,7 +406,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -436,7 +436,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -466,7 +466,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -496,7 +496,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -526,7 +526,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GeneratePropsCpp-test.js.snap b/packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GeneratePropsCpp-test.js.snap
index f9b2d81b2d8c..69900c4bba7b 100644
--- a/packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GeneratePropsCpp-test.js.snap
+++ b/packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GeneratePropsCpp-test.js.snap
@@ -13,10 +13,9 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
 
 namespace facebook::react {
 
@@ -128,8 +127,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -186,8 +184,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -239,9 +236,8 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
 
 namespace facebook::react {
 
@@ -293,8 +289,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -343,8 +338,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -401,8 +395,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -454,8 +447,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -507,8 +499,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -590,9 +581,8 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -644,8 +634,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -707,8 +696,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -760,9 +748,8 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <React/RendererCore.h>
 #include <folly/dynamic.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
 
 namespace facebook::react {
 
@@ -814,9 +801,8 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -883,8 +869,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -933,9 +918,8 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -997,8 +981,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1050,8 +1033,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap b/packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap
index a3ba5b86ea2f..5739bd6533bc 100644
--- a/packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap
+++ b/packages/react-native-codegen/e2e/namespaced/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap
@@ -13,16 +13,11 @@ Object {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
 #include <cinttypes>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/graphics/RectangleEdges.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 #include <yoga/Yoga.h>
 
@@ -228,9 +223,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -271,10 +265,9 @@ Object {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
 
 namespace facebook::react {
 
@@ -314,10 +307,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 #include <yoga/Yoga.h>
 
 namespace facebook::react {
@@ -358,9 +349,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -400,9 +390,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -515,9 +504,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -557,9 +545,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -599,9 +586,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -647,10 +633,9 @@ Object {
  */
 #pragma once
 
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook::react {
 
@@ -690,9 +675,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -734,9 +718,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -776,9 +759,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -818,12 +800,10 @@ Object {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook::react {
 
@@ -866,9 +846,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -908,14 +887,11 @@ Object {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/Image.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 
 namespace facebook::react {
@@ -1160,10 +1136,9 @@ Object {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Point.h>
 
 namespace facebook::react {
 
@@ -1203,9 +1178,8 @@ Object {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/src/generators/ReservedPrimitiveTypes.js b/packages/react-native-codegen/src/generators/ReservedPrimitiveTypes.js
index a99d6b0806d3..c81a60361fda 100644
--- a/packages/react-native-codegen/src/generators/ReservedPrimitiveTypes.js
+++ b/packages/react-native-codegen/src/generators/ReservedPrimitiveTypes.js
@@ -48,7 +48,7 @@ const RESERVED_TYPES: {readonly [ReservedPrimitiveName]: ReservedTypeMapping} =
     ColorPrimitive: {
       cpp: {
         typeName: 'SharedColor',
-        localIncludes: ['#include <react/renderer/graphics/Color.h>'],
+        localIncludes: ['#include <React/Graphics.h>'],
         conversionIncludes: [],
       },
       java: {
@@ -61,10 +61,8 @@ const RESERVED_TYPES: {readonly [ReservedPrimitiveName]: ReservedTypeMapping} =
     ImageSourcePrimitive: {
       cpp: {
         typeName: 'ImageSource',
-        localIncludes: ['#include <react/renderer/imagemanager/primitives.h>'],
-        conversionIncludes: [
-          '#include <react/renderer/components/image/conversions.h>',
-        ],
+        localIncludes: ['#include <React/ImageManager.h>'],
+        conversionIncludes: ['#include <React/Image.h>'],
       },
       java: {
         interfaceImports: ['import com.facebook.react.bridge.ReadableMap;'],
@@ -74,9 +72,7 @@ const RESERVED_TYPES: {readonly [ReservedPrimitiveName]: ReservedTypeMapping} =
     ImageRequestPrimitive: {
       cpp: {
         typeName: 'ImageRequest',
-        localIncludes: [
-          '#include <react/renderer/imagemanager/ImageRequest.h>',
-        ],
+        localIncludes: ['#include <React/ImageManager.h>'],
         conversionIncludes: [],
       },
       java: {
@@ -88,7 +84,7 @@ const RESERVED_TYPES: {readonly [ReservedPrimitiveName]: ReservedTypeMapping} =
     PointPrimitive: {
       cpp: {
         typeName: 'Point',
-        localIncludes: ['#include <react/renderer/graphics/Point.h>'],
+        localIncludes: ['#include <React/Graphics.h>'],
         conversionIncludes: [],
       },
       java: {
@@ -99,7 +95,7 @@ const RESERVED_TYPES: {readonly [ReservedPrimitiveName]: ReservedTypeMapping} =
     EdgeInsetsPrimitive: {
       cpp: {
         typeName: 'EdgeInsets',
-        localIncludes: ['#include <react/renderer/graphics/RectangleEdges.h>'],
+        localIncludes: ['#include <React/Graphics.h>'],
         conversionIncludes: [],
       },
       java: {
@@ -112,7 +108,7 @@ const RESERVED_TYPES: {readonly [ReservedPrimitiveName]: ReservedTypeMapping} =
         typeName: 'YGValue',
         localIncludes: [
           '#include <yoga/Yoga.h>',
-          '#include <react/renderer/core/graphicsConversions.h>',
+          '#include <React/RendererCore.h>',
         ],
         conversionIncludes: ['#include <React/View.h>'],
       },
diff --git a/packages/react-native-codegen/src/generators/components/ComponentsGeneratorUtils.js b/packages/react-native-codegen/src/generators/components/ComponentsGeneratorUtils.js
index bd706b186a1d..ebe1d2674f69 100644
--- a/packages/react-native-codegen/src/generators/components/ComponentsGeneratorUtils.js
+++ b/packages/react-native-codegen/src/generators/components/ComponentsGeneratorUtils.js
@@ -227,7 +227,7 @@ function getLocalImports(
       typeAnnotation.type === 'ArrayTypeAnnotation' &&
       typeAnnotation.elementType.type === 'ObjectTypeAnnotation'
     ) {
-      imports.add('#include <react/renderer/core/propsConversions.h>');
+      imports.add('#include <React/RendererCore.h>');
       const objectProps = typeAnnotation.elementType.properties;
       // $FlowFixMe[incompatible-type] the type is guaranteed to be ObjectTypeAnnotation<PropTypeAnnotation>
       const objectImports = getImports(objectProps);
@@ -240,7 +240,7 @@ function getLocalImports(
     }
 
     if (typeAnnotation.type === 'ObjectTypeAnnotation') {
-      imports.add('#include <react/renderer/core/propsConversions.h>');
+      imports.add('#include <React/RendererCore.h>');
       const objectImports = getImports(typeAnnotation.properties);
       const localImports = getLocalImports(typeAnnotation.properties);
       // $FlowFixMe[method-unbinding] added when improving typing for this parameters
diff --git a/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorCpp.js b/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorCpp.js
index 0bf3bfa50f87..6c5d99338bcc 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorCpp.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorCpp.js
@@ -36,8 +36,8 @@ const FileTemplate = ({
  */
 
 ${IncludeTemplate({headerPrefix, file: 'ComponentDescriptors.h'})}
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js b/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js
index b5f508277e5b..3ab1c5db190a 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js
@@ -39,7 +39,7 @@ const FileTemplate = ({
 
 ${IncludeTemplate({headerPrefix, file: 'ShadowNodes.h'})}
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsCpp.js b/packages/react-native-codegen/src/generators/components/GeneratePropsCpp.js
index 60041ed64d1a..e5a745a9bc66 100644
--- a/packages/react-native-codegen/src/generators/components/GeneratePropsCpp.js
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsCpp.js
@@ -313,12 +313,11 @@ module.exports = {
   ): FilesOutput {
     const fileName = 'Props.cpp';
     const allImports: Set<string> = new Set([
-      '#include <react/renderer/core/propsConversions.h>',
-      '#include <react/renderer/core/PropsParserContext.h>',
+      '#include <React/RendererCore.h>',
     ]);
 
     if (includeGetDebugPropsImplementation) {
-      allImports.add('#include <react/renderer/core/graphicsConversions.h>');
+      allImports.add('#include <React/RendererDebug.h>');
       allImports.add(
         '#include <react/renderer/debug/debugStringConvertibleUtils.h>',
       );
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsH.js b/packages/react-native-codegen/src/generators/components/GeneratePropsH.js
index 8aa4dd9fcbb5..b7dc064fb203 100644
--- a/packages/react-native-codegen/src/generators/components/GeneratePropsH.js
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsH.js
@@ -561,8 +561,7 @@ function getExtendsImports(
 ): Set<string> {
   const imports: Set<string> = new Set();
 
-  imports.add('#include <react/renderer/core/PropsParserContext.h>');
-  imports.add('#include <react/renderer/debug/DebugStringConvertible.h>');
+  imports.add('#include <React/RendererCore.h>');
 
   extendsProps.forEach(extendProps => {
     switch (extendProps.type) {
diff --git a/packages/react-native-codegen/src/generators/components/GenerateStateH.js b/packages/react-native-codegen/src/generators/components/GenerateStateH.js
index 1a5a03814045..10b0b64f6c5d 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateStateH.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateStateH.js
@@ -33,7 +33,7 @@ const FileTemplate = ({
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
diff --git a/packages/react-native-codegen/src/generators/components/GenerateTests.js b/packages/react-native-codegen/src/generators/components/GenerateTests.js
index 668f05c43cc9..4779e0695c2e 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateTests.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateTests.js
@@ -45,7 +45,7 @@ const FileTemplate = ({
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/${libraryName}/Props.h>
 ${imports}
 
@@ -176,11 +176,7 @@ module.exports = {
     headerPrefix?: string,
   ): FilesOutput {
     const fileName = 'Tests.cpp';
-    const allImports = new Set([
-      '#include <react/renderer/core/propsConversions.h>',
-      '#include <react/renderer/core/RawProps.h>',
-      '#include <react/renderer/core/RawPropsParser.h>',
-    ]);
+    const allImports = new Set<string>();
 
     const componentTests = Object.keys(schema.modules)
       .map(moduleName => {
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorCpp-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorCpp-test.js.snap
index 6800b1760616..32a3153ea9ee 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorCpp-test.js.snap
@@ -13,8 +13,8 @@ Map {
  */
 
 #include <react/renderer/components/ALL_PROP/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -41,8 +41,8 @@ Map {
  */
 
 #include <react/renderer/components/ALL_PROP_WITH_OPTIONAL_GEN/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -69,8 +69,8 @@ Map {
  */
 
 #include <react/renderer/components/ALL_PROP_WITH_OPTIONAL_OBJECT_GEN/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -97,8 +97,8 @@ Map {
  */
 
 #include <react/renderer/components/ARRAY_PROPS/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -125,8 +125,8 @@ Map {
  */
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -153,8 +153,8 @@ Map {
  */
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT_WITH_OPTIONAL_GEN/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -181,8 +181,8 @@ Map {
  */
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT_WITH_OPTIONAL_OBJECT_GEN/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -209,8 +209,8 @@ Map {
  */
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_OPTIONAL_GEN/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -237,8 +237,8 @@ Map {
  */
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_OPTIONAL_OBJECT_GEN/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -265,8 +265,8 @@ Map {
  */
 
 #include <react/renderer/components/BOOLEAN_PROP/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -293,8 +293,8 @@ Map {
  */
 
 #include <react/renderer/components/COLOR_PROP/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -321,8 +321,8 @@ Map {
  */
 
 #include <react/renderer/components/COMMANDS/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -349,8 +349,8 @@ Map {
  */
 
 #include <react/renderer/components/COMMANDS_AND_PROPS/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -377,8 +377,8 @@ Map {
  */
 
 #include <react/renderer/components/DIMENSION_PROP/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -405,8 +405,8 @@ Map {
  */
 
 #include <react/renderer/components/DOUBLE_PROPS/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -433,8 +433,8 @@ Map {
  */
 
 #include <react/renderer/components/EVENT_NESTED_OBJECT_PROPS/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -461,8 +461,8 @@ Map {
  */
 
 #include <react/renderer/components/EVENT_PROPS/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -489,8 +489,8 @@ Map {
  */
 
 #include <react/renderer/components/EVENTS_WITH_PAPER_NAME/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -517,8 +517,8 @@ Map {
  */
 
 #include <react/renderer/components/EXCLUDE_ANDROID/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -545,8 +545,8 @@ Map {
  */
 
 #include <react/renderer/components/EXCLUDE_ANDROID_IOS/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -573,8 +573,8 @@ Map {
  */
 
 #include <react/renderer/components/EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -602,8 +602,8 @@ Map {
  */
 
 #include <react/renderer/components/FLOAT_PROPS/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -630,8 +630,8 @@ Map {
  */
 
 #include <react/renderer/components/IMAGE_PROP/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -658,8 +658,8 @@ Map {
  */
 
 #include <react/renderer/components/INSETS_PROP/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -686,8 +686,8 @@ Map {
  */
 
 #include <react/renderer/components/INT32_ENUM_PROP/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -714,8 +714,8 @@ Map {
  */
 
 #include <react/renderer/components/INTEGER_PROPS/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -742,8 +742,8 @@ Map {
  */
 
 #include <react/renderer/components/INTERFACE_ONLY/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -770,8 +770,8 @@ Map {
  */
 
 #include <react/renderer/components/MIXED_PROP/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -798,8 +798,8 @@ Map {
  */
 
 #include <react/renderer/components/MULTI_NATIVE_PROP/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -826,8 +826,8 @@ Map {
  */
 
 #include <react/renderer/components/NO_PROPS_NO_EVENTS/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -854,8 +854,8 @@ Map {
  */
 
 #include <react/renderer/components/OBJECT_PROPS/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -882,8 +882,8 @@ Map {
  */
 
 #include <react/renderer/components/OBJECT_PROPS_WITH_OPTIONAL_GEN/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -910,8 +910,8 @@ Map {
  */
 
 #include <react/renderer/components/OBJECT_PROPS_WITH_OPTIONAL_OBJECT_GEN/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -938,8 +938,8 @@ Map {
  */
 
 #include <react/renderer/components/POINT_PROP/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -966,8 +966,8 @@ Map {
  */
 
 #include <react/renderer/components/STRING_ENUM_PROP/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -994,8 +994,8 @@ Map {
  */
 
 #include <react/renderer/components/STRING_PROP/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1022,8 +1022,8 @@ Map {
  */
 
 #include <react/renderer/components/TWO_COMPONENTS_DIFFERENT_FILES/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1051,8 +1051,8 @@ Map {
  */
 
 #include <react/renderer/components/TWO_COMPONENTS_SAME_FILE/ComponentDescriptors.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <React/ComponentRegistry.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap
index 0248e91ba64e..7fc05c1a072e 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap
@@ -16,7 +16,7 @@ Map {
 
 #include <react/renderer/components/ALL_PROP/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -46,7 +46,7 @@ Map {
 
 #include <react/renderer/components/ALL_PROP_WITH_OPTIONAL_GEN/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -76,7 +76,7 @@ Map {
 
 #include <react/renderer/components/ALL_PROP_WITH_OPTIONAL_OBJECT_GEN/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -106,7 +106,7 @@ Map {
 
 #include <react/renderer/components/ARRAY_PROPS/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -136,7 +136,7 @@ Map {
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -166,7 +166,7 @@ Map {
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT_WITH_OPTIONAL_GEN/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -196,7 +196,7 @@ Map {
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT_WITH_OPTIONAL_OBJECT_GEN/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -226,7 +226,7 @@ Map {
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_OPTIONAL_GEN/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -256,7 +256,7 @@ Map {
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_OPTIONAL_OBJECT_GEN/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -286,7 +286,7 @@ Map {
 
 #include <react/renderer/components/BOOLEAN_PROP/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -316,7 +316,7 @@ Map {
 
 #include <react/renderer/components/COLOR_PROP/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -346,7 +346,7 @@ Map {
 
 #include <react/renderer/components/COMMANDS/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -376,7 +376,7 @@ Map {
 
 #include <react/renderer/components/COMMANDS_AND_PROPS/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -406,7 +406,7 @@ Map {
 
 #include <react/renderer/components/DIMENSION_PROP/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -436,7 +436,7 @@ Map {
 
 #include <react/renderer/components/DOUBLE_PROPS/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -466,7 +466,7 @@ Map {
 
 #include <react/renderer/components/EVENT_NESTED_OBJECT_PROPS/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -496,7 +496,7 @@ Map {
 
 #include <react/renderer/components/EVENT_PROPS/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -526,7 +526,7 @@ Map {
 
 #include <react/renderer/components/EVENTS_WITH_PAPER_NAME/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -556,7 +556,7 @@ Map {
 
 #include <react/renderer/components/EXCLUDE_ANDROID/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -586,7 +586,7 @@ Map {
 
 #include <react/renderer/components/EXCLUDE_ANDROID_IOS/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -616,7 +616,7 @@ Map {
 
 #include <react/renderer/components/EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -647,7 +647,7 @@ Map {
 
 #include <react/renderer/components/FLOAT_PROPS/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -677,7 +677,7 @@ Map {
 
 #include <react/renderer/components/IMAGE_PROP/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -707,7 +707,7 @@ Map {
 
 #include <react/renderer/components/INSETS_PROP/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -737,7 +737,7 @@ Map {
 
 #include <react/renderer/components/INT32_ENUM_PROP/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -767,7 +767,7 @@ Map {
 
 #include <react/renderer/components/INTEGER_PROPS/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -797,7 +797,7 @@ Map {
 
 #include <react/renderer/components/INTERFACE_ONLY/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -827,7 +827,7 @@ Map {
 
 #include <react/renderer/components/MIXED_PROP/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -857,7 +857,7 @@ Map {
 
 #include <react/renderer/components/MULTI_NATIVE_PROP/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -887,7 +887,7 @@ Map {
 
 #include <react/renderer/components/NO_PROPS_NO_EVENTS/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -917,7 +917,7 @@ Map {
 
 #include <react/renderer/components/OBJECT_PROPS/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -947,7 +947,7 @@ Map {
 
 #include <react/renderer/components/OBJECT_PROPS_WITH_OPTIONAL_GEN/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -977,7 +977,7 @@ Map {
 
 #include <react/renderer/components/OBJECT_PROPS_WITH_OPTIONAL_OBJECT_GEN/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1007,7 +1007,7 @@ Map {
 
 #include <react/renderer/components/POINT_PROP/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1037,7 +1037,7 @@ Map {
 
 #include <react/renderer/components/STRING_ENUM_PROP/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1067,7 +1067,7 @@ Map {
 
 #include <react/renderer/components/STRING_PROP/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1097,7 +1097,7 @@ Map {
 
 #include <react/renderer/components/TWO_COMPONENTS_DIFFERENT_FILES/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1128,7 +1128,7 @@ Map {
 
 #include <react/renderer/components/TWO_COMPONENTS_SAME_FILE/ShadowNodes.h>
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap
index a88c7f9758e6..c90a4639fa53 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap
@@ -13,9 +13,8 @@ Map {
  */
 
 #include <react/renderer/components/ALL_PROP/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -147,9 +146,8 @@ Map {
  */
 
 #include <react/renderer/components/ALL_PROP_WITH_OPTIONAL_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -295,9 +293,8 @@ Map {
  */
 
 #include <react/renderer/components/ALL_PROP_WITH_OPTIONAL_OBJECT_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -443,10 +440,9 @@ Map {
  */
 
 #include <react/renderer/components/ARRAY_PROPS/Props.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
 
 namespace facebook::react {
 
@@ -558,8 +554,7 @@ Map {
  */
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -611,8 +606,7 @@ Map {
  */
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT_WITH_OPTIONAL_GEN/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -668,8 +662,7 @@ Map {
  */
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT_WITH_OPTIONAL_OBJECT_GEN/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -725,10 +718,9 @@ Map {
  */
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_OPTIONAL_GEN/Props.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
 
 namespace facebook::react {
 
@@ -892,10 +884,9 @@ Map {
  */
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_OPTIONAL_OBJECT_GEN/Props.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
 
 namespace facebook::react {
 
@@ -1059,8 +1050,7 @@ Map {
  */
 
 #include <react/renderer/components/BOOLEAN_PROP/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1112,8 +1102,7 @@ Map {
  */
 
 #include <react/renderer/components/COLOR_PROP/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1165,8 +1154,7 @@ Map {
  */
 
 #include <react/renderer/components/COMMANDS/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1215,8 +1203,7 @@ Map {
  */
 
 #include <react/renderer/components/COMMANDS_AND_PROPS/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1268,9 +1255,8 @@ Map {
  */
 
 #include <react/renderer/components/DIMENSION_PROP/Props.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
 
 namespace facebook::react {
 
@@ -1322,8 +1308,7 @@ Map {
  */
 
 #include <react/renderer/components/DOUBLE_PROPS/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1400,8 +1385,7 @@ Map {
  */
 
 #include <react/renderer/components/EVENT_NESTED_OBJECT_PROPS/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1453,8 +1437,7 @@ Map {
  */
 
 #include <react/renderer/components/EVENT_PROPS/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1506,8 +1489,7 @@ Map {
  */
 
 #include <react/renderer/components/EVENTS_WITH_PAPER_NAME/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1556,8 +1538,7 @@ Map {
  */
 
 #include <react/renderer/components/EXCLUDE_ANDROID/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1606,8 +1587,7 @@ Map {
  */
 
 #include <react/renderer/components/EXCLUDE_ANDROID_IOS/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1656,8 +1636,7 @@ Map {
  */
 
 #include <react/renderer/components/EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1735,8 +1714,7 @@ Map {
  */
 
 #include <react/renderer/components/FLOAT_PROPS/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1813,9 +1791,8 @@ Map {
  */
 
 #include <react/renderer/components/IMAGE_PROP/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1867,8 +1844,7 @@ Map {
  */
 
 #include <react/renderer/components/INSETS_PROP/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1920,8 +1896,7 @@ Map {
  */
 
 #include <react/renderer/components/INT32_ENUM_PROP/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -1973,8 +1948,7 @@ Map {
  */
 
 #include <react/renderer/components/INTEGER_PROPS/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -2036,8 +2010,7 @@ Map {
  */
 
 #include <react/renderer/components/INTERFACE_ONLY/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -2089,9 +2062,8 @@ Map {
  */
 
 #include <react/renderer/components/MIXED_PROP/Props.h>
+#include <React/RendererCore.h>
 #include <folly/dynamic.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
 
 namespace facebook::react {
 
@@ -2143,9 +2115,8 @@ Map {
  */
 
 #include <react/renderer/components/MULTI_NATIVE_PROP/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -2212,8 +2183,7 @@ Map {
  */
 
 #include <react/renderer/components/NO_PROPS_NO_EVENTS/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -2262,9 +2232,8 @@ Map {
  */
 
 #include <react/renderer/components/OBJECT_PROPS/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -2316,9 +2285,8 @@ Map {
  */
 
 #include <react/renderer/components/OBJECT_PROPS_WITH_OPTIONAL_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -2374,9 +2342,8 @@ Map {
  */
 
 #include <react/renderer/components/OBJECT_PROPS_WITH_OPTIONAL_OBJECT_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -2432,8 +2399,7 @@ Map {
  */
 
 #include <react/renderer/components/POINT_PROP/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -2485,8 +2451,7 @@ Map {
  */
 
 #include <react/renderer/components/STRING_ENUM_PROP/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -2538,8 +2503,7 @@ Map {
  */
 
 #include <react/renderer/components/STRING_PROP/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -2596,8 +2560,7 @@ Map {
  */
 
 #include <react/renderer/components/TWO_COMPONENTS_DIFFERENT_FILES/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
@@ -2678,8 +2641,7 @@ Map {
  */
 
 #include <react/renderer/components/TWO_COMPONENTS_SAME_FILE/Props.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap
index dddfce67e68a..681b6f3fbf31 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap
@@ -13,14 +13,11 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/Image.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 
 namespace facebook::react {
@@ -390,14 +387,11 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/Image.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 
 namespace facebook::react {
@@ -767,14 +761,11 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/Image.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 
 namespace facebook::react {
@@ -1158,15 +1149,11 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
 #include <cinttypes>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 #include <yoga/Yoga.h>
 
@@ -1458,14 +1445,11 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/Image.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 
 namespace facebook::react {
@@ -1561,14 +1545,11 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/Image.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 
 namespace facebook::react {
@@ -1664,14 +1645,11 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/Image.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 
 namespace facebook::react {
@@ -1773,15 +1751,11 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
 #include <cinttypes>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 #include <yoga/Yoga.h>
 
@@ -2073,15 +2047,11 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
 #include <cinttypes>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 #include <yoga/Yoga.h>
 
@@ -2375,9 +2345,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -2417,10 +2386,9 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
 
 namespace facebook::react {
 
@@ -2460,9 +2428,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -2502,9 +2469,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -2544,10 +2510,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 #include <yoga/Yoga.h>
 
 namespace facebook::react {
@@ -2588,9 +2552,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -2635,9 +2598,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -2677,9 +2639,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -2719,9 +2680,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -2761,9 +2721,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -2803,9 +2762,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -2845,9 +2803,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -2905,9 +2862,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -2952,10 +2908,9 @@ Map {
  */
 #pragma once
 
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook::react {
 
@@ -2995,10 +2950,9 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/RectangleEdges.h>
 
 namespace facebook::react {
 
@@ -3038,9 +2992,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -3122,9 +3075,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -3166,9 +3118,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -3208,9 +3159,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -3250,12 +3200,10 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook::react {
 
@@ -3298,9 +3246,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -3340,14 +3287,11 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/Image.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 
 namespace facebook::react {
@@ -3777,14 +3721,11 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/Image.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 
 namespace facebook::react {
@@ -4214,14 +4155,11 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/Image.h>
+#include <React/ImageManager.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Point.h>
-#include <react/renderer/imagemanager/primitives.h>
 #include <vector>
 
 namespace facebook::react {
@@ -4659,10 +4597,9 @@ Map {
  */
 #pragma once
 
+#include <React/Graphics.h>
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Point.h>
 
 namespace facebook::react {
 
@@ -4702,9 +4639,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -4770,9 +4706,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -4813,9 +4748,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
@@ -4873,9 +4807,8 @@ Map {
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateStateH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateStateH-test.js.snap
index 478385b96cae..f25dddf5bea8 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateStateH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateStateH-test.js.snap
@@ -12,7 +12,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -37,7 +37,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -62,7 +62,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -87,7 +87,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -112,7 +112,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -137,7 +137,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -162,7 +162,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -187,7 +187,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -212,7 +212,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -237,7 +237,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -262,7 +262,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -287,7 +287,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -312,7 +312,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -337,7 +337,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -362,7 +362,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -387,7 +387,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -412,7 +412,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -437,7 +437,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -462,7 +462,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -487,7 +487,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -512,7 +512,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -539,7 +539,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -564,7 +564,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -589,7 +589,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -614,7 +614,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -639,7 +639,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -664,7 +664,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -689,7 +689,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -714,7 +714,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -739,7 +739,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -764,7 +764,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -789,7 +789,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -814,7 +814,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -839,7 +839,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -864,7 +864,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -889,7 +889,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -914,7 +914,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
@@ -941,7 +941,7 @@ Map {
  */
 #pragma once
 
-#include <react/renderer/core/StateData.h>
+#include <React/RendererCore.h>
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap
index 55dc41f9c75f..b51bea3c50ad 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap
@@ -12,12 +12,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/ALL_PROP/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
 
 using namespace facebook::react;
 
@@ -178,12 +175,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/ALL_PROP_WITH_OPTIONAL_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
 
 using namespace facebook::react;
 
@@ -344,12 +338,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/ALL_PROP_WITH_OPTIONAL_OBJECT_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
 
 using namespace facebook::react;
 
@@ -510,13 +501,10 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/ARRAY_PROPS/Props.h>
+#include <React/Image.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
 
 using namespace facebook::react;
 
@@ -547,11 +535,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -582,11 +568,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT_WITH_OPTIONAL_GEN/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -617,11 +601,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT_WITH_OPTIONAL_OBJECT_GEN/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -652,13 +634,10 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/ARRAY_PROPS_WITH_OPTIONAL_GEN/Props.h>
+#include <React/Image.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
 
 using namespace facebook::react;
 
@@ -689,13 +668,10 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/ARRAY_PROPS_WITH_OPTIONAL_OBJECT_GEN/Props.h>
+#include <React/Image.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
 
 using namespace facebook::react;
 
@@ -726,11 +702,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/BOOLEAN_PROP/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -774,11 +748,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/COLOR_PROP/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -822,11 +794,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/COMMANDS/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -857,11 +827,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/COMMANDS_AND_PROPS/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -905,12 +873,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/DIMENSION_PROP/Props.h>
 #include <React/View.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
 
 using namespace facebook::react;
 
@@ -941,11 +906,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/DOUBLE_PROPS/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -976,11 +939,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/EVENT_NESTED_OBJECT_PROPS/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -1024,11 +985,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/EVENT_PROPS/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -1072,11 +1031,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/EVENTS_WITH_PAPER_NAME/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -1107,11 +1064,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/EXCLUDE_ANDROID/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -1142,11 +1097,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/EXCLUDE_ANDROID_IOS/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -1177,11 +1130,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -1238,11 +1189,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/FLOAT_PROPS/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -1351,12 +1300,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/IMAGE_PROP/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
 
 using namespace facebook::react;
 
@@ -1400,11 +1346,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/INSETS_PROP/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -1435,11 +1379,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/INT32_ENUM_PROP/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -1470,11 +1412,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/INTEGER_PROPS/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -1505,11 +1445,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/INTERFACE_ONLY/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -1553,12 +1491,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/MIXED_PROP/Props.h>
 #include <folly/dynamic.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
 
 using namespace facebook::react;
 
@@ -1589,12 +1524,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/MULTI_NATIVE_PROP/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
 
 using namespace facebook::react;
 
@@ -1677,11 +1609,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/NO_PROPS_NO_EVENTS/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -1712,12 +1642,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/OBJECT_PROPS/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
 
 using namespace facebook::react;
 
@@ -1748,12 +1675,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/OBJECT_PROPS_WITH_OPTIONAL_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
 
 using namespace facebook::react;
 
@@ -1784,12 +1708,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/OBJECT_PROPS_WITH_OPTIONAL_OBJECT_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+#include <React/Image.h>
 
 using namespace facebook::react;
 
@@ -1820,11 +1741,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/POINT_PROP/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -1868,11 +1787,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/STRING_ENUM_PROP/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -1942,11 +1859,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/STRING_PROP/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -2003,11 +1918,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/TWO_COMPONENTS_DIFFERENT_FILES/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
@@ -2077,11 +1990,9 @@ Map {
  * */
 
 #include <gtest/gtest.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <React/RendererCore.h>
 #include <react/renderer/components/TWO_COMPONENTS_SAME_FILE/Props.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawPropsParser.h>
-#include <react/renderer/core/propsConversions.h>
+
 
 using namespace facebook::react;
 
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
index dc5de4d4b2ee..21575fd4653b 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
@@ -212,8 +212,8 @@ const FileTemplate = ({
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
index 92a4c0dac764..90213293b3fb 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
@@ -45,8 +45,7 @@ const HeaderFileTemplate = ({
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap
index 0dfa992b6b84..86f3a5898775 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap
@@ -13,8 +13,8 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
@@ -51,8 +51,8 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
@@ -112,8 +112,8 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
@@ -155,8 +155,8 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
@@ -252,8 +252,8 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
@@ -971,8 +971,8 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
@@ -1009,8 +1009,8 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
@@ -1174,8 +1174,8 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
@@ -1296,8 +1296,8 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
@@ -1833,8 +1833,8 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
@@ -2049,8 +2049,8 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
@@ -2100,8 +2100,8 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
@@ -2171,8 +2171,8 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/TurboModule.h>
 #include <React/Bridging.h>
+#include <React/NativeModuleCore.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
index fed0ac2033fd..e849f8e751a0 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
@@ -14,8 +14,7 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {
@@ -80,8 +79,7 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {
@@ -146,8 +144,7 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {
@@ -205,8 +202,7 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {
@@ -271,8 +267,7 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {
@@ -330,8 +325,7 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {
@@ -396,8 +390,7 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {
@@ -462,8 +455,7 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {
@@ -528,8 +520,7 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {
@@ -602,8 +593,7 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {
@@ -668,8 +658,7 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {
@@ -734,8 +723,7 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {
@@ -808,8 +796,7 @@ Map {
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {