diff --git a/Firebase/Core/FIRApp.m b/Firebase/Core/FIRApp.m
index f4ccac995d5..82f9832132f 100644
--- a/Firebase/Core/FIRApp.m
+++ b/Firebase/Core/FIRApp.m
@@ -14,6 +14,8 @@
 
 #include <sys/utsname.h>
 
+#import "FIRApp.h"
+#import "FIRConfiguration.h"
 #import "Private/FIRAnalyticsConfiguration+Internal.h"
 #import "Private/FIRAppInternal.h"
 #import "Private/FIRBundleUtil.h"
@@ -21,8 +23,6 @@
 #import "Private/FIRLibrary.h"
 #import "Private/FIRLogger.h"
 #import "Private/FIROptionsInternal.h"
-#import "Public/FIRApp.h"
-#import "Public/FIRConfiguration.h"
 
 NSString *const kFIRServiceAdMob = @"AdMob";
 NSString *const kFIRServiceAuth = @"Auth";
diff --git a/Firebase/Core/FIRComponentType.m b/Firebase/Core/FIRComponentType.m
index e29ede22707..bdc004fbce5 100644
--- a/Firebase/Core/FIRComponentType.m
+++ b/Firebase/Core/FIRComponentType.m
@@ -16,7 +16,7 @@
 
 #import "Private/FIRComponentType.h"
 
-#import "FIRComponentContainerInternal.h"
+#import "Private/FIRComponentContainerInternal.h"
 
 @implementation FIRComponentType