@@ -74,11 +74,11 @@
 - (instancetype)initWithString: (OFString *)string
 {
 	return (id)[[OFMutableUTF8String alloc] initWithString: string];
 }
 
-- (instancetype)initWithCharacters: (const of_unichar_t *)characters
+- (instancetype)initWithCharacters: (const OFUnichar *)characters
 			    length: (size_t)length
 {
 	return (id)[[OFMutableUTF8String alloc] initWithCharacters: characters
 							    length: length];
 }
@@ -226,24 +226,24 @@
 
 	return [super alloc];
 }
 
 #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
 {
 	void *pool = objc_autoreleasePoolPush();
-	const of_unichar_t *characters = self.characters;
+	const OFUnichar *characters = self.characters;
 	size_t length = self.length;
 	bool isStart = true;
 
 	for (size_t i = 0; i < length; i++) {
-		const of_unichar_t *const *table;
+		const OFUnichar *const *table;
 		size_t tableSize;
-		of_unichar_t c = characters[i];
+		OFUnichar c = characters[i];
 
 		if (isStart) {
 			table = startTable;
 			tableSize = middleTableSize;
 		} else {
@@ -263,18 +263,18 @@
 static void
 convert(OFMutableString *self, char (*startFunction)(char),
     char (*middleFunction)(char))
 {
 	void *pool = objc_autoreleasePoolPush();
-	const of_unichar_t *characters = self.characters;
+	const OFUnichar *characters = self.characters;
 	size_t length = self.length;
 	bool isStart = true;
 
 	for (size_t i = 0; i < length; i++) {
 		char (*function)(char) =
 		    (isStart ? startFunction : middleFunction);
-		of_unichar_t c = characters[i];
+		OFUnichar c = characters[i];
 
 		if (c <= 0x7F)
 			[self setCharacter: (int)function(c) atIndex: i];
 
 		isStart = of_ascii_isspace(c);
@@ -282,11 +282,11 @@
 
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
-- (void)setCharacter: (of_unichar_t)character atIndex: (size_t)idx
+- (void)setCharacter: (OFUnichar)character atIndex: (size_t)idx
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFString *string =
 	    [OFString stringWithCharacters: &character length: 1];
 	[self replaceCharactersInRange: OFMakeRange(idx, 1) withString: string];
@@ -296,11 +296,11 @@
 - (void)appendString: (OFString *)string
 {
 	[self insertString: string atIndex: self.length];
 }
 
-- (void)appendCharacters: (const of_unichar_t *)characters
+- (void)appendCharacters: (const OFUnichar *)characters
 		  length: (size_t)length
 {
 	void *pool = objc_autoreleasePoolPush();
 	[self appendString: [OFString stringWithCharacters: characters
 						    length: length]];
@@ -380,11 +380,11 @@
 - (void)reverse
 {
 	size_t i, j, length = self.length;
 
 	for (i = 0, j = length - 1; i < length / 2; i++, j--) {
-		of_unichar_t tmp = [self characterAtIndex: j];
+		OFUnichar tmp = [self characterAtIndex: j];
 		[self setCharacter: [self characterAtIndex: i] atIndex: j];
 		[self setCharacter: tmp atIndex: i];
 	}
 }
 
@@ -458,12 +458,12 @@
 			withString: (OFString *)replacement
 			   options: (int)options
 			     range: (OFRange)range
 {
 	void *pool = objc_autoreleasePoolPush(), *pool2;
-	const of_unichar_t *characters;
-	const of_unichar_t *searchCharacters = string.characters;
+	const OFUnichar *characters;
+	const OFUnichar *searchCharacters = string.characters;
 	size_t searchLength = string.length;
 	size_t replacementLength = replacement.length;
 
 	if (string == nil || replacement == nil)
 		@throw [OFInvalidArgumentException exception];
@@ -480,11 +480,11 @@
 	pool2 = objc_autoreleasePoolPush();
 	characters = self.characters;
 
 	for (size_t i = range.location; i <= range.length - searchLength; i++) {
 		if (memcmp(characters + i, searchCharacters,
-		    searchLength * sizeof(of_unichar_t)) != 0)
+		    searchLength * sizeof(OFUnichar)) != 0)
 			continue;
 
 		[self replaceCharactersInRange: OFMakeRange(i, searchLength)
 				    withString: replacement];
 
@@ -503,15 +503,15 @@
 }
 
 - (void)deleteLeadingWhitespaces
 {
 	void *pool = objc_autoreleasePoolPush();
-	const of_unichar_t *characters = self.characters;
+	const OFUnichar *characters = self.characters;
 	size_t i, length = self.length;
 
 	for (i = 0; i < length; i++) {
-		of_unichar_t c = characters[i];
+		OFUnichar c = characters[i];
 
 		if (!of_ascii_isspace(c))
 			break;
 	}
 
@@ -521,11 +521,11 @@
 }
 
 - (void)deleteTrailingWhitespaces
 {
 	void *pool;
-	const of_unichar_t *characters, *p;
+	const OFUnichar *characters, *p;
 	size_t length, d;
 
 	length = self.length;
 
 	if (length == 0)