@@ -7,17 +7,11 @@
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE included in
  * the packaging of this file.
  */
 
-#import "objfw-defs.h"
-
-#ifdef OF_OBJFW_RUNTIME
-# import <objfw-rt.h>
-#else
-# import <objc/objc.h>
-#endif
+#import "OFObject.h"
 
 /// \cond internal
 typedef struct __of_block_literal {
 	Class isa;
 	int flags;
@@ -67,18 +61,11 @@
 #ifndef Block_release
 # define Block_release(x) _Block_release((const void*)(x))
 #endif
 
 /// \cond internal
-@interface OFBlock
-{
-	Class isa;
-}
-
-+ (Class)class;
-- copy;
-- (void)release;
+@interface OFBlock: OFObject
 @end
 
 @interface OFStackBlock: OFBlock
 @end