@@ -126,17 +126,17 @@
 
 - (size_t)lowlevelReadIntoBuffer: (void *)buffer_ length: (size_t)length
 {
 	void *pool = objc_autoreleasePoolPush();
 	char *buffer = buffer_;
-	of_char16_t *UTF16;
+	OFChar16 *UTF16;
 	size_t j = 0;
 
 	if (length > UINT32_MAX)
 		@throw [OFOutOfRangeException exception];
 
-	UTF16 = of_alloc(length, sizeof(of_char16_t));
+	UTF16 = of_alloc(length, sizeof(OFChar16));
 	@try {
 		DWORD UTF16Len;
 		OFMutableData *rest = nil;
 		size_t i = 0;
 
@@ -204,11 +204,11 @@
 			/* Missing high surrogate */
 			if ((c & 0xFC00) == 0xDC00)
 				@throw [OFInvalidEncodingException exception];
 
 			if ((c & 0xFC00) == 0xD800) {
-				of_char16_t next;
+				OFChar16 next;
 
 				if (UTF16Len <= i + 1) {
 					_incompleteUTF16Surrogate = c;
 
 					if (rest != nil) {
@@ -262,19 +262,19 @@
 }
 
 - (size_t)lowlevelWriteBuffer: (const void *)buffer_ length: (size_t)length
 {
 	const char *buffer = buffer_;
-	of_char16_t *tmp;
+	OFChar16 *tmp;
 	size_t i = 0, j = 0;
 
 	if (length > SIZE_MAX / 2)
 		@throw [OFOutOfRangeException exception];
 
 	if (_incompleteUTF8SurrogateLen > 0) {
 		OFUnichar c;
-		of_char16_t UTF16[2];
+		OFChar16 UTF16[2];
 		ssize_t UTF8Len;
 		size_t toCopy;
 		DWORD UTF16Len, bytesWritten;
 
 		UTF8Len = -of_string_utf8_decode(
@@ -355,11 +355,11 @@
 
 		_incompleteUTF8SurrogateLen = 0;
 		i += toCopy;
 	}
 
-	tmp = of_alloc(length * 2, sizeof(of_char16_t));
+	tmp = of_alloc(length * 2, sizeof(OFChar16));
 	@try {
 		DWORD bytesWritten;
 
 		while (i < length) {
 			OFUnichar c;