Index: src/OFDictionary.h
==================================================================
--- src/OFDictionary.h
+++ src/OFDictionary.h
@@ -155,11 +155,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: (id)key;
+- (id)objectForKey: (id <OFCopying>)key;
 
 /**
  * \brief Returns an OFEnumerator to enumerate through the dictionary's keys.
  *
  * \return An OFEnumerator to enumerate through the dictionary's keys

Index: src/OFDictionary.m
==================================================================
--- src/OFDictionary.m
+++ src/OFDictionary.m
@@ -471,11 +471,11 @@
 	}
 
 	return self;
 }
 
-- (id)objectForKey: (id)key
+- (id)objectForKey: (id <OFCopying>)key
 {
 	uint32_t i, hash, last;
 
 	if (key == nil)
 		@throw [OFInvalidArgumentException newWithClass: isa

Index: src/OFMutableDictionary.h
==================================================================
--- src/OFMutableDictionary.h
+++ src/OFMutableDictionary.h
@@ -42,11 +42,11 @@
 /**
  * \brief Removes the object for the specified key from the dictionary.
  *
  * \param key The key whose object should be removed
  */
-- (void)removeObjectForKey: (id)key;
+- (void)removeObjectForKey: (id <OFCopying>)key;
 
 #ifdef OF_HAVE_BLOCKS
 /**
  * \brief Replaces each object with the object returned by the block.
  *

Index: src/OFMutableDictionary.m
==================================================================
--- src/OFMutableDictionary.m
+++ src/OFMutableDictionary.m
@@ -174,11 +174,11 @@
 	old = data[i]->object;
 	data[i]->object = [object retain];
 	[old release];
 }
 
-- (void)removeObjectForKey: (id)key
+- (void)removeObjectForKey: (id <OFCopying>)key
 {
 	uint32_t i, hash, last;
 
 	if (key == nil)
 		@throw [OFInvalidArgumentException newWithClass: isa