@@ -37,31 +37,31 @@
 #import "OFOutOfRangeException.h"
 
 #import "of_asprintf.h"
 #import "unicode.h"
 
-extern const of_char16_t of_iso_8859_2_table[];
+extern const OFChar16 of_iso_8859_2_table[];
 extern const size_t of_iso_8859_2_table_offset;
-extern const of_char16_t of_iso_8859_3_table[];
+extern const OFChar16 of_iso_8859_3_table[];
 extern const size_t of_iso_8859_3_table_offset;
-extern const of_char16_t of_iso_8859_15_table[];
+extern const OFChar16 of_iso_8859_15_table[];
 extern const size_t of_iso_8859_15_table_offset;
-extern const of_char16_t of_windows_1251_table[];
+extern const OFChar16 of_windows_1251_table[];
 extern const size_t of_windows_1251_table_offset;
-extern const of_char16_t of_windows_1252_table[];
+extern const OFChar16 of_windows_1252_table[];
 extern const size_t of_windows_1252_table_offset;
-extern const of_char16_t of_codepage_437_table[];
+extern const OFChar16 of_codepage_437_table[];
 extern const size_t of_codepage_437_table_offset;
-extern const of_char16_t of_codepage_850_table[];
+extern const OFChar16 of_codepage_850_table[];
 extern const size_t of_codepage_850_table_offset;
-extern const of_char16_t of_codepage_858_table[];
+extern const OFChar16 of_codepage_858_table[];
 extern const size_t of_codepage_858_table_offset;
-extern const of_char16_t of_mac_roman_table[];
+extern const OFChar16 of_mac_roman_table[];
 extern const size_t of_mac_roman_table_offset;
-extern const of_char16_t of_koi8_r_table[];
+extern const OFChar16 of_koi8_r_table[];
 extern const size_t of_koi8_r_table_offset;
-extern const of_char16_t of_koi8_u_table[];
+extern const OFChar16 of_koi8_u_table[];
 extern const size_t of_koi8_u_table_offset;
 
 static inline int
 memcasecmp(const char *first, const char *second, size_t length)
 {
@@ -231,11 +231,11 @@
 			 length: (size_t)cStringLength
 {
 	self = [super init];
 
 	@try {
-		const of_char16_t *table;
+		const OFChar16 *table;
 		size_t tableOffset, j;
 
 		if (encoding == OF_STRING_ENCODING_UTF_8 &&
 		    cStringLength >= 3 &&
 		    memcmp(cString, "\xEF\xBB\xBF", 3) == 0) {
@@ -503,11 +503,11 @@
 	}
 
 	return self;
 }
 
-- (instancetype)initWithUTF16String: (const of_char16_t *)string
+- (instancetype)initWithUTF16String: (const OFChar16 *)string
 			     length: (size_t)length
 			  byteOrder: (OFByteOrder)byteOrder
 {
 	self = [super init];
 
@@ -540,11 +540,11 @@
 			/* Missing high surrogate */
 			if ((character & 0xFC00) == 0xDC00)
 				@throw [OFInvalidEncodingException exception];
 
 			if ((character & 0xFC00) == 0xD800) {
-				of_char16_t nextCharacter;
+				OFChar16 nextCharacter;
 
 				if (length <= i + 1)
 					@throw [OFInvalidEncodingException
 					    exception];
 
@@ -588,11 +588,11 @@
 	}
 
 	return self;
 }
 
-- (instancetype)initWithUTF32String: (const of_char32_t *)characters
+- (instancetype)initWithUTF32String: (const OFChar32 *)characters
 			     length: (size_t)length
 			  byteOrder: (OFByteOrder)byteOrder
 {
 	self = [super init];
 
@@ -1177,17 +1177,17 @@
 				      count: _s->length
 				   itemSize: sizeof(OFUnichar)
 			       freeWhenDone: true] items];
 }
 
-- (const of_char32_t *)UTF32StringWithByteOrder: (OFByteOrder)byteOrder
+- (const OFChar32 *)UTF32StringWithByteOrder: (OFByteOrder)byteOrder
 {
-	of_char32_t *buffer = of_alloc(_s->length + 1, sizeof(of_char32_t));
+	OFChar32 *buffer = of_alloc(_s->length + 1, sizeof(OFChar32));
 	size_t i = 0, j = 0;
 
 	while (i < _s->cStringLength) {
-		of_char32_t c;
+		OFChar32 c;
 		ssize_t cLen;
 
 		cLen = of_string_utf8_decode(_s->cString + i,
 		    _s->cStringLength - i, &c);
 
@@ -1205,11 +1205,11 @@
 	}
 	buffer[j] = 0;
 
 	return [[OFData dataWithItemsNoCopy: buffer
 				      count: _s->length + 1
-				   itemSize: sizeof(of_char32_t)
+				   itemSize: sizeof(OFChar32)
 			       freeWhenDone: true] items];
 }
 
 #ifdef OF_HAVE_BLOCKS
 - (void)enumerateLinesUsingBlock: (of_string_line_enumeration_block_t)block