@@ -570,18 +570,18 @@
 	[self finishInitialization];
 
 	return [self characters];
 }
 
-- (const of_char16_t *)UTF16String
+- (const char16_t *)UTF16String
 {
 	[self finishInitialization];
 
 	return [self UTF16String];
 }
 
-- (const of_char16_t *)UTF16StringWithByteOrder: (of_byte_order_t)byteOrder
+- (const char16_t *)UTF16StringWithByteOrder: (of_byte_order_t)byteOrder
 {
 	[self finishInitialization];
 
 	return [self UTF16StringWithByteOrder: byteOrder];
 }
@@ -591,18 +591,18 @@
 	[self finishInitialization];
 
 	return [self UTF16StringLength];
 }
 
-- (const of_char32_t *)UTF32String
+- (const char32_t *)UTF32String
 {
 	[self finishInitialization];
 
 	return [self UTF32String];
 }
 
-- (const of_char32_t *)UTF32StringWithByteOrder: (of_byte_order_t)byteOrder
+- (const char32_t *)UTF32StringWithByteOrder: (of_byte_order_t)byteOrder
 {
 	[self finishInitialization];
 
 	return [self UTF32StringWithByteOrder: byteOrder];
 }