@@ -31,11 +31,11 @@
  * @brief Sets the character at the specified index.
  *
  * @param character The character to set
  * @param index The index where to set the character
  */
-- (void)setCharacter: (of_unichar_t)character atIndex: (size_t)index;
+- (void)setCharacter: (OFUnichar)character atIndex: (size_t)index;
 
 /**
  * @brief Appends another OFString to the OFMutableString.
  *
  * @param string An OFString to append
@@ -46,12 +46,11 @@
  * @brief Appends the specified characters to the OFMutableString.
  *
  * @param characters An array of characters to append
  * @param length The length of the array of characters
  */
-- (void)appendCharacters: (const of_unichar_t *)characters
-		  length: (size_t)length;
+- (void)appendCharacters: (const OFUnichar *)characters length: (size_t)length;
 
 /**
  * @brief Appends a UTF-8 encoded C string to the OFMutableString.
  *
  * @param UTF8String A UTF-8 encoded C string to append
@@ -91,23 +90,23 @@
 
 /**
  * @brief Appends a formatted string to the OFMutableString.
  *
  * See `printf` for the format syntax. As an addition, `%@` is available as
- * format specifier for objects, `%C` for `of_unichar_t` and `%S` for
- * `const of_unichar_t *`.
+ * format specifier for objects, `%C` for `OFUnichar` and `%S` for
+ * `const OFUnichar *`.
  *
  * @param format A format string which generates the string to append
  */
 - (void)appendFormat: (OFConstantString *)format, ...;
 
 /**
  * @brief Appends a formatted string to the OFMutableString.
  *
  * See printf for the format syntax. As an addition, `%@` is available as
- * format specifier for objects, `%C` for `of_unichar_t` and `%S` for
- * `const of_unichar_t *`.
+ * format specifier for objects, `%C` for `OFUnichar` and `%S` for
+ * `const OFUnichar *`.
  *
  * @param format A format string which generates the string to append
  * @param arguments The arguments used in the format string
  */
 - (void)appendFormat: (OFConstantString *)format arguments: (va_list)arguments;