@@ -88,11 +88,11 @@
 	__objc_exec_class(&module);
 }
 /* Emd of ObjC module */
 
 of_block_literal_t*
-Block_copy(of_block_literal_t *block)
+_Block_copy(of_block_literal_t *block)
 {
 	if (block->isa == (Class)&_NSConcreteStackBlock) {
 		of_block_literal_t *copy;
 
 		if ((copy = malloc(block->descriptor->size)) == NULL) {
@@ -115,11 +115,11 @@
 
 	return block;
 }
 
 void
-Block_release(of_block_literal_t *block)
+_Block_release(of_block_literal_t *block)
 {
 	if (block->isa != (Class)&_NSConcreteMallocBlock)
 		return;
 
 	if (--block->reserved == 0) {
@@ -136,11 +136,11 @@
 	flags &= OF_BLOCK_FIELD_IS_BLOCK | OF_BLOCK_FIELD_IS_OBJECT |
 	    OF_BLOCK_FIELD_IS_BYREF;
 
 	switch (flags) {
 	case OF_BLOCK_FIELD_IS_BLOCK:
-		*(of_block_literal_t**)dst = Block_copy(src);
+		*(of_block_literal_t**)dst = _Block_copy(src);
 		break;
 	case OF_BLOCK_FIELD_IS_OBJECT:
 		*(id*)dst = [(id)src retain];
 		break;
 	case OF_BLOCK_FIELD_IS_BYREF:;
@@ -175,11 +175,11 @@
 	flags &= OF_BLOCK_FIELD_IS_BLOCK | OF_BLOCK_FIELD_IS_OBJECT |
 	    OF_BLOCK_FIELD_IS_BYREF;
 
 	switch (flags) {
 	case OF_BLOCK_FIELD_IS_BLOCK:
-		Block_release(obj);
+		_Block_release(obj);
 		break;
 	case OF_BLOCK_FIELD_IS_OBJECT:
 		[(id)obj release];
 		break;
 	case OF_BLOCK_FIELD_IS_BYREF:;
@@ -198,16 +198,16 @@
 static Class autoreleasepool = Nil;
 
 @implementation OFBlock
 - copy
 {
-	return (id)Block_copy((of_block_literal_t*)self);
+	return Block_copy(self);
 }
 
 - (void)release
 {
-	Block_release((of_block_literal_t*)self);
+	Block_release(self);
 }
 
 - autorelease
 {
 	/*