diff --git a/Sources/KlaviyoCore/AppLifeCycleEvents.swift b/Sources/KlaviyoCore/AppLifeCycleEvents.swift
index 7eb72d445..1b705d8ad 100644
--- a/Sources/KlaviyoCore/AppLifeCycleEvents.swift
+++ b/Sources/KlaviyoCore/AppLifeCycleEvents.swift
@@ -23,6 +23,7 @@ public enum LifeCycleEvents {
 public struct AppLifeCycleEvents {
     public var lifeCycleEvents: () -> AnyPublisher<LifeCycleEvents, Never>
 
+    @_spi(KlaviyoPrivate)
     public init(lifeCycleEvents: @escaping () -> AnyPublisher<LifeCycleEvents, Never> = {
         let terminated = environment
             .notificationCenterPublisher(UIApplication.willTerminateNotification)
diff --git a/Sources/KlaviyoCore/KlaviyoEnvironment.swift b/Sources/KlaviyoCore/KlaviyoEnvironment.swift
index d267cc7e1..85477777d 100644
--- a/Sources/KlaviyoCore/KlaviyoEnvironment.swift
+++ b/Sources/KlaviyoCore/KlaviyoEnvironment.swift
@@ -10,7 +10,21 @@ import CoreLocation
 import Foundation
 import UIKit
 
-public var environment = KlaviyoEnvironment.production
+@_spi(KlaviyoPrivate)
+public enum KlaviyoEnv {
+    #if compiler(>=5.10)
+    public nonisolated(unsafe) static var current = KlaviyoEnvironment.production
+    #else
+    public static var current = KlaviyoEnvironment.production
+    #endif
+}
+
+@_spi(KlaviyoPrivate)
+@available(*, deprecated, renamed: "KlaviyoEnv.current")
+public var environment: KlaviyoEnvironment {
+    get { KlaviyoEnv.current }
+    set { KlaviyoEnv.current = newValue }
+}
 
 public struct KlaviyoEnvironment {
     public init(
diff --git a/Sources/KlaviyoCore/Networking/KlaviyoAPI.swift b/Sources/KlaviyoCore/Networking/KlaviyoAPI.swift
index 61fbe99c4..5ac5b545f 100644
--- a/Sources/KlaviyoCore/Networking/KlaviyoAPI.swift
+++ b/Sources/KlaviyoCore/Networking/KlaviyoAPI.swift
@@ -11,6 +11,7 @@ import Foundation
 public struct KlaviyoAPI {
     public var send: (KlaviyoRequest, RequestAttemptInfo) async -> Result<Data, KlaviyoAPIError>
 
+    @_spi(KlaviyoPrivate)
     public init(send: @escaping (KlaviyoRequest, RequestAttemptInfo) async -> Result<Data, KlaviyoAPIError> = { request, requestAttemptInfo in
         let start = environment.date()
 
diff --git a/Sources/KlaviyoCore/Networking/KlaviyoRequest.swift b/Sources/KlaviyoCore/Networking/KlaviyoRequest.swift
index f88a362d9..e77762f2b 100644
--- a/Sources/KlaviyoCore/Networking/KlaviyoRequest.swift
+++ b/Sources/KlaviyoCore/Networking/KlaviyoRequest.swift
@@ -23,6 +23,7 @@ public struct KlaviyoRequest: Identifiable, Equatable, Codable {
     /// - Parameters:
     ///   - id: A unique identifier for this request. If not provided, a UUID will be generated.
     ///   - endpoint: The endpoint this request will target.
+    @_spi(KlaviyoPrivate)
     public init(
         id: String = environment.uuid().uuidString,
         endpoint: KlaviyoEndpoint
diff --git a/Sources/KlaviyoCore/Utils/LoggerClient.swift b/Sources/KlaviyoCore/Utils/LoggerClient.swift
index 0765808cd..59c0b9680 100644
--- a/Sources/KlaviyoCore/Utils/LoggerClient.swift
+++ b/Sources/KlaviyoCore/Utils/LoggerClient.swift
@@ -19,7 +19,6 @@ public struct LoggerClient {
     public static let production = Self(error: { message in os_log("%{public}s", type: .error, message) })
 }
 
-@usableFromInline
 @inline(__always)
 func runtimeWarn(
     _ message: @autoclosure () -> String,
diff --git a/Sources/KlaviyoForms/InAppForms/IAFPresentationManager.swift b/Sources/KlaviyoForms/InAppForms/IAFPresentationManager.swift
index e0e456e9f..14992c97d 100644
--- a/Sources/KlaviyoForms/InAppForms/IAFPresentationManager.swift
+++ b/Sources/KlaviyoForms/InAppForms/IAFPresentationManager.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import KlaviyoSwift
 import OSLog
 import UIKit
diff --git a/Sources/KlaviyoForms/InAppForms/IAFWebViewModel.swift b/Sources/KlaviyoForms/InAppForms/IAFWebViewModel.swift
index f3dde4d9f..6e0939dd3 100644
--- a/Sources/KlaviyoForms/InAppForms/IAFWebViewModel.swift
+++ b/Sources/KlaviyoForms/InAppForms/IAFWebViewModel.swift
@@ -7,7 +7,7 @@
 
 import Combine
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import KlaviyoSwift
 import OSLog
 import WebKit
diff --git a/Sources/KlaviyoForms/InAppForms/Observers/CompanyObserver.swift b/Sources/KlaviyoForms/InAppForms/Observers/CompanyObserver.swift
index 9396b0e77..86d2572d5 100644
--- a/Sources/KlaviyoForms/InAppForms/Observers/CompanyObserver.swift
+++ b/Sources/KlaviyoForms/InAppForms/Observers/CompanyObserver.swift
@@ -7,7 +7,7 @@
 
 import Combine
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import KlaviyoSwift
 import OSLog
 
diff --git a/Sources/KlaviyoForms/InAppForms/Observers/LifecycleObserver.swift b/Sources/KlaviyoForms/InAppForms/Observers/LifecycleObserver.swift
index 003bf454f..46eea3b86 100644
--- a/Sources/KlaviyoForms/InAppForms/Observers/LifecycleObserver.swift
+++ b/Sources/KlaviyoForms/InAppForms/Observers/LifecycleObserver.swift
@@ -7,7 +7,7 @@
 
 import Combine
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import KlaviyoSwift
 import OSLog
 
diff --git a/Sources/KlaviyoForms/InAppForms/Observers/ProfileEventObserver.swift b/Sources/KlaviyoForms/InAppForms/Observers/ProfileEventObserver.swift
index 028913f5b..1ca078465 100644
--- a/Sources/KlaviyoForms/InAppForms/Observers/ProfileEventObserver.swift
+++ b/Sources/KlaviyoForms/InAppForms/Observers/ProfileEventObserver.swift
@@ -7,7 +7,7 @@
 
 import Combine
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import KlaviyoSwift
 import OSLog
 
diff --git a/Sources/KlaviyoForms/KlaviyoWebView/Development Assets/PreviewWebViewModel.swift b/Sources/KlaviyoForms/KlaviyoWebView/Development Assets/PreviewWebViewModel.swift
index 5a8f928d6..6c8670d66 100644
--- a/Sources/KlaviyoForms/KlaviyoWebView/Development Assets/PreviewWebViewModel.swift	
+++ b/Sources/KlaviyoForms/KlaviyoWebView/Development Assets/PreviewWebViewModel.swift	
@@ -8,7 +8,7 @@
 #if DEBUG
 import Combine
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import WebKit
 
 // ViewModel for testing the KlaviyoWebViewController & KlaviyoWebViewModeling protocol in Xcode previews only.
diff --git a/Sources/KlaviyoForms/KlaviyoWebView/KlaviyoWebViewController.swift b/Sources/KlaviyoForms/KlaviyoWebView/KlaviyoWebViewController.swift
index a726e3c78..5889cdc8d 100644
--- a/Sources/KlaviyoForms/KlaviyoWebView/KlaviyoWebViewController.swift
+++ b/Sources/KlaviyoForms/KlaviyoWebView/KlaviyoWebViewController.swift
@@ -6,7 +6,7 @@
 //
 
 import Combine
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import OSLog
 import UIKit
 import WebKit
diff --git a/Sources/KlaviyoLocation/GeofenceService.swift b/Sources/KlaviyoLocation/GeofenceService.swift
index 0a6046ba9..d588cae92 100644
--- a/Sources/KlaviyoLocation/GeofenceService.swift
+++ b/Sources/KlaviyoLocation/GeofenceService.swift
@@ -6,7 +6,7 @@
 //
 
 import CoreLocation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import KlaviyoSwift
 import OSLog
 
diff --git a/Sources/KlaviyoLocation/KlaviyoLocationManager+CLLocationManagerDelegate.swift b/Sources/KlaviyoLocation/KlaviyoLocationManager+CLLocationManagerDelegate.swift
index 78c5a1d25..f71c2d16d 100644
--- a/Sources/KlaviyoLocation/KlaviyoLocationManager+CLLocationManagerDelegate.swift
+++ b/Sources/KlaviyoLocation/KlaviyoLocationManager+CLLocationManagerDelegate.swift
@@ -7,7 +7,7 @@
 
 import CoreLocation
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import KlaviyoSwift
 import OSLog
 
diff --git a/Sources/KlaviyoLocation/KlaviyoLocationManager.swift b/Sources/KlaviyoLocation/KlaviyoLocationManager.swift
index 508444fcc..74e274146 100644
--- a/Sources/KlaviyoLocation/KlaviyoLocationManager.swift
+++ b/Sources/KlaviyoLocation/KlaviyoLocationManager.swift
@@ -8,7 +8,7 @@
 import Combine
 import CoreLocation
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import KlaviyoSwift
 import OSLog
 
diff --git a/Sources/KlaviyoLocation/Models/Geofence.swift b/Sources/KlaviyoLocation/Models/Geofence.swift
index 0fb5f6efd..b6e8d3cb6 100644
--- a/Sources/KlaviyoLocation/Models/Geofence.swift
+++ b/Sources/KlaviyoLocation/Models/Geofence.swift
@@ -7,7 +7,7 @@
 
 import CoreLocation
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import KlaviyoSwift
 
 /// Represents a Klaviyo geofence
diff --git a/Sources/KlaviyoLocation/Utilities/GeofenceCooldownTracker.swift b/Sources/KlaviyoLocation/Utilities/GeofenceCooldownTracker.swift
index 285b30eb0..500467f9f 100644
--- a/Sources/KlaviyoLocation/Utilities/GeofenceCooldownTracker.swift
+++ b/Sources/KlaviyoLocation/Utilities/GeofenceCooldownTracker.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import KlaviyoSwift
 
 /// Manages geofence transition cooldown periods to prevent duplicate
diff --git a/Sources/KlaviyoSwift/Klaviyo.swift b/Sources/KlaviyoSwift/Klaviyo.swift
index 6aa2743fd..34fcd6d7d 100644
--- a/Sources/KlaviyoSwift/Klaviyo.swift
+++ b/Sources/KlaviyoSwift/Klaviyo.swift
@@ -7,7 +7,7 @@
 
 import AnyCodable
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import OSLog
 import UIKit
 
diff --git a/Sources/KlaviyoSwift/KlaviyoInternal.swift b/Sources/KlaviyoSwift/KlaviyoInternal.swift
index b2712f8ec..1fae0dd0c 100644
--- a/Sources/KlaviyoSwift/KlaviyoInternal.swift
+++ b/Sources/KlaviyoSwift/KlaviyoInternal.swift
@@ -7,7 +7,7 @@
 
 import Combine
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 
 /// The internal interface for the Klaviyo SDK.
 ///
diff --git a/Sources/KlaviyoSwift/Models/Event.swift b/Sources/KlaviyoSwift/Models/Event.swift
index 3ffb8b9f5..5365e73f5 100644
--- a/Sources/KlaviyoSwift/Models/Event.swift
+++ b/Sources/KlaviyoSwift/Models/Event.swift
@@ -7,7 +7,7 @@
 
 import AnyCodable
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 
 public struct Event: Equatable {
     public enum EventName: Equatable, Hashable {
diff --git a/Sources/KlaviyoSwift/Models/LifecycleEventsExtension.swift b/Sources/KlaviyoSwift/Models/LifecycleEventsExtension.swift
index 0bc16ffd4..5c0ad2362 100644
--- a/Sources/KlaviyoSwift/Models/LifecycleEventsExtension.swift
+++ b/Sources/KlaviyoSwift/Models/LifecycleEventsExtension.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 
 extension LifeCycleEvents {
     var transformToKlaviyoAction: KlaviyoAction {
diff --git a/Sources/KlaviyoSwift/Models/Profile.swift b/Sources/KlaviyoSwift/Models/Profile.swift
index 7a744646b..b5a9393c1 100644
--- a/Sources/KlaviyoSwift/Models/Profile.swift
+++ b/Sources/KlaviyoSwift/Models/Profile.swift
@@ -7,7 +7,7 @@
 
 import AnyCodable
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 
 public struct Profile: Equatable, Codable {
     public enum ProfileKey: Equatable, Hashable, Codable {
diff --git a/Sources/KlaviyoSwift/Models/ProfileAPIExtension.swift b/Sources/KlaviyoSwift/Models/ProfileAPIExtension.swift
index f7219ca2a..8d1a5c1dd 100644
--- a/Sources/KlaviyoSwift/Models/ProfileAPIExtension.swift
+++ b/Sources/KlaviyoSwift/Models/ProfileAPIExtension.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 
 extension String {
     internal func trimWhiteSpaceOrReturnNilIfEmpty() -> String? {
diff --git a/Sources/KlaviyoSwift/StateManagement/APIRequestErrorHandling.swift b/Sources/KlaviyoSwift/StateManagement/APIRequestErrorHandling.swift
index 1fd53d2a6..36cf8e7a6 100644
--- a/Sources/KlaviyoSwift/StateManagement/APIRequestErrorHandling.swift
+++ b/Sources/KlaviyoSwift/StateManagement/APIRequestErrorHandling.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 
 enum ErrorHandlingConstants {
     static let maxBackoff = 60 * 3 // 3 minutes
diff --git a/Sources/KlaviyoSwift/StateManagement/KlaviyoState.swift b/Sources/KlaviyoSwift/StateManagement/KlaviyoState.swift
index f621361c6..d7a53dfd7 100644
--- a/Sources/KlaviyoSwift/StateManagement/KlaviyoState.swift
+++ b/Sources/KlaviyoSwift/StateManagement/KlaviyoState.swift
@@ -7,7 +7,7 @@
 
 import AnyCodable
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import UIKit
 
 typealias DeviceMetadata = PushTokenPayload.PushToken.Attributes.MetaData
diff --git a/Sources/KlaviyoSwift/StateManagement/StateManagement.swift b/Sources/KlaviyoSwift/StateManagement/StateManagement.swift
index 918dd5fdb..d4930bd40 100644
--- a/Sources/KlaviyoSwift/StateManagement/StateManagement.swift
+++ b/Sources/KlaviyoSwift/StateManagement/StateManagement.swift
@@ -14,7 +14,7 @@
 import AnyCodable
 import Combine
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import OSLog
 import UIKit
 import UserNotifications
diff --git a/Sources/KlaviyoSwift/Utilities/EventBuffer.swift b/Sources/KlaviyoSwift/Utilities/EventBuffer.swift
index ef48dc4f0..2b5ee3c6a 100644
--- a/Sources/KlaviyoSwift/Utilities/EventBuffer.swift
+++ b/Sources/KlaviyoSwift/Utilities/EventBuffer.swift
@@ -7,7 +7,7 @@
 
 import Combine
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import OSLog
 
 // MARK: - Logger
diff --git a/Tests/KlaviyoCoreTests/ArchivalUtilsTests.swift b/Tests/KlaviyoCoreTests/ArchivalUtilsTests.swift
index d4074acb6..110481407 100644
--- a/Tests/KlaviyoCoreTests/ArchivalUtilsTests.swift
+++ b/Tests/KlaviyoCoreTests/ArchivalUtilsTests.swift
@@ -6,7 +6,7 @@
 //
 
 import Combine
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import XCTest
 
 class ArchivalUtilsTests: XCTestCase {
diff --git a/Tests/KlaviyoCoreTests/DeepLinkHandlerTests.swift b/Tests/KlaviyoCoreTests/DeepLinkHandlerTests.swift
index 666f5d6de..9f2613fae 100644
--- a/Tests/KlaviyoCoreTests/DeepLinkHandlerTests.swift
+++ b/Tests/KlaviyoCoreTests/DeepLinkHandlerTests.swift
@@ -5,7 +5,7 @@
 //  Created by Claude on 9/17/25.
 //
 
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 import XCTest
 
 final class DeepLinkHandlerTests: XCTestCase {
diff --git a/Tests/KlaviyoCoreTests/Dictionary+MetadataTests.swift b/Tests/KlaviyoCoreTests/Dictionary+MetadataTests.swift
index 273a94fb0..74d89ba9e 100644
--- a/Tests/KlaviyoCoreTests/Dictionary+MetadataTests.swift
+++ b/Tests/KlaviyoCoreTests/Dictionary+MetadataTests.swift
@@ -5,7 +5,7 @@
 //  Created by Ajay Subramanya on 10/10/25.
 //
 
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import XCTest
 
 final class DictionaryMetadataTests: XCTestCase {
diff --git a/Tests/KlaviyoCoreTests/EncodableTests.swift b/Tests/KlaviyoCoreTests/EncodableTests.swift
index ae4ee3a2e..4c8c43959 100644
--- a/Tests/KlaviyoCoreTests/EncodableTests.swift
+++ b/Tests/KlaviyoCoreTests/EncodableTests.swift
@@ -5,7 +5,7 @@
 //  Created by Noah Durell on 11/14/22.
 //
 
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import SnapshotTesting
 import XCTest
 
diff --git a/Tests/KlaviyoCoreTests/FileUtilsTests.swift b/Tests/KlaviyoCoreTests/FileUtilsTests.swift
index b8962d884..143726b69 100644
--- a/Tests/KlaviyoCoreTests/FileUtilsTests.swift
+++ b/Tests/KlaviyoCoreTests/FileUtilsTests.swift
@@ -5,7 +5,7 @@
 //  Created by Noah Durell on 9/29/22.
 //
 
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 import XCTest
 
 class FileUtilsTests: XCTestCase {
diff --git a/Tests/KlaviyoCoreTests/KlaviyoAPITests.swift b/Tests/KlaviyoCoreTests/KlaviyoAPITests.swift
index 06d7ee360..f68fb6894 100644
--- a/Tests/KlaviyoCoreTests/KlaviyoAPITests.swift
+++ b/Tests/KlaviyoCoreTests/KlaviyoAPITests.swift
@@ -5,7 +5,7 @@
 //  Created by Noah Durell on 11/16/22.
 //
 
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import SnapshotTesting
 import XCTest
 
diff --git a/Tests/KlaviyoCoreTests/KlaviyoEndpointTests.swift b/Tests/KlaviyoCoreTests/KlaviyoEndpointTests.swift
index 3e4a5f5ff..82a1b5748 100644
--- a/Tests/KlaviyoCoreTests/KlaviyoEndpointTests.swift
+++ b/Tests/KlaviyoCoreTests/KlaviyoEndpointTests.swift
@@ -1,4 +1,4 @@
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 import XCTest
 
 final class KlaviyoEndpointTests: XCTestCase {
diff --git a/Tests/KlaviyoCoreTests/KlaviyoRequestTests.swift b/Tests/KlaviyoCoreTests/KlaviyoRequestTests.swift
index 66ca892ff..dab81e8cb 100644
--- a/Tests/KlaviyoCoreTests/KlaviyoRequestTests.swift
+++ b/Tests/KlaviyoCoreTests/KlaviyoRequestTests.swift
@@ -1,4 +1,4 @@
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 import XCTest
 
 final class KlaviyoRequestTests: XCTestCase {
diff --git a/Tests/KlaviyoCoreTests/NetworkSessionTests.swift b/Tests/KlaviyoCoreTests/NetworkSessionTests.swift
index a8a06ea77..057b7ff73 100644
--- a/Tests/KlaviyoCoreTests/NetworkSessionTests.swift
+++ b/Tests/KlaviyoCoreTests/NetworkSessionTests.swift
@@ -5,7 +5,7 @@
 //  Created by Noah Durell on 11/18/22.
 //
 
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 import SnapshotTesting
 import XCTest
 
diff --git a/Tests/KlaviyoCoreTests/RequestAttemptInfoTests.swift b/Tests/KlaviyoCoreTests/RequestAttemptInfoTests.swift
index 336602fd0..b2c16653e 100644
--- a/Tests/KlaviyoCoreTests/RequestAttemptInfoTests.swift
+++ b/Tests/KlaviyoCoreTests/RequestAttemptInfoTests.swift
@@ -1,4 +1,4 @@
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 import XCTest
 
 final class RequestAttemptInfoTests: XCTestCase {
diff --git a/Tests/KlaviyoCoreTests/TestUtils.swift b/Tests/KlaviyoCoreTests/TestUtils.swift
index 0fc972489..62fdbd20b 100644
--- a/Tests/KlaviyoCoreTests/TestUtils.swift
+++ b/Tests/KlaviyoCoreTests/TestUtils.swift
@@ -5,7 +5,7 @@
 //  Created by Ajay Subramanya on 8/15/24.
 //
 
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 import Combine
 import CoreLocation
 import Foundation
diff --git a/Tests/KlaviyoCoreTests/WithTimeoutTests.swift b/Tests/KlaviyoCoreTests/WithTimeoutTests.swift
index 50b76cc95..f9acace1d 100644
--- a/Tests/KlaviyoCoreTests/WithTimeoutTests.swift
+++ b/Tests/KlaviyoCoreTests/WithTimeoutTests.swift
@@ -1,4 +1,4 @@
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 import XCTest
 
 final class WithTimeoutTests: XCTestCase {
diff --git a/Tests/KlaviyoFormsTests/IAFWebViewModelPreloadingTests.swift b/Tests/KlaviyoFormsTests/IAFWebViewModelPreloadingTests.swift
index 2b62840e9..8e7bd62b3 100644
--- a/Tests/KlaviyoFormsTests/IAFWebViewModelPreloadingTests.swift
+++ b/Tests/KlaviyoFormsTests/IAFWebViewModelPreloadingTests.swift
@@ -7,7 +7,7 @@
 
 @testable import KlaviyoForms
 @testable import KlaviyoSwift
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import WebKit
 import XCTest
 
diff --git a/Tests/KlaviyoFormsTests/IAFWebViewModelTests.swift b/Tests/KlaviyoFormsTests/IAFWebViewModelTests.swift
index 03287f586..76e05968c 100644
--- a/Tests/KlaviyoFormsTests/IAFWebViewModelTests.swift
+++ b/Tests/KlaviyoFormsTests/IAFWebViewModelTests.swift
@@ -7,7 +7,7 @@
 
 @testable import KlaviyoForms
 @testable import KlaviyoSwift
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import WebKit
 import XCTest
 
diff --git a/Tests/KlaviyoFormsTests/KlaviyoFormsTestUtils.swift b/Tests/KlaviyoFormsTests/KlaviyoFormsTestUtils.swift
index bcbe60776..c28ec829b 100644
--- a/Tests/KlaviyoFormsTests/KlaviyoFormsTestUtils.swift
+++ b/Tests/KlaviyoFormsTests/KlaviyoFormsTestUtils.swift
@@ -5,7 +5,7 @@
 //  Created by Isobelle Lim on 5/6/25.
 //
 
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 import Combine
 import CoreLocation
 import Foundation
diff --git a/Tests/KlaviyoFormsTests/KlaviyoWebViewControllerTests.swift b/Tests/KlaviyoFormsTests/KlaviyoWebViewControllerTests.swift
index adb0fa131..405b59817 100644
--- a/Tests/KlaviyoFormsTests/KlaviyoWebViewControllerTests.swift
+++ b/Tests/KlaviyoFormsTests/KlaviyoWebViewControllerTests.swift
@@ -1,6 +1,6 @@
 @testable import KlaviyoForms
 @testable import KlaviyoSwift
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import OSLog
 import UIKit
 import WebKit
diff --git a/Tests/KlaviyoLocationTests/GeofenceCooldownTrackerTests.swift b/Tests/KlaviyoLocationTests/GeofenceCooldownTrackerTests.swift
index a826e1466..d38b06065 100644
--- a/Tests/KlaviyoLocationTests/GeofenceCooldownTrackerTests.swift
+++ b/Tests/KlaviyoLocationTests/GeofenceCooldownTrackerTests.swift
@@ -7,7 +7,7 @@
 
 @testable import KlaviyoLocation
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import KlaviyoSwift
 import XCTest
 
diff --git a/Tests/KlaviyoLocationTests/GeofenceTests.swift b/Tests/KlaviyoLocationTests/GeofenceTests.swift
index 974991076..cd14e412d 100644
--- a/Tests/KlaviyoLocationTests/GeofenceTests.swift
+++ b/Tests/KlaviyoLocationTests/GeofenceTests.swift
@@ -9,7 +9,7 @@
 @testable import KlaviyoSwift
 import CoreLocation
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import XCTest
 
 final class GeofenceTests: XCTestCase {
diff --git a/Tests/KlaviyoLocationTests/KlaviyoLocationManagerTests.swift b/Tests/KlaviyoLocationTests/KlaviyoLocationManagerTests.swift
index 68c376f67..b54626f3a 100644
--- a/Tests/KlaviyoLocationTests/KlaviyoLocationManagerTests.swift
+++ b/Tests/KlaviyoLocationTests/KlaviyoLocationManagerTests.swift
@@ -8,7 +8,7 @@
 @testable import KlaviyoLocation
 import CoreLocation
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 @_spi(KlaviyoPrivate) @testable import KlaviyoSwift
 import Combine
 import XCTest
diff --git a/Tests/KlaviyoLocationTests/KlaviyoLocationTestUtils.swift b/Tests/KlaviyoLocationTests/KlaviyoLocationTestUtils.swift
index 2306c1dad..806e2c66c 100644
--- a/Tests/KlaviyoLocationTests/KlaviyoLocationTestUtils.swift
+++ b/Tests/KlaviyoLocationTests/KlaviyoLocationTestUtils.swift
@@ -5,7 +5,7 @@
 //  Created by Isobelle Lim on 1/27/25.
 //
 
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 import Combine
 import CoreLocation
 import Foundation
diff --git a/Tests/KlaviyoSwiftTests/APIRequestErrorHandlingTests.swift b/Tests/KlaviyoSwiftTests/APIRequestErrorHandlingTests.swift
index e35af37c0..a11c34433 100644
--- a/Tests/KlaviyoSwiftTests/APIRequestErrorHandlingTests.swift
+++ b/Tests/KlaviyoSwiftTests/APIRequestErrorHandlingTests.swift
@@ -7,7 +7,7 @@
 
 @testable import KlaviyoSwift
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import XCTest
 
 let TIMEOUT_NANOSECONDS: UInt64 = 10_000_000_000 // 10 seconds
diff --git a/Tests/KlaviyoSwiftTests/AppLifeCycleEventsTests.swift b/Tests/KlaviyoSwiftTests/AppLifeCycleEventsTests.swift
index 56cad1e47..090260236 100644
--- a/Tests/KlaviyoSwiftTests/AppLifeCycleEventsTests.swift
+++ b/Tests/KlaviyoSwiftTests/AppLifeCycleEventsTests.swift
@@ -8,7 +8,7 @@
 @testable import KlaviyoSwift
 import Combine
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import XCTest
 
 class AppLifeCycleEventsTests: XCTestCase {
diff --git a/Tests/KlaviyoSwiftTests/AttemptNumberTests.swift b/Tests/KlaviyoSwiftTests/AttemptNumberTests.swift
index a08827988..e440963e9 100644
--- a/Tests/KlaviyoSwiftTests/AttemptNumberTests.swift
+++ b/Tests/KlaviyoSwiftTests/AttemptNumberTests.swift
@@ -1,4 +1,4 @@
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 @testable import KlaviyoSwift
 import XCTest
 
diff --git a/Tests/KlaviyoSwiftTests/DeepLinkHandlingTests.swift b/Tests/KlaviyoSwiftTests/DeepLinkHandlingTests.swift
index 149210e19..e39ad2f92 100644
--- a/Tests/KlaviyoSwiftTests/DeepLinkHandlingTests.swift
+++ b/Tests/KlaviyoSwiftTests/DeepLinkHandlingTests.swift
@@ -4,7 +4,7 @@
 //  Created by Cursor AI on 8/11/25.
 //
 
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 @testable import KlaviyoSwift
 import Combine
 import Foundation
diff --git a/Tests/KlaviyoSwiftTests/EncodableTests.swift b/Tests/KlaviyoSwiftTests/EncodableTests.swift
index da2fe839f..361e19cbc 100644
--- a/Tests/KlaviyoSwiftTests/EncodableTests.swift
+++ b/Tests/KlaviyoSwiftTests/EncodableTests.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 @testable import KlaviyoSwift
 import SnapshotTesting
 import XCTest
diff --git a/Tests/KlaviyoSwiftTests/KlaviyoInternalTests.swift b/Tests/KlaviyoSwiftTests/KlaviyoInternalTests.swift
index 3233f55f6..99ebe938f 100644
--- a/Tests/KlaviyoSwiftTests/KlaviyoInternalTests.swift
+++ b/Tests/KlaviyoSwiftTests/KlaviyoInternalTests.swift
@@ -8,7 +8,7 @@
 import Combine
 import XCTest
 @_spi(KlaviyoPrivate) @testable import KlaviyoSwift
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 
 final class KlaviyoInternalTests: XCTestCase {
     var cancellables = Set<AnyCancellable>()
diff --git a/Tests/KlaviyoSwiftTests/KlaviyoSDKTests.swift b/Tests/KlaviyoSwiftTests/KlaviyoSDKTests.swift
index ff668ccb8..3087b3257 100644
--- a/Tests/KlaviyoSwiftTests/KlaviyoSDKTests.swift
+++ b/Tests/KlaviyoSwiftTests/KlaviyoSDKTests.swift
@@ -7,7 +7,7 @@
 
 @testable import KlaviyoSwift
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import XCTest
 
 // MARK: - KlaviyoSDKTests
diff --git a/Tests/KlaviyoSwiftTests/KlaviyoStateTests.swift b/Tests/KlaviyoSwiftTests/KlaviyoStateTests.swift
index e9e3d9a46..6a573ae65 100644
--- a/Tests/KlaviyoSwiftTests/KlaviyoStateTests.swift
+++ b/Tests/KlaviyoSwiftTests/KlaviyoStateTests.swift
@@ -7,7 +7,7 @@
 
 @testable import KlaviyoSwift
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import SnapshotTesting
 import XCTest
 
diff --git a/Tests/KlaviyoSwiftTests/KlaviyoTestUtils.swift b/Tests/KlaviyoSwiftTests/KlaviyoTestUtils.swift
index dc52978f8..a770eeb04 100644
--- a/Tests/KlaviyoSwiftTests/KlaviyoTestUtils.swift
+++ b/Tests/KlaviyoSwiftTests/KlaviyoTestUtils.swift
@@ -5,7 +5,7 @@
 //  Created by Noah Durell on 9/30/22.
 //
 
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 import Combine
 import CombineSchedulers
 import CoreLocation
diff --git a/Tests/KlaviyoSwiftTests/ResolveTrackingLinkTests.swift b/Tests/KlaviyoSwiftTests/ResolveTrackingLinkTests.swift
index 1330a273b..6dec14aa4 100644
--- a/Tests/KlaviyoSwiftTests/ResolveTrackingLinkTests.swift
+++ b/Tests/KlaviyoSwiftTests/ResolveTrackingLinkTests.swift
@@ -5,7 +5,7 @@
 //  Created by Claude on 8/4/25.
 //
 
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 @testable import KlaviyoSwift
 import Combine
 import XCTest
diff --git a/Tests/KlaviyoSwiftTests/StateChangePublisherTests.swift b/Tests/KlaviyoSwiftTests/StateChangePublisherTests.swift
index 45c72f951..9f88f7264 100644
--- a/Tests/KlaviyoSwiftTests/StateChangePublisherTests.swift
+++ b/Tests/KlaviyoSwiftTests/StateChangePublisherTests.swift
@@ -10,7 +10,7 @@ import CombineSchedulers
 import Foundation
 import XCTest
 @_spi(KlaviyoPrivate) @testable import KlaviyoSwift
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 
 final class StateChangePublisherTests: XCTestCase {
     @MainActor
diff --git a/Tests/KlaviyoSwiftTests/StateManagementEdgeCaseTests.swift b/Tests/KlaviyoSwiftTests/StateManagementEdgeCaseTests.swift
index 91e2a516b..98d5269a7 100644
--- a/Tests/KlaviyoSwiftTests/StateManagementEdgeCaseTests.swift
+++ b/Tests/KlaviyoSwiftTests/StateManagementEdgeCaseTests.swift
@@ -7,7 +7,7 @@
 
 @testable import KlaviyoSwift
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 import XCTest
 
 class StateManagementEdgeCaseTests: XCTestCase {
diff --git a/Tests/KlaviyoSwiftTests/StateManagementTests.swift b/Tests/KlaviyoSwiftTests/StateManagementTests.swift
index 8003d8ad3..9d25b14ce 100644
--- a/Tests/KlaviyoSwiftTests/StateManagementTests.swift
+++ b/Tests/KlaviyoSwiftTests/StateManagementTests.swift
@@ -5,7 +5,7 @@
 //  Created by Noah Durell on 12/6/22.
 //
 
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 @testable import KlaviyoSwift
 import AnyCodable
 import Combine
diff --git a/Tests/KlaviyoSwiftTests/TestData.swift b/Tests/KlaviyoSwiftTests/TestData.swift
index 34d6611b0..cb95d37b2 100644
--- a/Tests/KlaviyoSwiftTests/TestData.swift
+++ b/Tests/KlaviyoSwiftTests/TestData.swift
@@ -7,7 +7,7 @@
 
 import Combine
 import Foundation
-import KlaviyoCore
+@_spi(KlaviyoPrivate) import KlaviyoCore
 @_spi(KlaviyoPrivate) @testable import KlaviyoSwift
 
 let TEST_API_KEY = "fake-key"
diff --git a/Tests/KlaviyoSwiftTests/TrackingLinkDestinationResponseTests.swift b/Tests/KlaviyoSwiftTests/TrackingLinkDestinationResponseTests.swift
index 4b02b55c5..4aa98c961 100644
--- a/Tests/KlaviyoSwiftTests/TrackingLinkDestinationResponseTests.swift
+++ b/Tests/KlaviyoSwiftTests/TrackingLinkDestinationResponseTests.swift
@@ -5,7 +5,7 @@
 //  Created by Claude on 8/4/25.
 //
 
-@testable import KlaviyoCore
+@_spi(KlaviyoPrivate) @testable import KlaviyoCore
 @testable import KlaviyoSwift
 import XCTest