@@ -41,11 +41,11 @@
 	Class isa;
 	of_block_byref_t *forwarding;
 	int flags;
 	int size;
 	void (*byref_keep)(void *dest, void *src);
-	void (*byref_dispose)(void*);
+	void (*byref_dispose)(void *);
 };
 
 enum {
 	OF_BLOCK_HAS_COPY_DISPOSE = (1 << 25),
 	OF_BLOCK_HAS_CTOR	  = (1 << 26),
@@ -69,32 +69,32 @@
 @end
 
 #ifdef OF_OBJFW_RUNTIME
 /* Begin of ObjC module */
 static struct objc_abi_class _NSConcreteStackBlock_metaclass = {
-	(struct objc_abi_class*)(void*)"OFBlock", "OFBlock", "OFStackBlock", 8,
-	OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_abi_class), NULL, NULL
+	(struct objc_abi_class *)(void *)"OFBlock", "OFBlock", "OFStackBlock",
+	8, OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_abi_class), NULL, NULL
 };
 
 struct objc_abi_class _NSConcreteStackBlock = {
-	&_NSConcreteStackBlock_metaclass, "OFBlock", "OFStackBlock", 8,
-	OBJC_CLASS_INFO_CLASS, sizeof(of_block_literal_t), NULL, NULL
+	&_NSConcreteStackBlock_metaclass, "OFBlock", "OFStackBlock",
+	8, OBJC_CLASS_INFO_CLASS, sizeof(of_block_literal_t), NULL, NULL
 };
 
 static struct objc_abi_class _NSConcreteGlobalBlock_metaclass = {
-	(struct objc_abi_class*)(void*)"OFBlock", "OFBlock", "OFGlobalBlock", 8,
-	OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_abi_class), NULL, NULL
+	(struct objc_abi_class *)(void *)"OFBlock", "OFBlock", "OFGlobalBlock",
+	8, OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_abi_class), NULL, NULL
 };
 
 struct objc_abi_class _NSConcreteGlobalBlock = {
 	&_NSConcreteGlobalBlock_metaclass, "OFBlock", "OFGlobalBlock",
 	8, OBJC_CLASS_INFO_CLASS, sizeof(of_block_literal_t), NULL, NULL
 };
 
 static struct objc_abi_class _NSConcreteMallocBlock_metaclass = {
-	(struct objc_abi_class*)(void*)"OFBlock", "OFBlock", "OFMallocBlock", 8,
-	OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_abi_class), NULL, NULL
+	(struct objc_abi_class *)(void *)"OFBlock", "OFBlock", "OFMallocBlock",
+	8, OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_abi_class), NULL, NULL
 };
 
 struct objc_abi_class _NSConcreteMallocBlock = {
 	&_NSConcreteMallocBlock_metaclass, "OFBlock", "OFMallocBlock",
 	8, OBJC_CLASS_INFO_CLASS, sizeof(of_block_literal_t), NULL, NULL
@@ -112,20 +112,20 @@
 		&_NSConcreteMallocBlock, NULL
 	}
 };
 
 static struct objc_abi_module module = {
-	8, sizeof(module), NULL, (struct objc_abi_symtab*)&symtab
+	8, sizeof(module), NULL, (struct objc_abi_symtab *)&symtab
 };
 
 OF_CONSTRUCTOR()
 {
 	__objc_exec_class(&module);
 }
 /* End of ObjC module */
 #elif defined(OF_APPLE_RUNTIME)
