diff --git a/Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.h b/Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.h
index 3f5c398426a..d6ef46700e7 100644
--- a/Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.h
+++ b/Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.h
@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRCrashlytics.h"
+#import <FirebaseCrashlytics/FIRCrashlytics.h>
 
 #import "Crashlytics/Crashlytics/Helpers/FIRCLSProfiling.h"
 
diff --git a/Crashlytics/Crashlytics/FIRExceptionModel.m b/Crashlytics/Crashlytics/FIRExceptionModel.m
index 2bd9924c33c..ef95f8a2893 100644
--- a/Crashlytics/Crashlytics/FIRExceptionModel.m
+++ b/Crashlytics/Crashlytics/FIRExceptionModel.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRExceptionModel.h"
+#import <FirebaseCrashlytics/FIRExceptionModel.h>
 
 @interface FIRExceptionModel ()
 
diff --git a/Crashlytics/Crashlytics/Private/FIRExceptionModel_Private.h b/Crashlytics/Crashlytics/Private/FIRExceptionModel_Private.h
index b89290f37cc..81f05282f8f 100644
--- a/Crashlytics/Crashlytics/Private/FIRExceptionModel_Private.h
+++ b/Crashlytics/Crashlytics/Private/FIRExceptionModel_Private.h
@@ -17,7 +17,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRExceptionModel.h"
+#import <FirebaseCrashlytics/FIRExceptionModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRCrashlytics.h b/Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRCrashlytics.h
index 1ace1bed780..555554f6fe1 100644
--- a/Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRCrashlytics.h
+++ b/Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRCrashlytics.h
@@ -14,8 +14,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRCrashlyticsReport.h"
-#import "FIRExceptionModel.h"
+#import <FirebaseCrashlytics/FIRCrashlyticsReport.h>
+#import <FirebaseCrashlytics/FIRExceptionModel.h>
 
 #if __has_include(<Crashlytics/Crashlytics.h>)
 #warning "FirebaseCrashlytics and Crashlytics are not compatible \
diff --git a/Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRExceptionModel.h b/Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRExceptionModel.h
index 4a89ce92ddb..03c8f065d53 100644
--- a/Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRExceptionModel.h
+++ b/Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRExceptionModel.h
@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRStackFrame.h"
+#import <FirebaseCrashlytics/FIRStackFrame.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FirebaseCrashlytics.h b/Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FirebaseCrashlytics.h
index 280ab811217..0730978f307 100644
--- a/Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FirebaseCrashlytics.h
+++ b/Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FirebaseCrashlytics.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRCrashlytics.h"
-#import "FIRCrashlyticsReport.h"
-#import "FIRExceptionModel.h"
-#import "FIRStackFrame.h"
+#import <FirebaseCrashlytics/FIRCrashlytics.h>
+#import <FirebaseCrashlytics/FIRCrashlyticsReport.h>
+#import <FirebaseCrashlytics/FIRExceptionModel.h>
+#import <FirebaseCrashlytics/FIRStackFrame.h>
diff --git a/Crashlytics/UnitTests/FIRRecordExceptionModelTests.m b/Crashlytics/UnitTests/FIRRecordExceptionModelTests.m
index 1908fea71db..af525f994e0 100644
--- a/Crashlytics/UnitTests/FIRRecordExceptionModelTests.m
+++ b/Crashlytics/UnitTests/FIRRecordExceptionModelTests.m
@@ -14,7 +14,8 @@
 
 #import <XCTest/XCTest.h>
 
-#import "Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRExceptionModel.h"
+#import <FirebaseCrashlytics/FIRExceptionModel.h>
+//#import "Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRExceptionModel.h"
 #import "Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRStackFrame.h"
 
 #import "Crashlytics/Crashlytics/Components/FIRCLSContext.h"
diff --git a/FirebaseABTesting/Sources/Public/FirebaseABTesting/FirebaseABTesting.h b/FirebaseABTesting/Sources/Public/FirebaseABTesting/FirebaseABTesting.h
index cfa99b4acaa..5788c64c396 100755
--- a/FirebaseABTesting/Sources/Public/FirebaseABTesting/FirebaseABTesting.h
+++ b/FirebaseABTesting/Sources/Public/FirebaseABTesting/FirebaseABTesting.h
@@ -12,5 +12,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRExperimentController.h"
-#import "FIRLifecycleEvents.h"
+#import <FirebaseABTesting/FIRExperimentController.h>
+#import <FirebaseABTesting/FIRLifecycleEvents.h>
diff --git a/FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/FirebaseAppCheckInterop.h b/FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/FirebaseAppCheckInterop.h
index afe5f651d9c..37b447983f9 100644
--- a/FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/FirebaseAppCheckInterop.h
+++ b/FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/FirebaseAppCheckInterop.h
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-#import "FIRAppCheckInterop.h"
-#import "FIRAppCheckProtocol.h"
-#import "FIRAppCheckTokenResultInterop.h"
+#import <FirebaseAppCheckInterop/FIRAppCheckInterop.h>
+#import <FirebaseAppCheckInterop/FIRAppCheckProtocol.h>
+#import <FirebaseAppCheckInterop/FIRAppCheckTokenResultInterop.h>
diff --git a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppAttestProvider.h b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppAttestProvider.h
index d7b730946d1..c99c2c19565 100644
--- a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppAttestProvider.h
+++ b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppAttestProvider.h
@@ -16,9 +16,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAppCheckProvider.h"
+#import <FirebaseAppCheck/FIRAppCheckProvider.h>
 
