@@ -31,11 +31,11 @@
 	/** The function to retain keys / objects */
 	void *_Nullable (*_Nullable retain)(void *_Nullable object);
 	/** The function to release keys / objects */
 	void (*_Nullable release)(void *_Nullable object);
 	/** The function to hash keys */
-	uint32_t (*_Nullable hash)(void *_Nullable object);
+	unsigned long (*_Nullable hash)(void *_Nullable object);
 	/** The function to compare keys / objects */
 	bool (*_Nullable equal)(void *_Nullable object1,
 	    void *_Nullable object2);
 };
 typedef struct of_map_table_functions_t of_map_table_functions_t;
@@ -74,11 +74,11 @@
 OF_SUBCLASSING_RESTRICTED
 @interface OFMapTable: OFObject <OFCopying, OFFastEnumeration>
 {
 	of_map_table_functions_t _keyFunctions, _objectFunctions;
 	struct of_map_table_bucket *_Nonnull *_Nullable _buckets;
-	uint32_t _count, _capacity;
+	unsigned long _count, _capacity;
 	uint8_t _rotate;
 	unsigned long _mutations;
 }
 
 /**
@@ -240,14 +240,12 @@
  */
 @interface OFMapTableEnumerator: OFObject
 {
 	OFMapTable *_mapTable;
 	struct of_map_table_bucket *_Nonnull *_Nullable _buckets;
-	uint32_t _capacity;
-	unsigned long _mutations;
-	unsigned long *_Nullable _mutationsPtr;
-	uint32_t _position;
+	unsigned long _capacity, _mutations, *_Nullable _mutationsPtr;
+	unsigned long _position;
 }
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**