diff --git a/ios/RTCPjSip.xcodeproj/project.pbxproj b/ios/RTCPjSip.xcodeproj/project.pbxproj
index 59a1fbbe..1391e18a 100644
--- a/ios/RTCPjSip.xcodeproj/project.pbxproj
+++ b/ios/RTCPjSip.xcodeproj/project.pbxproj
@@ -239,6 +239,8 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
+				USE_HEADERMAP = NO;
+
 			};
 			name = Debug;
 		};
@@ -275,6 +277,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
+				USE_HEADERMAP = NO;
 			};
 			name = Release;
 		};
@@ -288,7 +291,7 @@
 				);
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
-					PJ_AUTOCONF,
+					"PJ_AUTOCONF=1",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../react-native/React/**",
@@ -314,7 +317,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				GCC_PREPROCESSOR_DEFINITIONS = PJ_AUTOCONF;
+				GCC_PREPROCESSOR_DEFINITIONS = "PJ_AUTOCONF=1";
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../react-native/React/**",
 					"\"$(SRCROOT)/VialerPJSIP/Headers\"",
diff --git a/react-native-pjsip.podspec b/react-native-pjsip.podspec
index 18c7c3c1..df7efd55 100644
--- a/react-native-pjsip.podspec
+++ b/react-native-pjsip.podspec
@@ -17,4 +17,8 @@ Pod::Spec.new do |s|
 
   s.dependency 'React'
   s.vendored_frameworks = 'ios/VialerPJSIP.framework'
+  s.xcconfig = {
+    'GCC_PREPROCESSOR_DEFINITIONS' => 'PJ_AUTOCONF=1',
+    'USE_HEADERMAP' => 'NO',
+  }
 end