diff --git a/src/main/c/src/EndpointDescriptor.c b/src/main/c/src/EndpointDescriptor.c
index 9d5973a..1227a5e 100644
--- a/src/main/c/src/EndpointDescriptor.c
+++ b/src/main/c/src/EndpointDescriptor.c
@@ -18,8 +18,7 @@ jobjectArray wrapEndpointDescriptors(JNIEnv *env, int count,
     jobjectArray array = (jobjectArray) (*env)->NewObjectArray(env, count,
         (*env)->FindClass(env, PACKAGE_DIR"/EndpointDescriptor"), NULL);
 
-    int i;
-    for (i = 0; i < count; i++)
+    for (int i = 0; i < count; i++)
         (*env)->SetObjectArrayElement(env, array, i,
             wrapEndpointDescriptor(env, &descriptors[i]));
 
diff --git a/src/main/c/src/Interface.c b/src/main/c/src/Interface.c
index a0fb948..8c05136 100644
--- a/src/main/c/src/Interface.c
+++ b/src/main/c/src/Interface.c
@@ -17,8 +17,7 @@ jobjectArray wrapInterfaces(JNIEnv *env, int count,
     jobjectArray array = (jobjectArray) (*env)->NewObjectArray(env, count,
         (*env)->FindClass(env, PACKAGE_DIR"/Interface"), NULL);
 
-    int i;
-    for (i = 0; i < count; i++)
+    for (int i = 0; i < count; i++)
         (*env)->SetObjectArrayElement(env, array, i,
             wrapInterface(env, &interfaces[i]));
 
diff --git a/src/main/c/src/InterfaceDescriptor.c b/src/main/c/src/InterfaceDescriptor.c
index b3b722e..02796d8 100644
--- a/src/main/c/src/InterfaceDescriptor.c
+++ b/src/main/c/src/InterfaceDescriptor.c
@@ -20,8 +20,7 @@ jobjectArray wrapInterfaceDescriptors(JNIEnv *env, int count,
     jobjectArray array = (jobjectArray) (*env)->NewObjectArray(env, count,
         (*env)->FindClass(env, PACKAGE_DIR"/InterfaceDescriptor"), NULL);
 
-    int i;
-    for (i = 0; i < count; i++)
+    for (int i = 0; i < count; i++)
         (*env)->SetObjectArrayElement(env, array, i,
             wrapInterfaceDescriptor(env, &descriptors[i]));
 
diff --git a/src/main/c/src/IsoPacketDescriptor.c b/src/main/c/src/IsoPacketDescriptor.c
index 5bd5b72..d1d3e39 100644
--- a/src/main/c/src/IsoPacketDescriptor.c
+++ b/src/main/c/src/IsoPacketDescriptor.c
@@ -13,8 +13,7 @@ jobjectArray wrapIsoPacketDescriptors(JNIEnv *env, int count,
     jobjectArray array = (jobjectArray) (*env)->NewObjectArray(env, count,
         (*env)->FindClass(env, PACKAGE_DIR"/IsoPacketDescriptor"), NULL);
 
-    int i;
-    for (i = 0; i < count; i++)
+    for (int i = 0; i < count; i++)
         (*env)->SetObjectArrayElement(env, array, i,
             wrapIsoPacketDescriptor(env, &descriptors[i]));