Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop_merge_cache_image_09

test/cache.c

@@ -19,9 +19,6 @@
  *		This file contains tests for the cache implemented in
  *		H5C.c
  */
-#include "h5test.h"
-#include "H5Iprivate.h"
-#include "H5ACprivate.h"
 #include "cache_common.h"
 
 

test/cache_api.c

@@ -20,9 +20,6 @@
  *		with the cache implemented in H5C.c
  */
 
-#include "h5test.h"
-#include "H5Iprivate.h"
-#include "H5ACprivate.h"
 #include "cache_common.h"
 
 /* extern declarations */

test/cache_common.c

@@ -19,9 +19,6 @@
  *		This file contains common code for tests of the cache
  *		implemented in H5C.c
  */
-#include "h5test.h"
-#include "H5Cprivate.h"
-#include "H5Iprivate.h"
 #include "H5MFprivate.h"
 #include "H5MMprivate.h"
 #include "cache_common.h"

test/cache_tagging.c

@@ -21,11 +21,8 @@
 #include "H5Fpkg.h"
 
 #include "testhdf5.h"
-#include "h5test.h"
 #include "cache_common.h"
 
-#include "H5Iprivate.h"
-#include "H5ACprivate.h"
 #include "H5HLprivate.h"
 
 /* ============ */

test/genall5.c

@@ -21,11 +21,6 @@
  *		of the same name.
  */
 
-#include <assert.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include "hdf5.h"
 #include "cache_common.h"
 #include "genall5.h"