@@ -38,31 +38,31 @@
 #import "OFOutOfRangeException.h"
 
 #import "of_asprintf.h"
 #import "unicode.h"
 
-extern const char16_t of_iso_8859_2_table[];
+extern const of_char16_t of_iso_8859_2_table[];
 extern const size_t of_iso_8859_2_table_offset;
-extern const char16_t of_iso_8859_3_table[];
+extern const of_char16_t of_iso_8859_3_table[];
 extern const size_t of_iso_8859_3_table_offset;
-extern const char16_t of_iso_8859_15_table[];
+extern const of_char16_t of_iso_8859_15_table[];
 extern const size_t of_iso_8859_15_table_offset;
-extern const char16_t of_windows_1251_table[];
+extern const of_char16_t of_windows_1251_table[];
 extern const size_t of_windows_1251_table_offset;
-extern const char16_t of_windows_1252_table[];
+extern const of_char16_t of_windows_1252_table[];
 extern const size_t of_windows_1252_table_offset;
-extern const char16_t of_codepage_437_table[];
+extern const of_char16_t of_codepage_437_table[];
 extern const size_t of_codepage_437_table_offset;
-extern const char16_t of_codepage_850_table[];
+extern const of_char16_t of_codepage_850_table[];
 extern const size_t of_codepage_850_table_offset;
-extern const char16_t of_codepage_858_table[];
+extern const of_char16_t of_codepage_858_table[];
 extern const size_t of_codepage_858_table_offset;
-extern const char16_t of_mac_roman_table[];
+extern const of_char16_t of_mac_roman_table[];
 extern const size_t of_mac_roman_table_offset;
-extern const char16_t of_koi8_r_table[];
+extern const of_char16_t of_koi8_r_table[];
 extern const size_t of_koi8_r_table_offset;
-extern const char16_t of_koi8_u_table[];
+extern const of_char16_t 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)
 {
@@ -232,11 +232,11 @@
 			 length: (size_t)cStringLength
 {
 	self = [super init];
 
 	@try {
-		const char16_t *table;
+		const of_char16_t *table;
 		size_t tableOffset, j;
 
 		if (encoding == OF_STRING_ENCODING_UTF_8 &&
 		    cStringLength >= 3 &&
 		    memcmp(cString, "\xEF\xBB\xBF", 3) == 0) {
@@ -512,11 +512,11 @@
 	}
 
 	return self;
 }
 
-- (instancetype)initWithUTF16String: (const char16_t *)string
+- (instancetype)initWithUTF16String: (const of_char16_t *)string
 			     length: (size_t)length
 			  byteOrder: (of_byte_order_t)byteOrder
 {
 	self = [super init];
 
@@ -548,11 +548,11 @@
 			/* Missing high surrogate */
 			if ((character & 0xFC00) == 0xDC00)
 				@throw [OFInvalidEncodingException exception];
 
 			if ((character & 0xFC00) == 0xD800) {
-				char16_t nextCharacter;
+				of_char16_t nextCharacter;
 
 				if (length <= i + 1)
 					@throw [OFInvalidEncodingException
 					    exception];
 
@@ -597,11 +597,11 @@
 	}
 
 	return self;
 }
 
-- (instancetype)initWithUTF32String: (const char32_t *)characters
+- (instancetype)initWithUTF32String: (const of_char32_t *)characters
 			     length: (size_t)length
 			  byteOrder: (of_byte_order_t)byteOrder
 {
 	self = [super init];
 
@@ -1281,14 +1281,14 @@
 	}
 
 	return ret;
 }
 
-- (const char32_t *)UTF32StringWithByteOrder: (of_byte_order_t)byteOrder
+- (const of_char32_t *)UTF32StringWithByteOrder: (of_byte_order_t)byteOrder
 {
 	OFObject *object = [[[OFObject alloc] init] autorelease];
-	char32_t *ret;
+	of_char32_t *ret;
 	size_t i, j;
 
 	ret = [object allocMemoryWithSize: sizeof(of_unichar_t)
 				    count: _s->length + 1];