firebase · paulb777 · Jun 19, 2020 · Jun 19, 2020 · Jun 19, 2020 · Jun 19, 2020
diff --git a/FirebaseAuth/Sources/Auth/FIRActionCodeSettings.m b/FirebaseAuth/Sources/Auth/FIRActionCodeSettings.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIRActionCodeSettings.h>
+#import "FirebaseAuth/Sources/Public/FIRActionCodeSettings.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/FirebaseAuth/Sources/Auth/FIRAuth.m b/FirebaseAuth/Sources/Auth/FIRAuth.m
@@ -22,7 +22,7 @@
 #import <UIKit/UIKit.h>
 #endif
 
-#import <FirebaseAuth/FirebaseAuth.h>
+#import "FirebaseAuth/Sources/Public/FirebaseAuth.h"
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h"
 #import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h"

diff --git a/FirebaseAuth/Sources/Auth/FIRAuthDataResult.m b/FirebaseAuth/Sources/Auth/FIRAuthDataResult.m
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIRAdditionalUserInfo.h>
-#import <FirebaseAuth/FIROAuthCredential.h>
-#import <FirebaseAuth/FIRUser.h>
+#import "FirebaseAuth/Sources/Public/FIRAdditionalUserInfo.h"
+#import "FirebaseAuth/Sources/Public/FIROAuthCredential.h"
+#import "FirebaseAuth/Sources/Public/FIRUser.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h"
 

diff --git a/FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h b/FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIRAuthDataResult.h>
+#import "FirebaseAuth/Sources/Public/FIRAuthDataResult.h"
 
 @class FIROAuthCredential;
 

diff --git a/FirebaseAuth/Sources/Auth/FIRAuthSettings.m b/FirebaseAuth/Sources/Auth/FIRAuthSettings.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIRAuthSettings.h>
+#import "FirebaseAuth/Sources/Public/FIRAuthSettings.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/FirebaseAuth/Sources/Auth/FIRAuthTokenResult_Internal.h b/FirebaseAuth/Sources/Auth/FIRAuthTokenResult_Internal.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIRAuthTokenResult.h>
 #import <Foundation/Foundation.h>
+#import "FirebaseAuth/Sources/Public/FIRAuthTokenResult.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/FirebaseAuth/Sources/Auth/FIRAuth_Internal.h b/FirebaseAuth/Sources/Auth/FIRAuth_Internal.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIRAuth.h>
 #import <Foundation/Foundation.h>
+#import "FirebaseAuth/Sources/Public/FIRAuth.h"
 #import "Interop/Auth/Public/FIRAuthInterop.h"
 
 @class FIRAuthRequestConfiguration;

diff --git a/FirebaseAuth/Sources/AuthProvider/Email/FIREmailAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/Email/FIREmailAuthProvider.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIREmailAuthProvider.h>
+#import "FirebaseAuth/Sources/Public/FIREmailAuthProvider.h"
 
 #import "FirebaseAuth/Sources/AuthProvider/Email/FIREmailPasswordAuthCredential.h"
 

diff --git a/FirebaseAuth/Sources/AuthProvider/Email/FIREmailPasswordAuthCredential.m b/FirebaseAuth/Sources/AuthProvider/Email/FIREmailPasswordAuthCredential.m
@@ -16,7 +16,7 @@
 
 #import "FirebaseAuth/Sources/AuthProvider/Email/FIREmailPasswordAuthCredential.h"
 
-#import <FirebaseAuth/FIREmailAuthProvider.h>
+#import "FirebaseAuth/Sources/Public/FIREmailAuthProvider.h"
 
 #import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyAssertionRequest.h"
 #import "FirebaseAuth/Sources/Utilities/FIRAuthExceptionUtils.h"

diff --git a/FirebaseAuth/Sources/AuthProvider/FIRAuthCredential_Internal.h b/FirebaseAuth/Sources/AuthProvider/FIRAuthCredential_Internal.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIRAuthCredential.h>
+#import "FirebaseAuth/Sources/Public/FIRAuthCredential.h"
 
 @class FIRVerifyAssertionRequest;
 

