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..a079836a7040 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,8 +13,8 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <React/Image.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -590,7 +590,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -814,7 +814,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -933,7 +933,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
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..4f7518f2a30a 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,6 +13,7 @@ Object {
  */
 #pragma once
 
+#include <React/ImageManager.h>
 #include <React/View.h>
 #include <cinttypes>
 #include <react/renderer/core/PropsParserContext.h>
@@ -22,7 +23,6 @@ Object {
 #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>
 
@@ -647,10 +647,10 @@ Object {
  */
 #pragma once
 
+#include <React/ImageManager.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 {
 
@@ -818,12 +818,12 @@ Object {
  */
 #pragma once
 
+#include <React/ImageManager.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 {
 
@@ -908,14 +908,14 @@ Object {
  */
 #pragma once
 
+#include <React/Image.h>
+#include <React/ImageManager.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 {
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..a5420f57ae3a 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,8 +13,8 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <React/Image.h>
 #include <React/View.h>
-#include <react/renderer/components/image/conversions.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -590,7 +590,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -814,7 +814,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -933,7 +933,7 @@ Object {
  */
 
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
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..464dedf81604 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,6 +13,7 @@ Object {
  */
 #pragma once
 
+#include <React/ImageManager.h>
 #include <React/View.h>
 #include <cinttypes>
 #include <react/renderer/core/PropsParserContext.h>
@@ -22,7 +23,6 @@ Object {
 #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>
 
@@ -647,10 +647,10 @@ Object {
  */
 #pragma once
 
+#include <React/ImageManager.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 {
 
@@ -818,12 +818,12 @@ Object {
  */
 #pragma once
 
+#include <React/ImageManager.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 {
 
@@ -908,14 +908,14 @@ Object {
  */
 #pragma once
 
+#include <React/Image.h>
+#include <React/ImageManager.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 {
diff --git a/packages/react-native-codegen/src/generators/ReservedPrimitiveTypes.js b/packages/react-native-codegen/src/generators/ReservedPrimitiveTypes.js
index a99d6b0806d3..731bca95d971 100644
--- a/packages/react-native-codegen/src/generators/ReservedPrimitiveTypes.js
+++ b/packages/react-native-codegen/src/generators/ReservedPrimitiveTypes.js
@@ -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: {
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..750383cc6ec7 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,7 +13,7 @@ Map {
  */
 
 #include <react/renderer/components/ALL_PROP/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -147,7 +147,7 @@ Map {
  */
 
 #include <react/renderer/components/ALL_PROP_WITH_OPTIONAL_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -295,7 +295,7 @@ Map {
  */
 
 #include <react/renderer/components/ALL_PROP_WITH_OPTIONAL_OBJECT_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -443,8 +443,8 @@ Map {
  */
 
 #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/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -725,8 +725,8 @@ Map {
  */
 
 #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/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -892,8 +892,8 @@ Map {
  */
 
 #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/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -1813,7 +1813,7 @@ Map {
  */
 
 #include <react/renderer/components/IMAGE_PROP/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -2143,7 +2143,7 @@ Map {
  */
 
 #include <react/renderer/components/MULTI_NATIVE_PROP/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -2262,7 +2262,7 @@ Map {
  */
 
 #include <react/renderer/components/OBJECT_PROPS/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -2316,7 +2316,7 @@ Map {
  */
 
 #include <react/renderer/components/OBJECT_PROPS_WITH_OPTIONAL_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
@@ -2374,7 +2374,7 @@ Map {
  */
 
 #include <react/renderer/components/OBJECT_PROPS_WITH_OPTIONAL_OBJECT_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
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..6e69fc48ee3f 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,14 @@ Map {
  */
 #pragma once
 
+#include <React/Image.h>
+#include <React/ImageManager.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 +390,14 @@ Map {
  */
 #pragma once
 
+#include <React/Image.h>
+#include <React/ImageManager.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 +767,14 @@ Map {
  */
 #pragma once
 
+#include <React/Image.h>
+#include <React/ImageManager.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,6 +1158,7 @@ Map {
  */
 #pragma once
 
+#include <React/ImageManager.h>
 #include <React/View.h>
 #include <cinttypes>
 #include <react/renderer/core/PropsParserContext.h>
@@ -1166,7 +1167,6 @@ Map {
 #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 +1458,14 @@ Map {
  */
 #pragma once
 
+#include <React/Image.h>
+#include <React/ImageManager.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 +1561,14 @@ Map {
  */
 #pragma once
 
+#include <React/Image.h>
+#include <React/ImageManager.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 +1664,14 @@ Map {
  */
 #pragma once
 
+#include <React/Image.h>
+#include <React/ImageManager.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,6 +1773,7 @@ Map {
  */
 #pragma once
 
+#include <React/ImageManager.h>
 #include <React/View.h>
 #include <cinttypes>
 #include <react/renderer/core/PropsParserContext.h>
@@ -1781,7 +1782,6 @@ Map {
 #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,6 +2073,7 @@ Map {
  */
 #pragma once
 
+#include <React/ImageManager.h>
 #include <React/View.h>
 #include <cinttypes>
 #include <react/renderer/core/PropsParserContext.h>
@@ -2081,7 +2082,6 @@ Map {
 #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>
 
@@ -2952,10 +2952,10 @@ Map {
  */
 #pragma once
 
+#include <React/ImageManager.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 {
 
@@ -3250,12 +3250,12 @@ Map {
  */
 #pragma once
 
+#include <React/ImageManager.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 {
 
@@ -3340,14 +3340,14 @@ Map {
  */
 #pragma once
 
+#include <React/Image.h>
+#include <React/ImageManager.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 +3777,14 @@ Map {
  */
 #pragma once
 
+#include <React/Image.h>
+#include <React/ImageManager.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 +4214,14 @@ Map {
  */
 #pragma once
 
+#include <React/Image.h>
+#include <React/ImageManager.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 {
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..a78fa7990fbe 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
@@ -14,7 +14,7 @@ Map {
 #include <gtest/gtest.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/ALL_PROP/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
 #include <react/renderer/core/propsConversions.h>
@@ -180,7 +180,7 @@ Map {
 #include <gtest/gtest.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/ALL_PROP_WITH_OPTIONAL_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
 #include <react/renderer/core/propsConversions.h>
@@ -346,7 +346,7 @@ Map {
 #include <gtest/gtest.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/ALL_PROP_WITH_OPTIONAL_OBJECT_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
 #include <react/renderer/core/propsConversions.h>
@@ -512,8 +512,8 @@ Map {
 #include <gtest/gtest.h>
 #include <react/renderer/core/PropsParserContext.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>
@@ -654,8 +654,8 @@ Map {
 #include <gtest/gtest.h>
 #include <react/renderer/core/PropsParserContext.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>
@@ -691,8 +691,8 @@ Map {
 #include <gtest/gtest.h>
 #include <react/renderer/core/PropsParserContext.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>
@@ -1353,7 +1353,7 @@ Map {
 #include <gtest/gtest.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/IMAGE_PROP/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
 #include <react/renderer/core/propsConversions.h>
@@ -1591,7 +1591,7 @@ Map {
 #include <gtest/gtest.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/MULTI_NATIVE_PROP/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
 #include <react/renderer/core/propsConversions.h>
@@ -1714,7 +1714,7 @@ Map {
 #include <gtest/gtest.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/OBJECT_PROPS/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
 #include <react/renderer/core/propsConversions.h>
@@ -1750,7 +1750,7 @@ Map {
 #include <gtest/gtest.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/OBJECT_PROPS_WITH_OPTIONAL_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
 #include <react/renderer/core/propsConversions.h>
@@ -1786,7 +1786,7 @@ Map {
 #include <gtest/gtest.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/OBJECT_PROPS_WITH_OPTIONAL_OBJECT_GEN/Props.h>
-#include <react/renderer/components/image/conversions.h>
+#include <React/Image.h>
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/RawPropsParser.h>
 #include <react/renderer/core/propsConversions.h>
diff --git a/packages/react-native/React/Base/RCTUtils.mm b/packages/react-native/React/Base/RCTUtils.mm
index 04f4e4ed3911..21ddfb6ff1f2 100644
--- a/packages/react-native/React/Base/RCTUtils.mm
+++ b/packages/react-native/React/Base/RCTUtils.mm
@@ -13,6 +13,7 @@
 #import <objc/runtime.h>
 #import <zlib.h>
 #import <atomic>
+#import <cmath>
 #import <vector>
 
 #import <UIKit/UIKit.h>
@@ -437,20 +438,20 @@ CGSize RCTSwitchSize(void)
 CGFloat RCTRoundPixelValue(CGFloat value)
 {
   CGFloat scale = RCTScreenScale();
-  return round(value * scale) / scale;
+  return std::round(value * scale) / scale;
 }
 
 CGFloat RCTCeilPixelValue(CGFloat value)
 {
   CGFloat scale = RCTScreenScale();
-  return ceil(value * scale) / scale;
+  return std::ceil(value * scale) / scale;
 }
 
 CGSize RCTSizeInPixels(CGSize pointSize, CGFloat scale)
 {
   return (CGSize){
-      ceil(pointSize.width * scale),
-      ceil(pointSize.height * scale),
+      std::ceil(pointSize.width * scale),
+      std::ceil(pointSize.height * scale),
   };
 }
 
diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec
index 8b84f704eef5..81971b33ae6b 100644
--- a/packages/react-native/ReactCommon/React-Fabric.podspec
+++ b/packages/react-native/ReactCommon/React-Fabric.podspec
@@ -77,6 +77,9 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "attributedstring" do |ss|
+    ss.dependency             "React-Fabric/coreUmbrella"
+    ss.dependency             "React-Fabric/components/viewUmbrella"
+    ss.dependency             "React-renderercss"
     ss.source_files         = podspec_sources("react/renderer/attributedstring/**/*.{m,mm,cpp,h}", "react/renderer/attributedstring/**/*.{h}")
     ss.exclude_files        = "react/renderer/attributedstring/tests"
     ss.header_dir           = "react/renderer/attributedstring"
@@ -209,6 +212,7 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "mounting" do |ss|
+    ss.dependency             "React-Fabric/coreUmbrella"
     ss.dependency             "React-jsinspectortracing"
     ss.source_files         = podspec_sources("react/renderer/mounting/**/*.{m,mm,cpp,h}", "react/renderer/mounting/**/*.h")
     ss.exclude_files        = "react/renderer/mounting/tests"
diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedString.h b/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedString.h
index f1cdbe4181cb..4913f3583704 100644
--- a/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedString.h
+++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedString.h
@@ -9,11 +9,10 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
-#include <react/renderer/core/Sealable.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
 #include <react/renderer/mounting/ShadowView.h>
-#include <react/utils/hash_combine.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h b/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h
index 4c9471bde5cf..077bf846c34d 100644
--- a/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h
+++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h
@@ -11,6 +11,7 @@
 
 #include <memory>
 
+#include <React/Debug.h>
 #include <react/renderer/attributedstring/AttributedString.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h b/packages/react-native/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h
index 7cd8252d7c8f..f9385bebe811 100644
--- a/packages/react-native/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h
+++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h
@@ -11,10 +11,10 @@
 
 #include <limits>
 
+#include <React/Graphics.h>
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 #include <react/renderer/attributedstring/primitives.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Float.h>
-#include <react/utils/hash_combine.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.h b/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.h
index bcf902f9093a..9f9fdb02b824 100644
--- a/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.h
+++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.h
@@ -14,16 +14,12 @@
 #include <optional>
 #include <vector>
 
+#include <React/Graphics.h>
+#include <React/RendererCore.h>
+#include <React/Utils.h>
+#include <React/View.h>
 #include <folly/dynamic.h>
 #include <react/renderer/attributedstring/primitives.h>
-#include <react/renderer/components/view/AccessibilityPrimitives.h>
-#include <react/renderer/core/LayoutPrimitives.h>
-#include <react/renderer/core/ReactPrimitives.h>
-#include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Float.h>
-#include <react/renderer/graphics/Size.h>
-#include <react/utils/hash_combine.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h b/packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h
index e77b21d33653..bdc5258a8664 100644
--- a/packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h
+++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h
@@ -9,28 +9,20 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/debug/react_native_expect.h>
-#include <react/featureflags/ReactNativeFeatureFlags.h>
+#include <React/CSS.h>
+#include <React/Debug.h>
+#include <React/FeatureFlags.h>
+#include <React/RendererCore.h>
+#include <React/View.h>
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
-#include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/attributedstring/primitives.h>
-#include <react/renderer/components/view/accessibilityPropsConversions.h>
-#include <react/renderer/core/LayoutableShadowNode.h>
-#include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/ShadowNode.h>
-#include <react/renderer/core/conversions.h>
-#include <react/renderer/core/graphicsConversions.h>
-#include <react/renderer/core/propsConversions.h>
-#include <react/renderer/css/CSSFontVariant.h>
-#include <react/renderer/css/CSSValueParser.h>
 #include <unordered_map>
 
 #ifdef RN_SERIALIZABLE_STATE
+#include <React/MapBuffer.h>
 #include <folly/json.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
 #include <glog/logging.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h
index da793a387562..a4311bb1a418 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h
@@ -9,6 +9,8 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
+#include <memory>
+
 #include <react/renderer/components/image/ImageShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.h
index cbd7eb781869..03f5da7c7f27 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.h
@@ -9,6 +9,8 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
+#include <cstdint>
+
 #include <react/renderer/components/view/ViewEventEmitter.h>
 #include <react/renderer/imagemanager/primitives.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h
index 9da186430d42..e8a9be18cd6a 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h
@@ -9,6 +9,9 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
+#include <optional>
+#include <string>
+
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h
index 61bcaba18a47..97c2b752f494 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h
@@ -9,6 +9,8 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
+#include <memory>
+
 #include <react/renderer/components/image/ImageEventEmitter.h>
 #include <react/renderer/components/image/ImageProps.h>
 #include <react/renderer/components/image/ImageState.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h
index d49393e65d9e..249d6ad01bdb 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h
@@ -9,14 +9,15 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
+#include <memory>
+#include <utility>
+
 #include <react/renderer/imagemanager/ImageRequest.h>
 #include <react/renderer/imagemanager/ImageRequestParams.h>
 #include <react/renderer/imagemanager/primitives.h>
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/conversions.cpp b/packages/react-native/ReactCommon/react/renderer/components/image/conversions.cpp
new file mode 100644
index 000000000000..c346d066917e
--- /dev/null
+++ b/packages/react-native/ReactCommon/react/renderer/components/image/conversions.cpp
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <react/renderer/components/image/conversions.h>
+
+#include <glog/logging.h>
+#include <react/debug/react_native_expect.h>
+
+#include <string>
+#include <unordered_map>
+
+namespace facebook::react {
+
+void fromRawValue(
+    const PropsParserContext& /* context */,
+    const RawValue& value,
+    ImageSource& result) {
+  if (value.hasType<std::string>()) {
+    result = {
+        /* .type = */ ImageSource::Type::Remote,
+        /* .uri = */ (std::string)value,
+    };
+    return;
+  }
+
+  if (value.hasType<std::unordered_map<std::string, RawValue>>()) {
+    auto items = (std::unordered_map<std::string, RawValue>)value;
+    result = {};
+
+    result.type = ImageSource::Type::Remote;
+
+    if (items.find("__packager_asset") != items.end()) {
+      result.type = ImageSource::Type::Local;
+    }
+
+    if (items.find("width") != items.end() &&
+        items.find("height") != items.end() &&
+        // The following checks have to be removed after codegen is shipped.
+        // See T45151459.
+        items.at("width").hasType<Float>() &&
+        items.at("height").hasType<Float>()) {
+      result.size = {(Float)items.at("width"), (Float)items.at("height")};
+    }
+
+    if (items.find("scale") != items.end() &&
+        // The following checks have to be removed after codegen is shipped.
+        // See T45151459.
+        items.at("scale").hasType<Float>()) {
+      result.scale = (Float)items.at("scale");
+    } else {
+      result.scale = items.find("deprecated") != items.end() ? 0.0f : 1.0f;
+    }
+
+    if (items.find("url") != items.end() &&
+        // The following should be removed after codegen is shipped.
+        // See T45151459.
+        items.at("url").hasType<std::string>()) {
+      result.uri = (std::string)items.at("url");
+    }
+
+    if (items.find("uri") != items.end() &&
+        // The following should be removed after codegen is shipped.
+        // See T45151459.
+        items.at("uri").hasType<std::string>()) {
+      result.uri = (std::string)items.at("uri");
+    }
+
+    if (items.find("bundle") != items.end() &&
+        // The following should be removed after codegen is shipped.
+        // See T45151459.
+        items.at("bundle").hasType<std::string>()) {
+      result.bundle = (std::string)items.at("bundle");
+      result.type = ImageSource::Type::Local;
+    }
+
+    if (items.find("headers") != items.end() &&
+        items.at("headers")
+            .hasType<std::unordered_map<std::string, std::string>>()) {
+      auto headers =
+          (std::unordered_map<std::string, std::string>)items.at("headers");
+      for (const auto& header : headers) {
+        result.headers.push_back(header);
+      }
+    }
+
+    if (items.find("body") != items.end() &&
+        items.at("body").hasType<std::string>()) {
+      result.body = (std::string)items.at("body");
+    }
+
+    if (items.find("method") != items.end() &&
+        items.at("method").hasType<std::string>()) {
+      result.method = (std::string)items.at("method");
+    }
+
+    if (items.find("cache") != items.end() &&
+        items.at("cache").hasType<std::string>()) {
+      auto cache = (std::string)items.at("cache");
+      if (cache == "reload") {
+        result.cache = ImageSource::CacheStategy::Reload;
+      } else if (cache == "force-cache") {
+        result.cache = ImageSource::CacheStategy::ForceCache;
+      } else if (cache == "only-if-cached") {
+        result.cache = ImageSource::CacheStategy::OnlyIfCached;
+      }
+    }
+
+    return;
+  }
+
+  // The following should be removed after codegen is shipped.
+  // See T45151459.
+  result = {};
+  result.type = ImageSource::Type::Invalid;
+}
+
+std::string toString(const ImageSource& value) {
+  return "{uri: " + value.uri + "}";
+}
+
+void fromRawValue(
+    const PropsParserContext& /* context */,
+    const RawValue& value,
+    ImageResizeMode& result) {
+  react_native_expect(value.hasType<std::string>());
+  if (!value.hasType<std::string>()) {
+    LOG(ERROR) << "Unsupported ImageResizeMode type";
+    // "cover" is default in non-Fabric web and iOS
+    result = ImageResizeMode::Cover;
+    return;
+  }
+
+  auto stringValue = (std::string)value;
+  if (stringValue == "cover") {
+    result = ImageResizeMode::Cover;
+  } else if (stringValue == "contain") {
+    result = ImageResizeMode::Contain;
+  } else if (stringValue == "stretch") {
+    result = ImageResizeMode::Stretch;
+  } else if (stringValue == "center") {
+    result = ImageResizeMode::Center;
+  } else if (stringValue == "repeat") {
+    result = ImageResizeMode::Repeat;
+  } else if (stringValue == "none") {
+    result = ImageResizeMode::None;
+  } else {
+    LOG(ERROR) << "Unsupported ImageResizeMode value: " << stringValue;
+    react_native_expect(false);
+    // "cover" is default in non-Fabric web and iOS
+    result = ImageResizeMode::Cover;
+  }
+}
+
+std::string toString(const ImageResizeMode& value) {
+  switch (value) {
+    case ImageResizeMode::Cover:
+      return "cover";
+    case ImageResizeMode::Contain:
+      return "contain";
+    case ImageResizeMode::Stretch:
+      return "stretch";
+    case ImageResizeMode::Center:
+      return "center";
+    case ImageResizeMode::Repeat:
+      return "repeat";
+    case ImageResizeMode::None:
+      return "none";
+    default:
+      LOG(ERROR) << "Unsupported ImageResizeMode value: " << (int)value;
+      react_native_expect(false);
+      // "cover" is default in non-Fabric web and iOS
+      return "cover";
+  }
+}
+
+} // namespace facebook::react
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/image/conversions.h
index 5d38e469e3f2..92a50739988e 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/image/conversions.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/image/conversions.h
@@ -9,167 +9,20 @@
 
 #include <react/cxxstableapi/UmbrellaGuard.h>
 
-#include <unordered_map>
+#include <string>
 
-#include <glog/logging.h>
-#include <react/debug/react_native_expect.h>
 #include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/core/graphicsConversions.h>
+#include <react/renderer/core/RawValue.h>
 #include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook::react {
 
-inline void fromRawValue(const PropsParserContext & /* context */, const RawValue &value, ImageSource &result)
-{
-  if (value.hasType<std::string>()) {
-    result = {
-        /* .type = */ ImageSource::Type::Remote,
-        /* .uri = */ (std::string)value,
-    };
-    return;
-  }
+void fromRawValue(const PropsParserContext & /*context*/, const RawValue &value, ImageSource &result);
 
-  if (value.hasType<std::unordered_map<std::string, RawValue>>()) {
-    auto items = (std::unordered_map<std::string, RawValue>)value;
-    result = {};
+std::string toString(const ImageSource &value);
 
-    result.type = ImageSource::Type::Remote;
+void fromRawValue(const PropsParserContext & /*context*/, const RawValue &value, ImageResizeMode &result);
 
-    if (items.find("__packager_asset") != items.end()) {
-      result.type = ImageSource::Type::Local;
-    }
-
-    if (items.find("width") != items.end() && items.find("height") != items.end() &&
-        // The following checks have to be removed after codegen is shipped.
-        // See T45151459.
-        items.at("width").hasType<Float>() && items.at("height").hasType<Float>()) {
-      result.size = {(Float)items.at("width"), (Float)items.at("height")};
-    }
-
-    if (items.find("scale") != items.end() &&
-        // The following checks have to be removed after codegen is shipped.
-        // See T45151459.
-        items.at("scale").hasType<Float>()) {
-      result.scale = (Float)items.at("scale");
-    } else {
-      result.scale = items.find("deprecated") != items.end() ? 0.0f : 1.0f;
-    }
-
-    if (items.find("url") != items.end() &&
-        // The following should be removed after codegen is shipped.
-        // See T45151459.
-        items.at("url").hasType<std::string>()) {
-      result.uri = (std::string)items.at("url");
-    }
-
-    if (items.find("uri") != items.end() &&
-        // The following should be removed after codegen is shipped.
-        // See T45151459.
-        items.at("uri").hasType<std::string>()) {
-      result.uri = (std::string)items.at("uri");
-    }
-
-    if (items.find("bundle") != items.end() &&
-        // The following should be removed after codegen is shipped.
-        // See T45151459.
-        items.at("bundle").hasType<std::string>()) {
-      result.bundle = (std::string)items.at("bundle");
-      result.type = ImageSource::Type::Local;
-    }
-
-    if (items.find("headers") != items.end() &&
-        items.at("headers").hasType<std::unordered_map<std::string, std::string>>()) {
-      auto headers = (std::unordered_map<std::string, std::string>)items.at("headers");
-      for (const auto &header : headers) {
-        result.headers.push_back(header);
-      }
-    }
-
-    if (items.find("body") != items.end() && items.at("body").hasType<std::string>()) {
-      result.body = (std::string)items.at("body");
-    }
-
-    if (items.find("method") != items.end() && items.at("method").hasType<std::string>()) {
-      result.method = (std::string)items.at("method");
-    }
-
-    if (items.find("cache") != items.end() && items.at("cache").hasType<std::string>()) {
-      auto cache = (std::string)items.at("cache");
-      if (cache == "reload") {
-        result.cache = ImageSource::CacheStategy::Reload;
-      } else if (cache == "force-cache") {
-        result.cache = ImageSource::CacheStategy::ForceCache;
-      } else if (cache == "only-if-cached") {
-        result.cache = ImageSource::CacheStategy::OnlyIfCached;
-      }
-    }
-
-    return;
-  }
-
-  // The following should be removed after codegen is shipped.
-  // See T45151459.
-  result = {};
-  result.type = ImageSource::Type::Invalid;
-}
-
-inline std::string toString(const ImageSource &value)
-{
-  return "{uri: " + value.uri + "}";
-}
-
-inline void fromRawValue(const PropsParserContext & /* context */, const RawValue &value, ImageResizeMode &result)
-{
-  react_native_expect(value.hasType<std::string>());
-  if (!value.hasType<std::string>()) {
-    LOG(ERROR) << "Unsupported ImageResizeMode type";
-    // "cover" is default in non-Fabric web and iOS
-    result = ImageResizeMode::Cover;
-    return;
-  }
-
-  auto stringValue = (std::string)value;
-  if (stringValue == "cover") {
-    result = ImageResizeMode::Cover;
-  } else if (stringValue == "contain") {
-    result = ImageResizeMode::Contain;
-  } else if (stringValue == "stretch") {
-    result = ImageResizeMode::Stretch;
-  } else if (stringValue == "center") {
-    result = ImageResizeMode::Center;
-  } else if (stringValue == "repeat") {
-    result = ImageResizeMode::Repeat;
-  } else if (stringValue == "none") {
-    result = ImageResizeMode::None;
-  } else {
-    LOG(ERROR) << "Unsupported ImageResizeMode value: " << stringValue;
-    react_native_expect(false);
-    // "cover" is default in non-Fabric web and iOS
-    result = ImageResizeMode::Cover;
-  }
-}
-
-inline std::string toString(const ImageResizeMode &value)
-{
-  switch (value) {
-    case ImageResizeMode::Cover:
-      return "cover";
-    case ImageResizeMode::Contain:
-      return "contain";
-    case ImageResizeMode::Stretch:
-      return "stretch";
-    case ImageResizeMode::Center:
-      return "center";
-    case ImageResizeMode::Repeat:
-      return "repeat";
-    case ImageResizeMode::None:
-      return "none";
-    default:
-      LOG(ERROR) << "Unsupported ImageResizeMode value: " << (int)value;
-      react_native_expect(false);
-      // "cover" is default in non-Fabric web and iOS
-      return "cover";
-  }
-}
+std::string toString(const ImageResizeMode &value);
 
 } // namespace facebook::react
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.mm b/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.mm
index e47deaa95cf6..1fc1a37068bf 100644
--- a/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.mm
+++ b/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.mm
@@ -12,6 +12,7 @@
 #import <objc/runtime.h>
 #import <react/renderer/graphics/RCTPlatformColorUtils.h>
 #import <react/utils/ManagedObjectWrapper.h>
+#import <cmath>
 #import <string>
 
 using namespace facebook::react;
@@ -86,9 +87,10 @@ bool UIColorIsP3ColorSpace(const std::shared_ptr<void> &uiColor)
 int32_t ColorFromColorComponents(const facebook::react::ColorComponents &components)
 {
   float ratio = 255;
-  auto color = ((int32_t)round((float)components.alpha * ratio) & 0xff) << 24 |
-      ((int)round((float)components.red * ratio) & 0xff) << 16 |
-      ((int)round((float)components.green * ratio) & 0xff) << 8 | ((int)round((float)components.blue * ratio) & 0xff);
+  auto color = ((int32_t)std::round((float)components.alpha * ratio) & 0xff) << 24 |
+      ((int)std::round((float)components.red * ratio) & 0xff) << 16 |
+      ((int)std::round((float)components.green * ratio) & 0xff) << 8 |
+      ((int)std::round((float)components.blue * ratio) & 0xff);
   return color;
 }
 
diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.cpp b/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.cpp
new file mode 100644
index 000000000000..bef05830294a
--- /dev/null
+++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <react/renderer/imagemanager/primitives.h>
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+#include <react/renderer/debug/debugStringConvertibleUtils.h>
+#endif
+
+namespace facebook::react {
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+SharedDebugStringConvertibleList ImageSource::getDebugProps(
+    const std::string& prefix) const {
+  ImageSource imageSource{};
+
+  SharedDebugStringConvertibleList headersList;
+  for (const auto& header : headers) {
+    headersList.push_back(debugStringConvertibleItem(
+        prefix + "-header-" + header.first, header.second));
+  }
+
+  return headersList +
+      SharedDebugStringConvertibleList{
+          debugStringConvertibleItem(
+              prefix + "-type", toString(type), toString(imageSource.type)),
+          debugStringConvertibleItem(prefix + "-uri", uri, imageSource.uri),
+          debugStringConvertibleItem(
+              prefix + "-bundle", bundle, imageSource.bundle),
+          debugStringConvertibleItem(
+              prefix + "-scale", scale, imageSource.scale),
+          debugStringConvertibleItem(
+              prefix + "-size",
+              react::toString(size),
+              react::toString(imageSource.size)),
+          debugStringConvertibleItem(prefix + "-body", body, imageSource.body),
+          debugStringConvertibleItem(
+              prefix + "-method", method, imageSource.method),
+          debugStringConvertibleItem(
+              prefix + "-cache", toString(cache), toString(imageSource.cache)),
+      };
+}
+#endif
+
+} // namespace facebook::react
diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h
index b044ae1071ec..c21c5b08b2ac 100644
--- a/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h
+++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h
@@ -15,7 +15,8 @@
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/core/propsConversions.h>
-#include <react/renderer/debug/debugStringConvertibleUtils.h>
+#include <react/renderer/debug/DebugStringConvertible.h>
+#include <react/renderer/debug/flags.h>
 #include <react/renderer/graphics/Float.h>
 #include <react/renderer/graphics/Size.h>
 
@@ -97,27 +98,7 @@ class ImageSource {
 #endif
 
 #if RN_DEBUG_STRING_CONVERTIBLE
-  SharedDebugStringConvertibleList getDebugProps(const std::string &prefix) const
-  {
-    ImageSource imageSource{};
-
-    SharedDebugStringConvertibleList headersList;
-    for (const auto &header : headers) {
-      headersList.push_back(debugStringConvertibleItem(prefix + "-header-" + header.first, header.second));
-    }
-
-    return headersList +
-        SharedDebugStringConvertibleList{
-            debugStringConvertibleItem(prefix + "-type", toString(type), toString(imageSource.type)),
-            debugStringConvertibleItem(prefix + "-uri", uri, imageSource.uri),
-            debugStringConvertibleItem(prefix + "-bundle", bundle, imageSource.bundle),
-            debugStringConvertibleItem(prefix + "-scale", scale, imageSource.scale),
-            debugStringConvertibleItem(prefix + "-size", react::toString(size), react::toString(imageSource.size)),
-            debugStringConvertibleItem(prefix + "-body", body, imageSource.body),
-            debugStringConvertibleItem(prefix + "-method", method, imageSource.method),
-            debugStringConvertibleItem(prefix + "-cache", toString(cache), toString(imageSource.cache)),
-        };
-  }
+  SharedDebugStringConvertibleList getDebugProps(const std::string &prefix) const;
 
   std::string toString(const Type &typeValue) const
   {
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.h b/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.h
index e0ecb4cfca52..8ba9f99c64d0 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.h
@@ -9,7 +9,7 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/ShadowNode.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.h b/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.h
index 561a74b8292b..c520508cb06b 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.h
@@ -13,7 +13,7 @@
 #include <condition_variable>
 #include <optional>
 
-#include <react/renderer/debug/flags.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/Differentiator.h>
 #include <react/renderer/mounting/MountingOverrideDelegate.h>
 #include <react/renderer/mounting/MountingTransaction.h>
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h
index 4eeb85abceea..457f9a56e3a2 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h
@@ -13,14 +13,12 @@
 #include <mutex>
 #include <shared_mutex>
 
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 #include <react/renderer/components/root/RootShadowNode.h>
-#include <react/renderer/core/LayoutConstraints.h>
-#include <react/renderer/core/ReactPrimitives.h>
-#include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/mounting/MountingCoordinator.h>
 #include <react/renderer/mounting/ShadowTreeDelegate.h>
 #include <react/renderer/mounting/ShadowTreeRevision.h>
-#include <react/utils/ContextContainer.h>
 #include "MountingOverrideDelegate.h"
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h
index bfe843ebf8f4..d65974423565 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h
@@ -12,7 +12,7 @@
 #include <shared_mutex>
 #include <unordered_map>
 
-#include <react/renderer/core/ReactPrimitives.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/ShadowTree.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.h
index e9a51fdf8363..e0dd7d4afc3a 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.h
@@ -9,13 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/EventEmitter.h>
-#include <react/renderer/core/LayoutMetrics.h>
-#include <react/renderer/core/Props.h>
-#include <react/renderer/core/ReactPrimitives.h>
-#include <react/renderer/core/ShadowNode.h>
-#include <react/renderer/debug/flags.h>
-#include <react/utils/hash_combine.h>
+#include <React/RendererCore.h>
+#include <React/Utils.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/internal/CullingContext.h b/packages/react-native/ReactCommon/react/renderer/mounting/internal/CullingContext.h
index 1057b7ab5384..30cc5f4792b1 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/internal/CullingContext.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/internal/CullingContext.h
@@ -9,8 +9,7 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/graphics/Rect.h>
-#include <react/renderer/graphics/Transform.h>
+#include <React/Graphics.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/internal/ShadowViewNodePair.h b/packages/react-native/ReactCommon/react/renderer/mounting/internal/ShadowViewNodePair.h
index 899deb527034..a5904bb32f8d 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/internal/ShadowViewNodePair.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/internal/ShadowViewNodePair.h
@@ -9,8 +9,8 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/ShadowNode.h>
-#include <react/renderer/graphics/Point.h>
+#include <React/Graphics.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/ShadowView.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubView.h b/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubView.h
index ffd166a0b0dc..c6507521e5ec 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubView.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubView.h
@@ -12,9 +12,7 @@
 #include <memory>
 #include <vector>
 
-#include <react/renderer/core/LayoutMetrics.h>
-#include <react/renderer/core/State.h>
-#include <react/renderer/debug/debugStringConvertibleUtils.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/ShadowView.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/stubs/stubs.h b/packages/react-native/ReactCommon/react/renderer/mounting/stubs/stubs.h
index cd5199c03b34..3948aa4eefcd 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/stubs/stubs.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/stubs/stubs.h
@@ -9,7 +9,7 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/ShadowNode.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/stubs/StubView.h>
 #include <react/renderer/mounting/stubs/StubViewTree.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/updateMountedFlag.h b/packages/react-native/ReactCommon/react/renderer/mounting/updateMountedFlag.h
index 0f8f8b968758..4ce08d2288a3 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/updateMountedFlag.h
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/updateMountedFlag.h
@@ -9,7 +9,7 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/ShadowNode.h>
+#include <React/RendererCore.h>
 #include <react/renderer/mounting/ShadowTree.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm
index af5b225e8e7e..3e5bfd528320 100644
--- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm
+++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm
@@ -8,6 +8,7 @@
 #import "RCTTextLayoutManager.h"
 
 #import <array>
+#import <cmath>
 
 #import "RCTAttributedTextUtils.h"
 
@@ -186,8 +187,8 @@ - (void)drawAttributedString:(AttributedString)attributedString
                     // remains visible at small sizes and proportionate at
                     // large ones. ~`fontSize / 12` plus a 1.5pt floor.
                     CGFloat thickness = MAX(fontSize / 12.0f, 1.5f);
-                    CGFloat wavyWavelength = 1.0f + 2.0f * round(2.0f * thickness + 0.5f);
-                    CGFloat wavyCpDistance = 0.5f + round(3.0f * thickness + 0.5f);
+                    CGFloat wavyWavelength = 1.0f + 2.0f * std::round(2.0f * thickness + 0.5f);
+                    CGFloat wavyCpDistance = 0.5f + std::round(3.0f * thickness + 0.5f);
 
                     NSRange targetGlyphRange = [layoutManager glyphRangeForCharacterRange:attrRange
                                                                      actualCharacterRange:nullptr];