@@ -26,64 +26,64 @@
 /**
  * Adds an object to the OFArray.
  *
  * \param obj An object to add
  */
-- (void)addObject: (OFObject*)obj;
+- (void)addObject: (id)obj;
 
 /**
  * Adds an object to the OFArray at the specified index.
  *
  * \param obj An object to add
  * \param index The index where the object should be added
  */
-- (void)addObject: (OFObject*)obj
+- (void)addObject: (id)obj
 	  atIndex: (size_t)index;
 
 /**
  * Replaces all objects equivalent to the first specified object with the
  * second specified object.
  *
  * \param old The object to replace
  * \param new The replacement object
  */
-- (void)replaceObject: (OFObject*)old
-	   withObject: (OFObject*)new;
+- (void)replaceObject: (id)old
+	   withObject: (id)new;
 
 /**
  * Replaces the object at the specified index with the specified object.
  *
  * \param index The index of the object to replace
  * \param obj The replacement object
  * \return The old object, autoreleased
  */
 - (id)replaceObjectAtIndex: (size_t)index
-		withObject: (OFObject*)obj;
+		withObject: (id)obj;
 
 /**
  * Replaces all objects that have the same address as the first specified object
  * with the second specified object.
  *
  * \param old The object to replace
  * \param new The replacement object
  */
-- (void)replaceObjectIdenticalTo: (OFObject*)old
-		      withObject: (OFObject*)new;
+- (void)replaceObjectIdenticalTo: (id)old
+		      withObject: (id)new;
 
 /**
  * Removes all objects equivalent to the specified object.
  *
  * \param obj The object to remove
  */
-- (void)removeObject: (OFObject*)obj;
+- (void)removeObject: (id)obj;
 
 /**
  * Removes all objects that have the same address as the specified object.
  *
  * \param obj The object to remove
  */
-- (void)removeObjectIdenticalTo: (OFObject*)obj;
+- (void)removeObjectIdenticalTo: (id)obj;
 
 /**
  * Removes the object at the specified index.
  *
  * \param index The index of the object to remove