@@ -287,11 +287,11 @@
 - (void)setCharacter: (of_unichar_t)character atIndex: (size_t)idx
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFString *string =
 	    [OFString stringWithCharacters: &character length: 1];
-	[self replaceCharactersInRange: of_range(idx, 1) withString: string];
+	[self replaceCharactersInRange: OFMakeRange(idx, 1) withString: string];
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)appendString: (OFString *)string
 {
@@ -429,19 +429,19 @@
 }
 #endif
 
 - (void)insertString: (OFString *)string atIndex: (size_t)idx
 {
-	[self replaceCharactersInRange: of_range(idx, 0) withString: string];
+	[self replaceCharactersInRange: OFMakeRange(idx, 0) withString: string];
 }
 
-- (void)deleteCharactersInRange: (of_range_t)range
+- (void)deleteCharactersInRange: (OFRange)range
 {
 	[self replaceCharactersInRange: range withString: @""];
 }
 
-- (void)replaceCharactersInRange: (of_range_t)range
+- (void)replaceCharactersInRange: (OFRange)range
 		      withString: (OFString *)replacement
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
@@ -449,17 +449,17 @@
 			withString: (OFString *)replacement
 {
 	[self replaceOccurrencesOfString: string
 			      withString: replacement
 				 options: 0
-				   range: of_range(0, self.length)];
+				   range: OFMakeRange(0, self.length)];
 }
 
 - (void)replaceOccurrencesOfString: (OFString *)string
 			withString: (OFString *)replacement
 			   options: (int)options
-			     range: (of_range_t)range
+			     range: (OFRange)range
 {
 	void *pool = objc_autoreleasePoolPush(), *pool2;
 	const of_unichar_t *characters;
 	const of_unichar_t *searchCharacters = string.characters;
 	size_t searchLength = string.length;
@@ -483,11 +483,11 @@
 	for (size_t i = range.location; i <= range.length - searchLength; i++) {
 		if (memcmp(characters + i, searchCharacters,
 		    searchLength * sizeof(of_unichar_t)) != 0)
 			continue;
 
-		[self replaceCharactersInRange: of_range(i, searchLength)
+		[self replaceCharactersInRange: OFMakeRange(i, searchLength)
 				    withString: replacement];
 
 		range.length -= searchLength;
 		range.length += replacementLength;
 
@@ -515,11 +515,11 @@
 			break;
 	}
 
 	objc_autoreleasePoolPop(pool);
 
-	[self deleteCharactersInRange: of_range(0, i)];
+	[self deleteCharactersInRange: OFMakeRange(0, i)];
 }
 
 - (void)deleteTrailingWhitespaces
 {
 	void *pool;
@@ -542,11 +542,11 @@
 		d++;
 	}
 
 	objc_autoreleasePoolPop(pool);
 
-	[self deleteCharactersInRange: of_range(length - d, d)];
+	[self deleteCharactersInRange: OFMakeRange(length - d, d)];
 }
 
 - (void)deleteEnclosingWhitespaces
 {
 	[self deleteLeadingWhitespaces];