diff --git a/Sources/Basics/Environment/Environment.swift b/Sources/Basics/Environment/Environment.swift
index 4fe22853e7c..ec286fd37cf 100644
--- a/Sources/Basics/Environment/Environment.swift
+++ b/Sources/Basics/Environment/Environment.swift
@@ -64,7 +64,8 @@ extension Environment {
 // MARK: - Conversions between Dictionary<String, String>
 
 extension Environment {
-    package init(_ dictionary: [String: String]) {
+    @_spi(SwiftPMInternal)
+    public init(_ dictionary: [String: String]) {
         self.storage = .init()
         let sorted = dictionary.sorted { $0.key < $1.key }
         for (key, value) in sorted {
@@ -74,7 +75,8 @@ extension Environment {
 }
 
 extension [String: String] {
-    package init(_ environment: Environment) {
+    @_spi(SwiftPMInternal)
+    public init(_ environment: Environment) {
         self.init()
         let sorted = environment.sorted { $0.key < $1.key }
         for (key, value) in sorted {
diff --git a/Sources/DriverSupport/DriverSupportUtils.swift b/Sources/DriverSupport/DriverSupportUtils.swift
index 15b7079f03f..497bd403373 100644
--- a/Sources/DriverSupport/DriverSupportUtils.swift
+++ b/Sources/DriverSupport/DriverSupportUtils.swift
@@ -10,7 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+@_spi(SwiftPMInternal)
 import Basics
+
 import PackageModel
 import SwiftDriver
 import class TSCBasic.Process
diff --git a/Sources/DriverSupport/SPMSwiftDriverExecutor.swift b/Sources/DriverSupport/SPMSwiftDriverExecutor.swift
index 98ffa234fb7..e20f8b207da 100644
--- a/Sources/DriverSupport/SPMSwiftDriverExecutor.swift
+++ b/Sources/DriverSupport/SPMSwiftDriverExecutor.swift
@@ -10,7 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+@_spi(SwiftPMInternal)
 import Basics
+
 import SwiftDriver
 
 import class TSCBasic.Process
diff --git a/Sources/SPMBuildCore/Plugins/PluginInvocation.swift b/Sources/SPMBuildCore/Plugins/PluginInvocation.swift
index 9fbacf0ae44..ad49b92eacd 100644
--- a/Sources/SPMBuildCore/Plugins/PluginInvocation.swift
+++ b/Sources/SPMBuildCore/Plugins/PluginInvocation.swift
@@ -10,7 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+@_spi(SwiftPMInternal)
 import Basics
+
 import Foundation
 import PackageModel
 import PackageLoading
diff --git a/Sources/Workspace/DefaultPluginScriptRunner.swift b/Sources/Workspace/DefaultPluginScriptRunner.swift
index 0dc7ab0037f..589789413ba 100644
--- a/Sources/Workspace/DefaultPluginScriptRunner.swift
+++ b/Sources/Workspace/DefaultPluginScriptRunner.swift
@@ -10,7 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+@_spi(SwiftPMInternal)
 import Basics
+
 import Foundation
 import PackageGraph
 import PackageModel
diff --git a/Tests/BasicsTests/Environment/EnvironmentTests.swift b/Tests/BasicsTests/Environment/EnvironmentTests.swift
index 820723e7a97..837d93706c4 100644
--- a/Tests/BasicsTests/Environment/EnvironmentTests.swift
+++ b/Tests/BasicsTests/Environment/EnvironmentTests.swift
@@ -10,7 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-@testable import Basics
+@_spi(SwiftPMInternal)
+@testable
+import Basics
+
 import XCTest
 
 final class EnvironmentTests: XCTestCase {
diff --git a/Tests/SPMBuildCoreTests/PluginInvocationTests.swift b/Tests/SPMBuildCoreTests/PluginInvocationTests.swift
index 5dd40179d90..d114a3d4b87 100644
--- a/Tests/SPMBuildCoreTests/PluginInvocationTests.swift
+++ b/Tests/SPMBuildCoreTests/PluginInvocationTests.swift
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@_spi(SwiftPMInternal)
 import Basics
 @testable import PackageGraph
 import PackageLoading