diff --git a/ios/RNIModalSheetView/RNIModalSheetView.h b/ios/RNIModalSheetView/RNIModalSheetView.h
index 2152715..536f3fd 100644
--- a/ios/RNIModalSheetView/RNIModalSheetView.h
+++ b/ios/RNIModalSheetView/RNIModalSheetView.h
@@ -5,11 +5,8 @@
 //  Created by Dominic Go on 6/6/24.
 //
 
-#if __has_include(<react_native_ios_utilities/RNIBaseView.h>)
-#import <react_native_ios_utilities/RNIBaseView.h>
-#else
-#import <react-native-ios-utilities/RNIBaseView.h>
-#endif
+#import "RNIHeaderUtils.h"
+#import RNI_UTILITIES_HEADER(RNIBaseView.h)
 
 #if RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
diff --git a/ios/RNIModalSheetView/RNIModalSheetView.mm b/ios/RNIModalSheetView/RNIModalSheetView.mm
index 9fd15fc..c73a432 100644
--- a/ios/RNIModalSheetView/RNIModalSheetView.mm
+++ b/ios/RNIModalSheetView/RNIModalSheetView.mm
@@ -6,30 +6,19 @@
 //
 
 #import "RNIModalSheetView.h"
+#import "RNIHeaderUtils.h"
 #import "../Swift.h"
 
-#if __has_include(<react_native_ios_utilities/RNIBaseView.h>)
-#import <react_native_ios_utilities/RNIBaseView.h>
-#import <react_native_ios_utilities/RNIContentViewParentDelegate.h>
-#import <react_native_ios_utilities/UIApplication+RNIHelpers.h>
-#import <react_native_ios_utilities/RNIObjcUtils.h>
-#else
-#import <react-native-ios-utilities/RNIBaseView.h>
-#import <react-native-ios-utilities/RNIContentViewParentDelegate.h>
-#import <react-native-ios-utilities/UIApplication+RNIHelpers.h>
-#import <react-native-ios-utilities/RNIObjcUtils.h>
-#endif
+#import RNI_UTILITIES_HEADER(RNIBaseView.h)
+#import RNI_UTILITIES_HEADER(RNIContentViewParentDelegate.h)
+#import RNI_UTILITIES_HEADER(UIApplication+RNIHelpers.h)
+#import RNI_UTILITIES_HEADER(RNIObjcUtils.h)
 
 #if RCT_NEW_ARCH_ENABLED
 #include "RNIModalSheetViewComponentDescriptor.h"
 
-#if __has_include(<react_native_ios_utilities/RNIBaseViewState.h>)
-#include <react_native_ios_utilities/RNIBaseViewState.h>
-#include <react_native_ios_utilities/RNIBaseViewProps.h>
-#else
-#include <react-native-ios-utilities/RNIBaseViewState.h>
-#include <react-native-ios-utilities/RNIBaseViewProps.h>
-#endif
+#import RNI_UTILITIES_HEADER(RNIBaseViewState.h)
+#import RNI_UTILITIES_HEADER(RNIBaseViewProps.h)
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
diff --git a/ios/RNIModalSheetView/RNIModalSheetViewComponentDescriptor.h b/ios/RNIModalSheetView/RNIModalSheetViewComponentDescriptor.h
index 5b6e388..251ddab 100644
--- a/ios/RNIModalSheetView/RNIModalSheetViewComponentDescriptor.h
+++ b/ios/RNIModalSheetView/RNIModalSheetViewComponentDescriptor.h
@@ -11,7 +11,9 @@
 #include "RNIModalSheetViewShadowNode.h"
 #include "RNIBaseViewComponentDescriptor.h"
 
-#include <react_native_ios_utilities/RNIBaseViewState.h>
+#include "RNIHeaderUtils.h"
+#import RNI_UTILITIES_HEADER(RNIBaseViewState.h)
+
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 
diff --git a/ios/RNIModalSheetView/RNIModalSheetViewManager.mm b/ios/RNIModalSheetView/RNIModalSheetViewManager.mm
index 340348f..223a998 100644
--- a/ios/RNIModalSheetView/RNIModalSheetViewManager.mm
+++ b/ios/RNIModalSheetView/RNIModalSheetViewManager.mm
@@ -6,18 +6,15 @@
 //
 
 #import "RNIModalSheetView.h"
+#import "RNIHeaderUtils.h"
 #import <objc/runtime.h>
 
+#import RNI_UTILITIES_HEADER(RNIBaseViewUtils.h)
+
 #import "RCTBridge.h"
 #import <React/RCTViewManager.h>
 #import <React/RCTUIManager.h>
 
-#if __has_include(<react_native_ios_utilities/RNIBaseViewUtils.h>)
-#import <react_native_ios_utilities/RNIBaseViewUtils.h>
-#else
-#import <react-native-ios-utilities/RNIBaseViewUtils.h>
-#endif
-
 
 @interface RNIModalSheetViewManager : RCTViewManager
 @end
diff --git a/ios/RNIModalSheetView/RNIModalSheetViewShadowNode.h b/ios/RNIModalSheetView/RNIModalSheetViewShadowNode.h
index dfc7708..bb25644 100644
--- a/ios/RNIModalSheetView/RNIModalSheetViewShadowNode.h
+++ b/ios/RNIModalSheetView/RNIModalSheetViewShadowNode.h
@@ -8,9 +8,10 @@
 #if __cplusplus
 #pragma once
 
-#include <react_native_ios_utilities/RNIBaseViewShadowNode.h>
-#include <react_native_ios_utilities/RNIBaseViewProps.h>
-#include <react_native_ios_utilities/RNIBaseViewEventEmitter.h>
+#include "RNIHeaderUtils.h"
+#import RNI_UTILITIES_HEADER(RNIBaseViewShadowNode.h)
+#import RNI_UTILITIES_HEADER(RNIBaseViewProps.h)
+#import RNI_UTILITIES_HEADER(RNIBaseViewEventEmitter.h)
 
 #include <react/renderer/components/RNIModalSpec/EventEmitters.h>
 #include <react/renderer/components/RNIModalSpec/Props.h>