@@ -57,11 +57,11 @@
 - (void)of_getArgv: (char ***)argv
     forProgramName: (OFString *)programName
       andArguments: (OFArray *)arguments;
 - (char **)of_environmentForDictionary: (OFDictionary *)dictionary;
 #else
-- (char16_t *)of_environmentForDictionary: (OFDictionary *)dictionary;
+- (of_char16_t *)of_environmentForDictionary: (OFDictionary *)dictionary;
 #endif
 @end
 
 @implementation OFProcess
 + (instancetype)processWithProgram: (OFString *)program
@@ -223,11 +223,11 @@
 		SECURITY_ATTRIBUTES sa;
 		PROCESS_INFORMATION pi;
 		STARTUPINFOW si;
 		void *pool;
 		OFMutableString *argumentsString;
-		char16_t *argumentsCopy;
+		of_char16_t *argumentsCopy;
 		size_t length;
 
 		sa.nLength = sizeof(sa);
 		sa.bInheritHandle = TRUE;
 		sa.lpSecurityDescriptor = NULL;
@@ -292,11 +292,11 @@
 			if (containsSpaces)
 				[argumentsString appendString: @"\""];
 		}
 
 		length = [argumentsString UTF16StringLength];
-		argumentsCopy = [self allocMemoryWithSize: sizeof(char16_t)
+		argumentsCopy = [self allocMemoryWithSize: sizeof(of_char16_t)
 						    count: length + 1];
 		memcpy(argumentsCopy, [argumentsString UTF16String],
 		    ([argumentsString UTF16StringLength] + 1) * 2);
 		@try {
 			if (!CreateProcessW([program UTF16String],
@@ -398,22 +398,22 @@
 	envp[i] = NULL;
 
 	return envp;
 }
 #else
-- (char16_t *)of_environmentForDictionary: (OFDictionary *)environment
+- (of_char16_t *)of_environmentForDictionary: (OFDictionary *)environment
 {
 	OFMutableData *env;
 	OFEnumerator *keyEnumerator, *objectEnumerator;
 	OFString *key, *object;
-	const char16_t equal = '=';
-	const char16_t zero[2] = { 0, 0 };
+	const of_char16_t equal = '=';
+	const of_char16_t zero[2] = { 0, 0 };
 
 	if (environment == nil)
 		return NULL;
 
-	env = [OFMutableData dataWithItemSize: sizeof(char16_t)];
+	env = [OFMutableData dataWithItemSize: sizeof(of_char16_t)];
 
 	keyEnumerator = [environment keyEnumerator];
 	objectEnumerator = [environment objectEnumerator];
 	while ((key = [keyEnumerator nextObject]) != nil &&
 	    (object = [objectEnumerator nextObject]) != nil) {