diff --git a/Libraries/ART/React-ART.podspec b/Libraries/ART/React-ART.podspec
index c7bd0d259b8376..32fd32bd1fb2f6 100644
--- a/Libraries/ART/React-ART.podspec
+++ b/Libraries/ART/React-ART.podspec
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "**/*.{h,m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "ART"
 
   s.dependency "React-Core", version
 end
diff --git a/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec b/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec
index 9cc25ab1e7501a..07dfc6d858b8b2 100644
--- a/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec
+++ b/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec
@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "*.{h,m}"
   s.preserve_paths          = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "RCTActionSheet"
 
   s.dependency "React-Core", version
 end
diff --git a/Libraries/Blob/RCTBlobManager.mm b/Libraries/Blob/RCTBlobManager.mm
index 9e8faeb7b149ca..cafddb1a3d3e15 100755
--- a/Libraries/Blob/RCTBlobManager.mm
+++ b/Libraries/Blob/RCTBlobManager.mm
@@ -10,11 +10,21 @@
 #import <mutex>
 
 #import <React/RCTConvert.h>
-#import <React/RCTNetworking.h>
 #import <React/RCTUtils.h>
-#import <React/RCTWebSocketModule.h>
 #import "RCTBlobCollector.h"
 
+#if __has_include(<React/RCTNetworking.h>)
+#import <React/RCTNetworking.h>
+#else
+#import <RCTNetwork/RCTNetworking.h>
+#endif
+
+#if __has_include(<React/RCTWebSocketModule.h>)
+#import <React/RCTWebSocketModule.h>
+#else
+#import <RCTWebSocket/RCTWebSocketModule.h>
+#endif
+
 static NSString *const kBlobURIScheme = @"blob";
 
 @interface RCTBlobManager () <RCTNetworkingRequestHandler, RCTNetworkingResponseHandler, RCTWebSocketContentHandler>
diff --git a/Libraries/Blob/React-RCTBlob.podspec b/Libraries/Blob/React-RCTBlob.podspec
index 55ab585abd88ea..6f7731d28ae418 100644
--- a/Libraries/Blob/React-RCTBlob.podspec
+++ b/Libraries/Blob/React-RCTBlob.podspec
@@ -28,9 +28,10 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "*.{h,m,mm}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "RCTBlob"
 
   s.dependency "React-Core", version
+  s.dependency "React-jsi", version
   s.dependency "React-RCTNetwork", version
   s.dependency "React-RCTWebSocket", version
 end
diff --git a/Libraries/Image/RCTGIFImageDecoder.h b/Libraries/Image/RCTGIFImageDecoder.h
index f9cc0eef4ebf94..56222eebdfd9a7 100644
--- a/Libraries/Image/RCTGIFImageDecoder.h
+++ b/Libraries/Image/RCTGIFImageDecoder.h
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTImageLoader.h>
+#import "RCTImageLoader.h"
 
 @interface RCTGIFImageDecoder : NSObject <RCTImageDataDecoder>
 
diff --git a/Libraries/Image/RCTImage.xcodeproj/project.pbxproj b/Libraries/Image/RCTImage.xcodeproj/project.pbxproj
index 30fbcdf83b894a..2e0bfbbbe1c9a2 100644
--- a/Libraries/Image/RCTImage.xcodeproj/project.pbxproj
+++ b/Libraries/Image/RCTImage.xcodeproj/project.pbxproj
@@ -13,6 +13,8 @@
 		139A38841C4D587C00862840 /* RCTResizeMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 139A38831C4D587C00862840 /* RCTResizeMode.m */; };
 		13EF7F7F1BC825B1003F47DD /* RCTLocalAssetImageLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 13EF7F7E1BC825B1003F47DD /* RCTLocalAssetImageLoader.m */; };
 		143879381AAD32A300F088A5 /* RCTImageLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 143879371AAD32A300F088A5 /* RCTImageLoader.m */; };
+		1ADE600C22C26D790062EAE9 /* RCTResizeMode.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D5FA63E1DE4B44A0058FD77 /* RCTResizeMode.h */; };
+		1ADE601022C26DB60062EAE9 /* RCTResizeMode.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D5FA63E1DE4B44A0058FD77 /* RCTResizeMode.h */; };
 		2D3B5F1A1D9B0D0400451313 /* RCTImageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = CCD34C261D4B8FE900268922 /* RCTImageCache.m */; };
 		2D3B5F1B1D9B0D0700451313 /* RCTImageBlurUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = EEF314711C9B0DD30049118E /* RCTImageBlurUtils.m */; };
 		2D3B5F1C1D9B0D1300451313 /* RCTResizeMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 139A38831C4D587C00862840 /* RCTResizeMode.m */; };
