@@ -77,28 +77,28 @@
 	[self freeMemory: data];
 	data = newdata;
 	size = newsize;
 }
 
-- (void)setObject: (OFObject*)obj
-	   forKey: (OFObject <OFCopying>*)key
+- (void)setObject: (id)obj
+	   forKey: (id <OFCopying>)key
 {
 	uint32_t i, hash, last;
 	id old;
 
 	if (key == nil || obj == nil)
 		@throw [OFInvalidArgumentException newWithClass: isa
 						       selector: _cmd];
 
-	hash = [key hash];
+	hash = [(id)key hash];
 	last = size;
 
 	for (i = hash & (size - 1); i < last && data[i] != NULL; i++) {
 		if (data[i] == DELETED)
 			continue;
 
-		if ([data[i]->key isEqual: key])
+		if ([(id)data[i]->key isEqual: key])
 			break;
 	}
 
 	/* In case the last bucket is already used */
 	if (i >= last) {
@@ -106,18 +106,18 @@
 
 		for (i = 0; i < last && data[i] != NULL; i++) {
 			if (data[i] == DELETED)
 				continue;
 
-			if ([data[i]->key isEqual: key])
+			if ([(id)data[i]->key isEqual: key])
 				break;
 		}
 	}
 
 	/* Key not in dictionary */
 	if (i >= last || data[i] == NULL || data[i] == DELETED ||
-	    ![data[i]->key isEqual: key]) {
+	    ![(id)data[i]->key isEqual: key]) {
 		BUCKET *b;
 
 		[self _resizeForCount: count + 1];
 
 		mutations++;
@@ -147,11 +147,11 @@
 
 		@try {
 			[obj retain];
 		} @catch (OFException *e) {
 			[self freeMemory: b];
-			[key release];
+			[(id)key release];
 			@throw e;
 		}
 
 		b->key = key;
 		b->object = obj;
@@ -165,11 +165,11 @@
 	old = data[i]->object;
 	data[i]->object = [obj retain];
 	[old release];
 }
 
-- (void)removeObjectForKey: (OFObject*)key
+- (void)removeObjectForKey: (id)key
 {
 	uint32_t i, hash, last;
 
 	if (key == nil)
 		@throw [OFInvalidArgumentException newWithClass: isa
@@ -180,12 +180,12 @@
 
 	for (i = hash & (size - 1); i < last && data[i] != NULL; i++) {
 		if (data[i] == DELETED)
 			continue;
 
-		if ([data[i]->key isEqual: key]) {
-			[data[i]->key release];
+		if ([(id)data[i]->key isEqual: key]) {
+			[(id)data[i]->key release];
 			[data[i]->object release];
 			[self freeMemory: data[i]];
 			data[i] = DELETED;
 
 			count--;
@@ -204,12 +204,12 @@
 
 	for (i = 0; i < last && data[i] != NULL; i++) {
 		if (data[i] == DELETED)
 			continue;
 
-		if ([data[i]->key isEqual: key]) {
-			[data[i]->key release];
+		if ([(id)data[i]->key isEqual: key]) {
+			[(id)data[i]->key release];
 			[data[i]->object release];
 			[self freeMemory: data[i]];
 			data[i] = DELETED;
 
 			count--;