diff --git a/src/frontend/numparam/spicenum.c b/src/frontend/numparam/spicenum.c
index 3791fa869..c7631fe2b 100644
--- a/src/frontend/numparam/spicenum.c
+++ b/src/frontend/numparam/spicenum.c
@@ -837,7 +837,7 @@ nupa_copy (char *s, int linenum)
         if (!inexpansionS)
         {
             putlogfile (dicoS->dyncategory[linenum], linenum, t);
-        };
+        }
     }
     spice_dstring_free(&u) ;
     return t;
diff --git a/src/main.c b/src/main.c
index eb5b5c292..e44bb1eeb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -362,7 +362,7 @@ void SMPprint( SMPmatrix *n1 , char *n2)
     NG_IGNORE(n2);
 
     return;
-};
+}
 
 void SMPprintRHS( SMPmatrix *n1, char *n2 , double* n3 , double* n4)
 {
@@ -372,7 +372,7 @@ void SMPprintRHS( SMPmatrix *n1, char *n2 , double* n3 , double* n4)
     NG_IGNORE(n4);
 
     return;
-};
+}
 
 #endif /* SIMULATOR */
 
diff --git a/src/maths/fft/fftext.c b/src/maths/fft/fftext.c
index eaa6143c5..0cc821e59 100644
--- a/src/maths/fft/fftext.c
+++ b/src/maths/fft/fftext.c
@@ -61,7 +61,7 @@ int fftInit(int M)
                 }
             }
         }
-    };
+    }
     return theError;
 }
 
