22 files changed, 4 insertions, 23 deletions
diff --git a/Firebase/Auth/FirebaseAuth.podspec b/Firebase/Auth/FirebaseAuth.podspec
index cda5f06..b6cd526 100644
--- a/Firebase/Auth/FirebaseAuth.podspec
+++ b/Firebase/Auth/FirebaseAuth.podspec
@@ -31,26 +31,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
     'Source/**/FIRAuthAPNSTokenType.[mh]',
     'Source/**/FIRAuthAPNSToken.[mh]',
     'Source/**/FIRPhoneAuthProvider.[mh]'
-  s.public_header_files =
-    'Source/FirebaseAuth.h',
-    'Source/FirebaseAuthVersion.h',
-    'Source/FIRAdditionalUserInfo.h',
-    'Source/FIRAuth.h',
-    'Source/FIRAuthAPNSTokenType.h',
-    'Source/FIRAuthCredential.h',
-    'Source/FIRAuthDataResult.h',
-    'Source/FIRAuthErrors.h',
-    'Source/FIRAuthSwiftNameSupport.h',
-    'Source/AuthProviders/EmailPassword/FIREmailAuthProvider.h',
-    'Source/AuthProviders/Facebook/FIRFacebookAuthProvider.h',
-    'Source/AuthProviders/GitHub/FIRGitHubAuthProvider.h',
-    'Source/AuthProviders/Google/FIRGoogleAuthProvider.h',
-    'Source/AuthProviders/OAuth/FIROAuthProvider.h',
-    'Source/AuthProviders/Phone/FIRPhoneAuthCredential.h',
-    'Source/AuthProviders/Phone/FIRPhoneAuthProvider.h',
-    'Source/AuthProviders/Twitter/FIRTwitterAuthProvider.h',
-    'Source/FIRUser.h',
-    'Source/FIRUserInfo.h'
+  s.public_header_files = 'Source/Public/*.h'
   s.preserve_paths =
     'README.md',
     'CHANGELOG.md'
diff --git a/Firebase/Auth/Source/FIRUser.m b/Firebase/Auth/Source/FIRUser.m
index 64c29a8..de9745d 100644
--- a/Firebase/Auth/Source/FIRUser.m
+++ b/Firebase/Auth/Source/FIRUser.m
@@ -19,7 +19,7 @@
 #import "Private/FIRUser_Internal.h"
 
 #import "AuthProviders/EmailPassword/FIREmailPasswordAuthCredential.h"
-#import "AuthProviders/EmailPassword/FIREmailAuthProvider.h"
+#import "FIREmailAuthProvider.h"
 #import "AuthProviders/Phone/FIRPhoneAuthCredential_Internal.h"
 #import "Private/FIRAdditionalUserInfo_Internal.h"
 #import "FIRAuth.h"
@@ -50,7 +50,7 @@
 #import "FIRVerifyPhoneNumberResponse.h"
 
 #if TARGET_OS_IOS
