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/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"