diff --git a/xcode/osx/moai-osx.xcodeproj/project.pbxproj b/xcode/osx/moai-osx.xcodeproj/project.pbxproj
index 2acf21ff1c..df033e739f 100644
--- a/xcode/osx/moai-osx.xcodeproj/project.pbxproj
+++ b/xcode/osx/moai-osx.xcodeproj/project.pbxproj
@@ -15,8 +15,7 @@
 		0300CF94140DC65100ABCC5B /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0300CF93140DC65100ABCC5B /* AudioUnit.framework */; };
 		4C623B6415246B10008E4436 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C623B6315246B10008E4436 /* Foundation.framework */; };
 		4C623B6615246B25008E4436 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C623B6515246B25008E4436 /* CoreServices.framework */; };
-		63F98C5A1E6B849C00A74124 /* libmoai-osx-3rdparty-crypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CDE6C8031AD8682200D6B83A /* libmoai-osx-3rdparty-crypto.a */; };
-		63F98C5B1E6B84B200A74124 /* liblibmoai-osx-3rdparty-mbedtls.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63F98C591E6B849C00A74124 /* liblibmoai-osx-3rdparty-mbedtls.a */; };
+		63F98C5B1E6B84B200A74124 /* libmoai-osx-3rdparty-mbedtls.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63F98C591E6B849C00A74124 /* libmoai-osx-3rdparty-mbedtls.a */; };
 		CD096FD218E0FFE300A36EDD /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD096FD118E0FFE300A36EDD /* libstdc++.dylib */; };
 		CD1845BD1A626F0300FCCCE0 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD1845BC1A626F0300FCCCE0 /* SystemConfiguration.framework */; };
 		CD2E46C51C5181A3008E22A1 /* libmoai-osx-harfbuzz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CD1F44E81BDEBB7800F5CF59 /* libmoai-osx-harfbuzz.a */; };
@@ -55,6 +54,13 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		6304D3E31E6D8DCF0084B62F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0324CC6913564429000ADC60 /* libmoai.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 63F98C6A1E6B8B3100A74124;
+			remoteInfo = "libmoai-ios-3rdparty-mbedtls";
+		};
 		63F98C581E6B849C00A74124 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0324CC6913564429000ADC60 /* libmoai.xcodeproj */;
@@ -83,13 +89,6 @@
 			remoteGlobalIDString = 0324E2A81356485F000ADC60;
 			remoteInfo = "libmoai-osx-3rdparty-core";
 		};
-		CD1830771AECC0AC00D92E9E /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0324CC6913564429000ADC60 /* libmoai.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = CD80789E1831C3B500E658D9;
-			remoteInfo = "libmoai-osx-3rdparty-crypto";
-		};
 		CD1830791AECC0AC00D92E9E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0324CC6913564429000ADC60 /* libmoai.xcodeproj */;
@@ -370,13 +369,6 @@
 			remoteGlobalIDString = CD257BA21A6255380057A53A;
 			remoteInfo = "libmoai-ios-apple";
 		};
-		CDE6C7C61AD8682200D6B83A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0324CC6913564429000ADC60 /* libmoai.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = CDD480D117FA78AE00525B77;
-			remoteInfo = "libmoai-ios-3rdparty-crypto";
-		};
 		CDE6C7C81AD8682200D6B83A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0324CC6913564429000ADC60 /* libmoai.xcodeproj */;
@@ -580,13 +572,6 @@
 			remoteGlobalIDString = 0324E2AF1356485F000ADC60;
 			remoteInfo = "libmoai-osx-3rdparty-core";
 		};
-		CDE6C8021AD8682200D6B83A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0324CC6913564429000ADC60 /* libmoai.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = CD807B4A1831C3B500E658D9;
-			remoteInfo = "libmoai-osx-3rdparty-crypto";
-		};
 		CDE6C8041AD8682200D6B83A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0324CC6913564429000ADC60 /* libmoai.xcodeproj */;
@@ -756,8 +741,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				63F98C5B1E6B84B200A74124 /* liblibmoai-osx-3rdparty-mbedtls.a in Frameworks */,
-				63F98C5A1E6B849C00A74124 /* libmoai-osx-3rdparty-crypto.a in Frameworks */,
+				63F98C5B1E6B84B200A74124 /* libmoai-osx-3rdparty-mbedtls.a in Frameworks */,
 				CDFD8FB11AD8653C0003F415 /* libmoai-osx-3rdparty-core.a in Frameworks */,
 				CDFD8FB31AD8653C0003F415 /* libmoai-osx-3rdparty-sdl.a in Frameworks */,
 				CDFD8FB41AD8653C0003F415 /* libmoai-osx-apple.a in Frameworks */,
