@@ -314,11 +314,11 @@
 
 	return 0;
 }
 
 size_t
-of_string_utf16_length(const of_char16_t *string)
+of_string_utf16_length(const OFChar16 *string)
 {
 	size_t length = 0;
 
 	while (*string++ != 0)
 		length++;
@@ -325,11 +325,11 @@
 
 	return length;
 }
 
 size_t
-of_string_utf32_length(const of_char32_t *string)
+of_string_utf32_length(const OFChar32 *string)
 {
 	size_t length = 0;
 
 	while (*string++ != 0)
 		length++;
@@ -479,58 +479,58 @@
 {
 	return (id)[[OFUTF8String alloc] initWithCharacters: string
 						     length: length];
 }
 
-- (instancetype)initWithUTF16String: (const of_char16_t *)string
+- (instancetype)initWithUTF16String: (const OFChar16 *)string
 {
 	return (id)[[OFUTF8String alloc] initWithUTF16String: string];
 }
 
-- (instancetype)initWithUTF16String: (const of_char16_t *)string
+- (instancetype)initWithUTF16String: (const OFChar16 *)string
 			     length: (size_t)length
 {
 	return (id)[[OFUTF8String alloc] initWithUTF16String: string
 						      length: length];
 }
 
-- (instancetype)initWithUTF16String: (const of_char16_t *)string
+- (instancetype)initWithUTF16String: (const OFChar16 *)string
 			  byteOrder: (OFByteOrder)byteOrder
 {
 	return (id)[[OFUTF8String alloc] initWithUTF16String: string
 						   byteOrder: byteOrder];
 }
 
-- (instancetype)initWithUTF16String: (const of_char16_t *)string
+- (instancetype)initWithUTF16String: (const OFChar16 *)string
 			     length: (size_t)length
 			  byteOrder: (OFByteOrder)byteOrder
 {
 	return (id)[[OFUTF8String alloc] initWithUTF16String: string
 						      length: length
 						   byteOrder: byteOrder];
 }
 
-- (instancetype)initWithUTF32String: (const of_char32_t *)string
+- (instancetype)initWithUTF32String: (const OFChar32 *)string
 {
 	return (id)[[OFUTF8String alloc] initWithUTF32String: string];
 }
 
-- (instancetype)initWithUTF32String: (const of_char32_t *)string
+- (instancetype)initWithUTF32String: (const OFChar32 *)string
 			     length: (size_t)length
 {
 	return (id)[[OFUTF8String alloc] initWithUTF32String: string
 						      length: length];
 }
 
-- (instancetype)initWithUTF32String: (const of_char32_t *)string
+- (instancetype)initWithUTF32String: (const OFChar32 *)string
 			  byteOrder: (OFByteOrder)byteOrder
 {
 	return (id)[[OFUTF8String alloc] initWithUTF32String: string
 						   byteOrder: byteOrder];
 }
 
-- (instancetype)initWithUTF32String: (const of_char32_t *)string
+- (instancetype)initWithUTF32String: (const OFChar32 *)string
 			     length: (size_t)length
 			  byteOrder: (OFByteOrder)byteOrder
 {
 	return (id)[[OFUTF8String alloc] initWithUTF32String: string
 						      length: length
@@ -700,58 +700,58 @@
 {
 	return [[[self alloc] initWithCharacters: string
 					  length: length] autorelease];
 }
 
-+ (instancetype)stringWithUTF16String: (const of_char16_t *)string
++ (instancetype)stringWithUTF16String: (const OFChar16 *)string
 {
 	return [[[self alloc] initWithUTF16String: string] autorelease];
 }
 
-+ (instancetype)stringWithUTF16String: (const of_char16_t *)string
++ (instancetype)stringWithUTF16String: (const OFChar16 *)string
 			       length: (size_t)length
 {
 	return [[[self alloc] initWithUTF16String: string
 					   length: length] autorelease];
 }
 
-+ (instancetype)stringWithUTF16String: (const of_char16_t *)string
++ (instancetype)stringWithUTF16String: (const OFChar16 *)string
 			    byteOrder: (OFByteOrder)byteOrder
 {
 	return [[[self alloc] initWithUTF16String: string
 					byteOrder: byteOrder] autorelease];
 }
 
-+ (instancetype)stringWithUTF16String: (const of_char16_t *)string
++ (instancetype)stringWithUTF16String: (const OFChar16 *)string
 			       length: (size_t)length
 			    byteOrder: (OFByteOrder)byteOrder
 {
 	return [[[self alloc] initWithUTF16String: string
 					   length: length
 					byteOrder: byteOrder] autorelease];
 }
 
-+ (instancetype)stringWithUTF32String: (const of_char32_t *)string
++ (instancetype)stringWithUTF32String: (const OFChar32 *)string
 {
 	return [[[self alloc] initWithUTF32String: string] autorelease];
 }
 
-+ (instancetype)stringWithUTF32String: (const of_char32_t *)string
++ (instancetype)stringWithUTF32String: (const OFChar32 *)string
 			       length: (size_t)length
 {
 	return [[[self alloc] initWithUTF32String: string
 					   length: length] autorelease];
 }
 
-+ (instancetype)stringWithUTF32String: (const of_char32_t *)string
++ (instancetype)stringWithUTF32String: (const OFChar32 *)string
 			    byteOrder: (OFByteOrder)byteOrder
 {
 	return [[[self alloc] initWithUTF32String: string
 					byteOrder: byteOrder] autorelease];
 }
 
-+ (instancetype)stringWithUTF32String: (const of_char32_t *)string
++ (instancetype)stringWithUTF32String: (const OFChar32 *)string
 			       length: (size_t)length
 			    byteOrder: (OFByteOrder)byteOrder
 {
 	return [[[self alloc] initWithUTF32String: string
 					   length: length
@@ -893,64 +893,64 @@
 			    length: (size_t)length
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (instancetype)initWithUTF16String: (const of_char16_t *)string
+- (instancetype)initWithUTF16String: (const OFChar16 *)string
 {
 	return [self initWithUTF16String: string
 				  length: of_string_utf16_length(string)
 			       byteOrder: OFByteOrderNative];
 }
 
-- (instancetype)initWithUTF16String: (const of_char16_t *)string
+- (instancetype)initWithUTF16String: (const OFChar16 *)string
 			     length: (size_t)length
 {
 	return [self initWithUTF16String: string
 				  length: length
 			       byteOrder: OFByteOrderNative];
 }
 
-- (instancetype)initWithUTF16String: (const of_char16_t *)string
+- (instancetype)initWithUTF16String: (const OFChar16 *)string
 			  byteOrder: (OFByteOrder)byteOrder
 {
 	return [self initWithUTF16String: string
 				  length: of_string_utf16_length(string)
 			       byteOrder: byteOrder];
 }
 
-- (instancetype)initWithUTF16String: (const of_char16_t *)string
+- (instancetype)initWithUTF16String: (const OFChar16 *)string
 			     length: (size_t)length
 			  byteOrder: (OFByteOrder)byteOrder
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (instancetype)initWithUTF32String: (const of_char32_t *)string
+- (instancetype)initWithUTF32String: (const OFChar32 *)string
 {
 	return [self initWithUTF32String: string
 				  length: of_string_utf32_length(string)
 			       byteOrder: OFByteOrderNative];
 }
 
-- (instancetype)initWithUTF32String: (const of_char32_t *)string
+- (instancetype)initWithUTF32String: (const OFChar32 *)string
 			     length: (size_t)length
 {
 	return [self initWithUTF32String: string
 				  length: length
 			       byteOrder: OFByteOrderNative];
 }
 
-- (instancetype)initWithUTF32String: (const of_char32_t *)string
+- (instancetype)initWithUTF32String: (const OFChar32 *)string
 			  byteOrder: (OFByteOrder)byteOrder
 {
 	return [self initWithUTF32String: string
 				  length: of_string_utf32_length(string)
 			       byteOrder: byteOrder];
 }
 
-- (instancetype)initWithUTF32String: (const of_char32_t *)string
+- (instancetype)initWithUTF32String: (const OFChar32 *)string
 			     length: (size_t)length
 			  byteOrder: (OFByteOrder)byteOrder
 {
 	OF_INVALID_INIT_METHOD
 }
@@ -2540,26 +2540,26 @@
 		free(buffer);
 		@throw e;
 	}
 }
 
-- (const of_char16_t *)UTF16String
+- (const OFChar16 *)UTF16String
 {
 	return [self UTF16StringWithByteOrder: OFByteOrderNative];
 }
 
-- (const of_char16_t *)UTF16StringWithByteOrder: (OFByteOrder)byteOrder
+- (const OFChar16 *)UTF16StringWithByteOrder: (OFByteOrder)byteOrder
 {
 	void *pool = objc_autoreleasePoolPush();
 	const OFUnichar *characters = self.characters;
 	size_t length = self.length;
-	of_char16_t *buffer;
+	OFChar16 *buffer;
 	size_t j;
 	bool swap = (byteOrder != OFByteOrderNative);
 
 	/* Allocate memory for the worst case */
-	buffer = of_alloc((length + 1) * 2, sizeof(of_char16_t));
+	buffer = of_alloc((length + 1) * 2, sizeof(OFChar16));
 
 	j = 0;
 	for (size_t i = 0; i < length; i++) {
 		OFUnichar c = characters[i];
 
@@ -2585,21 +2585,21 @@
 		}
 	}
 	buffer[j] = 0;
 
 	@try {
-		buffer = of_realloc(buffer, j + 1, sizeof(of_char16_t));
+		buffer = of_realloc(buffer, j + 1, sizeof(OFChar16));
 	} @catch (OFOutOfMemoryException *e) {
 		/* We don't care, as we only tried to make it smaller */
 	}
 
 	objc_autoreleasePoolPop(pool);
 
 	@try {
 		return [[OFData dataWithItemsNoCopy: buffer
 					      count: j + 1
-					   itemSize: sizeof(of_char16_t)
+					   itemSize: sizeof(OFChar16)
 				       freeWhenDone: true] items];
 	} @catch (id e) {
 		free(buffer);
 		@throw e;
 	}
@@ -2617,21 +2617,21 @@
 			UTF16StringLength++;
 
 	return UTF16StringLength;
 }
 
-- (const of_char32_t *)UTF32String
+- (const OFChar32 *)UTF32String
 {
 	return [self UTF32StringWithByteOrder: OFByteOrderNative];
 }
 
-- (const of_char32_t *)UTF32StringWithByteOrder: (OFByteOrder)byteOrder
+- (const OFChar32 *)UTF32StringWithByteOrder: (OFByteOrder)byteOrder
 {
 	size_t length = self.length;
-	of_char32_t *buffer;
+	OFChar32 *buffer;
 
-	buffer = of_alloc(length + 1, sizeof(of_char32_t));
+	buffer = of_alloc(length + 1, sizeof(OFChar32));
 	@try {
 		[self getCharacters: buffer inRange: OFMakeRange(0, length)];
 		buffer[length] = 0;
 
 		if (byteOrder != OFByteOrderNative)
@@ -2638,11 +2638,11 @@
 			for (size_t i = 0; i < length; i++)
 				buffer[i] = OF_BSWAP32(buffer[i]);
 
 		return [[OFData dataWithItemsNoCopy: buffer
 					      count: length + 1
-					   itemSize: sizeof(of_char32_t)
+					   itemSize: sizeof(OFChar32)
 				       freeWhenDone: true] items];
 	} @catch (id e) {
 		free(buffer);
 		@throw e;
 	}