diff --git a/src/mpi/interface/c/comm_get_name.c b/src/mpi/interface/c/comm_get_name.c
index 8e08a962df..e4afcc1a6a 100644
--- a/src/mpi/interface/c/comm_get_name.c
+++ b/src/mpi/interface/c/comm_get_name.c
@@ -1,11 +1,4 @@
 /*
- * Copyright (c) 2003 The Trustees of Indiana University.  
- *                    All rights reserved.
- * 
- * This file is part of the CMPI software package.  For license
- * information, see the LICENSE file in the top level directory of the
- * CMPI source distribution.
- * 
- * $Id: comm_get_name.c,v 1.1 2003/11/22 16:36:26 jsquyres Exp $
+ * $HEADER$
  */
 
diff --git a/src/mpi/interface/c/comm_set_name.c b/src/mpi/interface/c/comm_set_name.c
index d467107e83..81553d9216 100644
--- a/src/mpi/interface/c/comm_set_name.c
+++ b/src/mpi/interface/c/comm_set_name.c
@@ -1,7 +1,5 @@
 /*
  * $HEADER$
- * 
- * $Id: comm_set_name.c,v 1.4 2004/01/07 08:37:02 jsquyres Exp $
  */
 
 #include <string.h>
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index bf2b414166..23f6703eca 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,13 +1,6 @@
 # -*- makefile -*-
 #
-# Copyright (c) 2003 The Trustees of Indiana University.  
-#                    All rights reserved.
-# 
-# This file is part of the CMPI software package.  For license
-# information, see the LICENSE file in the top level directory of the
-# CMPI source distribution.
-#
-# $Id: Makefile.am,v 1.1 2003/11/22 16:36:58 jsquyres Exp $
+# $HEADER$
 #
 
 include $(top_srcdir)/config/Makefile.options
diff --git a/src/tools/wrappers/Makefile.am b/src/tools/wrappers/Makefile.am
index 97de9305ed..d13b562e2a 100644
--- a/src/tools/wrappers/Makefile.am
+++ b/src/tools/wrappers/Makefile.am
@@ -1,13 +1,6 @@
 # -*- makefile -*-
 #
-# Copyright (c) 2003 The Trustees of Indiana University.  
-#                    All rights reserved.
-# 
-# This file is part of the CMPI software package.  For license
-# information, see the LICENSE file in the top level directory of the
-# CMPI source distribution.
-#
-# $Id: Makefile.am,v 1.1 2003/11/22 16:36:58 jsquyres Exp $
+# $HEADER$
 #
 
 include $(top_srcdir)/config/Makefile.options
diff --git a/test/Makefile.am b/test/Makefile.am
index 4a97e6eba7..2dcb5b4cc6 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,13 +1,6 @@
 # -*- makefile -*-
 #
-# Copyright (c) 2003 The Trustees of Indiana University.  
-#                    All rights reserved.
-# 
-# This file is part of the CMPI software package.  For license
-# information, see the LICENSE file in the top level directory of the
-# CMPI source distribution.
-#
-# $Id: Makefile.am,v 1.1 2003/11/22 16:36:27 jsquyres Exp $
+# $HEADER$
 #
 
 include $(top_srcdir)/config/Makefile.options
diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
index 0547de8e08..7e82785d8a 100644
--- a/test/unit/Makefile.am
+++ b/test/unit/Makefile.am
@@ -1,13 +1,6 @@
 # -*- makefile -*-
 #
-# Copyright (c) 2003 The Trustees of Indiana University.  
-#                    All rights reserved.
-# 
-# This file is part of the CMPI software package.  For license
-# information, see the LICENSE file in the top level directory of the
-# CMPI source distribution.
-#
-# $Id: Makefile.am,v 1.1 2003/11/22 16:36:27 jsquyres Exp $
+# $HEADER$
 #
 
 include $(top_srcdir)/config/Makefile.options
diff --git a/test/unit/mpi/Makefile.am b/test/unit/mpi/Makefile.am
index bf06b55896..4a9fe1eb4f 100644
--- a/test/unit/mpi/Makefile.am
+++ b/test/unit/mpi/Makefile.am
@@ -1,13 +1,6 @@
 # -*- makefile -*-
 #
-# Copyright (c) 2003 The Trustees of Indiana University.  
-#                    All rights reserved.
-# 
-# This file is part of the CMPI software package.  For license
-# information, see the LICENSE file in the top level directory of the
-# CMPI source distribution.
-#
-# $Id: Makefile.am,v 1.1 2003/11/22 16:36:28 jsquyres Exp $
+# $HEADER$
 #
 
 include $(top_srcdir)/config/Makefile.options
diff --git a/test/unit/mpi/communicator/Makefile.am b/test/unit/mpi/communicator/Makefile.am
index 78a8b5b0dc..c1c423086b 100644
--- a/test/unit/mpi/communicator/Makefile.am
+++ b/test/unit/mpi/communicator/Makefile.am
@@ -1,13 +1,6 @@
 # -*- makefile -*-
 #
-# Copyright (c) 2003 The Trustees of Indiana University.  
-#                    All rights reserved.
-# 
-# This file is part of the CMPI software package.  For license
-# information, see the LICENSE file in the top level directory of the
-# CMPI source distribution.
-#
-# $Id: Makefile.am,v 1.1 2003/11/22 16:36:28 jsquyres Exp $
+# $HEADER$
 #
 
 include $(top_srcdir)/config/Makefile.options
diff --git a/test/unit/mpi/datatype/Makefile.am b/test/unit/mpi/datatype/Makefile.am
index 04a992af5e..c1c423086b 100644
--- a/test/unit/mpi/datatype/Makefile.am
+++ b/test/unit/mpi/datatype/Makefile.am
@@ -1,13 +1,6 @@
 # -*- makefile -*-
 #
-# Copyright (c) 2003 The Trustees of Indiana University.  
-#                    All rights reserved.
-# 
-# This file is part of the CMPI software package.  For license
-# information, see the LICENSE file in the top level directory of the
-# CMPI source distribution.
-#
-# $Id: Makefile.am,v 1.1 2003/11/22 16:36:29 jsquyres Exp $
+# $HEADER$
 #
 
 include $(top_srcdir)/config/Makefile.options