@@ -10,10 +10,11 @@
  */
 
 #include <stdarg.h>
 
 #import "OFObject.h"
+#import "OFCollection.h"
 #import "OFEnumerator.h"
 
 @class OFArray;
 
 #ifdef OF_HAVE_BLOCKS
@@ -30,22 +31,18 @@
 /// \endcond
 
 /**
  * \brief A class for storing objects in a hash table.
  */
-@interface OFDictionary: OFObject <OFCopying, OFMutableCopying,
+@interface OFDictionary: OFObject <OFCopying, OFMutableCopying, OFCollection,
     OFFastEnumeration>
 {
 	struct of_dictionary_bucket **data;
 	uint32_t size;
 	size_t count;
 }
 
-#ifdef OF_HAVE_PROPERTIES
-@property (readonly) size_t count;
-#endif
-
 /**
  * Creates a new OFDictionary.
  *
  * \return A new autoreleased OFDictionary
  */
@@ -154,20 +151,10 @@
  * \param key The key whose object should be returned
  * \return The object for the given key or nil if the key was not found
  */
 - (id)objectForKey: (id)key;
 
-/**
- * \return The number of objects in the dictionary
- */
-- (size_t)count;
-
-/**
- * \returns An OFEnumerator to enumerate through the dictionary's objects
- */
-- (OFEnumerator*)objectEnumerator;
-
 /**
  * \return An OFEnumerator to enumerate through the dictionary's keys
  */
 - (OFEnumerator*)keyEnumerator;