diff --git a/acinclude.m4 b/acinclude.m4
index 9d825ed332..87393a70e7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2,8 +2,6 @@ dnl -*- shell-script -*-
 dnl
 dnl $HEADER$
 dnl
-dnl $Id: acinclude.m4,v 1.3 2004/01/07 07:49:52 jsquyres Exp $
-dnl
 
 #
 # LAM/MPI-specific tests
diff --git a/config/Makefile.am b/config/Makefile.am
index 9a411f0073..766a510de7 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -2,8 +2,6 @@
 #
 # $HEADER$
 #
-# $Id: Makefile.am,v 1.2 2004/01/07 07:44:54 jsquyres Exp $
-#
 
 include $(top_srcdir)/config/Makefile.options
 
diff --git a/config/Makefile.options b/config/Makefile.options
index 56ee5afa48..a0eac3cc92 100644
--- a/config/Makefile.options
+++ b/config/Makefile.options
@@ -2,7 +2,5 @@
 #
 # $HEADER$
 #
-# $Id: Makefile.options,v 1.2 2004/01/07 07:45:59 jsquyres Exp $
-#
 
 AUTOMAKE_OPTIONS	= foreign dist-bzip2
diff --git a/config/cxx_find_template_parameters.m4 b/config/cxx_find_template_parameters.m4
index 96b9a27480..986da07df1 100644
--- a/config/cxx_find_template_parameters.m4
+++ b/config/cxx_find_template_parameters.m4
@@ -2,8 +2,6 @@ dnl -*- shell-script -*-
 dnl
 dnl $HEADER$
 dnl
-dnl $Id: cxx_find_template_parameters.m4,v 1.1 2004/01/07 07:40:48 jsquyres Exp $
-dnl
 
 define(LAM_CXX_FIND_TEMPLATE_PARAMETERS,[
 #
diff --git a/config/cxx_find_template_repository.m4 b/config/cxx_find_template_repository.m4
index f35d201709..fbe9af232c 100644
--- a/config/cxx_find_template_repository.m4
+++ b/config/cxx_find_template_repository.m4
@@ -2,8 +2,6 @@ dnl -*- shell-script -*-
 dnl
 dnl $HEADER$
 dnl
-dnl $Id: cxx_find_template_repository.m4,v 1.1 2004/01/07 07:39:52 jsquyres Exp $
-dnl
 
 define([LAM_CXX_FIND_TEMPLATE_REPOSITORY],[
 #
diff --git a/config/lam_check_optflags.m4 b/config/lam_check_optflags.m4
index 37b7943a8b..dacc254d09 100644
--- a/config/lam_check_optflags.m4
+++ b/config/lam_check_optflags.m4
@@ -2,8 +2,6 @@ dnl -*- shell-script -*-
 dnl
 dnl $HEADER$
 dnl
-dnl $Id: lam_check_optflags.m4,v 1.1 2004/01/07 07:41:42 jsquyres Exp $
-dnl
 
 AC_DEFUN(LAM_CHECK_OPTFLAGS,[
 
diff --git a/config/lam_configure_options.m4 b/config/lam_configure_options.m4
index eb8c7f22dd..0bfb22af16 100644
--- a/config/lam_configure_options.m4
+++ b/config/lam_configure_options.m4
@@ -2,8 +2,6 @@ dnl -*- shell-script -*-
 dnl
 dnl $HEADER$
 dnl
-dnl $Id: lam_configure_options.m4,v 1.2 2004/01/07 08:31:32 jsquyres Exp $
-dnl
 
 AC_DEFUN(LAM_CONFIGURE_OPTIONS,[
 lam_show_subtitle "Configuration options"
diff --git a/config/lam_functions.m4 b/config/lam_functions.m4
index ae4ca3144b..8825f045c4 100644
--- a/config/lam_functions.m4
+++ b/config/lam_functions.m4
@@ -2,8 +2,6 @@ dnl -*- shell-script -*-
 dnl
 dnl $HEADER$
 dnl
-dnl $Id: lam_functions.m4,v 1.2 2004/01/07 07:46:37 jsquyres Exp $
-dnl
 
 AC_DEFUN(LAM_CONFIGURE_SETUP,[
 
diff --git a/config/lam_get_version.m4 b/config/lam_get_version.m4
index baeb0e1ed1..f2f8b99903 100644
--- a/config/lam_get_version.m4
+++ b/config/lam_get_version.m4
@@ -2,8 +2,6 @@ dnl -*- shell-script -*-
 dnl
 dnl $HEADER$
 dnl
-dnl $Id: lam_get_version.m4,v 1.2 2004/01/07 07:47:13 jsquyres Exp $
-dnl
 
 AC_DEFUN(LAM_GET_VERSION,[
 gv_glv_dir="$1"
diff --git a/config/lam_get_version.sh b/config/lam_get_version.sh
index 44f7ed4019..a04aca652b 100755
--- a/config/lam_get_version.sh
+++ b/config/lam_get_version.sh
@@ -2,8 +2,6 @@
 #
 # $HEADER$
 #
-# $Id: lam_get_version.sh,v 1.2 2004/01/07 07:47:13 jsquyres Exp $
-#
 # Since we do this in multiple places, it's worth putting in a
 # separate shell script.  Very primitive script to get the version
 # number of LAM into a coherent variable.  Can query for any of the
diff --git a/config/lam_setup_cc.m4 b/config/lam_setup_cc.m4
index 3cc0d04bb6..5fdb83eb8d 100644
--- a/config/lam_setup_cc.m4
+++ b/config/lam_setup_cc.m4
@@ -2,8 +2,6 @@ dnl -*- shell-script -*-
 dnl
 dnl $HEADER$
 dnl
-dnl $Id: lam_setup_cc.m4,v 1.2 2004/01/07 08:31:09 jsquyres Exp $
-dnl
 
 AC_DEFUN(LAM_SETUP_CC,[
 
diff --git a/config/lam_setup_cxx.m4 b/config/lam_setup_cxx.m4
index 0c8d556027..4062860616 100644
--- a/config/lam_setup_cxx.m4
+++ b/config/lam_setup_cxx.m4
@@ -2,8 +2,6 @@ dnl -*- shell-script -*-
 dnl
 dnl $HEADER$
 dnl
-dnl $Id: lam_setup_cxx.m4,v 1.1 2004/01/07 07:43:28 jsquyres Exp $
-dnl
 
 AC_DEFUN(LAM_SETUP_CXX,[
 
diff --git a/src/include/mpi.h b/src/include/mpi.h
index e20a0209c1..383f69b0a0 100644
--- a/src/include/mpi.h
+++ b/src/include/mpi.h
@@ -1,7 +1,5 @@
 /*
  * $HEADER$
- * 
- * $Id: mpi.h,v 1.5 2004/01/07 08:32:16 jsquyres Exp $
  */
 
 #ifndef LAM_MPI_H