@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -71,11 +71,11 @@
 OF_SUBCLASSING_RESTRICTED
 @interface OFMapTable: OFObject <OFCopying, OFFastEnumeration>
 {
 	OFMapTableFunctions _keyFunctions, _objectFunctions;
 	struct OFMapTableBucket *_Nonnull *_Nullable _buckets;
-	unsigned long _count, _capacity;
+	uint32_t _count, _capacity;
 	unsigned char _rotate;
 	unsigned long _mutations;
 }
 
 /**
@@ -233,12 +233,12 @@
  */
 @interface OFMapTableEnumerator: OFObject
 {
 	OFMapTable *_mapTable;
 	struct OFMapTableBucket *_Nonnull *_Nullable _buckets;
-	unsigned long _capacity, _mutations, *_Nullable _mutationsPtr;
-	unsigned long _position;
+	uint32_t _capacity;
+	unsigned long _mutations, *_Nullable _mutationsPtr, _position;
 }
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**