diff --git a/Headers/gnustep/base/NSDictionary.h b/Headers/gnustep/base/NSDictionary.h
index ce86d631a..dc7c8a4db 100644
--- a/Headers/gnustep/base/NSDictionary.h
+++ b/Headers/gnustep/base/NSDictionary.h
@@ -23,44 +23,45 @@
 
 #include <objects/Dictionary.h>
 
-@class NSArray;
-@class NSString;
+@class NSArray, NSString, NSEnumerator;
 
-@interface NSDictionary : Dictionary <NSCopying>
+@interface NSDictionary : NSObject <NSCopying>
 
-+ allocWithZone:(NSZone *)zone;
++ allocWithZone: (NSZone*)zone;
 + dictionary;
-+ dictionaryWithObjects:(id *)objects forKeys:(NSString **)keys count:(unsigned)count;
-+ dictionaryWithObjects:(NSArray *)objects forKeys:(NSArray *)keys;
-- initWithObjects:(id *)objects forKeys:(NSString **)keys count:(unsigned)count;
-- initWithDictionary:(NSDictionary *)otherDictionary;
-- initWithContentsOfFile:(NSString *)path;
++ dictionaryWithObjects: (id*)objects forKeys: (NSString**)keys
+		  count: (unsigned)count;
++ dictionaryWithObjects: (NSArray*)objects forKeys: (NSArray*)keys;
+- initWithObjects: (id*)objects forKeys: (NSString**)keys
+	    count: (unsigned)count;
+- initWithDictionary: (NSDictionary*)otherDictionary;
+- initWithContentsOfFile: (NSString*)path;
 
-- (unsigned)count;
-- objectForKey:(NSString *)aKey;
-//- (NSEnumerator *)keyEnumerator;
-- (BOOL)isEqualToDictionary:(NSDictionary *)other;
-- (NSString *)description;
-- (NSString *)descriptionWithIndent:(unsigned)level;
-- (NSArray *)allKeys;
-- (NSArray *)allValues;
-- (NSArray *)allKeysForObject:anObject;
-- (BOOL)writeToFile:(NSString *)path atomically:(BOOL)useAuxiliaryFile;
-//- (NSEnumerator *)objectEnumerator;
+- (unsigned) count;
+- objectForKey: (NSString*)aKey;
+- (NSEnumerator*) keyEnumerator;
+- (BOOL) isEqualToDictionary: (NSDictionary*)other;
+- (NSString*) description;
+- (NSString*) descriptionWithIndent: (unsigned)level;
+- (NSArray*) allKeys;
+- (NSArray*) allValues;
+- (NSArray*) allKeysForObject: anObject;
+- (BOOL) writeToFile: (NSString*)path atomically: (BOOL)useAuxiliaryFile;
+- (NSEnumerator*) objectEnumerator;
 
 @end
 
 @interface NSMutableDictionary: NSDictionary
 
-+ allocWithZone:(NSZone *)zone;
-+ dictionaryWithCapacity:(unsigned)numItems;
-- initWithCapacity:(unsigned)numItems;
++ allocWithZone: (NSZone*)zone;
++ dictionaryWithCapacity: (unsigned)numItems;
+- initWithCapacity: (unsigned)numItems;
 
-- (void)setObject:anObject forKey:(NSString *)aKey;
-- (void)removeObjectForKey:(NSString *)aKey;
-- (void)removeAllObjects;
-- (void)removeObjectsForKeys:(NSArray *)keyArray;
-- (void)addEntriesFromDictionary:(NSDictionary *)otherDictionary;
+- (void) setObject: anObject forKey: (NSString*)aKey;
+- (void) removeObjectForKey: (NSString*)aKey;
+- (void) removeAllObjects;
+- (void) removeObjectsForKeys: (NSArray*)keyArray;
+- (void) addEntriesFromDictionary: (NSDictionary*)otherDictionary;
 
 @end