@@ -70,6 +72,7 @@
 			dstPath = include/RCTImage;
 			dstSubfolderSpec = 16;
 			files = (
+				1ADE600C22C26D790062EAE9 /* RCTResizeMode.h in Copy Headers */,
 				3D302E181DF8228100D6DDAE /* RCTImageUtils.h in Copy Headers */,
 			);
 			name = "Copy Headers";
@@ -81,6 +84,7 @@
 			dstPath = include/RCTImage;
 			dstSubfolderSpec = 16;
 			files = (
+				1ADE601022C26DB60062EAE9 /* RCTResizeMode.h in Copy Headers */,
 				3D302F211DF8269200D6DDAE /* RCTImageUtils.h in Copy Headers */,
 			);
 			name = "Copy Headers";
diff --git a/Libraries/Image/RCTImageCache.h b/Libraries/Image/RCTImageCache.h
index b7acc1126ca6cd..3ee09c974d3727 100644
--- a/Libraries/Image/RCTImageCache.h
+++ b/Libraries/Image/RCTImageCache.h
@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <React/RCTImageLoader.h>
+#import "RCTImageLoader.h"
 
 @interface RCTImageCache : NSObject <RCTImageCache>
 @end
diff --git a/Libraries/Image/RCTImageCache.m b/Libraries/Image/RCTImageCache.m
index a6546a7e26ce17..f4d533606ff8fd 100644
--- a/Libraries/Image/RCTImageCache.m
+++ b/Libraries/Image/RCTImageCache.m
@@ -12,9 +12,14 @@
 #import <ImageIO/ImageIO.h>
 
 #import <React/RCTConvert.h>
-#import <React/RCTNetworking.h>
 #import <React/RCTUtils.h>
-#import <React/RCTResizeMode.h>
+#import "RCTResizeMode.h"
+
+#if __has_include(<React/RCTNetworking.h>)
+#import <React/RCTNetworking.h>
+#else
+#import <RCTNetwork/RCTNetworking.h>
+#endif
 
 #import "RCTImageUtils.h"
 
diff --git a/Libraries/Image/RCTImageLoader.h b/Libraries/Image/RCTImageLoader.h
index 9e5ff9f8c5de61..ec9582832994bb 100644
--- a/Libraries/Image/RCTImageLoader.h
+++ b/Libraries/Image/RCTImageLoader.h
@@ -8,7 +8,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTBridge.h>
-#import <React/RCTResizeMode.h>
+#import "RCTResizeMode.h"
 #import <React/RCTURLRequestHandler.h>
 
 typedef void (^RCTImageLoaderProgressBlock)(int64_t progress, int64_t total);
diff --git a/Libraries/Image/RCTImageLoader.m b/Libraries/Image/RCTImageLoader.m
index 13a485f4122ead..87a84ab9941147 100644
--- a/Libraries/Image/RCTImageLoader.m
+++ b/Libraries/Image/RCTImageLoader.m
@@ -12,11 +12,16 @@
 
 #import <React/RCTConvert.h>
 #import <React/RCTDefines.h>
-#import <React/RCTImageLoader.h>
+#import "RCTImageLoader.h"
 #import <React/RCTLog.h>
-#import <React/RCTNetworking.h>
 #import <React/RCTUtils.h>
 
+#if __has_include(<React/RCTNetworking.h>)
+#import <React/RCTNetworking.h>
+#else
+#import <RCTNetwork/RCTNetworking.h>
+#endif
+
 #import "RCTImageCache.h"
 #import "RCTImageUtils.h"
 
diff --git a/Libraries/Image/RCTImageUtils.h b/Libraries/Image/RCTImageUtils.h
index a4b8216c401dc2..8c4331984c92c5 100644
--- a/Libraries/Image/RCTImageUtils.h
+++ b/Libraries/Image/RCTImageUtils.h
@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTDefines.h>
-#import <React/RCTResizeMode.h>
+#import "RCTResizeMode.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Libraries/Image/RCTImageView.h b/Libraries/Image/RCTImageView.h
index 24c56d448ba3fb..39506f155e96d7 100644
--- a/Libraries/Image/RCTImageView.h
+++ b/Libraries/Image/RCTImageView.h
@@ -7,7 +7,7 @@
 
 #import <UIKit/UIKit.h>
 #import <React/RCTView.h>
