@@ -10,10 +10,11 @@
  */
 
 #include <stdarg.h>
 
 #import "OFObject.h"
+#import "OFCollection.h"
 #import "OFEnumerator.h"
 
 @class OFDataArray;
 @class OFString;
 
@@ -22,11 +23,12 @@
 #endif
 
 /**
  * \brief A class for storing objects in an array.
  */
-@interface OFArray: OFObject <OFCopying, OFMutableCopying, OFFastEnumeration>
+@interface OFArray: OFObject <OFCopying, OFMutableCopying, OFCollection,
+    OFFastEnumeration>
 {
 	OFDataArray *array;
 }
 
 /**
@@ -112,15 +114,10 @@
  * \return An initialized OFArray
  */
 - initWithCArray: (id*)objs
 	  length: (size_t)len;
 
-/**
- * \return The number of objects in the array
- */
-- (size_t)count;
-
 /**
  * \return The objects of the array as a C array
  */
 - (id*)cArray;
 
@@ -180,15 +177,10 @@
  * \param separator The string with which the objects should be joined
  * \return A string containing all objects joined by the separator
  */
 - (OFString*)componentsJoinedByString: (OFString*)separator;
 
-/**
- * \return An OFEnumerator to enumarate through the array's objects
- */
-- (OFEnumerator*)objectEnumerator;
-
 #ifdef OF_HAVE_BLOCKS
 /**
  * Executes a block for each object.
  *
  * \param block The block to execute for each object