diff --git a/Makefile.in b/Makefile.in
index aa80b81f47..f7056774b7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,3 @@
-## Top-level HDF5 Makefile(.in)
-##
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -17,6 +15,8 @@
 ## but does so in the correct order.  You can alternatively invoke make from
 ## each subdirectory manually.
 ##
+## Top-level HDF5 Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=.
 srcdir=@srcdir@
diff --git a/c++/Makefile.in b/c++/Makefile.in
index 3af5fc44d6..7c3c131f6c 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,5 +1,3 @@
-## Top-level HDF5-C++ Makefile(.in)
-##
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -13,7 +11,7 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ## 
-## 
+## Top-level HDF5-C++ Makefile(.in)
 ## 
 ## This makefile mostly just reinvokes make in the various subdirectories
 ## but does so in the correct order.  You can alternatively invoke make from
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index 9e0592407a..08464257d2 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -1,7 +1,4 @@
 ##
-## HDF5-C++ Library Makefile(.in)
-##
-##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -14,7 +11,7 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
-##
+## HDF5-C++ Library Makefile(.in)
 ##
 top_srcdir=@top_srcdir@
 top_builddir=../..
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 61ab0576a5..094849c76a 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -1,5 +1,3 @@
-## HDF5-C++ test/Makefile(.in)
-##
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -13,7 +11,7 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
-##
+## HDF5-C++ test/Makefile(.in)
 ##
 top_srcdir=@top_srcdir@
 top_builddir=../..
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 7e9a0c1c39..ad949706d4 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1,4 +1,3 @@
-## HDF5 Library Examples Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -12,6 +11,8 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
+## HDF5 Library Examples Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 63a417742d..477763af99 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -1,4 +1,3 @@
-## Top-level HDF5-Fortran Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -16,6 +15,8 @@
 ## but does so in the correct order.  You can alternatively invoke make from
 ## each subdirectory manually.
 ##
+## Top-level HDF5-Fortran Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index c4c1882da5..745c15dc04 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -1,4 +1,3 @@
-## HDF5-Fortran test/Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -12,6 +11,8 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
+## HDF5-Fortran test/Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 6b80cc52ae..e5f06f37d2 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -1,6 +1,4 @@
 ##
-## HDF5 Fortran Library Makefile(.in)
-##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
 ##
@@ -13,6 +11,8 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
+## HDF5 Fortran Library Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index b60d7de4a4..e72a10dd00 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -1,5 +1,3 @@
-## HDF5-Fortran test/Makefile(.in)
-
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -13,6 +11,8 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
+## HDF5-Fortran test/Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index ea8d31bb9f..863da359c1 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -1,5 +1,3 @@
-## HDF5 Fortran Parallel Library Test Makefile(.in)
-##
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -13,6 +11,8 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
+## HDF5 Fortran Parallel Library Test Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 1c5fd3c366..79c3552d1b 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -1,4 +1,3 @@
-## HDF5 Library Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -12,6 +11,8 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
+## HDF5 Library Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
diff --git a/perform/Makefile.in b/perform/Makefile.in
index 5a4dff562a..90bb22cbfa 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -1,4 +1,3 @@
-## HDF5 Library Performance Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -12,6 +11,8 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
+## HDF5 Library Performance Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index 867c8b6fdf..f5fa45d5d5 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -1,4 +1,3 @@
-## hdf5 Parallel Library Test Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -12,6 +11,8 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
+## hdf5 Parallel Library Test Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index b9388e96d1..51e3b53b28 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,4 +1,3 @@
-## Tools HDF5 Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -11,7 +10,9 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-## 
+##
+## Tools HDF5 Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index 1c5fd3c366..79c3552d1b 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@@ -1,4 +1,3 @@
-## HDF5 Library Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -12,6 +11,8 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
+## HDF5 Library Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 1c543b519c..4ce10db155 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -1,4 +1,3 @@
-## HDF5 Library Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -12,6 +11,8 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
+## HDF5 Library Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 4e9a1ac746..c33ca0cf9e 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -1,4 +1,3 @@
-## HDF5 Library Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -11,7 +10,9 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-## 
+##
+## HDF5 Library Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 73d4f13bb3..cd16af8b5e 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -1,4 +1,3 @@
-## HDF5 Library Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -12,6 +11,7 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
+## HDF5 Library Makefile(.in)
 ## 
 top_srcdir=@top_srcdir@
 top_builddir=../..
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index 0ecf657966..40fd20a9d7 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -1,4 +1,3 @@
-## HDF5 Library Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -12,6 +11,8 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
+## HDF5 Library Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index b6b979e0fb..6918d32d78 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -1,4 +1,3 @@
-## HDF5 Library Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -11,7 +10,9 @@
 ## is linked from the top-level documents page.  It can also be found at
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-## 
+##
+## HDF5 Library Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 9e98a73cd4..acd4fa19b1 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -1,4 +1,3 @@
-## HDF5 Library Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -12,6 +11,7 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
+## HDF5 Library Makefile(.in)
 ## 
 top_srcdir=@top_srcdir@
 top_builddir=../..