@@ -108,11 +108,11 @@
 	return self;
 }
 
 - (instancetype)initWithUTF16String: (const of_char16_t *)UTF16String
 			     length: (size_t)length
-			  byteOrder: (of_byte_order_t)byteOrder
+			  byteOrder: (OFByteOrder)byteOrder
 {
 	self = [super init];
 
 	@try {
 		_string = [[OFMutableString alloc]
@@ -127,11 +127,11 @@
 	return self;
 }
 
 - (instancetype)initWithUTF32String: (const of_char32_t *)UTF32String
 			     length: (size_t)length
-			  byteOrder: (of_byte_order_t)byteOrder
+			  byteOrder: (OFByteOrder)byteOrder
 {
 	self = [super init];
 
 	@try {
 		_string = [[OFMutableString alloc]
@@ -1187,13 +1187,13 @@
 
 	TEST(@"-[characters]", (ua = C(@"fööbär🀺").characters) &&
 	    !memcmp(ua, ucstr + 1, sizeof(ucstr) - 8))
 
 #ifdef OF_BIG_ENDIAN
-# define SWAPPED_BYTE_ORDER OF_BYTE_ORDER_LITTLE_ENDIAN
+# define SWAPPED_BYTE_ORDER OFByteOrderLittleEndian
 #else
-# define SWAPPED_BYTE_ORDER OF_BYTE_ORDER_BIG_ENDIAN
+# define SWAPPED_BYTE_ORDER OFByteOrderBigEndian
 #endif
 	TEST(@"-[UTF16String]", (u16a = C(@"fööbär🀺").UTF16String) &&
 	    !memcmp(u16a, utf16str + 1, of_string_utf16_length(utf16str) * 2) &&
 	    (u16a = [C(@"fööbär🀺")
 	    UTF16StringWithByteOrder: SWAPPED_BYTE_ORDER]) &&