@@ -674,11 +674,11 @@
 				OFMutableString *path = [OFMutableString
 				    stringWithString:
 				    (URL->_URLEncodedPath != nil
 				    ? URL->_URLEncodedPath
 				    : @"/")];
-				of_range_t range = [path
+				OFRange range = [path
 				    rangeOfString: @"/"
 					  options: OF_STRING_SEARCH_BACKWARDS];
 
 				if (range.location == OF_NOT_FOUND)
 					@throw [OFInvalidFormatException
@@ -877,11 +877,11 @@
 - (OFString *)host
 {
 	if ([_URLEncodedHost hasPrefix: @"["] &&
 	    [_URLEncodedHost hasSuffix: @"]"]) {
 		OFString *host = [_URLEncodedHost substringWithRange:
-		    of_range(1, _URLEncodedHost.length - 2)];
+		    OFMakeRange(1, _URLEncodedHost.length - 2)];
 
 		if (!of_url_is_ipv6_host(host))
 			@throw [OFInvalidArgumentException exception];
 
 		return host;