@@ -9,33 +9,33 @@
  * the packaging of this file.
  */
 
 #import "OFObject.h"
 
-/// \cond internal
-typedef struct __of_block_literal {
+typedef struct of_block_literal_t {
 	Class isa;
 	int flags;
 	int reserved;
 	void (*invoke)(void *, ...);
-	struct __of_block_descriptor {
+	struct of_block_descriptor_t {
 		unsigned long reserved;
 		unsigned long size;
 		void (*copy_helper)(void *dest, void *src);
 		void (*dispose_helper)(void *src);
 		const char *signature;
 	} *descriptor;
 } of_block_literal_t;
 
-typedef struct __of_block_byref {
+typedef struct of_block_byref_t of_block_byref_t;
+struct of_block_byref_t {
 	Class isa;
-	struct __of_block_byref *forwarding;
+	of_block_byref_t *forwarding;
 	int flags;
 	int size;
 	void (*byref_keep)(void *dest, void *src);
 	void (*byref_dispose)(void*);
-} of_block_byref_t;
+};
 
 enum {
 	OF_BLOCK_HAS_COPY_DISPOSE = (1 << 25),
 	OF_BLOCK_HAS_CTOR	  = (1 << 26),
 	OF_BLOCK_IS_GLOBAL	  = (1 << 28),
@@ -51,11 +51,10 @@
 	OF_BLOCK_FIELD_IS_BLOCK	 =   7,
 	OF_BLOCK_FIELD_IS_BYREF	 =   8,
 	OF_BLOCK_FIELD_IS_WEAK	 =  16,
 	OF_BLOCK_BYREF_CALLER	 = 128,
 };
-/// \endcond
 
 extern void* _Block_copy(const void*);
 extern void _Block_release(const void*);
 
 #ifndef Block_copy
@@ -63,11 +62,10 @@
 #endif
 #ifndef Block_release
 # define Block_release(x) _Block_release((const void*)(x))
 #endif
 
-/// \cond internal
 @interface OFBlock: OFObject
 @end
 
 @interface OFStackBlock: OFBlock
 @end
@@ -75,6 +73,5 @@
 @interface OFGlobalBlock: OFBlock
 @end
 
 @interface OFMallocBlock: OFBlock
 @end
-/// \endcond