summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/H5A.c2
-rw-r--r--src/H5AC.c1
-rw-r--r--src/H5Adeprec.c1
-rw-r--r--src/H5Aint.c2
-rw-r--r--src/H5Atest.c1
-rw-r--r--src/H5B.c2
-rw-r--r--src/H5B2dbg.c7
-rw-r--r--src/H5Cimage.c1
-rw-r--r--src/H5Ctag.c1
-rw-r--r--src/H5Dbtree.c1
-rw-r--r--src/H5Dcontig.c2
-rw-r--r--src/H5Ddbg.c1
-rw-r--r--src/H5Dfill.c2
-rw-r--r--src/H5Dio.c3
-rw-r--r--src/H5Dmpio.c1
-rw-r--r--src/H5Dnone.c1
-rw-r--r--src/H5Dscatgath.c1
-rw-r--r--src/H5Dsingle.c2
-rw-r--r--src/H5EAcache.c3
-rw-r--r--src/H5EAdblkpage.c1
-rw-r--r--src/H5EApkg.h1
-rw-r--r--src/H5ES.c1
-rw-r--r--src/H5ESlist.c7
-rw-r--r--src/H5FAcache.c3
-rw-r--r--src/H5FAdbg.c1
-rw-r--r--src/H5FD.c1
-rw-r--r--src/H5FDfamily.c1
-rw-r--r--src/H5FDmpi.c3
-rw-r--r--src/H5FDperform.c9
-rw-r--r--src/H5FDsec2.c1
-rw-r--r--src/H5FDwindows.c4
-rw-r--r--src/H5FScache.c1
-rw-r--r--src/H5Fdeprec.c1
-rw-r--r--src/H5Fint.c1
-rw-r--r--src/H5Fio.c1
-rw-r--r--src/H5Fmount.c4
-rw-r--r--src/H5Fsuper.c1
-rw-r--r--src/H5Fsuper_cache.c2
-rw-r--r--src/H5Gcache.c2
-rw-r--r--src/H5Gdeprec.c1
-rw-r--r--src/H5Gent.c1
-rw-r--r--src/H5Glink.c1
-rw-r--r--src/H5Gname.c1
-rw-r--r--src/H5Gobj.c15
-rw-r--r--src/H5Groot.c2
-rw-r--r--src/H5Gtraverse.c1
-rw-r--r--src/H5HF.c2
-rw-r--r--src/H5HFcache.c2
-rw-r--r--src/H5HFdbg.c1
-rw-r--r--src/H5HFman.c2
-rw-r--r--src/H5HFsection.c1
-rw-r--r--src/H5HGcache.c1
-rw-r--r--src/H5HGdbg.c1
-rw-r--r--src/H5Lexternal.c2
-rw-r--r--src/H5MF.c1
-rw-r--r--src/H5O.c1
-rw-r--r--src/H5Ocache.c2
-rw-r--r--src/H5Ocont.c1
-rw-r--r--src/H5Ocopy.c3
-rw-r--r--src/H5Odbg.c1
-rw-r--r--src/H5Odtype.c1
-rw-r--r--src/H5Ofill.c1
-rw-r--r--src/H5Olayout.c2
-rw-r--r--src/H5Olink.c2
-rw-r--r--src/H5Omessage.c1
-rw-r--r--src/H5Omtime.c1
-rw-r--r--src/H5Opline.c1
-rw-r--r--src/H5Osdspace.c2
-rw-r--r--src/H5Oshared.c1
-rw-r--r--src/H5Otest.c1
-rw-r--r--src/H5PB.c1
-rw-r--r--src/H5PLint.c9
-rw-r--r--src/H5PLplugin_cache.c1
-rw-r--r--src/H5Pdcpl.c1
-rw-r--r--src/H5Pdxpl.c2
-rw-r--r--src/H5Pencdec.c1
-rw-r--r--src/H5Pfmpl.c1
-rw-r--r--src/H5Pgcpl.c1
-rw-r--r--src/H5Pint.c6
-rw-r--r--src/H5Plcpl.c1
-rw-r--r--src/H5Pmapl.c1
-rw-r--r--src/H5Pmcpl.c1
-rw-r--r--src/H5Pocpl.c2
-rw-r--r--src/H5Pocpypl.c1
-rw-r--r--src/H5Pstrcpl.c1
-rw-r--r--src/H5Ptest.c1
-rw-r--r--src/H5R.c1
-rw-r--r--src/H5Rdeprec.c1
-rw-r--r--src/H5Rint.c4
-rw-r--r--src/H5SMbtree2.c9
-rw-r--r--src/H5SMcache.c2
-rw-r--r--src/H5SMpkg.h1
-rw-r--r--src/H5SMtest.c1
-rw-r--r--src/H5Snone.c9
-rw-r--r--src/H5Tbit.c1
-rw-r--r--src/H5Tcommit.c1
-rw-r--r--src/H5Tcompound.c1
-rw-r--r--src/H5Tconv.c1
-rw-r--r--src/H5Tdeprec.c2
-rw-r--r--src/H5Tnative.c2
-rw-r--r--src/H5Tvlen.c2
-rw-r--r--src/H5VL.c13
-rw-r--r--src/H5VLdyn_ops.c1
-rw-r--r--src/H5VLnative_datatype.c1
-rw-r--r--src/H5VLnative_file.c1
-rw-r--r--src/H5VLnative_group.c1
-rw-r--r--src/H5VLnative_link.c2
-rw-r--r--src/H5VLnative_object.c1
-rw-r--r--src/H5Z.c1
-rw-r--r--src/H5Zfletcher32.c1
-rw-r--r--src/H5Znbit.c1
-rw-r--r--src/H5Zscaleoffset.c1
-rw-r--r--src/H5Zszip.c1
113 files changed, 38 insertions, 193 deletions
diff --git a/src/H5A.c b/src/H5A.c
index a3bcf01..1db7fd3 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -25,9 +25,7 @@
#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
#include "H5ESprivate.h" /* Event Sets */
-#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
-#include "H5MMprivate.h" /* Memory management */
#include "H5Opkg.h" /* Object headers */
#include "H5Sprivate.h" /* Dataspace functions */
#include "H5VLprivate.h" /* Virtual Object Layer */
diff --git a/src/H5AC.c b/src/H5AC.c
index b752803..6610af8 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -40,7 +40,6 @@
#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fpkg.h" /* Files */
-#include "H5Iprivate.h" /* IDs */
#include "H5Pprivate.h" /* Property lists */
#include "H5SLprivate.h" /* Skip Lists */
diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c
index 7ff2b06..25dd662 100644
--- a/src/H5Adeprec.c
+++ b/src/H5Adeprec.c
@@ -35,7 +35,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Apkg.h" /* Attributes */
#include "H5CXprivate.h" /* API Contexts */
-#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
#include "H5Iprivate.h" /* IDs */
#include "H5Opkg.h" /* Object headers */
diff --git a/src/H5Aint.c b/src/H5Aint.c
index 160e359..15f025c 100644
--- a/src/H5Aint.c
+++ b/src/H5Aint.c
@@ -31,8 +31,6 @@
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5Apkg.h" /* Attributes */
-#include "H5CXprivate.h" /* API Contexts */
-#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
diff --git a/src/H5Atest.c b/src/H5Atest.c
index 1d18b44..141f511 100644
--- a/src/H5Atest.c
+++ b/src/H5Atest.c
@@ -31,7 +31,6 @@
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5Apkg.h" /* Attributes */
-#include "H5ACprivate.h" /* Metadata cache */
#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
#include "H5Iprivate.h" /* IDs */
diff --git a/src/H5B.c b/src/H5B.c
index 041acec..7b71b5f 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -101,10 +101,8 @@
#include "H5Bpkg.h" /* B-link trees */
#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Iprivate.h" /* IDs */
#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
-#include "H5Pprivate.h" /* Property lists */
/****************/
/* Local Macros */
diff --git a/src/H5B2dbg.c b/src/H5B2dbg.c
index 83a70eb..0977a4c 100644
--- a/src/H5B2dbg.c
+++ b/src/H5B2dbg.c
@@ -28,10 +28,9 @@
/***********/
/* Headers */
/***********/
-#include "H5private.h" /* Generic Functions */
-#include "H5B2pkg.h" /* v2 B-trees */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5FLprivate.h" /* Free Lists */
+#include "H5private.h" /* Generic Functions */
+#include "H5B2pkg.h" /* v2 B-trees */
+#include "H5Eprivate.h" /* Error handling */
/****************/
/* Local Macros */
diff --git a/src/H5Cimage.c b/src/H5Cimage.c
index b969054..ec1af78 100644
--- a/src/H5Cimage.c
+++ b/src/H5Cimage.c
@@ -40,7 +40,6 @@
#include "H5Fpkg.h" /* Files */
#include "H5FDprivate.h" /* File drivers */
#include "H5FLprivate.h" /* Free Lists */
-#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
/****************/
diff --git a/src/H5Ctag.c b/src/H5Ctag.c
index 8da6c13..71eb24d 100644
--- a/src/H5Ctag.c
+++ b/src/H5Ctag.c
@@ -37,7 +37,6 @@
#include "H5Eprivate.h" /* Error Handling */
#include "H5Fpkg.h" /* Files */
#include "H5FLprivate.h" /* Free Lists */
-#include "H5MMprivate.h" /* Memory management */
/****************/
/* Local Macros */
diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c
index 4f8a867..6c32c26 100644
--- a/src/H5Dbtree.c
+++ b/src/H5Dbtree.c
@@ -31,7 +31,6 @@
#include "H5Fprivate.h" /* Files */
#include "H5FDprivate.h" /* File drivers */
#include "H5FLprivate.h" /* Free Lists */
-#include "H5Iprivate.h" /* IDs */
#include "H5MFprivate.h" /* File space management */
#include "H5MMprivate.h" /* Memory management */
#include "H5Oprivate.h" /* Object headers */
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index 0407736..0874881 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -36,9 +36,7 @@
#include "H5Iprivate.h" /* IDs */
#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
-#include "H5FOprivate.h" /* File objects */
#include "H5Oprivate.h" /* Object headers */
-#include "H5Pprivate.h" /* Property lists */
#include "H5PBprivate.h" /* Page Buffer */
#include "H5VMprivate.h" /* Vector and array functions */
diff --git a/src/H5Ddbg.c b/src/H5Ddbg.c
index 22777b4..d8a9234 100644
--- a/src/H5Ddbg.c
+++ b/src/H5Ddbg.c
@@ -20,7 +20,6 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
-#include "H5CXprivate.h" /* API Contexts */
#include "H5Dpkg.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
#include "H5Iprivate.h" /* IDs */
diff --git a/src/H5Dfill.c b/src/H5Dfill.c
index 12cc3ea..447a22d 100644
--- a/src/H5Dfill.c
+++ b/src/H5Dfill.c
@@ -29,11 +29,9 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
-#include "H5CXprivate.h" /* API Contexts */
#include "H5Dpkg.h" /* Dataset functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free Lists */
-#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5VMprivate.h" /* Vector and array functions */
#include "H5WBprivate.h" /* Wrapped Buffers */
diff --git a/src/H5Dio.c b/src/H5Dio.c
index 2652f6d..14f8b7f 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -24,12 +24,9 @@
#include "H5Dpkg.h" /* Dataset functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free Lists */
-#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Sprivate.h" /* Dataspace */
-#include "H5VLnative_private.h" /* Native VOL connector */
-
/****************/
/* Local Macros */
/****************/
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c
index de8a27a..7d8ba21 100644
--- a/src/H5Dmpio.c
+++ b/src/H5Dmpio.c
@@ -30,7 +30,6 @@
#include "H5Fprivate.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
#include "H5FLprivate.h" /* Free Lists */
-#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Oprivate.h" /* Object headers */
#include "H5Pprivate.h" /* Property lists */
diff --git a/src/H5Dnone.c b/src/H5Dnone.c
index d4eb918..b319bd2 100644
--- a/src/H5Dnone.c
+++ b/src/H5Dnone.c
@@ -34,7 +34,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Dpkg.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
-#include "H5FLprivate.h" /* Free Lists */
#include "H5MFprivate.h" /* File space management */
#include "H5VMprivate.h" /* Vector functions */
diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c
index 4fc32dd..997c72c 100644
--- a/src/H5Dscatgath.c
+++ b/src/H5Dscatgath.c
@@ -24,7 +24,6 @@
#include "H5Dpkg.h" /* Dataset functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free Lists */
-#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
/****************/
diff --git a/src/H5Dsingle.c b/src/H5Dsingle.c
index dd9f235..a08fa10 100644
--- a/src/H5Dsingle.c
+++ b/src/H5Dsingle.c
@@ -30,9 +30,7 @@
#include "H5private.h" /* Generic Functions */
#include "H5Dpkg.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
-#include "H5FLprivate.h" /* Free Lists */
#include "H5MFprivate.h" /* File space management */
-#include "H5VMprivate.h" /* Vector functions */
/****************/
/* Local Macros */
diff --git a/src/H5EAcache.c b/src/H5EAcache.c
index 36494d3..74a3abe 100644
--- a/src/H5EAcache.c
+++ b/src/H5EAcache.c
@@ -35,10 +35,7 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5EApkg.h" /* Extensible Arrays */
-#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
-#include "H5VMprivate.h" /* Vectors and arrays */
-#include "H5WBprivate.h" /* Wrapped Buffers */
/****************/
/* Local Macros */
diff --git a/src/H5EAdblkpage.c b/src/H5EAdblkpage.c
index c13b519..1fd04b2 100644
--- a/src/H5EAdblkpage.c
+++ b/src/H5EAdblkpage.c
@@ -36,7 +36,6 @@
#include "H5Eprivate.h" /* Error handling */
#include "H5EApkg.h" /* Extensible Arrays */
#include "H5FLprivate.h" /* Free Lists */
-#include "H5VMprivate.h" /* Vectors and arrays */
/****************/
/* Local Macros */
diff --git a/src/H5EApkg.h b/src/H5EApkg.h
index e8b5a13..3dd2a2d 100644
--- a/src/H5EApkg.h
+++ b/src/H5EApkg.h
@@ -27,6 +27,7 @@
/* Other private headers needed by this file */
#include "H5FLprivate.h" /* Free Lists */
+#include "H5VMprivate.h" /* Vectors and arrays */
/**************************/
/* Package Private Macros */
diff --git a/src/H5ES.c b/src/H5ES.c
index 24452f9..1c8b087 100644
--- a/src/H5ES.c
+++ b/src/H5ES.c
@@ -35,7 +35,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5ESpkg.h" /* Event Sets */
-#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
diff --git a/src/H5ESlist.c b/src/H5ESlist.c
index 1022e63..90eef90 100644
--- a/src/H5ESlist.c
+++ b/src/H5ESlist.c
@@ -32,10 +32,9 @@
/***********/
/* Headers */
/***********/
-#include "H5private.h" /* Generic Functions */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5ESpkg.h" /* Event Sets */
-#include "H5FLprivate.h" /* Free Lists */
+#include "H5private.h" /* Generic Functions */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5ESpkg.h" /* Event Sets */
/****************/
/* Local Macros */
diff --git a/src/H5FAcache.c b/src/H5FAcache.c
index 5aa06f6..2920dd1 100644
--- a/src/H5FAcache.c
+++ b/src/H5FAcache.c
@@ -35,10 +35,7 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FApkg.h" /* Fixed Arrays */
-#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
-#include "H5VMprivate.h" /* Vectors and arrays */
-#include "H5WBprivate.h" /* Wrapped Buffers */
/****************/
/* Local Macros */
diff --git a/src/H5FAdbg.c b/src/H5FAdbg.c
index e28f678..1e624b3 100644
--- a/src/H5FAdbg.c
+++ b/src/H5FAdbg.c
@@ -35,7 +35,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FApkg.h" /* Fixed Arrays */
-#include "H5Oprivate.h" /* Object Header */
#include "H5VMprivate.h" /* Vector functions */
/****************/
diff --git a/src/H5FD.c b/src/H5FD.c
index f89fdd9..f8ad027 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -30,7 +30,6 @@
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5CXprivate.h" /* API Contexts */
-#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fpkg.h" /* File access */
#include "H5FDpkg.h" /* File Drivers */
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c
index 9173e5b..9899b2e 100644
--- a/src/H5FDfamily.c
+++ b/src/H5FDfamily.c
@@ -31,7 +31,6 @@
#include "H5FDdrvr_module.h" /* This source code file is part of the H5FD driver module */
#include "H5private.h" /* Generic Functions */
-#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
diff --git a/src/H5FDmpi.c b/src/H5FDmpi.c
index f247c34..bfa2125 100644
--- a/src/H5FDmpi.c
+++ b/src/H5FDmpi.c
@@ -15,12 +15,9 @@
*/
#include "H5private.h" /* Generic Functions */
-#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Fprivate.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDmpi.h" /* Common MPI file driver */
-#include "H5Pprivate.h" /* Property lists */
#ifdef H5_HAVE_PARALLEL
diff --git a/src/H5FDperform.c b/src/H5FDperform.c
index 62097f1..f07abd4 100644
--- a/src/H5FDperform.c
+++ b/src/H5FDperform.c
@@ -19,11 +19,10 @@
/***********/
/* Headers */
/***********/
-#include "H5private.h" /* Generic Functions */
-#include "H5CXprivate.h" /* API Contexts */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5FDpkg.h" /* File Drivers */
-#include "H5Iprivate.h" /* IDs */
+#include "H5private.h" /* Generic Functions */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5FDpkg.h" /* File Drivers */
+#include "H5Iprivate.h" /* IDs */
/*-------------------------------------------------------------------------
* Function: H5FDperform_init
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index c4bfbff..59f833e 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -28,7 +28,6 @@
#include "H5FDsec2.h" /* Sec2 file driver */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
-#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
/* The driver identification number, initialized at runtime */
diff --git a/src/H5FDwindows.c b/src/H5FDwindows.c
index e38a4d3..71078cd 100644
--- a/src/H5FDwindows.c
+++ b/src/H5FDwindows.c
@@ -12,13 +12,9 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Fprivate.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDwindows.h" /* Windows file driver */
#include "H5FDsec2.h" /* Windows file driver */
-#include "H5FLprivate.h" /* Free Lists */
-#include "H5Iprivate.h" /* IDs */
-#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
#ifdef H5_HAVE_WINDOWS
diff --git a/src/H5FScache.c b/src/H5FScache.c
index f5e9361..94c414f 100644
--- a/src/H5FScache.c
+++ b/src/H5FScache.c
@@ -36,7 +36,6 @@
#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
#include "H5VMprivate.h" /* Vectors and arrays */
-#include "H5WBprivate.h" /* Wrapped Buffers */
/****************/
/* Local Macros */
diff --git a/src/H5Fdeprec.c b/src/H5Fdeprec.c
index bc43ca3..40e5ec3 100644
--- a/src/H5Fdeprec.c
+++ b/src/H5Fdeprec.c
@@ -36,7 +36,6 @@
#include "H5Eprivate.h" /* Error handling */
#include "H5Fpkg.h" /* File access */
#include "H5Iprivate.h" /* IDs */
-#include "H5SMprivate.h" /* Shared object header messages */
#include "H5VLnative_private.h" /* Native VOL connector */
diff --git a/src/H5Fint.c b/src/H5Fint.c
index 7b5aeb4..76515bc 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -29,7 +29,6 @@
#include "H5FDprivate.h" /* File drivers */
#include "H5Gprivate.h" /* Groups */
#include "H5Iprivate.h" /* IDs */
-#include "H5Lprivate.h" /* Links */
#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
diff --git a/src/H5Fio.c b/src/H5Fio.c
index b2c5835..b0c2401 100644
--- a/src/H5Fio.c
+++ b/src/H5Fio.c
@@ -32,7 +32,6 @@
#include "H5Eprivate.h" /* Error handling */
#include "H5Fpkg.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
-#include "H5Iprivate.h" /* IDs */
#include "H5PBprivate.h" /* Page Buffer */
/****************/
diff --git a/src/H5Fmount.c b/src/H5Fmount.c
index 47345f2..6f49746 100644
--- a/src/H5Fmount.c
+++ b/src/H5Fmount.c
@@ -14,15 +14,11 @@
/* Packages needed by this file... */
#include "H5private.h" /* Generic Functions */
-#include "H5ACprivate.h" /* Metadata cache */
-#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fpkg.h" /* File access */
#include "H5Gprivate.h" /* Groups */
-#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
-#include "H5VLprivate.h" /* Virtual Object Layer */
/* PRIVATE PROTOTYPES */
static void H5F__mount_count_ids_recurse(H5F_t *f, unsigned *nopen_files, unsigned *nopen_objs);
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 36ba660..2d27579 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -21,7 +21,6 @@
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5ACprivate.h" /* Metadata cache */
-#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fpkg.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c
index e62cc47..7161b8b 100644
--- a/src/H5Fsuper_cache.c
+++ b/src/H5Fsuper_cache.c
@@ -35,9 +35,7 @@
#include "H5FDprivate.h" /* File drivers */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Gpkg.h" /* Groups */
-#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
-#include "H5Pprivate.h" /* Property lists */
/****************/
/* Local Macros */
diff --git a/src/H5Gcache.c b/src/H5Gcache.c
index f7ba49a..8a90813 100644
--- a/src/H5Gcache.c
+++ b/src/H5Gcache.c
@@ -31,9 +31,7 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Gpkg.h" /* Groups */
-#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
-#include "H5WBprivate.h" /* Wrapped Buffers */
/****************/
/* Local Macros */
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index 5982c12..19493ac 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -32,7 +32,6 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
-#include "H5ACprivate.h" /* Metadata cache */
#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
#include "H5Gpkg.h" /* Groups */
diff --git a/src/H5Gent.c b/src/H5Gent.c
index 0563ae1..5b7c064 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -22,7 +22,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
-#include "H5FLprivate.h" /* Free Lists */
#include "H5Gpkg.h" /* Groups */
#include "H5HLprivate.h" /* Local Heaps */
#include "H5MMprivate.h" /* Memory management */
diff --git a/src/H5Glink.c b/src/H5Glink.c
index fd4d560..b862947 100644
--- a/src/H5Glink.c
+++ b/src/H5Glink.c
@@ -35,7 +35,6 @@
#include "H5Iprivate.h" /* IDs */
#include "H5Lprivate.h" /* Links */
#include "H5MMprivate.h" /* Memory management */
-#include "H5Ppublic.h" /* Property Lists */
#include "H5VLnative_private.h" /* Native VOL connector */
diff --git a/src/H5Gname.c b/src/H5Gname.c
index 1341a2c..38fea86 100644
--- a/src/H5Gname.c
+++ b/src/H5Gname.c
@@ -32,7 +32,6 @@
#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
-#include "H5FLprivate.h" /* Free Lists */
#include "H5Gpkg.h" /* Groups */
#include "H5Iprivate.h" /* IDs */
#include "H5Lprivate.h" /* Links */
diff --git a/src/H5Gobj.c b/src/H5Gobj.c
index c5bdfc1..2b73c2b 100644
--- a/src/H5Gobj.c
+++ b/src/H5Gobj.c
@@ -28,14 +28,13 @@
/***********/
/* Headers */
/***********/
-#include "H5private.h" /* Generic Functions */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5Fprivate.h" /* File access */
-#include "H5Gpkg.h" /* Groups */
-#include "H5Iprivate.h" /* IDs */
-#include "H5Lprivate.h" /* Links */
-#include "H5MMprivate.h" /* Memory management */
-#include "H5Pprivate.h" /* Property Lists */
+#include "H5private.h" /* Generic Functions */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5Fprivate.h" /* File access */
+#include "H5Gpkg.h" /* Groups */
+#include "H5Iprivate.h" /* IDs */
+#include "H5Lprivate.h" /* Links */
+#include "H5Pprivate.h" /* Property Lists */
/****************/
/* Local Macros */
diff --git a/src/H5Groot.c b/src/H5Groot.c
index 0686fa9..7d4a252 100644
--- a/src/H5Groot.c
+++ b/src/H5Groot.c
@@ -33,9 +33,7 @@
#include "H5Eprivate.h" /* Error handling */
#include "H5Fpkg.h" /* File access */
#include "H5Gpkg.h" /* Groups */
-#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
-#include "H5Pprivate.h" /* Property Lists */
/****************/
/* Local Macros */
diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c
index dbb46c1..67f8e47 100644
--- a/src/H5Gtraverse.c
+++ b/src/H5Gtraverse.c
@@ -30,7 +30,6 @@
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5CXprivate.h" /* API Contexts */
-#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
#include "H5Gpkg.h" /* Groups */
diff --git a/src/H5HF.c b/src/H5HF.c
index 3484d45a..856d792 100644
--- a/src/H5HF.c
+++ b/src/H5HF.c
@@ -35,9 +35,7 @@
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
-#include "H5FOprivate.h" /* File objects */
#include "H5HFpkg.h" /* Fractal heaps */
-#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
/****************/
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index ad8e4d2..b214a1c 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -34,8 +34,6 @@
#include "H5HFpkg.h" /* Fractal heaps */
#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
-#include "H5VMprivate.h" /* Vectors and arrays */
-#include "H5WBprivate.h" /* Wrapped Buffers */
/****************/
/* Local Macros */
diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c
index 14fab84..d9a6c19 100644
--- a/src/H5HFdbg.c
+++ b/src/H5HFdbg.c
@@ -31,7 +31,6 @@
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
-#include "H5FLprivate.h" /* Free Lists */
#include "H5HFpkg.h" /* Fractal heaps */
#include "H5MMprivate.h" /* Memory management */
#include "H5VMprivate.h" /* Vectors and arrays */
diff --git a/src/H5HFman.c b/src/H5HFman.c
index b15960a..edbb48e 100644
--- a/src/H5HFman.c
+++ b/src/H5HFman.c
@@ -31,9 +31,7 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5HFpkg.h" /* Fractal heaps */
-#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
-#include "H5VMprivate.h" /* Vectors and arrays */
/****************/
/* Local Macros */
diff --git a/src/H5HFsection.c b/src/H5HFsection.c
index 8b27999..df30f8c 100644
--- a/src/H5HFsection.c
+++ b/src/H5HFsection.c
@@ -27,7 +27,6 @@
#include "H5Eprivate.h" /* Error handling */
#include "H5HFpkg.h" /* Fractal heaps */
#include "H5MMprivate.h" /* Memory management */
-#include "H5VMprivate.h" /* Vectors and arrays */
/****************/
/* Local Macros */
diff --git a/src/H5HGcache.c b/src/H5HGcache.c
index 125d451..6e42a7c 100644
--- a/src/H5HGcache.c
+++ b/src/H5HGcache.c
@@ -32,7 +32,6 @@
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
#include "H5HGpkg.h" /* Global heaps */
-#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
/****************/
diff --git a/src/H5HGdbg.c b/src/H5HGdbg.c
index 0f100e4..8f33052 100644
--- a/src/H5HGdbg.c
+++ b/src/H5HGdbg.c
@@ -27,7 +27,6 @@
#include "H5ACprivate.h" /* Metadata cache */
#include "H5Eprivate.h" /* Error handling */
#include "H5HGpkg.h" /* Global heaps */
-#include "H5Iprivate.h" /* ID Functions */
/****************/
/* Local Macros */
diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c
index 56c3117..89484ea 100644
--- a/src/H5Lexternal.c
+++ b/src/H5Lexternal.c
@@ -21,8 +21,6 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
-#include "H5ACprivate.h" /* Metadata cache */
-#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* Files */
#include "H5Gpkg.h" /* Groups */
diff --git a/src/H5MF.c b/src/H5MF.c
index c8df9e4..2de3e7a 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -34,7 +34,6 @@
#include "H5Eprivate.h" /* Error handling */
#include "H5Fpkg.h" /* File access */
#include "H5FSpkg.h" /* File free space */
-#include "H5Iprivate.h" /* IDs */
#include "H5MFpkg.h" /* File memory management */
#include "H5VMprivate.h" /* Vectors and arrays */
diff --git a/src/H5O.c b/src/H5O.c
index aa43d89..e515e19 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -32,7 +32,6 @@
#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
#include "H5ESprivate.h" /* Event Sets */
-#include "H5Fprivate.h" /* File access */
#include "H5Iprivate.h" /* IDs */
#include "H5Lprivate.h" /* Links */
#include "H5Opkg.h" /* Object headers */
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index 31763f9..53a7d0a 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -31,10 +31,8 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free lists */
-#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
#include "H5Opkg.h" /* Object headers */
-#include "H5WBprivate.h" /* Wrapped Buffers */
/****************/
/* Local Macros */
diff --git a/src/H5Ocont.c b/src/H5Ocont.c
index 6894eca..621095a 100644
--- a/src/H5Ocont.c
+++ b/src/H5Ocont.c
@@ -27,7 +27,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free Lists */
-#include "H5MFprivate.h" /* File memory management */
#include "H5Opkg.h" /* Object headers */
/* PRIVATE PROTOTYPES */
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c
index e4b6dd5..e87a770 100644
--- a/src/H5Ocopy.c
+++ b/src/H5Ocopy.c
@@ -30,18 +30,15 @@
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5Aprivate.h" /* Attributes */
-#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free lists */
#include "H5Iprivate.h" /* IDs */
-#include "H5HGprivate.h" /* Global Heaps */
#include "H5FOprivate.h" /* File objects */
#include "H5Lprivate.h" /* Links */
#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
#include "H5Opkg.h" /* Object headers */
#include "H5Pprivate.h" /* Property lists */
-#include "H5VLprivate.h" /* Virtual Object Layer */
/****************/
/* Local Macros */
diff --git a/src/H5Odbg.c b/src/H5Odbg.c
index bc880bb..dfc8e87 100644
--- a/src/H5Odbg.c
+++ b/src/H5Odbg.c
@@ -32,7 +32,6 @@
#include "H5Eprivate.h" /* Error handling */
#include "H5MMprivate.h" /* Memory management */
#include "H5Opkg.h" /* Object headers */
-#include "H5Ppublic.h" /* Property Lists */
/****************/
/* Local Macros */
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index 620d686..05652df 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -18,7 +18,6 @@
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* Files */
#include "H5FLprivate.h" /* Free Lists */
-#include "H5Gprivate.h" /* Groups */
#include "H5MMprivate.h" /* Memory management */
#include "H5Opkg.h" /* Object headers */
#include "H5Tpkg.h" /* Datatypes */
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index 9eaeb80..c1bb70f 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -21,7 +21,6 @@
#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free Lists */
-#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Opkg.h" /* Object headers */
#include "H5Pprivate.h" /* Property lists */
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 75456d6..fc0f59e 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -21,10 +21,8 @@
#include "H5Dpkg.h" /* Dataset functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free Lists */
-#include "H5MFprivate.h" /* File space management */
#include "H5MMprivate.h" /* Memory management */
#include "H5Opkg.h" /* Object headers */
-#include "H5Pprivate.h" /* Property lists */
/* Local macros */
diff --git a/src/H5Olink.c b/src/H5Olink.c
index 6657a50..431e1dd 100644
--- a/src/H5Olink.c
+++ b/src/H5Olink.c
@@ -19,14 +19,12 @@
*-------------------------------------------------------------------------
*/
-#define H5G_FRIEND /*suppress error about including H5Gpkg */
#define H5L_FRIEND /*suppress error about including H5Lpkg */
#include "H5Omodule.h" /* This source code file is part of the H5O module */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free lists */
-#include "H5Gpkg.h" /* Groups */
#include "H5Iprivate.h" /* IDs */
#include "H5Lpkg.h" /* Links */
#include "H5MMprivate.h" /* Memory management */
diff --git a/src/H5Omessage.c b/src/H5Omessage.c
index bc4381b..7190e46 100644
--- a/src/H5Omessage.c
+++ b/src/H5Omessage.c
@@ -29,7 +29,6 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
-#include "H5Aprivate.h" /* Attributes */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
#include "H5Iprivate.h" /* IDs */
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index 864af93..cd7fba4 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -19,7 +19,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free lists */
-#include "H5MMprivate.h" /* Memory management */
#include "H5Opkg.h" /* Object headers */
static void *H5O__mtime_new_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
diff --git a/src/H5Opline.c b/src/H5Opline.c
index 897fa34..80345d8 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -18,7 +18,6 @@
#define H5Z_FRIEND /*suppress error about including H5Zpkg */
#include "H5private.h" /* Generic Functions */
-#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free Lists */
#include "H5MMprivate.h" /* Memory management */
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c
index cf68a76..1658fa7 100644
--- a/src/H5Osdspace.c
+++ b/src/H5Osdspace.c
@@ -17,8 +17,6 @@
#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free lists */
-#include "H5Gprivate.h" /* Groups */
-#include "H5MMprivate.h" /* Memory management */
#include "H5Opkg.h" /* Object headers */
#include "H5Spkg.h" /* Dataspaces */
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index f53fae5..9c32caf 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -32,7 +32,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
-#include "H5Gprivate.h" /* Groups */
#include "H5HFprivate.h" /* Fractal heap */
#include "H5MMprivate.h" /* Memory management */
#include "H5Opkg.h" /* Object headers */
diff --git a/src/H5Otest.c b/src/H5Otest.c
index 2c23f0c..410baa7 100644
--- a/src/H5Otest.c
+++ b/src/H5Otest.c
@@ -30,7 +30,6 @@
#include "H5ACprivate.h" /* Metadata cache */
#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Iprivate.h" /* IDs */
#include "H5Opkg.h" /* Object headers */
/****************/
diff --git a/src/H5PB.c b/src/H5PB.c
index c671489..b941225 100644
--- a/src/H5PB.c
+++ b/src/H5PB.c
@@ -33,7 +33,6 @@
#include "H5Eprivate.h" /* Error handling */
#include "H5Fpkg.h" /* Files */
#include "H5FDprivate.h" /* File drivers */
-#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5PBpkg.h" /* File access */
#include "H5SLprivate.h" /* Skip List */
diff --git a/src/H5PLint.c b/src/H5PLint.c
index 23d0750..6ee4603 100644
--- a/src/H5PLint.c
+++ b/src/H5PLint.c
@@ -24,11 +24,10 @@
/***********/
/* Headers */
/***********/
-#include "H5private.h" /* Generic Functions */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5MMprivate.h" /* Memory management */
-#include "H5PLpkg.h" /* Plugin */
-#include "H5Zprivate.h" /* Filter pipeline */
+#include "H5private.h" /* Generic Functions */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5PLpkg.h" /* Plugin */
+#include "H5Zprivate.h" /* Filter pipeline */
/****************/
/* Local Macros */
diff --git a/src/H5PLplugin_cache.c b/src/H5PLplugin_cache.c
index 3538d7f..3878f36 100644
--- a/src/H5PLplugin_cache.c
+++ b/src/H5PLplugin_cache.c
@@ -35,7 +35,6 @@
#include "H5Eprivate.h" /* Error handling */
#include "H5MMprivate.h" /* Memory management */
#include "H5PLpkg.h" /* Plugin */
-#include "H5Zprivate.h" /* Filter pipeline */
/****************/
/* Local Macros */
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index da516db..96cb52a 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -30,7 +30,6 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
-#include "H5CXprivate.h" /* API Contexts */
#include "H5Dpkg.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free Lists */
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index 344746f..a253881 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -29,11 +29,9 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
-#include "H5ACprivate.h" /* Cache */
#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDprivate.h" /* File drivers */
-#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Ppkg.h" /* Property lists */
#include "H5VMprivate.h" /* Vector Functions */
diff --git a/src/H5Pencdec.c b/src/H5Pencdec.c
index 77568c5..4d1d818 100644
--- a/src/H5Pencdec.c
+++ b/src/H5Pencdec.c
@@ -25,7 +25,6 @@
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Fprivate.h" /* Files */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Ppkg.h" /* Property lists */
diff --git a/src/H5Pfmpl.c b/src/H5Pfmpl.c
index ff6a3a3..97856c5 100644
--- a/src/H5Pfmpl.c
+++ b/src/H5Pfmpl.c
@@ -31,7 +31,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* Files */
-#include "H5Iprivate.h" /* IDs */
#include "H5Ppkg.h" /* Property lists */
/****************/
diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c
index bcf9e8f..4ea0448 100644
--- a/src/H5Pgcpl.c
+++ b/src/H5Pgcpl.c
@@ -31,7 +31,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Gprivate.h" /* Groups */
-#include "H5Iprivate.h" /* IDs */
#include "H5Oprivate.h" /* Object headers */
#include "H5Ppkg.h" /* Property lists */
diff --git a/src/H5Pint.c b/src/H5Pint.c
index f6dbb27..544ad37 100644
--- a/src/H5Pint.c
+++ b/src/H5Pint.c
@@ -23,12 +23,8 @@
/***********/
/* Headers */
/***********/
-#include "H5private.h" /* Generic Functions */
-#ifdef H5_HAVE_PARALLEL
-#include "H5ACprivate.h" /* Metadata cache */
-#endif /* H5_HAVE_PARALLEL */
+#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Fprivate.h" /* File access */
#include "H5FLprivate.h" /* Free lists */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
diff --git a/src/H5Plcpl.c b/src/H5Plcpl.c
index 65a740c..b720b10 100644
--- a/src/H5Plcpl.c
+++ b/src/H5Plcpl.c
@@ -30,7 +30,6 @@
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Iprivate.h" /* IDs */
#include "H5Lprivate.h" /* Links */
#include "H5Ppkg.h" /* Property lists */
diff --git a/src/H5Pmapl.c b/src/H5Pmapl.c
index ffb33d9..8824f05 100644
--- a/src/H5Pmapl.c
+++ b/src/H5Pmapl.c
@@ -29,7 +29,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Mprivate.h" /* Maps */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Iprivate.h" /* IDs */
#include "H5Ppkg.h" /* Property lists */
/****************/
diff --git a/src/H5Pmcpl.c b/src/H5Pmcpl.c
index f2cc29a..367edb3 100644
--- a/src/H5Pmcpl.c
+++ b/src/H5Pmcpl.c
@@ -31,7 +31,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Mprivate.h" /* Maps */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Iprivate.h" /* IDs */
#include "H5Ppkg.h" /* Property lists */
/****************/
diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c
index 721e141..d293e84 100644
--- a/src/H5Pocpl.c
+++ b/src/H5Pocpl.c
@@ -31,11 +31,9 @@
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Opkg.h" /* Object headers */
#include "H5Ppkg.h" /* Property lists */
-#include "H5PLprivate.h" /* Dynamic plugin */
#include "H5VMprivate.h" /* Vector Functions */
#include "H5Zprivate.h" /* Filter pipeline */
diff --git a/src/H5Pocpypl.c b/src/H5Pocpypl.c
index 113caa9..8a72337 100644
--- a/src/H5Pocpypl.c
+++ b/src/H5Pocpypl.c
@@ -31,7 +31,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free Lists */
-#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Oprivate.h" /* Object headers */
#include "H5Ppkg.h" /* Property lists */
diff --git a/src/H5Pstrcpl.c b/src/H5Pstrcpl.c
index b23a6fd..58cfa4c 100644
--- a/src/H5Pstrcpl.c
+++ b/src/H5Pstrcpl.c
@@ -31,7 +31,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* Files */
-#include "H5Iprivate.h" /* IDs */
#include "H5Ppkg.h" /* Property lists */
/****************/
diff --git a/src/H5Ptest.c b/src/H5Ptest.c
index 5d2446c..f52a370 100644
--- a/src/H5Ptest.c
+++ b/src/H5Ptest.c
@@ -22,7 +22,6 @@
#include "H5Eprivate.h" /* Error handling */
#include "H5Iprivate.h" /* IDs */
#include "H5Ppkg.h" /* Property lists */
-#include "H5Dprivate.h" /* Dataset */
/* Local variables */
diff --git a/src/H5R.c b/src/H5R.c
index 8c2d88a..3a91b92 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -28,7 +28,6 @@
#include "H5Eprivate.h" /* Error handling */
#include "H5ESprivate.h" /* Event Sets */
#include "H5Iprivate.h" /* IDs */
-#include "H5MMprivate.h" /* Memory management */
#include "H5Rpkg.h" /* References */
#include "H5Sprivate.h" /* Dataspaces */
#include "H5VLprivate.h" /* Virtual Object Layer */
diff --git a/src/H5Rdeprec.c b/src/H5Rdeprec.c
index 0637eae..90869cf 100644
--- a/src/H5Rdeprec.c
+++ b/src/H5Rdeprec.c
@@ -36,7 +36,6 @@
/* Private headers needed by this file */
#include "H5private.h" /* Generic Functions */
-#include "H5ACprivate.h" /* Metadata cache */
#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
#include "H5Gprivate.h" /* Groups */
diff --git a/src/H5Rint.c b/src/H5Rint.c
index 6a84f1c..4606a57 100644
--- a/src/H5Rint.c
+++ b/src/H5Rint.c
@@ -20,18 +20,14 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
-#include "H5ACprivate.h" /* Metadata cache */
#include "H5CXprivate.h" /* API Contexts */
-#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Gprivate.h" /* Groups */
#include "H5HGprivate.h" /* Global Heaps */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Oprivate.h" /* Object headers */
#include "H5Rpkg.h" /* References */
#include "H5Sprivate.h" /* Dataspaces */
-#include "H5Tprivate.h" /* Datatypes */
#include "H5VLnative_private.h" /* Native VOL connector */
diff --git a/src/H5SMbtree2.c b/src/H5SMbtree2.c
index d021a48..ef0da51 100644
--- a/src/H5SMbtree2.c
+++ b/src/H5SMbtree2.c
@@ -20,11 +20,10 @@
/***********/
/* Headers */
/***********/
-#include "H5private.h" /* Generic Functions */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5MMprivate.h" /* Memory management */
-#include "H5Opkg.h" /* Object Headers */
-#include "H5SMpkg.h" /* Shared object header messages */
+#include "H5private.h" /* Generic Functions */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5Opkg.h" /* Object Headers */
+#include "H5SMpkg.h" /* Shared object header messages */
/****************/
/* Local Macros */
diff --git a/src/H5SMcache.c b/src/H5SMcache.c
index 029e402..77f1eef 100644
--- a/src/H5SMcache.c
+++ b/src/H5SMcache.c
@@ -31,10 +31,8 @@
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
#include "H5FLprivate.h" /* Free Lists */
-#include "H5MFprivate.h" /* File memory management */
#include "H5MMprivate.h" /* Memory management */
#include "H5SMpkg.h" /* Shared object header messages */
-#include "H5WBprivate.h" /* Wrapped Buffers */
/****************/
/* Local Macros */
diff --git a/src/H5SMpkg.h b/src/H5SMpkg.h
index 64f5c76..439954a 100644
--- a/src/H5SMpkg.h
+++ b/src/H5SMpkg.h
@@ -29,6 +29,7 @@
#include "H5ACprivate.h" /* Metadata Cache */
#include "H5B2private.h" /* B-trees */
#include "H5HFprivate.h" /* Fractal heaps */
+#include "H5FLprivate.h" /* Free Lists */
/****************************/
/* Package Macros */
diff --git a/src/H5SMtest.c b/src/H5SMtest.c
index f306b89..bde1d1d 100644
--- a/src/H5SMtest.c
+++ b/src/H5SMtest.c
@@ -24,7 +24,6 @@
#include "H5ACprivate.h" /* Metadata cache */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
-#include "H5FLprivate.h" /* Free Lists */
#include "H5SMpkg.h" /* Shared object header messages */
/****************/
diff --git a/src/H5Snone.c b/src/H5Snone.c
index c4fdd4c..9e1ac8a 100644
--- a/src/H5Snone.c
+++ b/src/H5Snone.c
@@ -23,11 +23,10 @@
/***********/
/* Headers */
/***********/
-#include "H5private.h" /* Generic Functions */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5Iprivate.h" /* ID Functions */
-#include "H5Spkg.h" /* Dataspace functions */
-#include "H5VMprivate.h" /* Vector functions */
+#include "H5private.h" /* Generic Functions */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5Iprivate.h" /* ID Functions */
+#include "H5Spkg.h" /* Dataspace functions */
/****************/
/* Local Macros */
diff --git a/src/H5Tbit.c b/src/H5Tbit.c
index f70b038..c8300b8 100644
--- a/src/H5Tbit.c
+++ b/src/H5Tbit.c
@@ -19,7 +19,6 @@
#include "H5private.h" /*generic functions */
#include "H5Eprivate.h" /*error handling */
-#include "H5MMprivate.h" /* Memory management */
#include "H5Tpkg.h" /*data-type functions */
#include "H5WBprivate.h" /* Wrapped Buffers */
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index 70b0930..5c4b4be 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -25,7 +25,6 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
-#include "H5ACprivate.h" /* Metadata cache */
#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
#include "H5ESprivate.h" /* Event Sets */
diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c
index f877d52..17ccc50 100644
--- a/src/H5Tcompound.c
+++ b/src/H5Tcompound.c
@@ -25,7 +25,6 @@
/* Headers */
/***********/
#include "H5private.h" /*generic functions */
-#include "H5CXprivate.h" /*API Contexts */
#include "H5Eprivate.h" /*error handling */
#include "H5Iprivate.h" /*ID functions */
#include "H5MMprivate.h" /*memory management */
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 607b5ef..9a9d656 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -30,7 +30,6 @@
#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
-#include "H5Pprivate.h" /* Property lists */
#include "H5Tpkg.h" /* Datatypes */
/****************/
diff --git a/src/H5Tdeprec.c b/src/H5Tdeprec.c
index 34e3687..76cddc7 100644
--- a/src/H5Tdeprec.c
+++ b/src/H5Tdeprec.c
@@ -32,10 +32,8 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
-#include "H5ACprivate.h" /* Metadata cache */
#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
-#include "H5FOprivate.h" /* File objects */
#include "H5Iprivate.h" /* IDs */
#include "H5Ppublic.h" /* Property Lists */
#include "H5Tpkg.h" /* Datatypes */
diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index 0e7d395..bf039e6 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -18,10 +18,8 @@
#include "H5Tmodule.h" /* This source code file is part of the H5T module */
#include "H5private.h" /* Generic Functions */
-#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
#include "H5Iprivate.h" /* IDs */
-#include "H5Pprivate.h" /* Property lists */
#include "H5MMprivate.h" /* Memory management */
#include "H5Tpkg.h" /* Datatypes */
diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c
index ff822b2..6cf11c7 100644
--- a/src/H5Tvlen.c
+++ b/src/H5Tvlen.c
@@ -20,7 +20,6 @@
/****************/
#include "H5Tmodule.h" /* This source code file is part of the H5T module */
-#define H5F_FRIEND /*suppress error about including H5Fpkg */
/***********/
/* Headers */
@@ -28,7 +27,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5CXprivate.h" /* API Contexts */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Fpkg.h" /* File */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Tpkg.h" /* Datatypes */
diff --git a/src/H5VL.c b/src/H5VL.c
index 8e68f01..ce28a24 100644
--- a/src/H5VL.c
+++ b/src/H5VL.c
@@ -27,13 +27,12 @@
/* Headers */
/***********/
-#include "H5private.h" /* Generic Functions */
-#include "H5CXprivate.h" /* API Contexts */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5Iprivate.h" /* IDs */
-#include "H5Pprivate.h" /* Property lists */
-#include "H5Tprivate.h" /* Datatypes */
-#include "H5VLpkg.h" /* Virtual Object Layer */
+#include "H5private.h" /* Generic Functions */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5Iprivate.h" /* IDs */
+#include "H5Pprivate.h" /* Property lists */
+#include "H5Tprivate.h" /* Datatypes */
+#include "H5VLpkg.h" /* Virtual Object Layer */
/* VOL connectors */
#include "H5VLnative.h" /* Native VOL connector */
diff --git a/src/H5VLdyn_ops.c b/src/H5VLdyn_ops.c
index 9d2e287..5f3f58c 100644
--- a/src/H5VLdyn_ops.c
+++ b/src/H5VLdyn_ops.c
@@ -30,7 +30,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free lists */
-#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5SLprivate.h" /* Skip lists */
#include "H5VLpkg.h" /* Virtual Object Layer */
diff --git a/src/H5VLnative_datatype.c b/src/H5VLnative_datatype.c
index b2451d7..41776eb 100644
--- a/src/H5VLnative_datatype.c
+++ b/src/H5VLnative_datatype.c
@@ -29,7 +29,6 @@
#include "H5Gprivate.h" /* Groups */
#include "H5Iprivate.h" /* IDs */
#include "H5Oprivate.h" /* Object headers */
-#include "H5Pprivate.h" /* Property lists */
#include "H5Tpkg.h" /* Datatypes */
#include "H5VLprivate.h" /* Virtual Object Layer */
diff --git a/src/H5VLnative_file.c b/src/H5VLnative_file.c
index 9ebc2c2..0c13c1d 100644
--- a/src/H5VLnative_file.c
+++ b/src/H5VLnative_file.c
@@ -29,7 +29,6 @@
#include "H5Cprivate.h" /* Cache */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fpkg.h" /* Files */
-#include "H5Gprivate.h" /* Groups */
#include "H5Iprivate.h" /* IDs */
#include "H5MFprivate.h" /* File memory management */
#include "H5Pprivate.h" /* Property lists */
diff --git a/src/H5VLnative_group.c b/src/H5VLnative_group.c
index 70b7ab9..43ab7a3 100644
--- a/src/H5VLnative_group.c
+++ b/src/H5VLnative_group.c
@@ -29,7 +29,6 @@
#include "H5Gpkg.h" /* Groups */
#include "H5Iprivate.h" /* IDs */
#include "H5Oprivate.h" /* Object headers */
-#include "H5Pprivate.h" /* Property lists */
#include "H5VLprivate.h" /* Virtual Object Layer */
#include "H5VLnative_private.h" /* Native VOL connector */
diff --git a/src/H5VLnative_link.c b/src/H5VLnative_link.c
index 5f4fa4d..c25a012 100644
--- a/src/H5VLnative_link.c
+++ b/src/H5VLnative_link.c
@@ -27,9 +27,7 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Gprivate.h" /* Groups */
-#include "H5Iprivate.h" /* IDs */
#include "H5Lpkg.h" /* Links */
-#include "H5Pprivate.h" /* Property lists */
#include "H5VLprivate.h" /* Virtual Object Layer */
#include "H5VLnative_private.h" /* Native VOL connector */
diff --git a/src/H5VLnative_object.c b/src/H5VLnative_object.c
index 8c21e7f..00442b8 100644
--- a/src/H5VLnative_object.c
+++ b/src/H5VLnative_object.c
@@ -31,7 +31,6 @@
#include "H5Gprivate.h" /* Groups */
#include "H5Iprivate.h" /* IDs */
#include "H5Opkg.h" /* Object headers */
-#include "H5Pprivate.h" /* Property lists */
#include "H5VLprivate.h" /* Virtual Object Layer */
#include "H5VLnative_private.h" /* Native VOL connector */
diff --git a/src/H5Z.c b/src/H5Z.c
index 6d02027..1895501 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -13,7 +13,6 @@
#include "H5Zmodule.h" /* This source code file is part of the H5Z module */
#include "H5private.h" /* Generic Functions */
-#include "H5CXprivate.h" /* API Contexts */
#include "H5Dprivate.h" /* Dataset functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File */
diff --git a/src/H5Zfletcher32.c b/src/H5Zfletcher32.c
index 37f1381..a90131c 100644
--- a/src/H5Zfletcher32.c
+++ b/src/H5Zfletcher32.c
@@ -14,7 +14,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Fprivate.h" /* File access */
#include "H5MMprivate.h" /* Memory management */
#include "H5Zpkg.h" /* Data filters */
diff --git a/src/H5Znbit.c b/src/H5Znbit.c
index 65d09c7..fb5c5c5 100644
--- a/src/H5Znbit.c
+++ b/src/H5Znbit.c
@@ -17,7 +17,6 @@
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Ppublic.h" /* Property lists */
-#include "H5Oprivate.h" /* Object headers */
#include "H5Sprivate.h" /* Dataspaces */
#include "H5Tprivate.h" /* Datatypes */
#include "H5Zpkg.h" /* Data filters */
diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c
index 685e25a..fba1c7d 100644
--- a/src/H5Zscaleoffset.c
+++ b/src/H5Zscaleoffset.c
@@ -13,7 +13,6 @@
#include "H5Zmodule.h" /* This source code file is part of the H5Z module */
#include "H5private.h" /* Generic Functions */
-#include "H5ACprivate.h" /* Metadata cache */
#include "H5Eprivate.h" /* Error handling */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
diff --git a/src/H5Zszip.c b/src/H5Zszip.c
index 052efa8..f75060e 100644
--- a/src/H5Zszip.c
+++ b/src/H5Zszip.c
@@ -14,7 +14,6 @@
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Fprivate.h" /* File access */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Oprivate.h" /* Object headers */