@@ -368,11 +368,11 @@
 	} @catch (OFOutOfRangeException *e) {
 		return [self sendErrorAndClose: 400];
 	}
 
 	pos = [line rangeOfString: @" "].location;
-	if (pos == OF_NOT_FOUND)
+	if (pos == OFNotFound)
 		return [self sendErrorAndClose: 400];
 
 	method = [line substringToIndex: pos];
 	@try {
 		_method = of_http_request_method_from_string(method);
@@ -444,11 +444,11 @@
 
 		return false;
 	}
 
 	pos = [line rangeOfString: @":"].location;
-	if (pos == OF_NOT_FOUND)
+	if (pos == OFNotFound)
 		return [self sendErrorAndClose: 400];
 
 	key = [line substringToIndex: pos];
 	value = [line substringFromIndex: pos + 1];
 
@@ -464,11 +464,11 @@
 	if ([key isEqual: @"Host"]) {
 		pos = [value
 		    rangeOfString: @":"
 			  options: OF_STRING_SEARCH_BACKWARDS].location;
 
-		if (pos != OF_NOT_FOUND) {
+		if (pos != OFNotFound) {
 			[_host release];
 			_host = [[value substringToIndex: pos] retain];
 
 			@try {
 				unsigned long long portTmp =
@@ -533,11 +533,11 @@
 	URL.scheme = @"http";
 	URL.host = _host;
 	if (_port != 80)
 		URL.port = [OFNumber numberWithUnsignedShort: _port];
 
-	if ((pos = [_path rangeOfString: @"?"].location) != OF_NOT_FOUND) {
+	if ((pos = [_path rangeOfString: @"?"].location) != OFNotFound) {
 		OFString *path, *query;
 
 		path = [_path substringToIndex: pos];
 		query = [_path substringFromIndex: pos + 1];
 
@@ -692,19 +692,19 @@
 
 		if (line == nil)
 			return 0;
 
 		pos = [line rangeOfString: @";"].location;
-		if (pos != OF_NOT_FOUND)
+		if (pos != OFNotFound)
 			line = [line substringToIndex: pos];
 
 		if (line.length < 1) {
 			/*
 			 * We have read the empty string because the socket is
 			 * at end of stream.
 			 */
-			if (_socket.atEndOfStream && pos == OF_NOT_FOUND)
+			if (_socket.atEndOfStream && pos == OFNotFound)
 				@throw [OFTruncatedDataException exception];
 			else
 				@throw [OFInvalidFormatException exception];
 		}