-extern Class objc_initializeClassPair(Class, const char*, Class, Class);
+extern Class objc_initializeClassPair(Class, const char *, Class, Class);
 
 struct class {
 	struct class *isa, *super_class;
 	const char *name;
 	long version, info, instance_size;
@@ -156,22 +156,23 @@
 # define SPINLOCK_HASH(p) ((uintptr_t)p >> 4) & (NUM_SPINLOCKS - 1)
 static of_spinlock_t blockSpinlocks[NUM_SPINLOCKS];
 static of_spinlock_t byrefSpinlocks[NUM_SPINLOCKS];
 #endif
 
-void*
+void *
 _Block_copy(const void *block_)
 {
-	of_block_literal_t *block = (of_block_literal_t*)block_;
+	of_block_literal_t *block = (of_block_literal_t *)block_;
 
 	if (object_getClass((id)block) == (Class)&_NSConcreteStackBlock) {
 		of_block_literal_t *copy;
 
 		if ((copy = malloc(block->descriptor->size)) == NULL) {
 			alloc_failed_exception.isa =
 			    [OFAllocFailedException class];
-			@throw (OFAllocFailedException*)&alloc_failed_exception;
+			@throw (OFAllocFailedException *)
+			    &alloc_failed_exception;
 		}
 		memcpy(copy, block, block->descriptor->size);
 
 		object_setClass((id)copy, (Class)&_NSConcreteMallocBlock);
 		copy->flags++;
@@ -198,11 +199,11 @@
 }
 
 void
 _Block_release(const void *block_)
 {
-	of_block_literal_t *block = (of_block_literal_t*)block_;
+	of_block_literal_t *block = (of_block_literal_t *)block_;
 
 	if (object_getClass((id)block) != (Class)&_NSConcreteMallocBlock)
 		return;
 
 #ifdef OF_HAVE_ATOMIC_OPS
@@ -239,27 +240,27 @@
 	if (src_ == NULL)
 		return;
 
 	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:
 		if (!(flags_ & OF_BLOCK_BYREF_CALLER))
-			*(id*)dst_ = [(id)src_ retain];
+			*(id *)dst_ = [(id)src_ retain];
 		break;
 	case OF_BLOCK_FIELD_IS_BYREF:;
-		of_block_byref_t *src = (of_block_byref_t*)src_;
-		of_block_byref_t **dst = (of_block_byref_t**)dst_;
+		of_block_byref_t *src = (of_block_byref_t *)src_;
+		of_block_byref_t **dst = (of_block_byref_t **)dst_;
 
 		src = src->forwarding;
 
 		if ((src->flags & OF_BLOCK_REFCOUNT_MASK) == 0) {
 			if ((*dst = malloc(src->size)) == NULL) {
 				alloc_failed_exception.isa =
 				    [OFAllocFailedException class];
-				@throw (OFAllocFailedException*)
+				@throw (OFAllocFailedException *)
 				    &alloc_failed_exception;
 			}
 
 			memcpy(*dst, src, src->size);
 			(*dst)->flags =
@@ -268,11 +269,11 @@
 
 			if (src->flags & OF_BLOCK_HAS_COPY_DISPOSE)
 				src->byref_keep(*dst, src);
 
 #ifdef OF_HAVE_ATOMIC_OPS
-			if (!of_atomic_ptr_cmpswap((void**)&src->forwarding,
+			if (!of_atomic_ptr_cmpswap((void **)&src->forwarding,
 			    src, *dst)) {
 				src->byref_dispose(*dst);
 				free(*dst);
 
 				*dst = src->forwarding;
@@ -323,11 +324,11 @@
 	case OF_BLOCK_FIELD_IS_OBJECT:
 		if (!(flags_ & OF_BLOCK_BYREF_CALLER))
 			[(id)obj_ release];
 		break;
 	case OF_BLOCK_FIELD_IS_BYREF:;
-		of_block_byref_t *obj = (of_block_byref_t*)obj_;
+		of_block_byref_t *obj = (of_block_byref_t *)obj_;
 
 		obj = obj->forwarding;
 
 #ifdef OF_HAVE_ATOMIC_OPS
 		if ((of_atomic_int_dec(&obj->flags) &
@@ -432,35 +433,35 @@
 - init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (void*)allocMemoryWithSize: (size_t)size
+- (void *)allocMemoryWithSize: (size_t)size
+{
+	OF_UNRECOGNIZED_SELECTOR
+}
+
+- (void *)allocMemoryWithSize: (size_t)size
+			count: (size_t)count
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void*)allocMemoryWithSize: (size_t)size
-		       count: (size_t)count
+- (void *)resizeMemory: (void *)ptr
+		  size: (size_t)size
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void*)resizeMemory: (void*)ptr
-		 size: (size_t)size
+- (void *)resizeMemory: (void *)ptr
+		  size: (size_t)size
+		 count: (size_t)count
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void*)resizeMemory: (void*)ptr
-		 size: (size_t)size
-		count: (size_t)count
-{
-	OF_UNRECOGNIZED_SELECTOR
-}
-
-- (void)freeMemory: (void*)ptr
+- (void)freeMemory: (void *)ptr
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 - retain
@@ -485,11 +486,11 @@
 }
 
 - (unsigned int)retainCount
 {
 	if (object_getClass(self) == (Class)&_NSConcreteMallocBlock)
-		return ((of_block_literal_t*)self)->flags &
+		return ((of_block_literal_t *)self)->flags &
 		    OF_BLOCK_REFCOUNT_MASK;
 
 	return OF_RETAIN_COUNT_MAX;
 }