-#import <React/RCTResizeMode.h>
+#import "RCTResizeMode.h"
 
 @class RCTBridge;
 @class RCTImageSource;
diff --git a/Libraries/Image/RCTLocalAssetImageLoader.h b/Libraries/Image/RCTLocalAssetImageLoader.h
index df3918ad548c1a..6d00619b794ea2 100644
--- a/Libraries/Image/RCTLocalAssetImageLoader.h
+++ b/Libraries/Image/RCTLocalAssetImageLoader.h
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTImageLoader.h>
+#import "RCTImageLoader.h"
 
 @interface RCTLocalAssetImageLoader : NSObject <RCTImageURLLoader>
 
diff --git a/Libraries/Image/React-RCTImage.podspec b/Libraries/Image/React-RCTImage.podspec
index 01ee7fb7cdf826..9fa302bd3fc8aa 100644
--- a/Libraries/Image/React-RCTImage.podspec
+++ b/Libraries/Image/React-RCTImage.podspec
@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "*.{h,m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "RCTImage"
 
   s.dependency "React-Core", version
   s.dependency "React-RCTNetwork", version
diff --git a/Libraries/LinkingIOS/React-RCTLinking.podspec b/Libraries/LinkingIOS/React-RCTLinking.podspec
index e111a64a23e302..060d9bd5ea6b02 100644
--- a/Libraries/LinkingIOS/React-RCTLinking.podspec
+++ b/Libraries/LinkingIOS/React-RCTLinking.podspec
@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "*.{h,m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "RCTLinking"
 
   s.dependency "React-Core", version
 end
diff --git a/Libraries/NativeAnimation/React-RCTAnimation.podspec b/Libraries/NativeAnimation/React-RCTAnimation.podspec
index ddab24fba42b04..63c3457d6f3e34 100644
--- a/Libraries/NativeAnimation/React-RCTAnimation.podspec
+++ b/Libraries/NativeAnimation/React-RCTAnimation.podspec
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "{Drivers/*,Nodes/*,*}.{h,m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "RCTAnimation"
 
   s.dependency "React-Core", version
 end
diff --git a/Libraries/Network/RCTNetworkTask.m b/Libraries/Network/RCTNetworkTask.m
index 65be2871cc7448..ed87ecb268972f 100644
--- a/Libraries/Network/RCTNetworkTask.m
+++ b/Libraries/Network/RCTNetworkTask.m
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#import "RCTNetworkTask.h"
 #import <React/RCTLog.h>
-#import <React/RCTNetworkTask.h>
 #import <React/RCTUtils.h>
 
 @implementation RCTNetworkTask
diff --git a/Libraries/Network/RCTNetworking.h b/Libraries/Network/RCTNetworking.h
index 8a4dc1221e466a..9cf873a6b4dcb6 100644
--- a/Libraries/Network/RCTNetworking.h
+++ b/Libraries/Network/RCTNetworking.h
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#import "RCTNetworkTask.h"
 #import <React/RCTEventEmitter.h>
-#import <React/RCTNetworkTask.h>
 #import <React/RCTURLRequestHandler.h>
 
 @protocol RCTNetworkingRequestHandler <NSObject>
diff --git a/Libraries/Network/RCTNetworking.mm b/Libraries/Network/RCTNetworking.mm
index a17d0d3de56d56..fc060b25fa011f 100644
--- a/Libraries/Network/RCTNetworking.mm
+++ b/Libraries/Network/RCTNetworking.mm
@@ -12,8 +12,8 @@
 #import <React/RCTConvert.h>
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTLog.h>
-#import <React/RCTNetworkTask.h>
-#import <React/RCTNetworking.h>
+#import "RCTNetworkTask.h"
+#import "RCTNetworking.h"
 #import <React/RCTUtils.h>
 
 #import "RCTHTTPRequestHandler.h"
diff --git a/Libraries/Network/React-RCTNetwork.podspec b/Libraries/Network/React-RCTNetwork.podspec
index 17797985e7c641..90eda7f3789147 100644
--- a/Libraries/Network/React-RCTNetwork.podspec
+++ b/Libraries/Network/React-RCTNetwork.podspec
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "*.{h,m,mm}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "RCTNetwork"
 
   s.dependency "React-Core", version
 end
diff --git a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec
index da20c0e2f6422d..719dabaaeeb7f9 100644
--- a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec
+++ b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec
@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "*.{h,m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "RCTPushNotification"
 
   s.dependency "React-Core", version
 end
