diff --git a/src/H5.c b/src/H5.c
index cd9c6b927d..5bcb5dff4e 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -10,10 +10,6 @@
  *                                                                          *
  ****************************************************************************/
 
-#ifdef RCSID
-static char             RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 /* private headers */
diff --git a/src/H5A.c b/src/H5A.c
index 65443aacd5..1d63594f9b 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -10,10 +10,6 @@
 *									    *
 ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "$Revision$";
-#endif
-
 /* $Id$ */
 
 #define H5A_PACKAGE		/*suppress error about including H5Apkg	*/
diff --git a/src/H5D.c b/src/H5D.c
index 15f2f54cb1..c6b3e3bf6b 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -10,10 +10,6 @@
 *                                                                           *
 ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 #include <H5private.h>		/* Generic Functions			*/
diff --git a/src/H5F.c b/src/H5F.c
index 8767e6b299..62c16e8386 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -14,10 +14,6 @@
 *
 ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 #define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
diff --git a/src/H5I.c b/src/H5I.c
index 817b2735d3..79a21b0d02 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -10,10 +10,6 @@
  *									    *
  ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 /*
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index 7ffd804f56..65cb4bfff2 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -10,10 +10,6 @@
 *                                                                          *
 ****************************************************************************/
 
-#ifdef RCSID
-static char             RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 #define H5A_PACKAGE         /*prevent warning from including H5Tpkg.h */
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index d5b7618e81..398e5cb224 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -10,10 +10,6 @@
 *									   *
 ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 #define H5T_PACKAGE		/*prevent warning from including H5Tpkg.h */
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c
index a2829ef2d6..8dab9842a3 100644
--- a/src/H5Osdspace.c
+++ b/src/H5Osdspace.c
@@ -10,10 +10,6 @@
 *									   *
 ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 #define H5S_PACKAGE		/*prevent warning from including H5Spkg.h */
diff --git a/src/H5P.c b/src/H5P.c
index 61b4bfdedf..aa23d1e70f 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -10,10 +10,6 @@
 *									                                        *
 ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 /* Private header files */
diff --git a/src/H5R.c b/src/H5R.c
index cd283311d9..495eb32595 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -10,10 +10,6 @@
 *									   *
 ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 #define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
diff --git a/src/H5S.c b/src/H5S.c
index 04b49137cc..e0213a4ac1 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -10,10 +10,6 @@
 *									   *
 ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 #define H5S_PACKAGE		/*suppress error about including H5Spkg	  */
diff --git a/src/H5T.c b/src/H5T.c
index a3d8710d39..201141c731 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -5,9 +5,6 @@
  * Programmer:	Robb Matzke <matzke@llnl.gov>
  *		Tuesday, March 31, 1998
  */
-#ifdef RCSID
-static char		RcsId[] = "@(#)$Revision$";
-#endif
 
 #define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
 
diff --git a/src/H5TB.c b/src/H5TB.c
index 67591a0dcb..fb0eeded9f 100644
--- a/src/H5TB.c
+++ b/src/H5TB.c
@@ -56,10 +56,6 @@
  * void H5TB_free( ITM ***root, void (*df)(ITM *), void (*kf)(void *) );
  */
 
-#ifdef RCSID
-static char RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 #include <H5private.h>		/*library		  */
diff --git a/src/H5TS.c b/src/H5TS.c
index dcf018fc34..7b6af3b466 100644
--- a/src/H5TS.c
+++ b/src/H5TS.c
@@ -10,10 +10,6 @@
  *                                                                          *
  ****************************************************************************/
 
-#ifdef RCSID
-static char             RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 /* private headers */
diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c
index f454b0acb2..133253e8ab 100644
--- a/src/H5Tvlen.c
+++ b/src/H5Tvlen.c
@@ -10,10 +10,6 @@
 *                                                                           *
 ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 #define H5T_PACKAGE		/*suppress error about including H5Tpkg	     */
diff --git a/src/H5public.h b/src/H5public.h
index 4793006f47..fe2d54f489 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -10,10 +10,6 @@
  *                                                                          *
  ****************************************************************************/
 
-#ifdef RCSID
-static char             RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 
diff --git a/test/tarray.c b/test/tarray.c
index ebb5ff848c..34047c578c 100644
--- a/test/tarray.c
+++ b/test/tarray.c
@@ -10,10 +10,6 @@
  *									                                        *
  ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "$Revision$";
