diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCore.h b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCore.h
index f3922e961..c91e282e4 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCore.h
+++ b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCore.h
@@ -41,7 +41,6 @@
 #import <OneSignalCore/OneSignalClient.h>
 #import <OneSignalCore/OneSignalCoreHelper.h>
 #import <OneSignalCore/OneSignalTrackFirebaseAnalytics.h>
-#import <OneSignalCore/OSMacros.h>
 #import <OneSignalCore/OSJSONHandling.h>
 #import <OneSignalCore/OSPrivacyConsentController.h>
 #import <OneSignalCore/OSDeviceUtils.h>
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCoreHelper.h b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCoreHelper.h
index 9194ead16..f3c1d4147 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCoreHelper.h
+++ b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCoreHelper.h
@@ -35,8 +35,6 @@
 + (void)dispatch_async_on_main_queue:(void(^)())block;
 + (void)performSelector:(SEL)aSelector onMainThreadOnObject:(id)targetObj withObject:(id)anArgument afterDelay:(NSTimeInterval)delay;
 
-+ (NSString*)hashUsingSha1:(NSString*)string;
-+ (NSString*)hashUsingMD5:(NSString*)string;
 + (NSString*)trimURLSpacing:(NSString*)url;
 + (NSString*)parseNSErrorAsJsonString:(NSError*)error;
 + (BOOL)isOneSignalPayload:(NSDictionary *)payload;
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCoreHelper.m b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCoreHelper.m
index 4c04fda85..9ce42e159 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCoreHelper.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCoreHelper.m
@@ -32,129 +32,9 @@
 extern "C" {
 #endif
 
-#define CC_DIGEST_DEPRECATION_WARNING                                                                                          \
-    "This function is cryptographically broken and should not be used in security contexts. Clients should migrate to SHA256 (or stronger)."
-
-/*
- * For compatibility with legacy implementations, the *Init(), *Update(),
- * and *Final() functions declared here *always* return a value of 1 (one).
- * This corresponds to "success" in the similar openssl implementations.
- * There are no errors of any kind which can be, or are, reported here,
- * so you can safely ignore the return values of all of these functions
- * if you are implementing new code.
- *
- * The one-shot functions (CC_MD2(), CC_SHA1(), etc.) perform digest
- * calculation and place the result in the caller-supplied buffer
- * indicated by the md parameter. They return the md parameter.
- * Unlike the opensssl counterparts, these one-shot functions require
- * a non-NULL md pointer. Passing in NULL for the md parameter
- * results in a NULL return and no digest calculation.
- */
-
 typedef uint32_t CC_LONG;       /* 32 bit unsigned integer */
 typedef uint64_t CC_LONG64;     /* 64 bit unsigned integer */
 
-/*** MD2 ***/
-
-#define CC_MD2_DIGEST_LENGTH    16          /* digest length in bytes */
-#define CC_MD2_BLOCK_BYTES      64          /* block size in bytes */
-#define CC_MD2_BLOCK_LONG       (CC_MD2_BLOCK_BYTES / sizeof(CC_LONG))
-
-typedef struct CC_MD2state_st
-{
-    int num;
-    unsigned char data[CC_MD2_DIGEST_LENGTH];
-    CC_LONG cksm[CC_MD2_BLOCK_LONG];
-    CC_LONG state[CC_MD2_BLOCK_LONG];
-} CC_MD2_CTX;
-
-extern int CC_MD2_Init(CC_MD2_CTX *c)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern int CC_MD2_Update(CC_MD2_CTX *c, const void *data, CC_LONG len)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern int CC_MD2_Final(unsigned char *md, CC_MD2_CTX *c)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern unsigned char *CC_MD2(const void *data, CC_LONG len, unsigned char *md)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-/*** MD4 ***/
-
-#define CC_MD4_DIGEST_LENGTH    16          /* digest length in bytes */
-#define CC_MD4_BLOCK_BYTES      64          /* block size in bytes */
-#define CC_MD4_BLOCK_LONG       (CC_MD4_BLOCK_BYTES / sizeof(CC_LONG))
-
-typedef struct CC_MD4state_st
-{
-    CC_LONG A,B,C,D;
-    CC_LONG Nl,Nh;
-    CC_LONG data[CC_MD4_BLOCK_LONG];
-    uint32_t num;
-} CC_MD4_CTX;
-
-extern int CC_MD4_Init(CC_MD4_CTX *c)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern int CC_MD4_Update(CC_MD4_CTX *c, const void *data, CC_LONG len)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern int CC_MD4_Final(unsigned char *md, CC_MD4_CTX *c)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern unsigned char *CC_MD4(const void *data, CC_LONG len, unsigned char *md)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-
-/*** MD5 ***/
-
-#define CC_MD5_DIGEST_LENGTH    16          /* digest length in bytes */
-#define CC_MD5_BLOCK_BYTES      64          /* block size in bytes */
-#define CC_MD5_BLOCK_LONG       (CC_MD5_BLOCK_BYTES / sizeof(CC_LONG))
-
-typedef struct CC_MD5state_st
-{
-    CC_LONG A,B,C,D;
-    CC_LONG Nl,Nh;
-    CC_LONG data[CC_MD5_BLOCK_LONG];
-    int num;
-} CC_MD5_CTX;
-
-extern int CC_MD5_Init(CC_MD5_CTX *c)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-    
-extern int CC_MD5_Update(CC_MD5_CTX *c, const void *data, CC_LONG len)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-    
-extern int CC_MD5_Final(unsigned char *md, CC_MD5_CTX *c)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-extern unsigned char *CC_MD5(const void *data, CC_LONG len, unsigned char *md)
-API_DEPRECATED(CC_DIGEST_DEPRECATION_WARNING, macos(10.4, 10.15), ios(2.0, 13.0));
-
-/*** SHA1 ***/
-
-#define CC_SHA1_DIGEST_LENGTH   20          /* digest length in bytes */
-#define CC_SHA1_BLOCK_BYTES     64          /* block size in bytes */
-#define CC_SHA1_BLOCK_LONG      (CC_SHA1_BLOCK_BYTES / sizeof(CC_LONG))
-
-typedef struct CC_SHA1state_st
-{
-    CC_LONG h0,h1,h2,h3,h4;
-    CC_LONG Nl,Nh;
-    CC_LONG data[CC_SHA1_BLOCK_LONG];
-    int num;
-} CC_SHA1_CTX;
-
-extern int CC_SHA1_Init(CC_SHA1_CTX *c);
-
-extern int CC_SHA1_Update(CC_SHA1_CTX *c, const void *data, CC_LONG len);
-
-extern int CC_SHA1_Final(unsigned char *md, CC_SHA1_CTX *c);
-
-extern unsigned char *CC_SHA1(const void *data, CC_LONG len, unsigned char *md);
-
 /*** SHA224 ***/
 #define CC_SHA224_DIGEST_LENGTH     28          /* digest length in bytes */
 #define CC_SHA224_BLOCK_BYTES       64          /* block size in bytes */
@@ -258,26 +138,6 @@ + (void)performSelector:(SEL)aSelector onMainThreadOnObject:(nullable id)targetO
     }];
 }
 
