diff --git a/build-mac/generated-files-asn1.txt b/build-mac/generated-files-asn1.txt
new file mode 100644
index 00000000..934993f4
--- /dev/null
+++ b/build-mac/generated-files-asn1.txt
@@ -0,0 +1,48 @@
+$(SRCROOT)/../asn.1/BIT_STRING.c
+$(SRCROOT)/../asn.1/BOOLEAN.c
+$(SRCROOT)/../asn.1/Beacon.c
+$(SRCROOT)/../asn.1/CommitAccept.c
+$(SRCROOT)/../asn.1/CommitAcceptForGroup.c
+$(SRCROOT)/../asn.1/CommitReject.c
+$(SRCROOT)/../asn.1/GroupKeys.c
+$(SRCROOT)/../asn.1/GroupKeysAndClose.c
+$(SRCROOT)/../asn.1/HandshakeAnswer.c
+$(SRCROOT)/../asn.1/HandshakeRequest.c
+$(SRCROOT)/../asn.1/Hash.c
+$(SRCROOT)/../asn.1/Hex.c
+$(SRCROOT)/../asn.1/INTEGER.c
+$(SRCROOT)/../asn.1/ISO639-1.c
+$(SRCROOT)/../asn.1/Identity.c
+$(SRCROOT)/../asn.1/IdentityList.c
+$(SRCROOT)/../asn.1/KeySync.c
+$(SRCROOT)/../asn.1/NativeEnumerated.c
+$(SRCROOT)/../asn.1/NativeInteger.c
+$(SRCROOT)/../asn.1/OCTET_STRING.c
+$(SRCROOT)/../asn.1/PString.c
+$(SRCROOT)/../asn.1/PrintableString.c
+$(SRCROOT)/../asn.1/Rollback.c
+$(SRCROOT)/../asn.1/Sync.c
+$(SRCROOT)/../asn.1/TID.c
+$(SRCROOT)/../asn.1/UTF8String.c
+$(SRCROOT)/../asn.1/Version.c
+$(SRCROOT)/../asn.1/asn_SEQUENCE_OF.c
+$(SRCROOT)/../asn.1/asn_SET_OF.c
+$(SRCROOT)/../asn.1/asn_codecs_prim.c
+$(SRCROOT)/../asn.1/ber_decoder.c
+$(SRCROOT)/../asn.1/ber_tlv_length.c
+$(SRCROOT)/../asn.1/ber_tlv_tag.c
+$(SRCROOT)/../asn.1/constr_CHOICE.c
+$(SRCROOT)/../asn.1/constr_SEQUENCE.c
+$(SRCROOT)/../asn.1/constr_SEQUENCE_OF.c
+$(SRCROOT)/../asn.1/constr_SET_OF.c
+$(SRCROOT)/../asn.1/constr_TYPE.c
+$(SRCROOT)/../asn.1/constraints.c
+$(SRCROOT)/../asn.1/der_encoder.c
+$(SRCROOT)/../asn.1/pdu_collection.c
+$(SRCROOT)/../asn.1/per_decoder.c
+$(SRCROOT)/../asn.1/per_encoder.c
+$(SRCROOT)/../asn.1/per_opentype.c
+$(SRCROOT)/../asn.1/per_support.c
+$(SRCROOT)/../asn.1/xer_decoder.c
+$(SRCROOT)/../asn.1/xer_encoder.c
+$(SRCROOT)/../asn.1/xer_support.c
diff --git a/build-mac/pEpEngine.xcodeproj/project.pbxproj b/build-mac/pEpEngine.xcodeproj/project.pbxproj
index bf95c30b..bc7dbcfc 100644
--- a/build-mac/pEpEngine.xcodeproj/project.pbxproj
+++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -864,25 +864,9 @@
 			inputPaths = (
 			);
 			outputFileListPaths = (
+				"$(SRCROOT)/generated-files-asn1.txt",
 			);
 			outputPaths = (
-				"$(SRCROOT)/../asn.1/xer_encoder.c",
-				"$(SRCROOT)/../asn.1/xer_decoder.c",
-				"$(SRCROOT)/../asn.1/xer_support.c",
-				"$(SRCROOT)/../src/sync_impl.c",
-				"$(SRCROOT)/../src/sync_codec.c",
-				"$(SRCROOT)/../src/sync_actions.c",
-				"$(SRCROOT)/../asn.1/per_support.c",
-				"$(SRCROOT)/../asn.1/per_opentype.c",
-				"$(SRCROOT)/../asn.1/per_encoder.c",
-				"$(SRCROOT)/../asn.1/per_decoder.c",
-				"$(SRCROOT)/../asn.1/pdu_collection.c",
-				"$(SRCROOT)/../asn.1/der_encoder.c",
-				"$(SRCROOT)/../asn.1/constraints.c",
-				"$(SRCROOT)/../asn.1/constr_TYPE.c",
-				"$(SRCROOT)/../asn.1/constr_SET_OF.c",
-				"$(SRCROOT)/../asn.1/constr_SEQUENCE_OF.c",
-				"$(SRCROOT)/../asn.1/constr_SEQUENCE.c",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
@@ -1177,7 +1161,15 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../src $(PROJECT_DIR) $(PROJECT_DIR)/../../netpgp-et/include/ $(PROJECT_DIR)/../../netpgp-et/src/ $(PROJECT_DIR)/../../OpenSSL-for-iPhone/include $(PROJECT_DIR)/../asn.1/ $(inherited)";
+				USER_HEADER_SEARCH_PATHS = (
+					"$(PROJECT_DIR)/../src",
+					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/../../netpgp-et/include/",
+					"$(PROJECT_DIR)/../../netpgp-et/src/",
+					"$(PROJECT_DIR)/../../OpenSSL-for-iPhone/include",
+					"$(PROJECT_DIR)/../asn.1/",
+					"$(inherited)",
+				);
 			};
 			name = Debug;
 		};
@@ -1194,7 +1186,15 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../src $(PROJECT_DIR) $(PROJECT_DIR)/../../netpgp-et/include/ $(PROJECT_DIR)/../../netpgp-et/src/ $(PROJECT_DIR)/../../OpenSSL-for-iPhone/include $(PROJECT_DIR)/../asn.1/ $(inherited)";
+				USER_HEADER_SEARCH_PATHS = (
+					"$(PROJECT_DIR)/../src",
+					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/../../netpgp-et/include/",
+					"$(PROJECT_DIR)/../../netpgp-et/src/",
+					"$(PROJECT_DIR)/../../OpenSSL-for-iPhone/include",
+					"$(PROJECT_DIR)/../asn.1/",
+					"$(inherited)",
+				);
 			};
 			name = Release;
 		};