diff --git a/ios/RNFIRMessaging.h b/ios/RNFIRMessaging.h
index 52637da0222fea5fa2405fac30ee184fb28ba8f1..9813c4ff9264462ffb36c0a04b024cde924b22ab 100644
--- a/ios/RNFIRMessaging.h
+++ b/ios/RNFIRMessaging.h
@@ -1,9 +1,9 @@
 
 #import <UIKit/UIKit.h>
 
-#import <FirebaseCore/FIRApp.h>
-#import <FirebaseMessaging/FirebaseMessaging.h>
-#import <FirebaseInstanceID/FirebaseInstanceID.h>
+@import FirebaseCore;
+@import FirebaseMessaging;
+@import FirebaseInstanceID;
 #import <React/RCTEventEmitter.h>
 
 @import UserNotifications;
diff --git a/ios/RNFIRMessaging.xcodeproj/project.pbxproj b/ios/RNFIRMessaging.xcodeproj/project.pbxproj
index 6813e0d60152f7a79ad95b9bc54a29ef1abc83e2..f662aef6d3e04e7e8d0eb4cc1b1d7819a90c8d0c 100644
--- a/ios/RNFIRMessaging.xcodeproj/project.pbxproj
+++ b/ios/RNFIRMessaging.xcodeproj/project.pbxproj
@@ -218,16 +218,18 @@
 				CLANG_STATIC_ANALYZER_MODE = deep;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../../../ios/Pods/**",
 					"$(PROJECT_DIR)/../../../ios/Frameworks/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/FirebaseCore/**",
 					"$(SRCROOT)/../../../node_modules/react-native-firestack/ios/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/FirebaseMessaging/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/FirebaseInstanceID/**",
 				);
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../react-native/React/**",
-					"$(PROJECT_DIR)/../../../ios/Pods/**",
 					"$(PROJECT_DIR)/../../../ios/Frameworks/**",
 					"$(SRCROOT)/../../../node_modules/react-native-firestack/ios/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/Firebase/**",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
@@ -244,15 +246,17 @@
 				CLANG_STATIC_ANALYZER_MODE = deep;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../../../ios/Pods/**",
 					"$(PROJECT_DIR)/../../../ios/Frameworks/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/FirebaseCore/**",
 					"$(SRCROOT)/../../../node_modules/react-native-firestack/ios/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/FirebaseMessaging/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/FirebaseInstanceID/**",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../react-native/React/**",
-					"$(PROJECT_DIR)/../../../ios/Pods/**",
 					"$(PROJECT_DIR)/../../../ios/Frameworks/**",
 					"$(SRCROOT)/../../../node_modules/react-native-firestack/ios/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/Firebase/**",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";