-#import "FIRAppCheckAvailability.h"
+#import <FirebaseAppCheck/FIRAppCheckAvailability.h>
 
 @class FIRApp;
 
diff --git a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProvider.h b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProvider.h
index f0efe2c89a0..945c6328d56 100644
--- a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProvider.h
+++ b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProvider.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAppCheckProvider.h"
+#import <FirebaseAppCheck/FIRAppCheckProvider.h>
 
 @class FIRApp;
 @protocol FIRAppCheckDebugProviderAPIServiceProtocol;
diff --git a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProviderFactory.h b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProviderFactory.h
index 07f9bd138dc..063bd2913fa 100644
--- a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProviderFactory.h
+++ b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProviderFactory.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAppCheckProviderFactory.h"
+#import <FirebaseAppCheck/FIRAppCheckProviderFactory.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckProviderFactory.h b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckProviderFactory.h
index 8b4d3472094..4e2beb5d40b 100644
--- a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckProviderFactory.h
+++ b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckProviderFactory.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAppCheckProvider.h"
+#import <FirebaseAppCheck/FIRAppCheckProvider.h>
 
 @class FIRApp;
 
diff --git a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProvider.h b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProvider.h
index 44ed77766bd..ed2cd6838d7 100644
--- a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProvider.h
+++ b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProvider.h
@@ -16,8 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAppCheckAvailability.h"
-#import "FIRAppCheckProvider.h"
+#import <FirebaseAppCheck/FIRAppCheckAvailability.h>
+#import <FirebaseAppCheck/FIRAppCheckProvider.h>
 
 @class FIRApp;
 @protocol FIRDeviceCheckAPIServiceProtocol;
diff --git a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProviderFactory.h b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProviderFactory.h
index e20bb9869e7..8721bcbeb0d 100644
--- a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProviderFactory.h
+++ b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProviderFactory.h
@@ -16,8 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAppCheckAvailability.h"
-#import "FIRAppCheckProviderFactory.h"
+#import <FirebaseAppCheck/FIRAppCheckAvailability.h>
+#import <FirebaseAppCheck/FIRAppCheckProviderFactory.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FirebaseAppCheck.h b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FirebaseAppCheck.h
index 807336e29b4..e8d3502043f 100644
--- a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FirebaseAppCheck.h
+++ b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FirebaseAppCheck.h
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-#import "FIRAppCheck.h"
-#import "FIRAppCheckErrors.h"
-#import "FIRAppCheckProvider.h"
-#import "FIRAppCheckProviderFactory.h"
-#import "FIRAppCheckToken.h"
+#import <FirebaseAppCheck/FIRAppCheck.h>
+#import <FirebaseAppCheck/FIRAppCheckErrors.h>
+#import <FirebaseAppCheck/FIRAppCheckProvider.h>
+#import <FirebaseAppCheck/FIRAppCheckProviderFactory.h>
+#import <FirebaseAppCheck/FIRAppCheckToken.h>
 
 // Debug provider
-#import "FIRAppCheckDebugProvider.h"
-#import "FIRAppCheckDebugProviderFactory.h"
+#import <FirebaseAppCheck/FIRAppCheckDebugProvider.h>
+#import <FirebaseAppCheck/FIRAppCheckDebugProviderFactory.h>
 
 // DeviceCheck provider
-#import "FIRDeviceCheckProvider.h"
-#import "FIRDeviceCheckProviderFactory.h"
+#import <FirebaseAppCheck/FIRDeviceCheckProvider.h>
+#import <FirebaseAppCheck/FIRDeviceCheckProviderFactory.h>
 
 // App Attest provider.