@@ -885,7 +869,6 @@
 				CDE6C7C11AD8682200D6B83A /* libmoai-ios.a */,
 				CDE6C7C31AD8682200D6B83A /* libmoai-ios-apple.a */,
 				CDE6556B1C0AAB75004493DD /* libmoai-ios-3rdparty-contrib.a */,
-				CDE6C7C71AD8682200D6B83A /* libmoai-ios-3rdparty-crypto.a */,
 				CDE6556D1C0AAB75004493DD /* libmoai-ios-3rdparty-expat.a */,
 				CDE6556F1C0AAB75004493DD /* libmoai-ios-3rdparty-freetype.a */,
 				CDE655711C0AAB75004493DD /* libmoai-ios-3rdparty-jannson.a */,
@@ -930,7 +913,6 @@
 				CDE6C7FD1AD8682200D6B83A /* libmoai-osx.a */,
 				CDE6C7FF1AD8682200D6B83A /* libmoai-osx-apple.a */,
 				CDE6C8011AD8682200D6B83A /* libmoai-osx-3rdparty-core.a */,
-				CDE6C8031AD8682200D6B83A /* libmoai-osx-3rdparty-crypto.a */,
 				CDE6C8051AD8682200D6B83A /* libmoai-osx-3rdparty-sdl.a */,
 				CDE6C8071AD8682200D6B83A /* libmoai-osx-audio-sampler.a */,
 				CDE6C8091AD8682200D6B83A /* libmoai-osx-box2d.a */,
@@ -951,7 +933,8 @@
 				CDE6C81D1AD8682200D6B83A /* libmoai-osx-zl-core.a */,
 				CDE6C81F1AD8682200D6B83A /* libmoai-osx-zl-crypto.a */,
 				CDE6C8211AD8682200D6B83A /* libmoai-osx-zl-vfs.a */,
-				63F98C591E6B849C00A74124 /* liblibmoai-osx-3rdparty-mbedtls.a */,
+				63F98C591E6B849C00A74124 /* libmoai-osx-3rdparty-mbedtls.a */,
+				6304D3E41E6D8DCF0084B62F /* libmoai-ios-3rdparty-mbedtls.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -974,7 +957,6 @@
 				CD1830741AECC0AC00D92E9E /* PBXTargetDependency */,
 				CDFF5AE01C29233B00969B44 /* PBXTargetDependency */,
 				CD1830761AECC0AC00D92E9E /* PBXTargetDependency */,
-				CD1830781AECC0AC00D92E9E /* PBXTargetDependency */,
 				CD18307A1AECC0AC00D92E9E /* PBXTargetDependency */,
 				CD18307E1AECC0AC00D92E9E /* PBXTargetDependency */,
 				CD1830801AECC0AC00D92E9E /* PBXTargetDependency */,
@@ -1043,10 +1025,17 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		63F98C591E6B849C00A74124 /* liblibmoai-osx-3rdparty-mbedtls.a */ = {
+		6304D3E41E6D8DCF0084B62F /* libmoai-ios-3rdparty-mbedtls.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libmoai-ios-3rdparty-mbedtls.a";
+			remoteRef = 6304D3E31E6D8DCF0084B62F /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		63F98C591E6B849C00A74124 /* libmoai-osx-3rdparty-mbedtls.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "liblibmoai-osx-3rdparty-mbedtls.a";
+			path = "libmoai-osx-3rdparty-mbedtls.a";
 			remoteRef = 63F98C581E6B849C00A74124 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -1211,13 +1200,6 @@
 			remoteRef = CDE6C7C21AD8682200D6B83A /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		CDE6C7C71AD8682200D6B83A /* libmoai-ios-3rdparty-crypto.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libmoai-ios-3rdparty-crypto.a";
-			remoteRef = CDE6C7C61AD8682200D6B83A /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		CDE6C7C91AD8682200D6B83A /* libmoai-ios-adcolony.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1421,13 +1403,6 @@
 			remoteRef = CDE6C8001AD8682200D6B83A /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		CDE6C8031AD8682200D6B83A /* libmoai-osx-3rdparty-crypto.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libmoai-osx-3rdparty-crypto.a";
-			remoteRef = CDE6C8021AD8682200D6B83A /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		CDE6C8051AD8682200D6B83A /* libmoai-osx-3rdparty-sdl.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1585,11 +1560,6 @@
 			name = "libmoai-osx-3rdparty-core";
 			targetProxy = CD1830751AECC0AC00D92E9E /* PBXContainerItemProxy */;
 		};
-		CD1830781AECC0AC00D92E9E /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "libmoai-osx-3rdparty-crypto";
-			targetProxy = CD1830771AECC0AC00D92E9E /* PBXContainerItemProxy */;
-		};
 		CD18307A1AECC0AC00D92E9E /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = "libmoai-osx-3rdparty-sdl";