diff --git a/FirebaseAppCheck/Sources/AppAttestProvider/FIRAppAttestProvider.m b/FirebaseAppCheck/Sources/AppAttestProvider/FIRAppAttestProvider.m
index 9d4425d5d2a..12d9ba1d3ae 100644
--- a/FirebaseAppCheck/Sources/AppAttestProvider/FIRAppAttestProvider.m
+++ b/FirebaseAppCheck/Sources/AppAttestProvider/FIRAppAttestProvider.m
@@ -23,6 +23,8 @@
 #import "FirebaseAppCheck/Sources/Core/FIRAppCheckToken+Internal.h"
 #import "FirebaseAppCheck/Sources/Core/FIRHeartbeatLogger+AppCheck.h"
 
+@import FirebaseCoreExtension;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface FIRAppAttestProvider ()
diff --git a/FirebaseAppDistribution.podspec b/FirebaseAppDistribution.podspec
index c5230bda665..58ea6f3cdd7 100644
--- a/FirebaseAppDistribution.podspec
+++ b/FirebaseAppDistribution.podspec
@@ -25,7 +25,6 @@ iOS SDK for App Distribution for Firebase.
   base_dir = "FirebaseAppDistribution/Sources/"
   s.source_files = [
     base_dir + '**/*.{c,h,m,mm}',
-    'FirebaseCore/Extension/*.h',
     'FirebaseInstallations/Source/Library/Private/*.h',
   ]
   s.public_header_files = base_dir + 'Public/FirebaseAppDistribution/*.h'
diff --git a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m
index 1221d98bb1f..f9647b14260 100644
--- a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m
+++ b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m
@@ -30,6 +30,9 @@
 #import "FirebaseDynamicLinks/Sources/Utilities/FDLUtilities.h"
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
+@import FirebaseCore;
+@import FirebaseCoreExtension;
+
 static NSString *const kAPIKey = @"myAPIKey";
 static NSString *const kStructuredLinkFmtFreeform = @"%@://google/link/%@";
 static NSString *const kStructuredLinkFmtDeepLink = @"%@://google/link/?deep_link_id=%@";
diff --git a/FirebaseInAppMessaging.podspec b/FirebaseInAppMessaging.podspec
index 9aa37623b15..fe7528ba99b 100644
--- a/FirebaseInAppMessaging.podspec
+++ b/FirebaseInAppMessaging.podspec
@@ -41,7 +41,6 @@ See more product details at https://firebase.google.com/products/in-app-messagin
     base_dir + "Swift/Source/**/*.swift",
     'Interop/Analytics/Public/*.h',
     'FirebaseABTesting/Sources/Private/*.h',
-    'FirebaseCore/Extension/*.h',
     'FirebaseInstallations/Source/Library/Private/*.h',
   ]
 
@@ -59,7 +58,6 @@ See more product details at https://firebase.google.com/products/in-app-messagin
     base_dir + "Swift/Source/**/*.swift",
     'Interop/Analytics/Public/*.h',
     'FirebaseABTesting/Sources/Private/*.h',
-    'FirebaseCore/Extension/*.h',
     'FirebaseInstallations/Source/Library/Private/*.h',
   ]
 
diff --git a/FirebaseMLModelDownloader/Apps/Sample/Podfile b/FirebaseMLModelDownloader/Apps/Sample/Podfile
index 7f0d733bc8d..2c9c37c65a1 100644
--- a/FirebaseMLModelDownloader/Apps/Sample/Podfile
+++ b/FirebaseMLModelDownloader/Apps/Sample/Podfile
@@ -8,6 +8,7 @@ source 'https://cdn.cocoapods.org/'
 pod 'FirebaseCore', :path => '../../../'
 pod 'FirebaseCoreInternal', :path => '../../../'
 pod 'FirebaseCoreExtension', :path => '../../../'
+pod 'FirebaseInstallations', :path => '../../../'
 pod 'FirebaseMLModelDownloader', :path => '../../../'
 pod 'TensorFlowLiteSwift'
 
diff --git a/FirebasePerformance/Tests/Unit/FPRClientTest.m b/FirebasePerformance/Tests/Unit/FPRClientTest.m
index cc2780b8979..5d8c796d136 100644
--- a/FirebasePerformance/Tests/Unit/FPRClientTest.m
+++ b/FirebasePerformance/Tests/Unit/FPRClientTest.m
@@ -14,7 +14,12 @@
 
 #import <XCTest/XCTest.h>
 
+@import FirebaseCore;
 @import FirebaseCoreExtension;
+@import FirebaseCoreInternal;
+#if SWIFT_PACKAGE
+@import FirebaseCoreInternalObjC;
+#endif
 
 #import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h"
 #import "FirebasePerformance/Sources/FPRClient+Private.h"