-#import "FIRAppAttestProvider.h"
+#import <FirebaseAppCheck/FIRAppAttestProvider.h>
diff --git a/FirebaseAppDistribution/Sources/Public/FirebaseAppDistribution/FirebaseAppDistribution.h b/FirebaseAppDistribution/Sources/Public/FirebaseAppDistribution/FirebaseAppDistribution.h
index 0689ee7031f..faba1a97040 100644
--- a/FirebaseAppDistribution/Sources/Public/FirebaseAppDistribution/FirebaseAppDistribution.h
+++ b/FirebaseAppDistribution/Sources/Public/FirebaseAppDistribution/FirebaseAppDistribution.h
@@ -12,5 +12,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRAppDistribution.h"
-#import "FIRAppDistributionRelease.h"
+#import <FirebaseAppDistribution/FIRAppDistribution.h>
+#import <FirebaseAppDistribution/FIRAppDistributionRelease.h>
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuth.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuth.h
index 362ed293231..c056c82242b 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuth.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuth.h
@@ -17,8 +17,8 @@
 #import <AvailabilityMacros.h>
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthAPNSTokenType.h"
-#import "FIRAuthErrors.h"
+#import <FirebaseAuth/FIRAuthAPNSTokenType.h>
+#import <FirebaseAuth/FIRAuthErrors.h>
 
 @class FIRActionCodeSettings;
 @class FIRApp;
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRFederatedAuthProvider.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRFederatedAuthProvider.h
index 5c0f25f7398..57350fac8ea 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRFederatedAuthProvider.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRFederatedAuthProvider.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthUIDelegate.h"
+#import <FirebaseAuth/FIRAuthUIDelegate.h>
 
 @class FIRAuthCredential;
 
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactor.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactor.h
index 88a23d47795..165cc105d88 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactor.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactor.h
@@ -16,10 +16,10 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuth.h"
-#import "FIRMultiFactorAssertion.h"
-#import "FIRMultiFactorInfo.h"
-#import "FIRMultiFactorSession.h"
+#import <FirebaseAuth/FIRAuth.h>
+#import <FirebaseAuth/FIRMultiFactorAssertion.h>
+#import <FirebaseAuth/FIRMultiFactorInfo.h>
+#import <FirebaseAuth/FIRMultiFactorSession.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactorResolver.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactorResolver.h
index 6a102c591ac..ca1d482bc25 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactorResolver.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactorResolver.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRMultiFactor.h"
+#import <FirebaseAuth/FIRMultiFactor.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthCredential.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthCredential.h
index 94abe4f22b4..41a35000cea 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthCredential.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthCredential.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthCredential.h"
+#import <FirebaseAuth/FIRAuthCredential.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthProvider.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthProvider.h
index 2c2128c1128..35ea388ebe6 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthProvider.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthProvider.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRFederatedAuthProvider.h"
+#import <FirebaseAuth/FIRFederatedAuthProvider.h>
 
 @class FIRAuth;
 @class FIROAuthCredential;
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneAuthCredential.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneAuthCredential.h
index deea1dd9a6b..7ad7641ae65 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneAuthCredential.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneAuthCredential.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthCredential.h"
+#import <FirebaseAuth/FIRAuthCredential.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorAssertion.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorAssertion.h
index 13e6a42d2f4..bc1ad969077 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorAssertion.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorAssertion.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRMultiFactorAssertion.h"
+#import <FirebaseAuth/FIRMultiFactorAssertion.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorGenerator.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorGenerator.h
index 355b927cbe6..f18e1a547e6 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorGenerator.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorGenerator.h
@@ -16,8 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRPhoneAuthCredential.h"
-#import "FIRPhoneMultiFactorAssertion.h"
+#import <FirebaseAuth/FIRPhoneAuthCredential.h>
+#import <FirebaseAuth/FIRPhoneMultiFactorAssertion.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorInfo.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorInfo.h
index fe119efd40b..54bd2c4aad6 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorInfo.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneMultiFactorInfo.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRMultiFactorInfo.h"
+#import <FirebaseAuth/FIRMultiFactorInfo.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPMultiFactorAssertion.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPMultiFactorAssertion.h
index 5f4647eddaa..6352c68290c 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPMultiFactorAssertion.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPMultiFactorAssertion.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRMultiFactorAssertion.h"
+#import <FirebaseAuth/FIRMultiFactorAssertion.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPMultiFactorGenerator.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPMultiFactorGenerator.h
index d321eb573ba..d0175700850 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPMultiFactorGenerator.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPMultiFactorGenerator.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#import <FirebaseAuth/FIRMultiFactorSession.h>
+#import <FirebaseAuth/FIRTOTPMultiFactorAssertion.h>
+#import <FirebaseAuth/FIRTOTPSecret.h>
 #import <Foundation/Foundation.h>
