Index: src/OFArray.h
==================================================================
--- src/OFArray.h
+++ src/OFArray.h
@@ -33,11 +33,11 @@
 
 /**
  * \brief A class for storing objects in an array.
  */
 @interface OFArray: OFObject <OFCopying, OFMutableCopying, OFCollection,
-    OFFastEnumeration, OFSerialization>
+    OFSerialization>
 {
 	OFDataArray *array;
 }
 
 /**

Index: src/OFCollection.h
==================================================================
--- src/OFCollection.h
+++ src/OFCollection.h
@@ -17,11 +17,11 @@
 #import "OFEnumerator.h"
 
 /**
  * \brief A protocol with methods common for all collections.
  */
-@protocol OFCollection <OFEnumerating>
+@protocol OFCollection <OFEnumerating, OFFastEnumeration>
 #ifdef OF_HAVE_PROPERTIES
 @property (readonly) size_t count;
 #endif
 
 /**

Index: src/OFDictionary.h
==================================================================
--- src/OFDictionary.h
+++ src/OFDictionary.h
@@ -42,11 +42,11 @@
  *
  * Note: Fast enumeration on a dictionary enumerates through the keys of the
  * dictionary.
  */
 @interface OFDictionary: OFObject <OFCopying, OFMutableCopying, OFCollection,
-    OFFastEnumeration, OFSerialization>
+    OFSerialization>
 {
 	struct of_dictionary_bucket **data;
 	uint32_t size;
 	size_t count;
 }

Index: src/OFList.h
==================================================================
--- src/OFList.h
+++ src/OFList.h
@@ -36,12 +36,11 @@
 };
 
 /**
  * \brief A class which provides easy to use double-linked lists.
  */
-@interface OFList: OFObject <OFCopying, OFCollection, OFFastEnumeration,
-    OFSerialization>
+@interface OFList: OFObject <OFCopying, OFCollection, OFSerialization>
 {
 	of_list_object_t *firstListObject;
 	of_list_object_t *lastListObject;
 	size_t		 count;
 	unsigned long	 mutations;

Index: src/OFSet.h
==================================================================
--- src/OFSet.h
+++ src/OFSet.h
@@ -23,12 +23,11 @@
 @class OFArray;
 
 /**
  * \brief An unordered set of unique objects.
  */
-@interface OFSet: OFObject <OFCollection, OFCopying, OFMutableCopying,
-    OFFastEnumeration>
+@interface OFSet: OFObject <OFCollection, OFCopying, OFMutableCopying>
 {
 	OFMutableDictionary *dictionary;
 }
 
 /**