@@ -62,24 +62,24 @@
 
 	return self;
 }
 
 #ifdef OF_HAVE_UNICODE_TABLES
-- (void)of_convertWithWordStartTable: (const of_unichar_t *const [])startTable
-		     wordMiddleTable: (const of_unichar_t *const [])middleTable
+- (void)of_convertWithWordStartTable: (const OFUnichar *const [])startTable
+		     wordMiddleTable: (const OFUnichar *const [])middleTable
 		  wordStartTableSize: (size_t)startTableSize
 		 wordMiddleTableSize: (size_t)middleTableSize
 {
-	of_unichar_t *unicodeString;
+	OFUnichar *unicodeString;
 	size_t unicodeLen, newCStringLength;
 	size_t i, j;
 	char *newCString;
 	bool isStart = true;
 
 	if (!_s->isUTF8) {
 		uint8_t t;
-		const of_unichar_t *const *table;
+		const OFUnichar *const *table;
 
 		assert(startTableSize >= 1 && middleTableSize >= 1);
 
 		_s->hashed = false;
 
@@ -97,19 +97,19 @@
 
 		return;
 	}
 
 	unicodeLen = self.length;
-	unicodeString = of_alloc(unicodeLen, sizeof(of_unichar_t));
+	unicodeString = of_alloc(unicodeLen, sizeof(OFUnichar));
 
 	i = j = 0;
 	newCStringLength = 0;
 
 	while (i < _s->cStringLength) {
-		const of_unichar_t *const *table;
+		const OFUnichar *const *table;
 		size_t tableSize;
-		of_unichar_t c;
+		OFUnichar c;
 		ssize_t cLen;
 
 		if (isStart) {
 			table = startTable;
 			tableSize = middleTableSize;
@@ -127,11 +127,11 @@
 		}
 
 		isStart = of_ascii_isspace(c);
 
 		if (c >> 8 < tableSize) {
-			of_unichar_t tc = table[c >> 8][c & 0xFF];
+			OFUnichar tc = table[c >> 8][c & 0xFF];
 
 			if (tc)
 				c = tc;
 		}
 		unicodeString[j++] = c;
@@ -187,14 +187,14 @@
 	 * need to change it.
 	 */
 }
 #endif
 
-- (void)setCharacter: (of_unichar_t)character atIndex: (size_t)idx
+- (void)setCharacter: (OFUnichar)character atIndex: (size_t)idx
 {
 	char buffer[4];
-	of_unichar_t c;
+	OFUnichar c;
 	size_t lenNew;
 	ssize_t lenOld;
 
 	if (_s->isUTF8)
 		idx = of_string_utf8_get_position(_s->cString, idx,
@@ -367,11 +367,11 @@
 			_s->isUTF8 = true;
 	} else
 		_s->isUTF8 = true;
 }
 
-- (void)appendCharacters: (const of_unichar_t *)characters
+- (void)appendCharacters: (const OFUnichar *)characters
 		  length: (size_t)length
 {
 	char *tmp = of_alloc((length * 4) + 1, 1);
 
 	@try {