@@ -285,11 +285,11 @@
 
 	if (data.itemSize != 1)
 		@throw [OFInvalidFormatException exception];
 
 	if ([OFSystemInfo isWindowsNT]) {
-		const of_char16_t *UTF16String = data.items;
+		const OFChar16 *UTF16String = data.items;
 		size_t length = data.count;
 
 		if (length % 2 == 1)
 			@throw [OFInvalidFormatException exception];
 
@@ -349,11 +349,11 @@
 	OFData *data;
 
 	if ([OFSystemInfo isWindowsNT])
 		data = [OFData dataWithItems: string.UTF16String
 				       count: string.UTF16StringLength + 1
-				    itemSize: sizeof(of_char16_t)];
+				    itemSize: sizeof(OFChar16)];
 	else {
 		of_string_encoding_t encoding = [OFLocale encoding];
 		const char *cString = [string cStringWithEncoding: encoding];
 		size_t length = [string cStringLengthWithEncoding: encoding];