@@ -183,23 +183,23 @@
 	return true;
 }
 
 - (unsigned long)hash
 {
-	uint32_t hash;
-
-	OF_HASH_INIT(hash);
-
-	OF_HASH_ADD(hash, _method);
-	OF_HASH_ADD(hash, _protocolVersion.major);
-	OF_HASH_ADD(hash, _protocolVersion.minor);
-	OF_HASH_ADD_HASH(hash, _URL.hash);
-	OF_HASH_ADD_HASH(hash, _headers.hash);
+	unsigned long hash;
+
+	OFHashInit(&hash);
+
+	OFHashAdd(&hash, _method);
+	OFHashAdd(&hash, _protocolVersion.major);
+	OFHashAdd(&hash, _protocolVersion.minor);
+	OFHashAddHash(&hash, _URL.hash);
+	OFHashAddHash(&hash, _headers.hash);
 	if (_hasRemoteAddress)
-		OF_HASH_ADD_HASH(hash, OFSocketAddressHash(&_remoteAddress));
+		OFHashAddHash(&hash, OFSocketAddressHash(&_remoteAddress));
 
-	OF_HASH_FINALIZE(hash);
+	OFHashFinalize(&hash);
 
 	return hash;
 }
 
 - (void)setProtocolVersion: (OFHTTPRequestProtocolVersion)protocolVersion