diff --git a/FirebaseAuth/Sources/AuthProvider/Facebook/FIRFacebookAuthCredential.m b/FirebaseAuth/Sources/AuthProvider/Facebook/FIRFacebookAuthCredential.m
@@ -16,7 +16,7 @@
 
 #import "FirebaseAuth/Sources/AuthProvider/Facebook/FIRFacebookAuthCredential.h"
 
-#import <FirebaseAuth/FIRFacebookAuthProvider.h>
+#import "FirebaseAuth/Sources/Public/FIRFacebookAuthProvider.h"
 
 #import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyAssertionRequest.h"
 #import "FirebaseAuth/Sources/Utilities/FIRAuthExceptionUtils.h"

diff --git a/FirebaseAuth/Sources/AuthProvider/Facebook/FIRFacebookAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/Facebook/FIRFacebookAuthProvider.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIRFacebookAuthProvider.h>
+#import "FirebaseAuth/Sources/Public/FIRFacebookAuthProvider.h"
 
 #import "FirebaseAuth/Sources/AuthProvider/Facebook/FIRFacebookAuthCredential.h"
 #import "FirebaseAuth/Sources/Utilities/FIRAuthExceptionUtils.h"

diff --git a/FirebaseAuth/Sources/AuthProvider/GameCenter/FIRGameCenterAuthCredential.h b/FirebaseAuth/Sources/AuthProvider/GameCenter/FIRGameCenterAuthCredential.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIRAuthCredential.h>
 #import <Foundation/Foundation.h>
+#import "FirebaseAuth/Sources/Public/FIRAuthCredential.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/FirebaseAuth/Sources/AuthProvider/GameCenter/FIRGameCenterAuthCredential.m b/FirebaseAuth/Sources/AuthProvider/GameCenter/FIRGameCenterAuthCredential.m
@@ -16,7 +16,7 @@
 
 #import "FirebaseAuth/Sources/AuthProvider/GameCenter/FIRGameCenterAuthCredential.h"
 
-#import <FirebaseAuth/FIRGameCenterAuthProvider.h>
+#import "FirebaseAuth/Sources/Public/FIRGameCenterAuthProvider.h"
 
 #import "FirebaseAuth/Sources/AuthProvider/FIRAuthCredential_Internal.h"
 #import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyAssertionRequest.h"

diff --git a/FirebaseAuth/Sources/AuthProvider/GameCenter/FIRGameCenterAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/GameCenter/FIRGameCenterAuthProvider.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIRGameCenterAuthProvider.h>
+#import "FirebaseAuth/Sources/Public/FIRGameCenterAuthProvider.h"
 #import <GameKit/GameKit.h>
 
 #import "FirebaseAuth/Sources/AuthProvider/GameCenter/FIRGameCenterAuthCredential.h"

diff --git a/FirebaseAuth/Sources/AuthProvider/GitHub/FIRGitHubAuthCredential.m b/FirebaseAuth/Sources/AuthProvider/GitHub/FIRGitHubAuthCredential.m
@@ -16,7 +16,7 @@
 
 #import "FirebaseAuth/Sources/AuthProvider/GitHub/FIRGitHubAuthCredential.h"
 
-#import <FirebaseAuth/FIRGitHubAuthProvider.h>
+#import "FirebaseAuth/Sources/Public/FIRGitHubAuthProvider.h"
 
 #import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyAssertionRequest.h"
 #import "FirebaseAuth/Sources/Utilities/FIRAuthExceptionUtils.h"

diff --git a/FirebaseAuth/Sources/AuthProvider/GitHub/FIRGitHubAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/GitHub/FIRGitHubAuthProvider.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIRGitHubAuthProvider.h>
+#import "FirebaseAuth/Sources/Public/FIRGitHubAuthProvider.h"
 
 #import "FirebaseAuth/Sources/AuthProvider/GitHub/FIRGitHubAuthCredential.h"
 #import "FirebaseAuth/Sources/Utilities/FIRAuthExceptionUtils.h"

