diff --git a/Sources/OpenAPIRuntime/Conversion/Converter.swift b/Sources/OpenAPIRuntime/Conversion/Converter.swift
index bd7566b9..69223da5 100644
--- a/Sources/OpenAPIRuntime/Conversion/Converter.swift
+++ b/Sources/OpenAPIRuntime/Conversion/Converter.swift
@@ -12,11 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 #if canImport(Darwin)
-import Foundation
+import class Foundation.JSONEncoder
 #else
 @preconcurrency import class Foundation.JSONEncoder
-@preconcurrency import class Foundation.JSONDecoder
 #endif
+import class Foundation.JSONDecoder
 
 /// Converter between generated and HTTP currency types.
 @_spi(Generated) public struct Converter: Sendable {
diff --git a/Sources/OpenAPIRuntime/Errors/ClientError.swift b/Sources/OpenAPIRuntime/Errors/ClientError.swift
index 5a20f224..90481bff 100644
--- a/Sources/OpenAPIRuntime/Errors/ClientError.swift
+++ b/Sources/OpenAPIRuntime/Errors/ClientError.swift
@@ -14,11 +14,11 @@
 
 import HTTPTypes
 #if canImport(Darwin)
-import Foundation
+import struct Foundation.URL
 #else
 @preconcurrency import struct Foundation.URL
-@preconcurrency import protocol Foundation.LocalizedError
 #endif
+import protocol Foundation.LocalizedError
 
 /// An error thrown by a client performing an OpenAPI operation.
 ///
diff --git a/Sources/OpenAPIRuntime/Interface/ClientTransport.swift b/Sources/OpenAPIRuntime/Interface/ClientTransport.swift
index 3786bcea..200520ca 100644
--- a/Sources/OpenAPIRuntime/Interface/ClientTransport.swift
+++ b/Sources/OpenAPIRuntime/Interface/ClientTransport.swift
@@ -13,11 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import HTTPTypes
-#if canImport(Darwin)
 import struct Foundation.URL
-#else
-@preconcurrency import struct Foundation.URL
-#endif
 
 /// A type that performs HTTP operations.
 ///
diff --git a/Sources/OpenAPIRuntime/Interface/UniversalClient.swift b/Sources/OpenAPIRuntime/Interface/UniversalClient.swift
index 431fb8af..5afff2b1 100644
--- a/Sources/OpenAPIRuntime/Interface/UniversalClient.swift
+++ b/Sources/OpenAPIRuntime/Interface/UniversalClient.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 import HTTPTypes
 #if canImport(Darwin)
-import Foundation
+import struct Foundation.URL
 #else
 @preconcurrency import struct Foundation.URL
 #endif
diff --git a/Sources/OpenAPIRuntime/Interface/UniversalServer.swift b/Sources/OpenAPIRuntime/Interface/UniversalServer.swift
index 80d69e25..4608dafe 100644
--- a/Sources/OpenAPIRuntime/Interface/UniversalServer.swift
+++ b/Sources/OpenAPIRuntime/Interface/UniversalServer.swift
@@ -13,14 +13,12 @@
 //===----------------------------------------------------------------------===//
 
 import HTTPTypes
-
 #if canImport(Darwin)
 import struct Foundation.URL
-import struct Foundation.URLComponents
 #else
 @preconcurrency import struct Foundation.URL
-@preconcurrency import struct Foundation.URLComponents
 #endif
+import struct Foundation.URLComponents
 
 /// OpenAPI document-agnostic HTTP server used by OpenAPI document-specific,
 /// generated servers to perform request deserialization, middleware and handler
diff --git a/Tests/OpenAPIRuntimeTests/URICoder/Test_URICodingRoundtrip.swift b/Tests/OpenAPIRuntimeTests/URICoder/Test_URICodingRoundtrip.swift
index 0487c756..ccfe52c4 100644
--- a/Tests/OpenAPIRuntimeTests/URICoder/Test_URICodingRoundtrip.swift
+++ b/Tests/OpenAPIRuntimeTests/URICoder/Test_URICodingRoundtrip.swift
@@ -12,10 +12,12 @@
 //
 //===----------------------------------------------------------------------===//
 import XCTest
-@_spi(Generated) @testable import OpenAPIRuntime
-#if os(Linux)
-@preconcurrency import Foundation
+#if canImport(Darwin) || swift(>=5.9.1)
+import struct Foundation.Date
+#else
+@preconcurrency import struct Foundation.Date
 #endif
+@_spi(Generated) @testable import OpenAPIRuntime
 
 final class Test_URICodingRoundtrip: Test_Runtime {