diff --git a/Package.swift b/Package.swift
index 04b795686..3bb16ded0 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.1
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the SwiftCrypto open source project
@@ -53,6 +53,7 @@ if development || isFreeBSD {
         "CXKCPShims",
     ]
 } else {
+#if !canImport(Darwin)
     let platforms: [Platform] = [
         Platform.linux,
         Platform.android,
@@ -71,6 +72,19 @@ if development || isFreeBSD {
         .target(name: "CXKCP", condition: .when(platforms: platforms)),
         .target(name: "CXKCPShims", condition: .when(platforms: platforms)),
     ]
+#else
+    swiftSettings = [
+        .define("CRYPTO_IN_SWIFTPM"),
+        .define("CRYPTO_IN_SWIFTPM_FORCE_BUILD_API", .when(traits: ["FORCE_BUILD_SWIFT_CRYPTO_API"])),
+    ]
+    dependencies = [
+        .target(name: "CCryptoBoringSSL", condition: .when(traits: ["FORCE_BUILD_SWIFT_CRYPTO_API"])),
+        .target(name: "CCryptoBoringSSLShims", condition: .when(traits: ["FORCE_BUILD_SWIFT_CRYPTO_API"])),
+        .target(name: "CryptoBoringWrapper", condition: .when(traits: ["FORCE_BUILD_SWIFT_CRYPTO_API"])),
+        .target(name: "CXKCP", condition: .when(traits: ["FORCE_BUILD_SWIFT_CRYPTO_API"])),
+        .target(name: "CXKCPShims", condition: .when(traits: ["FORCE_BUILD_SWIFT_CRYPTO_API"])),
+    ]
+#endif
 }
 
 // This doesn't work when cross-compiling: the privacy manifest will be included in the Bundle and
@@ -96,6 +110,7 @@ let package = Package(
             .library(name: "CCryptoBoringSSL", type: .static, targets: ["CCryptoBoringSSL"]),
             MANGLE_END */
     ],
+    traits: [.trait(name: "FORCE_BUILD_SWIFT_CRYPTO_API")],
     dependencies: [
         // Dependencies are added below so that they can be switched between local and absolute URLs
     ],
diff --git a/Sources/CryptoExtras/AES/AES_CBC.swift b/Sources/CryptoExtras/AES/AES_CBC.swift
index f94910bf3..ce7dc48fa 100644
--- a/Sources/CryptoExtras/AES/AES_CBC.swift
+++ b/Sources/CryptoExtras/AES/AES_CBC.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/AES/AES_CFB.swift b/Sources/CryptoExtras/AES/AES_CFB.swift
index 0334f2a4a..3efbb7b3a 100644
--- a/Sources/CryptoExtras/AES/AES_CFB.swift
+++ b/Sources/CryptoExtras/AES/AES_CFB.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/AES/AES_CTR.swift b/Sources/CryptoExtras/AES/AES_CTR.swift
index 416b0c313..8b33580ea 100644
--- a/Sources/CryptoExtras/AES/AES_CTR.swift
+++ b/Sources/CryptoExtras/AES/AES_CTR.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/AES/AES_GCM_SIV.swift b/Sources/CryptoExtras/AES/AES_GCM_SIV.swift
index 33d0c7edf..27455a7c0 100644
--- a/Sources/CryptoExtras/AES/AES_GCM_SIV.swift
+++ b/Sources/CryptoExtras/AES/AES_GCM_SIV.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 @_implementationOnly import CCryptoBoringSSL
 @_implementationOnly import CCryptoBoringSSLShims
 import CryptoBoringWrapper
diff --git a/Sources/CryptoExtras/AES/Block Function.swift b/Sources/CryptoExtras/AES/Block Function.swift
index 0bf0ccbc8..80ab35ebc 100644
--- a/Sources/CryptoExtras/AES/Block Function.swift	
+++ b/Sources/CryptoExtras/AES/Block Function.swift	
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 @_implementationOnly import CCryptoBoringSSL
 @_implementationOnly import CCryptoBoringSSLShims
 import CryptoBoringWrapper
diff --git a/Sources/CryptoExtras/AES/BoringSSL/AES_CFB_boring.swift b/Sources/CryptoExtras/AES/BoringSSL/AES_CFB_boring.swift
index 69e57ddac..4184fdb01 100644
--- a/Sources/CryptoExtras/AES/BoringSSL/AES_CFB_boring.swift
+++ b/Sources/CryptoExtras/AES/BoringSSL/AES_CFB_boring.swift
@@ -13,7 +13,11 @@
 //===----------------------------------------------------------------------===//
 
 @_implementationOnly import CCryptoBoringSSL
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 #if canImport(FoundationEssentials)
 import FoundationEssentials
diff --git a/Sources/CryptoExtras/AES/BoringSSL/AES_CTR_boring.swift b/Sources/CryptoExtras/AES/BoringSSL/AES_CTR_boring.swift
index 2ed03be5f..63d83b527 100644
--- a/Sources/CryptoExtras/AES/BoringSSL/AES_CTR_boring.swift
+++ b/Sources/CryptoExtras/AES/BoringSSL/AES_CTR_boring.swift
@@ -13,7 +13,11 @@
 //===----------------------------------------------------------------------===//
 
 @_implementationOnly import CCryptoBoringSSL
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 #if canImport(FoundationEssentials)
 import FoundationEssentials
diff --git a/Sources/CryptoExtras/AES/BoringSSL/AES_GCM_SIV_boring.swift b/Sources/CryptoExtras/AES/BoringSSL/AES_GCM_SIV_boring.swift
index 3bc7aff3e..ffafa16a1 100644
--- a/Sources/CryptoExtras/AES/BoringSSL/AES_GCM_SIV_boring.swift
+++ b/Sources/CryptoExtras/AES/BoringSSL/AES_GCM_SIV_boring.swift
@@ -16,7 +16,11 @@
 
 @_implementationOnly import CCryptoBoringSSL
 @_implementationOnly import CCryptoBoringSSLShims
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 import CryptoBoringWrapper
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/CryptoExtras/AES/CMAC.swift b/Sources/CryptoExtras/AES/CMAC.swift
index c96293345..b0a7ea937 100644
--- a/Sources/CryptoExtras/AES/CMAC.swift
+++ b/Sources/CryptoExtras/AES/CMAC.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 @_implementationOnly import CCryptoBoringSSL
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 #if canImport(FoundationEssentials)
 import FoundationEssentials
@@ -47,7 +51,7 @@ extension AES {
         ///   - outputSize: The number of bytes of MAC to generate. Must be in the range 0 to 16 inclusive.
         public init(key: SymmetricKey, outputSize: Int) throws {
             guard [128, 192, 256].contains(key.bitCount) else {
-                throw CryptoError.incorrectKeySize
+                throw CryptoKitError.incorrectKeySize
             }
             guard (0...16).contains(outputSize) else {
                 throw CryptoKitError.incorrectParameterSize
diff --git a/Sources/CryptoExtras/ARC/ARC+API.swift b/Sources/CryptoExtras/ARC/ARC+API.swift
index b40b8c1bf..262c86a52 100644
--- a/Sources/CryptoExtras/ARC/ARC+API.swift
+++ b/Sources/CryptoExtras/ARC/ARC+API.swift
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/ARC/ARC.swift b/Sources/CryptoExtras/ARC/ARC.swift
index 087a13260..20ffa39e8 100644
--- a/Sources/CryptoExtras/ARC/ARC.swift
+++ b/Sources/CryptoExtras/ARC/ARC.swift
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/ARC/ARCCredential.swift b/Sources/CryptoExtras/ARC/ARCCredential.swift
index 915cbc3e3..674d52ed6 100644
--- a/Sources/CryptoExtras/ARC/ARCCredential.swift
+++ b/Sources/CryptoExtras/ARC/ARCCredential.swift
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/ARC/ARCEncoding.swift b/Sources/CryptoExtras/ARC/ARCEncoding.swift
index e445f6f2f..19916a908 100644
--- a/Sources/CryptoExtras/ARC/ARCEncoding.swift
+++ b/Sources/CryptoExtras/ARC/ARCEncoding.swift
@@ -16,7 +16,11 @@ import FoundationEssentials
 #else
 import Foundation
 #endif
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 @available(macOS 10.15, iOS 13.2, tvOS 13.2, watchOS 6.1, macCatalyst 13.2, visionOS 1.2, *)
 typealias ARCP256 = HashToCurveImpl<P256>
diff --git a/Sources/CryptoExtras/ARC/ARCPrecredential.swift b/Sources/CryptoExtras/ARC/ARCPrecredential.swift
index 4259cb096..7bb8b647a 100644
--- a/Sources/CryptoExtras/ARC/ARCPrecredential.swift
+++ b/Sources/CryptoExtras/ARC/ARCPrecredential.swift
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/ARC/ARCPresentation.swift b/Sources/CryptoExtras/ARC/ARCPresentation.swift
index 6f7105438..53dca2e87 100644
--- a/Sources/CryptoExtras/ARC/ARCPresentation.swift
+++ b/Sources/CryptoExtras/ARC/ARCPresentation.swift
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/ARC/ARCRequest.swift b/Sources/CryptoExtras/ARC/ARCRequest.swift
index b36aacfd9..df3f451c0 100644
--- a/Sources/CryptoExtras/ARC/ARCRequest.swift
+++ b/Sources/CryptoExtras/ARC/ARCRequest.swift
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/ARC/ARCResponse.swift b/Sources/CryptoExtras/ARC/ARCResponse.swift
index 059eefd2b..de5e657e5 100644
--- a/Sources/CryptoExtras/ARC/ARCResponse.swift
+++ b/Sources/CryptoExtras/ARC/ARCResponse.swift
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/ARC/ARCServer.swift b/Sources/CryptoExtras/ARC/ARCServer.swift
index c39daece2..9266dd379 100644
--- a/Sources/CryptoExtras/ARC/ARCServer.swift
+++ b/Sources/CryptoExtras/ARC/ARCServer.swift
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/ChaCha20CTR/BoringSSL/ChaCha20CTR_boring.swift b/Sources/CryptoExtras/ChaCha20CTR/BoringSSL/ChaCha20CTR_boring.swift
index 701bf8d8c..5050044c8 100644
--- a/Sources/CryptoExtras/ChaCha20CTR/BoringSSL/ChaCha20CTR_boring.swift
+++ b/Sources/CryptoExtras/ChaCha20CTR/BoringSSL/ChaCha20CTR_boring.swift
@@ -14,7 +14,11 @@
 
 @_implementationOnly import CCryptoBoringSSL
 @_implementationOnly import CCryptoBoringSSLShims
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 import CryptoBoringWrapper
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/CryptoExtras/ChaCha20CTR/ChaCha20CTR.swift b/Sources/CryptoExtras/ChaCha20CTR/ChaCha20CTR.swift
index 385fa6e64..34fef52f9 100644
--- a/Sources/CryptoExtras/ChaCha20CTR/ChaCha20CTR.swift
+++ b/Sources/CryptoExtras/ChaCha20CTR/ChaCha20CTR.swift
@@ -14,7 +14,11 @@
 
 @_implementationOnly import CCryptoBoringSSL
 @_implementationOnly import CCryptoBoringSSLShims
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 import CryptoBoringWrapper
 #if canImport(FoundationEssentials)
 import FoundationEssentials
diff --git a/Sources/CryptoExtras/EC/Curve25519+PEM.swift b/Sources/CryptoExtras/EC/Curve25519+PEM.swift
index 5e8071c83..e148a3b41 100644
--- a/Sources/CryptoExtras/EC/Curve25519+PEM.swift
+++ b/Sources/CryptoExtras/EC/Curve25519+PEM.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 import Foundation
 import SwiftASN1
 
diff --git a/Sources/CryptoExtras/EC/PKCS8DERRepresentation.swift b/Sources/CryptoExtras/EC/PKCS8DERRepresentation.swift
index bfaf11f44..becc27402 100644
--- a/Sources/CryptoExtras/EC/PKCS8DERRepresentation.swift
+++ b/Sources/CryptoExtras/EC/PKCS8DERRepresentation.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 import Foundation
 import SwiftASN1
 
diff --git a/Sources/CryptoExtras/EC/PKCS8PrivateKey.swift b/Sources/CryptoExtras/EC/PKCS8PrivateKey.swift
index 5de7a11e4..5ee715c2b 100644
--- a/Sources/CryptoExtras/EC/PKCS8PrivateKey.swift
+++ b/Sources/CryptoExtras/EC/PKCS8PrivateKey.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 import SwiftASN1
 
 @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, visionOS 1.0, *)
diff --git a/Sources/CryptoExtras/ECToolbox/BoringSSL/ECToolbox_boring.swift b/Sources/CryptoExtras/ECToolbox/BoringSSL/ECToolbox_boring.swift
index 36cb3d738..72b6eef08 100644
--- a/Sources/CryptoExtras/ECToolbox/BoringSSL/ECToolbox_boring.swift
+++ b/Sources/CryptoExtras/ECToolbox/BoringSSL/ECToolbox_boring.swift
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 import CryptoBoringWrapper
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/CryptoExtras/ECToolbox/ECToolbox.swift b/Sources/CryptoExtras/ECToolbox/ECToolbox.swift
index a1eb80e90..f99e8457d 100644
--- a/Sources/CryptoExtras/ECToolbox/ECToolbox.swift
+++ b/Sources/CryptoExtras/ECToolbox/ECToolbox.swift
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/H2G/HashToField.swift b/Sources/CryptoExtras/H2G/HashToField.swift
index 3b9b55c8d..c56f8d276 100644
--- a/Sources/CryptoExtras/H2G/HashToField.swift
+++ b/Sources/CryptoExtras/H2G/HashToField.swift
@@ -29,7 +29,11 @@ import FoundationEssentials
 #else
 import Foundation
 #endif
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, visionOS 1.0, *)
 extension Data {
diff --git a/Sources/CryptoExtras/Key Derivation/KDF.swift b/Sources/CryptoExtras/Key Derivation/KDF.swift
index 6990023d7..75b552552 100644
--- a/Sources/CryptoExtras/Key Derivation/KDF.swift	
+++ b/Sources/CryptoExtras/Key Derivation/KDF.swift	
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/Key Derivation/PBKDF2/BoringSSL/PBKDF2_boring.swift b/Sources/CryptoExtras/Key Derivation/PBKDF2/BoringSSL/PBKDF2_boring.swift
index 6bfbad715..031cebc0c 100644
--- a/Sources/CryptoExtras/Key Derivation/PBKDF2/BoringSSL/PBKDF2_boring.swift	
+++ b/Sources/CryptoExtras/Key Derivation/PBKDF2/BoringSSL/PBKDF2_boring.swift	
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 #if canImport(FoundationEssentials)
 import FoundationEssentials
diff --git a/Sources/CryptoExtras/Key Derivation/PBKDF2/BoringSSL/PBKDF2_commoncrypto.swift b/Sources/CryptoExtras/Key Derivation/PBKDF2/BoringSSL/PBKDF2_commoncrypto.swift
index 5926bbc4a..42df9af4f 100644
--- a/Sources/CryptoExtras/Key Derivation/PBKDF2/BoringSSL/PBKDF2_commoncrypto.swift	
+++ b/Sources/CryptoExtras/Key Derivation/PBKDF2/BoringSSL/PBKDF2_commoncrypto.swift	
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 #if canImport(FoundationEssentials)
 import FoundationEssentials
diff --git a/Sources/CryptoExtras/Key Derivation/PBKDF2/PBKDF2.swift b/Sources/CryptoExtras/Key Derivation/PBKDF2/PBKDF2.swift
index d222f141a..59372ffed 100644
--- a/Sources/CryptoExtras/Key Derivation/PBKDF2/PBKDF2.swift	
+++ b/Sources/CryptoExtras/Key Derivation/PBKDF2/PBKDF2.swift	
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/Key Derivation/Scrypt/BoringSSL/Scrypt_boring.swift b/Sources/CryptoExtras/Key Derivation/Scrypt/BoringSSL/Scrypt_boring.swift
index b89c9bd1e..299c29e79 100644
--- a/Sources/CryptoExtras/Key Derivation/Scrypt/BoringSSL/Scrypt_boring.swift	
+++ b/Sources/CryptoExtras/Key Derivation/Scrypt/BoringSSL/Scrypt_boring.swift	
@@ -14,7 +14,11 @@
 
 @_implementationOnly import CCryptoBoringSSL
 @_implementationOnly import CCryptoBoringSSLShims
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 #if canImport(FoundationEssentials)
 #if os(Windows)
diff --git a/Sources/CryptoExtras/Key Derivation/Scrypt/Scrypt.swift b/Sources/CryptoExtras/Key Derivation/Scrypt/Scrypt.swift
index e0bc93b8f..4a699da5d 100644
--- a/Sources/CryptoExtras/Key Derivation/Scrypt/Scrypt.swift	
+++ b/Sources/CryptoExtras/Key Derivation/Scrypt/Scrypt.swift	
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/OPRFs/OPRF.swift b/Sources/CryptoExtras/OPRFs/OPRF.swift
index 28336d123..963a09f12 100644
--- a/Sources/CryptoExtras/OPRFs/OPRF.swift
+++ b/Sources/CryptoExtras/OPRFs/OPRF.swift
@@ -16,7 +16,11 @@ import FoundationEssentials
 #else
 import Foundation
 #endif
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 /// (Verifiable Partly-)Oblivious Pseudorandom Functions
 /// https://cfrg.github.io/draft-irtf-cfrg-voprf/draft-irtf-cfrg-voprf.html
diff --git a/Sources/CryptoExtras/OPRFs/OPRFClient.swift b/Sources/CryptoExtras/OPRFs/OPRFClient.swift
index a30808210..a189f509b 100644
--- a/Sources/CryptoExtras/OPRFs/OPRFClient.swift
+++ b/Sources/CryptoExtras/OPRFs/OPRFClient.swift
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/OPRFs/OPRFServer.swift b/Sources/CryptoExtras/OPRFs/OPRFServer.swift
index baa3a419a..373643feb 100644
--- a/Sources/CryptoExtras/OPRFs/OPRFServer.swift
+++ b/Sources/CryptoExtras/OPRFs/OPRFServer.swift
@@ -16,7 +16,11 @@ import FoundationEssentials
 #else
 import Foundation
 #endif
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 @available(macOS 10.15, iOS 13.2, tvOS 13.2, watchOS 6.1, macCatalyst 13.2, visionOS 1.2, *)
 extension OPRF {
diff --git a/Sources/CryptoExtras/OPRFs/VOPRF+API.swift b/Sources/CryptoExtras/OPRFs/VOPRF+API.swift
index 44476b0ef..0c1ca61b1 100644
--- a/Sources/CryptoExtras/OPRFs/VOPRF+API.swift
+++ b/Sources/CryptoExtras/OPRFs/VOPRF+API.swift
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/OPRFs/VOPRFClient.swift b/Sources/CryptoExtras/OPRFs/VOPRFClient.swift
index 299e00c1f..a5789bd37 100644
--- a/Sources/CryptoExtras/OPRFs/VOPRFClient.swift
+++ b/Sources/CryptoExtras/OPRFs/VOPRFClient.swift
@@ -11,7 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 #if canImport(FoundationEssentials)
 import FoundationEssentials
 #else
diff --git a/Sources/CryptoExtras/OPRFs/VOPRFServer.swift b/Sources/CryptoExtras/OPRFs/VOPRFServer.swift
index 1a20271fd..da27e9559 100644
--- a/Sources/CryptoExtras/OPRFs/VOPRFServer.swift
+++ b/Sources/CryptoExtras/OPRFs/VOPRFServer.swift
@@ -16,7 +16,11 @@ import FoundationEssentials
 #else
 import Foundation
 #endif
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 @available(macOS 10.15, iOS 13.2, tvOS 13.2, watchOS 6.1, macCatalyst 13.2, visionOS 1.2, *)
 extension OPRF {
diff --git a/Sources/CryptoExtras/RSA/RSA+BlindSigning.swift b/Sources/CryptoExtras/RSA/RSA+BlindSigning.swift
index 3f14da321..e80e3c843 100644
--- a/Sources/CryptoExtras/RSA/RSA+BlindSigning.swift
+++ b/Sources/CryptoExtras/RSA/RSA+BlindSigning.swift
@@ -16,7 +16,11 @@ import FoundationEssentials
 #else
 import Foundation
 #endif
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 import CryptoBoringWrapper
 
 // NOTE: RSABSSA API is implemented using BoringSSL on all platforms.
diff --git a/Sources/CryptoExtras/RSA/RSA.swift b/Sources/CryptoExtras/RSA/RSA.swift
index a6c13a899..b224a0f5f 100644
--- a/Sources/CryptoExtras/RSA/RSA.swift
+++ b/Sources/CryptoExtras/RSA/RSA.swift
@@ -16,7 +16,11 @@ import FoundationEssentials
 #else
 import Foundation
 #endif
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 import CryptoBoringWrapper
 import SwiftASN1
 
diff --git a/Sources/CryptoExtras/RSA/RSA_boring.swift b/Sources/CryptoExtras/RSA/RSA_boring.swift
index c0f3be1ac..a47c5823a 100644
--- a/Sources/CryptoExtras/RSA/RSA_boring.swift
+++ b/Sources/CryptoExtras/RSA/RSA_boring.swift
@@ -15,7 +15,11 @@
 // NOTE: This file is unconditionally compiled because RSABSSA is implemented using BoringSSL on all platforms.
 @_implementationOnly import CCryptoBoringSSL
 @_implementationOnly import CCryptoBoringSSLShims
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 import CryptoBoringWrapper
 
 #if canImport(FoundationEssentials)
diff --git a/Sources/CryptoExtras/Reexport.swift b/Sources/CryptoExtras/Reexport.swift
index 5bfdabc0b..725c334e3 100644
--- a/Sources/CryptoExtras/Reexport.swift
+++ b/Sources/CryptoExtras/Reexport.swift
@@ -12,4 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 @_exported import Crypto
+#endif
diff --git a/Sources/CryptoExtras/Util/BoringSSLHelpers.swift b/Sources/CryptoExtras/Util/BoringSSLHelpers.swift
index b560330c3..9f86ec359 100644
--- a/Sources/CryptoExtras/Util/BoringSSLHelpers.swift
+++ b/Sources/CryptoExtras/Util/BoringSSLHelpers.swift
@@ -20,7 +20,11 @@ import FoundationEssentials
 #else
 import Foundation
 #endif
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, visionOS 1.0, *)
 internal enum BIOHelper {
diff --git a/Sources/CryptoExtras/Util/CryptoKitErrors_boring.swift b/Sources/CryptoExtras/Util/CryptoKitErrors_boring.swift
index 21d5da6fa..d4a45b60b 100644
--- a/Sources/CryptoExtras/Util/CryptoKitErrors_boring.swift
+++ b/Sources/CryptoExtras/Util/CryptoKitErrors_boring.swift
@@ -13,7 +13,11 @@
 //===----------------------------------------------------------------------===//
 
 @_implementationOnly import CCryptoBoringSSL
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, visionOS 1.0, *)
 extension CryptoKitError {
diff --git a/Sources/CryptoExtras/Util/DigestType.swift b/Sources/CryptoExtras/Util/DigestType.swift
index 469c56873..d36f2f578 100644
--- a/Sources/CryptoExtras/Util/DigestType.swift
+++ b/Sources/CryptoExtras/Util/DigestType.swift
@@ -14,7 +14,11 @@
 
 // NOTE: This file is unconditionally compiled because RSABSSA is implemented using BoringSSL on all platforms.
 @_implementationOnly import CCryptoBoringSSL
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, visionOS 1.0, *)
 struct DigestType: @unchecked Sendable {
diff --git a/Sources/CryptoExtras/Util/PEMDocument.swift b/Sources/CryptoExtras/Util/PEMDocument.swift
index 17467a854..b911891cf 100644
--- a/Sources/CryptoExtras/Util/PEMDocument.swift
+++ b/Sources/CryptoExtras/Util/PEMDocument.swift
@@ -16,7 +16,11 @@ import FoundationEssentials
 #else
 import Foundation
 #endif
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, visionOS 1.0, *)
 enum ASN1 {
diff --git a/Sources/CryptoExtras/ZKPs/DLEQ.swift b/Sources/CryptoExtras/ZKPs/DLEQ.swift
index 41cf271ee..17ea360fc 100644
--- a/Sources/CryptoExtras/ZKPs/DLEQ.swift
+++ b/Sources/CryptoExtras/ZKPs/DLEQ.swift
@@ -16,8 +16,11 @@ import FoundationEssentials
 #else
 import Foundation
 #endif
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
-
+#endif
 /// A DLEQ Proof as described in https://cfrg.github.io/draft-irtf-cfrg-voprf/draft-irtf-cfrg-voprf.html#name-generateproof
 @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, visionOS 1.0, *)
 struct DLEQProof<GS: GroupScalar> {
diff --git a/Sources/CryptoExtras/ZKPs/Prover.swift b/Sources/CryptoExtras/ZKPs/Prover.swift
index ac5fa036b..791487696 100644
--- a/Sources/CryptoExtras/ZKPs/Prover.swift
+++ b/Sources/CryptoExtras/ZKPs/Prover.swift
@@ -16,7 +16,11 @@ import FoundationEssentials
 #else
 import Foundation
 #endif
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, visionOS 1.0, *)
 struct Prover<H2G: HashToGroup>: ProofParticipant {
diff --git a/Sources/CryptoExtras/ZKPs/Verifier.swift b/Sources/CryptoExtras/ZKPs/Verifier.swift
index 8a9a8445e..057a5872a 100644
--- a/Sources/CryptoExtras/ZKPs/Verifier.swift
+++ b/Sources/CryptoExtras/ZKPs/Verifier.swift
@@ -16,7 +16,11 @@ import FoundationEssentials
 #else
 import Foundation
 #endif
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, visionOS 1.0, *)
 struct Verifier<H2G: HashToGroup>: ProofParticipant {
diff --git a/Sources/CryptoExtras/ZKPs/ZKPToolbox.swift b/Sources/CryptoExtras/ZKPs/ZKPToolbox.swift
index 8c7db5d14..e4fd62c33 100644
--- a/Sources/CryptoExtras/ZKPs/ZKPToolbox.swift
+++ b/Sources/CryptoExtras/ZKPs/ZKPToolbox.swift
@@ -16,7 +16,11 @@ import FoundationEssentials
 #else
 import Foundation
 #endif
+#if CRYPTO_IN_SWIFTPM && !CRYPTO_IN_SWIFTPM_FORCE_BUILD_API
+@_exported import CryptoKit
+#else
 import Crypto
+#endif
 
 @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, visionOS 1.0, *)
 struct ScalarVar {