diff --git a/test/cache.c b/test/cache.c
index 9ca48e7a71..a2bfa9114f 100644
--- a/test/cache.c
+++ b/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"
 
 
diff --git a/test/cache_api.c b/test/cache_api.c
index 1d3c9cf08f..a0d6e83fd1 100644
--- a/test/cache_api.c
+++ b/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 */
diff --git a/test/cache_common.c b/test/cache_common.c
index 59328f70a7..bb526c1e8b 100644
--- a/test/cache_common.c
+++ b/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"
diff --git a/test/cache_tagging.c b/test/cache_tagging.c
index 473851e817..74321d3d66 100644
--- a/test/cache_tagging.c
+++ b/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"
 
 /* ============ */
diff --git a/test/genall5.c b/test/genall5.c
index 1d92e96889..8a1e853463 100644
--- a/test/genall5.c
+++ b/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"