diff --git a/Doxyfile b/Doxyfile
index b6354ae379..bbb70eecba 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,4 +1,7 @@
 # Doxyfile 1.3.4
+#
+# $HEADER$
+#
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
diff --git a/HACKING b/HACKING
index 7dc4048113..041d782992 100644
--- a/HACKING
+++ b/HACKING
@@ -1,3 +1,5 @@
+$HEADER$
+
 Overview
 ========
 
diff --git a/INSTALL b/INSTALL
index d87ae93dd0..5da7b1fae2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,3 +1,5 @@
+$HEADER$
+
 If you have checked out a DEVELOPER'S COPY of Open MPI (i.e., you
 checked out from subversion), you must first run:
 
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000..c56f531643
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,6 @@
+$HEADER$
+
+This is a placeholder for what will eventually be the license text for
+Open MPI.  It will likely be based off the modified BSD license:
+
+    http://www.opensource.org/licenses/bsd-license.php
diff --git a/README b/README
index 124f1b0fb5..f1e79cc614 100644
--- a/README
+++ b/README
@@ -1,3 +1,5 @@
+$HEADER$
+
 This is the world's greatest MPI.
 
 ...more to write here
diff --git a/config/ompi_get_libtool_linker_flags.m4 b/config/ompi_get_libtool_linker_flags.m4
index 329fdb6f53..5a4c00e4e7 100644
--- a/config/ompi_get_libtool_linker_flags.m4
+++ b/config/ompi_get_libtool_linker_flags.m4
@@ -1,6 +1,6 @@
 dnl -*- shell-script -*-
 dnl
