diff --git a/src/ca/V5_vxWorks_patch.c b/src/ca/V5_vxWorks_patch.c
index 3c0bd7ac9..78b768167 100644
--- a/src/ca/V5_vxWorks_patch.c
+++ b/src/ca/V5_vxWorks_patch.c
@@ -1,5 +1,5 @@
 
-static char *sccsId = "@(#)V5_vxWorks_patch.c	1.2\t7/27/92";
+static char *sccsId = "$Id$";
 
 #include <taskLib.h>
 #include <taskVarLib.h>
diff --git a/src/ca/caRepeater.c b/src/ca/caRepeater.c
index 16d4476ad..55acfb034 100644
--- a/src/ca/caRepeater.c
+++ b/src/ca/caRepeater.c
@@ -1,4 +1,5 @@
 /*
+ * $Id$
  * caRepeater.c
  * share/src/ca/caRepeater.c
  *
diff --git a/src/ca/conn.c b/src/ca/conn.c
index 697dffa04..0dc2ccc5d 100644
--- a/src/ca/conn.c
+++ b/src/ca/conn.c
@@ -39,7 +39,7 @@
 /************************************************************************/
 /*_end									*/
 
-static char     *sccsId = "$Id$";
+static char 	*sccsId = "$Id$";
 
 #include 	"iocinf.h"
 
diff --git a/src/ca/convert.c b/src/ca/convert.c
index d717c2e2e..6df7d5ff9 100644
--- a/src/ca/convert.c
+++ b/src/ca/convert.c
@@ -27,7 +27,7 @@
  *
  */
 
-static char     *sccsId = "$Id$";
+static char	*sccsId = "$Id$";
 
 #include	<string.h>
 
diff --git a/src/ca/evtime.c b/src/ca/evtime.c
index e9fe4bf01..f058b596e 100644
--- a/src/ca/evtime.c
+++ b/src/ca/evtime.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 #include <cadef.h>
 #include <dbDefs.h>
diff --git a/src/ca/flow_control.c b/src/ca/flow_control.c
index 1c4872a72..b99732f26 100644
--- a/src/ca/flow_control.c
+++ b/src/ca/flow_control.c
@@ -33,7 +33,7 @@
 /************************************************************************/
 /*_end									*/
 
-static char     *sccsId = "$Id$";
+static char	*sccsId = "$Id$";
 
 #include		"iocinf.h"
 
diff --git a/src/ca/gsd_sync_subr.c b/src/ca/gsd_sync_subr.c
index 5cb327408..a5e49230e 100644
--- a/src/ca/gsd_sync_subr.c
+++ b/src/ca/gsd_sync_subr.c
@@ -81,7 +81,7 @@
 ***************************************************
 */
 
-static char *sccsId = "@(#)gsd_sync_subr.c	1.8\t11/5/92";
+static char *sccsId = "$Id$";
 
 #if defined(UNIX)
 #	include	<sys/types.h>
diff --git a/src/ca/if_depen.c b/src/ca/if_depen.c
index 64271caf2..72a47e0f2 100644
--- a/src/ca/if_depen.c
+++ b/src/ca/if_depen.c
@@ -35,7 +35,7 @@
  */
 
 
-static char	*sccsId = "%W% %G%";
+static char	*sccsId = "$Id$";
 
 
 #include "iocinf.h"
diff --git a/src/ca/iocinf.h b/src/ca/iocinf.h
index 364c96665..ad69b652c 100644
--- a/src/ca/iocinf.h
+++ b/src/ca/iocinf.h
@@ -53,7 +53,7 @@
 #ifndef INCiocinfh  
 #define INCiocinfh
 
-static char     *iocinfhSccsId = "$Id$";
+static char	*iocinfhSccsId = "$Id$";
 
 /*
  * ANSI C includes
diff --git a/src/ca/iocmsg.h b/src/ca/iocmsg.h
index b01a251b6..464d87d2d 100644
--- a/src/ca/iocmsg.h
+++ b/src/ca/iocmsg.h
@@ -23,7 +23,7 @@
 
 #define __IOCMSG__
 
-static char     *iocmsghSccsId = "$Id$ CA version 4.3";
+static char	*iocmsghSccsId = "$Id$ CA version 4.3";
 
 /* TCP/UDP port number (bumped each protocol change) */
 #define CA_PROTOCOL_VERSION	4
diff --git a/src/ca/posix_depen.c b/src/ca/posix_depen.c
index b7a685dba..7c66e69ce 100644
--- a/src/ca/posix_depen.c
+++ b/src/ca/posix_depen.c
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ *	$Id$ 
  *      Author: Jeffrey O. Hill
  *              hill@luke.lanl.gov
  *              (505) 665 1831
diff --git a/src/ca/repeater.c b/src/ca/repeater.c
index 01711cda9..af4bb9d8a 100644
--- a/src/ca/repeater.c
+++ b/src/ca/repeater.c
@@ -1,5 +1,5 @@
 /*
- * REPEATER.C
+ * $Id$
  *
  * CA broadcast repeater
  *