diff --git a/Libraries/Settings/React-RCTSettings.podspec b/Libraries/Settings/React-RCTSettings.podspec
index 05463e4b714777..f3d6caf81b6f25 100644
--- a/Libraries/Settings/React-RCTSettings.podspec
+++ b/Libraries/Settings/React-RCTSettings.podspec
@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "*.{h,m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "RCTSettings"
 
   s.dependency "React-Core", version
 end
diff --git a/Libraries/Text/React-RCTText.podspec b/Libraries/Text/React-RCTText.podspec
index 23072496b6c85e..9beba15a820bd8 100644
--- a/Libraries/Text/React-RCTText.podspec
+++ b/Libraries/Text/React-RCTText.podspec
@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "**/*.{h,m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "RCTText"
 
   s.dependency "React-Core", version
 end
diff --git a/Libraries/Vibration/React-RCTVibration.podspec b/Libraries/Vibration/React-RCTVibration.podspec
index e4df901ac533df..81190e6247b546 100644
--- a/Libraries/Vibration/React-RCTVibration.podspec
+++ b/Libraries/Vibration/React-RCTVibration.podspec
@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "*.{h,m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "RCTVibration"
 
   s.dependency "React-Core", version
 end
diff --git a/Libraries/WebSocket/React-RCTWebSocket.podspec b/Libraries/WebSocket/React-RCTWebSocket.podspec
index 8f2ec71cefabf1..e28fe3bd0a9fec 100644
--- a/Libraries/WebSocket/React-RCTWebSocket.podspec
+++ b/Libraries/WebSocket/React-RCTWebSocket.podspec
@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "*.{h,m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "RCTWebSocket"
 
   s.dependency "React-Core", version
 end
diff --git a/RNTester/RCTTest/React-RCTTest.podspec b/RNTester/RCTTest/React-RCTTest.podspec
index 400e0c8481a26c..c4404a5c0e10d3 100644
--- a/RNTester/RCTTest/React-RCTTest.podspec
+++ b/RNTester/RCTTest/React-RCTTest.podspec
@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
   s.source_files           = "**/*.{h,m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.framework              = "XCTest"
-  s.header_dir             = "React"
+  s.header_dir             = "RCTTest"
 
   s.dependency "React-Core", version
 end
diff --git a/React/DevSupport/RCTInspectorDevServerHelper.h b/React/DevSupport/RCTInspectorDevServerHelper.h
index c718dfd3b55e77..b0e246543db034 100644
--- a/React/DevSupport/RCTInspectorDevServerHelper.h
+++ b/React/DevSupport/RCTInspectorDevServerHelper.h
@@ -7,7 +7,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTDefines.h>
-#import <React/RCTInspectorPackagerConnection.h>
+#import "RCTInspectorPackagerConnection.h"
 
 #if RCT_DEV
 
diff --git a/React/DevSupport/RCTPackagerClient.m b/React/DevSupport/RCTPackagerClient.m
index 66c086f39183f8..36c2fc24868ae4 100644
--- a/React/DevSupport/RCTPackagerClient.m
+++ b/React/DevSupport/RCTPackagerClient.m
@@ -8,9 +8,14 @@
 #import "RCTPackagerClient.h"
 
 #import <React/RCTLog.h>
-#import <React/RCTReconnectingWebSocket.h>
 #import <React/RCTUtils.h>
 
+#if __has_include(<React/RCTReconnectingWebSocket.h>)
+#import <React/RCTReconnectingWebSocket.h>
+#else
+#import <RCTWebSocket/RCTReconnectingWebSocket.h>
+#endif
+
 #if RCT_DEV // Only supported in dev mode
 
 const int RCT_PACKAGER_CLIENT_PROTOCOL_VERSION = 2;
diff --git a/React/DevSupport/RCTPackagerConnection.mm b/React/DevSupport/RCTPackagerConnection.mm
index 6df2ad31f27bca..3e47b16c7c92f6 100644
--- a/React/DevSupport/RCTPackagerConnection.mm
+++ b/React/DevSupport/RCTPackagerConnection.mm
@@ -17,10 +17,16 @@
 #import <React/RCTConvert.h>
 #import <React/RCTDefines.h>
 #import <React/RCTLog.h>
-#import <React/RCTPackagerClient.h>
+#import "RCTPackagerClient.h"
+#import <React/RCTUtils.h>
+
+#if __has_include(<React/RCTReconnectingWebSocket.h>)
 #import <React/RCTReconnectingWebSocket.h>
 #import <React/RCTSRWebSocket.h>
