@@ -141,11 +141,11 @@
 
 	return 0;
 }
 
 size_t
-of_string_utf16_length(const uint16_t *string)
+of_string_utf16_length(const of_char16_t *string)
 {
 	size_t length = 0;
 
 	while (*string++ != 0)
 		length++;
@@ -152,11 +152,11 @@
 
 	return length;
 }
 
 size_t
-of_string_utf32_length(const uint32_t *string)
+of_string_utf32_length(const of_char32_t *string)
 {
 	size_t length = 0;
 
 	while (*string++ != 0)
 		length++;
@@ -312,58 +312,58 @@
 {
 	return (id)[[OFString_UTF8 alloc] initWithCharacters: string
 						      length: length];
 }
 
-- initWithUTF16String: (const uint16_t*)string
+- initWithUTF16String: (const of_char16_t*)string
 {
 	return (id)[[OFString_UTF8 alloc] initWithUTF16String: string];
 }
 
-- initWithUTF16String: (const uint16_t*)string
+- initWithUTF16String: (const of_char16_t*)string
 	       length: (size_t)length
 {
 	return (id)[[OFString_UTF8 alloc] initWithUTF16String: string
 						       length: length];
 }
 
-- initWithUTF16String: (const uint16_t*)string
+- initWithUTF16String: (const of_char16_t*)string
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	return (id)[[OFString_UTF8 alloc] initWithUTF16String: string
 						    byteOrder: byteOrder];
 }
 
-- initWithUTF16String: (const uint16_t*)string
+- initWithUTF16String: (const of_char16_t*)string
 	       length: (size_t)length
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	return (id)[[OFString_UTF8 alloc] initWithUTF16String: string
 						       length: length
 						    byteOrder: byteOrder];
 }
 
-- initWithUTF32String: (const uint32_t*)string
+- initWithUTF32String: (const of_char32_t*)string
 {
 	return (id)[[OFString_UTF8 alloc] initWithUTF32String: string];
 }
 
-- initWithUTF32String: (const uint32_t*)string
+- initWithUTF32String: (const of_char32_t*)string
 	       length: (size_t)length
 {
 	return (id)[[OFString_UTF8 alloc] initWithUTF32String: string
 						       length: length];
 }
 
-- initWithUTF32String: (const uint32_t*)string
+- initWithUTF32String: (const of_char32_t*)string
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	return (id)[[OFString_UTF8 alloc] initWithUTF32String: string
 						    byteOrder: byteOrder];
 }
 
-- initWithUTF32String: (const uint32_t*)string
+- initWithUTF32String: (const of_char32_t*)string
 	       length: (size_t)length
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	return (id)[[OFString_UTF8 alloc] initWithUTF32String: string
 						       length: length
@@ -530,58 +530,58 @@
 {
 	return [[[self alloc] initWithCharacters: string
 					  length: length] autorelease];
 }
 
-+ (instancetype)stringWithUTF16String: (const uint16_t*)string
++ (instancetype)stringWithUTF16String: (const of_char16_t*)string
 {
 	return [[[self alloc] initWithUTF16String: string] autorelease];
 }
 
-+ (instancetype)stringWithUTF16String: (const uint16_t*)string
++ (instancetype)stringWithUTF16String: (const of_char16_t*)string
 			       length: (size_t)length
 {
 	return [[[self alloc] initWithUTF16String: string
 					   length: length] autorelease];
 }
 
-+ (instancetype)stringWithUTF16String: (const uint16_t*)string
++ (instancetype)stringWithUTF16String: (const of_char16_t*)string
 			    byteOrder: (of_byte_order_t)byteOrder
 {
 	return [[[self alloc] initWithUTF16String: string
 					byteOrder: byteOrder] autorelease];
 }
 
-+ (instancetype)stringWithUTF16String: (const uint16_t*)string
++ (instancetype)stringWithUTF16String: (const of_char16_t*)string
 			       length: (size_t)length
 			    byteOrder: (of_byte_order_t)byteOrder
 {
 	return [[[self alloc] initWithUTF16String: string
 					   length: length
 					byteOrder: byteOrder] autorelease];
 }
 
-+ (instancetype)stringWithUTF32String: (const uint32_t*)string
++ (instancetype)stringWithUTF32String: (const of_char32_t*)string
 {
 	return [[[self alloc] initWithUTF32String: string] autorelease];
 }
 
-+ (instancetype)stringWithUTF32String: (const uint32_t*)string
++ (instancetype)stringWithUTF32String: (const of_char32_t*)string
 			       length: (size_t)length
 {
 	return [[[self alloc] initWithUTF32String: string
 					   length: length] autorelease];
 }
 
-+ (instancetype)stringWithUTF32String: (const uint32_t*)string
++ (instancetype)stringWithUTF32String: (const of_char32_t*)string
 			    byteOrder: (of_byte_order_t)byteOrder
 {
 	return [[[self alloc] initWithUTF32String: string
 					byteOrder: byteOrder] autorelease];
 }
 
-+ (instancetype)stringWithUTF32String: (const uint32_t*)string
++ (instancetype)stringWithUTF32String: (const of_char32_t*)string
 			       length: (size_t)length
 			    byteOrder: (of_byte_order_t)byteOrder
 {
 	return [[[self alloc] initWithUTF32String: string
 					   length: length
@@ -716,34 +716,34 @@
 		[self release];
 		@throw e;
 	}
 }
 
-- initWithUTF16String: (const uint16_t*)string
+- initWithUTF16String: (const of_char16_t*)string
 {
 	return [self initWithUTF16String: string
 				  length: of_string_utf16_length(string)
 			       byteOrder: OF_BYTE_ORDER_NATIVE];
 }
 
-- initWithUTF16String: (const uint16_t*)string
+- initWithUTF16String: (const of_char16_t*)string
 	       length: (size_t)length
 {
 	return [self initWithUTF16String: string
 				  length: length
 			       byteOrder: OF_BYTE_ORDER_NATIVE];
 }
 
-- initWithUTF16String: (const uint16_t*)string
+- initWithUTF16String: (const of_char16_t*)string
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	return [self initWithUTF16String: string
 				  length: of_string_utf16_length(string)
 			       byteOrder: byteOrder];
 }
 
-- initWithUTF16String: (const uint16_t*)string
+- initWithUTF16String: (const of_char16_t*)string
 	       length: (size_t)length
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	@try {
 		[self doesNotRecognizeSelector: _cmd];
@@ -752,34 +752,34 @@
 		[self release];
 		@throw e;
 	}
 }
 
