@@ -250,11 +250,11 @@
 	void *old;
 
 	if (key == NULL || object == NULL)
 		@throw [OFInvalidArgumentException exception];
 
-	hash = OF_ROL(hash, self->_rotate);
+	hash = OFRotateLeft(hash, self->_rotate);
 	last = self->_capacity;
 
 	for (i = hash & (self->_capacity - 1);
 	    i < last && self->_buckets[i] != NULL; i++) {
 		if (self->_buckets[i] == &deleted)
@@ -369,11 +369,11 @@
 {
 	unsigned long hash = 0;
 
 	for (unsigned long i = 0; i < _capacity; i++) {
 		if (_buckets[i] != NULL && _buckets[i] != &deleted) {
-			hash ^= OF_ROR(_buckets[i]->hash, _rotate);
+			hash ^= OFRotateRight(_buckets[i]->hash, _rotate);
 			hash ^= _objectFunctions.hash(_buckets[i]->object);
 		}
 	}
 
 	return hash;
@@ -389,11 +389,11 @@
 	@try {
 		for (unsigned long i = 0; i < _capacity; i++)
 			if (_buckets[i] != NULL && _buckets[i] != &deleted)
 				setObject(copy, _buckets[i]->key,
 				    _buckets[i]->object,
-				    OF_ROR(_buckets[i]->hash, _rotate));
+				    OFRotateRight(_buckets[i]->hash, _rotate));
 	} @catch (id e) {
 		[copy release];
 		@throw e;
 	}
 
@@ -410,11 +410,11 @@
 	unsigned long i, hash, last;
 
 	if (key == NULL)
 		@throw [OFInvalidArgumentException exception];
 
-	hash = OF_ROL(_keyFunctions.hash(key), _rotate);
+	hash = OFRotateLeft(_keyFunctions.hash(key), _rotate);
 	last = _capacity;
 
 	for (i = hash & (_capacity - 1); i < last && _buckets[i] != NULL; i++) {
 		if (_buckets[i] == &deleted)
 			continue;
@@ -450,11 +450,11 @@
 	unsigned long i, hash, last;
 
 	if (key == NULL)
 		@throw [OFInvalidArgumentException exception];
 
-	hash = OF_ROL(_keyFunctions.hash(key), _rotate);
+	hash = OFRotateLeft(_keyFunctions.hash(key), _rotate);
 	last = _capacity;
 
 	for (i = hash & (_capacity - 1); i < last && _buckets[i] != NULL; i++) {
 		if (_buckets[i] == &deleted)
 			continue;