-#import <React/RCTUtils.h>
+#else
+#import <RCTWebSocket/RCTReconnectingWebSocket.h>
+#import <RCTWebSocket/RCTSRWebSocket.h>
+#endif
 
 #if RCT_DEV
 @interface RCTPackagerConnection () <RCTReconnectingWebSocketDelegate>
diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm
index 17f4491a7c582a..38aa64587cdef0 100644
--- a/React/Fabric/RCTSurfacePresenter.mm
+++ b/React/Fabric/RCTSurfacePresenter.mm
@@ -18,7 +18,7 @@
 #import <React/RCTComponentViewRegistry.h>
 #import <React/RCTFabricSurface.h>
 #import <React/RCTFollyConvert.h>
-#import <React/RCTImageLoader.h>
+#import <RCTImage/RCTImageLoader.h>
 #import <React/RCTMountingManager.h>
 #import <React/RCTMountingManagerDelegate.h>
 #import <React/RCTScheduler.h>
diff --git a/React/React-Core.podspec b/React/React-Core.podspec
index 07b250db4c6b72..b8560129891d5f 100644
--- a/React/React-Core.podspec
+++ b/React/React-Core.podspec
@@ -40,15 +40,28 @@ Pod::Spec.new do |s|
                              "Views/RCTPicker*",
                              "Views/RCTRefreshControl*",
                              "Views/RCTSlider*",
-                             "Views/RCTSwitch*",
+                             "Views/RCTSwitch*"
+  s.private_header_files   = "Cxx*/*.h"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.header_dir             = "React"
   s.framework              = "JavaScriptCore"
   s.library                = "stdc++"
   s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\"" }
+  s.default_subspec         = "Default"
+
+  s.subspec "Default" do |ss|
+    # no-op
+  end
+
+  s.subspec "CxxBridge" do |ss|
+    # Make the C++ headers visible if they are needed
+    ss.public_header_files   = "**/*.{h}"
+  end
 
   s.dependency "Folly", folly_version
   s.dependency "React-cxxreact", version
+  s.dependency "React-jsi", version
   s.dependency "React-jsiexecutor", version
   s.dependency "yoga", "#{version}.React"
+  s.dependency "glog"
 end
diff --git a/React/React-DevSupport.podspec b/React/React-DevSupport.podspec
index 0f9405fb942851..3638a516ee6c3a 100644
--- a/React/React-DevSupport.podspec
+++ b/React/React-DevSupport.podspec
@@ -28,8 +28,9 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "DevSupport/*",
                              "Inspector/*"
-  s.header_dir             = "React"
+  s.header_dir             = "DevSupport"
 
   s.dependency "React-Core", version
+  s.dependency "React-jsinspector", version
   s.dependency "React-RCTWebSocket", version
 end
diff --git a/React/React-RCTFabric.podspec b/React/React-RCTFabric.podspec
index 04d3ffc668bf66..1328360249f3f4 100644
--- a/React/React-RCTFabric.podspec
+++ b/React/React-RCTFabric.podspec
@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   s.xcconfig               = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/Folly\"", 
                                "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" + " " + folly_flags  }
 
-  s.dependency "React-Core", version
+  s.dependency "React-Core/CxxBridge", version
   s.dependency "React-Fabric", version
   s.dependency "React-RCTImage", version
   s.dependency "Folly/Fabric", folly_version
diff --git a/ReactCommon/cxxreact/React-cxxreact.podspec b/ReactCommon/cxxreact/React-cxxreact.podspec
index 9613929748decb..3f1a214f0d20eb 100644
--- a/ReactCommon/cxxreact/React-cxxreact.podspec
+++ b/ReactCommon/cxxreact/React-cxxreact.podspec
@@ -33,7 +33,7 @@ Pod::Spec.new do |s|
   s.source_files           = "*.{cpp,h}"
   s.exclude_files          = "SampleCxxModule.*"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\"" }
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
   s.header_dir             = "cxxreact"
 
   s.dependency "boost-for-react-native", "1.63.0"
diff --git a/ReactCommon/fabric/imagemanager/platform/ios/ImageManager.mm b/ReactCommon/fabric/imagemanager/platform/ios/ImageManager.mm
index 148b95fe1663ce..6833a84e6a4741 100644
--- a/ReactCommon/fabric/imagemanager/platform/ios/ImageManager.mm
+++ b/ReactCommon/fabric/imagemanager/platform/ios/ImageManager.mm
@@ -7,7 +7,7 @@
 
 #include "ImageManager.h"
 