-#import "AuthProviders/Phone/FIRPhoneAuthProvider.h"
+#import "FIRPhoneAuthProvider.h"
 #endif
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Firebase/Auth/Source/FIRAdditionalUserInfo.h b/Firebase/Auth/Source/Public/FIRAdditionalUserInfo.h
index 70e9e57..70e9e57 100644
--- a/Firebase/Auth/Source/FIRAdditionalUserInfo.h
+++ b/Firebase/Auth/Source/Public/FIRAdditionalUserInfo.h
diff --git a/Firebase/Auth/Source/FIRAuth.h b/Firebase/Auth/Source/Public/FIRAuth.h
index 356c8dd..356c8dd 100644
--- a/Firebase/Auth/Source/FIRAuth.h
+++ b/Firebase/Auth/Source/Public/FIRAuth.h
diff --git a/Firebase/Auth/Source/FIRAuthAPNSTokenType.h b/Firebase/Auth/Source/Public/FIRAuthAPNSTokenType.h
index 87df574..87df574 100644
--- a/Firebase/Auth/Source/FIRAuthAPNSTokenType.h
+++ b/Firebase/Auth/Source/Public/FIRAuthAPNSTokenType.h
diff --git a/Firebase/Auth/Source/FIRAuthCredential.h b/Firebase/Auth/Source/Public/FIRAuthCredential.h
index ce28854..ce28854 100644
--- a/Firebase/Auth/Source/FIRAuthCredential.h
+++ b/Firebase/Auth/Source/Public/FIRAuthCredential.h
diff --git a/Firebase/Auth/Source/FIRAuthDataResult.h b/Firebase/Auth/Source/Public/FIRAuthDataResult.h
index e72adf2..e72adf2 100644
--- a/Firebase/Auth/Source/FIRAuthDataResult.h
+++ b/Firebase/Auth/Source/Public/FIRAuthDataResult.h
diff --git a/Firebase/Auth/Source/FIRAuthErrors.h b/Firebase/Auth/Source/Public/FIRAuthErrors.h
index 0b161f7..0b161f7 100644
--- a/Firebase/Auth/Source/FIRAuthErrors.h
+++ b/Firebase/Auth/Source/Public/FIRAuthErrors.h
diff --git a/Firebase/Auth/Source/FIRAuthSwiftNameSupport.h b/Firebase/Auth/Source/Public/FIRAuthSwiftNameSupport.h
index 55e1bcc..55e1bcc 100644
--- a/Firebase/Auth/Source/FIRAuthSwiftNameSupport.h
+++ b/Firebase/Auth/Source/Public/FIRAuthSwiftNameSupport.h
diff --git a/Firebase/Auth/Source/AuthProviders/EmailPassword/FIREmailAuthProvider.h b/Firebase/Auth/Source/Public/FIREmailAuthProvider.h
index 4fb5ea0..4fb5ea0 100644
--- a/Firebase/Auth/Source/AuthProviders/EmailPassword/FIREmailAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIREmailAuthProvider.h
diff --git a/Firebase/Auth/Source/AuthProviders/Facebook/FIRFacebookAuthProvider.h b/Firebase/Auth/Source/Public/FIRFacebookAuthProvider.h
index 2307b08..2307b08 100644
--- a/Firebase/Auth/Source/AuthProviders/Facebook/FIRFacebookAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIRFacebookAuthProvider.h
diff --git a/Firebase/Auth/Source/AuthProviders/GitHub/FIRGitHubAuthProvider.h b/Firebase/Auth/Source/Public/FIRGitHubAuthProvider.h
index ab5c0ef..ab5c0ef 100644
--- a/Firebase/Auth/Source/AuthProviders/GitHub/FIRGitHubAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIRGitHubAuthProvider.h
diff --git a/Firebase/Auth/Source/AuthProviders/Google/FIRGoogleAuthProvider.h b/Firebase/Auth/Source/Public/FIRGoogleAuthProvider.h
index 92f0db2..92f0db2 100644
--- a/Firebase/Auth/Source/AuthProviders/Google/FIRGoogleAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIRGoogleAuthProvider.h
diff --git a/Firebase/Auth/Source/AuthProviders/OAuth/FIROAuthProvider.h b/Firebase/Auth/Source/Public/FIROAuthProvider.h
index e059b22..e059b22 100644
--- a/Firebase/Auth/Source/AuthProviders/OAuth/FIROAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIROAuthProvider.h
diff --git a/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthCredential.h b/Firebase/Auth/Source/Public/FIRPhoneAuthCredential.h
index d951564..d951564 100644
--- a/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthCredential.h
+++ b/Firebase/Auth/Source/Public/FIRPhoneAuthCredential.h
diff --git a/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.h b/Firebase/Auth/Source/Public/FIRPhoneAuthProvider.h
index 402edb5..402edb5 100644
--- a/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIRPhoneAuthProvider.h
diff --git a/Firebase/Auth/Source/AuthProviders/Twitter/FIRTwitterAuthProvider.h b/Firebase/Auth/Source/Public/FIRTwitterAuthProvider.h
index d8f647d..d8f647d 100644
--- a/Firebase/Auth/Source/AuthProviders/Twitter/FIRTwitterAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIRTwitterAuthProvider.h
diff --git a/Firebase/Auth/Source/FIRUser.h b/Firebase/Auth/Source/Public/FIRUser.h
index 9e3ac77..9e3ac77 100644
--- a/Firebase/Auth/Source/FIRUser.h
+++ b/Firebase/Auth/Source/Public/FIRUser.h
diff --git a/Firebase/Auth/Source/FIRUserInfo.h b/Firebase/Auth/Source/Public/FIRUserInfo.h
index 03f2038..03f2038 100644
--- a/Firebase/Auth/Source/FIRUserInfo.h
+++ b/Firebase/Auth/Source/Public/FIRUserInfo.h
diff --git a/Firebase/Auth/Source/FirebaseAuth.h b/Firebase/Auth/Source/Public/FirebaseAuth.h
index ef4aca6..ef4aca6 100644
--- a/Firebase/Auth/Source/FirebaseAuth.h
+++ b/Firebase/Auth/Source/Public/FirebaseAuth.h
diff --git a/Firebase/Auth/Source/FirebaseAuthVersion.h b/Firebase/Auth/Source/Public/FirebaseAuthVersion.h
index 1b2d06a..1b2d06a 100644
--- a/Firebase/Auth/Source/FirebaseAuthVersion.h
+++ b/Firebase/Auth/Source/Public/FirebaseAuthVersion.h
diff --git a/Firebase/Auth/Source/RPCs/FIRAuthBackend.m b/Firebase/Auth/Source/RPCs/FIRAuthBackend.m
index d89e3c6..26ce790 100644
--- a/Firebase/Auth/Source/RPCs/FIRAuthBackend.m
+++ b/Firebase/Auth/Source/RPCs/FIRAuthBackend.m
@@ -56,7 +56,7 @@
 #import <GTMSessionFetcher/GTMSessionFetcherService.h>
 
 #if TARGET_OS_IOS
-#import "../AuthProviders/Phone/FIRPhoneAuthProvider.h"
+#import "FIRPhoneAuthProvider.h"
 #endif
 
 /** @var kClientVersionHeader