@@ -28,11 +28,11 @@
 #endif
 
 static void
 init(void)
 {
-	uint_fast16_t i;
+	uint16_t i;
 
 	empty_level2 = malloc(sizeof(struct objc_dtable_level2));
 	if (empty_level2 == NULL)
 		OBJC_ERROR("Not enough memory to allocate dtable!");
 
@@ -55,11 +55,11 @@
 
 struct objc_dtable*
 objc_dtable_new(void)
 {
 	struct objc_dtable *dtable;
-	uint_fast16_t i;
+	uint16_t i;
 
 #ifdef OF_SELUID24
 	if (empty_level2 == NULL || empty_level3 == NULL)
 		init();
 #else
@@ -77,13 +77,13 @@
 }
 
 void
 objc_dtable_copy(struct objc_dtable *dst, struct objc_dtable *src)
 {
-	uint_fast16_t i, j;
+	uint16_t i, j;
 #ifdef OF_SELUID24
-	uint_fast16_t k;
+	uint16_t k;
 #endif
 	uint32_t idx;
 
 	for (i = 0; i < 256; i++) {
 		if (src->buckets[i] == empty_level2)
@@ -135,11 +135,11 @@
 	uint8_t j = idx;
 #endif
 
 	if (dtable->buckets[i] == empty_level2) {
 		struct objc_dtable_level2 *level2;
-		uint_fast16_t l;
+		uint16_t l;
 
 		level2 = malloc(sizeof(struct objc_dtable_level2));
 
 		if (level2 == NULL)
 			OBJC_ERROR("Not enough memory to insert into dtable!");
@@ -155,11 +155,11 @@
 	}
 
 #ifdef OF_SELUID24
 	if (dtable->buckets[i]->buckets[j] == empty_level3) {
 		struct objc_dtable_level3 *level3;
-		uint_fast16_t l;
+		uint16_t l;
 
 		level3 = malloc(sizeof(struct objc_dtable_level3));
 
 		if (level3 == NULL)
 			OBJC_ERROR("Not enough memory to insert into dtable!");
@@ -177,13 +177,13 @@
 }
 
 void
 objc_dtable_free(struct objc_dtable *dtable)
 {
-	uint_fast16_t i;
+	uint16_t i;
 #ifdef OF_SELUID24
-	uint_fast16_t j;
+	uint16_t j;
 #endif
 
 	for (i = 0; i < 256; i++) {
 		if (dtable->buckets[i] == empty_level2)
 			continue;