@@ -19,47 +19,57 @@
 /*!
  * @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
+#endif
 /*!
  * @brief Adds the specified object to the set.
  *
  * @param object The object to add to the set
  */
-- (void)addObject: (id)object;
+- (void)addObject: (ObjectType)object;
 
 /*!
  * @brief Removes the specified object from the set.
  *
  * @param object The object to remove from the set
  */
-- (void)removeObject: (id)object;
+- (void)removeObject: (ObjectType)object;
 
 /*!
  * @brief Removes all objects from the receiver which are in the specified set.
  *
  * @param set The set whose objects will be removed from the receiver
  */
-- (void)minusSet: (OFSet*)set;
+- (void)minusSet: (OFSet OF_GENERIC(ObjectType)*)set;
 
 /*!
  * @brief Removes all objects from the receiver which are not in the specified
  *	  set.
  *
  * @param set The set to intersect with
  */
-- (void)intersectSet: (OFSet*)set;
+- (void)intersectSet: (OFSet OF_GENERIC(ObjectType)*)set;
 
 /*!
  * @brief Creates a union of the receiver and the specified set.
  *
  * @param set The set to create the union with
  */
-- (void)unionSet: (OFSet*)set;
+- (void)unionSet: (OFSet OF_GENERIC(ObjectType)*)set;
 
 /*!
  * @brief Converts the mutable set to an immutable set.
  */
 - (void)makeImmutable;
 @end
+#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
+# undef ObjectType
+#endif