diff --git a/src/frontend/numparam/nupatest.c b/src/frontend/numparam/nupatest.c
index cfe5cd3dc..830a15e0e 100644
--- a/src/frontend/numparam/nupatest.c
+++ b/src/frontend/numparam/nupatest.c
@@ -2,6 +2,7 @@
  *
  *  This file is part of Numparam, see:  readme.txt  
  *  Free software under the terms of the GNU Lesser General Public License 
+ *  $Id$
  */
 
 /****   test executable for the numparam library  ****/
@@ -141,7 +142,7 @@ Begin
   Done
 EndProc
 
-#if 0	// sjb - this is in mystring.c
+#if 0	/* sjb - this is in mystring.c */
 Proc rs(Pchar s) /*  78 coumn limit */
 Begin
   short i; 
diff --git a/src/frontend/parse.c b/src/frontend/parse.c
index ce24ad9ab..20bd816f5 100644
--- a/src/frontend/parse.c
+++ b/src/frontend/parse.c
@@ -1,6 +1,7 @@
 /**********
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
+$Id$
 **********/
 
 /*
@@ -428,7 +429,7 @@ parse(void)
             fprintf(cp_err, "Error: in parse.c(parse) stack understep.\n");
             return (NULL);
         }
-//for (i=0; i<=sp; i++) print_elem(stack+i); printf("next: "); print_elem(next); printf("\n"); 
+/*for (i=0; i<=sp; i++) print_elem(stack+i); printf("next: "); print_elem(next); printf("\n");*/ 
 
         rel = prectable[top->e_token][next->e_token];
         switch (rel) {
diff --git a/src/frontend/resource.c b/src/frontend/resource.c
index 046501fca..3b4cc0255 100644
--- a/src/frontend/resource.c
+++ b/src/frontend/resource.c
@@ -59,14 +59,14 @@ char *enddata;
 void
 init_rlimits(void)
 {
-#  ifdef HAVE__MEMAVL   // hvogt
+#  ifdef HAVE__MEMAVL   /* hvogt */
     mem_avail = _memavl( );
 #  else
     startdata = (char *) baseaddr( );
     enddata = sbrk(0);
 #  endif
-//    startdata = (char *) baseaddr( );
-//    enddata = sbrk(0);
+/*    startdata = (char *) baseaddr( );
+      enddata = sbrk(0); */
 
 }
 
@@ -208,10 +208,10 @@ printres(char *name)
 #    else
 #      ifdef HAVE_FTIME
 	struct timeb timenow;
-//	int sec, msec; sjb
+/*	int sec, msec; sjb */
 	ftime(&timenow);
 	timediff(&timenow, &timebegin, &total, &totalu);
-//	totalu /= 1000;  hvogt
+/*	totalu /= 1000;  hvogt */
 	cpu_elapsed = "elapsed";
 #      else
 #        define NO_RUDATA
diff --git a/src/frontend/runcoms.c b/src/frontend/runcoms.c
index 7b9d4dfcf..2fb0fd050 100644
--- a/src/frontend/runcoms.c
+++ b/src/frontend/runcoms.c
@@ -2,6 +2,7 @@
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 Modified: 2000 AlansFixes
+$Id$
 **********/
 
 /*
@@ -224,7 +225,7 @@ dosim(char *what, wordlist *wl)
         if (!*wl->wl_word)
 	    rawfileFp = stdout;
 #ifdef __MINGW32__
-// ask if binary or ASCII, open file with w or wb   hvogt 15.3.2000
+/* ask if binary or ASCII, open file with w or wb   hvogt 15.3.2000 */
         else if (ascii) { 
             if(!(rawfileFp = fopen(wl->wl_word, "w"))) {
                 perror(wl->wl_word);
@@ -241,7 +242,7 @@ dosim(char *what, wordlist *wl)
             }
             fprintf(cp_out,"binary raw file\n");
         }
-//-------------------------------------------------------------------------
+/*---------------------------------------------------------------------------*/
 #else	    
         else if (!(rawfileFp = fopen(wl->wl_word, "w"))) {
         	setvbuf(rawfileFp, rawfileBuf, _IOFBF, RAWBUF_SIZE);
diff --git a/src/frontend/variable.h b/src/frontend/variable.h
index 6c8b6ae9a..2b3d3c68f 100644
--- a/src/frontend/variable.h
+++ b/src/frontend/variable.h
@@ -1,3 +1,8 @@
+/*
+  variable.h
+  $Id$
+*/
+
 #ifndef _VARIABLE_H
 #define _VARIABLE_H
 
@@ -44,7 +49,7 @@ extern bool cp_noclobber;
 extern bool cp_ignoreeof;
 extern bool cp_echo;
 
-// extern struct variable *variables;
+/* extern struct variable *variables; */
 wordlist * cp_varwl(struct variable *var);
 void cp_vset(char *varname, char type, char *value);
 struct variable * cp_setparse(wordlist *wl);
@@ -55,4 +60,4 @@ wordlist * vareval(char *string);
 void cp_vprint(void);
 
 
-#endif
+#endif /* _VARIABLE_H */
diff --git a/src/maths/misc/test_accuracy.c b/src/maths/misc/test_accuracy.c
index 659dc9203..8594da5cf 100644
--- a/src/maths/misc/test_accuracy.c
+++ b/src/maths/misc/test_accuracy.c
@@ -1,5 +1,6 @@
 /* Paolo Nenzi 2002 - This program tests some machine
  * dependent variables.
+ * $Id$
  */
 
 /* Nota:
@@ -55,7 +56,7 @@ int main (void)
 	    xhold = xh;
 	}
 	xh = 0.5 * (xl + xu);
-//	if (xhold == xh) break;
+/*	if (xhold == xh) break; */
     }
 printf("xu-xl: %e \t cond: %e \t xh: %e\n", (xu-xl), (2.0 * acc * (xu + xl)), xh);
 
diff --git a/src/maths/misc/test_erfc.c b/src/maths/misc/test_erfc.c
index dda072e84..585d12de7 100644
--- a/src/maths/misc/test_erfc.c
+++ b/src/maths/misc/test_erfc.c
@@ -1,5 +1,6 @@
 /* Paolo Nenzi 2002 - This program tests function
  * implementations.
+ * $Id$
  */
 
 
@@ -87,11 +88,12 @@ int main (void)
  double x = -100.0;
  double y1= 0.0, y2 = 0.0;
  
-// _FPU_GETCW(prec);
-// prec &= ~_FPU_EXTENDED;
-// prec |= _FPU_DOUBLE;
-// _FPU_SETCW(prec);
-
+#if 0
+ _FPU_GETCW(prec);
+ prec &= ~_FPU_EXTENDED;
+ prec |= _FPU_DOUBLE;
+ _FPU_SETCW(prec);
+#endif
 
 for (;(x <= 100.0);)
 {
diff --git a/src/misc/missing_math.c b/src/misc/missing_math.c
index f07378ae6..4aefa8a81 100644
--- a/src/misc/missing_math.c
+++ b/src/misc/missing_math.c
@@ -1,5 +1,6 @@
 /**********
 Copyright 1991 Regents of the University of California.  All rights reserved.
+$Id$
 **********/
 
 /*
@@ -100,7 +101,7 @@ erfc(double  x)
 
 
 #ifndef HAVE_ISNAN
-// isnan (originally) for SOI devices in MINGW32  hvogt (dev.c)
+/* isnan (originally) for SOI devices in MINGW32  hvogt (dev.c) */
 
 union ieee754_double
 {