@@ -421,11 +421,11 @@
  * @param string The UTF-16 string
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return A new autoreleased OFString
  */
 + (instancetype)stringWithUTF16String: (const of_char16_t *)string
-			    byteOrder: (of_byte_order_t)byteOrder;
+			    byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Creates a new OFString from a UTF-16 encoded string with the
  *	  specified length, assuming the specified byte order if no byte order
  *	  mark is found.
@@ -435,11 +435,11 @@
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return A new autoreleased OFString
  */
 + (instancetype)stringWithUTF16String: (const of_char16_t *)string
 			       length: (size_t)length
-			    byteOrder: (of_byte_order_t)byteOrder;
+			    byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Creates a new OFString from a UTF-32 encoded string.
  *
  * @param string The UTF-32 string
@@ -465,11 +465,11 @@
  * @param string The UTF-32 string
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return A new autoreleased OFString
  */
 + (instancetype)stringWithUTF32String: (const of_char32_t *)string
-			    byteOrder: (of_byte_order_t)byteOrder;
+			    byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Creates a new OFString from a UTF-32 encoded string with the
  *	  specified length, assuming the specified byte order if no byte order
  *	  mark is found.
@@ -479,11 +479,11 @@
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return A new autoreleased OFString
  */
 + (instancetype)stringWithUTF32String: (const of_char32_t *)string
 			       length: (size_t)length
-			    byteOrder: (of_byte_order_t)byteOrder;
+			    byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Creates a new OFString from a format string.
  *
  * See printf for the format syntax. As an addition, `%@` is available as
@@ -679,11 +679,11 @@
  * @param string The UTF-16 string
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return An initialized OFString
  */
 - (instancetype)initWithUTF16String: (const of_char16_t *)string
-			  byteOrder: (of_byte_order_t)byteOrder;
+			  byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Initializes an already allocated OFString with a UTF-16 string with
  *	  the specified length, assuming the specified byte order if no byte
  *	  order mark is found.
@@ -693,11 +693,11 @@
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return An initialized OFString
  */
 - (instancetype)initWithUTF16String: (const of_char16_t *)string
 			     length: (size_t)length
-			  byteOrder: (of_byte_order_t)byteOrder;
+			  byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Initializes an already allocated OFString with a UTF-32 string.
  *
  * @param string The UTF-32 string
@@ -723,11 +723,11 @@
  * @param string The UTF-32 string
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return An initialized OFString
  */
 - (instancetype)initWithUTF32String: (const of_char32_t *)string
-			  byteOrder: (of_byte_order_t)byteOrder;
+			  byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Initializes an already allocated OFString with a UTF-32 string with
  *	  the specified length, assuming the specified byte order if no byte
  *	  order mark is found.
@@ -737,11 +737,11 @@
  * @param byteOrder The byte order to assume if there is no byte order mark
  * @return An initialized OFString
  */
 - (instancetype)initWithUTF32String: (const of_char32_t *)string
 			     length: (size_t)length
-			  byteOrder: (of_byte_order_t)byteOrder;
+			  byteOrder: (OFByteOrder)byteOrder;
 
 /**
  * @brief Initializes an already allocated OFString with a format string.
  *
  * See printf for the format syntax. As an addition, `%@` is available as
@@ -1206,11 +1206,11 @@
  * copy it.
  *
  * @param byteOrder The byte order for the UTF-16 encoding
  * @return The string in UTF-16 encoding with the specified byte order
  */
-- (const of_char16_t *)UTF16StringWithByteOrder: (of_byte_order_t)byteOrder
+- (const of_char16_t *)UTF16StringWithByteOrder: (OFByteOrder)byteOrder
     OF_RETURNS_INNER_POINTER;
 
 /**
  * @brief Returns the string in UTF-32 encoding with the specified byte order.
  *
@@ -1219,11 +1219,11 @@
  * copy it.
  *
  * @param byteOrder The byte order for the UTF-32 encoding
  * @return The string in UTF-32 encoding with the specified byte order
  */
-- (const of_char32_t *)UTF32StringWithByteOrder: (of_byte_order_t)byteOrder
+- (const of_char32_t *)UTF32StringWithByteOrder: (OFByteOrder)byteOrder
     OF_RETURNS_INNER_POINTER;
 
 /**
  * @brief Returns the string as OFData with the specified encoding.
  *