-#import <React/RCTImageLoader.h>
+#import <RCTImage/RCTImageLoader.h>
 #import <react/utils/ManagedObjectWrapper.h>
 
 #import "RCTImageManager.h"
diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.mm b/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.mm
index c319cd30d56a51..70c80cd30d80fd 100644
--- a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.mm
+++ b/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.mm
@@ -10,7 +10,7 @@
 #import <react/debug/SystraceSection.h>
 #import <react/utils/SharedFunction.h>
 
-#import <React/RCTImageLoader.h>
+#import <RCTImage/RCTImageLoader.h>
 #import <react/imagemanager/ImageResponse.h>
 #import <react/imagemanager/ImageResponseObserver.h>
 
diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h b/ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
index 2a4b6f0f53e3d9..29eeca95560471 100644
--- a/ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
+++ b/ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
@@ -7,7 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import <React/RCTImageLoader.h>
+#import <RCTImage/RCTImageLoader.h>
 #import <react/imagemanager/primitives.h>
 
 using namespace facebook::react;
diff --git a/ReactCommon/jscallinvoker/React-jscallinvoker.podspec b/ReactCommon/jscallinvoker/React-jscallinvoker.podspec
index 383216404ab3ab..b15a7793a17183 100644
--- a/ReactCommon/jscallinvoker/React-jscallinvoker.podspec
+++ b/ReactCommon/jscallinvoker/React-jscallinvoker.podspec
@@ -32,8 +32,8 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files         = "jsireact/*.{cpp,h}"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.header_dir             = "jsireact"
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\"" }
+  s.header_dir             = "jscallinvoker"
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
 
   s.dependency "React-cxxreact", version
   s.dependency "Folly", folly_version
diff --git a/ReactCommon/jscallinvoker/jsireact/BridgeJSCallInvoker.cpp b/ReactCommon/jscallinvoker/jsireact/BridgeJSCallInvoker.cpp
index ed44cf84c3c45a..bd58ddc0c08ac7 100644
--- a/ReactCommon/jscallinvoker/jsireact/BridgeJSCallInvoker.cpp
+++ b/ReactCommon/jscallinvoker/jsireact/BridgeJSCallInvoker.cpp
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <jsireact/BridgeJSCallInvoker.h>
+#include "BridgeJSCallInvoker.h"
 #include <cxxreact/Instance.h>
 
 namespace facebook {
diff --git a/ReactCommon/jscallinvoker/jsireact/BridgeJSCallInvoker.h b/ReactCommon/jscallinvoker/jsireact/BridgeJSCallInvoker.h
index fa21c2a74d7e45..dd8ef34b6aab9e 100644
--- a/ReactCommon/jscallinvoker/jsireact/BridgeJSCallInvoker.h
+++ b/ReactCommon/jscallinvoker/jsireact/BridgeJSCallInvoker.h
@@ -10,7 +10,7 @@
 #include <functional>
 #include <memory>
 
-#include <jsireact/JSCallInvoker.h>
+#include "JSCallInvoker.h"
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/jsi/React-jsi.podspec b/ReactCommon/jsi/React-jsi.podspec
index 0b0ff66eb581e8..b297c5fedfe0ad 100644
--- a/ReactCommon/jsi/React-jsi.podspec
+++ b/ReactCommon/jsi/React-jsi.podspec
@@ -34,7 +34,7 @@ Pod::Spec.new do |s|
   s.exclude_files          = "**/test/*"
   s.framework              = "JavaScriptCore"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\"" }
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
   s.header_dir             = "jsi"
   s.default_subspec        = "Default"
 
diff --git a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec b/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
index d8c6f70fbc92f9..6ee7e3c9067643 100644
--- a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
+++ b/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files         = "jsireact/*.{cpp,h}"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\"" }
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
   s.header_dir             = "jsireact"
 
   s.dependency "React-cxxreact", version
diff --git a/ReactCommon/turbomodule/core/React-turbomodule-core.podspec b/ReactCommon/turbomodule/core/React-turbomodule-core.podspec
index 7b93bc87f17332..381f019ed9ebbd 100644
--- a/ReactCommon/turbomodule/core/React-turbomodule-core.podspec
+++ b/ReactCommon/turbomodule/core/React-turbomodule-core.podspec
@@ -32,8 +32,8 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "*.{cpp,h}"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\"" }
-  s.header_dir             = "jsireact"
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
+  s.header_dir             = "turbomodule"
   s.xcconfig               = { "OTHER_CFLAGS" => "$(inherited) -DRN_TURBO_MODULE_ENABLED" }
 
   s.dependency "React-Core", version
