diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateAutolinkingNewArchitecturesFileTask.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateAutolinkingNewArchitecturesFileTask.kt
index 3301946072f..068737880a9 100644
--- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateAutolinkingNewArchitecturesFileTask.kt
+++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateAutolinkingNewArchitecturesFileTask.kt
@@ -266,11 +266,10 @@ abstract class GenerateAutolinkingNewArchitecturesFileTask : DefaultTask() {
 
         #pragma once
 
-        #include <ReactCommon/CallInvoker.h>
-        #include <ReactCommon/JavaTurboModule.h>
-        #include <ReactCommon/TurboModule.h>
+        #include <React/CallInvoker.h>
+        #include <React/ComponentRegistry.h>
+        #include <React/NativeModuleCore.h>
         #include <jsi/jsi.h>
-        #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
         namespace facebook {
         namespace react {
diff --git a/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp b/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp
index 3e0915c8304..f79eb1a4551 100644
--- a/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp
+++ b/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp
@@ -30,9 +30,9 @@
 #include <DefaultComponentsRegistry.h>
 #include <DefaultTurboModuleManagerDelegate.h>
 #include <FBReactNativeSpec.h>
+#include <React/ComponentRegistry.h>
 #include <autolinking.h>
 #include <fbjni/fbjni.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 #ifdef REACT_NATIVE_APP_CODEGEN_HEADER
 #include REACT_NATIVE_APP_CODEGEN_HEADER
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h
index 826449cee4f..5a7fbc5ff00 100644
--- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h
+++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h
@@ -13,7 +13,6 @@
 #include <React/RendererCore.h>
 #include <fbjni/fbjni.h>
 #include <react/fabric/JFabricUIManager.h>
-#include <react/renderer/uimanager/primitives.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JRuntimeExecutor.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JRuntimeExecutor.h
index 9caffec9c43..9c0fe9dbda6 100644
--- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JRuntimeExecutor.h
+++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JRuntimeExecutor.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <ReactCommon/RuntimeExecutor.h>
+#include <React/RuntimeExecutor.h>
 #include <fbjni/fbjni.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h
index c8f87d39ce9..dc5dd898950 100644
--- a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h
+++ b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h
@@ -9,9 +9,8 @@
 #include <string>
 #include <vector>
 
+#include <React/NativeModuleCore.h>
 #include <ReactCommon/CxxReactPackage.h>
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
 #include <ReactCommon/TurboModuleManagerDelegate.h>
 #include <fbjni/fbjni.h>
 
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/BindingsInstallerHolder.h b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/BindingsInstallerHolder.h
index 1ca58bba439..6501f4fc709 100644
--- a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/BindingsInstallerHolder.h
+++ b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/BindingsInstallerHolder.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <ReactCommon/CallInvoker.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/CallInvoker.h>
+#include <React/NativeModuleCore.h>
 #include <fbjni/fbjni.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CallInvokerHolder.h b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CallInvokerHolder.h
index ca1fd0ff3e3..f0a6eda8d8f 100644
--- a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CallInvokerHolder.h
+++ b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CallInvokerHolder.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <ReactCommon/CallInvoker.h>
+#include <React/CallInvoker.h>
 #include <fbjni/fbjni.h>
 #include <memory>
 
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/NativeMethodCallInvokerHolder.h b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/NativeMethodCallInvokerHolder.h
index b6f9b1aed4c..d54b493e45f 100644
--- a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/NativeMethodCallInvokerHolder.h
+++ b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/NativeMethodCallInvokerHolder.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <ReactCommon/CallInvoker.h>
+#include <React/CallInvoker.h>
 #include <fbjni/fbjni.h>
 #include <memory>
 
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h
index 0cc6a096436..375bbfd4b91 100644
--- a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h
+++ b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h
@@ -12,11 +12,10 @@
 #include <memory>
 #include <unordered_map>
 
+#include <React/NativeModuleCore.h>
+#include <React/RuntimeExecutor.h>
 #include <ReactCommon/CallInvokerHolder.h>
-#include <ReactCommon/JavaTurboModule.h>
 #include <ReactCommon/NativeMethodCallInvokerHolder.h>
-#include <ReactCommon/RuntimeExecutor.h>
-#include <ReactCommon/TurboModule.h>
 #include <ReactCommon/TurboModuleManagerDelegate.h>
 #include <react/jni/JRuntimeExecutor.h>
 
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManagerDelegate.h b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManagerDelegate.h
index ce7ac58fa36..6dfd3c99603 100644
--- a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManagerDelegate.h
+++ b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManagerDelegate.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <ReactCommon/CallInvoker.h>
-#include <ReactCommon/JavaTurboModule.h>
+#include <React/CallInvoker.h>
+#include <React/NativeModuleCore.h>
 #include <fbjni/fbjni.h>
 #include <memory>
 #include <string>
diff --git a/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp
index 72d62fb0959..c54faffa30e 100644
--- a/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp
+++ b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp
@@ -9,9 +9,9 @@
 #include <DefaultTurboModuleManagerDelegate.h>
 #include <FBReactNativeSpec.h>
 #include <NativeCxxModuleExample.h>
+#include <React/ComponentRegistry.h>
 #include <ReactCommon/SampleTurboModuleJSIBindings.h>
 #include <fbjni/fbjni.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 #ifdef REACT_NATIVE_APP_CODEGEN_HEADER
 #include REACT_NATIVE_APP_CODEGEN_HEADER