diff --git a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj
index b26a0a718..467f60eac 100644
--- a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj
+++ b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj
@@ -491,7 +491,7 @@
 		DE7D18C627038249002D3A5D /* OneSignalOutcomes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D188027037F43002D3A5D /* OneSignalOutcomes.framework */; };
 		DE7D18CD270385D0002D3A5D /* OSOutcomesRequests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE7D18CB270385D0002D3A5D /* OSOutcomesRequests.m */; };
 		DE7D18CF270385E0002D3A5D /* OSOutcomesRequests.h in Headers */ = {isa = PBXBuildFile; fileRef = DE7D18CE270385E0002D3A5D /* OSOutcomesRequests.h */; };
-		DE7D18D1270389E1002D3A5D /* OSMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AE28B8725B8ADF400529100 /* OSMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DE7D18D1270389E1002D3A5D /* OSMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AE28B8725B8ADF400529100 /* OSMacros.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		DE7D18D22703ADE0002D3A5D /* OneSignalOutcomes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D188027037F43002D3A5D /* OneSignalOutcomes.framework */; };
 		DE7D18D62703B103002D3A5D /* OSInAppMessageOutcome.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A880F2A23FB45FB0081F5E8 /* OSInAppMessageOutcome.m */; };
 		DE7D18D72703B111002D3A5D /* OSInAppMessageOutcome.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A880F2923FB45CE0081F5E8 /* OSInAppMessageOutcome.h */; settings = {ATTRIBUTES = (Public, ); }; };
diff --git a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalAttachmentHandler.m b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalAttachmentHandler.m
index 3643ddfc9..e955a408e 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalAttachmentHandler.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalAttachmentHandler.m
@@ -28,7 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import <Foundation/Foundation.h>
 #import "OneSignalAttachmentHandler.h"
 #import "OneSignalNotificationCategoryController.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @interface DirectDownloadDelegate : NSObject <NSURLSessionDataDelegate> {
     NSError* error;
diff --git a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalExtensionRequests.m b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalExtensionRequests.m
index 94ce1c983..079a129cf 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalExtensionRequests.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalExtensionRequests.m
@@ -27,7 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import <Foundation/Foundation.h>
 #import "OneSignalExtensionRequests.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSRequestReceiveReceipts
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m
index 210d2910a..84273fe38 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m
@@ -26,7 +26,7 @@
  */
 
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import <OneSignalOutcomes/OneSignalOutcomes.h>
 #import "OneSignalNotificationServiceExtensionHandler.h"
 #import "OneSignalExtensionBadgeHandler.h"
