Removes staff email addresses from the repository

Removes redundant C library headers from hl library

23 files changed, 449 insertions, 555 deletions

diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c
index c6e4b1b..1d12f56 100644
--- a/hl/fortran/src/H5IMcc.c
+++ b/hl/fortran/src/H5IMcc.c
@@ -34,7 +34,7 @@ herr_t H5IM_get_palette(hid_t loc_id,
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -127,7 +127,7 @@ herr_t H5IMmake_image_8bitf(hid_t loc_id,
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -244,7 +244,7 @@ herr_t H5IMmake_image_24bitf(hid_t loc_id,
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -302,7 +302,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -395,7 +395,7 @@ herr_t H5IMmake_palettef(hid_t loc_id,
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -434,7 +434,7 @@ herr_t H5IMget_palettef(hid_t loc_id,
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
diff --git a/hl/fortran/src/H5IMfc.c b/hl/fortran/src/H5IMfc.c
index cafd623..638cea4 100644
--- a/hl/fortran/src/H5IMfc.c
+++ b/hl/fortran/src/H5IMfc.c
@@ -24,7 +24,7 @@
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 05, 2004
 *
@@ -85,7 +85,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 05, 2004
 *
@@ -138,7 +138,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 05, 2004
 *
@@ -207,7 +207,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 05, 2004
 *
@@ -292,7 +292,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 06, 2004
 *
@@ -341,7 +341,7 @@ h5imis_image_c(hid_t_f *loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 06, 2004
 *
@@ -396,7 +396,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 06, 2004
 *
@@ -461,7 +461,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 06, 2004
 *
@@ -527,7 +527,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 06 2004
 *
@@ -588,7 +588,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 06 2004
 *
@@ -655,7 +655,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 06 2004
 *
@@ -714,7 +714,7 @@ done:
 *
 * Return: true, false, fail
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 06, 2004
 *
diff --git a/hl/fortran/src/H5IMff.F90 b/hl/fortran/src/H5IMff.F90
index ffa18aa..3438e7f 100644
--- a/hl/fortran/src/H5IMff.F90
+++ b/hl/fortran/src/H5IMff.F90
@@ -41,7 +41,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -95,7 +95,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -142,7 +142,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -204,7 +204,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -267,7 +267,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -313,7 +313,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -364,7 +364,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -416,7 +416,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -467,7 +467,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -516,7 +516,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -567,7 +567,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -619,7 +619,7 @@ CONTAINS
 !
 ! Return: true, false, fail
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c
index 3597c3a..2c4f274 100644
--- a/hl/fortran/src/H5LTfc.c
+++ b/hl/fortran/src/H5LTfc.c
@@ -24,7 +24,7 @@
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 09, 2004
 *
@@ -94,7 +94,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 09, 2004
 *
@@ -153,7 +153,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 09, 2004
 *
@@ -218,7 +218,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 09, 2004
 *
@@ -274,7 +274,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 05, 2004
 *
@@ -373,7 +373,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 05, 2004
 *
@@ -460,7 +460,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 05, 2004
 *
@@ -535,7 +535,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 09, 2004
 *
@@ -595,7 +595,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 09, 2004
 *
@@ -643,7 +643,7 @@ h5ltfind_dataset_c(hid_t_f *loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 09, 2004
 *
@@ -722,7 +722,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 05, 2004
 *
@@ -791,7 +791,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 09, 2004
 *
diff --git a/hl/fortran/src/H5LTff.F90 b/hl/fortran/src/H5LTff.F90
index bc8734f..5cd255c 100644
--- a/hl/fortran/src/H5LTff.F90
+++ b/hl/fortran/src/H5LTff.F90
@@ -164,7 +164,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 1, 2004
   !
@@ -385,7 +385,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 22, 2004
   !
@@ -426,7 +426,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 22, 2004
   !
@@ -595,7 +595,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 22, 2004
   !
@@ -770,7 +770,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 22, 2004
   !
@@ -933,7 +933,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 22, 2004
   !
@@ -983,7 +983,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 22, 2004
   !
@@ -1092,7 +1092,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1143,7 +1143,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1193,7 +1193,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1245,7 +1245,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1350,7 +1350,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1397,7 +1397,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1443,7 +1443,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1490,7 +1490,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1551,7 +1551,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 30, 2004
   !
@@ -1600,7 +1600,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1644,7 +1644,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 30, 2004
   !
@@ -1703,7 +1703,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1757,7 +1757,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 30, 2004
   !
diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c
index 285cd84..bd582e4 100644
--- a/hl/fortran/src/H5TBfc.c
+++ b/hl/fortran/src/H5TBfc.c
@@ -26,7 +26,7 @@
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 06, 2004
 *
@@ -301,7 +301,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 12, 2004
 *
@@ -350,7 +350,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 12, 2004
 *
@@ -398,7 +398,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 12, 2004
 *
@@ -443,7 +443,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 12, 2004
 *
@@ -487,7 +487,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 13, 2004
 *
@@ -534,7 +534,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 13, 2004
 *
@@ -580,7 +580,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 12, 2004
 *
@@ -627,7 +627,7 @@ done:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 13, 2004
 *
diff --git a/hl/fortran/src/H5TBff.F90 b/hl/fortran/src/H5TBff.F90
index c3db01e..e39af97 100644
--- a/hl/fortran/src/H5TBff.F90
+++ b/hl/fortran/src/H5TBff.F90
@@ -172,7 +172,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -424,7 +424,7 @@ CONTAINS
 !
 ! Purpose: Writes one field
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 12, 2004
 !
@@ -505,7 +505,7 @@ CONTAINS
 !
 ! Purpose: Reads one field
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 12, 2004
 !
@@ -586,7 +586,7 @@ CONTAINS
 !
 ! Purpose: Writes one field
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 12, 2004
 !
@@ -661,7 +661,7 @@ CONTAINS
 !
 ! Purpose: Reads one field
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 12, 2004
 !
@@ -734,7 +734,7 @@ CONTAINS
 !
 ! Purpose: Inserts one field
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 13, 2004
 !
@@ -807,7 +807,7 @@ CONTAINS
 !
 ! Purpose: Inserts one field
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 13, 2004
 !
@@ -858,7 +858,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 13, 2004
 !
@@ -909,7 +909,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 13, 2004
 !
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c
index 82dc129..12bcc93 100644
--- a/hl/src/H5DS.c
+++ b/hl/src/H5DS.c
@@ -11,9 +11,6 @@
  * help@hdfgroup.org.                                                        *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 #include "H5DSprivate.h"
 #include "H5LTprivate.h"
 #include "H5IMprivate.h"
@@ -25,29 +22,24 @@ static herr_t H5DS_is_reserved(hid_t did);
 static hid_t H5DS_get_REFLIST_type(void);
 
 /*-------------------------------------------------------------------------
-* Function: H5DSset_scale
-*
-* Purpose: The dataset DSID is converted to a Dimension Scale dataset.
-*   Creates the CLASS attribute, set to the value "DIMENSION_SCALE"
-*   and an empty REFERENCE_LIST attribute.
-*   If DIMNAME is specified, then an attribute called NAME is created,
-*   with the value DIMNAME.
-*
-* Return: Success: SUCCEED, Failure: FAIL
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 04, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5DSset_scale(hid_t dsid,
-                     const char *dimname)
+ * Function: H5DSset_scale
+ *
+ * Purpose: The dataset DSID is converted to a Dimension Scale dataset.
+ *   Creates the CLASS attribute, set to the value "DIMENSION_SCALE"
+ *   and an empty REFERENCE_LIST attribute.
+ *   If DIMNAME is specified, then an attribute called NAME is created,
+ *   with the value DIMNAME.
+ *
+ * Return: Success: SUCCEED, Failure: FAIL
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: January 04, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5DSset_scale(hid_t dsid, const char *dimname)
 {
     int has_dimlist;
     H5I_type_t it;
@@ -95,34 +87,28 @@ herr_t H5DSset_scale(hid_t dsid,
 
 
 /*-------------------------------------------------------------------------
-* Function: H5DSattach_scale
-*
-* Purpose: Define Dimension Scale DSID to be associated with dimension IDX
-*  of Dataset DID. Entries are created in the DIMENSION_LIST and
-*  REFERENCE_LIST attributes.
-*
-* Return:
-*   Success: SUCCEED
-*   Failure: FAIL
-*
-* Fails if: Bad arguments
-*           If DSID is not a Dimension Scale
-*           If DID is a Dimension Scale (A Dimension Scale cannot have scales)
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: December 20, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5DSattach_scale(hid_t did,
-                        hid_t dsid,
-                        unsigned int idx)
+ * Function: H5DSattach_scale
+ *
+ * Purpose: Define Dimension Scale DSID to be associated with dimension IDX
+ *  of Dataset DID. Entries are created in the DIMENSION_LIST and
+ *  REFERENCE_LIST attributes.
+ *
+ * Return:
+ *   Success: SUCCEED
+ *   Failure: FAIL
+ *
+ * Fails if: Bad arguments
+ *           If DSID is not a Dimension Scale
+ *           If DID is a Dimension Scale (A Dimension Scale cannot have scales)
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: December 20, 2004
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx)
 {
     int        has_dimlist;
     int        has_reflist;
@@ -547,39 +533,31 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSdetach_scale
-*
-* Purpose: If possible, deletes association of Dimension Scale DSID with
-*     dimension IDX of Dataset DID. This deletes the entries in the
-*     DIMENSION_LIST and REFERENCE_LIST attributes.
-*
-* Return:
-*   Success: SUCCEED
-*   Failure: FAIL
-*
-* Fails if: Bad arguments
-*           The dataset DID or DSID do not exist.
-*           The DSID is not a Dimension Scale
-*           DSID is not attached to DID.
-* Note that a scale may be associated with more than dimension of the same dataset.
-* If so, the detach operation only deletes one of the associations, for DID.
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: December 20, 2004
-*
-* Comments:
-*
-* Modifications: Function didn't delete DIMENSION_LIST attribute, when
-*                all dimension scales were detached from a dataset; added.
-*                                                           2010/05/13 EIP
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5DSdetach_scale(hid_t did,
-                        hid_t dsid,
-                        unsigned int idx)
+ * Function: H5DSdetach_scale
+ *
+ * Purpose: If possible, deletes association of Dimension Scale DSID with
+ *     dimension IDX of Dataset DID. This deletes the entries in the
+ *     DIMENSION_LIST and REFERENCE_LIST attributes.
+ *
+ * Return:
+ *   Success: SUCCEED
+ *   Failure: FAIL
+ *
+ * Fails if: Bad arguments
+ *           The dataset DID or DSID do not exist.
+ *           The DSID is not a Dimension Scale
+ *           DSID is not attached to DID.
+ * Note that a scale may be associated with more than dimension of the same dataset.
+ * If so, the detach operation only deletes one of the associations, for DID.
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: December 20, 2004
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx)
 {
     int        has_dimlist;
     int        has_reflist;
@@ -940,35 +918,29 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSis_attached
-*
-* Purpose: Report if dimension scale DSID is currently attached to
-*  dimension IDX of dataset DID by checking if DID has a pointer in the REFERENCE_LIST
-*  attribute and DSID (scale ) has a pointer in the DIMENSION_LIST attribute
-*
-* Return:
-*   1: both the DS and the dataset pointers match
-*   0: one of them or both do not match
-*   FAIL (-1): error
-*
-* Fails if: Bad arguments
-*           If DSID is not a Dimension Scale
-*           If DID is a Dimension Scale (A Dimension Scale cannot have scales)
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: February 18, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-htri_t H5DSis_attached(hid_t did,
-                       hid_t dsid,
-                       unsigned int idx)
+ * Function: H5DSis_attached
+ *
+ * Purpose: Report if dimension scale DSID is currently attached to
+ *  dimension IDX of dataset DID by checking if DID has a pointer in the REFERENCE_LIST
+ *  attribute and DSID (scale ) has a pointer in the DIMENSION_LIST attribute
+ *
+ * Return:
+ *   1: both the DS and the dataset pointers match
+ *   0: one of them or both do not match
+ *   FAIL (-1): error
+ *
+ * Fails if: Bad arguments
+ *           If DSID is not a Dimension Scale
+ *           If DID is a Dimension Scale (A Dimension Scale cannot have scales)
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: February 18, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+htri_t
+H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx)
 {
     int        has_dimlist;
     int        has_reflist;
@@ -1249,54 +1221,47 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSiterate_scales
-*
-* Purpose: H5DSiterate_scales iterates over the scales attached to dimension DIM
-*  of dataset DID. For each scale in the list, the visitor_data and some
-*  additional information, specified below, are passed to the visitor function.
-*  The iteration begins with the IDX object in the group and the next element
-*  to be processed by the operator is returned in IDX. If IDX is NULL, then the
-*  iterator starts at zero.
-*
-* Parameters:
-*
-*  hid_t DID;               IN: the dataset
-*  unsigned int DIM;        IN: the dimension of the dataset
-*  int *DS_IDX;             IN/OUT: on input the dimension scale index to start iterating,
-*                               on output the next index to visit. If NULL, start at
-*                               the first position.
-*  H5DS_iterate_t VISITOR;  IN: the visitor function
-*  void *VISITOR_DATA;      IN: arbitrary data to pass to the visitor function.
-*
-*  Iterate over all scales of DIM, calling an application callback
-*   with the item, key and any operator data.
-*
-*   The operator callback receives a pointer to the item ,
-*   and the pointer to the operator data passed
-*   in to H5SL_iterate ('op_data').  The return values from an operator are:
-*       A. Zero causes the iterator to continue, returning zero when all
-*           nodes of that type have been processed.
-*       B. Positive causes the iterator to immediately return that positive
-*           value, indicating short-circuit success.
-*       C. Negative causes the iterator to immediately return that value,
-*           indicating failure.
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 31, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5DSiterate_scales(hid_t did,
-                          unsigned int dim,
-                          int *ds_idx,
-                          H5DS_iterate_t visitor,
-                          void *visitor_data )
+ * Function: H5DSiterate_scales
+ *
+ * Purpose: H5DSiterate_scales iterates over the scales attached to dimension DIM
+ *  of dataset DID. For each scale in the list, the visitor_data and some
+ *  additional information, specified below, are passed to the visitor function.
+ *  The iteration begins with the IDX object in the group and the next element
+ *  to be processed by the operator is returned in IDX. If IDX is NULL, then the
+ *  iterator starts at zero.
+ *
+ * Parameters:
+ *
+ *  hid_t DID;               IN: the dataset
+ *  unsigned int DIM;        IN: the dimension of the dataset
+ *  int *DS_IDX;             IN/OUT: on input the dimension scale index to start iterating,
+ *                               on output the next index to visit. If NULL, start at
+ *                               the first position.
+ *  H5DS_iterate_t VISITOR;  IN: the visitor function
+ *  void *VISITOR_DATA;      IN: arbitrary data to pass to the visitor function.
+ *
+ *  Iterate over all scales of DIM, calling an application callback
+ *   with the item, key and any operator data.
+ *
+ *   The operator callback receives a pointer to the item ,
+ *   and the pointer to the operator data passed
+ *   in to H5SL_iterate ('op_data').  The return values from an operator are:
+ *       A. Zero causes the iterator to continue, returning zero when all
+ *           nodes of that type have been processed.
+ *       B. Positive causes the iterator to immediately return that positive
+ *           value, indicating short-circuit success.
+ *       C. Negative causes the iterator to immediately return that value,
+ *           indicating failure.
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: January 31, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5DSiterate_scales(hid_t did, unsigned int dim, int *ds_idx,
+    H5DS_iterate_t visitor, void *visitor_data )
 {
     hid_t        scale_id;
     int          rank;
@@ -1450,20 +1415,20 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSset_label
-*
-* Purpose: Set label for the dimension IDX of dataset DID to the value LABEL
-*
-* Return: Success: SUCCEED, Failure: FAIL
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 11, 2005
-*
-*-------------------------------------------------------------------------
-*/
-
-herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
+ * Function: H5DSset_label
+ *
+ * Purpose: Set label for the dimension IDX of dataset DID to the value LABEL
+ *
+ * Return: Success: SUCCEED, Failure: FAIL
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: January 11, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5DSset_label(hid_t did, unsigned int idx, const char *label)
 {
     int        has_labels;
     hid_t      sid = -1;      /* space ID */
@@ -1655,29 +1620,24 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSget_label
-*
-* Purpose: Read the label LABEL for dimension IDX of dataset DID
-*   Up to 'size' characters are stored in 'label' followed by a '\0' string
-*   terminator.  If the label is longer than 'size'-1,
-*   the string terminator is stored in the last position of the buffer to
-*   properly terminate the string.
-*
-* Return: 0 if no label found, size of label if found, Failure: FAIL
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 11, 2005
-*
-* Comments:
-*
-* Modifications:
-*     JIRA HDFFV-7673: Added a check to see if the label name exists,
-*     if not then returns zero. July 30, 2011. MSB
-*
-*-------------------------------------------------------------------------
-*/
-ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size)
+ * Function: H5DSget_label
+ *
+ * Purpose: Read the label LABEL for dimension IDX of dataset DID
+ *   Up to 'size' characters are stored in 'label' followed by a '\0' string
+ *   terminator.  If the label is longer than 'size'-1,
+ *   the string terminator is stored in the last position of the buffer to
+ *   properly terminate the string.
+ *
+ * Return: 0 if no label found, size of label if found, Failure: FAIL
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: January 11, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+ssize_t
+H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size)
 {
     int        has_labels;
     hid_t      sid = -1;     /* space ID */
@@ -1817,32 +1777,24 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSget_scale_name
-*
-* Purpose: Read the name of dataset scale DID into buffer NAME
-*   Up to 'size' characters are stored in 'name' followed by a '\0' string
-*   terminator.  If the name is longer than 'size'-1,
-*   the string terminator is stored in the last position of the buffer to
-*   properly terminate the string.
-*
-* Return: size of name if found, zero if not found,  Failure: FAIL
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 04, 2005
-*
-* Comments:
-*
-* Modifications:
-*  The size of the name returned should not include the NULL termination
-*  in its value so as to be consistent with other HDF5 APIs.
-*
-*-------------------------------------------------------------------------
-*/
-
-ssize_t H5DSget_scale_name(hid_t did,
-                           char *name,
-                           size_t size)
+ * Function: H5DSget_scale_name
+ *
+ * Purpose: Read the name of dataset scale DID into buffer NAME
+ *   Up to 'size' characters are stored in 'name' followed by a '\0' string
+ *   terminator.  If the name is longer than 'size'-1,
+ *   the string terminator is stored in the last position of the buffer to
+ *   properly terminate the string.
+ *
+ * Return: size of name if found, zero if not found,  Failure: FAIL
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: January 04, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+ssize_t
+H5DSget_scale_name(hid_t did, char *name, size_t size)
 {
     hid_t      aid;      /* attribute ID  */
     hid_t      tid = -1; /* attribute type ID */
@@ -1944,24 +1896,20 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSis_scale
-*
-* Purpose: check if the dataset DID is a dimension scale
-*
-* Return: 1, is, 0, not, FAIL, error
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 04, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-htri_t H5DSis_scale(hid_t did)
+ * Function: H5DSis_scale
+ *
+ * Purpose: check if the dataset DID is a dimension scale
+ *
+ * Return: 1, is, 0, not, FAIL, error
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: January 04, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+htri_t
+H5DSis_scale(hid_t did)
 {
     hid_t      tid = -1;   /* attribute type ID */
     hid_t      aid = -1;   /* attribute ID */
@@ -2047,27 +1995,22 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DSget_num_scales
-*
-* Purpose: get the number of scales linked to the IDX dimension of dataset DID
-*
-* Return:
-*   Success: number of scales
-*   Failure: FAIL
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: January 13, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-int H5DSget_num_scales(hid_t did,
-                       unsigned int idx)
+ * Function: H5DSget_num_scales
+ *
+ * Purpose: get the number of scales linked to the IDX dimension of dataset DID
+ *
+ * Return:
+ *   Success: number of scales
+ *   Failure: FAIL
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: January 13, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+int
+H5DSget_num_scales(hid_t did, unsigned int idx)
 {
     int        has_dimlist;
     hid_t      sid;          /* space ID */
@@ -2170,25 +2113,20 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DS_is_reserved
-*
-* Purpose: Verify that a dataset's CLASS is either an image, palette or table
-*
-* Return: true, false, fail
-*
-* Programmer: pvn@ncsa.uiuc.edu
-*
-* Date: March 19, 2005
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-static
-herr_t H5DS_is_reserved(hid_t did)
+ * Function: H5DS_is_reserved
+ *
+ * Purpose: Verify that a dataset's CLASS is either an image, palette or table
+ *
+ * Return: true, false, fail
+ *
+ * Programmer: Pedro Vicente
+ *
+ * Date: March 19, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5DS_is_reserved(hid_t did)
 {
     int    has_class;
     hid_t  tid = -1;
@@ -2261,26 +2199,21 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5DS_get_REFLIST_type
-*
-* Purpose: This is a helper function to return a native type for
-*          the REFERENCE_LIST attribute.
-*
-* Return: Type identifier on success and negative on failure
-*
-* Programmer: epourmal@hdfgroup.org
-*
-* Date: May 22, 2010
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-
-static
-hid_t H5DS_get_REFLIST_type(void)
+ * Function: H5DS_get_REFLIST_type
+ *
+ * Purpose: This is a helper function to return a native type for
+ *          the REFERENCE_LIST attribute.
+ *
+ * Return: Type identifier on success and negative on failure
+ *
+ * Programmer: Elena Pourmal
+ *
+ * Date: May 22, 2010
+ *
+ *-------------------------------------------------------------------------
+ */
+static hid_t
+H5DS_get_REFLIST_type(void)
 {
     hid_t ntid_t = -1;
 
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index 6f7414b..2b292dc 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -13,8 +13,6 @@
 
 #include "H5IMprivate.h"
 #include "H5LTprivate.h"
-#include <string.h>
-#include <stdlib.h>
 
 /*-------------------------------------------------------------------------
 * Function: H5IMmake_image_8bit
@@ -23,7 +21,7 @@
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente Nunes
 *
 * Date: June 13, 2001
 *
@@ -77,7 +75,7 @@ herr_t H5IMmake_image_8bit( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente Nunes
 *
 * Date: June 13, 2001
 *
@@ -162,7 +160,7 @@ herr_t H5IMmake_image_24bit( hid_t loc_id,
 *
 * Return:
 *
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente Nunes
 *
 * Date: May 28, 2001
 *
@@ -204,7 +202,7 @@ static herr_t find_palette(hid_t loc_id,
 *
 * Return: Success: 1, Failure: 0
 *
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente Nunes
 *
 * Date: May 11, 2001
 *
@@ -230,7 +228,7 @@ herr_t H5IM_find_palette( hid_t loc_id )
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente Nunes
 *
 * Date: July 25, 2001
 *
@@ -412,7 +410,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente Nunes
 *
 * Date: June 13, 2001
 *
@@ -462,7 +460,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente Nunes
 *
 * Date: May 01, 2001
 *
@@ -518,7 +516,7 @@ herr_t H5IMmake_palette( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente Nunes
 *
 * Date: May 01, 2001
 *
@@ -695,7 +693,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente Nunes
 *
 * Date: September 10, 2001
 *
@@ -796,7 +794,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente Nunes
 *
 * Date: July 22, 2001
 *
@@ -887,7 +885,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente Nunes
 *
 * Date: July 22, 2001
 *
@@ -1003,7 +1001,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente Nunes
 *
 * Date: August 30, 2001
 *
@@ -1110,7 +1108,7 @@ out:
 *
 * Return: true, false, fail
 *
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente Nunes
 *
 * Date: August 30, 2001
 *
@@ -1214,7 +1212,7 @@ out:
 *
 * Return: true, false, fail
 *
-* Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente Nunes
 *
 * Date: August 30, 2001
 *
diff --git a/hl/src/H5LD.c b/hl/src/H5LD.c
index 3106ea8..21975d1 100644
--- a/hl/src/H5LD.c
+++ b/hl/src/H5LD.c
@@ -11,10 +11,6 @@
  * help@hdfgroup.org.                                                        *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <stdio.h>
 #include "H5LDprivate.h"
 
 /*-------------------------------------------------------------------------
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index a631533..939f6aa 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -11,11 +11,6 @@
  * help@hdfgroup.org.                                                        *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "H5LTprivate.h"
 
 /* For Lex and Yacc */
@@ -504,7 +499,7 @@ static herr_t H5LT_get_attribute_mem(hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Quincey Koziol, koziol@hdfgroup.org
+* Programmer: Quincey Koziol
 *
 * Date: October 10, 2007
 *
@@ -570,7 +565,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: March 19, 2001
 *
@@ -599,7 +594,7 @@ herr_t H5LTmake_dataset( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 14, 2001
 *
@@ -628,7 +623,7 @@ herr_t H5LTmake_dataset_char( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 14, 2001
 *
@@ -657,7 +652,7 @@ herr_t H5LTmake_dataset_short( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 14, 2001
 *
@@ -688,7 +683,7 @@ herr_t H5LTmake_dataset_int( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 14, 2001
 *
@@ -717,7 +712,7 @@ herr_t H5LTmake_dataset_long( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 14, 2001
 *
@@ -748,7 +743,7 @@ herr_t H5LTmake_dataset_float( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 14, 2001
 *
@@ -778,7 +773,7 @@ herr_t H5LTmake_dataset_double( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 05, 2004
 *
@@ -970,7 +965,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Quincey Koziol, koziol@hdfgroup.org
+* Programmer: Quincey Koziol
 *
 * Date: October 8, 2007
 *
@@ -1012,7 +1007,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: June 13, 2001
 *
@@ -1035,7 +1030,7 @@ herr_t H5LTread_dataset(hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 5, 2001
 *
@@ -1056,7 +1051,7 @@ herr_t H5LTread_dataset_char( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 5, 2001
 *
@@ -1077,7 +1072,7 @@ herr_t H5LTread_dataset_short( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 5, 2001
 *
@@ -1098,7 +1093,7 @@ herr_t H5LTread_dataset_int( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 5, 2001
 *
@@ -1119,7 +1114,7 @@ herr_t H5LTread_dataset_long( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 5, 2001
 *
@@ -1141,7 +1136,7 @@ herr_t H5LTread_dataset_float( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 5, 2001
 *
@@ -1163,7 +1158,7 @@ herr_t H5LTread_dataset_double( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: October 05, 2004
 *
@@ -1216,7 +1211,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 4, 2001
 *
@@ -1272,7 +1267,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 4, 2001
 *  Modified: February 28, 2006: checked for NULL parameters
@@ -1348,7 +1343,7 @@ out:
 *
 * Purpose: operator function used by H5LTfind_dataset
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: June 21, 2001
 *
@@ -1392,7 +1387,7 @@ find_dataset(hid_t loc_id, const char *name, const H5L_info2_t *linfo, void *op_
 * Purpose:  Inquires if a dataset named dset_name exists attached
 *           to the object loc_id.
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: July 15, 2001
 *
@@ -1436,7 +1431,7 @@ H5_GCC_DIAG_ON(cast-qual)
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: July 23, 2001
 *
@@ -1534,7 +1529,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: July 25, 2001
 *
@@ -1613,7 +1608,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 7, 2001
 *
@@ -1643,7 +1638,7 @@ herr_t H5LTset_attribute_char( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: March 8, 2004
 *
@@ -1674,7 +1669,7 @@ herr_t H5LTset_attribute_uchar( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 7, 2001
 *
@@ -1705,7 +1700,7 @@ herr_t H5LTset_attribute_short( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: March 8, 2004
 *
@@ -1736,7 +1731,7 @@ herr_t H5LTset_attribute_ushort( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 7, 2001
 *
@@ -1767,7 +1762,7 @@ herr_t H5LTset_attribute_int( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: March 8, 2004
 *
@@ -1799,7 +1794,7 @@ herr_t H5LTset_attribute_uint( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 7, 2001
 *
@@ -1829,7 +1824,7 @@ herr_t H5LTset_attribute_long( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Elena Pourmal, epourmal@ncsa.uiuc.edu
+* Programmer: Elena Pourmal
 *
 * Date: June 17, 2005
 *
@@ -1861,7 +1856,7 @@ herr_t H5LTset_attribute_long_long( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: March 8, 2004
 *
@@ -1893,7 +1888,7 @@ herr_t H5LTset_attribute_ulong( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: July 25, 2001
 *
@@ -1926,7 +1921,7 @@ herr_t H5LTset_attribute_float( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 7, 2001
 *
@@ -1957,7 +1952,7 @@ herr_t H5LTset_attribute_double( hid_t loc_id,
 *
 * Purpose: operator function used by H5LT_find_attribute
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: June 21, 2001
 *
@@ -1998,7 +1993,7 @@ find_attr(hid_t loc_id, const char *name, const H5A_info_t *ainfo,
 * Purpose: Inquires if an attribute named attr_name exists attached to
 *          the object loc_id.
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: May 17, 2006
 *
@@ -2020,7 +2015,7 @@ herr_t H5LTfind_attribute( hid_t loc_id, const char* attr_name )
 *
 * Purpose: Inquires if an attribute named attr_name exists attached to the object loc_id.
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: June 21, 2001
 *
@@ -2059,7 +2054,7 @@ H5_GCC_DIAG_ON(cast-qual)
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 4, 2001
 *
@@ -2129,7 +2124,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 4, 2001
 *
@@ -2215,7 +2210,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Raymond Lu, slu@ncsa.uiuc.edu
+* Programmer: Raymond Lu
 *
 * Date: October 6, 2004
 *
@@ -2265,7 +2260,7 @@ out:
 *
 * Return:      void
 *
-* Programmer:  Raymond Lu, songyulu@hdfgroup.org
+* Programmer:  Raymond Lu
 *
 * Date:        29 September 2011
 *
@@ -2325,7 +2320,7 @@ out:
 *
 * Return:      void
 *
-* Programmer:  Raymond Lu, slu@ncsa.uiuc.edu
+* Programmer:  Raymond Lu
 *
 * Date:        December 6, 2005
 *
@@ -2489,7 +2484,7 @@ out:
 *
 * Return:      Success: 0, Failure: -1
 *
-* Programmer:  Raymond Lu, slu@ncsa.uiuc.edu
+* Programmer:  Raymond Lu
 *
 * Date:        December 6, 2005
 *
@@ -2536,7 +2531,7 @@ out:
 *
 * Return:      Success: 0, Failure: -1
 *
-* Programmer:  Raymond Lu, slu@ncsa.uiuc.edu
+* Programmer:  Raymond Lu
 *
 * Date:        December 20, 2005
 *
@@ -3101,7 +3096,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 19, 2002
 *
@@ -3153,7 +3148,7 @@ herr_t H5LTget_attribute_string( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 19, 2002
 *
@@ -3182,7 +3177,7 @@ herr_t H5LTget_attribute_char( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: March 8, 2004
 *
@@ -3213,7 +3208,7 @@ herr_t H5LTget_attribute_uchar( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 19, 2002
 *
@@ -3242,7 +3237,7 @@ herr_t H5LTget_attribute_short( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: March 8, 2004
 *
@@ -3273,7 +3268,7 @@ herr_t H5LTget_attribute_ushort( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 19, 2002
 *
@@ -3302,7 +3297,7 @@ herr_t H5LTget_attribute_int( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: March 8, 2004
 *
@@ -3333,7 +3328,7 @@ herr_t H5LTget_attribute_uint( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 19, 2002
 *
@@ -3362,7 +3357,7 @@ herr_t H5LTget_attribute_long( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Elena Pourmal, epourmal@ncsa.uiuc.edu
+* Programmer: Elena Pourmal
 *
 * Date: June 17, 2005
 *
@@ -3392,7 +3387,7 @@ herr_t H5LTget_attribute_long_long( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: March 8, 2004
 *
@@ -3422,7 +3417,7 @@ herr_t H5LTget_attribute_ulong( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 19, 2002
 *
@@ -3454,7 +3449,7 @@ herr_t H5LTget_attribute_float( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 19, 2002
 *
@@ -3486,7 +3481,7 @@ herr_t H5LTget_attribute_double( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 19, 2002
 *
@@ -3525,7 +3520,7 @@ herr_t H5LTget_attribute( hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 19, 2002
 *
@@ -3589,7 +3584,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: September 19, 2002
 *
@@ -3639,7 +3634,7 @@ out:
 *
 * Return: FAIL on error, SUCCESS on success
 *
-* Programmer: pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: January 04, 2005
 *
diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c
index f413bea..fa77ae1 100644
--- a/hl/src/H5PT.c
+++ b/hl/src/H5PT.c
@@ -11,8 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-
 #include "H5PTprivate.h"
 #include "H5TBprivate.h"
 
@@ -53,8 +51,8 @@ static herr_t H5PT_get_index(htbl_t *table_id, hsize_t *pt_index);
  *
  * Return: Success: table ID, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu (Author of H5PTcreate_fl)
- *             James Laird, jlaird@ncsa.uiuc.edu (Author of H5PTcreate_fl)
+ * Programmer: Nat Furrer (Author of H5PTcreate_fl)
+ *             James Laird (Author of H5PTcreate_fl)
  *
  * Date: March 12, 2004
  *
@@ -182,8 +180,8 @@ error:
  *
  * Return: Success: table ID, Failure: Negative
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 12, 2004
  *
@@ -301,8 +299,8 @@ error:
  *
  * Return: Success: table ID, Failure: Negative
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 10, 2004
  *
@@ -426,8 +424,8 @@ H5PT_free_id(void *id)
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 10, 2004
  *
@@ -475,8 +473,8 @@ error:
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: April 21, 2004
  *
@@ -530,8 +528,8 @@ error:
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 12, 2004
  *
@@ -583,8 +581,8 @@ error:
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 10, 2004
  *
@@ -628,8 +626,8 @@ error:
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 12, 2004
  *
@@ -680,8 +678,8 @@ error:
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *  		   James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *  		   James Laird
  *
  * Date: March 12, 2004
  *
@@ -737,8 +735,8 @@ H5PT_get_index(htbl_t *table, hsize_t *pt_index)
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: April 23, 2004
  *
@@ -795,8 +793,8 @@ herr_t H5PTget_index(hid_t table_id, hsize_t *pt_index)
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 12, 2004
  *
@@ -832,8 +830,8 @@ error:
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 12, 2004
  *
@@ -861,8 +859,8 @@ herr_t H5PTis_valid(hid_t table_id)
  *
  * Return: True: 1, False: 0, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: April 14, 2004
  *
@@ -910,8 +908,8 @@ error:
  * Return: Success: SUCCEED, Failure: FAIL
  *          -2 if memory was reclaimed but another error occurred
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: April 12, 2004
  *
diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c
index c54c41f..79d5cef 100644
--- a/hl/src/H5TB.c
+++ b/hl/src/H5TB.c
@@ -11,9 +11,6 @@
  * help@hdfgroup.org.                                                        *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
-
 #include "H5LTprivate.h"
 #include "H5TBprivate.h"
 
@@ -55,7 +52,7 @@ static hid_t H5TB_create_type(hid_t loc_id,
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *             Quincey Koziol
 *
 * Date: January 17, 2001
@@ -275,7 +272,7 @@ out:
 * Return: Success: 0, Failure: -1
 *
 * Programmers:
-*  Pedro Vicente, pvn@ncsa.uiuc.edu
+*  Pedro Vicente
 *  Quincey Koziol
 *
 * Date: November 19, 2001
@@ -345,7 +342,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 19, 2001
 *
@@ -442,7 +439,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 21, 2001
 *
@@ -605,7 +602,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 21, 2001
 *
@@ -778,7 +775,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 20, 2001
 *
@@ -853,7 +850,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 19, 2001
 *
@@ -923,7 +920,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 19, 2001
 *
@@ -1086,7 +1083,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 19, 2001
 *
@@ -1251,7 +1248,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 26, 2001
 *
@@ -1413,7 +1410,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 26, 2001
 *
@@ -1569,7 +1566,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: December 5, 2001
 *
@@ -1701,7 +1698,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: December 10, 2001
 *
@@ -2059,7 +2056,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: January 30, 2002
 *
@@ -2480,7 +2477,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: January 30, 2002
 *
@@ -2934,7 +2931,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: January 30, 2001
 *
@@ -2960,7 +2957,7 @@ herr_t H5TBAget_title(hid_t loc_id,
 *
 * Return: Success: TRUE/FALSE, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: January 30, 2002
 *
@@ -3033,7 +3030,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 19, 2001
 *
@@ -3120,7 +3117,7 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 19, 2001
 *
@@ -3240,7 +3237,7 @@ out:
 *
 * Return: Success: TRUE/FALSE, Failure: N/A
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 19, 2001
 *
@@ -3281,7 +3278,7 @@ hbool_t H5TB_find_field(const char *field, const char *field_list)
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: December 6, 2001
 *
@@ -3345,7 +3342,7 @@ out:
 *
 * Return: Success: the memory type ID, Failure: -1
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: March 31, 2004
 *
@@ -3445,8 +3442,8 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
-*             James Laird, jlaird@ncsa.uiuc.edu
+* Programmer: Nat Furrer
+*             James Laird
 *
 * Date: March 8, 2004
 *
@@ -3512,8 +3509,8 @@ out:
 *
 * Return: Success: 0, Failure: -1
 *
-* Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
-*             James Laird, jlaird@ncsa.uiuc.edu
+* Programmer: Nat Furrer
+*             James Laird
 *
 * Date: March 8, 2004
 *
diff --git a/hl/test/gen_test_ds.c b/hl/test/gen_test_ds.c
index 285ab77..a43af77 100644
--- a/hl/test/gen_test_ds.c
+++ b/hl/test/gen_test_ds.c
@@ -23,8 +23,6 @@
  *              in test_ds.c will read them.
  */
 
-#include <stdlib.h>
-#include <string.h>
 #include "h5hltest.h"
 #include "H5DSpublic.h"
 #include "H5LTpublic.h"
diff --git a/hl/test/h5hltest.h b/hl/test/h5hltest.h
index 85f47bd..6cf5062 100644
--- a/hl/test/h5hltest.h
+++ b/hl/test/h5hltest.h
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Quincey Koziol <koziol@ncsa.uiuc.edu>
+ * Programmer:  Quincey Koziol
  *              Friday, April 28, 2006
  *
  * Purpose:     Test support stuff.
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 79e6f45..5550dd1 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -11,8 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
 #include "h5hltest.h"
 #include "H5srcdir.h"
 #include "H5DSpublic.h"
diff --git a/hl/test/test_dset_append.c b/hl/test/test_dset_append.c
index 1914a08..455c0e8 100644
--- a/hl/test/test_dset_append.c
+++ b/hl/test/test_dset_append.c
@@ -11,10 +11,6 @@
  * help@hdfgroup.org.                                                        *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "h5hltest.h"
 #include "H5DOpublic.h"
 
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index 6d13419..06a0ff3 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -11,10 +11,6 @@
  * help@hdfgroup.org.                                                        *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "h5hltest.h"
 #include "H5srcdir.h"
 #include "H5LTpublic.h"
diff --git a/hl/test/test_ld.c b/hl/test/test_ld.c
index e3cde5d..7de409f 100644
--- a/hl/test/test_ld.c
+++ b/hl/test/test_ld.c
@@ -11,11 +11,6 @@
  * help@hdfgroup.org.                                                        *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <setjmp.h>
 #include "h5hltest.h"
 #include "H5srcdir.h"
 #include "H5LDpublic.h"
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index e6b4668..f3e6e97 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -11,8 +11,6 @@
  * help@hdfgroup.org.                                                        *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
 #include "h5hltest.h"
 #include "H5srcdir.h"
 #include "H5LTpublic.h"
diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c
index 61aebc7..eb28e3d 100644
--- a/hl/test/test_packet.c
+++ b/hl/test/test_packet.c
@@ -11,8 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
 #include "h5hltest.h"
 #include "H5PTpublic.h"
 #include "H5TBpublic.h"
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
index 1d6bcec..cd2e2a4 100644
--- a/hl/test/test_table.c
+++ b/hl/test/test_table.c
@@ -11,8 +11,6 @@
  * help@hdfgroup.org.                                                        *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
 #include "h5hltest.h"
 #include "H5srcdir.h"
 #include "H5TBpublic.h"
diff --git a/hl/tools/gif2h5/h52gifgentst.c b/hl/tools/gif2h5/h52gifgentst.c
index 655563c..c0ad151 100644
--- a/hl/tools/gif2h5/h52gifgentst.c
+++ b/hl/tools/gif2h5/h52gifgentst.c
@@ -22,7 +22,7 @@
  *
  * Purpose: generate files for h52gif testing
  *
- * Programmer: Pedro Vicente, pvn@hdfgroup.org
+ * Programmer: Pedro Vicente
  *
  * Date: March 15, 2007
  *