@@ -15,10 +15,12 @@
  */
 
 #include "config.h"
 
 #include <string.h>
+
+#include <assert.h>
 
 #import "OFDictionary.h"
 #import "OFEnumerator.h"
 #import "OFArray.h"
 #import "OFString.h"
@@ -638,10 +640,74 @@
 		    data[i]->object == object)
 			return YES;
 
 	return NO;
 }
+
+- (OFArray*)allKeys
+{
+	OFArray *ret;
+	id *cArray = [self allocMemoryForNItems: count
+				       withSize: sizeof(id)];
+	size_t i, j;
+
+	for (i = j = 0; i < size; i++)
+		if (data[i] != NULL && data[i] != DELETED)
+			cArray[j++] = data[i]->key;
+
+	assert(j == count);
+
+	@try {
+		ret = [OFArray arrayWithCArray: cArray
+					length: count];
+	} @finally {
+		[self freeMemory: cArray];
+	}
+
+	return ret;
+}
+
+- (OFArray*)allObjects
+{
+	OFArray *ret;
+	id *cArray = [self allocMemoryForNItems: count
+				       withSize: sizeof(id)];
+	size_t i, j;
+
+	for (i = j = 0; i < size; i++)
+		if (data[i] != NULL && data[i] != DELETED)
+			cArray[j++] = data[i]->object;
+
+	assert(j == count);
+
+	@try {
+		ret = [OFArray arrayWithCArray: cArray
+					length: count];
+	} @finally {
+		[self freeMemory: cArray];
+	}
+
+	return ret;
+}
+
+- (OFEnumerator*)objectEnumerator
+{
+	return [[[OFDictionaryObjectEnumerator alloc]
+	    initWithDictionary: self
+			  data: data
+			  size: size
+	      mutationsPointer: NULL] autorelease];
+}
+
+- (OFEnumerator*)keyEnumerator
+{
+	return [[[OFDictionaryKeyEnumerator alloc]
+	    initWithDictionary: self
+			  data: data
+			  size: size
+	      mutationsPointer: NULL] autorelease];
+}
 
 - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state
 			   objects: (id*)objects
 			     count: (int)count_
 {
@@ -662,28 +728,10 @@
 	state->mutationsPtr = (unsigned long*)self;
 
 	return i;
 }
 
-- (OFEnumerator*)objectEnumerator
-{
-	return [[[OFDictionaryObjectEnumerator alloc]
-	    initWithDictionary: self
-			  data: data
-			  size: size
-	      mutationsPointer: NULL] autorelease];
-}
-
-- (OFEnumerator*)keyEnumerator
-{
-	return [[[OFDictionaryKeyEnumerator alloc]
-	    initWithDictionary: self
-			  data: data
-			  size: size
-	      mutationsPointer: NULL] autorelease];
-}
-
 #ifdef OF_HAVE_BLOCKS
 - (void)enumerateKeysAndObjectsUsingBlock:
     (of_dictionary_enumeration_block_t)block
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];