diff --git a/Plugins/ContainerImageBuilder/Pipe+lines.swift b/Plugins/ContainerImageBuilder/Pipe+lines.swift
index e2ff597..904588e 100644
--- a/Plugins/ContainerImageBuilder/Pipe+lines.swift
+++ b/Plugins/ContainerImageBuilder/Pipe+lines.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
+import class Foundation.Pipe
 
 extension Pipe {
     var lines: AsyncThrowingStream<String, Error> {
diff --git a/Sources/ContainerRegistry/Blobs.swift b/Sources/ContainerRegistry/Blobs.swift
index d7e8251..3c13bed 100644
--- a/Sources/ContainerRegistry/Blobs.swift
+++ b/Sources/ContainerRegistry/Blobs.swift
@@ -14,7 +14,7 @@
 
 import Foundation
 import HTTPTypes
-import Crypto
+import struct Crypto.SHA256
 
 /// Calculates the digest of a blob of data.
 /// - Parameter data: Blob of data to digest.
diff --git a/Sources/ContainerRegistry/ImageManifest+Digest.swift b/Sources/ContainerRegistry/ImageManifest+Digest.swift
index 0cbfcce..bbd1a0f 100644
--- a/Sources/ContainerRegistry/ImageManifest+Digest.swift
+++ b/Sources/ContainerRegistry/ImageManifest+Digest.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import Crypto
+import struct Crypto.SHA256
 
 public extension ImageManifest {
     var digest: String {
diff --git a/Sources/Tar/tar.swift b/Sources/Tar/tar.swift
index 8db9884..ecdc45d 100644
--- a/Sources/Tar/tar.swift
+++ b/Sources/Tar/tar.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
+import struct Foundation.Data
 
 // This file defines a basic tar writer which produces POSIX tar files.
 // This avoids the need to depend on a system-provided tar binary.
diff --git a/Sources/containertool/Extensions/RegistryClient+Layers.swift b/Sources/containertool/Extensions/RegistryClient+Layers.swift
index 56982c8..75302b3 100644
--- a/Sources/containertool/Extensions/RegistryClient+Layers.swift
+++ b/Sources/containertool/Extensions/RegistryClient+Layers.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
+import struct Foundation.Data
 import ContainerRegistry
 
 extension RegistryClient {
diff --git a/Tests/ContainerRegistryTests/SmokeTests.swift b/Tests/ContainerRegistryTests/SmokeTests.swift
index 028ad39..5969d04 100644
--- a/Tests/ContainerRegistryTests/SmokeTests.swift
+++ b/Tests/ContainerRegistryTests/SmokeTests.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
+import class Foundation.ProcessInfo
 import ContainerRegistry
 import Testing
 
diff --git a/Tests/TarTests/TarUnitTests.swift b/Tests/TarTests/TarUnitTests.swift
index 04a6ad8..ee070b6 100644
--- a/Tests/TarTests/TarUnitTests.swift
+++ b/Tests/TarTests/TarUnitTests.swift
@@ -12,7 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import Testing
 
 @testable import Tar
diff --git a/Tests/containertoolTests/ZlibTests.swift b/Tests/containertoolTests/ZlibTests.swift
index 2fc89dd..6e70f47 100644
--- a/Tests/containertoolTests/ZlibTests.swift
+++ b/Tests/containertoolTests/ZlibTests.swift
@@ -13,8 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 @testable import containertool
-import Crypto
-import Foundation
+import struct Crypto.SHA256
 import Testing
 
 // Check that compressing the same data on macOS and Linux produces the same output.