@@ -18,12 +18,12 @@
 
 /// \cond internal
 struct of_dictionary_bucket
 {
 	OFObject <OFCopying> *key;
-	OFObject	     *object;
-	uint32_t	     hash;
+	OFObject *object;
+	uint32_t hash;
 };
 /// \endcond
 
 /**
  * \brief A class for storing objects in a hash table.
@@ -30,12 +30,12 @@
  */
 @interface OFDictionary: OFObject <OFCopying, OFMutableCopying,
     OFFastEnumeration>
 {
 	struct of_dictionary_bucket *data;
-	size_t			    size;
-	size_t			    count;
+	uint32_t size;
+	size_t count;
 }
 
 /**
  * Creates a new OFDictionary.
  *
@@ -161,18 +161,18 @@
 
 /// \cond internal
 @interface OFDictionaryEnumerator: OFEnumerator
 {
 	struct of_dictionary_bucket *data;
-	size_t			    size;
-	unsigned long		    mutations;
-	unsigned long		    *mutations_ptr;
-	size_t			    pos;
+	uint32_t size;
+	unsigned long mutations;
+	unsigned long *mutations_ptr;
+	uint32_t pos;
 }
 
 -     initWithData: (struct of_dictionary_bucket*)data
-	      size: (size_t)size
+	      size: (uint32_t)size
   mutationsPointer: (unsigned long*)mutations_ptr;
 @end
 
 @interface OFDictionaryObjectEnumerator: OFDictionaryEnumerator
 @end