11 files changed, 4 insertions, 12 deletions
diff --git a/Firebase/Core/FirebaseCore.podspec b/Firebase/Core/FirebaseCore.podspec
index b4fbef1..ca172b6 100644
--- a/Firebase/Core/FirebaseCore.podspec
+++ b/Firebase/Core/FirebaseCore.podspec
@@ -23,14 +23,6 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
   s.osx.deployment_target = '10.10'
 
   s.source_files = '**/*.[mh]'
-  s.public_header_files =
-    'FirebaseCore.h',
-    'FIRAnalyticsConfiguration.h',
-    'FIRApp.h',
-    'FIRConfiguration.h',
-    'FIRLoggerLevel.h',
-    'FIROptions.h',
-    'FIRCoreSwiftNameSupport.h'
-
+  s.public_header_files = 'Firebase/Core/Public/*.h'
   s.dependency 'GoogleToolboxForMac/NSData+zlib', '~> 2.1'
 end
diff --git a/Firebase/Core/Private/FIRAnalyticsConfiguration+Internal.h b/Firebase/Core/Private/FIRAnalyticsConfiguration+Internal.h
index 6c57a0f..8ea4cea 100644
--- a/Firebase/Core/Private/FIRAnalyticsConfiguration+Internal.h
+++ b/Firebase/Core/Private/FIRAnalyticsConfiguration+Internal.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "../FIRAnalyticsConfiguration.h"
+#import "FIRAnalyticsConfiguration.h"
 
 /// Values stored in analyticsEnabledState. Never alter these constants since they must match with
 /// values persisted to disk.
diff --git a/Firebase/Core/Private/FIRNetworkLoggerProtocol.h b/Firebase/Core/Private/FIRNetworkLoggerProtocol.h
index 7b7d094..70cc56d 100644
--- a/Firebase/Core/Private/FIRNetworkLoggerProtocol.h
+++ b/Firebase/Core/Private/FIRNetworkLoggerProtocol.h
@@ -17,7 +17,7 @@
 @import Foundation;
 
 #import "FIRNetworkMessageCode.h"
-#import "../FIRLoggerLevel.h"
+#import "FIRLoggerLevel.h"
 
 /// The log levels used by FIRNetworkLogger.
 typedef NS_ENUM(NSInteger, FIRNetworkLogLevel) {
diff --git a/Firebase/Core/Private/FIROptionsInternal.h b/Firebase/Core/Private/FIROptionsInternal.h
index 2b30248..859ac5c 100644
--- a/Firebase/Core/Private/FIROptionsInternal.h
+++ b/Firebase/Core/Private/FIROptionsInternal.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "../FIROptions.h"
+#import "FIROptions.h"
 
 /**
  * Keys for the strings in the plist file.
diff --git a/Firebase/Core/FIRAnalyticsConfiguration.h b/Firebase/Core/Public/FIRAnalyticsConfiguration.h
index f42eaf5..f42eaf5 100644
--- a/Firebase/Core/FIRAnalyticsConfiguration.h
+++ b/Firebase/Core/Public/FIRAnalyticsConfiguration.h
diff --git a/Firebase/Core/FIRApp.h b/Firebase/Core/Public/FIRApp.h
index 8f52e1a..8f52e1a 100644
--- a/Firebase/Core/FIRApp.h
+++ b/Firebase/Core/Public/FIRApp.h
diff --git a/Firebase/Core/FIRConfiguration.h b/Firebase/Core/Public/FIRConfiguration.h
index 496b211..496b211 100644
--- a/Firebase/Core/FIRConfiguration.h
+++ b/Firebase/Core/Public/FIRConfiguration.h
diff --git a/Firebase/Core/FIRCoreSwiftNameSupport.h b/Firebase/Core/Public/FIRCoreSwiftNameSupport.h
index 55e1bcc..55e1bcc 100644
--- a/Firebase/Core/FIRCoreSwiftNameSupport.h
+++ b/Firebase/Core/Public/FIRCoreSwiftNameSupport.h
diff --git a/Firebase/Core/FIRLoggerLevel.h b/Firebase/Core/Public/FIRLoggerLevel.h
index 70e99ee..70e99ee 100644
--- a/Firebase/Core/FIRLoggerLevel.h
+++ b/Firebase/Core/Public/FIRLoggerLevel.h
diff --git a/Firebase/Core/FIROptions.h b/Firebase/Core/Public/FIROptions.h
index 7bc2406..7bc2406 100644
--- a/Firebase/Core/FIROptions.h
+++ b/Firebase/Core/Public/FIROptions.h
diff --git a/Firebase/Core/FirebaseCore.h b/Firebase/Core/Public/FirebaseCore.h
index fa26f69..fa26f69 100644
--- a/Firebase/Core/FirebaseCore.h
+++ b/Firebase/Core/Public/FirebaseCore.h