@@ -21,17 +21,13 @@
 /*!
  * @class OFMutableSet OFSet.h ObjFW/OFSet.h
  *
  * @brief An abstract class for a mutable unordered set of unique objects.
  */
-#ifdef OF_HAVE_GENERICS
-@interface OFMutableSet<ObjectType>: OFSet<ObjectType>
-#else
-# ifndef DOXYGEN
-#  define ObjectType id
-# endif
-@interface OFMutableSet: OFSet
+@interface OFMutableSet OF_GENERIC(ObjectType): OFSet OF_GENERIC(ObjectType)
+#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
+# define ObjectType id
 #endif
 /*!
  * @brief Creates a new OFMutableSet with enough memory to hold the specified
  *	  number of objects.
  *
@@ -87,11 +83,11 @@
 
 /*!
  * @brief Converts the mutable set to an immutable set.
  */
 - (void)makeImmutable;
-@end
 #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
 # undef ObjectType
 #endif
+@end
 
 OF_ASSUME_NONNULL_END