--- a/tools/objlink.c	Thu May 31 11:40:20 2018 +0300
+++ b/tools/objlink.c	Thu May 31 12:52:20 2018 +0300
@@ -768,7 +768,6 @@
 {
     FILE *dfile = NULL;
     BOOL hasOverlaps;
-    int i, j;
     int startAddr, endAddr, dataSize, totalSize;
 
     dmInitProg("objlink", "Simple file-linker", "0.81", NULL, NULL);
@@ -810,7 +809,7 @@
     {
         uint16_t *mp = (uint16_t *) memory;
         dmPrint(1, "WORD 0x%.4x\n", optInitValue);
-        for (i = memModel->size / sizeof(*mp); i; i--)
+        for (int i = memModel->size / sizeof(*mp); i; i--)
         {
             *mp++ = optInitValue;
         }
@@ -819,14 +818,14 @@
     {
         Uint32 *mp = (Uint32 *) memory;
         dmPrint(1, "DWORD 0x%.8x\n", optInitValue);
-        for (i = memModel->size / sizeof(*mp); i; i--)
+        for (int i = memModel->size / sizeof(*mp); i; i--)
         {
             *mp++ = optInitValue;
         }
     }
 
     // Load the datafiles
-    for (i = 0; i < nsrcFiles; i++)
+    for (int i = 0; i < nsrcFiles; i++)
     switch (srcFiles[i].type)
     {
         case STYPE_RAW:
@@ -844,7 +843,7 @@
 
     // Add memory model blocks
     dmMsg(1, "Applying memory model restrictions...\n");
-    for (i = 0; i < memModel->nmemBlocks; i++)
+    for (int i = 0; i < memModel->nmemBlocks; i++)
     {
         reserveMemBlock(
             memModel->memBlocks[i].start,
@@ -858,8 +857,8 @@
 
     // Check for overlapping conflicts
     hasOverlaps = FALSE;
-    for (i = 0; i < nmemBlocks; i++)
-    for (j = 0; j < nmemBlocks; j++)
+    for (int i = 0; i < nmemBlocks; i++)
+    for (int j = 0; j < nmemBlocks; j++)
     if (j != i && memBlocks[i].type == MTYPE_RES)
     {
         DMMemBlock *mbi = &memBlocks[i],
@@ -885,7 +884,7 @@
     // Find out start and end-addresses
     startAddr = memModel->size;
     totalSize = endAddr = 0;
-    for (i = 0; i < nmemBlocks; i++)
+    for (int i = 0; i < nmemBlocks; i++)
     {
         DMMemBlock *mbi = &memBlocks[i];
         if (mbi->type == MTYPE_RES)
@@ -927,7 +926,7 @@
                 break;
         }
 
-        for (i = 0; i < nmemBlocks; i++)
+        for (int i = 0; i < nmemBlocks; i++)
         {
             DMMemBlock *mbi = &memBlocks[i];
             outputLinkData(dfile, mbi->name, mbi->start, mbi->end);