diff --git a/FirebaseAuth/Sources/AuthProvider/Google/FIRGoogleAuthCredential.m b/FirebaseAuth/Sources/AuthProvider/Google/FIRGoogleAuthCredential.m
@@ -16,7 +16,7 @@
 
 #import "FirebaseAuth/Sources/AuthProvider/Google/FIRGoogleAuthCredential.h"
 
-#import <FirebaseAuth/FIRGoogleAuthProvider.h>
+#import "FirebaseAuth/Sources/Public/FIRGoogleAuthProvider.h"
 
 #import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyAssertionRequest.h"
 #import "FirebaseAuth/Sources/Utilities/FIRAuthExceptionUtils.h"

diff --git a/FirebaseAuth/Sources/AuthProvider/Google/FIRGoogleAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/Google/FIRGoogleAuthProvider.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIRGoogleAuthProvider.h>
+#import "FirebaseAuth/Sources/Public/FIRGoogleAuthProvider.h"
 
 #import "FirebaseAuth/Sources/AuthProvider/Google/FIRGoogleAuthCredential.h"
 #import "FirebaseAuth/Sources/Utilities/FIRAuthExceptionUtils.h"

diff --git a/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthCredential.m b/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthCredential.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIROAuthCredential.h>
+#import "FirebaseAuth/Sources/Public/FIROAuthCredential.h"
 
 #import "FirebaseAuth/Sources/AuthProvider/FIRAuthCredential_Internal.h"
 #import "FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthCredential_Internal.h"

diff --git a/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthCredential_Internal.h b/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthCredential_Internal.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIROAuthCredential.h>
 #import <Foundation/Foundation.h>
+#import "FirebaseAuth/Sources/Public/FIROAuthCredential.h"
 
 @class FIRVerifyAssertionResponse;
 

diff --git a/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#import "FirebaseAuth/Sources/Public/FIROAuthProvider.h"
 #include <CommonCrypto/CommonCrypto.h>
-#import <FirebaseAuth/FIRFacebookAuthProvider.h>
-#import <FirebaseAuth/FIROAuthCredential.h>
-#import <FirebaseAuth/FIROAuthProvider.h>
+#import "FirebaseAuth/Sources/Public/FIRFacebookAuthProvider.h"
+#import "FirebaseAuth/Sources/Public/FIROAuthCredential.h"
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"

diff --git a/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthCredential.m b/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthCredential.m
@@ -17,7 +17,7 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS
 
-#import <FirebaseAuth/FIRPhoneAuthCredential.h>
+#import "FirebaseAuth/Sources/Public/FIRPhoneAuthCredential.h"
 
 #import "FirebaseAuth/Sources/AuthProvider/FIRAuthCredential_Internal.h"
 #import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyAssertionRequest.h"

diff --git a/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthCredential_Internal.h b/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthCredential_Internal.h
@@ -17,8 +17,8 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS
 
-#import <FirebaseAuth/FIRPhoneAuthCredential.h>
 #import <Foundation/Foundation.h>
+#import "FirebaseAuth/Sources/Public/FIRPhoneAuthCredential.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m
@@ -17,10 +17,10 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS
 
-#import <FirebaseAuth/FIRAuthSettings.h>
-#import <FirebaseAuth/FIRMultiFactorResolver.h>
-#import <FirebaseAuth/FIRPhoneAuthProvider.h>
-#import <FirebaseAuth/FirebaseAuthVersion.h>
+#import "FirebaseAuth/Sources/Public/FIRAuthSettings.h"
+#import "FirebaseAuth/Sources/Public/FIRMultiFactorResolver.h"
+#import "FirebaseAuth/Sources/Public/FIRPhoneAuthProvider.h"
+#import "FirebaseAuth/Sources/Public/FirebaseAuthVersion.h"
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"

diff --git a/FirebaseAuth/Sources/AuthProvider/Twitter/FIRTwitterAuthCredential.m b/FirebaseAuth/Sources/AuthProvider/Twitter/FIRTwitterAuthCredential.m
@@ -16,7 +16,7 @@
 
 #import "FirebaseAuth/Sources/AuthProvider/Twitter/FIRTwitterAuthCredential.h"
 
