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

8 files changed, 19 insertions, 46 deletions

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 */