@@ -174,11 +174,11 @@
 		STARTUPINFOW si;
 		void *pool;
 		OFMutableString *argumentsString;
 		OFEnumerator *enumerator;
 		OFString *argument;
-		uint16_t *argumentsCopy;
+		of_char16_t *argumentsCopy;
 		size_t length;
 
 		sa.nLength = sizeof(sa);
 		sa.bInheritHandle = TRUE;
 		sa.lpSecurityDescriptor = NULL;
@@ -244,11 +244,11 @@
 			if (containsSpaces)
 				[argumentsString appendString: @"\""];
 		}
 
 		length = [argumentsString UTF16StringLength];
-		argumentsCopy = [self allocMemoryWithSize: sizeof(uint16_t)
+		argumentsCopy = [self allocMemoryWithSize: sizeof(of_char16_t)
 						    count: length + 1];
 		memcpy(argumentsCopy, [argumentsString UTF16String],
 		    ([argumentsString UTF16StringLength] + 1) * 2);
 		@try {
 			if (!CreateProcessW([program UTF16String],
@@ -328,17 +328,17 @@
 	envp[i] = NULL;
 
 	return envp;
 }
 #else
-- (uint16_t*)OF_environmentForDictionary: (OFDictionary*)environment
+- (of_char16_t*)OF_environmentForDictionary: (OFDictionary*)environment
 {
 	OFDataArray *env = [OFDataArray dataArrayWithItemSize: 2];
 	OFEnumerator *keyEnumerator, *objectEnumerator;
 	OFString *key, *object;
-	const uint16_t equal = '=';
-	const uint16_t zero = 0;
+	const of_char16_t equal = '=';
+	const of_char16_t zero = 0;
 
 	keyEnumerator = [environment keyEnumerator];
 	objectEnumerator = [environment objectEnumerator];
 
 	while ((key = [keyEnumerator nextObject]) != nil &&