diff --git a/ios/RNMBX/RNMBXModelsComponentView.mm b/ios/RNMBX/RNMBXModelsComponentView.mm
index fe94bc6474..9d562bc8e9 100644
--- a/ios/RNMBX/RNMBXModelsComponentView.mm
+++ b/ios/RNMBX/RNMBXModelsComponentView.mm
@@ -12,7 +12,7 @@
 
 #import "rnmapbox_maps-Swift.pre.h"
 
-#import "RCTFollyConvert.h"
+#import "RNMBXFollyConvert.h"
 #import "RNMBXFabricPropConvert.h"
 
 
diff --git a/ios/RNMBX/RNMBXViewportComponentView.mm b/ios/RNMBX/RNMBXViewportComponentView.mm
index df6986ae56..5d3ff077d5 100644
--- a/ios/RNMBX/RNMBXViewportComponentView.mm
+++ b/ios/RNMBX/RNMBXViewportComponentView.mm
@@ -12,7 +12,7 @@
 
 #import "rnmapbox_maps-Swift.pre.h"
 
-#import "RCTFollyConvert.h"
+#import "RNMBXFollyConvert.h"
 
 
 // TODO: use generated RNMBXViewportEventEmitter, but need 0.73+ for dynamic support
diff --git a/ios/RNMBX/Uitls/PropertyChanges.swift b/ios/RNMBX/Utils/PropertyChanges.swift
similarity index 100%
rename from ios/RNMBX/Uitls/PropertyChanges.swift
rename to ios/RNMBX/Utils/PropertyChanges.swift
diff --git a/ios/RNMBX/Utils/RNMBXFollyConvert.h b/ios/RNMBX/Utils/RNMBXFollyConvert.h
new file mode 100644
index 0000000000..6a5d4c0381
--- /dev/null
+++ b/ios/RNMBX/Utils/RNMBXFollyConvert.h
@@ -0,0 +1,15 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#if __has_include(<react/utils/FollyConvert.h>)
+  // static libs / header maps (no use_frameworks!)
+  #import <react/utils/FollyConvert.h>
+#elif __has_include("FollyConvert.h")
+  /// `use_frameworks! :linkage => :static` users will need to import FollyConvert this way
+  #import "FollyConvert.h"
+#elif __has_include("RCTFollyConvert.h")
+  #import "RCTFollyConvert.h"
+#else
+  #error "FollyConvert.h not found. Ensure React-utils & RCT-Folly pods are installed."
+#endif
+
+#endif
\ No newline at end of file
diff --git a/rnmapbox-maps.podspec b/rnmapbox-maps.podspec
index e80750e45c..ef66c97b66 100644
--- a/rnmapbox-maps.podspec
+++ b/rnmapbox-maps.podspec
@@ -253,7 +253,7 @@ Pod::Spec.new do |s|
     case $RNMapboxMapsImpl
     when 'mapbox'
       sp.source_files = "ios/RNMBX/**/*.{h,m,mm,swift}"
-      sp.private_header_files = 'ios/RNMBX/RNMBXFabricHelpers.h', 'ios/RNMBX/RNMBXFabricPropConvert.h', 'ios/RNMBX/rnmapbox_maps-Swift.pre.h'
+      sp.private_header_files = 'ios/RNMBX/RNMBXFabricHelpers.h', 'ios/RNMBX/RNMBXFabricPropConvert.h', 'ios/RNMBX/rnmapbox_maps-Swift.pre.h', 'ios/RNMBX/Utils/RNMBXFollyConvert.h'
       if new_arch_enabled
         sp.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
         install_modules_dependencies(sp)