HDFFV-10384 and includes cleanup merged from devlop

23 files changed, 18 insertions, 51 deletions

diff --git a/test/chunk_info.c b/test/chunk_info.c
index 1f19963..e3006cc 100644
--- a/test/chunk_info.c
+++ b/test/chunk_info.c
@@ -21,7 +21,6 @@
  */
 
 
-#include "hdf5.h"
 #include "h5test.h"
 
 #define PRINT_DATA
diff --git a/test/dangle.c b/test/dangle.c
index 1717d12..62b1d1b 100644
--- a/test/dangle.c
+++ b/test/dangle.c
@@ -15,10 +15,9 @@
  * Programmer:  Quincey Koziol <koziol@ncsa.uiuc.edu>
  *              Tuesday, May 13, 2003
  *
- * Purpose:	Test dangling IDs
+ * Purpose:    Test dangling IDs
  */
 #include "h5test.h"
-#include "H5private.h"
 
 const char *FILENAME[] = {
     "dangle",
diff --git a/test/gen_cross.c b/test/gen_cross.c
index cf3fc35..60ae319 100644
--- a/test/gen_cross.c
+++ b/test/gen_cross.c
@@ -26,7 +26,6 @@
  *  worth keeping around for now.
  */
 
-#include <stdio.h>
 #include "h5test.h"
 
 #define H5FILE_NAME        "data.h5"
diff --git a/test/gheap.c b/test/gheap.c
index 7564afa..c354366 100644
--- a/test/gheap.c
+++ b/test/gheap.c
@@ -20,9 +20,7 @@
  *		another by anything that appears in the file format.
  */
 #include "h5test.h"
-#include "H5private.h"
 #include "H5ACprivate.h"
-#include "H5Eprivate.h"
 #include "H5Fprivate.h"
 #include "H5Gprivate.h"
 #include "H5HGprivate.h"
diff --git a/test/h5test.h b/test/h5test.h
index ce5c64d..8e87192 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -20,8 +20,13 @@
 #ifndef _H5TEST_H
 #define _H5TEST_H
 
+/*
+ * Include required headers.  This file tests internal library functions,
+ * so we include the private headers here.
+ */
 #include "hdf5.h"
 #include "H5private.h"
+#include "H5Eprivate.h"
 
 /*
  * Predefined test verbosity levels.
diff --git a/test/hyperslab.c b/test/hyperslab.c
index c28d872..6c754db 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -21,8 +21,6 @@
  *		rewrite much of the hyperslab stuff.
  */
 #include "h5test.h"
-#include "H5private.h"
-#include "H5Eprivate.h"
 #include "H5VMprivate.h"
 
 #define TEST_SMALL	0x0001
diff --git a/test/istore.c b/test/istore.c
index c401e87..90dbcfe 100644
--- a/test/istore.c
+++ b/test/istore.c
@@ -20,15 +20,13 @@
 #define H5F_FRIEND		/*suppress error about including H5Fpkg	  */
 
 #include "h5test.h"
-#include "H5private.h"
+
 #include "H5Dprivate.h"
-#include "H5Eprivate.h"
 #include "H5Iprivate.h"
 #include "H5Pprivate.h"
 #include "H5Fpkg.h"
 #include "H5Gprivate.h"
 #include "H5Oprivate.h"
-#include "H5Pprivate.h"
 #include "H5VMprivate.h"
 
 const char *FILENAME[] = {
diff --git a/test/swmr.c b/test/swmr.c
index 3b1bd09..0b352e2 100644
--- a/test/swmr.c
+++ b/test/swmr.c
@@ -24,7 +24,6 @@
 *
 *************************************************************/
 
-#include "hdf5.h"
 #include "h5test.h"
 #include "H5Iprivate.h"
 
diff --git a/test/tarray.c b/test/tarray.c
index b2e0ee7..3ce0f6a 100644
--- a/test/tarray.c
+++ b/test/tarray.c
@@ -22,8 +22,6 @@
 #include "testhdf5.h"
 #include "H5srcdir.h"
 
-#include "hdf5.h"
-
 #define FILENAME   "tarray1.h5"
 #define TESTFILE   "tarrold.h5"
 
diff --git a/test/tattr.c b/test/tattr.c
index 2d333e9..57b0e64 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -20,8 +20,6 @@
 *************************************************************/
 
 #include "testhdf5.h"
-#include "h5test.h"
-#include "hdf5.h"
 
 /*
  * This file needs to access private information from the H5O package.
diff --git a/test/tconfig.c b/test/tconfig.c
index a9f3378..7fbdf36 100644
--- a/test/tconfig.c
+++ b/test/tconfig.c
@@ -19,7 +19,6 @@
 *
 *************************************************************/
 
-#include "hdf5.h"
 #include "testhdf5.h"
 
 /* macros definitions */
diff --git a/test/testhdf5.h b/test/testhdf5.h
index 127c687..1f3f6a0 100644
--- a/test/testhdf5.h
+++ b/test/testhdf5.h
@@ -18,13 +18,6 @@
 #ifndef TESTHDF5_H
 #define TESTHDF5_H
 
-/*
- * Include required headers.  This file tests internal library functions,
- * so we include the private headers here.
- */
-#include "H5private.h"
-#include "H5Eprivate.h"
-
 /* Include generic testing header also */
 #include "h5test.h"
 
@@ -204,12 +197,12 @@ void                    test_vlstrings(void);
 void                    test_iterate(void);
 void                    test_array(void);
 void                    test_genprop(void);
-void			test_configure(void);
-void			test_misc(void);
-void			test_ids(void);
-void			test_skiplist(void);
-void			test_sohm(void);
-void			test_unicode(void);
+void            test_configure(void);
+void            test_misc(void);
+void            test_ids(void);
+void            test_skiplist(void);
+void            test_sohm(void);
+void            test_unicode(void);
 
 /* Prototypes for the cleanup routines */
 void                    cleanup_metadata(void);
@@ -227,10 +220,10 @@ void                    cleanup_vlstrings(void);
 void                    cleanup_iterate(void);
 void                    cleanup_array(void);
 void                    cleanup_genprop(void);
-void			cleanup_configure(void);
-void			cleanup_sohm(void);
-void			cleanup_misc(void);
-void			cleanup_unicode(void);
+void            cleanup_configure(void);
+void            cleanup_sohm(void);
+void            cleanup_misc(void);
+void            cleanup_unicode(void);
 
 #ifdef __cplusplus
 }
diff --git a/test/tfile.c b/test/tfile.c
index 80ba4da..9391458 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -19,7 +19,6 @@
 *
 *************************************************************/
 
-#include "hdf5.h"
 #include "testhdf5.h"
 #include "H5srcdir.h"
 
diff --git a/test/tgenprop.c b/test/tgenprop.c
index 0e6b5c9..582b36e 100644
--- a/test/tgenprop.c
+++ b/test/tgenprop.c
@@ -25,7 +25,7 @@
 #define H5P_TESTING
 
 #include "testhdf5.h"
-#include "hdf5.h"
+
 #include "H5Dprivate.h"         /* For Dataset creation property list names */
 #include "H5Ppkg.h"		/* Generic Properties			*/
 
diff --git a/test/th5s.c b/test/th5s.c
index 99e40d5..9712bf1 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -22,7 +22,6 @@
 #include "testhdf5.h"
 #include "H5srcdir.h"
 
-#include "H5private.h"
 #include "H5Bprivate.h"
 #include "H5Sprivate.h"
 #include "H5Pprivate.h"
diff --git a/test/tid.c b/test/tid.c
index 7d6757f..7545e16 100644
--- a/test/tid.c
+++ b/test/tid.c
@@ -14,7 +14,6 @@
 /* Test user-created identifiers (hid_t's) and identifier types. */
 
 #include "testhdf5.h"
-#include "hdf5.h"
 
 /* Include H5Ipkg.h to calculate max number of groups */
 #define H5I_FRIEND		/*suppress error about including H5Ipkg	  */
diff --git a/test/titerate.c b/test/titerate.c
index 231bd2e..98588f9 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -21,8 +21,6 @@
 
 #include "testhdf5.h"
 
-#include "hdf5.h"
-
 #define DATAFILE   "titerate.h5"
 
 /* Number of datasets for group iteration test */
diff --git a/test/tmisc.c b/test/tmisc.c
index f0e595b..5825656 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -26,7 +26,6 @@
 /* Define this macro to indicate that the testing APIs should be available */
 #define H5D_TESTING
 
-#include "hdf5.h"
 #include "testhdf5.h"
 #include "H5srcdir.h"
 #include "H5Dpkg.h"         /* Datasets                 */
diff --git a/test/trefer.c b/test/trefer.c
index 6ab649e..ec9428f 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -21,8 +21,6 @@
 
 #include "testhdf5.h"
 
-#include "hdf5.h"
-
 #define FILE1   "trefer1.h5"
 #define FILE2	"trefer2.h5"
 #define FILE3	"trefer3.h5"
diff --git a/test/ttime.c b/test/ttime.c
index 2eb2117..0df7422 100644
--- a/test/ttime.c
+++ b/test/ttime.c
@@ -21,8 +21,6 @@
 
 #include "testhdf5.h"
 
-#include "hdf5.h"
-
 #define DATAFILE   "ttime.h5"
 #ifdef NOT_YET
 #define DATASETNAME   "Dataset"
diff --git a/test/ttsafe.h b/test/ttsafe.h
index 6cf449f..c29fadc 100644
--- a/test/ttsafe.h
+++ b/test/ttsafe.h
@@ -22,9 +22,6 @@
  * Include required headers.  This file tests internal library functions,
  * so we include the private headers here.
  */
-#include "hdf5.h"
-#include "H5private.h"
-#include "H5Eprivate.h"
 #include "testhdf5.h"
 
 
diff --git a/test/tvlstr.c b/test/tvlstr.c
index 7b520f2..e7593fa 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -21,8 +21,6 @@
 
 #include "testhdf5.h"
 
-#include "hdf5.h"
-
 #define DATAFILE   "tvlstr.h5"
 #define DATAFILE2  "tvlstr2.h5"
 
diff --git a/test/tvltypes.c b/test/tvltypes.c
index 0c4cb9d..ef154a2 100644
--- a/test/tvltypes.c
+++ b/test/tvltypes.c
@@ -21,7 +21,6 @@
 
 #include "testhdf5.h"
 
-#include "hdf5.h"
 #include "H5Dprivate.h"
 
 #define FILENAME   "tvltypes.h5"