-#import <FirebaseAuth/FIRTwitterAuthProvider.h>
+#import "FirebaseAuth/Sources/Public/FIRTwitterAuthProvider.h"
 
 #import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyAssertionRequest.h"
 #import "FirebaseAuth/Sources/Utilities/FIRAuthExceptionUtils.h"

diff --git a/FirebaseAuth/Sources/AuthProvider/Twitter/FIRTwitterAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/Twitter/FIRTwitterAuthProvider.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FIRTwitterAuthProvider.h>
+#import "FirebaseAuth/Sources/Public/FIRTwitterAuthProvider.h"
 
 #import "FirebaseAuth/Sources/AuthProvider/Twitter/FIRTwitterAuthCredential.h"
 #import "FirebaseAuth/Sources/Utilities/FIRAuthExceptionUtils.h"

diff --git a/FirebaseAuth/Sources/Backend/FIRAuthBackend.m b/FirebaseAuth/Sources/Backend/FIRAuthBackend.m
@@ -16,9 +16,14 @@
 
 #import "FirebaseAuth/Sources/Backend/FIRAuthBackend.h"
 
-#import <FirebaseAuth/FirebaseAuth.h>
+#if SWIFT_PACKAGE
+@import GTMSessionFetcherCore;
+#else
 #import <GTMSessionFetcher/GTMSessionFetcher.h>
 #import <GTMSessionFetcher/GTMSessionFetcherService.h>
+#endif
+
+#import "FirebaseAuth/Sources/Public/FirebaseAuth.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
 #import "FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthCredential_Internal.h"
@@ -59,7 +64,7 @@
 #import "FirebaseAuth/Sources/Utilities/FIRAuthErrorUtils.h"
 
 #if TARGET_OS_IOS
-#import <FirebaseAuth/FIRPhoneAuthProvider.h>
+#import "FirebaseAuth/Sources/Public/FIRPhoneAuthProvider.h"
 
 #import "FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthCredential_Internal.h"
 #import "FirebaseAuth/Sources/MultiFactor/Phone/FIRPhoneMultiFactorInfo+Internal.h"

diff --git a/FirebaseAuth/Sources/Backend/RPC/FIRGetOOBConfirmationCodeRequest.m b/FirebaseAuth/Sources/Backend/RPC/FIRGetOOBConfirmationCodeRequest.m
@@ -16,7 +16,7 @@
 
 #import "FirebaseAuth/Sources/Backend/RPC/FIRGetOOBConfirmationCodeRequest.h"
 
-#import <FirebaseAuth/FIRActionCodeSettings.h>
+#import "FirebaseAuth/Sources/Public/FIRActionCodeSettings.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"
 #import "FirebaseAuth/Sources/Utilities/FIRAuthErrorUtils.h"

diff --git a/FirebaseAuth/Sources/FirebaseAuthVersion.m b/FirebaseAuth/Sources/FirebaseAuthVersion.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseAuth/FirebaseAuthVersion.h>
+#import "FirebaseAuth/Sources/Public/FirebaseAuthVersion.h"
 
 // Convert the macro to a string
 #define STR(x) STR_EXPAND(x)

diff --git a/FirebaseAuth/Sources/MultiFactor/FIRMultiFactor+Internal.h b/FirebaseAuth/Sources/MultiFactor/FIRMultiFactor+Internal.h
@@ -17,7 +17,7 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS
 
-#import <FirebaseAuth/FIRMultiFactor.h>
+#import "FirebaseAuth/Sources/Public/FIRMultiFactor.h"
 
 #import "FirebaseAuth/Sources/Backend/RPC/Proto/FIRAuthProtoMFAEnrollment.h"
 

diff --git a/FirebaseAuth/Sources/MultiFactor/FIRMultiFactor.m b/FirebaseAuth/Sources/MultiFactor/FIRMultiFactor.m
@@ -16,7 +16,7 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS
 