@@ -44,6 +44,5 @@ Pod::Spec.new do |s|
 
   s.subspec "core-ios" do |ss|
     ss.source_files   = "platform/ios/*.{mm,cpp,h}"
-    ss.header_dir     = "jsireact"
   end
 end
diff --git a/ReactCommon/turbomodule/core/TurboCxxModule.cpp b/ReactCommon/turbomodule/core/TurboCxxModule.cpp
index 779fdeb08b161b..96c025168c7eaf 100644
--- a/ReactCommon/turbomodule/core/TurboCxxModule.cpp
+++ b/ReactCommon/turbomodule/core/TurboCxxModule.cpp
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include <jsi/JSIDynamic.h>
-#include <jsireact/TurboModuleUtils.h>
+#include "TurboModuleUtils.h"
 
 using namespace facebook;
 using namespace facebook::xplat::module;
diff --git a/ReactCommon/turbomodule/core/TurboModule.h b/ReactCommon/turbomodule/core/TurboModule.h
index 54a39fd76218bd..778ff383452593 100644
--- a/ReactCommon/turbomodule/core/TurboModule.h
+++ b/ReactCommon/turbomodule/core/TurboModule.h
@@ -12,7 +12,7 @@
 
 #include <jsi/jsi.h>
 
-#include <jsireact/JSCallInvoker.h>
+#include <jscallinvoker/JSCallInvoker.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/turbomodule/core/TurboModuleBinding.cpp b/ReactCommon/turbomodule/core/TurboModuleBinding.cpp
index 5b370eede9ae6d..c602d506bd8b46 100644
--- a/ReactCommon/turbomodule/core/TurboModuleBinding.cpp
+++ b/ReactCommon/turbomodule/core/TurboModuleBinding.cpp
@@ -10,7 +10,7 @@
 #include <string>
 
 #include <cxxreact/SystraceSection.h>
-#include <jsireact/LongLivedObject.h>
+#include "LongLivedObject.h"
 
 using namespace facebook;
 
diff --git a/ReactCommon/turbomodule/core/TurboModuleBinding.h b/ReactCommon/turbomodule/core/TurboModuleBinding.h
index 6195dcf39adccb..313af5113bdb23 100644
--- a/ReactCommon/turbomodule/core/TurboModuleBinding.h
+++ b/ReactCommon/turbomodule/core/TurboModuleBinding.h
@@ -10,7 +10,7 @@
 #include <string>
 
 #include <jsi/jsi.h>
-#include <jsireact/TurboModule.h>
+#include <turbomodule/TurboModule.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/turbomodule/core/TurboModuleUtils.h b/ReactCommon/turbomodule/core/TurboModuleUtils.h
index 61615ac77132ad..d94086f0d01bd5 100644
--- a/ReactCommon/turbomodule/core/TurboModuleUtils.h
+++ b/ReactCommon/turbomodule/core/TurboModuleUtils.h
@@ -11,7 +11,7 @@
 
 #include <jsi/jsi.h>
 
-#include <jsireact/JSCallInvoker.h>
+#include <jscallinvoker/JSCallInvoker.h>
 
 using namespace facebook;
 
diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.h b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.h
index ab0464ac85707d..7d2ec24009f57d 100644
--- a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.h
+++ b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.h
@@ -13,8 +13,8 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTModuleMethod.h>
 #import <cxxreact/MessageQueueThread.h>
-#import <jsireact/JSCallInvoker.h>
-#import <jsireact/TurboModule.h>
+#import <jscallinvoker/JSCallInvoker.h>
+#import "TurboModule.h"
 #import <unordered_map>
 #import <string>
 
diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm
index ce6c7616788173..bd5315a0fe12dc 100644
--- a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm
+++ b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm
@@ -16,10 +16,10 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTModuleMethod.h>
 #import <React/RCTUtils.h>
-#import <jsireact/JSCallInvoker.h>
-#import <jsireact/LongLivedObject.h>
-#import <jsireact/TurboModule.h>
-#import <jsireact/TurboModuleUtils.h>
+#import <jscallinvoker/JSCallInvoker.h>
+#import "LongLivedObject.h"
+#import "TurboModule.h"
+#import "TurboModuleUtils.h"
 #import <React/RCTCxxConvert.h>
 #import <React/RCTManagedPointer.h>
 
diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm
index 02565b28945b30..edbec7b5173d3c 100644
--- a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm
+++ b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm
@@ -16,9 +16,9 @@
 #import <React/RCTCxxModule.h>
 #import <React/RCTLog.h>
 #import <React/RCTPerformanceLogger.h>
