diff --git a/runtime/Cpp/demo/Mac/antlrcpp-demo.xcodeproj/project.pbxproj b/runtime/Cpp/demo/Mac/antlrcpp-demo.xcodeproj/project.pbxproj
index c730fa5b9..bb47040e1 100644
--- a/runtime/Cpp/demo/Mac/antlrcpp-demo.xcodeproj/project.pbxproj
+++ b/runtime/Cpp/demo/Mac/antlrcpp-demo.xcodeproj/project.pbxproj
@@ -50,6 +50,13 @@
 			remoteGlobalIDString = 37C147161B4D5A04008EDDDB;
 			remoteInfo = antlrcpp_static;
 		};
+		273DC2BC1CDB619900DB7B2B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 270925A11CDB409400522D32 /* antlrcpp.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 270C67F01CDB4F1E00116E17;
+			remoteInfo = antlrcpp_ios;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -66,7 +73,7 @@
 
 /* Begin PBXFileReference section */
 		270925A11CDB409400522D32 /* antlrcpp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = antlrcpp.xcodeproj; path = ../../runtime/antlrcpp.xcodeproj; sourceTree = "<group>"; };
-		270925B01CDB435600522D32 /* antlrcpp-Prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "antlrcpp-Prefix.h"; path = "../../runtime/antlrcpp-Prefix.h"; sourceTree = "<group>"; };
+		270925B01CDB435600522D32 /* antlrcpp-Prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "antlrcpp-Prefix.h"; path = "../../runtime/src/antlrcpp-Prefix.h"; sourceTree = "<group>"; };
 		2747A7121CA6C46C0030247B /* InputHandlingTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InputHandlingTests.mm; sourceTree = "<group>"; wrapsLines = 0; };
 		274FC6D81CA96B6C008D4374 /* MiscClassTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MiscClassTests.mm; sourceTree = "<group>"; wrapsLines = 0; };
 		27874F1D1CCB7A0700AF1C53 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
@@ -116,6 +123,7 @@
 			children = (
 				270925A71CDB409400522D32 /* antlrcpp.dylib */,
 				270925A91CDB409400522D32 /* libantlrcpp_static.a */,
+				273DC2BD1CDB619900DB7B2B /* antlrcpp_ios.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -294,6 +302,13 @@
 			remoteRef = 270925A81CDB409400522D32 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		273DC2BD1CDB619900DB7B2B /* antlrcpp_ios.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = antlrcpp_ios.framework;
+			remoteRef = 273DC2BC1CDB619900DB7B2B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -419,7 +434,7 @@
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "../../runtime/antlrcpp-Prefix.h";
+				GCC_PREFIX_HEADER = "../../runtime/src/antlrcpp-Prefix.h";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -433,13 +448,13 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					../../runtime/tree/pattern,
-					../../runtime/tree,
-					../../runtime/support,
-					../../runtime/misc,
-					../../runtime/dfa,
-					../../runtime/atn,
-					../../runtime,
+					../../runtime/src/tree/pattern,
+					../../runtime/src/tree,
+					../../runtime/src/support,
+					../../runtime/src/misc,
+					../../runtime/src/dfa,
+					../../runtime/src/atn,
+					../../runtime/src,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				ONLY_ACTIVE_ARCH = YES;
@@ -468,7 +483,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "../../runtime/antlrcpp-Prefix.h";
+				GCC_PREFIX_HEADER = "../../runtime/src/antlrcpp-Prefix.h";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_SIGN_COMPARE = YES;
@@ -477,13 +492,13 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					../../runtime/tree/pattern,
-					../../runtime/tree,
-					../../runtime/support,
-					../../runtime/misc,
-					../../runtime/dfa,
-					../../runtime/atn,
-					../../runtime,
+					../../runtime/src/tree/pattern,
+					../../runtime/src/tree,
+					../../runtime/src/support,
+					../../runtime/src/misc,
+					../../runtime/src/dfa,
+					../../runtime/src/atn,
+					../../runtime/src,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				SDKROOT = macosx;