-- initWithUTF32String: (const uint32_t*)string
+- initWithUTF32String: (const of_char32_t*)string
 {
 	return [self initWithUTF32String: string
 				  length: of_string_utf32_length(string)
 			       byteOrder: OF_BYTE_ORDER_NATIVE];
 }
 
-- initWithUTF32String: (const uint32_t*)string
+- initWithUTF32String: (const of_char32_t*)string
 	       length: (size_t)length
 {
 	return [self initWithUTF32String: string
 				  length: length
 			       byteOrder: OF_BYTE_ORDER_NATIVE];
 }
 
-- initWithUTF32String: (const uint32_t*)string
+- initWithUTF32String: (const of_char32_t*)string
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	return [self initWithUTF32String: string
 				  length: of_string_utf32_length(string)
 			       byteOrder: byteOrder];
 }
 
-- initWithUTF32String: (const uint32_t*)string
+- initWithUTF32String: (const of_char32_t*)string
 	       length: (size_t)length
 	    byteOrder: (of_byte_order_t)byteOrder
 {
 	@try {
 		[self doesNotRecognizeSelector: _cmd];
@@ -2120,27 +2120,27 @@
 		    inRange: of_range(0, length)];
 
 	return ret;
 }
 
-- (const uint16_t*)UTF16String
+- (const of_char16_t*)UTF16String
 {
 	return [self UTF16StringWithByteOrder: OF_BYTE_ORDER_NATIVE];
 }
 
-- (const uint16_t*)UTF16StringWithByteOrder: (of_byte_order_t)byteOrder
+- (const of_char16_t*)UTF16StringWithByteOrder: (of_byte_order_t)byteOrder
 {
 	OFObject *object = [[[OFObject alloc] init] autorelease];
 	void *pool = objc_autoreleasePoolPush();
 	const of_unichar_t *characters = [self characters];
 	size_t length = [self length];
-	uint16_t *ret;
+	of_char16_t *ret;
 	size_t i, j;
 	BOOL swap = (byteOrder != OF_BYTE_ORDER_NATIVE);
 
 	/* Allocate memory for the worst case */
-	ret = [object allocMemoryWithSize: sizeof(uint16_t)
+	ret = [object allocMemoryWithSize: sizeof(of_char16_t)
 				    count: (length + 1) * 2];
 
 	j = 0;
 
 	for (i = 0; i < length; i++) {
@@ -2168,11 +2168,11 @@
 	}
 	ret[j] = 0;
 
 	@try {
 		ret = [object resizeMemory: ret
-				      size: sizeof(uint16_t)
+				      size: sizeof(of_char16_t)
 				     count: j + 1];
 	} @catch (OFOutOfMemoryException *e) {
 		/* We don't care, as we only tried to make it smaller */
 	}
 
@@ -2193,22 +2193,22 @@
 			UTF16StringLength++;
 
 	return UTF16StringLength;
 }
 
-- (const of_unichar_t*)UTF32String
+- (const of_char32_t*)UTF32String
 {
 	return [self UTF32StringWithByteOrder: OF_BYTE_ORDER_NATIVE];
 }
 
-- (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];
 	size_t length = [self length];
-	of_unichar_t *ret;
+	of_char32_t *ret;
 
-	ret = [object allocMemoryWithSize: sizeof(of_unichar_t)
+	ret = [object allocMemoryWithSize: sizeof(of_char32_t)
 				    count: length + 1];
 	[self getCharacters: ret
 		    inRange: of_range(0, length)];
 	ret[length] = 0;