@@ -26,11 +26,11 @@
 static struct objc_sparsearray_level3 *empty_level3 = NULL;
 
 static void
 init(void)
 {
-	size_t i;
+	uint_fast16_t i;
 
 	empty_level2 = malloc(sizeof(struct objc_sparsearray_level2));
 	empty_level3 = malloc(sizeof(struct objc_sparsearray_level3));
 
 	if (empty_level2 == NULL || empty_level3 == NULL)
@@ -47,11 +47,11 @@
 
 struct objc_sparsearray*
 objc_sparsearray_new(void)
 {
 	struct objc_sparsearray *s;
-	size_t i;
+	uint_fast16_t i;
 
 	if (empty_level2 == NULL || empty_level3 == NULL)
 		init();
 
 	if ((s = malloc(sizeof(struct objc_sparsearray))) == NULL)
@@ -65,11 +65,11 @@
 
 void
 objc_sparsearray_copy(struct objc_sparsearray *dst,
     struct objc_sparsearray *src)
 {
-	size_t i, j, k;
+	uint_fast16_t i, j, k;
 	uint32_t idx;
 
 	for (i = 0; i < 256; i++) {
 		if (src->buckets[i]->empty)
 			continue;
@@ -100,11 +100,11 @@
 	uint8_t j = idx >>  8;
 	uint8_t k = idx;
 
 	if (s->buckets[i]->empty) {
 		struct objc_sparsearray_level2 *t;
-		size_t l;
+		uint_fast16_t l;
 
 		t = malloc(sizeof(struct objc_sparsearray_level2));
 
 		if (t == NULL)
 			ERROR("Not enough memory to insert into sparse array!");
@@ -117,11 +117,11 @@
 		s->buckets[i] = t;
 	}
 
 	if (s->buckets[i]->buckets[j]->empty) {
 		struct objc_sparsearray_level3 *t;
-		size_t l;
+		uint_fast16_t l;
 
 		t = malloc(sizeof(struct objc_sparsearray_level3));
 
 		if (t == NULL)
 			ERROR("Not enough memory to insert into sparse array!");
@@ -138,11 +138,11 @@
 }
 
 void
 objc_sparsearray_free(struct objc_sparsearray *s)
 {
-	size_t i, j;
+	uint_fast16_t i, j;
 
 	for (i = 0; i < 256; i++) {
 		if (s->buckets[i]->empty)
 			continue;