@@ -1595,11 +1595,11 @@
 		4BF3A2281E25EA48002EA46F /* windows_1251.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = windows_1251.m; path = src/encodings/windows_1251.m; sourceTree = "<group>"; };
 		4BF48CDF18A95F83000E8D04 /* OFBigDataArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFBigDataArray.h; path = src/OFBigDataArray.h; sourceTree = "<group>"; };
 		4BF48CE018A95F83000E8D04 /* OFBigDataArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFBigDataArray.m; path = src/OFBigDataArray.m; sourceTree = "<group>"; };
 		4BF5CB8F1E2DC1D800CF7584 /* iso_8859_2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = iso_8859_2.m; path = src/encodings/iso_8859_2.m; sourceTree = "<group>"; };
 		4BF69CE51BD44F8B00DFFC1B /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform.h; path = src/platform.h; sourceTree = "<group>"; };
-		4BFBDD1610A0724800051AFB /* unicode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = unicode.m; path = src/encodings/unicode.m; sourceTree = "<group>"; };
+		4BFBDD1610A0724800051AFB /* unicode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = unicode.m; path = src/unicode.m; sourceTree = "<group>"; };
 		4BFF3710177E17C100192782 /* OFRemoveItemFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFRemoveItemFailedException.h; path = src/exceptions/OFRemoveItemFailedException.h; sourceTree = "<group>"; };
 		4BFF3711177E17C100192782 /* OFRemoveItemFailedException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFRemoveItemFailedException.m; path = src/exceptions/OFRemoveItemFailedException.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1911,11 +1911,10 @@
 				4B5EBFB51E25A8CF004FE6A2 /* codepage_850.m */,
 				4B6736111E2B2F6F00681F2C /* codepage_858.m */,
 				4BF5CB8F1E2DC1D800CF7584 /* iso_8859_2.m */,
 				4B6AF96F10A8D40E0003FB0A /* iso_8859_15.m */,
 				4B5EBFB81E25A937004FE6A2 /* mac_roman.m */,
-				4BFBDD1610A0724800051AFB /* unicode.m */,
 				4BF3A2281E25EA48002EA46F /* windows_1251.m */,
 				4B6AF97210A8D42E0003FB0A /* windows_1252.m */,
 			);
 			name = Encodings;
 			sourceTree = "<group>";
@@ -2198,10 +2197,11 @@
 				4B7DD58118942FE200990FD6 /* socket_helpers.h */,
 				4B67998B1099E7C50041064A /* threading.h */,
 				4B3379CE1979326A0088E97E /* threading.m */,
 				4BABC29A197A8212006A93BD /* threading_pthread.m */,
 				4B67998C1099E7C50041064A /* unicode.h */,
+				4BFBDD1610A0724800051AFB /* unicode.m */,
 			);
 			name = ObjFW;
 			sourceTree = "<group>";
 		};
 		4B6EF66D123535480076B512 /* Tests */ = {
@@ -3213,10 +3213,11 @@
 				4B2C21901DA292BE00735907 /* pbkdf2.m in Sources */,
 				4B2C21911DA292BE00735907 /* resolver.m in Sources */,
 				4B2C21921DA292BE00735907 /* scrypt.m in Sources */,
 				4B2C21931DA292BE00735907 /* socket.m in Sources */,
 				4B2C21941DA292BE00735907 /* threading.m in Sources */,
+				4B2C21961DA292BE00735907 /* unicode.m in Sources */,
 				4B2C21981DA292BE00735907 /* OFAcceptFailedException.m in Sources */,
 				4B2C21991DA292BE00735907 /* OFObject+KeyValueCoding.m in Sources */,
 				4B2C219A1DA292BE00735907 /* OFAddressTranslationFailedException.m in Sources */,
 				4B2C219B1DA292BE00735907 /* OFAllocFailedException.m in Sources */,
 				4B2C219C1DA292BE00735907 /* OFAlreadyConnectedException.m in Sources */,
@@ -3279,11 +3280,10 @@
 				4B5EBFB71E25A8CF004FE6A2 /* codepage_850.m in Sources */,
 				4B6736131E2B2F6F00681F2C /* codepage_858.m in Sources */,
 				4B2C218C1DA292BE00735907 /* iso_8859_15.m in Sources */,
 				4BF5CB911E2DC1D800CF7584 /* iso_8859_2.m in Sources */,
 				4B5EBFBA1E25A937004FE6A2 /* mac_roman.m in Sources */,
-				4B2C21961DA292BE00735907 /* unicode.m in Sources */,
 				4BF3A22A1E25EA48002EA46F /* windows_1251.m in Sources */,
 				4B2C21971DA292BE00735907 /* windows_1252.m in Sources */,
 				4B2C21D41DA292BE00735907 /* forwarding.S in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3407,10 +3407,11 @@
 				4BD306351D46CEE300E2F372 /* pbkdf2.m in Sources */,
 				4B7769EE1895C07D00D12284 /* resolver.m in Sources */,
 				4B6994481D47FB1A007F34DF /* scrypt.m in Sources */,
 				4B40EC1B189FE2650031E19E /* socket.m in Sources */,
 				4B3379CF1979326A0088E97E /* threading.m in Sources */,
+				4B3D23B91337FC0D00DD29B8 /* unicode.m in Sources */,
 				4B90B79F133AD87D00BD33CB /* OFAcceptFailedException.m in Sources */,
 				4BC176311D04963000C32718 /* OFObject+KeyValueCoding.m in Sources */,
 				4B90B7A1133AD87D00BD33CB /* OFAddressTranslationFailedException.m in Sources */,
 				4B17FF80133A2D17003E6DCD /* OFAllocFailedException.m in Sources */,
 				4B90B78E133AD46700BD33CB /* OFAlreadyConnectedException.m in Sources */,
@@ -3473,11 +3474,10 @@
 				4B5EBFB61E25A8CF004FE6A2 /* codepage_850.m in Sources */,
 				4B6736121E2B2F6F00681F2C /* codepage_858.m in Sources */,
 				4B3D23B41337FC0D00DD29B8 /* iso_8859_15.m in Sources */,
 				4BF5CB901E2DC1D800CF7584 /* iso_8859_2.m in Sources */,
 				4B5EBFB91E25A937004FE6A2 /* mac_roman.m in Sources */,
-				4B3D23B91337FC0D00DD29B8 /* unicode.m in Sources */,
 				4BF3A2291E25EA48002EA46F /* windows_1251.m in Sources */,
 				4B3D23BA1337FC0D00DD29B8 /* windows_1252.m in Sources */,
 				4B5C112F17E9AB3E003C917F /* forwarding.S in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;