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 46757e6c95c0..6d4e694d14d5 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
@@ -15,8 +15,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -45,8 +45,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -75,8 +75,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -105,8 +105,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -135,8 +135,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -165,8 +165,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -195,8 +195,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -225,8 +225,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -255,8 +255,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -285,8 +285,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -315,8 +315,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -345,8 +345,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -375,8 +375,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -405,8 +405,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -435,8 +435,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -465,8 +465,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -495,8 +495,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -525,8 +525,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.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 049c9f244add..94010f4fdbe3 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
@@ -15,8 +15,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -45,8 +45,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -75,8 +75,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -105,8 +105,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -135,8 +135,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -165,8 +165,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -195,8 +195,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -225,8 +225,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -255,8 +255,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -285,8 +285,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -315,8 +315,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -345,8 +345,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -375,8 +375,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -405,8 +405,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -435,8 +435,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -465,8 +465,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -495,8 +495,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -525,8 +525,8 @@ Object {
 #pragma once
 
 #include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.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 75dba99e559c..b5f508277e5b 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js
@@ -38,8 +38,8 @@ const FileTemplate = ({
 #pragma once
 
 ${IncludeTemplate({headerPrefix, file: 'ShadowNodes.h'})}
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.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 8657a4701bff..0248e91ba64e 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
@@ -15,8 +15,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/ALL_PROP/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -45,8 +45,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/ALL_PROP_WITH_OPTIONAL_GEN/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -75,8 +75,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/ALL_PROP_WITH_OPTIONAL_OBJECT_GEN/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -105,8 +105,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/ARRAY_PROPS/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -135,8 +135,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -165,8 +165,8 @@ Map {
 #pragma once
 
 #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/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -195,8 +195,8 @@ Map {
 #pragma once
 
 #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/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -225,8 +225,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_OPTIONAL_GEN/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -255,8 +255,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/ARRAY_PROPS_WITH_OPTIONAL_OBJECT_GEN/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -285,8 +285,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/BOOLEAN_PROP/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -315,8 +315,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/COLOR_PROP/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -345,8 +345,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/COMMANDS/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -375,8 +375,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/COMMANDS_AND_PROPS/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -405,8 +405,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/DIMENSION_PROP/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -435,8 +435,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/DOUBLE_PROPS/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -465,8 +465,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/EVENT_NESTED_OBJECT_PROPS/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -495,8 +495,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/EVENT_PROPS/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -525,8 +525,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/EVENTS_WITH_PAPER_NAME/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -555,8 +555,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/EXCLUDE_ANDROID/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -585,8 +585,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/EXCLUDE_ANDROID_IOS/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -615,8 +615,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -646,8 +646,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/FLOAT_PROPS/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -676,8 +676,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/IMAGE_PROP/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -706,8 +706,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/INSETS_PROP/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -736,8 +736,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/INT32_ENUM_PROP/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -766,8 +766,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/INTEGER_PROPS/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -796,8 +796,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/INTERFACE_ONLY/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -826,8 +826,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/MIXED_PROP/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -856,8 +856,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/MULTI_NATIVE_PROP/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -886,8 +886,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/NO_PROPS_NO_EVENTS/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -916,8 +916,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/OBJECT_PROPS/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -946,8 +946,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/OBJECT_PROPS_WITH_OPTIONAL_GEN/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -976,8 +976,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/OBJECT_PROPS_WITH_OPTIONAL_OBJECT_GEN/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -1006,8 +1006,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/POINT_PROP/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -1036,8 +1036,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/STRING_ENUM_PROP/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -1066,8 +1066,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/STRING_PROP/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -1096,8 +1096,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/TWO_COMPONENTS_DIFFERENT_FILES/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
@@ -1127,8 +1127,8 @@ Map {
 #pragma once
 
 #include <react/renderer/components/TWO_COMPONENTS_SAME_FILE/ShadowNodes.h>
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/ComponentDescriptors.h b/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/ComponentDescriptors.h
index 48fbdfabc578..b89a3e123540 100644
--- a/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/ComponentDescriptors.h
+++ b/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/ComponentDescriptors.h
@@ -11,8 +11,8 @@
 #pragma once
 
 #include "ShadowNodes.h"
+#include <React/ComponentRegistry.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 namespace facebook::react {
 
diff --git a/private/react-native-fantom/tester/codegen/CMakeLists.txt b/private/react-native-fantom/tester/codegen/CMakeLists.txt
index 368d33014609..5c5f88997dff 100644
--- a/private/react-native-fantom/tester/codegen/CMakeLists.txt
+++ b/private/react-native-fantom/tester/codegen/CMakeLists.txt
@@ -24,6 +24,7 @@ target_link_libraries(
   react_codegen_rncore
   jsi
   react_nativemodule_core
+  react_renderer_componentregistry
   rrc_view
 )