@@ -106,11 +106,11 @@
 	}
 
 	return self;
 }
 
-- (instancetype)initWithUTF16String: (const of_char16_t *)UTF16String
+- (instancetype)initWithUTF16String: (const OFChar16 *)UTF16String
 			     length: (size_t)length
 			  byteOrder: (OFByteOrder)byteOrder
 {
 	self = [super init];
 
@@ -125,11 +125,11 @@
 	}
 
 	return self;
 }
 
-- (instancetype)initWithUTF32String: (const of_char32_t *)UTF32String
+- (instancetype)initWithUTF32String: (const OFChar32 *)UTF32String
 			     length: (size_t)length
 			  byteOrder: (OFByteOrder)byteOrder
 {
 	self = [super init];