Index: ObjFW.xcodeproj/project.pbxproj
==================================================================
--- ObjFW.xcodeproj/project.pbxproj
+++ ObjFW.xcodeproj/project.pbxproj
@@ -726,10 +726,14 @@
 		4B5D70671DA2F7B400B3B2D7 /* OFPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B6799791099E7C50041064A /* OFPlugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4B5D70681DA2F7B400B3B2D7 /* OFPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B67997A1099E7C50041064A /* OFPlugin.m */; };
 		4B5D70691DA2F81700B3B2D7 /* OFPluginTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF6761235358D0076B512 /* OFPluginTests.m */; };
 		4B5D706E1DA2F87A00B3B2D7 /* TestPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF684123535B60076B512 /* TestPlugin.m */; };
 		4B5D707A1DA2F96200B3B2D7 /* TestPlugin.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B5D70751DA2F87A00B3B2D7 /* TestPlugin.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		4B5EBFB61E25A8CF004FE6A2 /* codepage_850.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B5EBFB51E25A8CF004FE6A2 /* codepage_850.m */; };
+		4B5EBFB71E25A8CF004FE6A2 /* codepage_850.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B5EBFB51E25A8CF004FE6A2 /* codepage_850.m */; };
+		4B5EBFB91E25A937004FE6A2 /* mac_roman.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B5EBFB81E25A937004FE6A2 /* mac_roman.m */; };
+		4B5EBFBA1E25A937004FE6A2 /* mac_roman.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B5EBFB81E25A937004FE6A2 /* mac_roman.m */; };
 		4B60259F19B76A5C00694BCC /* OFSHA384Hash.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B60259919B76A5C00694BCC /* OFSHA384Hash.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4B6025A019B76A5C00694BCC /* OFSHA384Hash.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B60259A19B76A5C00694BCC /* OFSHA384Hash.m */; };
 		4B6025A119B76A5C00694BCC /* OFSHA384Or512Hash.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B60259B19B76A5C00694BCC /* OFSHA384Or512Hash.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4B6025A219B76A5C00694BCC /* OFSHA384Or512Hash.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B60259C19B76A5C00694BCC /* OFSHA384Or512Hash.m */; };
 		4B6025A319B76A5C00694BCC /* OFSHA512Hash.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B60259D19B76A5C00694BCC /* OFSHA512Hash.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1304,10 +1308,12 @@
 		4B5C112C17E9AAED003C917F /* forwarding.S */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; name = forwarding.S; path = src/forwarding/forwarding.S; sourceTree = "<group>"; };
 		4B5C112E17E9AB0C003C917F /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; name = Makefile; path = src/forwarding/Makefile; sourceTree = "<group>"; };
 		4B5CF8F614940BD2007AA324 /* OFString+JSONValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OFString+JSONValue.h"; path = "src/OFString+JSONValue.h"; sourceTree = "<group>"; };
 		4B5CF8F714940BD2007AA324 /* OFString+JSONValue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "OFString+JSONValue.m"; path = "src/OFString+JSONValue.m"; sourceTree = "<group>"; };
 		4B5D70751DA2F87A00B3B2D7 /* TestPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = TestPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B5EBFB51E25A8CF004FE6A2 /* codepage_850.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = codepage_850.m; path = src/codepage_850.m; sourceTree = "<group>"; };
+		4B5EBFB81E25A937004FE6A2 /* mac_roman.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = mac_roman.m; path = src/mac_roman.m; sourceTree = "<group>"; };
 		4B60259919B76A5C00694BCC /* OFSHA384Hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFSHA384Hash.h; path = src/OFSHA384Hash.h; sourceTree = "<group>"; };
 		4B60259A19B76A5C00694BCC /* OFSHA384Hash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFSHA384Hash.m; path = src/OFSHA384Hash.m; sourceTree = "<group>"; };
 		4B60259B19B76A5C00694BCC /* OFSHA384Or512Hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFSHA384Or512Hash.h; path = src/OFSHA384Or512Hash.h; sourceTree = "<group>"; };
 		4B60259C19B76A5C00694BCC /* OFSHA384Or512Hash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFSHA384Or512Hash.m; path = src/OFSHA384Or512Hash.m; sourceTree = "<group>"; };
 		4B60259D19B76A5C00694BCC /* OFSHA512Hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFSHA512Hash.h; path = src/OFSHA512Hash.h; sourceTree = "<group>"; };
@@ -2143,16 +2149,18 @@
 				4BA9CFA315E129D30076DC74 /* autorelease.h */,
 				4B3D236D1337FB5800DD29B8 /* base64.h */,
 				4B3D236E1337FB5800DD29B8 /* base64.m */,
 				4B837D7716829C5F007A3E83 /* block.h */,
 				4BB52CC617B8EA7F00B7EBF5 /* codepage_437.m */,
+				4B5EBFB51E25A8CF004FE6A2 /* codepage_850.m */,
 				4B881D391CCBFE0700E2F7D8 /* crc32.h */,
 				4B881D3A1CCBFE0700E2F7D8 /* crc32.m */,
 				4B837D7816829C5F007A3E83 /* instance.h */,
 				4B6AF96F10A8D40E0003FB0A /* iso_8859_15.m */,
 				4BE17AD812FD744C002CEB0B /* foundation-compat.m */,
 				4BBA36C511406AB700CBA3AC /* macros.h */,
