@@ -16,14 +16,12 @@
 
 #import "OFObject.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
-#ifndef DOXYGEN
-@class OFEnumerator OF_GENERIC(ObjectType);
 @class OFArray OF_GENERIC(ObjectType);
-#endif
+@class OFEnumerator OF_GENERIC(ObjectType);
 
 /*!
  * @protocol OFEnumerating OFEnumerator.h ObjFW/OFEnumerator.h
  *
  * @brief A protocol for getting an enumerator for the object.
@@ -41,17 +39,13 @@
 /*!
  * @class OFEnumerator OFEnumerator.h ObjFW/OFEnumerator.h
  *
  * @brief A class which provides methods to enumerate through collections.
  */
-#ifdef OF_HAVE_GENERICS
-@interface OFEnumerator<ObjectType>: OFObject
-#else
-# ifndef DOXYGEN
-#  define ObjectType id
-# endif
-@interface OFEnumerator: OFObject
+@interface OFEnumerator OF_GENERIC(ObjectType): OFObject
+#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
+# define ObjectType id
 #endif
 /*!
  * @brief Returns the next object or `nil` if there is none left.
  *
  * @return The next object or `nil` if there is none left
@@ -68,14 +62,14 @@
 /*!
  * @brief Resets the enumerator, so the next call to nextObject returns the
  *	  first object again.
  */
 - (void)reset;
-@end
 #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
 # undef ObjectType
 #endif
+@end
 
 /*
  * This needs to be exactly like this because it's hard-coded in the compiler.
  *
  * We need this bad check to see if we already imported Cocoa, which defines