-#import "FIRMultiFactorSession.h"
-#import "FIRTOTPMultiFactorAssertion.h"
-#import "FIRTOTPSecret.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPSecret.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPSecret.h
index 504fc7ff0d6..e173ddf5abd 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPSecret.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRTOTPSecret.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRMultiFactorInfo.h"
+#import <FirebaseAuth/FIRMultiFactorInfo.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRUser.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRUser.h
index 9fb1fbb2701..4bb9cd4b463 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRUser.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRUser.h
@@ -16,10 +16,10 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuth.h"
-#import "FIRAuthDataResult.h"
-#import "FIRMultiFactor.h"
-#import "FIRUserInfo.h"
+#import <FirebaseAuth/FIRAuth.h>
+#import <FirebaseAuth/FIRAuthDataResult.h>
+#import <FirebaseAuth/FIRMultiFactor.h>
+#import <FirebaseAuth/FIRUserInfo.h>
 
 @class FIRAuthTokenResult;
 @class FIRPhoneAuthCredential;
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FirebaseAuth.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FirebaseAuth.h
index 111ba066543..2756250604e 100644
--- a/FirebaseAuth/Sources/Public/FirebaseAuth/FirebaseAuth.h
+++ b/FirebaseAuth/Sources/Public/FirebaseAuth/FirebaseAuth.h
@@ -16,39 +16,39 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRActionCodeSettings.h"
-#import "FIRAdditionalUserInfo.h"
-#import "FIRAuth.h"
-#import "FIRAuthCredential.h"
-#import "FIRAuthDataResult.h"
-#import "FIRAuthErrors.h"
-#import "FIRAuthTokenResult.h"
-#import "FIREmailAuthProvider.h"
-#import "FIRFacebookAuthProvider.h"
-#import "FIRFederatedAuthProvider.h"
-#import "FIRGameCenterAuthProvider.h"
-#import "FIRGitHubAuthProvider.h"
-#import "FIRGoogleAuthProvider.h"
-#import "FIRMultiFactor.h"
-#import "FIRMultiFactorAssertion.h"
-#import "FIRMultiFactorInfo.h"
-#import "FIRMultiFactorResolver.h"
-#import "FIRMultiFactorSession.h"
-#import "FIROAuthCredential.h"
-#import "FIROAuthProvider.h"
-#import "FIRTwitterAuthProvider.h"
-#import "FIRUser.h"
-#import "FIRUserInfo.h"
-#import "FIRUserMetadata.h"
+#import <FirebaseAuth/FIRActionCodeSettings.h>
+#import <FirebaseAuth/FIRAdditionalUserInfo.h>
+#import <FirebaseAuth/FIRAuth.h>
+#import <FirebaseAuth/FIRAuthCredential.h>
+#import <FirebaseAuth/FIRAuthDataResult.h>
+#import <FirebaseAuth/FIRAuthErrors.h>
+#import <FirebaseAuth/FIRAuthTokenResult.h>
+#import <FirebaseAuth/FIREmailAuthProvider.h>
+#import <FirebaseAuth/FIRFacebookAuthProvider.h>
+#import <FirebaseAuth/FIRFederatedAuthProvider.h>
+#import <FirebaseAuth/FIRGameCenterAuthProvider.h>
+#import <FirebaseAuth/FIRGitHubAuthProvider.h>
+#import <FirebaseAuth/FIRGoogleAuthProvider.h>
+#import <FirebaseAuth/FIRMultiFactor.h>
+#import <FirebaseAuth/FIRMultiFactorAssertion.h>
+#import <FirebaseAuth/FIRMultiFactorInfo.h>
+#import <FirebaseAuth/FIRMultiFactorResolver.h>
+#import <FirebaseAuth/FIRMultiFactorSession.h>
+#import <FirebaseAuth/FIROAuthCredential.h>
+#import <FirebaseAuth/FIROAuthProvider.h>
+#import <FirebaseAuth/FIRTwitterAuthProvider.h>
+#import <FirebaseAuth/FIRUser.h>
+#import <FirebaseAuth/FIRUserInfo.h>
+#import <FirebaseAuth/FIRUserMetadata.h>
 
