@@ -600,12 +600,11 @@
 
 	return i;
 }
 
 #ifdef OF_HAVE_BLOCKS
-- (void)enumerateKeysAndObjectsUsingBlock:
-    (of_map_table_enumeration_block_t)block
+- (void)enumerateKeysAndObjectsUsingBlock: (OFMapTableEnumerationBlock)block
 {
 	bool stop = false;
 	unsigned long mutations = _mutations;
 
 	for (size_t i = 0; i < _capacity && !stop; i++) {
@@ -616,11 +615,11 @@
 		if (_buckets[i] != NULL && _buckets[i] != &deleted)
 			block(_buckets[i]->key, _buckets[i]->object, &stop);
 	}
 }
 
-- (void)replaceObjectsUsingBlock: (of_map_table_replace_block_t)block
+- (void)replaceObjectsUsingBlock: (OFMapTableReplaceBlock)block
 {
 	unsigned long mutations = _mutations;
 
 	for (size_t i = 0; i < _capacity; i++) {
 		if (_mutations != mutations)