-dnl $HEADER
+dnl $HEADER$
 denl
 
 AC_DEFUN([OMPI_CHECK_LINKER_FLAGS],[
diff --git a/contrib/code_counter.pl b/contrib/code_counter.pl
index 4c01eb2e1d..4929b7ebea 100755
--- a/contrib/code_counter.pl
+++ b/contrib/code_counter.pl
@@ -1,5 +1,7 @@
 #!/usr/bin/env perl
 #
+# $HEADER$
+#
 # Primitive script to give approximate code counts in the Open MPI tree
 #
 
diff --git a/contrib/find_occurence.pl b/contrib/find_occurence.pl
index d3b11fa459..760372e61b 100755
--- a/contrib/find_occurence.pl
+++ b/contrib/find_occurence.pl
@@ -1,4 +1,7 @@
 #!/usr/bin/perl
+#
+# $HEADER$
+#
 
 if (scalar(@ARGV) != 2) {
     print "Usage: #find_occurence <string> <source-path>\n";
diff --git a/contrib/find_offenders.pl b/contrib/find_offenders.pl
index 315c3ffbd8..48a2a434cd 100755
--- a/contrib/find_offenders.pl
+++ b/contrib/find_offenders.pl
@@ -1,4 +1,7 @@
 #!/usr/bin/perl
+#
+# $HEADER$
+#
 
 if (scalar(@ARGV) != 2) {
     print "Usage:
diff --git a/contrib/fix_headers.pl b/contrib/fix_headers.pl
index ffd3d8b73a..542c94a73e 100755
--- a/contrib/fix_headers.pl
+++ b/contrib/fix_headers.pl
@@ -1,4 +1,7 @@
 #!/usr/bin/perl
+#
+# $HEADER$
+#
 
 if (scalar(@ARGV) != 1) {
     print "Usage:
diff --git a/contrib/fix_indent.pl b/contrib/fix_indent.pl
index a9f416366d..ccf01ae00f 100755
--- a/contrib/fix_indent.pl
+++ b/contrib/fix_indent.pl
@@ -1,4 +1,7 @@
 #!/usr/bin/perl
+#
+# $HEADER$
+#
 #To keep brian happy
 
 if (scalar(@ARGV) != 1) {
diff --git a/contrib/generate_file_list.pl b/contrib/generate_file_list.pl
index aebdeb87ef..ef159b1328 100755
--- a/contrib/generate_file_list.pl
+++ b/contrib/generate_file_list.pl
@@ -1,4 +1,7 @@
 #!/usr/bin/perl
+#
+# $HEADER$
+#
 
 if (scalar(@ARGV) != 1) {
     print "Usage: generate_file_list <diff file>\n";
diff --git a/contrib/submit_test.pl b/contrib/submit_test.pl
index c0a1e04756..e98ec73675 100755
--- a/contrib/submit_test.pl
+++ b/contrib/submit_test.pl
@@ -1,4 +1,7 @@
 #!/usr/bin/env perl
+#
+# $HEADER$
+#
 
 use strict;
 use Data::Dumper;
diff --git a/contrib/test_headers_in_ompi.pl b/contrib/test_headers_in_ompi.pl
index edf0f6d5ef..7e01b97d88 100755
--- a/contrib/test_headers_in_ompi.pl
+++ b/contrib/test_headers_in_ompi.pl
@@ -1,4 +1,7 @@
 #!/usr/bin/perl
+#
+# $HEADER$
+#
 
 #this is the perl scripty foo which does the following tasks
 # 1. Extract the #include <*.h> files which are present in both header and source files
diff --git a/src/README.dox b/src/README.dox
index 42d0ab0c65..d2821c8e29 100644
--- a/src/README.dox
+++ b/src/README.dox
@@ -1,3 +1,6 @@
+/*
+ * $HEADER$
+ */
 /** @mainpage
 
 @section mainpage_introduction Introduction
diff --git a/src/datatype/datatype.h b/src/datatype/datatype.h
index c62a73ca8e..9b4987e28e 100644
--- a/src/datatype/datatype.h
+++ b/src/datatype/datatype.h
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 /**
  * ompi_datatype_t interface for OMPI internal data type representation
diff --git a/src/datatype/datatype_internal.h b/src/datatype/datatype_internal.h
index 1aab121989..25b1150cc3 100644
--- a/src/datatype/datatype_internal.h
+++ b/src/datatype/datatype_internal.h
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #ifndef DATATYPE_INTERNAL_H_HAS_BEEN_INCLUDED
 #define DATATYPE_INTERNAL_H_HAS_BEEN_INCLUDED
diff --git a/src/datatype/ddt_test.c b/src/datatype/ddt_test.c
index aa485ce43d..0e2fc58251 100644
--- a/src/datatype/ddt_test.c
+++ b/src/datatype/ddt_test.c
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include "datatype.h"
diff --git a/src/datatype/dt_add.c b/src/datatype/dt_add.c
index 270b8df3a0..4a05115748 100644
--- a/src/datatype/dt_add.c
+++ b/src/datatype/dt_add.c
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include "datatype.h"
diff --git a/src/datatype/dt_create.c b/src/datatype/dt_create.c
index 48e9867b78..60fa2d75fb 100644
--- a/src/datatype/dt_create.c
+++ b/src/datatype/dt_create.c
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include "datatype.h"
diff --git a/src/datatype/dt_create_array.c b/src/datatype/dt_create_array.c
index 61c9ebb0ed..ba79a98c9e 100644
--- a/src/datatype/dt_create_array.c
+++ b/src/datatype/dt_create_array.c
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include "datatype.h"
diff --git a/src/datatype/dt_create_dup.c b/src/datatype/dt_create_dup.c
index edbd3f6299..5bff124e52 100644
--- a/src/datatype/dt_create_dup.c
+++ b/src/datatype/dt_create_dup.c
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include "datatype.h"
diff --git a/src/datatype/dt_create_indexed.c b/src/datatype/dt_create_indexed.c
index 98b93d7cdf..06351e6c64 100644
--- a/src/datatype/dt_create_indexed.c
+++ b/src/datatype/dt_create_indexed.c
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include "datatype.h"
diff --git a/src/datatype/dt_create_struct.c b/src/datatype/dt_create_struct.c
index eace4b57dc..373db472b4 100644
--- a/src/datatype/dt_create_struct.c
+++ b/src/datatype/dt_create_struct.c
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include "datatype.h"
diff --git a/src/datatype/dt_create_vector.c b/src/datatype/dt_create_vector.c
index 4966a9d8e7..b15ed8bc35 100644
--- a/src/datatype/dt_create_vector.c
+++ b/src/datatype/dt_create_vector.c
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include "datatype.h"
diff --git a/src/datatype/dt_destroy.c b/src/datatype/dt_destroy.c
index 42acd1b581..1df0f7f65f 100644
--- a/src/datatype/dt_destroy.c
+++ b/src/datatype/dt_destroy.c
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include "datatype.h"
diff --git a/src/datatype/dt_module.c b/src/datatype/dt_module.c
index b59c0f8b9a..b87273d4c1 100644
--- a/src/datatype/dt_module.c
+++ b/src/datatype/dt_module.c
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include "datatype.h"
diff --git a/src/datatype/dt_optimize.c b/src/datatype/dt_optimize.c
index 9e5c4a61c0..28eacf63a7 100644
--- a/src/datatype/dt_optimize.c
+++ b/src/datatype/dt_optimize.c
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 
diff --git a/src/datatype/dt_pack.c b/src/datatype/dt_pack.c
index 1b888d0511..221183cd41 100644
--- a/src/datatype/dt_pack.c
+++ b/src/datatype/dt_pack.c
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 
diff --git a/src/datatype/dt_unpack.c b/src/datatype/dt_unpack.c
index 1b4711a72e..460ca5c609 100644
--- a/src/datatype/dt_unpack.c
+++ b/src/datatype/dt_unpack.c
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include "datatype.h"
diff --git a/src/datatype/fake_stack.c b/src/datatype/fake_stack.c
index 633233e2a3..daaf3e6b89 100644
--- a/src/datatype/fake_stack.c
+++ b/src/datatype/fake_stack.c
@@ -1,4 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 
diff --git a/src/event/Makefile.am b/src/event/Makefile.am
index 4a19cb40f6..f5c3cc3d53 100644
--- a/src/event/Makefile.am
+++ b/src/event/Makefile.am
@@ -1,3 +1,7 @@
+#
+# $HEADER$
+#
+
 include $(top_srcdir)/config/Makefile.options
 
 # OMPI Get the dirs where ompi_config.h and ompi_config_bottom.h live.
diff --git a/src/include/sys/alpha/update.sh b/src/include/sys/alpha/update.sh
index 4ccba131af..e3530e8397 100644
--- a/src/include/sys/alpha/update.sh
+++ b/src/include/sys/alpha/update.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# $HEADER$
+#
 
 CFILE=/tmp/ompi_atomic_$$.c
 
diff --git a/src/include/sys/amd64/update.sh b/src/include/sys/amd64/update.sh
index 4ccba131af..e3530e8397 100644
--- a/src/include/sys/amd64/update.sh
+++ b/src/include/sys/amd64/update.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# $HEADER$
+#
 
 CFILE=/tmp/ompi_atomic_$$.c
 
diff --git a/src/include/sys/ia32/atomic.s b/src/include/sys/ia32/atomic.s
index c7c7d83843..0815872d1b 100644
--- a/src/include/sys/ia32/atomic.s
+++ b/src/include/sys/ia32/atomic.s
@@ -1,3 +1,6 @@
+;; 
+;; $HEADER$
+;; 
 	.file	"atomic.c"
 	.text
 .globl ompi_atomic_mb
diff --git a/src/include/sys/ia32/update.sh b/src/include/sys/ia32/update.sh
index 4ccba131af..e3530e8397 100644
--- a/src/include/sys/ia32/update.sh
+++ b/src/include/sys/ia32/update.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# $HEADER$
+#
 
 CFILE=/tmp/ompi_atomic_$$.c
 
diff --git a/src/include/sys/ia64/update.sh b/src/include/sys/ia64/update.sh
index 4ccba131af..e3530e8397 100644
--- a/src/include/sys/ia64/update.sh
+++ b/src/include/sys/ia64/update.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# $HEADER$
+#
 
 CFILE=/tmp/ompi_atomic_$$.c
 
diff --git a/src/include/sys/powerpc/atomic.s b/src/include/sys/powerpc/atomic.s
index da212710ed..382a083883 100644
--- a/src/include/sys/powerpc/atomic.s
+++ b/src/include/sys/powerpc/atomic.s
@@ -1,3 +1,6 @@
+;; 
+;; $HEADER$
+;; 
 	.section __TEXT,__text,regular,pure_instructions
 	.section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32
 .section __TEXT,__text,regular,pure_instructions
diff --git a/src/include/sys/powerpc/update.sh b/src/include/sys/powerpc/update.sh
index 4ccba131af..e3530e8397 100644
--- a/src/include/sys/powerpc/update.sh
+++ b/src/include/sys/powerpc/update.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# $HEADER$
+#
 
 CFILE=/tmp/ompi_atomic_$$.c
 
diff --git a/src/include/sys/sparc64/atomic.s b/src/include/sys/sparc64/atomic.s
index 409ea15244..e7ac931fe0 100644
--- a/src/include/sys/sparc64/atomic.s
+++ b/src/include/sys/sparc64/atomic.s
@@ -1,3 +1,6 @@
+;; 
+;; $HEADER$
+;; 
 	.file	"atomic.c"
 gcc2_compiled.:
 .section	".text"
diff --git a/src/include/sys/sparc64/update.sh b/src/include/sys/sparc64/update.sh
index 4ccba131af..e3530e8397 100644
--- a/src/include/sys/sparc64/update.sh
+++ b/src/include/sys/sparc64/update.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# $HEADER$
+#
 
 CFILE=/tmp/ompi_atomic_$$.c
 
diff --git a/src/mca/allocator/basic/allocator_basic.c b/src/mca/allocator/basic/allocator_basic.c
index d5fb8ce8a6..7c46ae0eaa 100644
--- a/src/mca/allocator/basic/allocator_basic.c
+++ b/src/mca/allocator/basic/allocator_basic.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "util/output.h"
 #include "allocator_basic.h"
diff --git a/src/mca/allocator/bucket/allocator_bucket.c b/src/mca/allocator/bucket/allocator_bucket.c
index 2b79b5f1d0..a5b6f13467 100644
--- a/src/mca/allocator/bucket/allocator_bucket.c
+++ b/src/mca/allocator/bucket/allocator_bucket.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "mca/allocator/allocator.h"
 #include "include/constants.h"
diff --git a/src/mca/base/mca_base_parse_paramfile_lex.l b/src/mca/base/mca_base_parse_paramfile_lex.l
index 76391e24a6..9b07f70c23 100644
--- a/src/mca/base/mca_base_parse_paramfile_lex.l
+++ b/src/mca/base/mca_base_parse_paramfile_lex.l
@@ -1,4 +1,8 @@
 %{ /* -*- C -*- */
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 
 #include <stdio.h>
diff --git a/src/mca/coll/demo/configure.stub b/src/mca/coll/demo/configure.stub
index 69ac8bec1c..7d870c1272 100644
--- a/src/mca/coll/demo/configure.stub
+++ b/src/mca/coll/demo/configure.stub
@@ -1,4 +1,6 @@
 #
+# $HEADER$
+#
 # Don't really need anything in here -- we just want a configure
 # script so that this can be a standalone component.
 #
diff --git a/src/mca/coll/sm/coll_sm.h b/src/mca/coll/sm/coll_sm.h
index 3d775fe7fa..06a2af61e6 100644
--- a/src/mca/coll/sm/coll_sm.h
+++ b/src/mca/coll/sm/coll_sm.h
@@ -1,5 +1,5 @@
 /* 
- * $HEADER 
+ * $HEADER$
  */
 
 #ifndef MCA_COLL_SM_EXPORT_H
diff --git a/src/mca/common/sm/common_sm_mmap.c b/src/mca/common/sm/common_sm_mmap.c
index 3c55e69a69..020ddf5842 100644
--- a/src/mca/common/sm/common_sm_mmap.c
+++ b/src/mca/common/sm/common_sm_mmap.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include <errno.h>
 #ifdef HAVE_UNISTD_H
diff --git a/src/mca/common/sm/common_sm_mmap.h b/src/mca/common/sm/common_sm_mmap.h
index 2a814aaa18..c7c01d7f50 100644
--- a/src/mca/common/sm/common_sm_mmap.h
+++ b/src/mca/common/sm/common_sm_mmap.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #ifndef _COMMON_SM_MMAP_H_
 #define _COMMON_SM_MMAP_H_
 
diff --git a/src/mca/io/io.h b/src/mca/io/io.h
index b8571bb81b..35a75a5a9d 100644
--- a/src/mca/io/io.h
+++ b/src/mca/io/io.h
@@ -1,5 +1,5 @@
 /*
- * $HEADER
+ * $HEADER$
  */
 
 #ifndef MCA_IO_H
diff --git a/src/mca/io/romio/src/io_romio.h b/src/mca/io/romio/src/io_romio.h
index 73f07c835f..7f8c14e4e3 100644
--- a/src/mca/io/romio/src/io_romio.h
+++ b/src/mca/io/romio/src/io_romio.h
@@ -1,5 +1,5 @@
 /*
- * $HEADER
+ * $HEADER$
  */
 
 #ifndef MCA_IO_ROMIO_H
diff --git a/src/mca/io/romio/src/io_romio_module.c b/src/mca/io/romio/src/io_romio_module.c
index 2dd1a9ad7d..601b50d992 100644
--- a/src/mca/io/romio/src/io_romio_module.c
+++ b/src/mca/io/romio/src/io_romio_module.c
@@ -1,5 +1,5 @@
 /*
- * $HEADER
+ * $HEADER$
  */
 #include "ompi_config.h"
 
diff --git a/src/mca/llm/base/llm_base_parse_hostfile_lex.h b/src/mca/llm/base/llm_base_parse_hostfile_lex.h
index 80fa8fe4e6..7fdd84b3b7 100644
--- a/src/mca/llm/base/llm_base_parse_hostfile_lex.h
+++ b/src/mca/llm/base/llm_base_parse_hostfile_lex.h
@@ -1,5 +1,6 @@
 /* -*- C -*-
  *
+ * $HEADER$
  */
 
 #ifndef MCA_LLM_BASE_PARSE_HOSTFILE_LEX_H_
diff --git a/src/mca/llm/base/llm_base_parse_hostfile_lex.l b/src/mca/llm/base/llm_base_parse_hostfile_lex.l
index e1c46e4377..d6eeb286c2 100644
--- a/src/mca/llm/base/llm_base_parse_hostfile_lex.l
+++ b/src/mca/llm/base/llm_base_parse_hostfile_lex.l
@@ -1,4 +1,7 @@
 %{ /* -*- C -*- */
+/*
+ * $HEADER$
+ */
 #include "ompi_config.h"
 
 #include <stdio.h>
diff --git a/src/mca/one/one.h b/src/mca/one/one.h
index e34f0c85b1..4106516644 100644
--- a/src/mca/one/one.h
+++ b/src/mca/one/one.h
@@ -1,5 +1,5 @@
 /*
- * $HEADER
+ * $HEADER$
  */
 
 #ifndef MCA_ONE_H
diff --git a/src/mca/oob/base/oob_base_barrier.c b/src/mca/oob/base/oob_base_barrier.c
index 80d7c8415a..335370adee 100644
--- a/src/mca/oob/base/oob_base_barrier.c
+++ b/src/mca/oob/base/oob_base_barrier.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "include/constants.h"
 #include "mca/oob/oob.h"
diff --git a/src/mca/oob/base/oob_base_xcast.c b/src/mca/oob/base/oob_base_xcast.c
index 52f4618592..098e51bdc7 100644
--- a/src/mca/oob/base/oob_base_xcast.c
+++ b/src/mca/oob/base/oob_base_xcast.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include <string.h>
 
diff --git a/src/mca/oob/tcp/oob_tcp_addr.c b/src/mca/oob/tcp/oob_tcp_addr.c
index 466ff2b788..afe5b8946e 100644
--- a/src/mca/oob/tcp/oob_tcp_addr.c
+++ b/src/mca/oob/tcp/oob_tcp_addr.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/src/mca/op/op.h b/src/mca/op/op.h
index f54774b1bc..d0e556c82a 100644
--- a/src/mca/op/op.h
+++ b/src/mca/op/op.h
@@ -1 +1,5 @@
+/*
+ * $HEADER$
+ */
+
 /* Nothing to see here; move along... */
diff --git a/src/mca/pml/base/pml_base_bsend.c b/src/mca/pml/base/pml_base_bsend.c
index d3a715b97a..dd1403acff 100644
--- a/src/mca/pml/base/pml_base_bsend.c
+++ b/src/mca/pml/base/pml_base_bsend.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "threads/mutex.h"
 #include "threads/condition.h"
diff --git a/src/mca/pml/base/pml_base_bsend.h b/src/mca/pml/base/pml_base_bsend.h
index 19bb38584f..81ad96897f 100644
--- a/src/mca/pml/base/pml_base_bsend.h
+++ b/src/mca/pml/base/pml_base_bsend.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #ifndef _MCA_PML_BASE_BSEND_H_
 #define _MCA_PML_BASE_BSEND_H_
 
diff --git a/src/mca/pml/teg/src/pml_teg_ptl.h b/src/mca/pml/teg/src/pml_teg_ptl.h
index 29fe5dc268..159b2e9018 100644
--- a/src/mca/pml/teg/src/pml_teg_ptl.h
+++ b/src/mca/pml/teg/src/pml_teg_ptl.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #ifndef _MCA_PML_BASE_PTL_
 #define _MCA_PML_BASE_PTL_
 
diff --git a/src/mca/ptl/elan/tests/bw.c b/src/mca/ptl/elan/tests/bw.c
index fc0798ccbb..4c92149a0a 100644
--- a/src/mca/ptl/elan/tests/bw.c
+++ b/src/mca/ptl/elan/tests/bw.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "mpi.h"
 #include <stdio.h>
diff --git a/src/mca/ptl/elan/tests/check.c b/src/mca/ptl/elan/tests/check.c
index 5fdebda591..9b3e7effd1 100644
--- a/src/mca/ptl/elan/tests/check.c
+++ b/src/mca/ptl/elan/tests/check.c
@@ -1,3 +1,6 @@
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include <stdio.h>
diff --git a/src/mca/ptl/elan/tests/check_bw.c b/src/mca/ptl/elan/tests/check_bw.c
index 1daa6db713..1c5fd6b529 100644
--- a/src/mca/ptl/elan/tests/check_bw.c
+++ b/src/mca/ptl/elan/tests/check_bw.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "mpi.h"
 #include <stdio.h>
diff --git a/src/mca/ptl/elan/tests/init_elan.c b/src/mca/ptl/elan/tests/init_elan.c
index 9f2b0ce9a2..4f9f6b0adf 100644
--- a/src/mca/ptl/elan/tests/init_elan.c
+++ b/src/mca/ptl/elan/tests/init_elan.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include <unistd.h>
 #include <stdio.h>
diff --git a/src/mca/ptl/elan/tests/lat.c b/src/mca/ptl/elan/tests/lat.c
index 0547e47dd3..0496882502 100644
--- a/src/mca/ptl/elan/tests/lat.c
+++ b/src/mca/ptl/elan/tests/lat.c
@@ -1,3 +1,6 @@
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include <stdio.h>
diff --git a/src/mca/ptl/elan/tests/mpi_test.c b/src/mca/ptl/elan/tests/mpi_test.c
index f085b1e7e6..217847a952 100644
--- a/src/mca/ptl/elan/tests/mpi_test.c
+++ b/src/mca/ptl/elan/tests/mpi_test.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include <stdio.h>
 #include "mpi.h"
diff --git a/src/mca/ptl/elan/tests/qsnet_init.c b/src/mca/ptl/elan/tests/qsnet_init.c
index e03b088912..8dcfa32138 100644
--- a/src/mca/ptl/elan/tests/qsnet_init.c
+++ b/src/mca/ptl/elan/tests/qsnet_init.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include <stdio.h>
 #include "qsnet/fence.h"
diff --git a/src/mca/ptl/elan/tests/qsnet_qdma.c b/src/mca/ptl/elan/tests/qsnet_qdma.c
index 49e8b3efe9..0b9a282476 100644
--- a/src/mca/ptl/elan/tests/qsnet_qdma.c
+++ b/src/mca/ptl/elan/tests/qsnet_qdma.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "qsnet/fence.h"
 #include "ptl_elan.h"
diff --git a/src/mca/ptl/elan/tests/qsnet_rdma.c b/src/mca/ptl/elan/tests/qsnet_rdma.c
index 7db133abc6..93f7b51c6a 100644
--- a/src/mca/ptl/elan/tests/qsnet_rdma.c
+++ b/src/mca/ptl/elan/tests/qsnet_rdma.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "qsnet/fence.h"
 #include "ptl_elan.h"
diff --git a/src/mca/ptl/elan/tests/test_util.h b/src/mca/ptl/elan/tests/test_util.h
index 962446cd67..e1ec8ae469 100644
--- a/src/mca/ptl/elan/tests/test_util.h
+++ b/src/mca/ptl/elan/tests/test_util.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/mca/ptl/gm/src/ptl_gm_priv.h b/src/mca/ptl/gm/src/ptl_gm_priv.h
index 67c0628bcd..2a3a8600b7 100644
--- a/src/mca/ptl/gm/src/ptl_gm_priv.h
+++ b/src/mca/ptl/gm/src/ptl_gm_priv.h
@@ -1,5 +1,8 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
 
+/*
+ * $HEADER$
+ */
 #include "gm.h"
 
 struct mca_ptl_gm_send_frag_t;
diff --git a/src/mca/ptl/gm/src/ptl_gm_req.c b/src/mca/ptl/gm/src/ptl_gm_req.c
index 54cebf3a6b..fa9fc20f27 100644
--- a/src/mca/ptl/gm/src/ptl_gm_req.c
+++ b/src/mca/ptl/gm/src/ptl_gm_req.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
 
 /*
- *HEADER$
+ * $HEADER$
  */
 #include "ompi_config.h"
 #include "include/types.h"
diff --git a/src/mca/ptl/gm/src/ptl_gm_req.h b/src/mca/ptl/gm/src/ptl_gm_req.h
index d0635e6771..421f4babe9 100644
--- a/src/mca/ptl/gm/src/ptl_gm_req.h
+++ b/src/mca/ptl/gm/src/ptl_gm_req.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
 
 /*
- *HEADER$
+ * $HEADER$
  */
 /**
  * @file
diff --git a/src/mca/ptl/gm/src/ptl_gm_sendfrag.c b/src/mca/ptl/gm/src/ptl_gm_sendfrag.c
index c61992aa08..525f6581c5 100644
--- a/src/mca/ptl/gm/src/ptl_gm_sendfrag.c
+++ b/src/mca/ptl/gm/src/ptl_gm_sendfrag.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
 
 /*
- *HEADER$
+ * $HEADER$
  */
 #include "ompi_config.h"
 #include "include/types.h"
diff --git a/src/mca/ptl/gm/src/ptl_gm_sendfrag.h b/src/mca/ptl/gm/src/ptl_gm_sendfrag.h
index b9c6e1681a..43fa5fde2d 100644
--- a/src/mca/ptl/gm/src/ptl_gm_sendfrag.h
+++ b/src/mca/ptl/gm/src/ptl_gm_sendfrag.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; -*- */
 
 /*
- *HEADER$
+ * $HEADER$
  */
 /**
  * @file
diff --git a/src/mca/ptl/gm/tests/Makefile b/src/mca/ptl/gm/tests/Makefile
index 2d2dd72e4a..9008a7d0bf 100644
--- a/src/mca/ptl/gm/tests/Makefile
+++ b/src/mca/ptl/gm/tests/Makefile
@@ -1,3 +1,7 @@
+#
+# $HEADER$
+#
+
 PROGS = mpi-ping
 
 all: $(PROGS)
diff --git a/src/mca/ptl/gm/tests/lat.c b/src/mca/ptl/gm/tests/lat.c
index 060072206d..147a8e98e6 100644
--- a/src/mca/ptl/gm/tests/lat.c
+++ b/src/mca/ptl/gm/tests/lat.c
@@ -1,3 +1,6 @@
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include <stdio.h>
diff --git a/src/mca/ptl/gm/tests/lat.sh b/src/mca/ptl/gm/tests/lat.sh
index 289f049b3a..c2e6b375c4 100755
--- a/src/mca/ptl/gm/tests/lat.sh
+++ b/src/mca/ptl/gm/tests/lat.sh
@@ -1,4 +1,8 @@
 #!/bin/bash 
+#
+# $HEADER$
+#
+
 prog=./lat
 i=$((0))
 while [ $i -le $((1<<20)) ] ; 
diff --git a/src/mca/ptl/gm/tests/mpi-ping.c b/src/mca/ptl/gm/tests/mpi-ping.c
index baf20abfd5..582b733538 100644
--- a/src/mca/ptl/gm/tests/mpi-ping.c
+++ b/src/mca/ptl/gm/tests/mpi-ping.c
@@ -1,4 +1,6 @@
 /*
+ * $HEADER$
+ *
  * MPI ping program
  *
  * Patterned after the example in the Quadrics documentation
diff --git a/src/mca/ptl/ib/src/ptl_ib_addr.h b/src/mca/ptl/ib/src/ptl_ib_addr.h
index c2741eeefc..b836274f3d 100644
--- a/src/mca/ptl/ib/src/ptl_ib_addr.h
+++ b/src/mca/ptl/ib/src/ptl_ib_addr.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #ifndef MCA_PTL_IB_ADDR_H
 #define MCA_PTL_IB_ADDR_H
 
diff --git a/src/mca/ptl/ib/src/ptl_ib_peer.c b/src/mca/ptl/ib/src/ptl_ib_peer.c
index 31dcd53598..78dbdd0069 100644
--- a/src/mca/ptl/ib/src/ptl_ib_peer.c
+++ b/src/mca/ptl/ib/src/ptl_ib_peer.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 
 #include "ompi_config.h"
 #include <sys/time.h>
diff --git a/src/mca/ptl/ib/src/ptl_ib_peer.h b/src/mca/ptl/ib/src/ptl_ib_peer.h
index b458a9b7fc..2641ee7342 100644
--- a/src/mca/ptl/ib/src/ptl_ib_peer.h
+++ b/src/mca/ptl/ib/src/ptl_ib_peer.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #ifndef MCA_PTL_IB_PEER_H
 #define MCA_PTL_IB_PEER_H
 
diff --git a/src/mca/ptl/ib/src/ptl_ib_priv.c b/src/mca/ptl/ib/src/ptl_ib_priv.c
index df4f99bbac..4053895d22 100644
--- a/src/mca/ptl/ib/src/ptl_ib_priv.c
+++ b/src/mca/ptl/ib/src/ptl_ib_priv.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "ptl_ib_vapi.h"
 #include "ptl_ib_priv.h"
diff --git a/src/mca/ptl/ib/src/ptl_ib_priv.h b/src/mca/ptl/ib/src/ptl_ib_priv.h
index 184bf82f7d..ae108825cb 100644
--- a/src/mca/ptl/ib/src/ptl_ib_priv.h
+++ b/src/mca/ptl/ib/src/ptl_ib_priv.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #ifndef MCA_PTL_IB_PRIV_H
 #define MCA_PTL_IB_PRIV_H
 
diff --git a/src/mca/ptl/ib/src/ptl_ib_proc.c b/src/mca/ptl/ib/src/ptl_ib_proc.c
index ae5abd883d..f62b368dde 100644
--- a/src/mca/ptl/ib/src/ptl_ib_proc.c
+++ b/src/mca/ptl/ib/src/ptl_ib_proc.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 
 #include "class/ompi_hash_table.h"
diff --git a/src/mca/ptl/ib/src/ptl_ib_proc.h b/src/mca/ptl/ib/src/ptl_ib_proc.h
index ca24a32d3e..1df1a4402d 100644
--- a/src/mca/ptl/ib/src/ptl_ib_proc.h
+++ b/src/mca/ptl/ib/src/ptl_ib_proc.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #ifndef MCA_PTL_IB_PROC_H
 #define MCA_PTL_IB_PROC_H
 
diff --git a/src/mca/ptl/ib/src/ptl_ib_recvfrag.c b/src/mca/ptl/ib/src/ptl_ib_recvfrag.c
index f88d540d27..2ff93232a7 100644
--- a/src/mca/ptl/ib/src/ptl_ib_recvfrag.c
+++ b/src/mca/ptl/ib/src/ptl_ib_recvfrag.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "mca/pml/base/pml_base_sendreq.h"
 #include "ptl_ib.h"
diff --git a/src/mca/ptl/ib/src/ptl_ib_recvfrag.h b/src/mca/ptl/ib/src/ptl_ib_recvfrag.h
index 5baeafc6bb..6e278d7f0d 100644
--- a/src/mca/ptl/ib/src/ptl_ib_recvfrag.h
+++ b/src/mca/ptl/ib/src/ptl_ib_recvfrag.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #ifndef MCA_PTL_IB_RECV_FRAG_H
 #define MCA_PTL_IB_RECV_FRAG_H
 
diff --git a/src/mca/ptl/ib/src/ptl_ib_sendfrag.c b/src/mca/ptl/ib/src/ptl_ib_sendfrag.c
index 3554d9f997..750bb84815 100644
--- a/src/mca/ptl/ib/src/ptl_ib_sendfrag.c
+++ b/src/mca/ptl/ib/src/ptl_ib_sendfrag.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "include/types.h"
 #include "datatype/datatype.h"
diff --git a/src/mca/ptl/ib/src/ptl_ib_sendfrag.h b/src/mca/ptl/ib/src/ptl_ib_sendfrag.h
index 8573c6c64b..d3a68ca7e6 100644
--- a/src/mca/ptl/ib/src/ptl_ib_sendfrag.h
+++ b/src/mca/ptl/ib/src/ptl_ib_sendfrag.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #ifndef MCA_PTL_IB_SEND_FRAG_H
 #define MCA_PTL_IB_SEND_FRAG_H
 
diff --git a/src/mca/ptl/ib/src/ptl_ib_sendreq.c b/src/mca/ptl/ib/src/ptl_ib_sendreq.c
index ef22f3d331..0440536cb7 100644
--- a/src/mca/ptl/ib/src/ptl_ib_sendreq.c
+++ b/src/mca/ptl/ib/src/ptl_ib_sendreq.c
@@ -1,3 +1,6 @@
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 #include "include/types.h"
diff --git a/src/mca/ptl/ib/src/ptl_ib_sendreq.h b/src/mca/ptl/ib/src/ptl_ib_sendreq.h
index 1a42675368..7b439f2b23 100644
--- a/src/mca/ptl/ib/src/ptl_ib_sendreq.h
+++ b/src/mca/ptl/ib/src/ptl_ib_sendreq.h
@@ -1,4 +1,6 @@
-
+/*
+ * $HEADER$
+ */
 
 #ifndef MCA_PTL_IB_SEND_REQUEST_H
 #define MCA_PTL_IB_SEND_REQUEST_H
diff --git a/src/mca/ptl/ib/src/ptl_ib_vapi.h b/src/mca/ptl/ib/src/ptl_ib_vapi.h
index 6aa34fb652..3d4631f08b 100644
--- a/src/mca/ptl/ib/src/ptl_ib_vapi.h
+++ b/src/mca/ptl/ib/src/ptl_ib_vapi.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #ifndef MCA_PTL_IB_VAPI_H
 #define MCA_PTL_IB_VAPI_H
 
diff --git a/src/mca/ptl/mx/ptl_mx_module.c b/src/mca/ptl/mx/ptl_mx_module.c
index a9a22096df..79563c1d5e 100644
--- a/src/mca/ptl/mx/ptl_mx_module.c
+++ b/src/mca/ptl/mx/ptl_mx_module.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ptl_mx.h"
 #include "include/constants.h"
 #include "util/output.h"
diff --git a/src/mca/ptl/prof/ptl_prof.c b/src/mca/ptl/prof/ptl_prof.c
index 9fc24d5c7a..6c823ab222 100644
--- a/src/mca/ptl/prof/ptl_prof.c
+++ b/src/mca/ptl/prof/ptl_prof.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "ptl_prof.h"
 #include "class/ompi_bitmap.h"
diff --git a/src/mca/ptl/prof/ptl_prof.h b/src/mca/ptl/prof/ptl_prof.h
index b7a94b6b46..b4aabd2261 100644
--- a/src/mca/ptl/prof/ptl_prof.h
+++ b/src/mca/ptl/prof/ptl_prof.h
@@ -1,5 +1,5 @@
 /*
- *  *$HEADER$
+ * $HEADER$
  *   */
 /**
  *  * @file
diff --git a/src/mca/svc/exec/svc_exec.c b/src/mca/svc/exec/svc_exec.c
index ef317c592c..0cb666ab43 100644
--- a/src/mca/svc/exec/svc_exec.c
+++ b/src/mca/svc/exec/svc_exec.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 
 #include <unistd.h>
diff --git a/src/mca/svc/exec/svc_exec_component.c b/src/mca/svc/exec/svc_exec_component.c
index 7fe84b653b..7edacbcd4a 100644
--- a/src/mca/svc/exec/svc_exec_component.c
+++ b/src/mca/svc/exec/svc_exec_component.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "include/constants.h"
 
diff --git a/src/mca/svc/sched/svc_sched.c b/src/mca/svc/sched/svc_sched.c
index cc8a8e471f..58c69e9297 100644
--- a/src/mca/svc/sched/svc_sched.c
+++ b/src/mca/svc/sched/svc_sched.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "util/output.h"
 #include "mca/oob/oob.h"
diff --git a/src/mca/svc/sched/svc_sched_component.c b/src/mca/svc/sched/svc_sched_component.c
index be54f91019..90fba6ab27 100644
--- a/src/mca/svc/sched/svc_sched_component.c
+++ b/src/mca/svc/sched/svc_sched_component.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "svc_sched.h"
 #include "util/proc_info.h"
diff --git a/src/mca/svc/sched/svc_sched_node.c b/src/mca/svc/sched/svc_sched_node.c
index 24c51f66ad..3fc19122a3 100644
--- a/src/mca/svc/sched/svc_sched_node.c
+++ b/src/mca/svc/sched/svc_sched_node.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 
 #include <string.h>
diff --git a/src/mca/svc/stdio.old/Makefile b/src/mca/svc/stdio.old/Makefile
index a0aff38c1b..654d40a91d 100644
--- a/src/mca/svc/stdio.old/Makefile
+++ b/src/mca/svc/stdio.old/Makefile
@@ -1,3 +1,7 @@
+#
+# $HEADER$
+#
+
 SNL_OBJECTS = ./snipe_lite/msg.c \
 	./snipe_lite/msgbuf2.c \
 	./snipe_lite/memory.c \
diff --git a/src/mca/svc/stdio.old/README b/src/mca/svc/stdio.old/README
index e48e803e8f..62423e28a4 100644
--- a/src/mca/svc/stdio.old/README
+++ b/src/mca/svc/stdio.old/README
@@ -1,3 +1,5 @@
+$HEADER$
+
 This should be in a design document but....
 
 Random thoughts on stdio redirection.
diff --git a/src/mca/svc/stdio.old/cioapp.c b/src/mca/svc/stdio.old/cioapp.c
index 21501607a3..c273fd5ef0 100644
--- a/src/mca/svc/stdio.old/cioapp.c
+++ b/src/mca/svc/stdio.old/cioapp.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/mca/svc/stdio.old/libcio.c b/src/mca/svc/stdio.old/libcio.c
index f196385161..87d769109e 100644
--- a/src/mca/svc/stdio.old/libcio.c
+++ b/src/mca/svc/stdio.old/libcio.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 /*
 	HARNESS G_HCORE
 	HARNESS FT_MPI
diff --git a/src/mca/svc/stdio.old/libcio.h b/src/mca/svc/stdio.old/libcio.h
index 962dac6cfe..a28aaf47a2 100644
--- a/src/mca/svc/stdio.old/libcio.h
+++ b/src/mca/svc/stdio.old/libcio.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 /*
 	HARNESS G_HCORE
 	HARNESS FT_MPI
diff --git a/src/mca/svc/stdio.old/libsio.c b/src/mca/svc/stdio.old/libsio.c
index 73c87fc180..608d6c8c2a 100644
--- a/src/mca/svc/stdio.old/libsio.c
+++ b/src/mca/svc/stdio.old/libsio.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 /*
 	HARNESS G_HCORE
 	HARNESS FT_MPI
diff --git a/src/mca/svc/stdio.old/libsio.h b/src/mca/svc/stdio.old/libsio.h
index fddc3402b4..c495b0b6ac 100644
--- a/src/mca/svc/stdio.old/libsio.h
+++ b/src/mca/svc/stdio.old/libsio.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 /*
 	HARNESS G_HCORE
 	HARNESS FT_MPI
diff --git a/src/mca/svc/stdio.old/sioapp.c b/src/mca/svc/stdio.old/sioapp.c
index 9d365a07a3..377c1f0813 100644
--- a/src/mca/svc/stdio.old/sioapp.c
+++ b/src/mca/svc/stdio.old/sioapp.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include <stdio.h>
 #include "libsio.h"
diff --git a/src/mca/svc/stdio.old/snipe_lite/debug.h b/src/mca/svc/stdio.old/snipe_lite/debug.h
index d76ce0118d..9e3d24749a 100644
--- a/src/mca/svc/stdio.old/snipe_lite/debug.h
+++ b/src/mca/svc/stdio.old/snipe_lite/debug.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #ifndef DEBUG_H_HAS_BEEN_INCLUDED
 #define DEBUG_H_HAS_BEEN_INCLUDED
 
diff --git a/src/mca/svc/stdio.old/snipe_lite/memory.c b/src/mca/svc/stdio.old/snipe_lite/memory.c
index 1a854ab5b0..a43b25d494 100644
--- a/src/mca/svc/stdio.old/snipe_lite/memory.c
+++ b/src/mca/svc/stdio.old/snipe_lite/memory.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #if !defined(NDEBUG)
 #include <stdio.h>
diff --git a/src/mca/svc/stdio.old/snipe_lite/msg.c b/src/mca/svc/stdio.old/snipe_lite/msg.c
index 09ecfe88ca..8161f18298 100644
--- a/src/mca/svc/stdio.old/snipe_lite/msg.c
+++ b/src/mca/svc/stdio.old/snipe_lite/msg.c
@@ -1,3 +1,6 @@
+/*
+ * $HEADER$
+ */
 
 /*
 	HARNESS G_HCORE
diff --git a/src/mca/svc/stdio.old/snipe_lite/msg.h b/src/mca/svc/stdio.old/snipe_lite/msg.h
index ec51c2124b..c555295a17 100644
--- a/src/mca/svc/stdio.old/snipe_lite/msg.h
+++ b/src/mca/svc/stdio.old/snipe_lite/msg.h
@@ -1,3 +1,6 @@
+/*
+ * $HEADER$
+ */
 
 /*
 	HARNESS G_HCORE
diff --git a/src/mca/svc/stdio.old/snipe_lite/msgbuf.h b/src/mca/svc/stdio.old/snipe_lite/msgbuf.h
index 71ed9bacb7..fa1d3decd8 100644
--- a/src/mca/svc/stdio.old/snipe_lite/msgbuf.h
+++ b/src/mca/svc/stdio.old/snipe_lite/msgbuf.h
@@ -1,3 +1,6 @@
+/*
+ * $HEADER$
+ */
 
 /*
 	HARNESS G_HCORE
diff --git a/src/mca/svc/stdio.old/snipe_lite/msgbuf2.c b/src/mca/svc/stdio.old/snipe_lite/msgbuf2.c
index 0494ba116d..b28fc8783f 100644
--- a/src/mca/svc/stdio.old/snipe_lite/msgbuf2.c
+++ b/src/mca/svc/stdio.old/snipe_lite/msgbuf2.c
@@ -1,3 +1,6 @@
+/*
+ * $HEADER$
+ */
 
 /*
 	HARNESS G_HCORE
diff --git a/src/mca/svc/stdio.old/snipe_lite/snipe_lite.c b/src/mca/svc/stdio.old/snipe_lite/snipe_lite.c
index e018d9049b..8ee8eb2a1c 100644
--- a/src/mca/svc/stdio.old/snipe_lite/snipe_lite.c
+++ b/src/mca/svc/stdio.old/snipe_lite/snipe_lite.c
@@ -1,3 +1,6 @@
+/*
+ * $HEADER$
+ */
 
 /*
 	HARNESS G_HCORE
diff --git a/src/mca/svc/stdio.old/snipe_lite/snipe_lite.h b/src/mca/svc/stdio.old/snipe_lite/snipe_lite.h
index d589235778..8f710e6609 100644
--- a/src/mca/svc/stdio.old/snipe_lite/snipe_lite.h
+++ b/src/mca/svc/stdio.old/snipe_lite/snipe_lite.h
@@ -1,4 +1,6 @@
-
+/*
+ * $HEADER$
+ */
 
 /*
 	HARNESS G_HCORE
diff --git a/src/mca/svc/stdio.old/snipe_lite/syslog.c b/src/mca/svc/stdio.old/snipe_lite/syslog.c
index 8b2147d1fd..6d71389187 100644
--- a/src/mca/svc/stdio.old/snipe_lite/syslog.c
+++ b/src/mca/svc/stdio.old/snipe_lite/syslog.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "syslog.h"
 #include "debug.h"
diff --git a/src/mca/svc/stdio.old/snipe_lite/syslog.h b/src/mca/svc/stdio.old/snipe_lite/syslog.h
index c59abe6f1b..fe05ba277b 100644
--- a/src/mca/svc/stdio.old/snipe_lite/syslog.h
+++ b/src/mca/svc/stdio.old/snipe_lite/syslog.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #ifndef SYSLOG_H_HAS_BEEN_INCLUDED
 #define SYSLOG_H_HAS_BEEN_INCLUDED
 
diff --git a/src/mca/svc/stdio/svc_stdio.c b/src/mca/svc/stdio/svc_stdio.c
index 8302acb2b5..7d64e45e84 100644
--- a/src/mca/svc/stdio/svc_stdio.c
+++ b/src/mca/svc/stdio/svc_stdio.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "include/constants.h"
 #include "mca/oob/oob.h"
diff --git a/src/mca/svc/stdio/svc_stdio_component.c b/src/mca/svc/stdio/svc_stdio_component.c
index 29d38e69ac..5d6c52a76c 100644
--- a/src/mca/svc/stdio/svc_stdio_component.c
+++ b/src/mca/svc/stdio/svc_stdio_component.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "include/constants.h"
 #include "svc_stdio.h"
diff --git a/src/mca/topo/base/topo_base_comm_unselect.c b/src/mca/topo/base/topo_base_comm_unselect.c
index c6efe3f993..9e15c9143b 100644
--- a/src/mca/topo/base/topo_base_comm_unselect.c
+++ b/src/mca/topo/base/topo_base_comm_unselect.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include <stdio.h>
 #include <string.h>
diff --git a/src/mca/topo/base/topo_base_find_available.c b/src/mca/topo/base/topo_base_find_available.c
index 883a512535..efd596b787 100644
--- a/src/mca/topo/base/topo_base_find_available.c
+++ b/src/mca/topo/base/topo_base_find_available.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 
 #include <stdio.h>
diff --git a/src/mca/topo/topo.h b/src/mca/topo/topo.h
index a01d7d359e..7c6987aeed 100644
--- a/src/mca/topo/topo.h
+++ b/src/mca/topo/topo.h
@@ -1,5 +1,5 @@
 /*
- * $HEADER
+ * $HEADER$
  */
 
 #ifndef MCA_TOPO_H
diff --git a/src/mca/win_makefile b/src/mca/win_makefile
index f0b8d772ac..33f2053dca 100644
--- a/src/mca/win_makefile
+++ b/src/mca/win_makefile
@@ -1,8 +1,11 @@
 #!/bin/sh
 #
-# This is a simple makefile for windows which makes all the components which are 
-# required for super computing. Too lazy to open up visual studio each and every
-# time to compile a component, so just adding this to the svn repository 
+# $HEADER$
+#
+# This is a simple makefile for windows which makes all the components
+# which are required for super computing. Too lazy to open up visual
+# studio each and every time to compile a component, so just adding
+# this to the svn repository
 #
 
 gen_base = ${topdir}/src/win32/generated_include
diff --git a/src/mpi/README.dox b/src/mpi/README.dox
index 5ec69767f1..5f0fe18ac7 100644
--- a/src/mpi/README.dox
+++ b/src/mpi/README.dox
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 /**
 
 @page page_mpi The src/mpi directory
diff --git a/src/mpi/f90/fortran_kinds.sh.in b/src/mpi/f90/fortran_kinds.sh.in
index f76d41353b..4da1bb5020 100644
--- a/src/mpi/f90/fortran_kinds.sh.in
+++ b/src/mpi/f90/fortran_kinds.sh.in
@@ -1,4 +1,7 @@
 #! /bin/sh
+#
+# $HEADER$
+#
 
 ranks="1 2 3 4 5 6 7"
 
diff --git a/src/mpi/f90/mpi.f90 b/src/mpi/f90/mpi.f90
index ba0174da13..0aa1ec16aa 100644
--- a/src/mpi/f90/mpi.f90
+++ b/src/mpi/f90/mpi.f90
@@ -1,5 +1,9 @@
 module mpi_kinds
 
+!
+! $HEADER$
+!
+
 !
 ! kind for 4 byte integer (selected_int_kind(18) for 8 byte integer)
 ! (WARNING, Compiler dependent)
diff --git a/src/mpi/f90/scripts/mpi.i.sh b/src/mpi/f90/scripts/mpi.i.sh
index 2fd268ab2d..178eb9f844 100755
--- a/src/mpi/f90/scripts/mpi.i.sh
+++ b/src/mpi/f90/scripts/mpi.i.sh
@@ -1,4 +1,7 @@
 #! /bin/sh
+#
+# $HEADER$
+#
 
 . fortran_kinds.sh
 
diff --git a/src/mpi/f90/test/print_ikinds.f90 b/src/mpi/f90/test/print_ikinds.f90
index 2b0c7055d6..7b3c950271 100644
--- a/src/mpi/f90/test/print_ikinds.f90
+++ b/src/mpi/f90/test/print_ikinds.f90
@@ -1,4 +1,6 @@
 !
+! $HEADER$
+!
 ! print_ikinds.f90
 !   - prints out values of selected_int_kind to determine Fortran compiler
 !     dependent values
diff --git a/src/mpi/f90/test/send_t.c b/src/mpi/f90/test/send_t.c
index 345ce0477f..d9cd0bd50a 100644
--- a/src/mpi/f90/test/send_t.c
+++ b/src/mpi/f90/test/send_t.c
@@ -1,4 +1,6 @@
 /**
+ * $HEADER$
+ *
  * send_t.c - tests mpi_send variants
  *
  * Actual tests do not use MPI, they just test parameters and types.
diff --git a/src/mpi/f90/test/test_send.f90 b/src/mpi/f90/test/test_send.f90
index bdeded45ac..6a4bdd021a 100644
--- a/src/mpi/f90/test/test_send.f90
+++ b/src/mpi/f90/test/test_send.f90
@@ -1,4 +1,6 @@
 !
+! $HEADER$
+!
 ! test_send.f90 - tests mpi_send variants (calls functions in send_t.c)
 !
 ! Actual tests do not use MPI, they just test parameters and types.
diff --git a/src/mpi/f90/xml/mpi.h.xml b/src/mpi/f90/xml/mpi.h.xml
index 8ebfd2976a..6692e58e1e 100644
--- a/src/mpi/f90/xml/mpi.h.xml
+++ b/src/mpi/f90/xml/mpi.h.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE library SYSTEM "mapping.dtd">
-
+<!--
+ $HEADER$
+-->
 <!-- mpi.h.xml : automatically generated XML -->
 <!-- Source PDB file : mpi.h.pdb -->
 <library lang="cxx" version="3" name="mpi.h">
diff --git a/src/os/darwin/ppc_32/Makefile.am b/src/os/darwin/ppc_32/Makefile.am
index 4d44921af1..f97d9e1626 100644
--- a/src/os/darwin/ppc_32/Makefile.am
+++ b/src/os/darwin/ppc_32/Makefile.am
@@ -1,4 +1,6 @@
-
+#
+# $HEADER$
+#
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
diff --git a/src/os/linux/i686/lock.s b/src/os/linux/i686/lock.s
index 4efd7b7df6..815465f5ac 100644
--- a/src/os/linux/i686/lock.s
+++ b/src/os/linux/i686/lock.s
@@ -1,3 +1,7 @@
+;;
+;; $HEADER$
+;;
+	
 #include <asm.h>
 
 .text
diff --git a/src/os/linux/ia64/lock.s b/src/os/linux/ia64/lock.s
index 4efd7b7df6..130b011abb 100644
--- a/src/os/linux/ia64/lock.s
+++ b/src/os/linux/ia64/lock.s
@@ -1,5 +1,8 @@
+;;
+;; $HEADER$
+;;
+	
 #include <asm.h>
-
 .text
 
 .global spinlock
diff --git a/src/proc/proc.c b/src/proc/proc.c
index 6d06c90ba5..fb8ebec33a 100644
--- a/src/proc/proc.c
+++ b/src/proc/proc.c
@@ -1,5 +1,5 @@
 /*
- * $HEADER
+ * $HEADER$
  */
 
 #include "ompi_config.h"
diff --git a/src/request/grequest.c b/src/request/grequest.c
index 9d9eeae2c6..b1db9aa902 100644
--- a/src/request/grequest.c
+++ b/src/request/grequest.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "request/grequest.h"
 
diff --git a/src/runtime/ompi_progress.c b/src/runtime/ompi_progress.c
index 9460f35e92..bd3a816379 100644
--- a/src/runtime/ompi_progress.c
+++ b/src/runtime/ompi_progress.c
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "event/event.h"
 #include "mca/pml/pml.h"
diff --git a/src/runtime/ompi_progress.h b/src/runtime/ompi_progress.h
index 7d65cdfaf4..c38ad69c50 100644
--- a/src/runtime/ompi_progress.h
+++ b/src/runtime/ompi_progress.h
@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #ifndef _OMPI_PROGRESS_H_
 #define _OMPI_PROGRESS_H_
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/src/tools/bootproxy/bootproxy.c b/src/tools/bootproxy/bootproxy.c
index 3e9df164f9..1946d320aa 100644
--- a/src/tools/bootproxy/bootproxy.c
+++ b/src/tools/bootproxy/bootproxy.c
@@ -1,5 +1,5 @@
 /* 
- * $HEADER
+ * $HEADER$
  */
 
 #include "ompi_config.h"
diff --git a/src/tools/openmpi/openmpi.c b/src/tools/openmpi/openmpi.c
index fbb3b1801c..4009e46623 100644
--- a/src/tools/openmpi/openmpi.c
+++ b/src/tools/openmpi/openmpi.c
@@ -1,4 +1,6 @@
 /*
+  $HEADER$
+
   openmpi.c - main program for spawning persistent universe.
 
   --------------------------------------------------------------------------
diff --git a/src/tools/win_makefile b/src/tools/win_makefile
index 452ee0e49a..28c81b10b8 100644
--- a/src/tools/win_makefile
+++ b/src/tools/win_makefile
@@ -1,8 +1,11 @@
 #!/bin/sh
 #
-# This is a simple makefile for windows which makes all the components which are 
-# required for super computing. Too lazy to open up visual studio each and every
-# time to compile a component, so just adding this to the svn repository 
+# $HEADER$
+#
+# This is a simple makefile for windows which makes all the components
+# which are required for super computing. Too lazy to open up visual
+# studio each and every time to compile a component, so just adding
+# this to the svn repository
 #
 
 topdir = `echo $(CURDIR) | sed 's/^\//C:\/cygwin\//g' | sed 's/\/src\/tools//g'`
diff --git a/src/util/show_help_lex.l b/src/util/show_help_lex.l
index 3e1f336a30..bfb5c95608 100644
--- a/src/util/show_help_lex.l
+++ b/src/util/show_help_lex.l
@@ -1,4 +1,7 @@
 %{ /* -*- C -*- */
+/*
+ * $HEADER$
+ */
 
 #include "ompi_config.h"
 
diff --git a/src/win32/generated_include/coll-basic-version.h b/src/win32/generated_include/coll-basic-version.h
index 2c496b08a8..b1bbc71c9a 100644
--- a/src/win32/generated_include/coll-basic-version.h
+++ b/src/win32/generated_include/coll-basic-version.h
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 /*
  * This file is automatically created by autogen.sh; it should not
  * be edited by hand!!
diff --git a/src/win32/generated_include/config.h b/src/win32/generated_include/config.h
index af1b44f2c1..90c6ade462 100644
--- a/src/win32/generated_include/config.h
+++ b/src/win32/generated_include/config.h
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 /* config.h.  Generated by configure.  */
 /* config-h.in.  Generated from configure.ac by autoheader.  */
 
diff --git a/src/win32/generated_include/io-romio-version.h b/src/win32/generated_include/io-romio-version.h
index a8a02670bb..d1a1e1fd17 100644
--- a/src/win32/generated_include/io-romio-version.h
+++ b/src/win32/generated_include/io-romio-version.h
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 /*
  * This file is automatically created by autogen.sh; it should not
  * be edited by hand!!
diff --git a/src/win32/generated_include/llm-hostfile-version.h b/src/win32/generated_include/llm-hostfile-version.h
index 4a8e4eadff..1c485829ee 100644
--- a/src/win32/generated_include/llm-hostfile-version.h
+++ b/src/win32/generated_include/llm-hostfile-version.h
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 /*
  * This file is automatically created by autogen.sh; it should not
  * be edited by hand!!
diff --git a/src/win32/generated_include/pcmclient-env-version.h b/src/win32/generated_include/pcmclient-env-version.h
index 22b489261b..fb0f1b478a 100644
--- a/src/win32/generated_include/pcmclient-env-version.h
+++ b/src/win32/generated_include/pcmclient-env-version.h
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 /*
  * This file is automatically created by autogen.sh; it should not
  * be edited by hand!!
diff --git a/src/win32/generated_include/pcmclient-rms-version.h b/src/win32/generated_include/pcmclient-rms-version.h
index c9c3946e35..72ce348e05 100644
--- a/src/win32/generated_include/pcmclient-rms-version.h
+++ b/src/win32/generated_include/pcmclient-rms-version.h
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 /*
  * This file is automatically created by autogen.sh; it should not
  * be edited by hand!!
diff --git a/src/win32/generated_include/pcmclient-seed-version.h b/src/win32/generated_include/pcmclient-seed-version.h
index 4c84b1a0b8..93a025a1dc 100644
--- a/src/win32/generated_include/pcmclient-seed-version.h
+++ b/src/win32/generated_include/pcmclient-seed-version.h
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 /*
  * This file is automatically created by autogen.sh; it should not
  * be edited by hand!!
diff --git a/src/win32/generated_include/pcmclient-singleton-version.h b/src/win32/generated_include/pcmclient-singleton-version.h
index 8ced408445..27e3ef30bd 100644
--- a/src/win32/generated_include/pcmclient-singleton-version.h
+++ b/src/win32/generated_include/pcmclient-singleton-version.h
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 /*
  * This file is automatically created by autogen.sh; it should not
  * be edited by hand!!
diff --git a/src/win32/generated_include/pcmclient-slurm-version.h b/src/win32/generated_include/pcmclient-slurm-version.h
index 88da01ba59..34f25196e6 100644
--- a/src/win32/generated_include/pcmclient-slurm-version.h
+++ b/src/win32/generated_include/pcmclient-slurm-version.h
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 /*
  * This file is automatically created by autogen.sh; it should not
  * be edited by hand!!
diff --git a/src/win32/generated_include/ptl-prof-version.h b/src/win32/generated_include/ptl-prof-version.h
index 52de3d9c00..3af1e292e0 100644
--- a/src/win32/generated_include/ptl-prof-version.h
+++ b/src/win32/generated_include/ptl-prof-version.h
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 /*
  * This file is automatically created by autogen.sh; it should not
  * be edited by hand!!
diff --git a/src/win32/generated_include/topo-unity-version.h b/src/win32/generated_include/topo-unity-version.h
index a7f0363f08..3de53e2db9 100644
--- a/src/win32/generated_include/topo-unity-version.h
+++ b/src/win32/generated_include/topo-unity-version.h
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 /*
  * This file is automatically created by autogen.sh; it should not
  * be edited by hand!!
diff --git a/src/win32/generated_source/ltdl.c b/src/win32/generated_source/ltdl.c
index de98cbcfdd..6f848f73a2 100644
--- a/src/win32/generated_source/ltdl.c
+++ b/src/win32/generated_source/ltdl.c
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 /* ltdl.c -- system independent dlopen wrapper
    Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
    Originally by Thomas Tanner <tanner@ffii.org>
diff --git a/src/win32/ompi_declspec.h b/src/win32/ompi_declspec.h
index 2426b213c2..8fb4d131b6 100644
--- a/src/win32/ompi_declspec.h
+++ b/src/win32/ompi_declspec.h
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 #ifndef OMPI_DECLSPEC_H
 #define OMPI_DECLSPEC_H
 
diff --git a/src/win32/ompi_get_error.h b/src/win32/ompi_get_error.h
index c8e0d689bc..42c8953984 100644
--- a/src/win32/ompi_get_error.h
+++ b/src/win32/ompi_get_error.h
@@ -1,6 +1,6 @@
 /*
- $HEADER$
-  */
+ * $HEADER$
+ */
 #ifndef OMPI_GET_ERROR_H
 #define OMPI_GET_ERROR_H
 
diff --git a/src/win32/ompi_misc.h b/src/win32/ompi_misc.h
index e1cad4e31d..c2a472391d 100644
--- a/src/win32/ompi_misc.h
+++ b/src/win32/ompi_misc.h
@@ -1,6 +1,6 @@
 /*
-$HEADER$
-*/
+ * $HEADER$
+ */
 
 #ifndef OMPI_MISC_H
 #define OMPI_MISC_H
diff --git a/src/win32/ompi_time.h b/src/win32/ompi_time.h
index 012a726468..f6eaf9837b 100644
--- a/src/win32/ompi_time.h
+++ b/src/win32/ompi_time.h
@@ -1,6 +1,6 @@
 /*
-$HEADER$
-*/
+ *$HEADER$
+ */
 
 #ifndef OMPI_TIME_H
 #define OMPI_TIME_H
diff --git a/src/win32/ompi_util.h b/src/win32/ompi_util.h
index 0e501d0486..a71f5a7061 100644
--- a/src/win32/ompi_util.h
+++ b/src/win32/ompi_util.h
@@ -1,5 +1,5 @@
 /*
-  $HEADER$
+ * $HEADER$
  */
   
 #ifndef OMPI_UTIL_H
diff --git a/src/win32/ompi_utsname.h b/src/win32/ompi_utsname.h
index cda0292fd2..ec25442b6a 100644
--- a/src/win32/ompi_utsname.h
+++ b/src/win32/ompi_utsname.h
@@ -1,5 +1,5 @@
 /*
- $HEADER$
+ * $HEADER$
  */
 
 #ifndef OMPI_UTSNAME_H
diff --git a/src/win32/win_compat.h b/src/win32/win_compat.h
index 173a6eb5a1..86761a06fa 100644
--- a/src/win32/win_compat.h
+++ b/src/win32/win_compat.h
@@ -1,5 +1,5 @@
 /*
- $HEADER&
+ * $HEADER$
  */
 
 #ifndef OMPI_WIN_COMPAT_H
diff --git a/src/win_makefile b/src/win_makefile
index 2bc3fefbb3..bc4adc0dea 100644
--- a/src/win_makefile
+++ b/src/win_makefile
@@ -1,8 +1,11 @@
 #!/bin/sh
 #
-# This is a simple makefile for windows which makes all the components which are 
-# required for super computing. Too lazy to open up visual studio each and every
-# time to compile a component, so just adding this to the svn repository 
+# $HEADER$
+#
+# This is a simple makefile for windows which makes all the components
+# which are required for super computing. Too lazy to open up visual
+# studio each and every time to compile a component, so just adding
+# this to the svn repository
 #
 
 topdir = `echo $(CURDIR) | sed 's/^\//C:\/cygwin\//g' | sed 's/\/src//g'`
diff --git a/vcproj/console/test_event.c b/vcproj/console/test_event.c
index 79df0c7da4..c5b93dcdaa 100755
--- a/vcproj/console/test_event.c
+++ b/vcproj/console/test_event.c
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 #include "ompi_config.h"
 #include "event.h"
 
diff --git a/vcproj/openmpi/hello.c b/vcproj/openmpi/hello.c
index abc293c5c7..ef5ec1b86d 100644
--- a/vcproj/openmpi/hello.c
+++ b/vcproj/openmpi/hello.c
@@ -1,3 +1,7 @@
+/* 
+ * $HEADER$
+ */
+
 #include <mpi.h>
 #include <stdio.h>