-#endif
-
 /* $Id$ */
 
 /***********************************************************
diff --git a/test/tattr.c b/test/tattr.c
index 4747c7463e..7bef8df46f 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -10,10 +10,6 @@
  *									                                        *
  ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "$Revision$";
-#endif
-
 /* $Id$ */
 
 /***********************************************************
diff --git a/test/testhdf5.c b/test/testhdf5.c
index e2060469b6..83d42c44e6 100644
--- a/test/testhdf5.c
+++ b/test/testhdf5.c
@@ -10,10 +10,6 @@
  *                                                                          *
  ****************************************************************************/
 
-#ifdef RCSID
-static char             RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 /*
diff --git a/test/tfile.c b/test/tfile.c
index b158fb5bd2..c9be023b50 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -10,10 +10,6 @@
  *									    *
  ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "$Revision$";
-#endif
-
 /* $Id$ */
 
 /***********************************************************
diff --git a/test/tgenprop.c b/test/tgenprop.c
index a70ac063c6..8789fc5eea 100644
--- a/test/tgenprop.c
+++ b/test/tgenprop.c
@@ -10,10 +10,6 @@
  *									                                        *
  ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "$Revision$";
-#endif
-
 /* $Id$ */
 
 /***********************************************************
diff --git a/test/th5s.c b/test/th5s.c
index 8d25978bd2..a6052e27d4 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -10,10 +10,6 @@
  *									    *
  ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "$Revision$";
-#endif
-
 /* $Id$ */
 
 /***********************************************************
diff --git a/test/titerate.c b/test/titerate.c
index 5e560010b8..b067b88acf 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -10,10 +10,6 @@
  *									                                        *
  ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "$Revision$";
-#endif
-
 /* $Id$ */
 
 /***********************************************************
diff --git a/test/tmeta.c b/test/tmeta.c
index ade015a248..8b4c161ad9 100644
--- a/test/tmeta.c
+++ b/test/tmeta.c
@@ -10,10 +10,6 @@
  *                                                                          *
  ****************************************************************************/
 
-#ifdef RCSID
-static char             RcsId[] = "$Revision$";
-#endif
-
 /* $Id$ */
 
 /***********************************************************
diff --git a/test/trefer.c b/test/trefer.c
index 9935b5b72b..a010302ed0 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -10,10 +10,6 @@
  *									                                        *
  ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "$Revision$";
-#endif
-
 /* $Id$ */
 
 /***********************************************************
diff --git a/test/tselect.c b/test/tselect.c
index b108b5c50b..1f9c329eae 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -10,10 +10,6 @@
  *									                                        *
  ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "$Revision$";
-#endif
-
 /* $Id$ */
 
 /***********************************************************
diff --git a/test/ttbbt.c b/test/ttbbt.c
index b839b6fd2d..364f117dca 100644
--- a/test/ttbbt.c
+++ b/test/ttbbt.c
@@ -10,10 +10,6 @@
  *                                                                          *
  ****************************************************************************/
 
-#ifdef RCSID
-static char RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 /*
diff --git a/test/ttime.c b/test/ttime.c
index 2ff5426700..8ce2cc9a6d 100644
--- a/test/ttime.c
+++ b/test/ttime.c
@@ -10,10 +10,6 @@
  *									                                        *
  ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "$Revision$";
-#endif
-
 /* $Id$ */
 
 /***********************************************************
diff --git a/test/ttsafe.c b/test/ttsafe.c
index 692032148d..663872bc8f 100644
--- a/test/ttsafe.c
+++ b/test/ttsafe.c
@@ -10,10 +10,6 @@
  *                                                                          *
  ****************************************************************************/
 
-#ifdef RCSID
-static char             RcsId[] = "@(#)$Revision$";
-#endif
-
 /* $Id$ */
 
 /*
diff --git a/test/tvlstr.c b/test/tvlstr.c
index ee3867c2eb..bab43657a6 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -10,10 +10,6 @@
  *									                                        *
  ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "$Revision$";
-#endif
-
 /* $Id$ */
 
 /***********************************************************
diff --git a/test/tvltypes.c b/test/tvltypes.c
index ea4d481bbe..1738bf4576 100644
--- a/test/tvltypes.c
+++ b/test/tvltypes.c
@@ -10,10 +10,6 @@
  *									                                        *
  ****************************************************************************/
 
-#ifdef RCSID
-static char		RcsId[] = "$Revision$";
-#endif
-
 /* $Id$ */
 
 /***********************************************************