-#import "FIRAuthAPNSTokenType.h"
-#import "FIRAuthSettings.h"
-#import "FIRAuthUIDelegate.h"
-#import "FIRPhoneAuthCredential.h"
-#import "FIRPhoneAuthProvider.h"
-#import "FIRPhoneMultiFactorAssertion.h"
-#import "FIRPhoneMultiFactorGenerator.h"
-#import "FIRPhoneMultiFactorInfo.h"
-#import "FIRTOTPMultiFactorAssertion.h"
-#import "FIRTOTPMultiFactorGenerator.h"
-#import "FIRTOTPSecret.h"
+#import <FirebaseAuth/FIRAuthAPNSTokenType.h>
+#import <FirebaseAuth/FIRAuthSettings.h>
+#import <FirebaseAuth/FIRAuthUIDelegate.h>
+#import <FirebaseAuth/FIRPhoneAuthCredential.h>
+#import <FirebaseAuth/FIRPhoneAuthProvider.h>
+#import <FirebaseAuth/FIRPhoneMultiFactorAssertion.h>
+#import <FirebaseAuth/FIRPhoneMultiFactorGenerator.h>
+#import <FirebaseAuth/FIRPhoneMultiFactorInfo.h>
+#import <FirebaseAuth/FIRTOTPMultiFactorAssertion.h>
+#import <FirebaseAuth/FIRTOTPMultiFactorGenerator.h>
+#import <FirebaseAuth/FIRTOTPSecret.h>
diff --git a/FirebaseCore/Sources/Public/FirebaseCore/FIRConfiguration.h b/FirebaseCore/Sources/Public/FirebaseCore/FIRConfiguration.h
index 408bcadb75f..40d46ba1bf2 100644
--- a/FirebaseCore/Sources/Public/FirebaseCore/FIRConfiguration.h
+++ b/FirebaseCore/Sources/Public/FirebaseCore/FIRConfiguration.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRLoggerLevel.h"
+#import <FirebaseCore/FIRLoggerLevel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseCore/Sources/Public/FirebaseCore/FirebaseCore.h b/FirebaseCore/Sources/Public/FirebaseCore/FirebaseCore.h
index 680d60483e2..03f78d3f929 100644
--- a/FirebaseCore/Sources/Public/FirebaseCore/FirebaseCore.h
+++ b/FirebaseCore/Sources/Public/FirebaseCore/FirebaseCore.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FIRApp.h"
-#import "FIRConfiguration.h"
-#import "FIRLoggerLevel.h"
-#import "FIROptions.h"
-#import "FIRVersion.h"
+#import <FirebaseCore/FIRApp.h>
+#import <FirebaseCore/FIRConfiguration.h>
+#import <FirebaseCore/FIRLoggerLevel.h>
+#import <FirebaseCore/FIROptions.h>
+#import <FirebaseCore/FIRVersion.h>
diff --git a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabase.h b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabase.h
index eeab6b033ad..5a1ce638cc3 100644
--- a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabase.h
+++ b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabase.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRDatabaseReference.h"
+#import <FirebaseDatabase/FIRDatabaseReference.h>
 #import <Foundation/Foundation.h>
 
 @class FIRApp;
diff --git a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseQuery.h b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseQuery.h
index 4143d4fb349..e41fe7e5d0b 100644
--- a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseQuery.h
+++ b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseQuery.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FIRDataEventType.h"
-#import "FIRDataSnapshot.h"
+#import <FirebaseDatabase/FIRDataEventType.h>
+#import <FirebaseDatabase/FIRDataSnapshot.h>
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h
index 9dd3585fabf..4704e25f78e 100644
--- a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h
+++ b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#import "FIRDataSnapshot.h"
-#import "FIRDatabase.h"
-#import "FIRDatabaseQuery.h"
-#import "FIRMutableData.h"
-#import "FIRServerValue.h"
-#import "FIRTransactionResult.h"
+#import <FirebaseDatabase/FIRDataSnapshot.h>
+#import <FirebaseDatabase/FIRDatabase.h>
+#import <FirebaseDatabase/FIRDatabaseQuery.h>
+#import <FirebaseDatabase/FIRMutableData.h>
+#import <FirebaseDatabase/FIRServerValue.h>
+#import <FirebaseDatabase/FIRTransactionResult.h>
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRTransactionResult.h b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRTransactionResult.h
index 6a97c5c0b44..0c9c2ffc90e 100644
--- a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRTransactionResult.h
+++ b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRTransactionResult.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRMutableData.h"
+#import <FirebaseDatabase/FIRMutableData.h>
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FirebaseDatabase.h b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FirebaseDatabase.h
index ae6b93394a8..09546bfec74 100644
--- a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FirebaseDatabase.h
+++ b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FirebaseDatabase.h
@@ -17,13 +17,13 @@
 #ifndef FirebaseDatabase_h
 #define FirebaseDatabase_h
 
-#import "FIRDataEventType.h"
-#import "FIRDataSnapshot.h"
-#import "FIRDatabase.h"
-#import "FIRDatabaseQuery.h"
-#import "FIRDatabaseReference.h"
-#import "FIRMutableData.h"
-#import "FIRServerValue.h"
-#import "FIRTransactionResult.h"
+#import <FirebaseDatabase/FIRDataEventType.h>
+#import <FirebaseDatabase/FIRDataSnapshot.h>
+#import <FirebaseDatabase/FIRDatabase.h>
+#import <FirebaseDatabase/FIRDatabaseQuery.h>
+#import <FirebaseDatabase/FIRDatabaseReference.h>
+#import <FirebaseDatabase/FIRMutableData.h>
+#import <FirebaseDatabase/FIRServerValue.h>
+#import <FirebaseDatabase/FIRTransactionResult.h>
 
 #endif /* FirebaseDatabase_h */
