@@ -21,12 +21,12 @@
 #endif
 
 /// \cond internal
 struct of_dictionary_bucket
 {
-	OFObject <OFCopying> *key;
-	OFObject *object;
+	id <OFCopying> key;
+	id object;
 	uint32_t hash;
 };
 /// \endcond
 
 /**
@@ -64,12 +64,12 @@
  *
  * \param key The key
  * \param obj The object
  * \return A new autoreleased OFDictionary
  */
-+ dictionaryWithObject: (OFObject*)obj
-		forKey: (OFObject <OFCopying>*)key;
++ dictionaryWithObject: (id)obj
+		forKey: (id <OFCopying>)key;
 
 /**
  * Creates a new OFDictionary with the specified keys and objects.
  *
  * \param keys An array of keys
@@ -83,11 +83,11 @@
  * Creates a new OFDictionary with the specified keys objects.
  *
  * \param key The first key
  * \return A new autoreleased OFDictionary
  */
-+ dictionaryWithKeysAndObjects: (OFObject <OFCopying>*)key, ...;
++ dictionaryWithKeysAndObjects: (id <OFCopying>)key, ...;
 
 /**
  * Initializes an already allocated OFDictionary.
  *
  * \return An initialized OFDictionary
@@ -109,12 +109,12 @@
  *
  * \param key The key
  * \param obj The object
  * \return A new initialized OFDictionary
  */
-- initWithObject: (OFObject*)obj
-	  forKey: (OFObject <OFCopying>*)key;
+- initWithObject: (id)obj
+	  forKey: (id <OFCopying>)key;
 
 /**
  * Initializes an already allocated OFDictionary with the specified keys and
  * objects.
  *
@@ -130,21 +130,21 @@
  * objects.
  *
  * \param first The first key
  * \return A new initialized OFDictionary
  */
-- initWithKeysAndObjects: (OFObject <OFCopying>*)first, ...;
+- initWithKeysAndObjects: (id <OFCopying>)first, ...;
 
 /**
  * Initializes an already allocated OFDictionary with the specified key and
  * va_list.
  *
  * \param first The first key
  * \param args A va_list of the other arguments
  * \return A new initialized OFDictionary
  */
-- initWithKey: (OFObject <OFCopying>*)first
+- initWithKey: (id <OFCopying>)first
       argList: (va_list)args;
 
 /**
  * Returns the object for the given key or nil if the key was not found.
  *
@@ -152,11 +152,11 @@
  * reasons!
  *
  * \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: (OFObject <OFCopying>*)key;
+- (id)objectForKey: (id)key;
 
 /**
  * \return The number of objects in the dictionary
  */
 - (size_t)count;