+				4B5EBFB81E25A937004FE6A2 /* mac_roman.m */,
 				4BF1BCBF11C9663F0025511F /* objfw-defs.h.in */,
 				4BB50DCF12F863C700C9393F /* of_asprintf.h */,
 				4BB50DD012F863C700C9393F /* of_asprintf.m */,
 				4BA355BC14879BF700442EF4 /* of_strptime.h */,
 				4BA355B914879BDD00442EF4 /* of_strptime.m */,
@@ -3177,13 +3185,15 @@
 				4B2C21861DA292BE00735907 /* OFXMLProcessingInstructions.m in Sources */,
 				4B2C21871DA292BE00735907 /* OFZIPArchive.m in Sources */,
 				4B2C21881DA292BE00735907 /* OFZIPArchiveEntry.m in Sources */,
 				4B2C21891DA292BE00735907 /* base64.m in Sources */,
 				4B2C218A1DA292BE00735907 /* codepage_437.m in Sources */,
+				4B5EBFB71E25A8CF004FE6A2 /* codepage_850.m in Sources */,
 				4B2C218B1DA292BE00735907 /* crc32.m in Sources */,
 				4B2C218C1DA292BE00735907 /* iso_8859_15.m in Sources */,
 				4B2C218D1DA292BE00735907 /* foundation-compat.m in Sources */,
+				4B5EBFBA1E25A937004FE6A2 /* mac_roman.m in Sources */,
 				4B2C218E1DA292BE00735907 /* of_asprintf.m in Sources */,
 				4B2C218F1DA292BE00735907 /* of_strptime.m in Sources */,
 				4B2C21901DA292BE00735907 /* pbkdf2.m in Sources */,
 				4B2C21911DA292BE00735907 /* resolver.m in Sources */,
 				4B2C21921DA292BE00735907 /* scrypt.m in Sources */,
@@ -3366,13 +3376,15 @@
 				4B48B95514DC23B100546D39 /* OFXMLProcessingInstructions.m in Sources */,
 				4BE52D2217B990B4005958D1 /* OFZIPArchive.m in Sources */,
 				4B8B025A17BBA7C7009ED983 /* OFZIPArchiveEntry.m in Sources */,
 				4B3D23B31337FC0D00DD29B8 /* base64.m in Sources */,
 				4BB52CC717B8EA7F00B7EBF5 /* codepage_437.m in Sources */,
+				4B5EBFB61E25A8CF004FE6A2 /* codepage_850.m in Sources */,
 				4B881D3D1CCBFE2A00E2F7D8 /* crc32.m in Sources */,
 				4B3D23B41337FC0D00DD29B8 /* iso_8859_15.m in Sources */,
 				4B3D23B51337FC0D00DD29B8 /* foundation-compat.m in Sources */,
+				4B5EBFB91E25A937004FE6A2 /* mac_roman.m in Sources */,
 				4B3D23EE1337FFD000DD29B8 /* of_asprintf.m in Sources */,
 				4BA355BA14879BDD00442EF4 /* of_strptime.m in Sources */,
 				4BD306351D46CEE300E2F372 /* pbkdf2.m in Sources */,
 				4B7769EE1895C07D00D12284 /* resolver.m in Sources */,
 				4B6994481D47FB1A007F34DF /* scrypt.m in Sources */,

Index: src/codepage_437.m
==================================================================
--- src/codepage_437.m
+++ src/codepage_437.m
@@ -445,10 +445,10 @@
 					return false;
 
 				break;
 			}
 		} else
-			output[i] = (uint8_t)c;
+			output[i] = (unsigned char)c;
 	}
 
 	return true;
 }

Index: src/codepage_850.m
==================================================================
--- src/codepage_850.m
+++ src/codepage_850.m
@@ -445,10 +445,10 @@
 					return false;
 
 				break;
 			}
 		} else
-			output[i] = (uint8_t)c;
+			output[i] = (unsigned char)c;
 	}
 
 	return true;
 }

Index: src/iso_8859_15.m
==================================================================
--- src/iso_8859_15.m
+++ src/iso_8859_15.m
@@ -101,13 +101,13 @@
 				else
 					return false;
 
 				break;
 			default:
-				output[i] = (uint8_t)c;
+				output[i] = (unsigned char)c;
 				break;
 			}
 		}
 	}
 
 	return true;
 }

Index: src/mac_roman.m
==================================================================
--- src/mac_roman.m
+++ src/mac_roman.m
@@ -445,10 +445,10 @@
 					return false;
 
 				break;
 			}
 		} else
-			output[i] = (uint8_t)c;
+			output[i] = (unsigned char)c;
 	}
 
 	return true;
 }

Index: src/windows_1252.m
==================================================================
--- src/windows_1252.m
+++ src/windows_1252.m
@@ -148,11 +148,11 @@
 				if (lossy)
 					output[i] = '?';
 				else
 					return false;
 			} else
-				output[i] = (uint8_t)c;
+				output[i] = (unsigned char)c;
 		}
 	}
 
 	return true;
 }