diff --git a/FirebaseDynamicLinks/Sources/Public/FirebaseDynamicLinks/FIRDynamicLinks.h b/FirebaseDynamicLinks/Sources/Public/FirebaseDynamicLinks/FIRDynamicLinks.h
index 78c8f5d0e81..bd553814826 100644
--- a/FirebaseDynamicLinks/Sources/Public/FirebaseDynamicLinks/FIRDynamicLinks.h
+++ b/FirebaseDynamicLinks/Sources/Public/FirebaseDynamicLinks/FIRDynamicLinks.h
@@ -16,8 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRDynamicLink.h"
-#import "FIRDynamicLinksCommon.h"
+#import <FirebaseDynamicLinks/FIRDynamicLink.h>
+#import <FirebaseDynamicLinks/FIRDynamicLinksCommon.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseDynamicLinks/Sources/Public/FirebaseDynamicLinks/FirebaseDynamicLinks.h b/FirebaseDynamicLinks/Sources/Public/FirebaseDynamicLinks/FirebaseDynamicLinks.h
index ea6f45f021e..fc4ffbd2c30 100755
--- a/FirebaseDynamicLinks/Sources/Public/FirebaseDynamicLinks/FirebaseDynamicLinks.h
+++ b/FirebaseDynamicLinks/Sources/Public/FirebaseDynamicLinks/FirebaseDynamicLinks.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FDLURLComponents.h"
-#import "FIRDynamicLink.h"
-#import "FIRDynamicLinks.h"
-#import "FIRDynamicLinksCommon.h"
+#import <FirebaseDynamicLinks/FDLURLComponents.h>
+#import <FirebaseDynamicLinks/FIRDynamicLink.h>
+#import <FirebaseDynamicLinks/FIRDynamicLinks.h>
+#import <FirebaseDynamicLinks/FIRDynamicLinksCommon.h>
diff --git a/FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FIRInAppMessaging.h b/FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FIRInAppMessaging.h
index 32af0ef7d61..04c7a1bdaca 100644
--- a/FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FIRInAppMessaging.h
+++ b/FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FIRInAppMessaging.h
@@ -18,7 +18,7 @@
 
 @class FIRApp;
 
