Bring subfiling VFD code closer to typical library code

src/H5FDsubfiling/H5FDioc_priv.h

@@ -37,7 +37,6 @@
 #include "H5Pprivate.h"  /* Property lists                           */
 
 #include "H5subfiling_common.h"
-#include "H5subfiling_err.h"
 
 #include "mercury_thread.h"
 #include "mercury_thread_mutex.h"
@@ -411,17 +410,13 @@ extern int *H5FD_IOC_tag_ub_val_ptr;
 extern "C" {
 #endif
 
-H5_DLL int initialize_ioc_threads(void *_sf_context);
-H5_DLL int finalize_ioc_threads(void *_sf_context);
-
-H5_DLL herr_t ioc__write_independent_async(int64_t context_id, int64_t offset, int64_t elements,
-                                           const void *data, io_req_t **io_req);
-H5_DLL herr_t ioc__read_independent_async(int64_t context_id, int64_t offset, int64_t elements, void *data,
-                                          io_req_t **io_req);
-
-H5_DLL herr_t ioc__async_completion(MPI_Request *mpi_reqs, size_t num_reqs);
-
-H5_DLL int wait_for_thread_main(void);
+H5_DLL herr_t H5FD__ioc_init_threads(void *_sf_context);
+H5_DLL herr_t H5FD__ioc_finalize_threads(void *_sf_context);
+H5_DLL herr_t H5FD__ioc_write_independent_async(int64_t context_id, int64_t offset, int64_t elements,
+                                                const void *data, io_req_t **io_req);
+H5_DLL herr_t H5FD__ioc_read_independent_async(int64_t context_id, int64_t offset, int64_t elements,
+                                               void *data, io_req_t **io_req);
+H5_DLL herr_t H5FD__ioc_async_completion(MPI_Request *mpi_reqs, size_t num_reqs);
 
 #ifdef __cplusplus
 }