@@ -912,20 +912,20 @@
  *	  buffer.
  *
  * @param buffer The buffer to store the Unicode characters
  * @param range The range of the Unicode characters to copy
  */
-- (void)getCharacters: (of_unichar_t *)buffer inRange: (of_range_t)range;
+- (void)getCharacters: (of_unichar_t *)buffer inRange: (OFRange)range;
 
 /**
  * @brief Returns the range of the first occurrence of the string.
  *
  * @param string The string to search
  * @return The range of the first occurrence of the string or a range with
  *	   `OF_NOT_FOUND` as start position if it was not found
  */
-- (of_range_t)rangeOfString: (OFString *)string;
+- (OFRange)rangeOfString: (OFString *)string;
 
 /**
  * @brief Returns the range of the string.
  *
  * @param string The string to search
@@ -935,11 +935,11 @@
  *		  -----------------------------|-------------------------------
  *		  `OF_STRING_SEARCH_BACKWARDS` | Search backwards in the string
  * @return The range of the first occurrence of the string or a range with
  *	   `OF_NOT_FOUND` as start position if it was not found
  */
-- (of_range_t)rangeOfString: (OFString *)string options: (int)options;
+- (OFRange)rangeOfString: (OFString *)string options: (int)options;
 
 /**
  * @brief Returns the range of the string in the specified range.
  *
  * @param string The string to search
@@ -950,13 +950,13 @@
  *		  `OF_STRING_SEARCH_BACKWARDS` | Search backwards in the string
  * @param range The range in which to search
  * @return The range of the first occurrence of the string or a range with
  *	   `OF_NOT_FOUND` as start position if it was not found
  */
-- (of_range_t)rangeOfString: (OFString *)string
-		    options: (int)options
-		      range: (of_range_t)range;
+- (OFRange)rangeOfString: (OFString *)string
+		 options: (int)options
+		   range: (OFRange)range;
 
 /**
  * @brief Returns the index of the first character from the set.
  *
  * @param characterSet The set of characters to search for
@@ -993,11 +993,11 @@
  * @return The index of the first occurrence of a character from the set or
  *	   `OF_NOT_FOUND` if it was not found
  */
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
 			  options: (int)options
-			    range: (of_range_t)range;
+			    range: (OFRange)range;
 
 /**
  * @brief Returns whether the string contains the specified string.
  *
  * @param string The string to search
@@ -1025,11 +1025,11 @@
  * @brief Creates a substring with the specified range.
  *
  * @param range The range of the substring
  * @return The substring as a new autoreleased OFString
  */
-- (OFString *)substringWithRange: (of_range_t)range;
+- (OFString *)substringWithRange: (OFRange)range;
 
 /**
  * @brief The value of the string in the specified base as a `long long`.
  *
  * Leading and trailing whitespaces are ignored.
@@ -1126,11 +1126,11 @@
  * @return A new string with the occurrences of the specified string replaced
  */
 - (OFString *)stringByReplacingOccurrencesOfString: (OFString *)string
 					withString: (OFString *)replacement
 					   options: (int)options
-					     range: (of_range_t)range;
+					     range: (OFRange)range;
 
 /**
  * @brief Checks whether the string has the specified prefix.
  *
  * @param prefix The prefix to check for