-#import "FIRInAppMessagingRendering.h"
+#import <FirebaseInAppMessaging/FIRInAppMessagingRendering.h>
 
 NS_ASSUME_NONNULL_BEGIN
 /**
diff --git a/FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FirebaseInAppMessaging.h b/FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FirebaseInAppMessaging.h
index c28c967bc50..b1357d4cb13 100644
--- a/FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FirebaseInAppMessaging.h
+++ b/FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FirebaseInAppMessaging.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FIRInAppMessaging.h"
-#import "FIRInAppMessagingRendering.h"
+#import <FirebaseInAppMessaging/FIRInAppMessaging.h>
+#import <FirebaseInAppMessaging/FIRInAppMessagingRendering.h>
 
 #if __has_include(<FirebaseInAppMessagingDisplay/FirebaseInAppMessagingDisplay.h>)
 #warning The FirebaseInAppMessagingDisplay subspec is deprecated. Please remove FirebaseInAppMessagingDisplay from your Podfile (or delete the framework).
diff --git a/FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FirebaseInstallations.h b/FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FirebaseInstallations.h
index 8a9b3c14460..566ad1695ce 100644
--- a/FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FirebaseInstallations.h
+++ b/FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FirebaseInstallations.h
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-#import "FIRInstallations.h"
-#import "FIRInstallationsAuthTokenResult.h"
-#import "FIRInstallationsErrors.h"
+#import <FirebaseInstallations/FIRInstallations.h>
+#import <FirebaseInstallations/FIRInstallationsAuthTokenResult.h>
+#import <FirebaseInstallations/FIRInstallationsErrors.h>
diff --git a/FirebaseMessaging/Sources/Public/FirebaseMessaging/FirebaseMessaging.h b/FirebaseMessaging/Sources/Public/FirebaseMessaging/FirebaseMessaging.h
index c5d0bd05046..a4def0608c2 100755
--- a/FirebaseMessaging/Sources/Public/FirebaseMessaging/FirebaseMessaging.h
+++ b/FirebaseMessaging/Sources/Public/FirebaseMessaging/FirebaseMessaging.h
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-#import "FIRMessaging.h"
-#import "FIRMessagingExtensionHelper.h"
+#import <FirebaseMessaging/FIRMessaging.h>
+#import <FirebaseMessaging/FIRMessagingExtensionHelper.h>
diff --git a/FirebasePerformance/Sources/Public/FirebasePerformance/FIRHTTPMetric.h b/FirebasePerformance/Sources/Public/FirebasePerformance/FIRHTTPMetric.h
index 460efbafcb8..bd3b079728c 100644
--- a/FirebasePerformance/Sources/Public/FirebasePerformance/FIRHTTPMetric.h
+++ b/FirebasePerformance/Sources/Public/FirebasePerformance/FIRHTTPMetric.h
@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRPerformanceAttributable.h"
+#import <FirebasePerformance/FIRPerformanceAttributable.h>
 
 // clang-format off
 // clang-format12 does a weird cascading indent of this enum.
diff --git a/FirebasePerformance/Sources/Public/FirebasePerformance/FIRPerformance.h b/FirebasePerformance/Sources/Public/FirebasePerformance/FIRPerformance.h
index e9d1ed9a927..cb7b81b98ea 100644
--- a/FirebasePerformance/Sources/Public/FirebasePerformance/FIRPerformance.h
+++ b/FirebasePerformance/Sources/Public/FirebasePerformance/FIRPerformance.h
@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRTrace.h"
+#import <FirebasePerformance/FIRTrace.h>
 
 /**
  * This class allows you to configure the Firebase Performance Reporting SDK. It also provides the
diff --git a/FirebasePerformance/Sources/Public/FirebasePerformance/FIRTrace.h b/FirebasePerformance/Sources/Public/FirebasePerformance/FIRTrace.h
index bb487f50378..b827cb49a07 100644
--- a/FirebasePerformance/Sources/Public/FirebasePerformance/FIRTrace.h
+++ b/FirebasePerformance/Sources/Public/FirebasePerformance/FIRTrace.h
@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRPerformanceAttributable.h"
+#import <FirebasePerformance/FIRPerformanceAttributable.h>
 
 /**
  * FIRTrace objects contain information about a "Trace", which is a sequence of steps. Traces can be
diff --git a/FirebasePerformance/Sources/Public/FirebasePerformance/FirebasePerformance.h b/FirebasePerformance/Sources/Public/FirebasePerformance/FirebasePerformance.h
index 67bf9ae94d0..021cd063521 100644
--- a/FirebasePerformance/Sources/Public/FirebasePerformance/FirebasePerformance.h
+++ b/FirebasePerformance/Sources/Public/FirebasePerformance/FirebasePerformance.h
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRHTTPMetric.h"
-#import "FIRPerformance.h"
-#import "FIRPerformanceAttributable.h"
-#import "FIRTrace.h"
+#import <FirebasePerformance/FIRHTTPMetric.h>
+#import <FirebasePerformance/FIRPerformance.h>
+#import <FirebasePerformance/FIRPerformanceAttributable.h>
+#import <FirebasePerformance/FIRTrace.h>
diff --git a/FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FirebaseRemoteConfig.h b/FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FirebaseRemoteConfig.h
index 9ae8cea4a3c..ee451588266 100644
--- a/FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FirebaseRemoteConfig.h
+++ b/FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FirebaseRemoteConfig.h
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-#import "FIRRemoteConfig.h"
+#import <FirebaseRemoteConfig/FIRRemoteConfig.h>
diff --git a/Firestore/Source/Public/FirebaseFirestore/FIRAggregateQuery.h b/Firestore/Source/Public/FirebaseFirestore/FIRAggregateQuery.h
index 8170d5caa53..06c2568aa7b 100644
--- a/Firestore/Source/Public/FirebaseFirestore/FIRAggregateQuery.h
+++ b/Firestore/Source/Public/FirebaseFirestore/FIRAggregateQuery.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAggregateSource.h"
+#import <FirebaseFirestoreInternal/FIRAggregateSource.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Public/FirebaseFirestore/FIRCollectionReference.h b/Firestore/Source/Public/FirebaseFirestore/FIRCollectionReference.h
index 40ece263952..35556237974 100644
--- a/Firestore/Source/Public/FirebaseFirestore/FIRCollectionReference.h
+++ b/Firestore/Source/Public/FirebaseFirestore/FIRCollectionReference.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRQuery.h"
+#import <FirebaseFirestoreInternal/FIRQuery.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Public/FirebaseFirestore/FIRDocumentReference.h b/Firestore/Source/Public/FirebaseFirestore/FIRDocumentReference.h
index 70dbd0d02ad..fd771500e87 100644
--- a/Firestore/Source/Public/FirebaseFirestore/FIRDocumentReference.h
+++ b/Firestore/Source/Public/FirebaseFirestore/FIRDocumentReference.h
@@ -16,8 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRFirestoreSource.h"
-#import "FIRListenerRegistration.h"
+#import <FirebaseFirestoreInternal/FIRFirestoreSource.h>
+#import <FirebaseFirestoreInternal/FIRListenerRegistration.h>
 
 @class FIRCollectionReference;
 @class FIRDocumentSnapshot;
diff --git a/Firestore/Source/Public/FirebaseFirestore/FIRFirestore.h b/Firestore/Source/Public/FirebaseFirestore/FIRFirestore.h
index 8882c91eff1..4eabdc483a2 100644
--- a/Firestore/Source/Public/FirebaseFirestore/FIRFirestore.h
+++ b/Firestore/Source/Public/FirebaseFirestore/FIRFirestore.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRListenerRegistration.h"
+#import <FirebaseFirestoreInternal/FIRListenerRegistration.h>
 
 @class FIRApp;
 @class FIRCollectionReference;
diff --git a/Firestore/Source/Public/FirebaseFirestore/FIRQuery.h b/Firestore/Source/Public/FirebaseFirestore/FIRQuery.h
index 843dff16090..077c7cddad2 100644
--- a/Firestore/Source/Public/FirebaseFirestore/FIRQuery.h
+++ b/Firestore/Source/Public/FirebaseFirestore/FIRQuery.h
@@ -16,8 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRFirestoreSource.h"
-#import "FIRListenerRegistration.h"
+#import <FirebaseFirestoreInternal/FIRFirestoreSource.h>
+#import <FirebaseFirestoreInternal/FIRListenerRegistration.h>
 
 @class FIRAggregateQuery;
 @class FIRAggregateField;
diff --git a/Firestore/Source/Public/FirebaseFirestore/FirebaseFirestore.h b/Firestore/Source/Public/FirebaseFirestore/FirebaseFirestore.h
index 6746aa489e8..8b93dd1a5ec 100644
--- a/Firestore/Source/Public/FirebaseFirestore/FirebaseFirestore.h
+++ b/Firestore/Source/Public/FirebaseFirestore/FirebaseFirestore.h
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-#import "FIRAggregateField.h"
-#import "FIRAggregateQuery.h"
-#import "FIRAggregateQuerySnapshot.h"
-#import "FIRAggregateSource.h"
-#import "FIRCollectionReference.h"
-#import "FIRDocumentChange.h"
-#import "FIRDocumentReference.h"
-#import "FIRDocumentSnapshot.h"
-#import "FIRFieldPath.h"
-#import "FIRFieldValue.h"
-#import "FIRFilter.h"
-#import "FIRFirestore.h"
-#import "FIRFirestoreErrors.h"
-#import "FIRFirestoreSettings.h"
-#import "FIRGeoPoint.h"
-#import "FIRListenerRegistration.h"
-#import "FIRLoadBundleTask.h"
-#import "FIRLocalCacheSettings.h"
-#import "FIRQuery.h"
-#import "FIRQuerySnapshot.h"
-#import "FIRSnapshotMetadata.h"
-#import "FIRTimestamp.h"
-#import "FIRTransaction.h"
-#import "FIRTransactionOptions.h"
-#import "FIRWriteBatch.h"
+#import <FirebaseFirestoreInternal/FIRAggregateField.h>
+#import <FirebaseFirestoreInternal/FIRAggregateQuery.h>
+#import <FirebaseFirestoreInternal/FIRAggregateQuerySnapshot.h>
+#import <FirebaseFirestoreInternal/FIRAggregateSource.h>
+#import <FirebaseFirestoreInternal/FIRCollectionReference.h>
+#import <FirebaseFirestoreInternal/FIRDocumentChange.h>
+#import <FirebaseFirestoreInternal/FIRDocumentReference.h>
+#import <FirebaseFirestoreInternal/FIRDocumentSnapshot.h>
+#import <FirebaseFirestoreInternal/FIRFieldPath.h>
+#import <FirebaseFirestoreInternal/FIRFieldValue.h>
+#import <FirebaseFirestoreInternal/FIRFilter.h>
+#import <FirebaseFirestoreInternal/FIRFirestore.h>
+#import <FirebaseFirestoreInternal/FIRFirestoreErrors.h>
+#import <FirebaseFirestoreInternal/FIRFirestoreSettings.h>
+#import <FirebaseFirestoreInternal/FIRGeoPoint.h>
+#import <FirebaseFirestoreInternal/FIRListenerRegistration.h>
+#import <FirebaseFirestoreInternal/FIRLoadBundleTask.h>
+#import <FirebaseFirestoreInternal/FIRLocalCacheSettings.h>
+#import <FirebaseFirestoreInternal/FIRQuery.h>
+#import <FirebaseFirestoreInternal/FIRQuerySnapshot.h>
+#import <FirebaseFirestoreInternal/FIRSnapshotMetadata.h>
+#import <FirebaseFirestoreInternal/FIRTimestamp.h>
+#import <FirebaseFirestoreInternal/FIRTransaction.h>
+#import <FirebaseFirestoreInternal/FIRTransactionOptions.h>
+#import <FirebaseFirestoreInternal/FIRWriteBatch.h>