diff --git a/Sources/Auth/AuthAdmin.swift b/Sources/Auth/AuthAdmin.swift
index 8f5cc8eb..c287f47b 100644
--- a/Sources/Auth/AuthAdmin.swift
+++ b/Sources/Auth/AuthAdmin.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import HTTPTypes
-import Helpers
 
 public struct AuthAdmin: Sendable {
   let clientID: AuthClientID
diff --git a/Sources/Auth/AuthClient.swift b/Sources/Auth/AuthClient.swift
index 76fb9bda..9948ea1f 100644
--- a/Sources/Auth/AuthClient.swift
+++ b/Sources/Auth/AuthClient.swift
@@ -1,6 +1,5 @@
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 #if canImport(AuthenticationServices)
   import AuthenticationServices
diff --git a/Sources/Auth/AuthClientConfiguration.swift b/Sources/Auth/AuthClientConfiguration.swift
index e5944aee..a9a0dc38 100644
--- a/Sources/Auth/AuthClientConfiguration.swift
+++ b/Sources/Auth/AuthClientConfiguration.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Auth/AuthError.swift b/Sources/Auth/AuthError.swift
index f2ff6f87..5349d36f 100644
--- a/Sources/Auth/AuthError.swift
+++ b/Sources/Auth/AuthError.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Auth/AuthMFA.swift b/Sources/Auth/AuthMFA.swift
index 2b57c67e..bf6390b2 100644
--- a/Sources/Auth/AuthMFA.swift
+++ b/Sources/Auth/AuthMFA.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 /// Contains the full multi-factor authentication API.
 public struct AuthMFA: Sendable {
diff --git a/Sources/Auth/AuthStateChangeListener.swift b/Sources/Auth/AuthStateChangeListener.swift
index de5c69a9..c0d79415 100644
--- a/Sources/Auth/AuthStateChangeListener.swift
+++ b/Sources/Auth/AuthStateChangeListener.swift
@@ -7,7 +7,7 @@
 
 import ConcurrencyExtras
 import Foundation
-import Helpers
+
 
 /// A listener that can be removed by calling ``AuthStateChangeListenerRegistration/remove()``.
 ///
diff --git a/Sources/Auth/Defaults.swift b/Sources/Auth/Defaults.swift
index 309f5c3d..08a6f77c 100644
--- a/Sources/Auth/Defaults.swift
+++ b/Sources/Auth/Defaults.swift
@@ -7,7 +7,6 @@
 
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 extension AuthClient.Configuration {
   /// The default JSONEncoder instance used by the ``AuthClient``.
diff --git a/Sources/Auth/Deprecated.swift b/Sources/Auth/Deprecated.swift
index 5a77e208..9b0ca5f2 100644
--- a/Sources/Auth/Deprecated.swift
+++ b/Sources/Auth/Deprecated.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Auth/Exports.swift b/Sources/Auth/Exports.swift
new file mode 100644
index 00000000..c0545ac2
--- /dev/null
+++ b/Sources/Auth/Exports.swift
@@ -0,0 +1,8 @@
+//
+//  Exports.swift
+//  Supabase
+//
+//  Created by Guilherme Souza on 30/05/25.
+//
+
+@_exported import Helpers
diff --git a/Sources/Auth/Internal/APIClient.swift b/Sources/Auth/Internal/APIClient.swift
index af7eece5..92412b7f 100644
--- a/Sources/Auth/Internal/APIClient.swift
+++ b/Sources/Auth/Internal/APIClient.swift
@@ -1,6 +1,5 @@
 import Foundation
 import HTTPTypes
-import Helpers
 
 extension HTTPClient {
   init(configuration: AuthClient.Configuration) {
diff --git a/Sources/Auth/Internal/CodeVerifierStorage.swift b/Sources/Auth/Internal/CodeVerifierStorage.swift
index 4f0ebc8d..d4a1f4b4 100644
--- a/Sources/Auth/Internal/CodeVerifierStorage.swift
+++ b/Sources/Auth/Internal/CodeVerifierStorage.swift
@@ -1,6 +1,5 @@
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 struct CodeVerifierStorage: Sendable {
   var get: @Sendable () -> String?
diff --git a/Sources/Auth/Internal/Dependencies.swift b/Sources/Auth/Internal/Dependencies.swift
index c1e0603a..24488727 100644
--- a/Sources/Auth/Internal/Dependencies.swift
+++ b/Sources/Auth/Internal/Dependencies.swift
@@ -1,6 +1,5 @@
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 struct Dependencies: Sendable {
   var configuration: AuthClient.Configuration
diff --git a/Sources/Auth/Internal/EventEmitter.swift b/Sources/Auth/Internal/EventEmitter.swift
index 53b66b76..157b2583 100644
--- a/Sources/Auth/Internal/EventEmitter.swift
+++ b/Sources/Auth/Internal/EventEmitter.swift
@@ -1,6 +1,5 @@
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 struct AuthStateChangeEventEmitter {
   var emitter = EventEmitter<(AuthChangeEvent, Session?)?>(initialEvent: nil, emitsLastEventWhenAttaching: false)
diff --git a/Sources/Auth/Internal/Helpers.swift b/Sources/Auth/Internal/Helpers.swift
index de321a30..fa1f2e27 100644
--- a/Sources/Auth/Internal/Helpers.swift
+++ b/Sources/Auth/Internal/Helpers.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 /// Extracts parameters encoded in the URL both in the query and fragment.
 func extractParams(from url: URL) -> [String: String] {
diff --git a/Sources/Auth/Internal/SessionManager.swift b/Sources/Auth/Internal/SessionManager.swift
index 6109ed60..1979f297 100644
--- a/Sources/Auth/Internal/SessionManager.swift
+++ b/Sources/Auth/Internal/SessionManager.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 struct SessionManager: Sendable {
   var session: @Sendable () async throws -> Session
diff --git a/Sources/Auth/Internal/SessionStorage.swift b/Sources/Auth/Internal/SessionStorage.swift
index be2cf77c..c922bbd8 100644
--- a/Sources/Auth/Internal/SessionStorage.swift
+++ b/Sources/Auth/Internal/SessionStorage.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 struct SessionStorage {
   var get: @Sendable () -> Session?
diff --git a/Sources/Auth/Types.swift b/Sources/Auth/Types.swift
index 16c9bd5c..3aca69ca 100644
--- a/Sources/Auth/Types.swift
+++ b/Sources/Auth/Types.swift
@@ -1,8 +1,4 @@
 import Foundation
-import Helpers
-
-public typealias AnyJSON = Helpers.AnyJSON
-public typealias JSONObject = Helpers.JSONObject
 
 public enum AuthChangeEvent: String, Sendable {
   case initialSession = "INITIAL_SESSION"
diff --git a/Sources/Functions/Exports.swift b/Sources/Functions/Exports.swift
new file mode 100644
index 00000000..c0545ac2
--- /dev/null
+++ b/Sources/Functions/Exports.swift
@@ -0,0 +1,8 @@
+//
+//  Exports.swift
+//  Supabase
+//
+//  Created by Guilherme Souza on 30/05/25.
+//
+
+@_exported import Helpers
diff --git a/Sources/Functions/FunctionsClient.swift b/Sources/Functions/FunctionsClient.swift
index 5ee7e577..0e05c87a 100644
--- a/Sources/Functions/FunctionsClient.swift
+++ b/Sources/Functions/FunctionsClient.swift
@@ -1,7 +1,6 @@
 import ConcurrencyExtras
 import Foundation
 import HTTPTypes
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Functions/Types.swift b/Sources/Functions/Types.swift
index e69f036e..e53f06fd 100644
--- a/Sources/Functions/Types.swift
+++ b/Sources/Functions/Types.swift
@@ -1,6 +1,5 @@
 import Foundation
 import HTTPTypes
-import Helpers
 
 /// An error type representing various errors that can occur while invoking functions.
 public enum FunctionsError: Error, LocalizedError {
diff --git a/Sources/PostgREST/Defaults.swift b/Sources/PostgREST/Defaults.swift
index bceff89c..a823b015 100644
--- a/Sources/PostgREST/Defaults.swift
+++ b/Sources/PostgREST/Defaults.swift
@@ -7,7 +7,6 @@
 
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 let version = Helpers.version
 
diff --git a/Sources/PostgREST/Exports.swift b/Sources/PostgREST/Exports.swift
new file mode 100644
index 00000000..c0545ac2
--- /dev/null
+++ b/Sources/PostgREST/Exports.swift
@@ -0,0 +1,8 @@
+//
+//  Exports.swift
+//  Supabase
+//
+//  Created by Guilherme Souza on 30/05/25.
+//
+
+@_exported import Helpers
diff --git a/Sources/PostgREST/PostgrestBuilder.swift b/Sources/PostgREST/PostgrestBuilder.swift
index 6b5d5034..2f91af44 100644
--- a/Sources/PostgREST/PostgrestBuilder.swift
+++ b/Sources/PostgREST/PostgrestBuilder.swift
@@ -1,6 +1,5 @@
 import ConcurrencyExtras
 import Foundation
-import Helpers
 import HTTPTypes
 
 #if canImport(FoundationNetworking)
diff --git a/Sources/PostgREST/PostgrestClient.swift b/Sources/PostgREST/PostgrestClient.swift
index 9c651c50..a839aac9 100644
--- a/Sources/PostgREST/PostgrestClient.swift
+++ b/Sources/PostgREST/PostgrestClient.swift
@@ -1,11 +1,6 @@
 import ConcurrencyExtras
 import Foundation
 import HTTPTypes
-import Helpers
-
-public typealias PostgrestError = Helpers.PostgrestError
-public typealias HTTPError = Helpers.HTTPError
-public typealias AnyJSON = Helpers.AnyJSON
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/PostgREST/PostgrestFilterBuilder.swift b/Sources/PostgREST/PostgrestFilterBuilder.swift
index c5ee4ad5..02e50df8 100644
--- a/Sources/PostgREST/PostgrestFilterBuilder.swift
+++ b/Sources/PostgREST/PostgrestFilterBuilder.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 public class PostgrestFilterBuilder: PostgrestTransformBuilder, @unchecked Sendable {
   public enum Operator: String, CaseIterable, Sendable {
diff --git a/Sources/PostgREST/PostgrestFilterValue.swift b/Sources/PostgREST/PostgrestFilterValue.swift
index 254b3cfe..1d26ca7d 100644
--- a/Sources/PostgREST/PostgrestFilterValue.swift
+++ b/Sources/PostgREST/PostgrestFilterValue.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 /// A value that can be used to filter Postgrest queries.
 public protocol PostgrestFilterValue {
diff --git a/Sources/PostgREST/PostgrestQueryBuilder.swift b/Sources/PostgREST/PostgrestQueryBuilder.swift
index ee231a5f..17660dc0 100644
--- a/Sources/PostgREST/PostgrestQueryBuilder.swift
+++ b/Sources/PostgREST/PostgrestQueryBuilder.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 public final class PostgrestQueryBuilder: PostgrestBuilder, @unchecked Sendable {
   /// Perform a SELECT query on the table or view.
diff --git a/Sources/PostgREST/PostgrestTransformBuilder.swift b/Sources/PostgREST/PostgrestTransformBuilder.swift
index f0b470f8..89847753 100644
--- a/Sources/PostgREST/PostgrestTransformBuilder.swift
+++ b/Sources/PostgREST/PostgrestTransformBuilder.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 public class PostgrestTransformBuilder: PostgrestBuilder, @unchecked Sendable {
   /// Perform a SELECT on the query result.
diff --git a/Sources/Realtime/CallbackManager.swift b/Sources/Realtime/CallbackManager.swift
index 3d92e184..91a8e199 100644
--- a/Sources/Realtime/CallbackManager.swift
+++ b/Sources/Realtime/CallbackManager.swift
@@ -1,6 +1,5 @@
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 final class CallbackManager: Sendable {
   struct MutableState {
diff --git a/Sources/Realtime/Deprecated/Deprecated.swift b/Sources/Realtime/Deprecated/Deprecated.swift
index 27d32f91..c0cb2937 100644
--- a/Sources/Realtime/Deprecated/Deprecated.swift
+++ b/Sources/Realtime/Deprecated/Deprecated.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 @available(*, deprecated, renamed: "RealtimeMessage")
 public typealias Message = RealtimeMessage
diff --git a/Sources/Realtime/Deprecated/RealtimeChannel.swift b/Sources/Realtime/Deprecated/RealtimeChannel.swift
index 380df82f..22169bc1 100644
--- a/Sources/Realtime/Deprecated/RealtimeChannel.swift
+++ b/Sources/Realtime/Deprecated/RealtimeChannel.swift
@@ -20,7 +20,6 @@
 
 import ConcurrencyExtras
 import Foundation
-import Helpers
 import Swift
 import HTTPTypes
 
diff --git a/Sources/Realtime/Deprecated/RealtimeClient.swift b/Sources/Realtime/Deprecated/RealtimeClient.swift
index ce849702..d1eabe92 100644
--- a/Sources/Realtime/Deprecated/RealtimeClient.swift
+++ b/Sources/Realtime/Deprecated/RealtimeClient.swift
@@ -20,7 +20,6 @@
 
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Realtime/Deprecated/RealtimeMessage.swift b/Sources/Realtime/Deprecated/RealtimeMessage.swift
index 3feb0066..a993ae2d 100644
--- a/Sources/Realtime/Deprecated/RealtimeMessage.swift
+++ b/Sources/Realtime/Deprecated/RealtimeMessage.swift
@@ -19,7 +19,6 @@
 // THE SOFTWARE.
 
 import Foundation
-import Helpers
 
 /// Data that is received from the Server.
 public struct RealtimeMessage {
diff --git a/Sources/Realtime/Exports.swift b/Sources/Realtime/Exports.swift
new file mode 100644
index 00000000..c0545ac2
--- /dev/null
+++ b/Sources/Realtime/Exports.swift
@@ -0,0 +1,8 @@
+//
+//  Exports.swift
+//  Supabase
+//
+//  Created by Guilherme Souza on 30/05/25.
+//
+
+@_exported import Helpers
diff --git a/Sources/Realtime/PostgresAction.swift b/Sources/Realtime/PostgresAction.swift
index 320fea96..265bd2bf 100644
--- a/Sources/Realtime/PostgresAction.swift
+++ b/Sources/Realtime/PostgresAction.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 public struct Column: Equatable, Codable, Sendable {
   public let name: String
diff --git a/Sources/Realtime/PostgresActionData.swift b/Sources/Realtime/PostgresActionData.swift
index bf46856d..3d8f9d1e 100644
--- a/Sources/Realtime/PostgresActionData.swift
+++ b/Sources/Realtime/PostgresActionData.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 struct PostgresActionData: Codable {
   var type: String
diff --git a/Sources/Realtime/PresenceAction.swift b/Sources/Realtime/PresenceAction.swift
index f019ea34..f8753afb 100644
--- a/Sources/Realtime/PresenceAction.swift
+++ b/Sources/Realtime/PresenceAction.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 public struct PresenceV2: Hashable, Sendable {
   /// The presence reference of the object.
diff --git a/Sources/Realtime/PushV2.swift b/Sources/Realtime/PushV2.swift
index 81829860..66d4d49e 100644
--- a/Sources/Realtime/PushV2.swift
+++ b/Sources/Realtime/PushV2.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 /// Represents the different status of a push
 public enum PushStatus: String, Sendable {
diff --git a/Sources/Realtime/RealtimeChannelV2.swift b/Sources/Realtime/RealtimeChannelV2.swift
index 384d84af..d7447882 100644
--- a/Sources/Realtime/RealtimeChannelV2.swift
+++ b/Sources/Realtime/RealtimeChannelV2.swift
@@ -1,7 +1,6 @@
 import ConcurrencyExtras
 import Foundation
 import HTTPTypes
-import Helpers
 import IssueReporting
 
 #if canImport(FoundationNetworking)
diff --git a/Sources/Realtime/RealtimeClientV2.swift b/Sources/Realtime/RealtimeClientV2.swift
index 831a1b0c..af44bcd4 100644
--- a/Sources/Realtime/RealtimeClientV2.swift
+++ b/Sources/Realtime/RealtimeClientV2.swift
@@ -7,14 +7,11 @@
 
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
 #endif
 
-public typealias JSONObject = Helpers.JSONObject
-
 /// Factory function for returning a new WebSocket connection.
 typealias WebSocketTransport = @Sendable (_ url: URL, _ headers: [String: String]) async throws ->
   any WebSocket
diff --git a/Sources/Realtime/RealtimeMessageV2.swift b/Sources/Realtime/RealtimeMessageV2.swift
index 200498cd..ae111ef5 100644
--- a/Sources/Realtime/RealtimeMessageV2.swift
+++ b/Sources/Realtime/RealtimeMessageV2.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 public struct RealtimeMessageV2: Hashable, Codable, Sendable {
   public let joinRef: String?
diff --git a/Sources/Realtime/Types.swift b/Sources/Realtime/Types.swift
index 5f45a248..f1bd073e 100644
--- a/Sources/Realtime/Types.swift
+++ b/Sources/Realtime/Types.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import HTTPTypes
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Storage/Exports.swift b/Sources/Storage/Exports.swift
new file mode 100644
index 00000000..c0545ac2
--- /dev/null
+++ b/Sources/Storage/Exports.swift
@@ -0,0 +1,8 @@
+//
+//  Exports.swift
+//  Supabase
+//
+//  Created by Guilherme Souza on 30/05/25.
+//
+
+@_exported import Helpers
diff --git a/Sources/Storage/Helpers.swift b/Sources/Storage/Helpers.swift
index 11ba43df..95d3eb9a 100644
--- a/Sources/Storage/Helpers.swift
+++ b/Sources/Storage/Helpers.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 #if canImport(MobileCoreServices)
   import MobileCoreServices
diff --git a/Sources/Storage/MultipartFormData.swift b/Sources/Storage/MultipartFormData.swift
index f4b70bf6..7fa45f2f 100644
--- a/Sources/Storage/MultipartFormData.swift
+++ b/Sources/Storage/MultipartFormData.swift
@@ -26,7 +26,6 @@
 
 import Foundation
 import HTTPTypes
-import Helpers
 
 #if canImport(MobileCoreServices)
   import MobileCoreServices
diff --git a/Sources/Storage/StorageApi.swift b/Sources/Storage/StorageApi.swift
index 32008133..a537b6ec 100644
--- a/Sources/Storage/StorageApi.swift
+++ b/Sources/Storage/StorageApi.swift
@@ -1,6 +1,5 @@
 import Foundation
 import HTTPTypes
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Storage/StorageBucketApi.swift b/Sources/Storage/StorageBucketApi.swift
index ddbb426a..c91ea90e 100644
--- a/Sources/Storage/StorageBucketApi.swift
+++ b/Sources/Storage/StorageBucketApi.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Storage/StorageFileApi.swift b/Sources/Storage/StorageFileApi.swift
index 9852d893..5ec49be9 100644
--- a/Sources/Storage/StorageFileApi.swift
+++ b/Sources/Storage/StorageFileApi.swift
@@ -1,6 +1,5 @@
 import Foundation
 import HTTPTypes
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Storage/SupabaseStorage.swift b/Sources/Storage/SupabaseStorage.swift
index ed57a66e..f4ed85f6 100644
--- a/Sources/Storage/SupabaseStorage.swift
+++ b/Sources/Storage/SupabaseStorage.swift
@@ -1,8 +1,4 @@
 import Foundation
-import Helpers
-
-public typealias SupabaseLogger = Helpers.SupabaseLogger
-public typealias SupabaseLogMessage = Helpers.SupabaseLogMessage
 
 public struct StorageClientConfiguration: Sendable {
   public let url: URL
diff --git a/Sources/Storage/Types.swift b/Sources/Storage/Types.swift
index d47be699..c1b3dd93 100644
--- a/Sources/Storage/Types.swift
+++ b/Sources/Storage/Types.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 public struct SearchOptions: Encodable, Sendable {
   var prefix: String
diff --git a/Sources/Supabase/Constants.swift b/Sources/Supabase/Constants.swift
index cb4ac4e5..94037834 100644
--- a/Sources/Supabase/Constants.swift
+++ b/Sources/Supabase/Constants.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 let defaultHeaders: [String: String] = {
   var headers = [
diff --git a/Sources/Supabase/Exports.swift b/Sources/Supabase/Exports.swift
new file mode 100644
index 00000000..fef9e709
--- /dev/null
+++ b/Sources/Supabase/Exports.swift
@@ -0,0 +1,13 @@
+//
+//  Exports.swift
+//  Supabase
+//
+//  Created by Guilherme Souza on 30/05/25.
+//
+
+@_exported import Auth
+@_exported import Functions
+@_exported import Helpers
+@_exported import PostgREST
+@_exported import Realtime
+@_exported import Storage
diff --git a/Sources/Supabase/SupabaseClient.swift b/Sources/Supabase/SupabaseClient.swift
index 849cd3ae..97b38b2f 100644
--- a/Sources/Supabase/SupabaseClient.swift
+++ b/Sources/Supabase/SupabaseClient.swift
@@ -1,22 +1,12 @@
-@_exported import Auth
 import ConcurrencyExtras
 import Foundation
-@_exported import Functions
 import HTTPTypes
-import Helpers
 import IssueReporting
-@_exported import PostgREST
-@_exported import Realtime
-@_exported import Storage
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
 #endif
 
-public typealias SupabaseLogger = Helpers.SupabaseLogger
-public typealias SupabaseLogLevel = Helpers.SupabaseLogLevel
-public typealias SupabaseLogMessage = Helpers.SupabaseLogMessage
-
 /// Supabase Client.
 public final class SupabaseClient: Sendable {
   let options: SupabaseClientOptions
@@ -35,7 +25,8 @@ public final class SupabaseClient: Sendable {
         """
         Supabase Client is configured with the auth.accessToken option,
         accessing supabase.auth is not possible.
-        """)
+        """
+      )
     }
     return _auth
   }
diff --git a/Sources/Supabase/Types.swift b/Sources/Supabase/Types.swift
index dd7a04a8..5d5bd9fb 100644
--- a/Sources/Supabase/Types.swift
+++ b/Sources/Supabase/Types.swift
@@ -1,8 +1,4 @@
-import Auth
 import Foundation
-import Helpers
-import PostgREST
-import Realtime
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/TestHelpers/Exports.swift b/Sources/TestHelpers/Exports.swift
new file mode 100644
index 00000000..c0545ac2
--- /dev/null
+++ b/Sources/TestHelpers/Exports.swift
@@ -0,0 +1,8 @@
+//
+//  Exports.swift
+//  Supabase
+//
+//  Created by Guilherme Souza on 30/05/25.
+//
+
+@_exported import Helpers
diff --git a/Sources/TestHelpers/HTTPClientMock.swift b/Sources/TestHelpers/HTTPClientMock.swift
index 3de790de..4b8abcd3 100644
--- a/Sources/TestHelpers/HTTPClientMock.swift
+++ b/Sources/TestHelpers/HTTPClientMock.swift
@@ -7,7 +7,6 @@
 
 import ConcurrencyExtras
 import Foundation
-import Helpers
 import XCTestDynamicOverlay
 
 package actor HTTPClientMock: HTTPClientType {
diff --git a/Tests/AuthTests/AuthClientTests.swift b/Tests/AuthTests/AuthClientTests.swift
index 57105062..2a364045 100644
--- a/Tests/AuthTests/AuthClientTests.swift
+++ b/Tests/AuthTests/AuthClientTests.swift
@@ -7,7 +7,6 @@
 
 import ConcurrencyExtras
 import CustomDump
-import Helpers
 import InlineSnapshotTesting
 import Mocker
 import TestHelpers
diff --git a/Tests/AuthTests/Mocks/Mocks.swift b/Tests/AuthTests/Mocks/Mocks.swift
index fdd06678..e6b75831 100644
--- a/Tests/AuthTests/Mocks/Mocks.swift
+++ b/Tests/AuthTests/Mocks/Mocks.swift
@@ -7,7 +7,6 @@
 
 import ConcurrencyExtras
 import Foundation
-import Helpers
 import TestHelpers
 import XCTestDynamicOverlay
 
diff --git a/Tests/AuthTests/RequestsTests.swift b/Tests/AuthTests/RequestsTests.swift
index 0db09eb2..92c5b5aa 100644
--- a/Tests/AuthTests/RequestsTests.swift
+++ b/Tests/AuthTests/RequestsTests.swift
@@ -5,7 +5,6 @@
 //  Created by Guilherme Souza on 07/10/23.
 //
 
-import Helpers
 import InlineSnapshotTesting
 import SnapshotTesting
 import TestHelpers
diff --git a/Tests/AuthTests/SessionManagerTests.swift b/Tests/AuthTests/SessionManagerTests.swift
index 4fa316bd..3042419e 100644
--- a/Tests/AuthTests/SessionManagerTests.swift
+++ b/Tests/AuthTests/SessionManagerTests.swift
@@ -7,7 +7,6 @@
 
 import ConcurrencyExtras
 import CustomDump
-import Helpers
 import InlineSnapshotTesting
 import TestHelpers
 import XCTest
diff --git a/Tests/FunctionsTests/FunctionsClientTests.swift b/Tests/FunctionsTests/FunctionsClientTests.swift
index 7e2535a6..2d19c5d2 100644
--- a/Tests/FunctionsTests/FunctionsClientTests.swift
+++ b/Tests/FunctionsTests/FunctionsClientTests.swift
@@ -1,6 +1,5 @@
 import ConcurrencyExtras
 import HTTPTypes
-import Helpers
 import InlineSnapshotTesting
 import Mocker
 import TestHelpers
diff --git a/Tests/HelpersTests/AnyJSONTests.swift b/Tests/HelpersTests/AnyJSONTests.swift
index e486cf7e..02971a23 100644
--- a/Tests/HelpersTests/AnyJSONTests.swift
+++ b/Tests/HelpersTests/AnyJSONTests.swift
@@ -8,7 +8,6 @@
 import CustomDump
 import Foundation
 import XCTest
-
 import Helpers
 
 final class AnyJSONTests: XCTestCase {
diff --git a/Tests/HelpersTests/EventEmitterTests.swift b/Tests/HelpersTests/EventEmitterTests.swift
index f673a5a8..8d81a5cb 100644
--- a/Tests/HelpersTests/EventEmitterTests.swift
+++ b/Tests/HelpersTests/EventEmitterTests.swift
@@ -6,9 +6,8 @@
 //
 
 import ConcurrencyExtras
-import XCTest
-
 import Helpers
+import XCTest
 
 final class EventEmitterTests: XCTestCase {
 
diff --git a/Tests/HelpersTests/JWTTests.swift b/Tests/HelpersTests/JWTTests.swift
index e1fdeece..43d11f2c 100644
--- a/Tests/HelpersTests/JWTTests.swift
+++ b/Tests/HelpersTests/JWTTests.swift
@@ -1,5 +1,4 @@
 import XCTest
-
 import Helpers
 
 final class JWTTests: XCTestCase {
diff --git a/Tests/HelpersTests/WithTimeoutTests.swift b/Tests/HelpersTests/WithTimeoutTests.swift
index e17013e4..f30f51ab 100644
--- a/Tests/HelpersTests/WithTimeoutTests.swift
+++ b/Tests/HelpersTests/WithTimeoutTests.swift
@@ -10,25 +10,25 @@ import Helpers
 import XCTest
 
 final class WithTimeoutTests: XCTestCase {
-//  func testWithTimeout() async {
-//    do {
-//      try await withTimeout(interval: 0.25) {
-//        try await Task.sleep(nanoseconds: NSEC_PER_SEC)
-//      }
-//      XCTFail("Task should timeout.")
-//    } catch {
-//      XCTAssertTrue(error is TimeoutError)
-//    }
-//
-//    do {
-//      let answer = try await withTimeout(interval: 1.25) {
-//        try await Task.sleep(nanoseconds: NSEC_PER_SEC)
-//        return 42
-//      }
-//
-//      XCTAssertEqual(answer, 42)
-//    } catch {
-//      XCTFail("Should not throw error: \(error)")
-//    }
-//  }
+  //  func testWithTimeout() async {
+  //    do {
+  //      try await withTimeout(interval: 0.25) {
+  //        try await Task.sleep(nanoseconds: NSEC_PER_SEC)
+  //      }
+  //      XCTFail("Task should timeout.")
+  //    } catch {
+  //      XCTAssertTrue(error is TimeoutError)
+  //    }
+  //
+  //    do {
+  //      let answer = try await withTimeout(interval: 1.25) {
+  //        try await Task.sleep(nanoseconds: NSEC_PER_SEC)
+  //        return 42
+  //      }
+  //
+  //      XCTAssertEqual(answer, 42)
+  //    } catch {
+  //      XCTFail("Should not throw error: \(error)")
+  //    }
+  //  }
 }
diff --git a/Tests/IntegrationTests/RealtimeIntegrationTests.swift b/Tests/IntegrationTests/RealtimeIntegrationTests.swift
index 0c3c0b7e..e641154e 100644
--- a/Tests/IntegrationTests/RealtimeIntegrationTests.swift
+++ b/Tests/IntegrationTests/RealtimeIntegrationTests.swift
@@ -8,9 +8,7 @@
 import Clocks
 import ConcurrencyExtras
 import CustomDump
-import Helpers
 import InlineSnapshotTesting
-import PostgREST
 import Supabase
 import TestHelpers
 import XCTest
diff --git a/Tests/IntegrationTests/StorageFileIntegrationTests.swift b/Tests/IntegrationTests/StorageFileIntegrationTests.swift
index 188090a9..5c77c77b 100644
--- a/Tests/IntegrationTests/StorageFileIntegrationTests.swift
+++ b/Tests/IntegrationTests/StorageFileIntegrationTests.swift
@@ -8,7 +8,6 @@
 import InlineSnapshotTesting
 import Storage
 import XCTest
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Tests/PostgRESTTests/BuildURLRequestTests.swift b/Tests/PostgRESTTests/BuildURLRequestTests.swift
index 1be71197..6c4cbf37 100644
--- a/Tests/PostgRESTTests/BuildURLRequestTests.swift
+++ b/Tests/PostgRESTTests/BuildURLRequestTests.swift
@@ -1,6 +1,5 @@
 import ConcurrencyExtras
 import Foundation
-import Helpers
 import SnapshotTesting
 import XCTest
 
diff --git a/Tests/PostgRESTTests/PostgrestRpcBuilderTests.swift b/Tests/PostgRESTTests/PostgrestRpcBuilderTests.swift
index 8b163e42..8d4d6782 100644
--- a/Tests/PostgRESTTests/PostgrestRpcBuilderTests.swift
+++ b/Tests/PostgRESTTests/PostgrestRpcBuilderTests.swift
@@ -5,7 +5,6 @@
 //  Created by Guilherme Souza on 21/01/25.
 //
 
-import Helpers
 import InlineSnapshotTesting
 import Mocker
 import PostgREST
diff --git a/Tests/RealtimeTests/CallbackManagerTests.swift b/Tests/RealtimeTests/CallbackManagerTests.swift
index 779993b2..69403ba2 100644
--- a/Tests/RealtimeTests/CallbackManagerTests.swift
+++ b/Tests/RealtimeTests/CallbackManagerTests.swift
@@ -7,7 +7,6 @@
 
 import ConcurrencyExtras
 import CustomDump
-import Helpers
 import XCTest
 
 @testable import Realtime
diff --git a/Tests/RealtimeTests/RealtimeTests.swift b/Tests/RealtimeTests/RealtimeTests.swift
index f1517558..54d26be0 100644
--- a/Tests/RealtimeTests/RealtimeTests.swift
+++ b/Tests/RealtimeTests/RealtimeTests.swift
@@ -1,7 +1,6 @@
 import Clocks
 import ConcurrencyExtras
 import CustomDump
-import Helpers
 import InlineSnapshotTesting
 import TestHelpers
 import XCTest
diff --git a/Tests/RealtimeTests/_PushTests.swift b/Tests/RealtimeTests/_PushTests.swift
index f9c7f877..ce901bb9 100644
--- a/Tests/RealtimeTests/_PushTests.swift
+++ b/Tests/RealtimeTests/_PushTests.swift
@@ -6,7 +6,6 @@
 //
 
 import ConcurrencyExtras
-import Helpers
 import TestHelpers
 import XCTest
 
diff --git a/Tests/StorageTests/FileOptionsTests.swift b/Tests/StorageTests/FileOptionsTests.swift
index 6821ad81..35224d1b 100644
--- a/Tests/StorageTests/FileOptionsTests.swift
+++ b/Tests/StorageTests/FileOptionsTests.swift
@@ -1,4 +1,3 @@
-import Helpers
 import XCTest
 
 @testable import Storage
diff --git a/Tests/StorageTests/StorageFileAPITests.swift b/Tests/StorageTests/StorageFileAPITests.swift
index 8b91d076..d407e8b2 100644
--- a/Tests/StorageTests/StorageFileAPITests.swift
+++ b/Tests/StorageTests/StorageFileAPITests.swift
@@ -1,4 +1,3 @@
-import Helpers
 import InlineSnapshotTesting
 import Mocker
 import TestHelpers