@@ -75,11 +75,11 @@
 }
 
 static void
 resize(struct objc_hashtable *table, uint32_t count)
 {
-	uint32_t i, fullness, nsize;
+	uint32_t fullness, nsize;
 	struct objc_hashtable_bucket **ndata;
 
 	if (count > UINT32_MAX / sizeof(*table->data) || count > UINT32_MAX / 8)
 		OBJC_ERROR("Integer overflow!");
 
@@ -99,11 +99,11 @@
 		return;
 
 	if ((ndata = calloc(nsize, sizeof(sizeof(*ndata)))) == NULL)
 		OBJC_ERROR("Not enough memory to resize hash table!");
 
-	for (i = 0; i < table->size; i++) {
+	for (uint32_t i = 0; i < table->size; i++) {
 		if (table->data[i] != NULL &&
 		    table->data[i] != &objc_deleted_bucket) {
 			uint32_t j, last;
 
 			last = nsize;
@@ -230,15 +230,13 @@
 }
 
 void
 objc_hashtable_free(struct objc_hashtable *table)
 {
-	uint32_t i;
-
-	for (i = 0; i < table->size; i++)
+	for (uint32_t i = 0; i < table->size; i++)
 		if (table->data[i] != NULL &&
 		    table->data[i] != &objc_deleted_bucket)
 			free(table->data[i]);
 
 	free(table->data);
 	free(table);
 }