diff --git a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m
index 666422c88..86e1db286 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m
@@ -28,7 +28,7 @@
 #import <Foundation/Foundation.h>
 #import "OneSignalReceiveReceiptsController.h"
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import "OneSignalExtensionRequests.h"
 
 @implementation OneSignalReceiveReceiptsController
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSDynamicTriggerController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSDynamicTriggerController.m
index d4630b135..6db4635df 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSDynamicTriggerController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSDynamicTriggerController.m
@@ -30,7 +30,7 @@
 #import "OneSignalCommonDefines.h"
 #import "OSMessagingController.h"
 #import <OneSignalOutcomes/OneSignalOutcomes.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import "OSSessionManager.h"
 
 @interface OSDynamicTriggerController ()
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageController.m
index c2d93a850..bf42b381b 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageController.m
@@ -27,7 +27,7 @@
 
 #import "OSInAppMessageController.h"
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import <OneSignalUser/OneSignalUser.h>
 #import "OSInAppMessagingDefines.h"
 #import "OSInAppMessagingRequests.h"
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageMigrationController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageMigrationController.m
index f3d9a4257..ea3189f56 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageMigrationController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageMigrationController.m
@@ -28,7 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import "OSInAppMessageMigrationController.h"
 #import "OSInAppMessagingDefines.h"
 #import "OSInAppMessageInternal.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSInAppMessageMigrationController
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m
index 45e14b641..ad65a2f9d 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m
@@ -29,7 +29,7 @@
 #import "UIApplication+OneSignal.h"
 #import "NSDateFormatter+OneSignal.h"
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import "OSInAppMessageClickResult.h"
 #import "OSInAppMessageClickEvent.h"
 #import "OSInAppMessageController.h"
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.m
index 51826f8d9..80689b0e6 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.m
@@ -27,7 +27,7 @@
 
 #import "OSTriggerController.h"
 #import "OSInAppMessagingDefines.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @interface OSTriggerController ()
 @property (strong, nonatomic, nonnull) NSMutableDictionary<NSString *, id> *triggers;
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageBridgeEvent.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageBridgeEvent.m
index 4ad4cc53e..3aba051f0 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageBridgeEvent.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageBridgeEvent.m
@@ -27,7 +27,7 @@
 
 #import "OSInAppMessageBridgeEvent.h"
 #import "OSInAppMessageClickResult.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSInAppMessageBridgeEvent
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickEvent.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickEvent.m
index 1326cca6d..a949de9bc 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickEvent.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickEvent.m
@@ -27,7 +27,7 @@
 
 
 #import "OSInAppMessageClickEvent.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSInAppMessageClickEvent
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickResult.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickResult.m
index 67c1f8261..676375dbd 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickResult.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickResult.m
@@ -28,7 +28,7 @@
 #import "OSInAppMessageClickResult.h"
 #import "OSInAppMessagePushPrompt.h"
 #import "OSInAppMessageLocationPrompt.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSInAppMessageClickResult
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageDisplayStats.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageDisplayStats.m
index cecf056e6..3d829dbc6 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageDisplayStats.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageDisplayStats.m
@@ -26,7 +26,7 @@
 */
 
 #import "OSInAppMessageDisplayStats.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @interface OSInAppMessageDisplayStats ()
 @property (nonatomic, readwrite) BOOL redisplayEnabled;
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageInternal.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageInternal.m
index b52f14cf2..8875f53e6 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageInternal.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageInternal.m
@@ -28,7 +28,7 @@
 #import "OSInAppMessageInternal.h"
 #import "NSDateFormatter+OneSignal.h"
 #import "OneSignalCommonDefines.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSInAppMessage
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageLocationPrompt.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageLocationPrompt.m
index d7780be3a..b5d0e8d60 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageLocationPrompt.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageLocationPrompt.m
@@ -29,7 +29,7 @@
 #import "OSInAppMessageLocationPrompt.h"
 #import <OneSignalLocation/OneSignalLocationManager.h>
 #import <OneSignalCore/OneSignalLog.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 //@interface OneSignalLocation ()
 //
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessagePushPrompt.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessagePushPrompt.m
index fdf0c0adb..18e135ff6 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessagePushPrompt.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessagePushPrompt.m
@@ -28,7 +28,7 @@
 #import "OSInAppMessagePushPrompt.h"
 #import "OneSignalInAppMessages.h"
 #import <OneSignalNotifications/OneSignalNotifications.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSInAppMessagePushPrompt
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageTag.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageTag.m
index b462c8856..757aa2512 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageTag.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageTag.m
@@ -26,7 +26,7 @@
 */
 
 #import "OSInAppMessageTag.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSInAppMessageTag
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSTrigger.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSTrigger.m
index 10ba45f53..444dc73b6 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSTrigger.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSTrigger.m
@@ -26,7 +26,7 @@
  */
 
 #import "OSTrigger.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSTrigger
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Requests/OSInAppMessagingRequests.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Requests/OSInAppMessagingRequests.m
index a3d01dac9..dfb1babf8 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Requests/OSInAppMessagingRequests.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Requests/OSInAppMessagingRequests.m
@@ -26,7 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 #import <Foundation/Foundation.h>
 #import "OSInAppMessagingRequests.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSRequestGetInAppMessages
 - (NSString *)description {
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageView.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageView.m
index 9f0cfd80c..e74d98d5d 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageView.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageView.m
@@ -29,7 +29,7 @@
 #import <WebKit/WebKit.h>
 #import "OSInAppMessageClickResult.h"
 #import <OneSignalUser/OneSignalUser.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @interface OSInAppMessageView () <UIScrollViewDelegate, WKUIDelegate, WKNavigationDelegate>
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageViewController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageViewController.m
index 561dae491..bdefdb3f6 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageViewController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageViewController.m
@@ -30,7 +30,7 @@
 #import "OSInAppMessageController.h"
 #import "OSInAppMessageBridgeEvent.h"
 #import <OneSignalOutcomes/OneSignalOutcomes.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import "OSSessionManager.h"
 
 #define HIGHEST_CONSTRAINT_PRIORITY 999.0f
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OneSignalWebView.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OneSignalWebView.m
index 717a092b7..06910b334 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OneSignalWebView.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OneSignalWebView.m
@@ -28,7 +28,7 @@
 #import <UIKit/UIKit.h>
 #import "OneSignalWebView.h"
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OneSignalWebView
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalLocation/OneSignalLocationManager.m b/iOS_SDK/OneSignalSDK/OneSignalLocation/OneSignalLocationManager.m
index 090a400ab..dae1d86ec 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalLocation/OneSignalLocationManager.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalLocation/OneSignalLocationManager.m
@@ -29,7 +29,7 @@
 #import <CoreLocation/CoreLocation.h>
 #import "OneSignalLocationManager.h"
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import <OneSignalUser/OneSignalUser-Swift.h>
 
 @implementation OneSignalLocationManager
diff --git a/iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UIApplicationDelegate+OneSignalNotifications.m b/iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UIApplicationDelegate+OneSignalNotifications.m
index 032f1b8db..12aca3cd7 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UIApplicationDelegate+OneSignalNotifications.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UIApplicationDelegate+OneSignalNotifications.m
@@ -35,7 +35,7 @@
 #import "SwizzlingForwarder.h"
 #import "OSNotificationsManager.h"
 #import <objc/runtime.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 // This class hooks into the UIApplicationDelegate selectors to receive iOS 9 and older events.
 //   - UNUserNotificationCenter is used for iOS 10
diff --git a/iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UNUserNotificationCenter+OneSignalNotifications.m b/iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UNUserNotificationCenter+OneSignalNotifications.m
index 6d62eedbb..0de40559a 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UNUserNotificationCenter+OneSignalNotifications.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UNUserNotificationCenter+OneSignalNotifications.m
@@ -33,7 +33,7 @@
 #import "UIApplicationDelegate+OneSignalNotifications.h"
 #import "OSNotificationsManager.h"
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import <objc/runtime.h>
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wundeclared-selector"
diff --git a/iOS_SDK/OneSignalSDK/OneSignalNotifications/NotificationSettings/OneSignalNotificationSettings.m b/iOS_SDK/OneSignalSDK/OneSignalNotifications/NotificationSettings/OneSignalNotificationSettings.m
index 8d2dc9425..0a2db39c4 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalNotifications/NotificationSettings/OneSignalNotificationSettings.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalNotifications/NotificationSettings/OneSignalNotificationSettings.m
@@ -33,7 +33,7 @@
 #import "OneSignalCommonDefines.h"
 #import "OSNotificationsManager.h"
 #import <OneSignalCore/OSDeviceUtils.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import <OneSignalCore/OneSignalCoreHelper.h>
 
 @interface OneSignalNotificationSettings ()
diff --git a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m
index 5e994208a..698187b8d 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m
@@ -27,7 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import "OSNotificationsManager.h"
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import <UIKit/UIKit.h>
 #import <UserNotifications/UserNotifications.h>
 #import "OSNotification+OneSignal.h"
diff --git a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.m b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.m
index 81d8c55db..da4d1e17c 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.m
@@ -27,7 +27,7 @@
 
 #import "OSPermission.h"
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import "OSNotificationsManager.h"
 
 @implementation OSPermissionStateInternal
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSInAppMessageOutcome.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSInAppMessageOutcome.m
index f0a4e7c5a..a83131f8f 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSInAppMessageOutcome.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSInAppMessageOutcome.m
@@ -26,7 +26,7 @@
  */
 
 #import "OSInAppMessageOutcome.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSInAppMessageOutcome
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSOutcomes.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSOutcomes.m
index faf25e196..88df80b14 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSOutcomes.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSOutcomes.m
@@ -26,7 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 #import "OneSignalOutcomes.h"
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSOutcomes
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSChannelTracker.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSChannelTracker.m
index 8e75b8d95..b35313dc8 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSChannelTracker.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSChannelTracker.m
@@ -27,7 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import <Foundation/Foundation.h>
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import "OSChannelTracker.h"
 #import "OSIndirectInfluence.h"
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSInAppMessageTracker.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSInAppMessageTracker.m
index c861d085c..0a9c21b9d 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSInAppMessageTracker.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSInAppMessageTracker.m
@@ -30,7 +30,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import "OSIndirectInfluence.h"
 #import "OSInAppMessageTracker.h"
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @interface OSChannelTracker ()
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/model/OSIndirectInfluence.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/model/OSIndirectInfluence.m
index 9b4ebe3e1..6eabc1d4f 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/model/OSIndirectInfluence.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/model/OSIndirectInfluence.m
@@ -28,7 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import <Foundation/Foundation.h>
 #import "OSIndirectInfluence.h"
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @interface OSIndirectInfluence ()
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Model/V1/OSOutcomeEvent.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Model/V1/OSOutcomeEvent.m
index 340dd0601..c6044cbf9 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Model/V1/OSOutcomeEvent.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Model/V1/OSOutcomeEvent.m
@@ -27,7 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import "OSOutcomeEvent.h"
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSOutcomeEvent
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomeEventsRepository.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomeEventsRepository.m
index a1d1e49f9..8fde91097 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomeEventsRepository.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomeEventsRepository.m
@@ -28,7 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import <Foundation/Foundation.h>
 #import "OSCachedUniqueOutcome.h"
 #import "OSOutcomeEventsRepository.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSOutcomeEventsRepository
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomesRequests.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomesRequests.m
index 1f434a7ce..e0b7e3adf 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomesRequests.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomesRequests.m
@@ -26,7 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 
 #import "OSOutcomesRequests.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSRequestSendOutcomesV1ToServer
 NSString * const APP_ID = @"app_id";
diff --git a/iOS_SDK/OneSignalSDK/Source/OSAttributedFocusTimeProcessor.m b/iOS_SDK/OneSignalSDK/Source/OSAttributedFocusTimeProcessor.m
index 0dc03ed6a..64267b76d 100644
--- a/iOS_SDK/OneSignalSDK/Source/OSAttributedFocusTimeProcessor.m
+++ b/iOS_SDK/OneSignalSDK/Source/OSAttributedFocusTimeProcessor.m
@@ -26,7 +26,7 @@
  */
 #import <UIKit/UIKit.h>
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import "OneSignalFramework.h"
 #import "OSAttributedFocusTimeProcessor.h"
 #import <OneSignalUser/OneSignalUser.h>
diff --git a/iOS_SDK/OneSignalSDK/Source/OSFocusRequests.m b/iOS_SDK/OneSignalSDK/Source/OSFocusRequests.m
index 81a9ccc16..19b047acf 100644
--- a/iOS_SDK/OneSignalSDK/Source/OSFocusRequests.m
+++ b/iOS_SDK/OneSignalSDK/Source/OSFocusRequests.m
@@ -27,7 +27,7 @@
 
 #import <Foundation/Foundation.h>
 #import "OSFocusRequests.h"
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OSRequestOnFocus
 
diff --git a/iOS_SDK/OneSignalSDK/Source/OSUnattributedFocusTimeProcessor.m b/iOS_SDK/OneSignalSDK/Source/OSUnattributedFocusTimeProcessor.m
index 3a19ec545..cca12c035 100644
--- a/iOS_SDK/OneSignalSDK/Source/OSUnattributedFocusTimeProcessor.m
+++ b/iOS_SDK/OneSignalSDK/Source/OSUnattributedFocusTimeProcessor.m
@@ -27,7 +27,7 @@
 #import <UIKit/UIKit.h>
 #import <OneSignalCore/OneSignalCore.h>
 #import <OneSignalOSCore/OneSignalOSCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import "OSUnattributedFocusTimeProcessor.h"
 #import <OneSignalUser/OneSignalUser.h>
 
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m b/iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m
index 25c7c4674..58d3b2519 100644
--- a/iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m
+++ b/iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m
@@ -31,7 +31,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import "OneSignalCommonDefines.h"
 #import "OneSignalTracker.h"
 #import <OneSignalLocation/OneSignalLocationManager.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 
 @implementation OneSignalLifecycleObserver
 
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m b/iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m
index b23847f0e..9e96d059a 100644
--- a/iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m
+++ b/iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m
@@ -31,7 +31,7 @@
 #import "OneSignalTracker.h"
 #import "OneSignalWebView.h"
 #import <OneSignalCore/OneSignalCore.h>
-#import <OneSignalCore/OSMacros.h>
+#import "OSMacros.h"
 #import <OneSignalOutcomes/OneSignalOutcomes.h>
 #import "OSFocusTimeProcessorFactory.h"
 #import "OSFocusCallParams.h"