@@ -171,11 +171,11 @@
 			UTF16Len = (DWORD)stringLen;
 			memcpy(UTF16, string.UTF16String, stringLen);
 		}
 
 		if (UTF16Len > 0 && _incompleteUTF16Surrogate != 0) {
-			of_unichar_t c =
+			OFUnichar c =
 			    (((_incompleteUTF16Surrogate & 0x3FF) << 10) |
 			    (UTF16[0] & 0x3FF)) + 0x10000;
 			char UTF8[4];
 			size_t UTF8Len;
 
@@ -195,11 +195,11 @@
 			_incompleteUTF16Surrogate = 0;
 			i++;
 		}
 
 		for (; i < UTF16Len; i++) {
-			of_unichar_t c = UTF16[i];
+			OFUnichar c = UTF16[i];
 			char UTF8[4];
 			size_t UTF8Len;
 
 			/* Missing high surrogate */
 			if ((c & 0xFC00) == 0xDC00)
@@ -269,11 +269,11 @@
 
 	if (length > SIZE_MAX / 2)
 		@throw [OFOutOfRangeException exception];
 
 	if (_incompleteUTF8SurrogateLen > 0) {
-		of_unichar_t c;
+		OFUnichar c;
 		of_char16_t UTF16[2];
 		ssize_t UTF8Len;
 		size_t toCopy;
 		DWORD UTF16Len, bytesWritten;
 
@@ -360,11 +360,11 @@
 	tmp = of_alloc(length * 2, sizeof(of_char16_t));
 	@try {
 		DWORD bytesWritten;
 
 		while (i < length) {
-			of_unichar_t c;
+			OFUnichar c;
 			ssize_t UTF8Len;
 
 			UTF8Len = of_string_utf8_decode(buffer + i, length - i,
 			    &c);