diff --git a/.gitignore b/.gitignore
index b7dab5e9..13ebdb47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
-build
\ No newline at end of file
+build
+xcuserdata
diff --git a/ios/RNFIRMessaging.h b/ios/RNFIRMessaging.h
index 0a4fb1ab..ed630eec 100644
--- a/ios/RNFIRMessaging.h
+++ b/ios/RNFIRMessaging.h
@@ -1,7 +1,8 @@
 
 #import <UIKit/UIKit.h>
 
-#import "Firebase.h"
+@import Firebase;
+@import FirebaseMessaging;
 
 #import "RCTBridgeModule.h"
 
diff --git a/ios/RNFIRMessaging.xcodeproj/project.pbxproj b/ios/RNFIRMessaging.xcodeproj/project.pbxproj
index f86fe4e9..c0b8fa4e 100644
--- a/ios/RNFIRMessaging.xcodeproj/project.pbxproj
+++ b/ios/RNFIRMessaging.xcodeproj/project.pbxproj
@@ -212,11 +212,13 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/../../../ios/**",
+					"$(SRCROOT)/../../../node_modules/react-native-firestack/ios/**",
 				);
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../react-native/React/**",
 					"$(SRCROOT)/../../../ios/**",
+					"$(SRCROOT)/../../../node_modules/react-native-firestack/ios/**",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
@@ -233,10 +235,12 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/../../../ios/**",
+					"$(SRCROOT)/../../../node_modules/react-native-firestack/ios/**",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../react-native/React/**",
 					"$(SRCROOT)/../../../ios/**",
+					"$(SRCROOT)/../../../node_modules/react-native-firestack/ios/**",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";