diff --git a/src/H5A.c b/src/H5A.c index 1db7fd3eb48..6728596ab52 100644 --- a/src/H5A.c +++ b/src/H5A.c @@ -15,7 +15,6 @@ /****************/ #include "H5Amodule.h" /* This source code file is part of the H5A module */ -#define H5O_FRIEND /* Suppress error about including H5Opkg */ /***********/ /* Headers */ @@ -26,7 +25,6 @@ #include "H5Eprivate.h" /* Error handling */ #include "H5ESprivate.h" /* Event Sets */ #include "H5Iprivate.h" /* IDs */ -#include "H5Opkg.h" /* Object headers */ #include "H5Sprivate.h" /* Dataspace functions */ #include "H5VLprivate.h" /* Virtual Object Layer */ diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index 51f1b358a60..b8e582b3167 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -29,7 +29,6 @@ #include "H5private.h" /* Generic Functions */ #include "H5Cprivate.h" /* Cache */ #include "H5Fprivate.h" /* File access */ -#include "H5Pprivate.h" /* Property lists */ #include "H5SLprivate.h" /* Skip lists */ /* Global metadata tag values */ diff --git a/src/H5Aprivate.h b/src/H5Aprivate.h index 33f0134004f..7238c25c1eb 100644 --- a/src/H5Aprivate.h +++ b/src/H5Aprivate.h @@ -22,7 +22,6 @@ /* Private headers needed by this file */ #include "H5Gprivate.h" /* Groups */ #include "H5Oprivate.h" /* Object headers */ -#include "H5Sprivate.h" /* Dataspace */ #include "H5Tprivate.h" /* Datatypes */ /**************************/ diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h index a24249f05ca..9b6559cd9fb 100644 --- a/src/H5Dpkg.h +++ b/src/H5Dpkg.h @@ -26,10 +26,8 @@ #include "H5Dprivate.h" /* Other private headers needed by this file */ -#include "H5ACprivate.h" /* Metadata cache */ #include "H5B2private.h" /* v2 B-trees */ #include "H5Fprivate.h" /* File access */ -#include "H5FLprivate.h" /* Free Lists */ #include "H5Gprivate.h" /* Groups */ #include "H5SLprivate.h" /* Skip lists */ #include "H5Tprivate.h" /* Datatypes */ diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h index fa8b0770359..cc4b813b34a 100644 --- a/src/H5Dprivate.h +++ b/src/H5Dprivate.h @@ -20,10 +20,8 @@ #include "H5Dpublic.h" /* Private headers needed by this file */ -#include "H5FDprivate.h" /* File drivers */ -#include "H5Oprivate.h" /* Object headers */ -#include "H5Sprivate.h" /* Dataspaces */ -#include "H5Zprivate.h" /* Data filters */ +#include "H5Oprivate.h" /* Object headers */ +#include "H5Sprivate.h" /* Dataspaces */ /**************************/ /* Library Private Macros */ diff --git a/src/H5FAhdr.c b/src/H5FAhdr.c index ef3d689fce2..edb263aee3f 100644 --- a/src/H5FAhdr.c +++ b/src/H5FAhdr.c @@ -35,6 +35,7 @@ #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ #include "H5FApkg.h" /* Fixed Arrays */ +#include "H5FLprivate.h" /* Free Lists */ #include "H5MFprivate.h" /* File memory management */ #include "H5MMprivate.h" /* Memory management */ diff --git a/src/H5FApkg.h b/src/H5FApkg.h index 9c00171c81e..dd104f2af7a 100644 --- a/src/H5FApkg.h +++ b/src/H5FApkg.h @@ -27,7 +27,6 @@ /* Other private headers needed by this file */ #include "H5ACprivate.h" /* Metadata cache */ -#include "H5FLprivate.h" /* Free Lists */ /**************************/ /* Package Private Macros */ diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h index 2fe54a588a9..d850c368b4a 100644 --- a/src/H5FDprivate.h +++ b/src/H5FDprivate.h @@ -18,7 +18,6 @@ #include "H5FDdevelop.h" /* Private headers needed by this file */ -#include "H5Pprivate.h" /* Property lists */ #include "H5Sprivate.h" /* Dataspaces */ /* diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h index 8f8da1a23bb..a833427e3b6 100644 --- a/src/H5Gprivate.h +++ b/src/H5Gprivate.h @@ -27,7 +27,6 @@ /* Private headers needed by this file */ #include "H5private.h" /* Generic Functions */ -#include "H5Bprivate.h" /* B-trees */ #include "H5Fprivate.h" /* File access */ #include "H5RSprivate.h" /* Reference-counted strings */ diff --git a/src/H5HLpkg.h b/src/H5HLpkg.h index 9d23049dd35..f7c74a3d9cb 100644 --- a/src/H5HLpkg.h +++ b/src/H5HLpkg.h @@ -26,6 +26,7 @@ #include "H5HLprivate.h" /* Other private headers needed by this file */ +#include "H5ACprivate.h" /* Metadata cache */ #include "H5FLprivate.h" /* Free lists */ /*****************************/ diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h index 243d7653a86..31d430b0e93 100644 --- a/src/H5HLprivate.h +++ b/src/H5HLprivate.h @@ -22,9 +22,8 @@ #define H5HLprivate_H /* Private headers needed by this file. */ -#include "H5private.h" /* Generic Functions */ -#include "H5ACprivate.h" /* Metadata cache */ -#include "H5Fprivate.h" /* File access */ +#include "H5private.h" /* Generic Functions */ +#include "H5Fprivate.h" /* File access */ #define H5HL_ALIGN(X) ((((unsigned)X) + 7) & (unsigned)(~0x07)) /* align on 8-byte boundary */ diff --git a/src/H5Mprivate.h b/src/H5Mprivate.h index 6dfb55641c0..faf5b36f661 100644 --- a/src/H5Mprivate.h +++ b/src/H5Mprivate.h @@ -19,11 +19,6 @@ /* Include package's public header */ #include "H5Mpublic.h" -/* Private headers needed by this file */ -#include "H5Oprivate.h" /* Object headers */ -#include "H5Sprivate.h" /* Dataspaces */ -#include "H5Zprivate.h" /* Data filters */ - /**************************/ /* Library Private Macros */ /**************************/ diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index f312a3c94b0..89b3db2e20d 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -36,10 +36,13 @@ typedef struct H5O_fill_t H5O_fill_t; /* Private headers needed by this file */ #include "H5private.h" /* Generic Functions */ #include "H5ACprivate.h" /* Metadata cache */ +#include "H5Bprivate.h" +#include "H5B2private.h" #include "H5Fprivate.h" /* File access */ #include "H5HGprivate.h" /* Global Heaps */ #include "H5SLprivate.h" /* Skip lists */ #include "H5Tprivate.h" /* Datatype functions */ +#include "H5UCprivate.h" #include "H5VLprivate.h" /* Virtual Object Layer */ #include "H5Zprivate.h" /* I/O pipeline filters */ diff --git a/src/H5Rpkg.h b/src/H5Rpkg.h index 8ce6041769a..d3bbbad0b8c 100644 --- a/src/H5Rpkg.h +++ b/src/H5Rpkg.h @@ -26,7 +26,6 @@ /* Other private headers needed by this file */ #include "H5Fprivate.h" /* Files */ -#include "H5Gprivate.h" /* Groups */ #include "H5Oprivate.h" /* Object headers */ #include "H5Sprivate.h" /* Dataspaces */ diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h index b8cd20c7f9e..b2af3ecd913 100644 --- a/src/H5Sprivate.h +++ b/src/H5Sprivate.h @@ -25,8 +25,6 @@ /* Private headers needed by this file */ #include "H5private.h" /* Generic Functions */ #include "H5Fprivate.h" /* Files */ -#include "H5Gprivate.h" /* Groups */ -#include "H5Pprivate.h" /* Property lists */ #include "H5Tprivate.h" /* Datatypes */ /* Forward references of package typedefs */ diff --git a/src/H5VLconnector.h b/src/H5VLconnector.h index 02d22314ebc..34aa607faec 100644 --- a/src/H5VLconnector.h +++ b/src/H5VLconnector.h @@ -23,10 +23,10 @@ #include "H5Dpublic.h" /* Datasets */ #include "H5ESpublic.h" /* Event Stack */ #include "H5Fpublic.h" /* Files */ +#include "H5Gpublic.h" #include "H5Ipublic.h" /* IDs */ #include "H5Lpublic.h" /* Links */ #include "H5Opublic.h" /* Objects */ -#include "H5Rpublic.h" /* References */ #include "H5VLpublic.h" /* Virtual Object Layer */ /*****************/ diff --git a/src/H5VLnative.h b/src/H5VLnative.h index 6eaefb63b96..907ca59d90d 100644 --- a/src/H5VLnative.h +++ b/src/H5VLnative.h @@ -18,7 +18,8 @@ #define H5VLnative_H /* Public headers needed by this file */ -#include "H5Apublic.h" /* Attributes */ +#include "H5Apublic.h" /* Attributes */ +#include "H5Gpublic.h" #include "H5VLpublic.h" /* Virtual Object Layer */ /*****************/