-+ (NSString*)hashUsingSha1:(NSString*)string {
-    const char *cstr = [string UTF8String];
-    uint8_t digest[CC_SHA1_DIGEST_LENGTH];
-    CC_SHA1(cstr, (CC_LONG)strlen(cstr), digest);
-    NSMutableString *output = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2];
-    for (int i = 0; i < CC_SHA1_DIGEST_LENGTH; i++)
-        [output appendFormat:@"%02x", digest[i]];
-    return output;
-}
-
-+ (NSString*)hashUsingMD5:(NSString*)string {
-    const char *cstr = [string UTF8String];
-    uint8_t digest[CC_MD5_DIGEST_LENGTH];
-    CC_MD5(cstr, (CC_LONG)strlen(cstr), digest);
-    NSMutableString *output = [NSMutableString stringWithCapacity:CC_MD5_DIGEST_LENGTH * 2];
-    for (int i = 0; i < CC_MD5_DIGEST_LENGTH; i++)
-        [output appendFormat:@"%02x", digest[i]];
-    return output;
-}
-
 + (NSString*)trimURLSpacing:(NSString*)url {
     if (!url || [url isEqual:[NSNull null]]) {
         return nil;
diff --git a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalAttachmentHandler.m b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalAttachmentHandler.m
index 042b28146..3643ddfc9 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalAttachmentHandler.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalAttachmentHandler.m
@@ -28,6 +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>
 
 @interface DirectDownloadDelegate : NSObject <NSURLSessionDataDelegate> {
     NSError* error;
diff --git a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalExtensionRequests.m b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalExtensionRequests.m
index ebf505112..94ce1c983 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalExtensionRequests.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalExtensionRequests.m
@@ -27,6 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import <Foundation/Foundation.h>
 #import "OneSignalExtensionRequests.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSRequestReceiveReceipts
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m
index 39df2b8a4..210d2910a 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m
@@ -26,6 +26,7 @@
  */
 
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/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 63aa9dcab..666422c88 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m
@@ -28,6 +28,7 @@
 #import <Foundation/Foundation.h>
 #import "OneSignalReceiveReceiptsController.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/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 2e98511bb..d4630b135 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSDynamicTriggerController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSDynamicTriggerController.m
@@ -30,6 +30,7 @@
 #import "OneSignalCommonDefines.h"
 #import "OSMessagingController.h"
 #import <OneSignalOutcomes/OneSignalOutcomes.h>
+#import <OneSignalCore/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 b78b99d67..c2d93a850 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageController.m
@@ -27,6 +27,7 @@
 
 #import "OSInAppMessageController.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/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 001dc8569..f3d9a4257 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageMigrationController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageMigrationController.m
@@ -28,6 +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>
 
 @implementation OSInAppMessageMigrationController
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m
index e1143f183..c5b4ef521 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m
@@ -29,6 +29,7 @@
 #import "UIApplication+OneSignal.h"
 #import "NSDateFormatter+OneSignal.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/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 f3b99da28..13f7fa542 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.m
@@ -27,6 +27,7 @@
 
 #import "OSTriggerController.h"
 #import "OSInAppMessagingDefines.h"
+#import <OneSignalCore/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 52c5f1c79..4ad4cc53e 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageBridgeEvent.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageBridgeEvent.m
@@ -27,6 +27,7 @@
 
 #import "OSInAppMessageBridgeEvent.h"
 #import "OSInAppMessageClickResult.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessageBridgeEvent
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickEvent.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickEvent.m
index ee6da0999..1326cca6d 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickEvent.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickEvent.m
@@ -27,6 +27,7 @@
 
 
 #import "OSInAppMessageClickEvent.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessageClickEvent
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickResult.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickResult.m
index 24a479bdf..67c1f8261 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickResult.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageClickResult.m
@@ -28,6 +28,7 @@
 #import "OSInAppMessageClickResult.h"
 #import "OSInAppMessagePushPrompt.h"
 #import "OSInAppMessageLocationPrompt.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessageClickResult
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageDisplayStats.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageDisplayStats.m
index c71c73e05..cecf056e6 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageDisplayStats.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageDisplayStats.m
@@ -26,6 +26,7 @@
 */
 
 #import "OSInAppMessageDisplayStats.h"
+#import <OneSignalCore/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 040e3bc54..b52f14cf2 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageInternal.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageInternal.m
@@ -28,6 +28,7 @@
 #import "OSInAppMessageInternal.h"
 #import "NSDateFormatter+OneSignal.h"
 #import "OneSignalCommonDefines.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessage
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageLocationPrompt.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageLocationPrompt.m
index fb0513cbb..d7780be3a 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageLocationPrompt.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageLocationPrompt.m
@@ -29,6 +29,7 @@
 #import "OSInAppMessageLocationPrompt.h"
 #import <OneSignalLocation/OneSignalLocationManager.h>
 #import <OneSignalCore/OneSignalLog.h>
+#import <OneSignalCore/OSMacros.h>
 
 //@interface OneSignalLocation ()
 //
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessagePushPrompt.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessagePushPrompt.m
index 59bd00c38..fdf0c0adb 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessagePushPrompt.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessagePushPrompt.m
@@ -28,6 +28,7 @@
 #import "OSInAppMessagePushPrompt.h"
 #import "OneSignalInAppMessages.h"
 #import <OneSignalNotifications/OneSignalNotifications.h>
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessagePushPrompt
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageTag.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageTag.m
index f2a559197..b462c8856 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageTag.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSInAppMessageTag.m
@@ -26,6 +26,7 @@
 */
 
 #import "OSInAppMessageTag.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessageTag
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSTrigger.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSTrigger.m
index cb964b80b..10ba45f53 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSTrigger.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Model/OSTrigger.m
@@ -26,6 +26,7 @@
  */
 
 #import "OSTrigger.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSTrigger
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Requests/OSInAppMessagingRequests.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Requests/OSInAppMessagingRequests.m
index de6e1c524..a3d01dac9 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Requests/OSInAppMessagingRequests.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Requests/OSInAppMessagingRequests.m
@@ -26,6 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 #import <Foundation/Foundation.h>
 #import "OSInAppMessagingRequests.h"
+#import <OneSignalCore/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 f89832c43..9f0cfd80c 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageView.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageView.m
@@ -29,6 +29,7 @@
 #import <WebKit/WebKit.h>
 #import "OSInAppMessageClickResult.h"
 #import <OneSignalUser/OneSignalUser.h>
+#import <OneSignalCore/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 609419b94..7a3f75707 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageViewController.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageViewController.m
@@ -30,6 +30,7 @@
 #import "OSInAppMessageController.h"
 #import "OSInAppMessageBridgeEvent.h"
 #import <OneSignalOutcomes/OneSignalOutcomes.h>
+#import <OneSignalCore/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 dbcc8e777..717a092b7 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>
 
 @implementation OneSignalWebView
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalLocation/OneSignalLocationManager.m b/iOS_SDK/OneSignalSDK/OneSignalLocation/OneSignalLocationManager.m
index 3dc23d8fc..090a400ab 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalLocation/OneSignalLocationManager.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalLocation/OneSignalLocationManager.m
@@ -29,6 +29,7 @@
 #import <CoreLocation/CoreLocation.h>
 #import "OneSignalLocationManager.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/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 50ae12bc7..032f1b8db 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UIApplicationDelegate+OneSignalNotifications.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UIApplicationDelegate+OneSignalNotifications.m
@@ -35,6 +35,7 @@
 #import "SwizzlingForwarder.h"
 #import "OSNotificationsManager.h"
 #import <objc/runtime.h>
+#import <OneSignalCore/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 e093bb469..6d62eedbb 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UNUserNotificationCenter+OneSignalNotifications.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UNUserNotificationCenter+OneSignalNotifications.m
@@ -33,6 +33,7 @@
 #import "UIApplicationDelegate+OneSignalNotifications.h"
 #import "OSNotificationsManager.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import <objc/runtime.h>
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wundeclared-selector"
diff --git a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m
index 4a72345b6..5e994208a 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m
@@ -27,6 +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 <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 6edf22634..81d8c55db 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.m
@@ -27,6 +27,7 @@
 
 #import "OSPermission.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import "OSNotificationsManager.h"
 
 @implementation OSPermissionStateInternal
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSInAppMessageOutcome.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSInAppMessageOutcome.m
index 843a5b6f2..f0a4e7c5a 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSInAppMessageOutcome.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSInAppMessageOutcome.m
@@ -26,6 +26,7 @@
  */
 
 #import "OSInAppMessageOutcome.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSInAppMessageOutcome
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSOutcomes.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSOutcomes.m
index f246242d3..faf25e196 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSOutcomes.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSOutcomes.m
@@ -26,6 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 #import "OneSignalOutcomes.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/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 d712247aa..8e75b8d95 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSChannelTracker.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSChannelTracker.m
@@ -27,6 +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 "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 a45e8ca4a..c861d085c 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSInAppMessageTracker.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSInAppMessageTracker.m
@@ -30,6 +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>
 
 @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 1f7351c07..9b4ebe3e1 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/model/OSIndirectInfluence.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/model/OSIndirectInfluence.m
@@ -28,6 +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>
 
 @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 441967668..340dd0601 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Model/V1/OSOutcomeEvent.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Model/V1/OSOutcomeEvent.m
@@ -27,6 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import "OSOutcomeEvent.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/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 cf4762989..a1d1e49f9 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomeEventsRepository.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomeEventsRepository.m
@@ -28,6 +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>
 
 @implementation OSOutcomeEventsRepository
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomesRequests.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomesRequests.m
index 8b4257e83..1f434a7ce 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>
 
 @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 0bd16b3e9..0dc03ed6a 100644
--- a/iOS_SDK/OneSignalSDK/Source/OSAttributedFocusTimeProcessor.m
+++ b/iOS_SDK/OneSignalSDK/Source/OSAttributedFocusTimeProcessor.m
@@ -26,6 +26,7 @@
  */
 #import <UIKit/UIKit.h>
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/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 a69e8c42c..81a9ccc16 100644
--- a/iOS_SDK/OneSignalSDK/Source/OSFocusRequests.m
+++ b/iOS_SDK/OneSignalSDK/Source/OSFocusRequests.m
@@ -27,6 +27,7 @@
 
 #import <Foundation/Foundation.h>
 #import "OSFocusRequests.h"
+#import <OneSignalCore/OSMacros.h>
 
 @implementation OSRequestOnFocus
 
diff --git a/iOS_SDK/OneSignalSDK/Source/OSUnattributedFocusTimeProcessor.m b/iOS_SDK/OneSignalSDK/Source/OSUnattributedFocusTimeProcessor.m
index 5f61ebc1f..3a19ec545 100644
--- a/iOS_SDK/OneSignalSDK/Source/OSUnattributedFocusTimeProcessor.m
+++ b/iOS_SDK/OneSignalSDK/Source/OSUnattributedFocusTimeProcessor.m
@@ -27,6 +27,7 @@
 #import <UIKit/UIKit.h>
 #import <OneSignalCore/OneSignalCore.h>
 #import <OneSignalOSCore/OneSignalOSCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import "OSUnattributedFocusTimeProcessor.h"
 #import <OneSignalUser/OneSignalUser.h>
 
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalFramework.h b/iOS_SDK/OneSignalSDK/Source/OneSignalFramework.h
index 1a466d00a..90b8b0d8a 100755
--- a/iOS_SDK/OneSignalSDK/Source/OneSignalFramework.h
+++ b/iOS_SDK/OneSignalSDK/Source/OneSignalFramework.h
@@ -49,6 +49,10 @@
 #import <OneSignalOSCore/OneSignalOSCore.h>
 #import <OneSignalNotifications/OneSignalNotifications.h>
 
+// Forward declarations for Objective-C++ compatibility
+@protocol OSUser;
+@protocol OSLiveActivities;
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wstrict-prototypes"
 #pragma clang diagnostic ignored "-Wnullability-completeness"
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalHelper.h b/iOS_SDK/OneSignalSDK/Source/OneSignalHelper.h
index 86c1e05ce..92199bbea 100644
--- a/iOS_SDK/OneSignalSDK/Source/OneSignalHelper.h
+++ b/iOS_SDK/OneSignalSDK/Source/OneSignalHelper.h
@@ -43,8 +43,6 @@
 
 // Other
 + (BOOL) isValidEmail:(NSString*)email;
-+ (NSString*)hashUsingSha1:(NSString*)string;
-+ (NSString*)hashUsingMD5:(NSString*)string;
 + (BOOL)isTablet;
 
 #pragma clang diagnostic pop
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalHelper.m b/iOS_SDK/OneSignalSDK/Source/OneSignalHelper.m
index c7848b99d..2904212bc 100644
--- a/iOS_SDK/OneSignalSDK/Source/OneSignalHelper.m
+++ b/iOS_SDK/OneSignalSDK/Source/OneSignalHelper.m
@@ -110,26 +110,6 @@ + (BOOL)isValidEmail:(NSString*)email {
     return numberOfMatches != 0;
 }
 
-+ (NSString*)hashUsingSha1:(NSString*)string {
-    const char *cstr = [string UTF8String];
-    uint8_t digest[CC_SHA1_DIGEST_LENGTH];
-    CC_SHA1(cstr, (CC_LONG)strlen(cstr), digest);
-    NSMutableString *output = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2];
-    for (int i = 0; i < CC_SHA1_DIGEST_LENGTH; i++)
-        [output appendFormat:@"%02x", digest[i]];
-    return output;
-}
-
-+ (NSString*)hashUsingMD5:(NSString*)string {
-    const char *cstr = [string UTF8String];
-    uint8_t digest[CC_MD5_DIGEST_LENGTH];
-    CC_MD5(cstr, (CC_LONG)strlen(cstr), digest);
-    NSMutableString *output = [NSMutableString stringWithCapacity:CC_MD5_DIGEST_LENGTH * 2];
-    for (int i = 0; i < CC_MD5_DIGEST_LENGTH; i++)
-        [output appendFormat:@"%02x", digest[i]];
-    return output;
-}
-
 + (BOOL)isTablet {
     return UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad;
 }
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m b/iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m
index 943fb2df3..25c7c4674 100644
--- a/iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m
+++ b/iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m
@@ -31,6 +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>
 
 @implementation OneSignalLifecycleObserver
 
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m b/iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m
index 88172d99a..b23847f0e 100644
--- a/iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m
+++ b/iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m
@@ -31,6 +31,7 @@
 #import "OneSignalTracker.h"
 #import "OneSignalWebView.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalCore/OSMacros.h>
 #import <OneSignalOutcomes/OneSignalOutcomes.h>
 #import "OSFocusTimeProcessorFactory.h"
 #import "OSFocusCallParams.h"