@@ -49,21 +49,17 @@
  * Keys are copied and thus must conform to the OFCopying protocol.
  *
  * @note Fast enumeration on a dictionary enumerates through the keys of the
  *	 dictionary.
  */
-#ifdef OF_HAVE_GENERICS
-@interface OFDictionary<KeyType, ObjectType>:
-#else
-# ifndef DOXYGEN
-#  define KeyType id
-#  define ObjectType id
-# endif
-@interface OFDictionary:
+@interface OFDictionary OF_GENERIC(KeyType, ObjectType): OFObject <OFCopying,
+    OFMutableCopying, OFCollection, OFSerialization, OFJSONRepresentation,
+    OFMessagePackRepresentation>
+#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
+# define KeyType id
+# define ObjectType id
 #endif
-    OFObject <OFCopying, OFMutableCopying, OFCollection, OFSerialization,
-    OFJSONRepresentation, OFMessagePackRepresentation>
 /*!
  * @brief Creates a new OFDictionary.
  *
  * @return A new autoreleased OFDictionary
  */
@@ -303,19 +299,19 @@
  * @return A new autoreleased OFDictionary
  */
 - (OFDictionary OF_GENERIC(KeyType, ObjectType) *)filteredDictionaryUsingBlock:
     (of_dictionary_filter_block_t)block;
 #endif
-@end
 #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
 # undef KeyType
 # undef ObjectType
 #endif
+@end
 
 OF_ASSUME_NONNULL_END
 
 #import "OFMutableDictionary.h"
 
 #if !defined(NSINTEGER_DEFINED) && !__has_feature(modules)
 /* Required for dictionary literals to work */
 @compatibility_alias NSDictionary OFDictionary;
 #endif