Index: src/OFArray.h
==================================================================
--- src/OFArray.h
+++ src/OFArray.h
@@ -41,16 +41,16 @@
  * Returns a specific object of the OFDataArray.
  *
  * \param index The number of the object to return
  * \return The specified object of the OFArray
  */
-- (OFObject*)object: (size_t)index;
+- (id)object: (size_t)index;
 
 /**
  * \return The last object of the OFDataArray
  */
-- (OFObject*)last;
+- (id)last;
 
 /**
  * Adds an object to the OFDataArray.
  *
  * \param obj An object to add

Index: src/OFArray.m
==================================================================
--- src/OFArray.m
+++ src/OFArray.m
@@ -60,16 +60,16 @@
 		[objs[i] retain];
 
 	return new;
 }
 
-- (OFObject*)object: (size_t)index
+- (id)object: (size_t)index
 {
 	return *((OFObject**)[array item: index]);
 }
 
-- (OFObject*)last
+- (id)last
 {
 	return *((OFObject**)[array last]);
 }
 
 - add: (OFObject*)obj

Index: src/OFDictionary.h
==================================================================
--- src/OFDictionary.h
+++ src/OFDictionary.h
@@ -62,11 +62,11 @@
 
 /**
  * \param key The key whose object should be returned
  * \return The object for the given key
  */
-- get: (OFObject*)key;
+- (id)get: (OFObject*)key;
 
 /**
  * Remove the object with the given key from the dictionary.
  *
  * \param key The key whose object should be removed

Index: src/OFDictionary.m
==================================================================
--- src/OFDictionary.m
+++ src/OFDictionary.m
@@ -124,11 +124,11 @@
 	[data[hash] append: obj];
 
 	return self;
 }
 
-- get: (OFObject*)key
+- (id)get: (OFObject*)key
 {
 	uint32_t hash;
 	of_list_object_t *iter;
 
 	if (key == nil)