-#import <jsireact/BridgeJSCallInvoker.h>
-#import <jsireact/TurboCxxModule.h>
-#import <jsireact/TurboModuleBinding.h>
+#import <jscallinvoker/BridgeJSCallInvoker.h>
+#import "TurboCxxModule.h"
+#import "TurboModuleBinding.h"
 
 using namespace facebook;
 
diff --git a/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.h b/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.h
index a10fcf6cca1569..b19d4321dd5c66 100644
--- a/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.h
+++ b/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.h
@@ -10,7 +10,7 @@
 #include <memory>
 #include <string>
 
-#include <jsireact/TurboModule.h>
+#include <turbomodule/TurboModule.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/turbomodule/samples/React-turbomodule-samples.podspec b/ReactCommon/turbomodule/samples/React-turbomodule-samples.podspec
index e7cde973e42f43..1a57bc5dea0b38 100644
--- a/ReactCommon/turbomodule/samples/React-turbomodule-samples.podspec
+++ b/ReactCommon/turbomodule/samples/React-turbomodule-samples.podspec
@@ -32,8 +32,8 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "*.{cpp,h}"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\"" }
-  s.header_dir             = "jsireact"
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
+  s.header_dir             = "turbomodule-samples"
   s.xcconfig               = { "OTHER_CFLAGS" => "$(inherited) -DRN_TURBO_MODULE_ENABLED" }
 
   s.dependency "React-Core", version
@@ -41,9 +41,11 @@ Pod::Spec.new do |s|
   s.dependency "React-jsi", version
   s.dependency "React-turbomodule-core", version
   s.dependency "Folly", folly_version
+  s.dependency "DoubleConversion"
+  s.dependency "glog"
 
   s.subspec "samples-ios" do |ss|
     ss.source_files   = "platform/ios/*.{mm,cpp,h}"
-    ss.header_dir     = "jsireact"
+    ss.header_dir     = "turbomodule-samples"
   end
 end
diff --git a/ReactCommon/turbomodule/samples/SampleTurboCxxModule.cpp b/ReactCommon/turbomodule/samples/SampleTurboCxxModule.cpp
index 4062e05ed7e65d..2b634bd6eefaa3 100644
--- a/ReactCommon/turbomodule/samples/SampleTurboCxxModule.cpp
+++ b/ReactCommon/turbomodule/samples/SampleTurboCxxModule.cpp
@@ -7,7 +7,7 @@
 
 #import "SampleTurboCxxModule.h"
 
-#import <jsireact/TurboModuleUtils.h>
+#import <turbomodule/TurboModuleUtils.h>
 
 using namespace facebook;
 
diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h b/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h
index a3a1c589c8ccb2..d65bf12e056f01 100644
--- a/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h
+++ b/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h
@@ -14,7 +14,7 @@
 #import <React/RCTBridgeModule.h>
 
 #ifdef RN_TURBO_MODULE_ENABLED
-#import <jsireact/RCTTurboModule.h>
+#import <turbomodule/RCTTurboModule.h>
 #endif
 
 /**
diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.h b/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.h
index 5987d53cd44c4c..c19f796de824b2 100644
--- a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.h
+++ b/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #import <React/RCTCxxModule.h>
-#import <jsireact/RCTTurboModule.h>
+#import <turbomodule/RCTTurboModule.h>
 
 /**
  * Sample backward-compatible RCTCxxModule-based module.
diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.mm b/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.mm
index 873661c9779ec9..d0454872649f90 100644
--- a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.mm
+++ b/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.mm
@@ -8,7 +8,7 @@
 #import "RCTSampleTurboCxxModule.h"
 
 #import <cxxreact/CxxModule.h>
-#import <jsireact/SampleTurboCxxModule.h>
+#import "SampleTurboCxxModule.h"
 #import "SampleTurboCxxModuleLegacyImpl.h"
 
 using namespace facebook;
diff --git a/ReactCommon/yoga/yoga.podspec b/ReactCommon/yoga/yoga.podspec
index fd17f019cd4176..a1e6b9cf345ad5 100644
--- a/ReactCommon/yoga/yoga.podspec
+++ b/ReactCommon/yoga/yoga.podspec
@@ -47,7 +47,7 @@ Pod::Spec.new do |spec|
   source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
   spec.source_files = source_files
 
-  header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue,YGStyle,CompactValue,YGFloatOptional,Yoga-internal,YGNode,YGConfig,YGLayout,YGMarker}.h'
+  header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
   header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
   spec.public_header_files = header_files
 end