-#import <FirebaseAuth/FIRMultiFactor.h>
+#import "FirebaseAuth/Sources/Public/FIRMultiFactor.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"
@@ -28,7 +28,7 @@
 #import "FirebaseAuth/Sources/User/FIRUser_Internal.h"
 
 #if TARGET_OS_IOS
-#import <FirebaseAuth/FIRPhoneMultiFactorAssertion.h>
+#import "FirebaseAuth/Sources/Public/FIRPhoneMultiFactorAssertion.h"
 
 #import "FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthCredential_Internal.h"
 #import "FirebaseAuth/Sources/MultiFactor/Phone/FIRPhoneMultiFactorAssertion+Internal.h"

diff --git a/FirebaseAuth/Sources/MultiFactor/FIRMultiFactorAssertion+Internal.h b/FirebaseAuth/Sources/MultiFactor/FIRMultiFactorAssertion+Internal.h
@@ -17,7 +17,7 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS
 
-#import <FirebaseAuth/FIRMultiFactorAssertion.h>
+#import "FirebaseAuth/Sources/Public/FIRMultiFactorAssertion.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/FirebaseAuth/Sources/MultiFactor/FIRMultiFactorAssertion.m b/FirebaseAuth/Sources/MultiFactor/FIRMultiFactorAssertion.m
@@ -17,7 +17,7 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS
 
-#import <FirebaseAuth/FIRMultiFactorAssertion.h>
+#import "FirebaseAuth/Sources/Public/FIRMultiFactorAssertion.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/FirebaseAuth/Sources/MultiFactor/FIRMultiFactorInfo+Internal.h b/FirebaseAuth/Sources/MultiFactor/FIRMultiFactorInfo+Internal.h
@@ -17,7 +17,7 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS
 
-#import <FirebaseAuth/FIRMultiFactorInfo.h>
+#import "FirebaseAuth/Sources/Public/FIRMultiFactorInfo.h"
 
 #import "FirebaseAuth/Sources/Backend/RPC/Proto/FIRAuthProtoMFAEnrollment.h"
 

diff --git a/FirebaseAuth/Sources/MultiFactor/FIRMultiFactorInfo.m b/FirebaseAuth/Sources/MultiFactor/FIRMultiFactorInfo.m
@@ -17,7 +17,7 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS
 
-#import <FirebaseAuth/FIRMultiFactorInfo.h>
+#import "FirebaseAuth/Sources/Public/FIRMultiFactorInfo.h"
 
 #import "FirebaseAuth/Sources/Backend/RPC/Proto/FIRAuthProtoMFAEnrollment.h"
 

diff --git a/FirebaseAuth/Sources/MultiFactor/FIRMultiFactorResolver+Internal.h b/FirebaseAuth/Sources/MultiFactor/FIRMultiFactorResolver+Internal.h
@@ -16,7 +16,7 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS
 
-#import <FirebaseAuth/FIRMultiFactorResolver.h>
+#import "FirebaseAuth/Sources/Public/FIRMultiFactorResolver.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/FirebaseAuth/Sources/MultiFactor/FIRMultiFactorResolver.m b/FirebaseAuth/Sources/MultiFactor/FIRMultiFactorResolver.m
@@ -16,8 +16,8 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS
 
-#import <FirebaseAuth/FIRAdditionalUserInfo.h>
-#import <FirebaseAuth/FIRMultiFactorResolver.h>
+#import "FirebaseAuth/Sources/Public/FIRAdditionalUserInfo.h"
+#import "FirebaseAuth/Sources/Public/FIRMultiFactorResolver.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"
@@ -28,7 +28,7 @@
 #import "FirebaseAuth/Sources/MultiFactor/FIRMultiFactorSession+Internal.h"
 
 #if TARGET_OS_IOS
-#import <FirebaseAuth/FIRPhoneMultiFactorAssertion.h>
+#import "FirebaseAuth/Sources/Public/FIRPhoneMultiFactorAssertion.h"
 
 #import "FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthCredential_Internal.h"
 #import "FirebaseAuth/Sources/MultiFactor/Phone/FIRPhoneMultiFactorAssertion+Internal.h"