@@ -73,14 +73,14 @@ void fftFree(void)
         if (BRLowArray[i1] != 0) {
             free(BRLowArray[i1]);
             BRLowArray[i1] = 0;
-        };
-    };
+        }
+    }
     for (i1=8*sizeof(int)-1; i1>=0; i1--) {
         if (UtblArray[i1] != 0) {
             free(UtblArray[i1]);
             UtblArray[i1] = 0;
-        };
-    };
+        }
+    }
 }
 
 /*************************************************
diff --git a/src/maths/fft/fftlib.c b/src/maths/fft/fftlib.c
index b69ec5be0..b8013f44f 100644
--- a/src/maths/fft/fftlib.c
+++ b/src/maths/fft/fftlib.c
@@ -57,7 +57,7 @@ void fftBRInit(int M, short *BRLow)
             if (i1 & bitmask)
                 bitsum = bitsum + (Nroot_1 >> bit);
         BRLow[i1] = (short) bitsum;
-    };
+    }
 }
 
 /************************************************
@@ -174,7 +174,7 @@ static inline void bitrevR2(double *ioptr, int M, short *BRLow)
                 f1i = *(p0r+posAi);
                 iCol -= 1;
                 p1r = IOP + BRLow[iCol]*4;
-            };
+            }
             f2r = *(p0r+2);
             f2i = *(p0r+(2+1));
             f3r = *(p0r+posB);
@@ -198,8 +198,8 @@ static inline void bitrevR2(double *ioptr, int M, short *BRLow)
             *(p0r+posB) = f3r;
             *(p0r+posBi) = f3i;
 
-        };
-    };
+        }
+    }
 }
 
 static inline void fft2pt(double *ioptr);
@@ -1247,7 +1247,7 @@ static inline void scbitrevR2(double *ioptr, int M, short *BRLow, double scale)
                 f1i = *(p0r+posAi);
                 iCol -= 1;
                 p1r = IOP + BRLow[iCol]*4;
-            };
+            }
             f2r = *(p0r+2);
             f2i = *(p0r+(2+1));
             f3r = *(p0r+posB);
@@ -1271,8 +1271,8 @@ static inline void scbitrevR2(double *ioptr, int M, short *BRLow, double scale)
             *(p0r+posB) = scale*f3r;
             *(p0r+posBi) = scale*f3i;
 
-        };
-    };
+        }
+    }
 }
 
 static inline void ifft2pt(double *ioptr, double scale);
@@ -2626,7 +2626,7 @@ static inline void frstage(double *ioptr, int M, double *Utbl)
 
         p0r += 2;
         p1r -= 2;
-    };
+    }
 }
 
 void rffts1(double *ioptr, int M, int Rows, double *Utbl, short *BRLow)
@@ -3123,7 +3123,7 @@ static inline void ifrstage(double *ioptr, int M, double *Utbl)
 
         p0r += 2;
         p1r -= 2;
-    };
+    }
 }
 
 void riffts1(double *ioptr, int M, int Rows, double *Utbl, short *BRLow)
diff --git a/src/maths/ni/niiter.c b/src/maths/ni/niiter.c
index 011f09ff4..28307b9b5 100644
--- a/src/maths/ni/niiter.c
+++ b/src/maths/ni/niiter.c
@@ -216,8 +216,8 @@ NIiter(CKTcircuit *ckt, int maxIter)
                   diff = (ckt->CKTrhs)[node->number] -
                           (ckt->CKTrhsOld)[node->number];
                   if (diff>maxdiff) maxdiff=diff;
-                };
-              };
+                }
+              }
               if (maxdiff>10) {
                 damp_factor=10/maxdiff;
                 if (damp_factor<0.1) damp_factor=0.1;
@@ -226,13 +226,13 @@ NIiter(CKTcircuit *ckt, int maxIter)
                           (ckt->CKTrhsOld)[node->number];
                   (ckt->CKTrhs)[node->number]=(ckt->CKTrhsOld)[node->number] +
                                                 (damp_factor * diff);
-                };
+                }
                 for(i=0;i<ckt->CKTnumStates;i++) {
                     diff = *(ckt->CKTstate0+i) - *(OldCKTstate0+i);
                     *(ckt->CKTstate0+i) = *(OldCKTstate0+i) +
                                                 (damp_factor * diff);
-                };
-              };
+                }
+              }
             }
 
 
diff --git a/src/spicelib/analysis/cktncdump.c b/src/spicelib/analysis/cktncdump.c
index 6b2ce8c15..d836c3d8e 100644
--- a/src/spicelib/analysis/cktncdump.c
+++ b/src/spicelib/analysis/cktncdump.c
@@ -36,8 +36,8 @@ CKTncDump(
            fprintf(stdout," *");
       }
       fprintf(stdout,"\n");
-    };
+    }
     i++;
-  };
+  }
   fprintf(stdout,"\n");
 }
diff --git a/src/spicelib/devices/bjt/bjtask.c b/src/spicelib/devices/bjt/bjtask.c
index 9ccc79bc4..cf14cb42a 100644
--- a/src/spicelib/devices/bjt/bjtask.c
+++ b/src/spicelib/devices/bjt/bjtask.c
@@ -102,7 +102,7 @@ BJTask(CKTcircuit *ckt, GENinstance *instPtr, int which, IFvalue *value, IFvalue
                           !(ckt->CKTmode & MODETRANOP)) {
                       value->rValue -= *(ckt->CKTstate0 + here->BJTcqsub);
                 }
-            };
+            }
             value->rValue *= here->BJTm;
             return(OK);
         case BJT_QUEST_GPI:
diff --git a/src/spicelib/devices/devsup.c b/src/spicelib/devices/devsup.c
index 50d995665..edd1abeda 100644
--- a/src/spicelib/devices/devsup.c
+++ b/src/spicelib/devices/devsup.c
@@ -72,7 +72,7 @@ DEVpnjlim(double vnew, double vold, double vt, double vcrit, int *icheck)
               *icheck = 1;
            } else {
               *icheck = 0;
-           };
+           }
         } else {
            *icheck = 0;
         }
diff --git a/src/spicelib/devices/mos3/mos3load.c b/src/spicelib/devices/mos3/mos3load.c
index 05e22c472..45bc898c0 100644
--- a/src/spicelib/devices/mos3/mos3load.c
+++ b/src/spicelib/devices/mos3/mos3load.c
@@ -741,8 +741,8 @@ next1:      if(vbs <= -3*vt) {
 			ddldvd = -dldvd;
 			ddldvb = 0.0;
 			goto line520;
-		    };
-		};
+		    }
+		}
 			    
 		if ( model->MOS3maxDriftVel <= 0.0 ) goto line510;
 		if (model->MOS3alpha == 0.0) goto line700;
@@ -790,7 +790,7 @@ line510:
 		  delxl = sqrt(model->MOS3kappa*model->MOS3alpha*
 				     ((here->MOS3mode*vds)-vdsat+(vdsat/8)));
 		  dldvd =  0.5*delxl/((here->MOS3mode*vds)-vdsat+(vdsat/8));
-	        };
+	        }
 		ddldvg = 0.0;
 		ddldvd = -dldvd;
 		ddldvb = 0.0;
diff --git a/src/spicelib/devices/mos9/mos9load.c b/src/spicelib/devices/mos9/mos9load.c
index 37c6decee..b98da7c4b 100644
--- a/src/spicelib/devices/mos9/mos9load.c
+++ b/src/spicelib/devices/mos9/mos9load.c
@@ -759,8 +759,8 @@ next1:      if(vbs <= -3*vt) {
                  ddldvd = -dldvd;
                  ddldvb = 0.0;
                  goto line520;
-              };
-            };
+              }
+            }
             if ( model->MOS9maxDriftVel <= 0.0 ) goto line510;
             if (model->MOS9alpha == 0.0) goto line700;
             cdsat = cdrain;
@@ -802,7 +802,7 @@ line510:
                delxl = sqrt(model->MOS9kappa*model->MOS9alpha*
                                       ((here->MOS9mode*vds)-vdsat+(vdsat/8)));
                dldvd = 0.5*delxl/((here->MOS9mode*vds)-vdsat+(vdsat/8));
-            };
+            }
             ddldvg = 0.0;
             ddldvd = -dldvd;
             ddldvb = 0.0;
diff --git a/src/tclspice.c b/src/tclspice.c
index 77569b05e..61103a0e9 100644
--- a/src/tclspice.c
+++ b/src/tclspice.c
@@ -549,7 +549,7 @@ static int vectoblt TCL_CMDPROCARGS(clientData,interp,argc,argv) {
         }
         Blt_ResetVector(imag_BltVector, compData, var_dvec->v_length, var_dvec->v_length, TCL_VOLATILE);
       }
-    };
+    }
   } else
   {
     Blt_ResetVector(real_BltVector, var_dvec->v_realdata, var_dvec->v_length, var_dvec->v_length, TCL_VOLATILE);
diff --git a/src/winmain.c b/src/winmain.c
index 3acf54a8b..f66867309 100644
--- a/src/winmain.c
+++ b/src/winmain.c
@@ -1152,7 +1152,7 @@ size_t f_w_r_i_t_e(const void * __ptr, size_t __size, size_t __n, FILE * __strea
                 fp_u_t_c(c, __stream);
             } else
                 break;
-        };
+        }
 //      f_r_e_a_d(out, __size, __n, __stream);
 //      p_r_i_n_t_f("test2 %s", out);
         return (int)(i/__size);