@@ -535,12 +535,11 @@
 
 	return i;
 }
 
 #ifdef OF_HAVE_BLOCKS
-- (void)enumerateKeysAndObjectsUsingBlock:
-    (of_dictionary_enumeration_block_t)block
+- (void)enumerateKeysAndObjectsUsingBlock: (OFDictionaryEnumerationBlock)block
 {
 	bool stop = false;
 
 	for (id key in self) {
 		block(key, [self objectForKey: key], &stop);
@@ -548,11 +547,11 @@
 		if (stop)
 			break;
 	}
 }
 
-- (OFDictionary *)mappedDictionaryUsingBlock: (of_dictionary_map_block_t)block
+- (OFDictionary *)mappedDictionaryUsingBlock: (OFDictionaryMapBlock)block
 {
 	OFMutableDictionary *new = [OFMutableDictionary dictionary];
 
 	[self enumerateKeysAndObjectsUsingBlock: ^ (id key, id object,
 	    bool *stop) {
@@ -562,12 +561,11 @@
 	[new makeImmutable];
 
 	return new;
 }
 
-- (OFDictionary *)filteredDictionaryUsingBlock:
-    (of_dictionary_filter_block_t)block
+- (OFDictionary *)filteredDictionaryUsingBlock: (OFDictionaryFilterBlock)block
 {
 	OFMutableDictionary *new = [OFMutableDictionary dictionary];
 
 	[self enumerateKeysAndObjectsUsingBlock: ^ (id key, id object,
 	    bool *stop) {