@@ -319,11 +319,11 @@
 		else
 			keepAlive = true;
 	} else {
 		if (connectionHeader != nil)
 			keepAlive = ([connectionHeader caseInsensitiveCompare:
-			    @"keep-alive"] == OF_ORDERED_SAME);
+			    @"keep-alive"] == OFOrderedSame);
 		else
 			keepAlive = false;
 	}
 
 	if (keepAlive) {
@@ -346,20 +346,20 @@
 		newURL = [OFURL URLWithString: location
 				relativeToURL: URL];
 		newURLScheme = newURL.scheme;
 
 		if ([newURLScheme caseInsensitiveCompare: @"http"] !=
-		    OF_ORDERED_SAME &&
+		    OFOrderedSame &&
 		    [newURLScheme caseInsensitiveCompare: @"https"] !=
-		    OF_ORDERED_SAME)
+		    OFOrderedSame)
 			follow = false;
 
 		if (!_client->_allowsInsecureRedirects &&
 		    [URL.scheme caseInsensitiveCompare: @"https"] ==
-		    OF_ORDERED_SAME &&
+		    OFOrderedSame &&
 		    [newURLScheme caseInsensitiveCompare: @"http"] ==
-		    OF_ORDERED_SAME)
+		    OFOrderedSame)
 			follow = false;
 
 		if (follow && [_client->_delegate respondsToSelector: @selector(
 		    client:shouldFollowRedirect:statusCode:request:response:)])
 			follow = [_client->_delegate client: _client
@@ -699,11 +699,11 @@
 		OFNumber *URLPort;
 
 		[_client close];
 
 		if ([URL.scheme caseInsensitiveCompare: @"https"] ==
-		    OF_ORDERED_SAME) {
+		    OFOrderedSame) {
 			if (of_tls_socket_class == Nil)
 				@throw [OFUnsupportedProtocolException
 				    exceptionWithURL: URL];
 
 			sock = [[[of_tls_socket_class alloc] init] autorelease];
@@ -1238,12 +1238,12 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFURL *URL = request.URL;
 	OFString *scheme = URL.scheme;
 
-	if ([scheme caseInsensitiveCompare: @"http"] != OF_ORDERED_SAME &&
-	    [scheme caseInsensitiveCompare: @"https"] != OF_ORDERED_SAME)
+	if ([scheme caseInsensitiveCompare: @"http"] != OFOrderedSame &&
+	    [scheme caseInsensitiveCompare: @"https"] != OFOrderedSame)
 		@throw [OFUnsupportedProtocolException exceptionWithURL: URL];
 
 	if (_inProgress)
 		/* TODO: Find a better exception */
 		@throw [OFAlreadyConnectedException exception];