Makes the installed header files the same between the autotools

and CMake.

* CMake will no longer install private generated headers and tools
  library headers.
* Several empty public header files (which represent internal packages)
  were removed. These were only installed by CMake.
* Autotools installs will install H5FDwindows.h.

Fixes HDFFV-10614.

15 files changed, 93 insertions, 329 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f82b8de..311f8b4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,7 +32,6 @@ set (H5A_SOURCES
 )
 
 set (H5A_HDRS
-    ${HDF5_SRC_DIR}/H5Apkg.h
     ${HDF5_SRC_DIR}/H5Apublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5A" "${H5A_HDRS}" "${H5A_SOURCES}" )
@@ -46,7 +45,6 @@ set (H5AC_SOURCES
 )
 
 set (H5AC_HDRS
-    ${HDF5_SRC_DIR}/H5ACpkg.h
     ${HDF5_SRC_DIR}/H5ACpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5AC" "${H5AC_HDRS}" "${H5AC_SOURCES}" )
@@ -57,8 +55,6 @@ set (H5B_SOURCES
     ${HDF5_SRC_DIR}/H5Bdbg.c
 )
 set (H5B_HDRS
-    ${HDF5_SRC_DIR}/H5Bpkg.h
-    ${HDF5_SRC_DIR}/H5Bpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5B" "${H5B_HDRS}" "${H5B_SOURCES}" )
 
@@ -75,8 +71,6 @@ set (H5B2_SOURCES
     ${HDF5_SRC_DIR}/H5B2test.c
 )
 set (H5B2_HDRS
-    ${HDF5_SRC_DIR}/H5B2pkg.h
-    ${HDF5_SRC_DIR}/H5B2public.h
 )
 IDE_GENERATED_PROPERTIES ("H5B2" "${H5B2_HDRS}" "${H5B2_SOURCES}" )
 
@@ -94,7 +88,6 @@ set (H5C_SOURCES
     ${HDF5_SRC_DIR}/H5Ctest.c
 )
 set (H5C_HDRS
-    ${HDF5_SRC_DIR}/H5Cpkg.h
     ${HDF5_SRC_DIR}/H5Cpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5C" "${H5C_HDRS}" "${H5C_SOURCES}" )
@@ -143,7 +136,6 @@ set (H5D_SOURCES
 )
 
 set (H5D_HDRS
-    ${HDF5_SRC_DIR}/H5Dpkg.h
     ${HDF5_SRC_DIR}/H5Dpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5D" "${H5D_HDRS}" "${H5D_SOURCES}" )
@@ -155,12 +147,8 @@ set (H5E_SOURCES
 )
 
 set (H5E_HDRS
-    #${HDF5_SRC_DIR}/H5Edefin.h
-    #${HDF5_SRC_DIR}/H5Einit.h
-    ${HDF5_SRC_DIR}/H5Epkg.h
-    #${HDF5_SRC_DIR}/H5Epubgen.h
+    ${HDF5_SRC_DIR}/H5Epubgen.h
     ${HDF5_SRC_DIR}/H5Epublic.h
-    #${HDF5_SRC_DIR}/H5Eterm.h
 )
 IDE_GENERATED_PROPERTIES ("H5E" "${H5E_HDRS}" "${H5E_SOURCES}" )
 
@@ -179,7 +167,6 @@ set (H5EA_SOURCES
     ${HDF5_SRC_DIR}/H5EAtest.c
 )
 set (H5EA_HDRS
-    ${HDF5_SRC_DIR}/H5EApkg.h
 )
 IDE_GENERATED_PROPERTIES ("H5EA" "${H5EA_HDRS}" "${H5EA_SOURCES}" )
 
@@ -213,7 +200,6 @@ set (H5F_SOURCES
 )
 
 set (H5F_HDRS
-    ${HDF5_SRC_DIR}/H5Fpkg.h
     ${HDF5_SRC_DIR}/H5Fpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5F" "${H5F_HDRS}" "${H5F_SOURCES}" )
@@ -231,7 +217,6 @@ set (H5FA_SOURCES
     ${HDF5_SRC_DIR}/H5FAtest.c
 )
 set (H5FA_HDRS
-    ${HDF5_SRC_DIR}/H5FApkg.h
 )
 IDE_GENERATED_PROPERTIES ("H5FA" "${H5FA_HDRS}" "${H5FA_SOURCES}" )
 
@@ -261,7 +246,6 @@ set (H5FD_HDRS
     ${HDF5_SRC_DIR}/H5FDmpi.h
     ${HDF5_SRC_DIR}/H5FDmpio.h
     ${HDF5_SRC_DIR}/H5FDmulti.h
-    ${HDF5_SRC_DIR}/H5FDpkg.h
     ${HDF5_SRC_DIR}/H5FDpublic.h
     ${HDF5_SRC_DIR}/H5FDsec2.h
     ${HDF5_SRC_DIR}/H5FDstdio.h
@@ -297,8 +281,6 @@ set (H5FS_SOURCES
 )
 
 set (H5FS_HDRS
-    ${HDF5_SRC_DIR}/H5FSpkg.h
-    ${HDF5_SRC_DIR}/H5FSpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5FS" "${H5FS_HDRS}" "${H5FS_SOURCES}" )
 
@@ -324,7 +306,6 @@ set (H5G_SOURCES
 )
 
 set (H5G_HDRS
-    ${HDF5_SRC_DIR}/H5Gpkg.h
     ${HDF5_SRC_DIR}/H5Gpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5G" "${H5G_HDRS}" "${H5G_SOURCES}" )
@@ -349,8 +330,6 @@ set (H5HF_SOURCES
 )
 
 set (H5HF_HDRS
-    ${HDF5_SRC_DIR}/H5HFpkg.h
-    ${HDF5_SRC_DIR}/H5HFpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5HF" "${H5HF_HDRS}" "${H5HF_SOURCES}" )
 
@@ -362,8 +341,6 @@ set (H5HG_SOURCES
 )
 
 set (H5HG_HDRS
-    ${HDF5_SRC_DIR}/H5HGpkg.h
-    ${HDF5_SRC_DIR}/H5HGpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5HG" "${H5HG_HDRS}" "${H5HG_SOURCES}" )
 
@@ -377,8 +354,6 @@ set (H5HL_SOURCES
 )
 
 set (H5HL_HDRS
-    ${HDF5_SRC_DIR}/H5HLpkg.h
-    ${HDF5_SRC_DIR}/H5HLpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5HL" "${H5HL_HDRS}" "${H5HL_SOURCES}" )
 
@@ -396,7 +371,6 @@ set (H5I_SOURCES
     ${HDF5_SRC_DIR}/H5Itest.c
 )
 set (H5I_HDRS
-    ${HDF5_SRC_DIR}/H5Ipkg.h
     ${HDF5_SRC_DIR}/H5Ipublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5I" "${H5I_HDRS}" "${H5I_SOURCES}" )
@@ -407,7 +381,6 @@ set (H5L_SOURCES
     ${HDF5_SRC_DIR}/H5Lexternal.c
 )
 set (H5L_HDRS
-    ${HDF5_SRC_DIR}/H5Lpkg.h
     ${HDF5_SRC_DIR}/H5Lpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5L" "${H5L_HDRS}" "${H5L_SOURCES}" )
@@ -440,7 +413,6 @@ set (H5MP_SOURCES
 )
 
 set (H5MP_HDRS
-    ${HDF5_SRC_DIR}/H5MPpkg.h
 )
 IDE_GENERATED_PROPERTIES ("H5MP" "${H5MP_HDRS}" "${H5MP_SOURCES}" )
 
@@ -485,9 +457,7 @@ set (H5O_SOURCES
 )
 
 set (H5O_HDRS
-    ${HDF5_SRC_DIR}/H5Opkg.h
     ${HDF5_SRC_DIR}/H5Opublic.h
-    ${HDF5_SRC_DIR}/H5Oshared.h
 )
 IDE_GENERATED_PROPERTIES ("H5O" "${H5O_HDRS}" "${H5O_SOURCES}" )
 
@@ -513,7 +483,6 @@ set (H5P_SOURCES
 )
 
 set (H5P_HDRS
-    ${HDF5_SRC_DIR}/H5Ppkg.h
     ${HDF5_SRC_DIR}/H5Ppublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5P" "${H5P_HDRS}" "${H5P_SOURCES}" )
@@ -523,7 +492,6 @@ set (H5PB_SOURCES
 )
 
 set (H5PB_HDRS
-    ${HDF5_SRC_DIR}/H5PBpkg.h
 )
 IDE_GENERATED_PROPERTIES ("H5PB" "${H5PB_HDRS}" "${H5PB_SOURCES}" )
 
@@ -536,7 +504,6 @@ set (H5PL_SOURCES
 
 set (H5PL_HDRS
     ${HDF5_SRC_DIR}/H5PLextern.h
-    ${HDF5_SRC_DIR}/H5PLpkg.h
     ${HDF5_SRC_DIR}/H5PLpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5PL" "${H5PL_HDRS}" "${H5PL_SOURCES}" )
@@ -548,7 +515,6 @@ set (H5R_SOURCES
     ${HDF5_SRC_DIR}/H5Rint.c
 )
 set (H5R_HDRS
-    ${HDF5_SRC_DIR}/H5Rpkg.h
     ${HDF5_SRC_DIR}/H5Rpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5R" "${H5R_HDRS}" "${H5R_SOURCES}" )
@@ -575,7 +541,6 @@ set (H5S_SOURCES
 )
 
 set (H5S_HDRS
-    ${HDF5_SRC_DIR}/H5Spkg.h
     ${HDF5_SRC_DIR}/H5Spublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5S" "${H5S_HDRS}" "${H5S_SOURCES}" )
@@ -598,7 +563,6 @@ set (H5SM_SOURCES
 )
 
 set (H5SM_HDRS
-    ${HDF5_SRC_DIR}/H5SMpkg.h
 )
 IDE_GENERATED_PROPERTIES ("H5SM" "${H5SM_HDRS}" "${H5SM_SOURCES}" )
 
@@ -638,7 +602,6 @@ set (H5T_SOURCES
 )
 
 set (H5T_HDRS
-    ${HDF5_SRC_DIR}/H5Tpkg.h
     ${HDF5_SRC_DIR}/H5Tpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5T" "${H5T_HDRS}" "${H5T_SOURCES}" )
@@ -666,7 +629,6 @@ set (H5VL_SOURCES
     ${HDF5_SRC_DIR}/H5VLnative.c
 )
 set (H5VL_HDRS
-    ${HDF5_SRC_DIR}/H5VLpkg.h
     ${HDF5_SRC_DIR}/H5VLnative.h
     ${HDF5_SRC_DIR}/H5VLpublic.h
 )
@@ -705,7 +667,6 @@ endif ()
 
 
 set (H5Z_HDRS
-    ${HDF5_SRC_DIR}/H5Zpkg.h
     ${HDF5_SRC_DIR}/H5Zpublic.h
 )
 IDE_GENERATED_PROPERTIES ("H5Z" "${H5Z_HDRS}" "${H5Z_SOURCES}" )
@@ -795,51 +756,127 @@ set (H5_PUBLIC_HEADERS
 
 set (H5_PRIVATE_HEADERS
     ${HDF5_SRC_DIR}/H5private.h
+
+    ${HDF5_SRC_DIR}/H5Apkg.h
     ${HDF5_SRC_DIR}/H5Aprivate.h
+
+    ${HDF5_SRC_DIR}/H5ACpkg.h
     ${HDF5_SRC_DIR}/H5ACprivate.h
-    ${HDF5_SRC_DIR}/H5B2private.h
+
+    ${HDF5_SRC_DIR}/H5Bpkg.h
     ${HDF5_SRC_DIR}/H5Bprivate.h
+
+    ${HDF5_SRC_DIR}/H5B2pkg.h
+    ${HDF5_SRC_DIR}/H5B2private.h
+
+    ${HDF5_SRC_DIR}/H5Cpkg.h
     ${HDF5_SRC_DIR}/H5Cprivate.h
+
     ${HDF5_SRC_DIR}/H5CSprivate.h
+
     ${HDF5_SRC_DIR}/H5CXprivate.h
+
+    ${HDF5_SRC_DIR}/H5Dpkg.h
     ${HDF5_SRC_DIR}/H5Dprivate.h
+
+    ${HDF5_SRC_DIR}/H5Edefin.h
+    ${HDF5_SRC_DIR}/H5Einit.h
+    ${HDF5_SRC_DIR}/H5Epkg.h
     ${HDF5_SRC_DIR}/H5Eprivate.h
+    ${HDF5_SRC_DIR}/H5Eterm.h
+
+    ${HDF5_SRC_DIR}/H5EApkg.h
     ${HDF5_SRC_DIR}/H5EAprivate.h
+
+    ${HDF5_SRC_DIR}/H5Fpkg.h
+    ${HDF5_SRC_DIR}/H5Fprivate.h
+
+    ${HDF5_SRC_DIR}/H5FApkg.h
     ${HDF5_SRC_DIR}/H5FAprivate.h
+
+    ${HDF5_SRC_DIR}/H5FDpkg.h
     ${HDF5_SRC_DIR}/H5FDprivate.h
-    ${HDF5_SRC_DIR}/H5Fprivate.h
+
     ${HDF5_SRC_DIR}/H5FLprivate.h
+
     ${HDF5_SRC_DIR}/H5FOprivate.h
-    ${HDF5_SRC_DIR}/H5MFprivate.h
-    ${HDF5_SRC_DIR}/H5MMprivate.h
-    ${HDF5_SRC_DIR}/H5Cprivate.h
+
+    ${HDF5_SRC_DIR}/H5FSpkg.h
     ${HDF5_SRC_DIR}/H5FSprivate.h
+
+    ${HDF5_SRC_DIR}/H5Gpkg.h
     ${HDF5_SRC_DIR}/H5Gprivate.h
+
+    ${HDF5_SRC_DIR}/H5HFpkg.h
     ${HDF5_SRC_DIR}/H5HFprivate.h
+
+    ${HDF5_SRC_DIR}/H5HGpkg.h
     ${HDF5_SRC_DIR}/H5HGprivate.h
+
+    ${HDF5_SRC_DIR}/H5HLpkg.h
     ${HDF5_SRC_DIR}/H5HLprivate.h
+
     ${HDF5_SRC_DIR}/H5HPprivate.h
+
+    ${HDF5_SRC_DIR}/H5Ipkg.h
     ${HDF5_SRC_DIR}/H5Iprivate.h
+
+    ${HDF5_SRC_DIR}/H5Lpkg.h
     ${HDF5_SRC_DIR}/H5Lprivate.h
+
+    ${HDF5_SRC_DIR}/H5MFprivate.h
+
+    ${HDF5_SRC_DIR}/H5MMprivate.h
+
+    ${HDF5_SRC_DIR}/H5MPpkg.h
     ${HDF5_SRC_DIR}/H5MPprivate.h
+
+    ${HDF5_SRC_DIR}/H5Opkg.h
     ${HDF5_SRC_DIR}/H5Oprivate.h
+    ${HDF5_SRC_DIR}/H5Oshared.h
+
+    ${HDF5_SRC_DIR}/H5Ppkg.h
     ${HDF5_SRC_DIR}/H5Pprivate.h
+
     ${HDF5_SRC_DIR}/H5PBprivate.h
+    ${HDF5_SRC_DIR}/H5PBpkg.h
+
+    ${HDF5_SRC_DIR}/H5PLpkg.h
     ${HDF5_SRC_DIR}/H5PLprivate.h
-    ${HDF5_SRC_DIR}/H5UCprivate.h
+
+    ${HDF5_SRC_DIR}/H5Rpkg.h
     ${HDF5_SRC_DIR}/H5Rprivate.h
+
     ${HDF5_SRC_DIR}/H5RSprivate.h
+
+    ${HDF5_SRC_DIR}/H5Spkg.h
+    ${HDF5_SRC_DIR}/H5Sprivate.h
+
     ${HDF5_SRC_DIR}/H5SLprivate.h
+
+    ${HDF5_SRC_DIR}/H5SMpkg.h
     ${HDF5_SRC_DIR}/H5SMprivate.h
-    ${HDF5_SRC_DIR}/H5Sprivate.h
+
     ${HDF5_SRC_DIR}/H5STprivate.h
+
+    ${HDF5_SRC_DIR}/H5Tpkg.h
     ${HDF5_SRC_DIR}/H5Tprivate.h
+
     ${HDF5_SRC_DIR}/H5TSprivate.h
+
+    ${HDF5_SRC_DIR}/H5UCprivate.h
+
+    ${HDF5_SRC_DIR}/H5VLpkg.h
     ${HDF5_SRC_DIR}/H5VLnative_private.h
     ${HDF5_SRC_DIR}/H5VLprivate.h
+
     ${HDF5_SRC_DIR}/H5VMprivate.h
+
     ${HDF5_SRC_DIR}/H5WBprivate.h
+
+    ${HDF5_SRC_DIR}/H5Zpkg.h
     ${HDF5_SRC_DIR}/H5Zprivate.h
+
     ${HDF5_SRC_DIR}/H5win32defs.h
 )
 
@@ -852,6 +889,12 @@ set (H5_GENERATED_HEADERS
     ${HDF5_SRC_DIR}/H5overflow.h
 )
 
+set (H5_PUBLIC_GENERATED_HEADERS
+    ${HDF5_SRC_DIR}/H5Epubgen.h
+    ${HDF5_SRC_DIR}/H5version.h
+    ${HDF5_SRC_DIR}/H5overflow.h
+)
+
 option (HDF5_GENERATE_HEADERS "Rebuild Generated Files" ON)
 if (HDF5_GENERATE_HEADERS)
   set_source_files_properties(${H5_GENERATED_HEADERS} PROPERTIES GENERATED TRUE)
@@ -1054,7 +1097,7 @@ if (NOT HDF5_INSTALL_NO_DEVELOPMENT)
   install (
       FILES
           ${H5_PUBLIC_HEADERS}
-          ${H5_GENERATED_HEADERS}
+          ${H5_PUBLIC_GENERATED_HEADERS}
           ${HDF5_BINARY_DIR}/H5pubconf.h
       DESTINATION
           ${HDF5_INSTALL_INCLUDE_DIR}
diff --git a/src/H5B2private.h b/src/H5B2private.h
index 83a5272..0b64381 100644
--- a/src/H5B2private.h
+++ b/src/H5B2private.h
@@ -25,9 +25,6 @@
 #ifndef _H5B2private_H
 #define _H5B2private_H
 
-/* Include package's public header */
-#include "H5B2public.h"
-
 /* Private headers needed by this file */
 #include "H5ACprivate.h"        /* Metadata cache                   */
 #include "H5Fprivate.h"         /* File access                      */
diff --git a/src/H5B2public.h b/src/H5B2public.h
deleted file mode 100644
index 6e0b964..0000000
--- a/src/H5B2public.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*-------------------------------------------------------------------------
- *
- * Created:             H5B2public.h
- *                      Jan 31 2005
- *                      Quincey Koziol <koziol@ncsa.uiuc.edu>
- *
- * Purpose:             Public declarations for the v2 B-tree package.
- *
- *-------------------------------------------------------------------------
- */
-
-#ifndef _H5B2public_H
-#define _H5B2public_H
-
-/* Public headers needed by this file */
-#include "H5public.h"
-
-/*****************/
-/* Public Macros */
-/*****************/
-
-/*******************/
-/* Public Typedefs */
-/*******************/
-
-/**********************************/
-/* Public API Function Prototypes */
-/**********************************/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _H5B2public_H */
-
diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h
index e203b87..5aa3628 100644
--- a/src/H5Bprivate.h
+++ b/src/H5Bprivate.h
@@ -27,7 +27,6 @@
 #ifndef _H5Bprivate_H
 #define _H5Bprivate_H
 
-#include "H5Bpublic.h"		/*API prototypes			     */
 
 /* Private headers needed by this file */
 #include "H5private.h"		/* Generic Functions			*/
diff --git a/src/H5Bpublic.h b/src/H5Bpublic.h
deleted file mode 100644
index 1764f61..0000000
--- a/src/H5Bpublic.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*-------------------------------------------------------------------------
- *
- * Created:             H5Bproto.h
- *                      Jul 10 1997
- *                      Robb Matzke <matzke@llnl.gov>
- *
- * Purpose:             Public declarations for the H5B package.
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-#ifndef _H5Bpublic_H
-#define _H5Bpublic_H
-
-/* Public headers needed by this file */
-#include "H5public.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/H5FSprivate.h b/src/H5FSprivate.h
index de1b4c1..31fc63c 100644
--- a/src/H5FSprivate.h
+++ b/src/H5FSprivate.h
@@ -25,9 +25,6 @@
 #ifndef _H5FSprivate_H
 #define _H5FSprivate_H
 
-/* Include package's public header */
-#include "H5FSpublic.h"
-
 /* Private headers needed by this file */
 #include "H5Fprivate.h"		/* File access				*/
 #include "H5FLprivate.h"	/* Free Lists                           */
diff --git a/src/H5FSpublic.h b/src/H5FSpublic.h
deleted file mode 100644
index 3090d0d..0000000
--- a/src/H5FSpublic.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*-------------------------------------------------------------------------
- *
- * Created:             H5FSpublic.h
- *                      May  2 2006
- *                      Quincey Koziol <koziol@hdfgroup.org>
- *
- * Purpose:             Public declarations for the file free space package.
- *
- *-------------------------------------------------------------------------
- */
-
-#ifndef _H5FSpublic_H
-#define _H5FSpublic_H
-
-/* Public headers needed by this file */
-#include "H5public.h"
-
-/*****************/
-/* Public Macros */
-/*****************/
-
-/*******************/
-/* Public Typedefs */
-/*******************/
-
-/**********************************/
-/* Public API Function Prototypes */
-/**********************************/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _H5FSpublic_H */
-
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index e97144f..2098a77 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -30,12 +30,12 @@
 #include "H5Fprivate.h"
 
 /* Other public headers needed by this file */
-#include "H5Bpublic.h"          /* B-tree header (for H5B_NUM_BTREE_ID)     */
 #include "H5VLpublic.h"         /* Virtual Object Layer                     */
 
 /* Other private headers needed by this file */
 #include "H5private.h"		    /* Generic Functions                        */
 #include "H5ACprivate.h"        /* Metadata cache                           */
+#include "H5Bprivate.h"         /* B-trees                                  */
 #include "H5FLprivate.h"        /* Free Lists                               */
 #include "H5FOprivate.h"        /* File objects                             */
 #include "H5FSprivate.h"        /* File free space                          */
diff --git a/src/H5HFprivate.h b/src/H5HFprivate.h
index 587a8fc..4eec1c1 100644
--- a/src/H5HFprivate.h
+++ b/src/H5HFprivate.h
@@ -25,9 +25,6 @@
 #ifndef _H5HFprivate_H
 #define _H5HFprivate_H
 
-/* Include package's public header */
-#include "H5HFpublic.h"
-
 /* Private headers needed by this file */
 #include "H5Fprivate.h"		/* File access				*/
 #include "H5Oprivate.h"		/* Object headers		  	*/
diff --git a/src/H5HFpublic.h b/src/H5HFpublic.h
deleted file mode 100644
index 82cfc21..0000000
--- a/src/H5HFpublic.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*-------------------------------------------------------------------------
- *
- * Created:             H5HFpublic.h
- *                      Feb 24 2006
- *                      Quincey Koziol <koziol@ncsa.uiuc.edu>
- *
- * Purpose:             Public declarations for the fractal heap package.
- *
- *-------------------------------------------------------------------------
- */
-
-#ifndef _H5HFpublic_H
-#define _H5HFpublic_H
-
-/* Public headers needed by this file */
-#include "H5public.h"
-
-/*****************/
-/* Public Macros */
-/*****************/
-
-/*******************/
-/* Public Typedefs */
-/*******************/
-
-/**********************************/
-/* Public API Function Prototypes */
-/**********************************/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _H5HFpublic_H */
-
diff --git a/src/H5HGprivate.h b/src/H5HGprivate.h
index a7d7a80..1c609e2 100644
--- a/src/H5HGprivate.h
+++ b/src/H5HGprivate.h
@@ -18,9 +18,6 @@
 #ifndef _H5HGprivate_H
 #define _H5HGprivate_H
 
-/* Include package's public header */
-#include "H5HGpublic.h"
-
 /* Private headers needed by this file. */
 #include "H5Fprivate.h"		/* File access				*/
 
diff --git a/src/H5HGpublic.h b/src/H5HGpublic.h
deleted file mode 100644
index fcec593..0000000
--- a/src/H5HGpublic.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Programmer:  Robb Matzke <matzke@llnl.gov>
- *              Friday, March 27, 1998
- */
-#ifndef _H5HGpublic_H
-#define _H5HGpublic_H
-
-/* Public headers needed by this file */
-#include "H5public.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h
index 4001ef1..7a53b25 100644
--- a/src/H5HLprivate.h
+++ b/src/H5HLprivate.h
@@ -24,9 +24,6 @@
 #ifndef _H5HLprivate_H
 #define _H5HLprivate_H
 
-/* Include package's public header */
-#include "H5HLpublic.h"
-
 /* Private headers needed by this file. */
 #include "H5private.h"          /* Generic Functions                */
 #include "H5ACprivate.h"        /* Metadata cache                   */
diff --git a/src/H5HLpublic.h b/src/H5HLpublic.h
deleted file mode 100644
index 143bb78..0000000
--- a/src/H5HLpublic.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*-------------------------------------------------------------------------
- *
- * Created:             H5HLpublic.h
- *                      Jul 16 1997
- *                      Robb Matzke <matzke@llnl.gov>
- *
- * Purpose:             Public declarations for the H5HL (local heap) package.
- *
- *-------------------------------------------------------------------------
- */
-#ifndef _H5HLpublic_H
-#define _H5HLpublic_H
-
-/* Public headers needed by this file */
-#include "H5public.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 7889e10..ffdf844 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -136,7 +136,7 @@ include_HEADERS = hdf5.h H5api_adpt.h H5overflow.h H5pubconf.h H5public.h H5vers
         H5Epubgen.h H5Epublic.h H5ESpublic.h H5Fpublic.h \
         H5FDpublic.h H5FDcore.h H5FDdirect.h \
         H5FDfamily.h H5FDlog.h H5FDmpi.h H5FDmpio.h \
-        H5FDmulti.h H5FDsec2.h  H5FDstdio.h \
+        H5FDmulti.h H5FDsec2.h  H5FDstdio.h H5FDwindows.h \
         H5Gpublic.h  H5Ipublic.h H5Lpublic.h \
         H5MMpublic.h H5Opublic.h H5Ppublic.h \
         H5PLextern.h H5PLpublic.h \