Includes hdf5dev.h in hdf5.h (#728)

* Includes hdf5dev.h in hdf5.h

* Removes hdf5dev.h

* Restores H5PLextern.h as an independent header

* H5PLextern.h missed in the null VOL connector

33 files changed, 30 insertions, 74 deletions

diff --git a/MANIFEST b/MANIFEST
index f82d295..09209d6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1123,7 +1123,6 @@
 ./src/H5Ztrans.c
 ./src/Makefile.am
 ./src/hdf5.h
-./src/hdf5dev.h
 ./src/libhdf5.settings.in
 ./src/H5win32defs.h
 ./src/uthash.h
diff --git a/examples/h5_elink_unix2win.c b/examples/h5_elink_unix2win.c
index 60c75dc..6eca266 100644
--- a/examples/h5_elink_unix2win.c
+++ b/examples/h5_elink_unix2win.c
@@ -24,7 +24,6 @@
  */
 
 #include "hdf5.h"
-#include "hdf5dev.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/examples/h5_extlink.c b/examples/h5_extlink.c
index 44e55a9..f9d4046 100644
--- a/examples/h5_extlink.c
+++ b/examples/h5_extlink.c
@@ -19,7 +19,6 @@
  */
 
 #include "hdf5.h"
-#include "hdf5dev.h"
 #include <string.h>
 
 #define SOURCE_FILE "extlink_source.h5"
diff --git a/fortran/src/H5Zf.c b/fortran/src/H5Zf.c
index 33d9fb3..b31878c 100644
--- a/fortran/src/H5Zf.c
+++ b/fortran/src/H5Zf.c
@@ -20,7 +20,6 @@
  */
 
 #include "H5f90.h"
-#include "hdf5dev.h"
 
 /****if* H5Zf/h5zunregister_c
  * NAME
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index 52fc276..d245cae 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -21,7 +21,6 @@
 
 #include "H5f90.h"
 #include "H5fort_type_defines.h"
-#include "hdf5dev.h"
 
 int IntKinds_SizeOf[] = H5_FORTRAN_INTEGER_KINDS_SIZEOF;
 
diff --git a/java/src/jni/h5Constants.c b/java/src/jni/h5Constants.c
index a0deea3..7354e95 100644
--- a/java/src/jni/h5Constants.c
+++ b/java/src/jni/h5Constants.c
@@ -22,7 +22,6 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include "hdf5.h"
-#include "hdf5dev.h"
 #include <jni.h>
 #include <stdlib.h>
 #include "h5jni.h"
diff --git a/java/src/jni/h5lImp.c b/java/src/jni/h5lImp.c
index 1407fef..43db4e9 100644
--- a/java/src/jni/h5lImp.c
+++ b/java/src/jni/h5lImp.c
@@ -23,7 +23,6 @@ extern "C" {
 #include <jni.h>
 #include <stdlib.h>
 #include "hdf5.h"
-#include "hdf5dev.h"
 #include "h5jni.h"
 #include "h5lImp.h"
 
diff --git a/java/src/jni/h5zImp.c b/java/src/jni/h5zImp.c
index d8c93be..d750ee8 100644
--- a/java/src/jni/h5zImp.c
+++ b/java/src/jni/h5zImp.c
@@ -22,7 +22,6 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include "hdf5.h"
-#include "hdf5dev.h"
 #include <jni.h>
 #include <stdlib.h>
 #include "h5jni.h"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9eeac7b..ff47c8e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,7 +16,6 @@ set (H5_SOURCES
 
 set (H5_HDRS
     ${HDF5_SRC_DIR}/hdf5.h
-    ${HDF5_SRC_DIR}/hdf5dev.h
     ${HDF5_SRC_DIR}/H5api_adpt.h
     ${HDF5_SRC_DIR}/H5public.h
     #${HDF5_SRC_DIR}/H5version.h
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index 5562c23..86f7664 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5dev.h"
 
 #ifndef FALSE
 #define FALSE 0
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index e23aca8..6631325 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -29,7 +29,6 @@
 #include <sys/stat.h>
 
 #include "hdf5.h"
-#include "hdf5dev.h"
 
 #ifdef H5_HAVE_FLOCK
 /* Needed for lock type definitions (e.g., LOCK_EX) */
diff --git a/src/H5PLextern.h b/src/H5PLextern.h
index 5042069..7f3df5e 100644
--- a/src/H5PLextern.h
+++ b/src/H5PLextern.h
@@ -17,8 +17,8 @@
 #ifndef H5PLextern_H
 #define H5PLextern_H
 
-/* Include package's public header */
-#include "H5PLpublic.h"
+/* Include HDF5 header */
+#include "hdf5.h"
 
 /* plugins always export */
 #if defined(_MSC_VER) /* MSVC Compiler Case */
diff --git a/src/H5VLpassthru.c b/src/H5VLpassthru.c
index ede2f5f..681531e 100644
--- a/src/H5VLpassthru.c
+++ b/src/H5VLpassthru.c
@@ -36,7 +36,7 @@
 #include <string.h>
 
 /* Public HDF5 file */
-#include "hdf5dev.h"
+#include "hdf5.h"
 
 /* This connector's header */
 #include "H5VLpassthru.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index ce29217..ce6e3b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -156,8 +156,8 @@ include_HEADERS = hdf5.h H5api_adpt.h H5overflow.h H5pubconf.h H5public.h H5vers
         H5Zpublic.h
 
 # Public component author headers
-include_HEADERS += hdf5dev.h H5ESdevelop.h H5FDdevelop.h H5Idevelop.h \
-	H5Ldevelop.h H5Tdevelop.h H5TSdevelop.h H5Zdevelop.h
+include_HEADERS += H5ESdevelop.h H5FDdevelop.h H5Idevelop.h H5Ldevelop.h \
+        H5Tdevelop.h H5TSdevelop.h H5Zdevelop.h
 
 # install libhdf5.settings in lib directory
 settingsdir=$(libdir)
diff --git a/src/hdf5.h b/src/hdf5.h
index b6b5f59..8751ec5 100644
--- a/src/hdf5.h
+++ b/src/hdf5.h
@@ -41,6 +41,20 @@
 #include "H5VLpublic.h" /* Virtual Object Layer                     */
 #include "H5Zpublic.h"  /* Data filters                             */
 
+/* Plugin/component developer headers */
+#include "H5ESdevelop.h" /* Event Sets */
+#include "H5FDdevelop.h" /* File drivers */
+#include "H5Idevelop.h"  /* ID management */
+#include "H5Ldevelop.h"  /* Links */
+#include "H5Tdevelop.h"  /* Datatypes */
+#include "H5TSdevelop.h" /* Threadsafety */
+#include "H5Zdevelop.h"  /* Data filters */
+
+/* Virtual object layer (VOL) connector developer support */
+#include "H5VLconnector.h"          /* VOL connector author routines */
+#include "H5VLconnector_passthru.h" /* Pass-through VOL connector author routines */
+#include "H5VLnative.h"             /* Native VOL connector macros, for VOL connector authors */
+
 /* Predefined file drivers */
 #include "H5FDcore.h"     /* Files stored entirely in memory          */
 #include "H5FDdirect.h"   /* Linux direct I/O                         */
diff --git a/src/hdf5dev.h b/src/hdf5dev.h
deleted file mode 100644
index 201442d..0000000
--- a/src/hdf5dev.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * 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.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * This is the main public HDF5 include file for component authors.
- */
-
-#ifndef _HDF5DEV_H
-#define _HDF5DEV_H
-
-/* Include general purpose application developer interfaces */
-#include "hdf5.h"
-
-/* Application developer headers for various interfaces */
-#include "H5ESdevelop.h" /* Event Sets */
-#include "H5FDdevelop.h" /* File drivers */
-#include "H5Idevelop.h"  /* ID management */
-#include "H5Ldevelop.h"  /* Links */
-#include "H5PLextern.h"  /* Plugins */
-#include "H5Tdevelop.h"  /* Datatypes */
-#include "H5TSdevelop.h" /* Threadsafety */
-#include "H5Zdevelop.h"  /* Data filters */
-
-/* Virtual object layer (VOL) connector developer support */
-#include "H5VLconnector.h"          /* VOL connector author routines */
-#include "H5VLconnector_passthru.h" /* Pass-through VOL connector author routines */
-#include "H5VLnative.h"             /* Native VOL connector macros, for VOL connector authors */
-
-#endif /* _HDF5DEV_H */
diff --git a/test/filter_plugin1_dsets.c b/test/filter_plugin1_dsets.c
index 2b1e4d2..5d6c1ef 100644
--- a/test/filter_plugin1_dsets.c
+++ b/test/filter_plugin1_dsets.c
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "hdf5dev.h"
+#include "H5PLextern.h"
 
 #define FILTER1_ID 257
 
diff --git a/test/filter_plugin2_dsets.c b/test/filter_plugin2_dsets.c
index 0bef1a0..d2011d4 100644
--- a/test/filter_plugin2_dsets.c
+++ b/test/filter_plugin2_dsets.c
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "hdf5dev.h"
+#include "H5PLextern.h"
 
 #define FILTER2_ID 258
 #define MULTIPLIER 3
diff --git a/test/filter_plugin3_dsets.c b/test/filter_plugin3_dsets.c
index b9b3b82..618ce06 100644
--- a/test/filter_plugin3_dsets.c
+++ b/test/filter_plugin3_dsets.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "hdf5dev.h"
+#include "H5PLextern.h"
 
 #define FILTER3_ID 259
 
diff --git a/test/filter_plugin4_groups.c b/test/filter_plugin4_groups.c
index 589347c..630dcd6 100644
--- a/test/filter_plugin4_groups.c
+++ b/test/filter_plugin4_groups.c
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "hdf5dev.h"
+#include "H5PLextern.h"
 
 #define FILTER4_ID   260
 #define SUFFIX_LEN   8
diff --git a/test/h5test.h b/test/h5test.h
index f5c9608..89e30da 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -25,7 +25,6 @@
  * so we include the private headers here, along with developer routines.
  */
 #include "hdf5.h"
-#include "hdf5dev.h"
 #include "H5private.h"
 #include "H5Eprivate.h"
 
diff --git a/test/null_vol_connector.c b/test/null_vol_connector.c
index 7a1de6c..2b375d8 100644
--- a/test/null_vol_connector.c
+++ b/test/null_vol_connector.c
@@ -15,11 +15,8 @@
  *              (registration, etc.).
  */
 
-/* Public HDF5 header */
-#include "hdf5.h"
-
 /* For HDF5 plugin functionality */
-#include "hdf5dev.h"
+#include "H5PLextern.h"
 
 /* This connector's header */
 #include "null_vol_connector.h"
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 41bea54..eee9c53 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -21,7 +21,6 @@
 #include "h5tools_ref.h"
 #include "h5tools_utils.h"
 #include "H5private.h"
-#include "hdf5dev.h"
 
 #ifdef H5_TOOLS_DEBUG
 /* global debug variables */
diff --git a/tools/test/h5copy/dynlib_copy.c b/tools/test/h5copy/dynlib_copy.c
index e7d074d..b954a22 100644
--- a/tools/test/h5copy/dynlib_copy.c
+++ b/tools/test/h5copy/dynlib_copy.c
@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "hdf5dev.h"
+#include "H5PLextern.h"
 
 #define H5Z_FILTER_DYNLIBUD 300
 #define MULTIPLIER          3
diff --git a/tools/test/h5diff/dynlib_diff.c b/tools/test/h5diff/dynlib_diff.c
index 61abb90..433522d 100644
--- a/tools/test/h5diff/dynlib_diff.c
+++ b/tools/test/h5diff/dynlib_diff.c
@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "hdf5dev.h"
+#include "H5PLextern.h"
 
 #define H5Z_FILTER_DYNLIBUD 300
 #define MULTIPLIER          3
diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index 58d6129..f03254e 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -13,7 +13,6 @@
 
 #include "hdf5.h"
 #include "H5private.h"
-#include "hdf5dev.h"
 
 /*
  * The output functions need a temporary buffer to hold a piece of the
diff --git a/tools/test/h5dump/dynlib_dump.c b/tools/test/h5dump/dynlib_dump.c
index 61abb90..433522d 100644
--- a/tools/test/h5dump/dynlib_dump.c
+++ b/tools/test/h5dump/dynlib_dump.c
@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "hdf5dev.h"
+#include "H5PLextern.h"
 
 #define H5Z_FILTER_DYNLIBUD 300
 #define MULTIPLIER          3
diff --git a/tools/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c
index cea4e76..1da6b63 100644
--- a/tools/test/h5jam/h5jamgentest.c
+++ b/tools/test/h5jam/h5jamgentest.c
@@ -23,7 +23,6 @@
 
 #include "hdf5.h"
 #include "H5private.h"
-#include "hdf5dev.h"
 
 /* not used yet
 #define UBTXT1 "u0.txt"
diff --git a/tools/test/h5ls/dynlib_ls.c b/tools/test/h5ls/dynlib_ls.c
index 61abb90..433522d 100644
--- a/tools/test/h5ls/dynlib_ls.c
+++ b/tools/test/h5ls/dynlib_ls.c
@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "hdf5dev.h"
+#include "H5PLextern.h"
 
 #define H5Z_FILTER_DYNLIBUD 300
 #define MULTIPLIER          3
diff --git a/tools/test/h5repack/dynlib_rpk.c b/tools/test/h5repack/dynlib_rpk.c
index 0fa0642..b228344 100644
--- a/tools/test/h5repack/dynlib_rpk.c
+++ b/tools/test/h5repack/dynlib_rpk.c
@@ -18,7 +18,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "hdf5dev.h"
+#include "H5PLextern.h"
 
 #define H5Z_FILTER_DYNLIB1 257
 
diff --git a/tools/test/h5repack/dynlib_vrpk.c b/tools/test/h5repack/dynlib_vrpk.c
index 454ae49..5eac4f2 100644
--- a/tools/test/h5repack/dynlib_vrpk.c
+++ b/tools/test/h5repack/dynlib_vrpk.c
@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "hdf5dev.h"
+#include "H5PLextern.h"
 
 #define H5Z_FILTER_DYNLIB4 260
 
diff --git a/tools/test/perform/chunk.c b/tools/test/perform/chunk.c
index 209fd43..5e2dde2 100644
--- a/tools/test/perform/chunk.c
+++ b/tools/test/perform/chunk.c
@@ -22,7 +22,6 @@
 
 /* See H5private.h for how to include headers */
 #include "hdf5.h"
-#include "hdf5dev.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/utils/mirror_vfd/mirror_remote.h b/utils/mirror_vfd/mirror_remote.h
index 7a72372..6f37b0b 100644
--- a/utils/mirror_vfd/mirror_remote.h
+++ b/utils/mirror_vfd/mirror_remote.h
@@ -16,7 +16,6 @@
  */
 
 #include "hdf5.h"
-#include "hdf5dev.h"
 #include "H5private.h"
 
 #ifdef H5_HAVE_MIRROR_VFD