@@ -37,12 +37,12 @@
 #import "autorelease.h"
 #import "macros.h"
 #import "of_asprintf.h"
 #import "unicode.h"
 
-extern const uint16_t of_iso_8859_15[256];
-extern const uint16_t of_windows_1252[256];
+extern const of_char16_t of_iso_8859_15[256];
+extern const of_char16_t of_windows_1252[256];
 
 static inline int
 memcasecmp(const char *first, const char *second, size_t length)
 {
 	size_t i;
@@ -211,11 +211,11 @@
 {
 	self = [super init];
 
 	@try {
 		size_t i, j;
-		const uint16_t *table;
+		const of_char16_t *table;
 
 		if (encoding == OF_STRING_ENCODING_UTF_8 &&
 		    cStringLength >= 3 && !memcmp(cString, "\xEF\xBB\xBF", 3)) {
 			cString += 3;
 			cStringLength -= 3;
@@ -464,11 +464,11 @@
 	}
 
 	return self;
 }
 
-- initWithUTF16String: (const uint16_t*)string
+- initWithUTF16String: (const of_char16_t*)string
 	       length: (size_t)length
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	self = [super init];
 
@@ -502,11 +502,11 @@
 			if ((character & 0xFC00) == 0xDC00)
 				@throw [OFInvalidEncodingException
 				    exceptionWithClass: [self class]];
 
 			if ((character & 0xFC00) == 0xD800) {
-				uint16_t nextCharacter;
+				of_char16_t nextCharacter;
 
 				if (length <= i + 1)
 					@throw [OFInvalidEncodingException
 					    exceptionWithClass: [self class]];
 
@@ -576,11 +576,11 @@
 	}
 
 	return self;
 }
 
-- initWithUTF32String: (const of_unichar_t*)characters
+- initWithUTF32String: (const of_char32_t*)characters
 	       length: (size_t)length
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	self = [super init];
 
@@ -1346,14 +1346,14 @@
 	}
 
 	return ret;
 }
 
-- (const of_unichar_t*)UTF32StringWithByteOrder: (of_byte_order_t)byteOrder
+- (const of_char32_t*)UTF32StringWithByteOrder: (of_byte_order_t)byteOrder
 {
 	OFObject *object = [[[OFObject alloc] init] autorelease];
-	of_unichar_t *ret;
+	of_char32_t *ret;
 	size_t i, j;
 
 	ret = [object allocMemoryWithSize: sizeof(of_unichar_t)
 				    count: s->length + 1];