diff --git a/source/compiler/sc1.c b/source/compiler/sc1.c
index 8ffe87e..3ed634f 100644
--- a/source/compiler/sc1.c
+++ b/source/compiler/sc1.c
@@ -2812,7 +2812,7 @@ static cell initvector(int ident,int tag,cell size,int startlit,int fillzero,
         if (!matchtoken(',')) {
           needtoken('}');
           break;
-        } /* for */
+        } /* if */
       } /* for */
       /* if this array is based on an enumeration, fill the "field" up with
        * zeros, and toggle the tag
@@ -4202,7 +4202,7 @@ static int declargs(symbol *sym,int chkshadow)
           if (matchtoken('}'))
             break;
           needtoken(',');
-        } /* for */
+        } /* while */
         needtoken(':');
         tok=tLABEL;     /* for outer loop: flag that we have seen a tagname */
         break;
@@ -5033,7 +5033,7 @@ static long max_stacksize(symbol *root,int *recursion)
       if ((sym->usage & uNATIVE)==0)
         numfunctions++;
     } /* if */
-  } /* if */
+  } /* for */
   /* allocate function symbol stack */
   symstack=(symbol **)malloc((numfunctions+1)*sizeof(symbol*));
   rsymstack=(symbol **)malloc((numfunctions+1)*sizeof(symbol*));
@@ -5163,7 +5163,7 @@ static int testsymbols(symbol *root,int level,int testlabs,int testconst)
       /* also mark the variable (local or global) to the debug information */
       if ((sym->usage & (uWRITTEN | uREAD))!=0 && (sym->usage & uNATIVE)==0)
         insert_dbgsymbol(sym);
-    } /* if */
+    } /* switch */
     sym=sym->next;
   } /* while */
 
@@ -6206,7 +6206,7 @@ static int doswitch(void)
               error(40,val);            /* duplicate "case" label */
             assert(csp==NULL || csp->next==cse);
             insert_constval(csp,cse,itoh(lbl_case),val,0);
-          } /* if */
+          } /* while */
         } /* if */
       } while (matchtoken(','));
       needtoken(':');                   /* ':' ends the case */
@@ -6264,7 +6264,7 @@ static int doswitch(void)
       errorset(sSETPOS,save_fline);
       error(244,cur->name); /* enum element not handled in switch */
       errorset(sSETPOS,-1);
-    } /* while */
+    } /* for */
   } /* if */
 
   #if !defined NDEBUG
diff --git a/source/compiler/sc2.c b/source/compiler/sc2.c
index 2de0832..18d8f30 100644
--- a/source/compiler/sc2.c
+++ b/source/compiler/sc2.c
@@ -250,7 +250,7 @@ SC_FUNC int plungefile(char *name,int try_currentpath,int try_includepaths)
       strlcpy(path,ptr,arraysize(path));
       strlcat(path,name,arraysize(path));
       result=plungequalifiedfile(path);
-    } /* while */
+    } /* for */
   } /* if */
   return result;
 }
@@ -992,7 +992,7 @@ static const unsigned char *getstring(unsigned char *dest,int max,const unsigned
       if (len<max-1)
         dest[len++]=*line;
       line++;
-    } /* if */
+    } /* while */
     dest[len]='\0';
     if (*line=='"')
       line++;           /* skip closing " */
diff --git a/source/compiler/sc3.c b/source/compiler/sc3.c
index 3ec6141..8d8b03c 100644
--- a/source/compiler/sc3.c
+++ b/source/compiler/sc3.c
@@ -419,7 +419,7 @@ static int skim(int *opstr,void (*testfunc)(int),int dropval,int endval,
       break;                    /* none of the operators in "opstr" were found */
     } /* if */
 
-  } /* while */
+  } /* for */
 
   lval_stgidx=org_index;
   lval_cidx=org_cidx;
@@ -834,7 +834,7 @@ static cell array_levelsize(symbol *sym,int level)
   while (level-- > 0) {
     sym=sym->child;
     assert(sym!=NULL);
-  } /* if */
+  } /* while */
   return sym->dim.array.length;
 }
 
@@ -1439,7 +1439,7 @@ static int hier2(value *lval)
           offsmul*=subsym->dim.array.length;
           arrayidx*=arrayidx*subsym->dim.array.length;
           subsym=subsym->child;
-        } /* if */
+        } /* while */
         lval->constval+=(numoffsets-1+arrayidx)*(cell)sizeof(cell);
         ldconst(lval->constval,sPRI);
       } /* if */