@@ -426,11 +426,11 @@
 	objc_autoreleasePoolPop(pool);
 	return [ret autorelease];
 }
 
 #ifdef OF_HAVE_BLOCKS
-- (void)enumerateObjectsUsingBlock: (of_set_enumeration_block_t)block
+- (void)enumerateObjectsUsingBlock: (OFSetEnumerationBlock)block
 {
 	bool stop = false;
 
 	for (id object in self) {
 		block(object, &stop);
@@ -438,11 +438,11 @@
 		if (stop)
 			break;
 	}
 }
 
-- (OFSet *)filteredSetUsingBlock: (of_set_filter_block_t)block
+- (OFSet *)filteredSetUsingBlock: (OFSetFilterBlock)block
 {
 	OFMutableSet *ret = [OFMutableSet set];
 
 	[self enumerateObjectsUsingBlock: ^ (id object, bool *stop) {
 		if (block(object))