Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into merge_func_enter_vol

Plus initial steps toward merging API context push into FUNC_ENTER_API* macros

15 files changed, 1020 insertions, 804 deletions

diff --git a/fortran/CMakeLists.txt b/fortran/CMakeLists.txt
index 075e1da..8c7b8f6 100644
--- a/fortran/CMakeLists.txt
+++ b/fortran/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_F90 C CXX Fortran)
 
 if (H5_HAVE_PARALLEL)
@@ -10,21 +10,21 @@ endif ()
 #-----------------------------------------------------------------------------
 # Traverse source subdirectory
 #-----------------------------------------------------------------------------
-add_subdirectory (${HDF5_F90_SOURCE_DIR}/src ${HDF5_F90_BINARY_DIR}/src)
+add_subdirectory (src)
 
 #-----------------------------------------------------------------------------
 # Build the Fortran Examples
 #-----------------------------------------------------------------------------
 if (HDF5_BUILD_EXAMPLES)
-  add_subdirectory (${HDF5_F90_SOURCE_DIR}/examples ${HDF5_F90_BINARY_DIR}/examples)
+  add_subdirectory (examples)
 endif ()
 
 #-----------------------------------------------------------------------------
 # Testing
 #-----------------------------------------------------------------------------
 if (BUILD_TESTING)
-  add_subdirectory (${HDF5_F90_SOURCE_DIR}/test ${HDF5_F90_BINARY_DIR}/test)
+  add_subdirectory (test)
   if (MPI_Fortran_FOUND)
-    add_subdirectory (${HDF5_F90_SOURCE_DIR}/testpar ${HDF5_F90_BINARY_DIR}/testpar)
+    add_subdirectory (testpar)
   endif ()
 endif ()
diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index 426df7e..8b7333a 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_F90_EXAMPLES C CXX Fortran)
 # --------------------------------------------------------------------
 # Notes: When creating examples they should be prefixed
@@ -40,7 +40,6 @@ set (F2003_examples
 
 foreach (example ${examples})
   add_executable (f90_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-  TARGET_NAMING (f90_ex_${example} STATIC)
   TARGET_FORTRAN_PROPERTIES (f90_ex_${example} STATIC " " " ")
   target_link_libraries (f90_ex_${example}
       ${HDF5_F90_LIB_TARGET}
@@ -52,9 +51,8 @@ foreach (example ${examples})
       FOLDER examples/fortran
       Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
   )
-  if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+  if (BUILD_SHARED_LIBS)
     add_executable (f90_ex_${example}-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-    TARGET_NAMING (f90_ex_${example}-shared SHARED)
     TARGET_FORTRAN_PROPERTIES (f90_ex_${example}-shared SHARED " " " ")
     target_link_libraries (f90_ex_${example}-shared
         ${HDF5_F90_LIBSH_TARGET}
@@ -71,7 +69,6 @@ endforeach ()
 
 foreach (example ${F2003_examples})
   add_executable (f03_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-  TARGET_NAMING (f03_ex_${example} STATIC)
   TARGET_FORTRAN_PROPERTIES (f03_ex_${example} STATIC " " " ")
   target_link_libraries (f03_ex_${example}
       ${HDF5_F90_LIB_TARGET}
@@ -83,9 +80,8 @@ foreach (example ${F2003_examples})
       FOLDER examples/fortran03
       Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
   )
-  if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+  if (BUILD_SHARED_LIBS)
     add_executable (f03_ex_${example}-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-    TARGET_NAMING (f03_ex_${example}-shared SHARED)
     TARGET_FORTRAN_PROPERTIES (f03_ex_${example}-shared SHARED " " " ")
     target_link_libraries (f03_ex_${example}-shared
         ${HDF5_F90_LIBSH_TARGET}
@@ -102,7 +98,6 @@ endforeach ()
 
 if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
   add_executable (f90_ex_ph5example ${HDF5_F90_EXAMPLES_SOURCE_DIR}/ph5example.f90)
-  TARGET_NAMING (f90_ex_ph5example STATIC)
   TARGET_FORTRAN_PROPERTIES (f90_ex_ph5example STATIC " " " ")
   target_link_libraries (f90_ex_ph5example
       ${HDF5_F90_LIB_TARGET}
@@ -114,9 +109,8 @@ if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
       FOLDER examples/fortran
       Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
   )
-  if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+  if (BUILD_SHARED_LIBS)
     add_executable (f90_ex_ph5example-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/ph5example.f90)
-    TARGET_NAMING (f90_ex_ph5example-shared SHARED)
     TARGET_FORTRAN_PROPERTIES (f90_ex_ph5example-shared SHARED " " " ")
     target_link_libraries (f90_ex_ph5example-shared
         ${HDF5_F90_LIBSH_TARGET}
diff --git a/fortran/examples/CMakeTests.cmake b/fortran/examples/CMakeTests.cmake
index b130f30..c3d94b4 100644
--- a/fortran/examples/CMakeTests.cmake
+++ b/fortran/examples/CMakeTests.cmake
@@ -41,7 +41,7 @@
     set_tests_properties (f90_ex-clear-objects PROPERTIES DEPENDS ${last_test})
   endif ()
   set (last_test "f90_ex-clear-objects")
-  if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+  if (BUILD_SHARED_LIBS)
     add_test (
         NAME f90_ex-shared-clear-objects
         COMMAND    ${CMAKE_COMMAND}
@@ -87,7 +87,7 @@ foreach (example ${examples})
     set_tests_properties (f90_ex_${example} PROPERTIES DEPENDS ${last_test})
   endif ()
   set (last_test "f90_ex_${example}")
-  if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+  if (BUILD_SHARED_LIBS)
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME f90_ex-shared_${example} COMMAND $<TARGET_FILE:f90_ex_${example}-shared>)
     else ()
@@ -129,7 +129,7 @@ if (HDF5_ENABLE_F2003)
       set_tests_properties (f03_ex_${example} PROPERTIES DEPENDS ${last_test})
     endif ()
     set (last_test "f03_ex_${example}")
-    if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+    if (BUILD_SHARED_LIBS)
       if (HDF5_ENABLE_USING_MEMCHECKER)
         add_test (NAME f03_ex-shared_${example} COMMAND $<TARGET_FILE:f03_ex_${example}-shared>)
       else ()
@@ -154,7 +154,7 @@ endif ()
 
 if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
   add_test (NAME f90_ex_ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:f90_ex_ph5example> ${MPIEXEC_POSTFLAGS})
-  if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+  if (BUILD_SHARED_LIBS)
     add_test (NAME f90_ex-shared_ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:f90_ex_ph5example> ${MPIEXEC_POSTFLAGS})
   endif ()
 endif ()
diff --git a/fortran/examples/h5_crtatt.f90 b/fortran/examples/h5_crtatt.f90
index 7e287c6..d3df380 100644
--- a/fortran/examples/h5_crtatt.f90
+++ b/fortran/examples/h5_crtatt.f90
@@ -84,6 +84,10 @@ PROGRAM H5_CRTATT
   !
   CALL h5aclose_f(attr_id, error)
   !
+  ! Close the attribute datatype.
+  !
+  CALL h5tclose_f(atype_id, error)
+  !
   ! Terminate access to the data space.
   !
   CALL h5sclose_f(aspace_id, error)
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index e34c778..3abab4e 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required (VERSION 3.2.2)
-PROJECT (HDF5_F90_SRC C CXX Fortran)
+cmake_minimum_required (VERSION 3.10)
+project (HDF5_F90_SRC C CXX Fortran)
 
 #-----------------------------------------------------------------------------
 # configure def file for shared libs on windows
@@ -64,37 +64,40 @@ set_target_properties (H5_buildiface PROPERTIES
     Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
 )
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (BUILD_SHARED_LIBS)
   file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared")
-  if (WIN32)
-    set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${CMAKE_BUILD_TYPE})
-  else ()
-    set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
-  endif ()
-endif ()
-if (WIN32)
-  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${CMAKE_BUILD_TYPE})
-else ()
-  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
+  set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF_CFG_BUILD_TYPE})
 endif ()
+file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/static")
+set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF_CFG_BUILD_TYPE})
 
-INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${CMAKE_Fortran_MODULE_DIRECTORY})
+INCLUDE_DIRECTORIES (${HDF5_F90_SOURCE_DIR} ${HDF5_F90_BINARY_DIR} ${CMAKE_Fortran_MODULE_DIRECTORY})
 
 #-----------------------------------------------------------------------------
 add_executable (H5match_types
     ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h
     ${HDF5_F90_SRC_SOURCE_DIR}/H5match_types.c
 )
-set (CMD $<TARGET_FILE:H5match_types>)
 add_custom_command (
-    OUTPUT ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
-           ${HDF5_F90_BINARY_DIR}/H5fortran_types.F90
-    COMMAND ${CMD}
-    WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}
+    OUTPUT ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h
+           ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.F90
+    COMMAND $<TARGET_FILE:H5match_types>
+    WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/static
     DEPENDS H5match_types
 )
-set_source_files_properties (${HDF5_F90_BINARY_DIR}/H5f90i_gen.h PROPERTIES GENERATED TRUE)
-set_source_files_properties (${HDF5_F90_BINARY_DIR}/H5fortran_types.F90 PROPERTIES GENERATED TRUE)
+set_source_files_properties (${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h PROPERTIES GENERATED TRUE)
+set_source_files_properties (${HDF5_F90_BINARY_DIR}/static/H5fortran_types.F90 PROPERTIES GENERATED TRUE)
+if (BUILD_SHARED_LIBS)
+  add_custom_command (
+      OUTPUT ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h
+             ${HDF5_F90_BINARY_DIR}/shared/H5fortran_types.F90
+      COMMAND $<TARGET_FILE:H5match_types>
+      WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/shared
+      DEPENDS H5match_types
+  )
+  set_source_files_properties (${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h PROPERTIES GENERATED TRUE)
+  set_source_files_properties (${HDF5_F90_BINARY_DIR}/shared/H5fortran_types.F90 PROPERTIES GENERATED TRUE)
+endif ()
 
 #-----------------------------------------------------------------------------
 # f90CStub lib
@@ -121,10 +124,15 @@ set_source_files_properties (${f90CStub_C_SOURCES} PROPERTIES LANGUAGE C)
 
 set (f90CStub_C_HDRS
     # generated files
-    ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
+    ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h
+)
+set (f90CStub_C_SHHDRS
+    # generated files
+    ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h
 )
 
 add_library (${HDF5_F90_C_LIB_TARGET} STATIC ${f90CStub_C_SOURCES} ${f90CStub_C_HDRS})
+target_include_directories(${HDF5_F90_C_LIB_TARGET} PUBLIC ${HDF5_F90_BINARY_DIR}/static)
 TARGET_C_PROPERTIES (${HDF5_F90_C_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_F90_C_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIB_TARGET}")
@@ -136,8 +144,9 @@ set_target_properties (${HDF5_F90_C_LIB_TARGET} PROPERTIES
 )
 set (install_targets ${HDF5_F90_C_LIB_TARGET})
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
-  add_library (${HDF5_F90_C_LIBSH_TARGET} SHARED ${f90CStub_C_SOURCES} ${f90CStub_C_HDRS})
+if (BUILD_SHARED_LIBS)
+  add_library (${HDF5_F90_C_LIBSH_TARGET} SHARED ${f90CStub_C_SOURCES} ${f90CStub_C_SHHDRS})
+  target_include_directories(${HDF5_F90_C_LIBSH_TARGET} PUBLIC ${HDF5_F90_BINARY_DIR}/shared)
   TARGET_C_PROPERTIES (${HDF5_F90_C_LIBSH_TARGET} SHARED " " " ")
   target_link_libraries (${HDF5_F90_C_LIBSH_TARGET} PUBLIC ${HDF5_LIBSH_TARGET})
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIBSH_TARGET}")
@@ -160,24 +169,22 @@ set (f90_F_GEN_SOURCES
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Dff.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Pff.F90
 )
-set (CMD $<TARGET_FILE:H5_buildiface>)
 add_custom_command (
-    OUTPUT ${HDF5_F90_BINARY_DIR}/H5_gen.F90
-    COMMAND ${CMD}
-    WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}
+    OUTPUT ${HDF5_F90_BINARY_DIR}/static/H5_gen.F90
+    COMMAND $<TARGET_FILE:H5_buildiface>
+    WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/static
     DEPENDS ${f90_F_GEN_SOURCES}
     COMMENT "Generating the H5_gen.F90 file"
 )
 add_custom_target (H5gen ALL
-    DEPENDS ${HDF5_F90_BINARY_DIR}/H5_gen.F90
+    DEPENDS ${HDF5_F90_BINARY_DIR}/static/H5_gen.F90
 )
-set_source_files_properties (${HDF5_F90_BINARY_DIR}/H5_gen.F90 PROPERTIES GENERATED TRUE)
+set_source_files_properties (${HDF5_F90_BINARY_DIR}/static/H5_gen.F90 PROPERTIES GENERATED TRUE)
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
-  set (CMDSH $<TARGET_FILE:H5_buildiface>)
+if (BUILD_SHARED_LIBS)
   add_custom_command (
       OUTPUT ${HDF5_F90_BINARY_DIR}/shared/H5_gen.F90
-      COMMAND ${CMDSH}
+      COMMAND $<TARGET_FILE:H5_buildiface>
       WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/shared
       DEPENDS ${f90_F_GEN_SOURCES}
       COMMENT "Generating the H5_gen.F90 shared file"
@@ -210,20 +217,20 @@ set (f90_F_BASE_SOURCES
 
 set (f90_F_SOURCES
     # generated file
-    ${HDF5_F90_BINARY_DIR}/H5fortran_types.F90
+    ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.F90
 
     ${f90_F_BASE_SOURCES}
 
     # generated file
-    ${HDF5_F90_BINARY_DIR}/H5_gen.F90
+    ${HDF5_F90_BINARY_DIR}/static/H5_gen.F90
 
     # normal distribution
     ${HDF5_F90_SRC_SOURCE_DIR}/HDF5.F90
 )
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (BUILD_SHARED_LIBS)
   set (f90_F_SOURCES_SHARED
       # generated file
-      ${HDF5_F90_BINARY_DIR}/H5fortran_types.F90
+      ${HDF5_F90_BINARY_DIR}/shared/H5fortran_types.F90
 
       ${f90_F_BASE_SOURCES}
 
@@ -243,6 +250,7 @@ set (SHARED_LINK_FLAGS " ")
 TARGET_FORTRAN_PROPERTIES (${HDF5_F90_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_F90_LIB_TARGET} PUBLIC ${HDF5_F90_C_LIB_TARGET})
 target_link_libraries (${HDF5_F90_LIB_TARGET} PRIVATE ${LINK_Fortran_LIBS})
+target_include_directories (${HDF5_F90_LIB_TARGET} PUBLIC ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
 if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
   target_include_directories (${HDF5_F90_LIB_TARGET} PUBLIC ${MPI_Fortran_INCLUDE_DIRS})
 endif ()
@@ -262,7 +270,7 @@ endif ()
 set (install_targets ${install_targets} ${HDF5_F90_LIB_TARGET})
 add_dependencies(${HDF5_F90_LIB_TARGET} H5gen)
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (BUILD_SHARED_LIBS)
   add_library (${HDF5_F90_LIBSH_TARGET} SHARED ${f90_F_SOURCES_SHARED})
   set (SHARED_LINK_FLAGS " ")
   if (WIN32 AND MSVC)
@@ -271,6 +279,7 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   TARGET_FORTRAN_PROPERTIES (${HDF5_F90_LIBSH_TARGET} SHARED " " ${SHARED_LINK_FLAGS})
   target_link_libraries (${HDF5_F90_LIBSH_TARGET} PUBLIC ${HDF5_F90_C_LIBSH_TARGET})
   target_link_libraries (${HDF5_F90_LIBSH_TARGET} PRIVATE ${LINK_Fortran_LIBS})
+  target_include_directories (${HDF5_F90_LIBSH_TARGET} PUBLIC ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
   if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
     target_include_directories (${HDF5_F90_LIBSH_TARGET} PUBLIC ${MPI_Fortran_INCLUDE_DIRS})
   endif ()
@@ -286,7 +295,7 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   )
   if (WIN32)
     set_property (TARGET ${HDF5_F90_LIBSH_TARGET}
-      APPEND PROPERTY COMPILE_DEFINITIONS "BUILD_HDF5_DLL;HDF5F90_WINDOWS"
+        APPEND PROPERTY COMPILE_DEFINITIONS "BUILD_HDF5_DLL;HDF5F90_WINDOWS"
     )
   endif ()
   set (install_targets ${install_targets} ${HDF5_F90_LIBSH_TARGET})
@@ -301,8 +310,8 @@ install (
         ${HDF5_F90_SRC_SOURCE_DIR}/H5f90.h
         ${HDF5_F90_SRC_SOURCE_DIR}/H5f90i.h
         ${HDF5_F90_SRC_SOURCE_DIR}/H5f90proto.h
-        ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
-        ${HDF5_F90_BINARY_DIR}/H5fortran_types.F90
+        ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h
+        ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.F90
     DESTINATION
         ${HDF5_INSTALL_INCLUDE_DIR}
     COMPONENT
@@ -339,7 +348,7 @@ install (
         fortheaders
 )
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (BUILD_SHARED_LIBS)
   set (modsh_files
       ${MODSH_BUILD_DIR}/h5fortran_types.mod
       ${MODSH_BUILD_DIR}/hdf5.mod
@@ -375,7 +384,7 @@ endif ()
 # Add Target(s) to CMake Install for import into other projects
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+  if (BUILD_SHARED_LIBS)
     INSTALL_TARGET_PDB (${HDF5_F90_C_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} fortlibraries)
     #INSTALL_TARGET_PDB (${HDF5_F90_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} fortlibraries)
   endif ()
diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c
index 588ea9f..14fac6b 100644
--- a/fortran/src/H5Df.c
+++ b/fortran/src/H5Df.c
@@ -567,7 +567,7 @@ DONE:
  *  dims          - one-demnsional array of size 2
  *  dims[0] = MAXLENGTH
  *  dims[1] = number of elements of VL type
- *  len           - array element lenghts
+ *  len           - array element lengths
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -641,7 +641,7 @@ DONE:
  *  dims[1] = number of elements of VL type
  * OUTPUTS
  *  buf           - data buffer
- *  len           - array element lenghts
+ *  len           - array element lengths
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -882,7 +882,7 @@ h5dread_vl_string_c( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_spac
  *  dims          - one-demnsional array of size 2
  *  dims[0] = MAXLENGTH
  *  dims[1] = number of elements of VL type
- *  len           - array element lenghts
+ *  len           - array element lengths
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -956,7 +956,7 @@ DONE:
  *  dims[1] = number of elements of VL type
  * OUTPUTS
  *  buf           - data buffer
- *  len           - array element lenghts
+ *  len           - array element lengths
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -1209,7 +1209,7 @@ h5dwrite_f_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
  *  dims[1] = number of elements of VL type
  * OUTPUTS
  *  buf - data buffer
- *  len - array element lenghts
+ *  len - array element lengths
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
diff --git a/fortran/src/H5Gf.c b/fortran/src/H5Gf.c
index 720bd49..b829b20 100644
--- a/fortran/src/H5Gf.c
+++ b/fortran/src/H5Gf.c
@@ -47,7 +47,7 @@
 */
 int_f
 h5gcreate_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size_hint,
-	     hid_t_f *grp_id, hid_t_f *lcpl_id, hid_t_f *gcpl_id, hid_t_f *gapl_id )
+        hid_t_f *grp_id, hid_t_f *lcpl_id, hid_t_f *gcpl_id, hid_t_f *gapl_id )
 /******/
 {
     hid_t c_gcpl_id = -1;          /* Group creation property list */
@@ -69,11 +69,11 @@ h5gcreate_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size_hint,
     else {
       /* Create the group creation property list */
       if((c_gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0)
-	goto DONE;
+          goto DONE;
 
       /* Set the local heap size hint */
       if(H5Pset_local_heap_size_hint(c_gcpl_id, (size_t)*size_hint) < 0)
-	goto DONE;
+          goto DONE;
 
       /* Create the group */
       c_grp_id = H5Gcreate2((hid_t)*loc_id, c_name, H5P_DEFAULT, c_gcpl_id, H5P_DEFAULT);
@@ -308,9 +308,9 @@ h5gclose_c(hid_t_f *grp_id)
  *  link_type - link type
  *  current_name - name of the existing object for hard link,
  *  anything for the soft link
- *  current_namelen - current name lenghth
+ *  current_namelen - current name length
  *  new_name - new name for the object
- *  new_namelen - new_name lenghth
+ *  new_namelen - new_name length
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -365,7 +365,7 @@ h5glink_c(hid_t_f *loc_id, int_f *link_type, _fcd current_name,
                 goto DONE;
             break;
     /* End of the warnings fix */
- 
+
         default:        /* Unknown/unhandled link type */
             goto DONE;
     } /* end switch */
@@ -390,12 +390,12 @@ DONE:
  *  cur_name - name of the existing object for hard link releative
  *  to cur_loc_id location,
  *  anything for the soft link
- *  current_namelen - current name lenghth
+ *  current_namelen - current name length
  *  link_type - link type
  *  new_loc_id - location identifier
  *  new_name - new name for the object releative to the new_loc_id
  *  location
- *  new_namelen - new_name lenghth
+ *  new_namelen - new_name length
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -515,9 +515,9 @@ DONE:
  * INPUTS
  *  loc_id - identifier of file or group
  *  src_name - name of the original object
- *  src_namelen - original name lenghth
+ *  src_namelen - original name length
  *  dst_name - new name for the object
- *  dst_namelen - new name lenghth
+ *  dst_namelen - new name length
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -565,10 +565,10 @@ DONE:
  * INPUTS
  *  src_loc_id - identifier of file or group
  *  src_name - name of the original object relative to src_loc_id
- *  src_namelen - original name lenghth
+ *  src_namelen - original name length
  *  dst_loc_id - new location identifier
  *  dst_name - new name for the object relative to dst_loc_id
- *  dst_namelen - new name lenghth
+ *  dst_namelen - new name length
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -617,8 +617,8 @@ DONE:
  * INPUTS
  *  loc_id - identifier of file or group
  *  name - name of the object that symbolic link points to
- *  namelen - the name lenghth
- *  size - lenghth of retrurned value
+ *  namelen - the name length
+ *  size - length of retrurned value
  * OUTPUTS
  *  value - name to be returned
  * RETURNS
@@ -681,9 +681,9 @@ DONE:
  * INPUTS
  *  loc_id - identifier of file or group
  *  name - name of object whose comment is to be set or reset
- *  namelen - the name lenghth
+ *  namelen - the name length
  *  comment - the new comment
- *  commentlen - new comment lenghth
+ *  commentlen - new comment length
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -732,7 +732,7 @@ DONE:
  * INPUTS
  *  loc_id - identifier of file or group
  *  name - name of object whose comment is to be set or reset
- *  namelen - the name lenghth
+ *  namelen - the name length
  *  bufsize - at most bufsize characters
  *  comment - the new comment
  * RETURNS
@@ -948,8 +948,8 @@ done:
 */
 int_f
 h5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
-		      int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
-		      int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted )
+            int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
+            int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted )
 /******/
 {
   char *c_group_name = NULL;          /* Buffer to hold group name C string */
@@ -965,7 +965,7 @@ h5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
    * Call H5Gget_info_by_idx function.
    */
   if(H5Gget_info_by_idx((hid_t)*loc_id,c_group_name, (H5_index_t)*index_type,(H5_iter_order_t)*order,(hsize_t)*n,
-			&ginfo, (hid_t)*lapl_id) < 0)
+            &ginfo, (hid_t)*lapl_id) < 0)
     HGOTO_DONE(FAIL);
 
   /* Unpack the structure */
@@ -1018,7 +1018,7 @@ h5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
 */
 int_f
 h5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id,
-		       int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted)
+            int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted)
 /******/
 {
   char *c_group_name = NULL;          /* Buffer to hold group name C string */
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index a114e8b..9fdd19b 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -2638,7 +2638,7 @@ h5pget_hyper_vector_size_c ( hid_t_f *prp_id , size_t_f *size)
  * INPUTS
  *  parent - property list class identifier
  *  name   - name of the new class
- *  name_len - lenght of the "name" buffer
+ *  name_len - length of the "name" buffer
  * OUTPUTS
  *  class - new class identifier
  * RETURNS
@@ -3415,8 +3415,8 @@ h5pset_family_offset_c ( hid_t_f *prp_id , hsize_t_f *offset)
  *  mem_map - memory mapping array
  *  memb_fapl - property list for each memory usage type
  *  memb_name - array with members names
- *  len - array with the lenght of each name
- *  lenmax - lenght of the name a sdeclared in Fortran
+ *  len - array with the length of each name
+ *  lenmax - length of the name a sdeclared in Fortran
  *  flag - flag allowing partila access when one of the files is missing
  * RETURNS
  *  0 on success, -1 on failure
@@ -3537,12 +3537,12 @@ h5pset_fapl_multi_sc ( hid_t_f *prp_id , int_f *flag)
  *  Call H5Pget_fapl_multi to set multi file dirver
  * INPUTS
  *  prp_id - file_creation property list identifier
- *  lenmax - lenght of the name a sdeclared in Fortran
+ *  lenmax - length of the name a sdeclared in Fortran
  * OUTPUTS
  *  memb_map - memory mapping array
  *  memb_fapl - property list for each memory usage type
  *  memb_name - array with members names
- *  len - array with the lenght of each name
+ *  len - array with the length of each name
  *  flag - flag allowing partila access when one of the files is missing
  * RETURNS
  *  0 on success, -1 on failure
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index b69d4d0..178aa80 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -5313,7 +5313,7 @@ CONTAINS
 !  
 !  expression - buffer to hold transform expression
 !  hdferr     - Error code
-!                 Success:  Actual lenght of the expression
+!                 Success:  Actual length of the expression
 !                           If provided buffer "expression" is 
 !                           smaller, than expression will be 
 !                           truncated to fit into
diff --git a/fortran/src/H5Rff.F90 b/fortran/src/H5Rff.F90
index 6d6371b..f5a9c6e 100644
--- a/fortran/src/H5Rff.F90
+++ b/fortran/src/H5Rff.F90
@@ -38,7 +38,7 @@
 !
 !*****
 
-MODULE H5R 
+MODULE H5R
   USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR, C_SIGNED_CHAR
   USE H5GLOBAL
 
@@ -62,7 +62,7 @@ MODULE H5R
 
   END INTERFACE
 
-  TYPE :: hdset_reg_ref_t_f03 
+  TYPE :: hdset_reg_ref_t_f03
      INTEGER(C_SIGNED_CHAR), DIMENSION(1:H5R_DSET_REG_REF_BUF_SIZE_F) :: ref
   END TYPE hdset_reg_ref_t_f03
 
@@ -165,16 +165,16 @@ CONTAINS
 !  Retrieves the type of object that an object reference points to.
 !
 ! INPUTS
-!  dset_id 	 - identifier of the dataset containing
+!  dset_id      - identifier of the dataset containing
 !                  reference to the objects
-!  ref 	         - reference to open
+!  ref              - reference to open
 ! OUTPUTS
-!  obj_type 	 - object_type, possible values:
+!  obj_type      - object_type, possible values:
 !                    H5G_UNKNOWN_F
-!                    H5G_GROUP_F 
+!                    H5G_GROUP_F
 !                    H5G_DATASET_F
 !                    H5G_TYPE_F
-!  hdferr 	 - Returns 0 if successful and -1 if fails
+!  hdferr      - Returns 0 if successful and -1 if fails
 !
 ! AUTHOR
 !  Elena Pourmal
@@ -227,17 +227,17 @@ CONTAINS
 !  Retrieves a dataspace with the specified region selected
 !
 ! INPUTS
-!  dset_id 	 - identifier of the dataset containing
+!  dset_id      - identifier of the dataset containing
 !                  reference to the regions
-!  ref 	         - reference to open
+!  ref              - reference to open
 ! OUTPUTS
-!  space_id 	 - dataspace identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
+!  space_id      - dataspace identifier
+!  hdferr      - Returns 0 if successful and -1 if fails
 ! AUTHOR
 !  Elena Pourmal
 !  August 12, 1999
 !
-! HISTORY 	
+! HISTORY
 !  Explicit Fortran interfaces were added for
 !  called C functions (it is needed for Windows
 !  port).  February 28, 2001
@@ -276,16 +276,16 @@ CONTAINS
 !  h5rget_region_ptr_f
 !
 ! PURPOSE
-!  Retrieves a dataspace with the specified region 
+!  Retrieves a dataspace with the specified region
 !  selected using pointer
 !
 ! INPUTS
-!  dset_id 	 - identifier of the dataset containing
+!  dset_id      - identifier of the dataset containing
 !                  reference to the regions
-!  ref 	         - reference to open
+!  ref              - reference to open
 ! OUTPUTS
-!  space_id 	 - dataspace identifier
-!  hdferr 	 - Returns 0 if successful and -1 if fails
+!  space_id      - dataspace identifier
+!  hdferr      - Returns 0 if successful and -1 if fails
 ! AUTHOR
 !  M. Scot Breitenfeld
 !  August 4, 2012
@@ -319,7 +319,7 @@ CONTAINS
 !  loc_id    - location identifier
 !  name      - name of the object at the specified location
 ! Outputs:
-!  ref 	     - reference to the specified object
+!  ref          - reference to the specified object
 !  hdferr    - returns 0 if successful and -1 if fails
 ! AUTHOR
 !  Elena Pourmal
@@ -363,11 +363,11 @@ CONTAINS
 !  Creates reference to the dataset region
 !
 ! INPUTS
-!  loc_id 	 - location identifier
-!  name 	 - name of the dataset at the specified location
-!  space_id 	 - dataspace identifier that describes selected region
+!  loc_id      - location identifier
+!  name      - name of the dataset at the specified location
+!  space_id      - dataspace identifier that describes selected region
 ! OUTPUTS
-!  ref 	         - reference to the dataset region
+!  ref              - reference to the dataset region
 !  hdferr        - returns 0 if successful and -1 if fails
 ! AUTHOR
 !  Elena Pourmal
@@ -424,12 +424,12 @@ CONTAINS
 !
 ! Inputs:
 !  loc_id     - location identifier
-!  name	      - name of the dataset at the specified location
+!  name          - name of the dataset at the specified location
 !  ref_type   - type of reference:
 !                H5R_OBJECT
 !                H5T_STD_REF_DSETREG
 ! Outputs:
-!  ref	      - reference created by the function call.
+!  ref          - reference created by the function call.
 !  hdferr     - returns 0 if successful and -1 if fails.
 ! OPTIONAL
 !  space_id   - dataspace identifier that describes selected region
@@ -474,7 +474,7 @@ CONTAINS
 ! Inputs:
 !  dset_id  - identifier of the dataset containing
 !             reference
-!  ref 	    - reference to open
+!  ref         - reference to open
 ! Outputs:
 !  obj_id   - object_identifier
 !  hdferr   - returns 0 if successful and -1 if fails
@@ -515,8 +515,8 @@ CONTAINS
 !
 ! Inputs:
 !  dset_id  - identifier of the dataset containing
-!             reference to teh regions
-!  ref 	    - reference to open
+!             reference to the regions
+!  ref         - reference to open
 ! Outputs:
 !  obj_id   - dataspace identifier
 !  hdferr   - returns 0 if successful and -1 if fails
@@ -585,7 +585,7 @@ CONTAINS
     INTEGER(HID_T), INTENT(OUT) :: ref_obj_id
                                           ! Identifier of referenced object
     INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!***** 
+!*****
     hdferr = h5rdereference_ptr_c(obj_id, ref_type, ref, ref_obj_id)
 
   END SUBROUTINE h5rdereference_ptr_f
@@ -600,14 +600,14 @@ CONTAINS
 !
 ! Inputs:
 !  loc_id    - Identifier for the file containing the reference or for any object in that file.
-!  ref 	     - An object or dataset region reference.
+!  ref          - An object or dataset region reference.
 !
 ! Outputs:
 !  name      - A name associated with the referenced object or dataset region.
 !  hdferr    - Returns 0 if successful and -1 if fails.
 !
 ! Optional parameters:
-!  size     - The size of the name buffer, returning 0 (zero) if no name is associated 
+!  size     - The size of the name buffer, returning 0 (zero) if no name is associated
 !             with the identifier.
 !
 ! AUTHOR
@@ -648,7 +648,7 @@ CONTAINS
 !
 ! Inputs:
 !  loc_id  - Identifier for the file containing the reference or for any object in that file.
-!  ref 	   - An object or dataset region reference.
+!  ref        - An object or dataset region reference.
 !
 ! Outputs:
 !  name    - A name associated with the referenced object or dataset region.
@@ -747,12 +747,12 @@ CONTAINS
   !  ref      - Reference to query.
   !
   ! Outputs:
-  !  obj_type - Type of referenced object. 
+  !  obj_type - Type of referenced object.
   !               H5G_UNKNOWN_F
   !               H5G_GROUP_F
   !               H5G_DATASET_F
   !               H5G_TYPE_F
-  !              
+  !
   !  hdferr   - Returns 0 if successful and -1 if fails.
   !
   ! AUTHOR
diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90
index ef89d2f..db57f03 100644
--- a/fortran/src/H5_ff.F90
+++ b/fortran/src/H5_ff.F90
@@ -38,10 +38,111 @@
 
 MODULE H5LIB
 
-  USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr, C_INTPTR_T
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_INTPTR_T
   USE H5GLOBAL
   IMPLICIT NONE
 
+  PRIVATE
+  !
+  ! H5F flags declaration
+  !
+  INTEGER, PARAMETER :: H5F_FLAGS_LEN = 19
+  INTEGER, DIMENSION(1:H5F_FLAGS_LEN) :: H5F_flags
+  !
+  ! H5generic flags declaration
+  !
+  INTEGER, PARAMETER :: H5generic_FLAGS_LEN = 9
+  INTEGER, DIMENSION(1:H5generic_FLAGS_LEN) :: H5generic_flags
+  
+  INTEGER, PARAMETER :: H5generic_haddr_FLAGS_LEN = 1
+  INTEGER(HADDR_T), DIMENSION(1:H5generic_haddr_FLAGS_LEN) :: H5generic_haddr_flags
+  !
+  ! H5G flags declaration
+  !
+  INTEGER, PARAMETER :: H5G_FLAGS_LEN = 12
+  INTEGER, DIMENSION(1:H5G_FLAGS_LEN) :: H5G_flags
+  !
+  ! H5D flags declaration
+  !
+  INTEGER, PARAMETER :: H5D_FLAGS_LEN = 29
+  INTEGER, DIMENSION(1:H5D_FLAGS_LEN) :: H5D_flags
+  INTEGER, PARAMETER :: H5D_SIZE_FLAGS_LEN = 2
+  INTEGER(SIZE_T), DIMENSION(1:H5D_SIZE_FLAGS_LEN) :: H5D_size_flags
+  !
+  ! H5E flags declaration
+  !
+  INTEGER, PARAMETER :: H5E_FLAGS_LEN = 4
+  INTEGER, DIMENSION(1:H5E_FLAGS_LEN) :: H5E_flags
+  INTEGER, PARAMETER :: H5E_HID_FLAGS_LEN = 1
+  INTEGER(HID_T), DIMENSION(1:H5E_HID_FLAGS_LEN) :: H5E_hid_flags
+  !
+  ! H5FD flags declaration
+  !
+  INTEGER, PARAMETER :: H5FD_FLAGS_LEN = 11
+  INTEGER, DIMENSION(1:H5FD_FLAGS_LEN) :: H5FD_flags
+  !
+  ! H5FD file drivers flags declaration 
+  !
+  INTEGER, PARAMETER :: H5FD_HID_FLAGS_LEN = 7
+  INTEGER(HID_T), DIMENSION(1:H5FD_HID_FLAGS_LEN) :: H5FD_hid_flags
+  !
+  ! H5I flags declaration
+  !
+  INTEGER, PARAMETER :: H5I_FLAGS_LEN = 7
+  INTEGER, DIMENSION(1:H5I_FLAGS_LEN) :: H5I_flags
+  !
+  ! H5L flags declaration
+  !
+  INTEGER, PARAMETER :: H5L_FLAGS_LEN = 6
+  INTEGER, DIMENSION(1:H5L_FLAGS_LEN) :: H5L_flags
+  !
+  ! H5O flags declaration
+  !
+  INTEGER, PARAMETER :: H5O_FLAGS_LEN = 27
+  INTEGER, DIMENSION(1:H5O_FLAGS_LEN) :: H5o_flags
+  !
+  ! H5P flags declaration
+  !
+  INTEGER, PARAMETER :: H5P_FLAGS_LEN = 18
+  INTEGER(HID_T), DIMENSION(1:H5P_FLAGS_LEN) :: H5P_flags
+  !
+  ! H5P integers flags declaration
+  !
+  INTEGER, PARAMETER :: H5P_FLAGS_INT_LEN = 2
+  INTEGER, DIMENSION(1:H5P_FLAGS_INT_LEN) :: H5P_flags_int
+  !
+  ! H5R flags declaration
+  !
+  INTEGER, PARAMETER :: H5R_FLAGS_LEN = 2
+  INTEGER, DIMENSION(1:H5R_FLAGS_LEN) :: H5R_flags
+  !
+  ! H5S flags declaration
+  !
+  INTEGER, PARAMETER :: H5S_FLAGS_LEN = 18
+  INTEGER, DIMENSION(1:H5S_FLAGS_LEN) :: H5S_flags
+  INTEGER, PARAMETER :: H5S_HSIZE_FLAGS_LEN = 1
+  INTEGER(HSIZE_T), DIMENSION(1:H5S_HSIZE_FLAGS_LEN) :: H5S_hsize_flags
+  INTEGER, PARAMETER :: H5S_HID_FLAGS_LEN = 1
+  INTEGER(HSIZE_T), DIMENSION(1:H5S_HID_FLAGS_LEN)   :: H5S_hid_flags
+  !
+  ! H5T flags declaration
+  !
+  INTEGER, PARAMETER :: H5T_FLAGS_LEN = 35
+  INTEGER, DIMENSION(1:H5T_FLAGS_LEN) :: H5T_flags
+  !
+  ! H5Z flags declaration
+  !
+  INTEGER, PARAMETER :: H5Z_FLAGS_LEN = 20
+  INTEGER, DIMENSION(1:H5Z_FLAGS_LEN) :: H5Z_flags
+  !
+  ! H5 Library flags declaration
+  !
+  INTEGER, PARAMETER :: H5LIB_FLAGS_LEN =  2
+  INTEGER, DIMENSION(1:H5LIB_FLAGS_LEN) :: H5LIB_flags
+  
+  PUBLIC :: h5open_f, h5close_f, h5get_libversion_f, h5dont_atexit_f, h5kind_to_type, h5offsetof
+  PUBLIC :: h5garbage_collect_f, h5check_version_f
+
 CONTAINS
 !****s* H5LIB/h5open_f
 !
@@ -65,26 +166,24 @@ CONTAINS
 !
 ! Removed call to h5open_c since this may cause a problem for an
 ! application that uses HDF5 library outside HDF5 Fortran APIs.
-!          October 13, 2011
+! October 13, 2011
 ! Fortran90 Interface:
   SUBROUTINE h5open_f(error)
     IMPLICIT NONE
     INTEGER, INTENT(OUT) :: error
 !*****
-    INTEGER ::  error_1, error_2, error_3
-
     INTERFACE
+
        INTEGER FUNCTION h5init_types_c(p_types, f_types, i_types) &
             BIND(C,NAME='h5init_types_c')
          IMPORT :: HID_T
          IMPORT :: PREDEF_TYPES_LEN, FLOATING_TYPES_LEN, INTEGER_TYPES_LEN
          IMPLICIT NONE
-         INTEGER(HID_T), DIMENSION(PREDEF_TYPES_LEN) :: p_types
-         INTEGER(HID_T), DIMENSION(FLOATING_TYPES_LEN) :: f_types
-         INTEGER(HID_T), DIMENSION(INTEGER_TYPES_LEN) :: i_types
+         INTEGER(HID_T), DIMENSION(1:PREDEF_TYPES_LEN)   :: p_types
+         INTEGER(HID_T), DIMENSION(1:FLOATING_TYPES_LEN) :: f_types
+         INTEGER(HID_T), DIMENSION(1:INTEGER_TYPES_LEN)  :: i_types
        END FUNCTION h5init_types_c
-    END INTERFACE
-    INTERFACE
+
        INTEGER FUNCTION h5init_flags_c(i_H5D_flags, &
             i_H5D_size_flags,&
             i_H5E_flags, &
@@ -116,39 +215,90 @@ CONTAINS
               H5R_FLAGS_LEN, H5S_FLAGS_LEN, H5S_HID_FLAGS_LEN, H5S_HSIZE_FLAGS_LEN, &
               H5T_FLAGS_LEN, H5Z_FLAGS_LEN, H5generic_FLAGS_LEN, H5generic_haddr_FLAGS_LEN
          IMPLICIT NONE
-         INTEGER i_H5D_flags(H5D_FLAGS_LEN)
-         INTEGER(SIZE_T) i_H5D_size_flags(H5D_SIZE_FLAGS_LEN)
-         INTEGER i_H5E_flags(H5E_FLAGS_LEN)
-         INTEGER(HID_T) i_H5E_hid_flags(H5E_HID_FLAGS_LEN)
-         INTEGER i_H5F_flags(H5F_FLAGS_LEN)
-         INTEGER i_H5G_flags(H5G_FLAGS_LEN)
-         INTEGER i_H5FD_flags(H5FD_FLAGS_LEN)
-         INTEGER(HID_T) i_H5FD_hid_flags(H5FD_HID_FLAGS_LEN)
-         INTEGER i_H5I_flags(H5I_FLAGS_LEN)
-         INTEGER i_H5L_flags(H5L_FLAGS_LEN)
-         INTEGER i_H5O_flags(H5O_FLAGS_LEN)
-         INTEGER(HID_T) i_H5P_flags(H5P_FLAGS_LEN)
-         INTEGER i_H5P_flags_int(H5P_FLAGS_INT_LEN)
-         INTEGER i_H5R_flags(H5R_FLAGS_LEN)
-         INTEGER i_H5S_flags(H5S_FLAGS_LEN)
-         INTEGER(HID_T) i_H5S_hid_flags(H5S_HID_FLAGS_LEN)
-         INTEGER(HSIZE_T) i_H5S_hsize_flags(H5S_HSIZE_FLAGS_LEN)
-         INTEGER i_H5T_flags(H5T_FLAGS_LEN)
-         INTEGER i_H5Z_flags(H5Z_FLAGS_LEN)
-         INTEGER i_H5generic_flags(H5generic_FLAGS_LEN)
-         INTEGER(HADDR_T) i_H5generic_haddr_flags(H5generic_haddr_FLAGS_LEN)
+         INTEGER         , DIMENSION(1:H5D_FLAGS_LEN)             :: i_H5D_flags
+         INTEGER(SIZE_T) , DIMENSION(1:H5D_SIZE_FLAGS_LEN)        :: i_H5D_size_flags
+         INTEGER         , DIMENSION(1:H5E_FLAGS_LEN)             :: i_H5E_flags
+         INTEGER(HID_T)  , DIMENSION(1:H5E_HID_FLAGS_LEN)         :: i_H5E_hid_flags
+         INTEGER         , DIMENSION(1:H5F_FLAGS_LEN)             :: i_H5F_flags
+         INTEGER         , DIMENSION(1:H5G_FLAGS_LEN)             :: i_H5G_flags
+         INTEGER         , DIMENSION(1:H5FD_FLAGS_LEN)            :: i_H5FD_flags
+         INTEGER(HID_T)  , DIMENSION(1:H5FD_HID_FLAGS_LEN)        :: i_H5FD_hid_flags
+         INTEGER         , DIMENSION(1:H5I_FLAGS_LEN)             :: i_H5I_flags
+         INTEGER         , DIMENSION(1:H5L_FLAGS_LEN)             :: i_H5L_flags
+         INTEGER         , DIMENSION(1:H5O_FLAGS_LEN)             :: i_H5O_flags
+         INTEGER(HID_T)  , DIMENSION(1:H5P_FLAGS_LEN)             :: i_H5P_flags
+         INTEGER         , DIMENSION(1:H5P_FLAGS_INT_LEN)         :: i_H5P_flags_int
+         INTEGER         , DIMENSION(1:H5R_FLAGS_LEN)             :: i_H5R_flags
+         INTEGER         , DIMENSION(1:H5S_FLAGS_LEN)             :: i_H5S_flags
+         INTEGER(HID_T)  , DIMENSION(1:H5S_HID_FLAGS_LEN)         :: i_H5S_hid_flags
+         INTEGER(HSIZE_T), DIMENSION(1:H5S_HSIZE_FLAGS_LEN)       :: i_H5S_hsize_flags
+         INTEGER         , DIMENSION(1:H5T_FLAGS_LEN)             :: i_H5T_flags
+         INTEGER         , DIMENSION(1:H5Z_FLAGS_LEN)             :: i_H5Z_flags
+         INTEGER         , DIMENSION(1:H5generic_FLAGS_LEN)       :: i_H5generic_flags
+         INTEGER(HADDR_T), DIMENSION(1:H5generic_haddr_FLAGS_LEN) :: i_H5generic_haddr_flags
        END FUNCTION h5init_flags_c
-    END INTERFACE
-    INTERFACE
+
        INTEGER FUNCTION h5init1_flags_c( i_H5LIB_flags ) &
             BIND(C,NAME='h5init1_flags_c')
          IMPORT :: H5LIB_FLAGS_LEN
          IMPLICIT NONE
-         INTEGER i_H5LIB_flags(H5LIB_FLAGS_LEN)
+         INTEGER, DIMENSION(1:H5LIB_FLAGS_LEN) :: i_H5LIB_flags
        END FUNCTION h5init1_flags_c
+
     END INTERFACE
-    error_1 = h5init_types_c(predef_types, floating_types, integer_types)
-    error_2 = h5init_flags_c(H5D_flags, &
+    
+    error = h5init_types_c(predef_types, floating_types, integer_types)
+
+    H5T_NATIVE_INTEGER_KIND(1:5)  = predef_types(1:5) 
+    H5T_NATIVE_INTEGER            = predef_types(6)
+    H5T_NATIVE_REAL               = predef_types(7)
+    H5T_NATIVE_DOUBLE             = predef_types(8) 
+    H5T_NATIVE_CHARACTER          = predef_types(9)
+    H5T_STD_REF_OBJ               = predef_types(10)
+    H5T_STD_REF_DSETREG           = predef_types(11)
+    H5T_NATIVE_REAL_C_FLOAT       = predef_types(12)
+    H5T_NATIVE_REAL_C_DOUBLE      = predef_types(13)
+    H5T_NATIVE_REAL_C_LONG_DOUBLE = predef_types(14)
+    H5T_NATIVE_B8                 = predef_types(15)
+    H5T_NATIVE_B16                = predef_types(16)
+    H5T_NATIVE_B32                = predef_types(17)
+    H5T_NATIVE_B64                = predef_types(18)
+    H5T_NATIVE_FLOAT_128          = predef_types(19)
+    
+    H5T_IEEE_F32BE = floating_types(1)
+    H5T_IEEE_F32LE = floating_types(2)
+    H5T_IEEE_F64BE = floating_types(3)
+    H5T_IEEE_F64LE = floating_types(4) 
+    
+    H5T_STD_I8BE   = integer_types(1)
+    H5T_STD_I8LE   = integer_types(2)
+    H5T_STD_I16BE  = integer_types(3)
+    H5T_STD_I16LE  = integer_types(4)
+    H5T_STD_I32BE  = integer_types(5)
+    H5T_STD_I32LE  = integer_types(6)
+    H5T_STD_I64BE  = integer_types(7)
+    H5T_STD_I64LE  = integer_types(8)
+    H5T_STD_U8BE   = integer_types(9)
+    H5T_STD_U8LE   = integer_types(10)
+    H5T_STD_U16BE  = integer_types(11)
+    H5T_STD_U16LE  = integer_types(12)
+    H5T_STD_U32BE  = integer_types(13)
+    H5T_STD_U32LE  = integer_types(14)
+    H5T_STD_U64BE  = integer_types(15)
+    H5T_STD_U64LE  = integer_types(16)
+    H5T_STRING     = integer_types(17)
+    H5T_STD_B8BE   = integer_types(18)
+    H5T_STD_B8LE   = integer_types(19)
+    H5T_STD_B16BE  = integer_types(20)
+    H5T_STD_B16LE  = integer_types(21)
+    H5T_STD_B32BE  = integer_types(22)
+    H5T_STD_B32LE  = integer_types(23)
+    H5T_STD_B64BE  = integer_types(24)
+    H5T_STD_B64LE  = integer_types(25)
+    H5T_FORTRAN_S1 = integer_types(26)
+    H5T_C_S1       = integer_types(27)
+
+    error = error + h5init_flags_c(H5D_flags, &
          H5D_size_flags, &
          H5E_flags, &
          H5E_hid_flags, &
@@ -169,8 +319,299 @@ CONTAINS
          H5Z_flags, &
          H5generic_flags,&
          H5generic_haddr_flags)
-    error_3 = h5init1_flags_c(H5LIB_flags )
-    error = error_1 + error_2 + error_3
+    !
+    ! H5F flags
+    !
+    H5F_ACC_RDWR_F        = H5F_flags(1)
+    H5F_ACC_RDONLY_F      = H5F_flags(2)
+    H5F_ACC_TRUNC_F       = H5F_flags(3)
+    H5F_ACC_EXCL_F        = H5F_flags(4)
+    H5F_ACC_DEBUG_F       = H5F_flags(5)
+    H5F_SCOPE_LOCAL_F     = H5F_flags(6)
+    H5F_SCOPE_GLOBAL_F    = H5F_flags(7)
+    H5F_CLOSE_DEFAULT_F   = H5F_flags(8)
+    H5F_CLOSE_WEAK_F      = H5F_flags(9)
+    H5F_CLOSE_SEMI_F      = H5F_flags(10)
+    H5F_CLOSE_STRONG_F    = H5F_flags(11)
+    H5F_OBJ_FILE_F        = H5F_flags(12)
+    H5F_OBJ_DATASET_F     = H5F_flags(13)
+    H5F_OBJ_GROUP_F       = H5F_flags(14)
+    H5F_OBJ_DATATYPE_F    = H5F_flags(15)
+    H5F_OBJ_ALL_F         = H5F_flags(16)
+    H5F_LIBVER_EARLIEST_F = H5F_flags(17)
+    H5F_LIBVER_LATEST_F   = H5F_flags(18)
+    H5F_UNLIMITED_F       = H5F_flags(19)
+    !
+    ! H5generic flags
+    !
+    H5_INDEX_UNKNOWN_F   = H5generic_flags(1)
+    H5_INDEX_NAME_F      = H5generic_flags(2)
+    H5_INDEX_CRT_ORDER_F = H5generic_flags(3)
+    H5_INDEX_N_F         = H5generic_flags(4)
+    H5_ITER_UNKNOWN_F    = H5generic_flags(5)
+    H5_ITER_INC_F        = H5generic_flags(6)
+    H5_ITER_DEC_F        = H5generic_flags(7)
+    H5_ITER_NATIVE_F     = H5generic_flags(8)
+    H5_ITER_N_F          = H5generic_flags(9)
+    
+    HADDR_UNDEF_F = H5generic_haddr_flags(1)
+    !
+    ! H5G flags
+    !
+    H5G_UNKNOWN_F                   = H5G_flags(1) 
+    H5G_GROUP_F                     = H5G_flags(2)
+    H5G_DATASET_F                   = H5G_flags(3)
+    H5G_TYPE_F                      = H5G_flags(4)
+    H5G_SAME_LOC_F                  = H5G_flags(5)
+    H5G_LINK_ERROR_F                = H5G_flags(6)
+    H5G_LINK_HARD_F                 = H5G_flags(7)
+    H5G_LINK_SOFT_F                 = H5G_flags(8)
+    H5G_STORAGE_TYPE_UNKNOWN_F      = H5G_flags(9)
+    H5G_STORAGE_TYPE_SYMBOL_TABLE_F = H5G_flags(10)
+    H5G_STORAGE_TYPE_COMPACT_F      = H5G_flags(11)
+    H5G_STORAGE_TYPE_DENSE_F        = H5G_flags(12)
+    !
+    ! H5D flags
+    !
+    H5D_COMPACT_F                  = H5D_flags(1)
+    H5D_CONTIGUOUS_F               = H5D_flags(2)
+    H5D_CHUNKED_F                  = H5D_flags(3)
+    H5D_ALLOC_TIME_ERROR_F         = H5D_flags(4)
+    H5D_ALLOC_TIME_DEFAULT_F       = H5D_flags(5)
+    H5D_ALLOC_TIME_EARLY_F         = H5D_flags(6)
+    H5D_ALLOC_TIME_LATE_F          = H5D_flags(7)
+    H5D_ALLOC_TIME_INCR_F          = H5D_flags(8)
+    H5D_SPACE_STS_ERROR_F          = H5D_flags(9)
+    H5D_SPACE_STS_NOT_ALLOCATED_F  = H5D_flags(10)
+    H5D_SPACE_STS_PART_ALLOCATED_F = H5D_flags(11)
+    H5D_SPACE_STS_ALLOCATED_F      = H5D_flags(12)
+    H5D_FILL_TIME_ERROR_F          = H5D_flags(13)
+    H5D_FILL_TIME_ALLOC_F          = H5D_flags(14)
+    H5D_FILL_TIME_NEVER_F          = H5D_flags(15)
+    H5D_FILL_VALUE_ERROR_F         = H5D_flags(16)
+    H5D_FILL_VALUE_UNDEFINED_F     = H5D_flags(17)
+    H5D_FILL_VALUE_DEFAULT_F       = H5D_flags(18)
+    H5D_FILL_VALUE_USER_DEFINED_F  = H5D_flags(19)
+    H5D_CHUNK_CACHE_W0_DFLT_F      = H5D_flags(20)
+    H5D_MPIO_NO_COLLECTIVE_F       = H5D_flags(21)
+    H5D_MPIO_CHUNK_INDEPENDENT_F   = H5D_flags(22)
+    H5D_MPIO_CHUNK_COLLECTIVE_F    = H5D_flags(23)
+    H5D_MPIO_CHUNK_MIXED_F         = H5D_flags(24)
+    H5D_MPIO_CONTIG_COLLECTIVE_F   = H5D_flags(25)
+    H5D_VDS_ERROR_F                = H5D_flags(26)
+    H5D_VDS_FIRST_MISSING_F        = H5D_flags(27)
+    H5D_VDS_LAST_AVAILABLE_F       = H5D_flags(28)
+    H5D_VIRTUAL_F                  = H5D_flags(29)
+    
+    H5D_CHUNK_CACHE_NSLOTS_DFLT_F = H5D_size_flags(1)
+    H5D_CHUNK_CACHE_NBYTES_DFLT_F = H5D_size_flags(2)
+    !
+    ! H5E flags
+    !
+    H5E_DEFAULT_F = H5E_hid_flags(1)
+
+    H5E_MAJOR_F         = H5E_flags(1)
+    H5E_MINOR_F         = H5E_flags(2) 
+    H5E_WALK_UPWARD_F   = H5E_flags(3)
+    H5E_WALK_DOWNWARD_F = H5E_flags(4)
+    !
+    ! H5FD flags
+    !
+    H5FD_MPIO_INDEPENDENT_F = H5FD_flags(1)
+    H5FD_MPIO_COLLECTIVE_F  = H5FD_flags(2)
+    H5FD_MEM_NOLIST_F       = H5FD_flags(3)
+    H5FD_MEM_DEFAULT_F      = H5FD_flags(4)
+    H5FD_MEM_SUPER_F        = H5FD_flags(5)
+    H5FD_MEM_BTREE_F        = H5FD_flags(6)
+    H5FD_MEM_DRAW_F         = H5FD_flags(7)
+    H5FD_MEM_GHEAP_F        = H5FD_flags(8)
+    H5FD_MEM_LHEAP_F        = H5FD_flags(9)
+    H5FD_MEM_OHDR_F         = H5FD_flags(10)
+    H5FD_MEM_NTYPES_F       = H5FD_flags(11)
+    !
+    ! H5FD file driver flags
+    !    
+    H5FD_CORE_F   = H5FD_hid_flags(1)
+    H5FD_FAMILY_F = H5FD_hid_flags(2)
+    H5FD_LOG_F    = H5FD_hid_flags(3)
+    H5FD_MPIO_F   = H5FD_hid_flags(4)
+    H5FD_MULTI_F  = H5FD_hid_flags(5)
+    H5FD_SEC2_F   = H5FD_hid_flags(6)
+    H5FD_STDIO_F  = H5FD_hid_flags(7)
+    !
+    ! H5I flags declaration
+    !
+    H5I_FILE_F      = H5I_flags(1)
+    H5I_GROUP_F     = H5I_flags(2)
+    H5I_DATATYPE_F  = H5I_flags(3)
+    H5I_DATASPACE_F = H5I_flags(4)
+    H5I_DATASET_F   = H5I_flags(5)
+    H5I_ATTR_F      = H5I_flags(6)
+    H5I_BADID_F     = H5I_flags(7)
+    !
+    ! H5L flags
+    !    
+    H5L_TYPE_ERROR_F        = H5L_flags(1)
+    H5L_TYPE_HARD_F         = H5L_flags(2)
+    H5L_TYPE_SOFT_F         = H5L_flags(3)
+    H5L_TYPE_EXTERNAL_F     = H5L_flags(4)
+    H5L_SAME_LOC_F          = H5L_flags(5)
+    H5L_LINK_CLASS_T_VERS_F = H5L_flags(6)
+    !
+    ! H5O flags
+    !
+    H5O_COPY_SHALLOW_HIERARCHY_F   = h5o_flags(1)
+    H5O_COPY_EXPAND_SOFT_LINK_F    = h5o_flags(2)
+    H5O_COPY_EXPAND_EXT_LINK_F     = h5o_flags(3)
+    H5O_COPY_EXPAND_REFERENCE_F    = h5o_flags(4)
+    H5O_COPY_WITHOUT_ATTR_FLAG_F   = h5o_flags(5)
+    H5O_COPY_PRESERVE_NULL_FLAG_F  = h5o_flags(6)
+    H5O_COPY_ALL_F                 = h5o_flags(7)
+    H5O_SHMESG_NONE_FLAG_F         = h5o_flags(8) 
+    H5O_SHMESG_SDSPACE_FLAG_F      = h5o_flags(9)
+    H5O_SHMESG_DTYPE_FLAG_F        = h5o_flags(10)
+    H5O_SHMESG_FILL_FLAG_F         = h5o_flags(11) 
+    H5O_SHMESG_PLINE_FLAG_F        = h5o_flags(12) 
+    H5O_SHMESG_ATTR_FLAG_F         = h5o_flags(13) 
+    H5O_SHMESG_ALL_FLAG_F          = h5o_flags(14) 
+    H5O_HDR_CHUNK0_SIZE_F          = h5o_flags(15) 
+    H5O_HDR_ATTR_CRT_ORDER_TRACK_F = h5o_flags(16) 
+    H5O_HDR_ATTR_CRT_ORDER_INDEX_F = h5o_flags(17) 
+    H5O_HDR_ATTR_STORE_PHASE_CHA_F = h5o_flags(18) 
+    H5O_HDR_STORE_TIMES_F          = h5o_flags(19) 
+    H5O_HDR_ALL_FLAGS_F            = h5o_flags(20)
+    H5O_SHMESG_MAX_NINDEXES_F      = h5o_flags(21) 
+    H5O_SHMESG_MAX_LIST_SIZE_F     = h5o_flags(22) 
+    H5O_TYPE_UNKNOWN_F             = h5o_flags(23) 
+    H5O_TYPE_GROUP_F               = h5o_flags(24) 
+    H5O_TYPE_DATASET_F             = h5o_flags(25) 
+    H5O_TYPE_NAMED_DATATYPE_F      = h5o_flags(26) 
+    H5O_TYPE_NTYPES_F              = h5o_flags(27) 
+    !
+    ! H5P flags
+    !    
+    H5P_FILE_CREATE_F      = H5P_flags(1)
+    H5P_FILE_ACCESS_F      = H5P_flags(2)
+    H5P_DATASET_CREATE_F   = H5P_flags(3)
+    H5P_DATASET_XFER_F     = H5P_flags(4)
+    H5P_FILE_MOUNT_F       = H5P_flags(5)
+    H5P_DEFAULT_F          = H5P_flags(6)
+    H5P_ROOT_F             = H5P_flags(7)
+    H5P_OBJECT_CREATE_F    = H5P_flags(8)
+    H5P_DATASET_ACCESS_F   = H5P_flags(9)
+    H5P_GROUP_CREATE_F     = H5P_flags(10)
+    H5P_GROUP_ACCESS_F     = H5P_flags(11)
+    H5P_DATATYPE_CREATE_F  = H5P_flags(12)
+    H5P_DATATYPE_ACCESS_F  = H5P_flags(13)
+    H5P_STRING_CREATE_F    = H5P_flags(14)
+    H5P_ATTRIBUTE_CREATE_F = H5P_flags(15)
+    H5P_OBJECT_COPY_F      = H5P_flags(16)
+    H5P_LINK_CREATE_F      = H5P_flags(17)
+    H5P_LINK_ACCESS_F      = H5P_flags(18)
+    !
+    ! H5P integers flags
+    !    
+    H5P_CRT_ORDER_INDEXED_F = H5P_flags_int(1)
+    H5P_CRT_ORDER_TRACKED_F = H5P_flags_int(2)
+    !
+    ! H5R flags
+    !    
+    H5R_OBJECT_F         = H5R_flags(1)
+    H5R_DATASET_REGION_F = H5R_flags(2)
+    !
+    ! H5S flags
+    !    
+    H5S_ALL_F = H5S_hid_flags(1)
+    
+    H5S_UNLIMITED_F = H5S_hsize_flags(1)
+    
+    H5S_SCALAR_F         = H5S_flags(1)
+    H5S_SIMPLE_F         = H5S_flags(2)
+    H5S_NULL_F           = H5S_flags(3)
+    H5S_SELECT_SET_F     = H5S_flags(4)
+    H5S_SELECT_OR_F      = H5S_flags(5)
+    H5S_SELECT_NOOP_F    = H5S_flags(6)
+    H5S_SELECT_AND_F     = H5S_flags(7)
+    H5S_SELECT_XOR_F     = H5S_flags(8)
+    H5S_SELECT_NOTB_F    = H5S_flags(9)
+    H5S_SELECT_NOTA_F    = H5S_flags(10)
+    H5S_SELECT_APPEND_F  = H5S_flags(11)
+    H5S_SELECT_PREPEND_F = H5S_flags(12)
+    H5S_SELECT_INVALID_F = H5S_flags(13)
+    H5S_SEL_ERROR_F      = H5S_flags(14)
+    H5S_SEL_NONE_F       = H5S_flags(15)
+    H5S_SEL_POINTS_F     = H5S_flags(16)
+    H5S_SEL_HYPERSLABS_F = H5S_flags(17)
+    H5S_SEL_ALL_F        = H5S_flags(18)
+    !
+    ! H5T flags declaration
+    !    
+    H5T_NO_CLASS_F       = H5T_flags(1)
+    H5T_INTEGER_F        = H5T_flags(2)
+    H5T_FLOAT_F          = H5T_flags(3)
+    H5T_TIME_F           = H5T_flags(4)
+    H5T_STRING_F         = H5T_flags(5)
+    H5T_BITFIELD_F       = H5T_flags(6)
+    H5T_OPAQUE_F         = H5T_flags(7)
+    H5T_COMPOUND_F       = H5T_flags(8)
+    H5T_REFERENCE_F      = H5T_flags(9)
+    H5T_ENUM_F           = H5T_flags(10)
+    H5T_ORDER_LE_F       = H5T_flags(11)
+    H5T_ORDER_BE_F       = H5T_flags(12)
+    H5T_ORDER_MIXED_F    = H5T_flags(13)
+    H5T_ORDER_VAX_F      = H5T_flags(14)
+    H5T_ORDER_NONE_F     = H5T_flags(15)
+    H5T_PAD_ZERO_F       = H5T_flags(16)
+    H5T_PAD_ONE_F        = H5T_flags(17)
+    H5T_PAD_BACKGROUND_F = H5T_flags(18)
+    H5T_PAD_ERROR_F      = H5T_flags(19)
+    H5T_SGN_NONE_F       = H5T_flags(20)
+    H5T_SGN_2_F          = H5T_flags(21)
+    H5T_SGN_ERROR_F      = H5T_flags(22)
+    H5T_NORM_IMPLIED_F   = H5T_flags(23)
+    H5T_NORM_MSBSET_F    = H5T_flags(24)
+    H5T_NORM_NONE_F      = H5T_flags(25)
+    H5T_CSET_ASCII_F     = H5T_flags(26)
+    H5T_CSET_UTF8_F      = H5T_flags(27)
+    H5T_STR_NULLTERM_F   = H5T_flags(28)
+    H5T_STR_NULLPAD_F    = H5T_flags(29)
+    H5T_STR_SPACEPAD_F   = H5T_flags(30)
+    H5T_STR_ERROR_F      = H5T_flags(31)
+    H5T_VLEN_F           = H5T_flags(32)
+    H5T_ARRAY_F          = H5T_flags(33)
+    H5T_DIR_ASCEND_F     = H5T_flags(34)
+    H5T_DIR_DESCEND_F    = H5T_flags(35)
+    !
+    ! H5Z flags
+    !
+    H5Z_FILTER_ERROR_F           = H5Z_flags(1)
+    H5Z_FILTER_NONE_F            = H5Z_flags(2)
+    H5Z_FILTER_DEFLATE_F         = H5Z_flags(3)
+    H5Z_FILTER_SHUFFLE_F         = H5Z_flags(4)
+    H5Z_FILTER_FLETCHER32_F      = H5Z_flags(5)
+    H5Z_ERROR_EDC_F              = H5Z_flags(6)
+    H5Z_DISABLE_EDC_F            = H5Z_flags(7)
+    H5Z_ENABLE_EDC_F             = H5Z_flags(8)
+    H5Z_NO_EDC_F                 = H5Z_flags(9)
+    H5Z_FILTER_SZIP_F            = H5Z_flags(10)
+    H5Z_FLAG_OPTIONAL_F          = H5Z_flags(11)
+    H5Z_FILTER_ENCODE_ENABLED_F  = H5Z_flags(12)
+    H5Z_FILTER_DECODE_ENABLED_F  = H5Z_flags(13)
+    H5Z_FILTER_ALL_F             = H5Z_flags(14)
+    H5Z_FILTER_NBIT_F            = H5Z_flags(15)
+    H5Z_FILTER_SCALEOFFSET_F     = H5Z_flags(16)
+    H5Z_SO_FLOAT_DSCALE_F        = H5Z_flags(17)
+    H5Z_SO_FLOAT_ESCALE_F        = H5Z_flags(18)
+    H5Z_SO_INT_F                 = H5Z_flags(19)
+    H5Z_SO_INT_MINBITS_DEFAULT_F = H5Z_flags(20)
+
+    error = error + h5init1_flags_c(H5LIB_flags)
+    !
+    ! H5 Library flags
+    !
+    H5_SZIP_EC_OM_F = H5LIB_flags(1)
+    H5_SZIP_NN_OM_F = H5LIB_flags(2)
+
   END SUBROUTINE h5open_f
 
 !****s* H5LIB/h5close_f
@@ -201,25 +642,23 @@ CONTAINS
     IMPLICIT NONE
     INTEGER, INTENT(OUT) :: error
 !*****
-    INTEGER :: error_1
     INTERFACE
        INTEGER FUNCTION h5close_types_c(p_types, P_TYPES_LEN, &
             f_types, F_TYPES_LEN, &
             i_types, I_TYPES_LEN ) &
             BIND(C,NAME='h5close_types_c')
          IMPORT :: HID_T
-         INTEGER P_TYPES_LEN
-         INTEGER F_TYPES_LEN
-         INTEGER I_TYPES_LEN
-         INTEGER(HID_T), DIMENSION(P_TYPES_LEN) :: p_types
-         INTEGER(HID_T), DIMENSION(F_TYPES_LEN) :: f_types
-         INTEGER(HID_T), DIMENSION(I_TYPES_LEN) :: i_types
+         INTEGER :: P_TYPES_LEN
+         INTEGER :: F_TYPES_LEN
+         INTEGER :: I_TYPES_LEN
+         INTEGER(HID_T), DIMENSION(1:P_TYPES_LEN) :: p_types
+         INTEGER(HID_T), DIMENSION(1:F_TYPES_LEN) :: f_types
+         INTEGER(HID_T), DIMENSION(1:I_TYPES_LEN) :: i_types
        END FUNCTION h5close_types_c
     END INTERFACE
-    error_1 = h5close_types_c(predef_types, PREDEF_TYPES_LEN, &
+    error = h5close_types_c(predef_types, PREDEF_TYPES_LEN, &
          floating_types, FLOATING_TYPES_LEN, &
          integer_types, INTEGER_TYPES_LEN )
-    error = error_1
 
   END SUBROUTINE h5close_f
 
diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
index 629418a..078778a 100644
--- a/fortran/src/H5f90global.F90
+++ b/fortran/src/H5f90global.F90
@@ -50,7 +50,6 @@ MODULE H5GLOBAL
   END ENUM
   INTEGER, PARAMETER :: ENUM_T = KIND(enum_dtype)
   
-
   ! Definitions for reference datatypes.
   ! If you change the value of these parameters, do not forget to change corresponding
   ! values in the H5f90.h file.
@@ -71,184 +70,170 @@ MODULE H5GLOBAL
      INTEGER, DIMENSION(1:REF_REG_BUF_LEN) :: ref
   END TYPE hdset_reg_ref_t_f
 
-  INTEGER, PARAMETER :: PREDEF_TYPES_LEN = 19 ! Do not forget to change this
-                                              ! value when new predefined
-                                              ! datatypes are added
-
-  ! Do not forget to change the following line when new predefined
-  ! floating data types are added
+  ! Do not forget to change these values when new predefined
+  ! datatypes are added
+  INTEGER, PARAMETER :: PREDEF_TYPES_LEN = 19
   INTEGER, PARAMETER :: FLOATING_TYPES_LEN = 4
-
-  ! Do not forget to change the following line when new predefined
-  ! integer data types are added
   INTEGER, PARAMETER :: INTEGER_TYPES_LEN = 27
 
-  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_FLOAT, &
-       H5T_NATIVE_REAL_C_DOUBLE, &
-       H5T_NATIVE_REAL_C_LONG_DOUBLE, &
-       H5T_NATIVE_INTEGER, &
-       H5T_NATIVE_REAL, &
-       H5T_NATIVE_DOUBLE, &
-       H5T_NATIVE_CHARACTER , &
-       H5T_STD_REF_OBJ,      &
-       H5T_STD_REF_DSETREG, &
-       H5T_IEEE_F32BE,  &
-       H5T_IEEE_F32LE,  &
-       H5T_IEEE_F64BE,  &
-       H5T_IEEE_F64LE,  &
-       H5T_STD_I8BE,    &
-       H5T_STD_I8LE,    &
-       H5T_STD_I16BE,   &
-       H5T_STD_I16LE,   &
-       H5T_STD_I32BE,   &
-       H5T_STD_I32LE,   &
-       H5T_STD_I64BE,   &
-       H5T_STD_I64LE,   &
-       H5T_STD_U8BE,    &
-       H5T_STD_U8LE,    &
-       H5T_STD_U16BE,   &
-       H5T_STD_U16LE,   &
-       H5T_STD_U32BE
+  ! These arrays need to be global because they are used in 
+  ! both h5open_f and in h5close_f; initialize to fix linking issues
+  ! on OSX and Intel compilers.
+  INTEGER(HID_T), DIMENSION(1:PREDEF_TYPES_LEN)   :: predef_types = -1
+  INTEGER(HID_T), DIMENSION(1:FLOATING_TYPES_LEN) :: floating_types = -1
+  INTEGER(HID_T), DIMENSION(1:INTEGER_TYPES_LEN)  :: integer_types = -1
+  
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_REAL_C_FLOAT
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_REAL_C_DOUBLE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_REAL_C_LONG_DOUBLE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_INTEGER
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_REAL
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_DOUBLE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_CHARACTER 
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_REF_OBJ
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_REF_DSETREG
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_IEEE_F32BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_IEEE_F32LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_IEEE_F64BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_IEEE_F64LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I8BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I8LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I16BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I16LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I32BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I32LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I64BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_I64LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U8BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U8LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U16BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U16LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U32BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U32LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U64BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_U64LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STRING
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B8BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B8LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B16BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B16LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B32BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B32LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B64BE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STD_B64LE
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_B8
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_B16
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_B32
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_B64
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_FORTRAN_S1
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_C_S1
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_INTEGER_KIND
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NATIVE_FLOAT_128
+  !DEC$endif
+  
+  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_FLOAT
+  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_DOUBLE
+  INTEGER(HID_T) :: H5T_NATIVE_REAL_C_LONG_DOUBLE
+  INTEGER(HID_T) :: H5T_NATIVE_INTEGER
+  INTEGER(HID_T) :: H5T_NATIVE_REAL
+  INTEGER(HID_T) :: H5T_NATIVE_DOUBLE
+  INTEGER(HID_T) :: H5T_NATIVE_CHARACTER 
+  INTEGER(HID_T) :: H5T_STD_REF_OBJ
+  INTEGER(HID_T) :: H5T_STD_REF_DSETREG
+  INTEGER(HID_T) :: H5T_IEEE_F32BE
+  INTEGER(HID_T) :: H5T_IEEE_F32LE
+  INTEGER(HID_T) :: H5T_IEEE_F64BE
+  INTEGER(HID_T) :: H5T_IEEE_F64LE
+  INTEGER(HID_T) :: H5T_STD_I8BE
+  INTEGER(HID_T) :: H5T_STD_I8LE
+  INTEGER(HID_T) :: H5T_STD_I16BE
+  INTEGER(HID_T) :: H5T_STD_I16LE
+  INTEGER(HID_T) :: H5T_STD_I32BE
+  INTEGER(HID_T) :: H5T_STD_I32LE
+  INTEGER(HID_T) :: H5T_STD_I64BE
+  INTEGER(HID_T) :: H5T_STD_I64LE
+  INTEGER(HID_T) :: H5T_STD_U8BE
+  INTEGER(HID_T) :: H5T_STD_U8LE
+  INTEGER(HID_T) :: H5T_STD_U16BE
+  INTEGER(HID_T) :: H5T_STD_U16LE
+  INTEGER(HID_T) :: H5T_STD_U32BE
+  INTEGER(HID_T) :: H5T_STD_U32LE
+  INTEGER(HID_T) :: H5T_STD_U64BE
+  INTEGER(HID_T) :: H5T_STD_U64LE
+  INTEGER(HID_T) :: H5T_STRING
+  INTEGER(HID_T) :: H5T_STD_B8BE
+  INTEGER(HID_T) :: H5T_STD_B8LE
+  INTEGER(HID_T) :: H5T_STD_B16BE
+  INTEGER(HID_T) :: H5T_STD_B16LE
+  INTEGER(HID_T) :: H5T_STD_B32BE
+  INTEGER(HID_T) :: H5T_STD_B32LE
+  INTEGER(HID_T) :: H5T_STD_B64BE
+  INTEGER(HID_T) :: H5T_STD_B64LE
+  INTEGER(HID_T) :: H5T_NATIVE_B8
+  INTEGER(HID_T) :: H5T_NATIVE_B16
+  INTEGER(HID_T) :: H5T_NATIVE_B32
+  INTEGER(HID_T) :: H5T_NATIVE_B64
+  INTEGER(HID_T) :: H5T_FORTRAN_S1
+  INTEGER(HID_T) :: H5T_C_S1
 
   INTEGER, PARAMETER :: NUM_NATIVE_INTEGER_KIND = 5
   ! INTEGER*1, INTEGER*2, INTEGER*4, INTEGER*8, INTEGER*16
   INTEGER(HID_T), DIMENSION(1:NUM_NATIVE_INTEGER_KIND) :: H5T_NATIVE_INTEGER_KIND
 
   INTEGER(HID_T) :: H5T_NATIVE_FLOAT_128 ! NEED IFDEF -MSB-
-
-! NOTE: Splitting the line since the Fortran 95 standard limits the number of 
-!       continuation lines to 39; the F03/F08 standard limits the number 
-!       to 255 lines.
-
-  INTEGER(HID_T) :: H5T_STD_U32LE,   &
-       H5T_STD_U64BE,   &
-       H5T_STD_U64LE,   &
-       H5T_STRING,      &
-       H5T_STD_B8BE,    &
-       H5T_STD_B8LE,    &
-       H5T_STD_B16BE,   &
-       H5T_STD_B16LE,   &
-       H5T_STD_B32BE,   &
-       H5T_STD_B32LE,   &
-       H5T_STD_B64BE,   &
-       H5T_STD_B64LE,   &
-       H5T_NATIVE_B8,   &
-       H5T_NATIVE_B16,  &
-       H5T_NATIVE_B32,  &
-       H5T_NATIVE_B64,  &
-       H5T_FORTRAN_S1,  &
-       H5T_C_S1
-
-
-  INTEGER(HID_T), DIMENSION(PREDEF_TYPES_LEN) :: predef_types
-  EQUIVALENCE (predef_types(1), H5T_NATIVE_INTEGER_KIND(1))
-  ! EQUIVALENCE predef_types(2:5) are unnecessary and violate the standard
-  EQUIVALENCE (predef_types(6), H5T_NATIVE_INTEGER)
-  EQUIVALENCE (predef_types(7), H5T_NATIVE_REAL)
-  EQUIVALENCE (predef_types(8), H5T_NATIVE_DOUBLE)
-  EQUIVALENCE (predef_types(9), H5T_NATIVE_CHARACTER)
-  EQUIVALENCE (predef_types(10), H5T_STD_REF_OBJ)
-  EQUIVALENCE (predef_types(11), H5T_STD_REF_DSETREG)
-  EQUIVALENCE (predef_types(12), H5T_NATIVE_REAL_C_FLOAT)
-  EQUIVALENCE (predef_types(13), H5T_NATIVE_REAL_C_DOUBLE)
-  EQUIVALENCE (predef_types(14), H5T_NATIVE_REAL_C_LONG_DOUBLE)
-  EQUIVALENCE (predef_types(15), H5T_NATIVE_B8 )
-  EQUIVALENCE (predef_types(16), H5T_NATIVE_B16)
-  EQUIVALENCE (predef_types(17), H5T_NATIVE_B32)
-  EQUIVALENCE (predef_types(18), H5T_NATIVE_B64)
-  EQUIVALENCE (predef_types(19), H5T_NATIVE_FLOAT_128)   ! ADDED NEW TYPE -MSB-
-
-  INTEGER(HID_T), DIMENSION(FLOATING_TYPES_LEN) :: floating_types
-  EQUIVALENCE (floating_types(1), H5T_IEEE_F32BE )
-  EQUIVALENCE (floating_types(2), H5T_IEEE_F32LE)
-  EQUIVALENCE (floating_types(3), H5T_IEEE_F64BE)
-  EQUIVALENCE (floating_types(4), H5T_IEEE_F64LE)
-
-  INTEGER(HID_T), DIMENSION(INTEGER_TYPES_LEN) :: integer_types
-  EQUIVALENCE (integer_types(1), H5T_STD_I8BE )
-  EQUIVALENCE (integer_types(2), H5T_STD_I8LE)
-  EQUIVALENCE (integer_types(3), H5T_STD_I16BE)
-  EQUIVALENCE (integer_types(4), H5T_STD_I16LE)
-  EQUIVALENCE (integer_types(5), H5T_STD_I32BE)
-  EQUIVALENCE (integer_types(6), H5T_STD_I32LE)
-  EQUIVALENCE (integer_types(7), H5T_STD_I64BE)
-  EQUIVALENCE (integer_types(8), H5T_STD_I64LE)
-  EQUIVALENCE (integer_types(9), H5T_STD_U8BE)
-  EQUIVALENCE (integer_types(10), H5T_STD_U8LE)
-  EQUIVALENCE (integer_types(11), H5T_STD_U16BE)
-  EQUIVALENCE (integer_types(12), H5T_STD_U16LE)
-  EQUIVALENCE (integer_types(13), H5T_STD_U32BE)
-  EQUIVALENCE (integer_types(14), H5T_STD_U32LE)
-  EQUIVALENCE (integer_types(15), H5T_STD_U64BE)
-  EQUIVALENCE (integer_types(16), H5T_STD_U64LE)
-  EQUIVALENCE (integer_types(17), H5T_STRING)
-  EQUIVALENCE (integer_types(18), H5T_STD_B8BE)
-  EQUIVALENCE (integer_types(19), H5T_STD_B8LE)
-  EQUIVALENCE (integer_types(20), H5T_STD_B16BE)
-  EQUIVALENCE (integer_types(21), H5T_STD_B16LE)
-  EQUIVALENCE (integer_types(22), H5T_STD_B32BE)
-  EQUIVALENCE (integer_types(23), H5T_STD_B32LE)
-  EQUIVALENCE (integer_types(24), H5T_STD_B64BE)
-  EQUIVALENCE (integer_types(25), H5T_STD_B64LE)
-  EQUIVALENCE (integer_types(26), H5T_FORTRAN_S1)
-  EQUIVALENCE (integer_types(27), H5T_C_S1)
-
-
-  !      COMMON /PREDEFINED_TYPES/ H5T_NATIVE_INTEGER, &
-  !                                H5T_NATIVE_REAL, &
-  !                                H5T_NATIVE_DOUBLE, &
-  !                                H5T_NATIVE_CHARACTER, &
-  !                                H5T_STD_REF_OBJ, &
-  !                                H5T_STD_REF_DSETREG
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /PREDEFINED_TYPES/
-  !DEC$endif
-  COMMON /PREDEFINED_TYPES/  predef_types
-
-  !      COMMON /FLOATING_TYPES/ H5T_IEEE_F32BE,  &
-  !                              H5T_IEEE_F32LE,  &
-  !                              H5T_IEEE_F64BE,  &
-  !                              H5T_IEEE_F64LE
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /FLOATING_TYPES/
-  !DEC$endif
-  COMMON /FLOATING_TYPES/ floating_types
   !
-  !      COMMON /INTEGER_TYPES/ H5T_STD_I8BE,  &
-  !                             H5T_STD_I8LE,    &
-  !                             H5T_STD_I16BE,   &
-  !                             H5T_STD_I16LE,   &
-  !                             H5T_STD_I32BE,   &
-  !                             H5T_STD_I32LE,   &
-  !                             H5T_STD_I64BE,   &
-  !                             H5T_STD_I64LE,   &
-  !                             H5T_STD_U8BE,    &
-  !                             H5T_STD_U8LE,    &
-  !                             H5T_STD_U16BE,   &
-  !                             H5T_STD_U16LE,   &
-  !                             H5T_STD_U32BE,   &
-  !                             H5T_STD_U32LE,   &
-  !                             H5T_STD_U64BE,   &
-  !                             H5T_STD_U64LE
+  ! H5generic flags declaration
+  !
   !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /INTEGER_TYPES/
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_INDEX_UNKNOWN_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_INDEX_NAME_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_INDEX_CRT_ORDER_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_INDEX_N_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_ITER_UNKNOWN_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_ITER_INC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_ITER_DEC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_ITER_NATIVE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_ITER_N_F
+  !DEC$ATTRIBUTES DLLEXPORT :: HADDR_UNDEF_F
   !DEC$endif
-  COMMON /INTEGER_TYPES/ integer_types
-  !
-  ! Fortran flags
-  !
-  !
-  ! H5F flags (DO NOT FORGET TO UPDATE WHEN NEW FLAGS ARE ADDED !)
+  
+  INTEGER :: H5_INDEX_UNKNOWN_F
+  INTEGER :: H5_INDEX_NAME_F
+  INTEGER :: H5_INDEX_CRT_ORDER_F
+  INTEGER :: H5_INDEX_N_F
+  INTEGER :: H5_ITER_UNKNOWN_F
+  INTEGER :: H5_ITER_INC_F
+  INTEGER :: H5_ITER_DEC_F
+  INTEGER :: H5_ITER_NATIVE_F
+  INTEGER :: H5_ITER_N_F
+
+  INTEGER(HADDR_T) :: HADDR_UNDEF_F
   !
   ! H5F flags declaration
   !
-  INTEGER, PARAMETER :: H5F_FLAGS_LEN = 19
-  INTEGER :: H5F_flags(H5F_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5F_FLAGS/
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_ACC_RDWR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_ACC_RDONLY_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_ACC_TRUNC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_ACC_EXCL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_ACC_DEBUG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_SCOPE_LOCAL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_SCOPE_GLOBAL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_CLOSE_DEFAULT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_CLOSE_WEAK_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_CLOSE_SEMI_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_CLOSE_STRONG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_OBJ_FILE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_OBJ_DATASET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_OBJ_GROUP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_OBJ_DATATYPE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_OBJ_ALL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_EARLIEST_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_LATEST_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5F_UNLIMITED_F
   !DEC$endif
-  COMMON /H5F_FLAGS/ H5F_flags
-
+  
   INTEGER :: H5F_ACC_RDWR_F
   INTEGER :: H5F_ACC_RDONLY_F
   INTEGER :: H5F_ACC_TRUNC_F
@@ -268,77 +253,26 @@ MODULE H5GLOBAL
   INTEGER :: H5F_LIBVER_EARLIEST_F
   INTEGER :: H5F_LIBVER_LATEST_F
   INTEGER :: H5F_UNLIMITED_F
-
-  EQUIVALENCE(H5F_flags(1), H5F_ACC_RDWR_F)
-  EQUIVALENCE(H5F_flags(2), H5F_ACC_RDONLY_F)
-  EQUIVALENCE(H5F_flags(3), H5F_ACC_TRUNC_F)
-  EQUIVALENCE(H5F_flags(4), H5F_ACC_EXCL_F)
-  EQUIVALENCE(H5F_flags(5), H5F_ACC_DEBUG_F)
-  EQUIVALENCE(H5F_flags(6), H5F_SCOPE_LOCAL_F)
-  EQUIVALENCE(H5F_flags(7), H5F_SCOPE_GLOBAL_F)
-  EQUIVALENCE(H5F_flags(8), H5F_CLOSE_DEFAULT_F)
-  EQUIVALENCE(H5F_flags(9), H5F_CLOSE_WEAK_F)
-  EQUIVALENCE(H5F_flags(10), H5F_CLOSE_SEMI_F)
-  EQUIVALENCE(H5F_flags(11), H5F_CLOSE_STRONG_F)
-  EQUIVALENCE(H5F_flags(12), H5F_OBJ_FILE_F)
-  EQUIVALENCE(H5F_flags(13), H5F_OBJ_DATASET_F)
-  EQUIVALENCE(H5F_flags(14), H5F_OBJ_GROUP_F)
-  EQUIVALENCE(H5F_flags(15), H5F_OBJ_DATATYPE_F)
-  EQUIVALENCE(H5F_flags(16), H5F_OBJ_ALL_F)
-  EQUIVALENCE(H5F_flags(17), H5F_LIBVER_EARLIEST_F)
-  EQUIVALENCE(H5F_flags(18), H5F_LIBVER_LATEST_F)
-  EQUIVALENCE(H5F_flags(19), H5F_UNLIMITED_F)
-  !
-  ! H5generic flags declaration
-  !
-  INTEGER, PARAMETER :: H5generic_FLAGS_LEN = 9
-  INTEGER :: H5generic_flags(H5generic_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5generic_FLAGS/
-  !DEC$endif
-  COMMON /H5generic_FLAGS/ H5generic_flags
-
-  INTEGER :: H5_INDEX_UNKNOWN_F
-  INTEGER :: H5_INDEX_NAME_F
-  INTEGER :: H5_INDEX_CRT_ORDER_F
-  INTEGER :: H5_INDEX_N_F
-  INTEGER :: H5_ITER_UNKNOWN_F
-  INTEGER :: H5_ITER_INC_F
-  INTEGER :: H5_ITER_DEC_F
-  INTEGER :: H5_ITER_NATIVE_F
-  INTEGER :: H5_ITER_N_F
-
-  EQUIVALENCE(H5generic_flags(1), H5_INDEX_UNKNOWN_F)
-  EQUIVALENCE(H5generic_flags(2), H5_INDEX_NAME_F)
-  EQUIVALENCE(H5generic_flags(3), H5_INDEX_CRT_ORDER_F)
-  EQUIVALENCE(H5generic_flags(4), H5_INDEX_N_F)
-  EQUIVALENCE(H5generic_flags(5), H5_ITER_UNKNOWN_F)
-  EQUIVALENCE(H5generic_flags(6), H5_ITER_INC_F)
-  EQUIVALENCE(H5generic_flags(7), H5_ITER_DEC_F)
-  EQUIVALENCE(H5generic_flags(8), H5_ITER_NATIVE_F)
-  EQUIVALENCE(H5generic_flags(9), H5_ITER_N_F)
-
-  INTEGER, PARAMETER :: H5generic_haddr_FLAGS_LEN = 1
-  INTEGER(HADDR_T) :: H5generic_haddr_flags(H5generic_haddr_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5generic_haddr_FLAGS/
-  !DEC$endif
-  COMMON /H5generic_haddr_FLAGS/ H5generic_haddr_flags
-
-  INTEGER(HADDR_T) :: HADDR_UNDEF_F
-
-  EQUIVALENCE(H5generic_haddr_flags(1), HADDR_UNDEF_F)
-
   !
   ! H5G flags declaration
   !
-  INTEGER, PARAMETER :: H5G_FLAGS_LEN = 12
-  INTEGER :: H5G_flags(H5G_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5G_FLAGS/
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_UNKNOWN_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_GROUP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_DATASET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_TYPE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_LINK_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_UDLINK_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_SAME_LOC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_LINK_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_LINK_HARD_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_LINK_SOFT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_STORAGE_TYPE_UNKNOWN_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_STORAGE_TYPE_SYMBOL_TABLE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_STORAGE_TYPE_COMPACT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5G_STORAGE_TYPE_DENSE_F
   !DEC$endif
-  COMMON /H5G_FLAGS/ H5G_flags
-
+  
   INTEGER :: H5G_UNKNOWN_F
   INTEGER :: H5G_GROUP_F
   INTEGER :: H5G_DATASET_F
@@ -353,35 +287,43 @@ MODULE H5GLOBAL
   INTEGER :: H5G_STORAGE_TYPE_SYMBOL_TABLE_F
   INTEGER :: H5G_STORAGE_TYPE_COMPACT_F
   INTEGER :: H5G_STORAGE_TYPE_DENSE_F
-
-  EQUIVALENCE(H5G_flags(1), H5G_UNKNOWN_F) ! Unknown object type
-  EQUIVALENCE(H5G_flags(2), H5G_GROUP_F)   ! Object is a group
-  EQUIVALENCE(H5G_flags(3), H5G_DATASET_F) ! Object is a dataset
-  EQUIVALENCE(H5G_flags(4), H5G_TYPE_F)    ! Object is a named data type
-  EQUIVALENCE(H5G_flags(5), H5G_SAME_LOC_F)
-  EQUIVALENCE(H5G_flags(6), H5G_LINK_ERROR_F)
-  EQUIVALENCE(H5G_flags(7), H5G_LINK_HARD_F)
-  EQUIVALENCE(H5G_flags(8), H5G_LINK_SOFT_F)
-
-  EQUIVALENCE(H5G_flags(9), H5G_STORAGE_TYPE_UNKNOWN_F )
-  EQUIVALENCE(H5G_flags(10), H5G_STORAGE_TYPE_SYMBOL_TABLE_F)
-  EQUIVALENCE(H5G_flags(11), H5G_STORAGE_TYPE_COMPACT_F)
-  EQUIVALENCE(H5G_flags(12), H5G_STORAGE_TYPE_DENSE_F)
-
   !
   ! H5D flags declaration
   !
-  INTEGER, PARAMETER :: H5D_FLAGS_LEN = 29
-  INTEGER :: H5D_flags(H5D_FLAGS_LEN)
-  INTEGER, PARAMETER :: H5D_SIZE_FLAGS_LEN = 2
-  INTEGER(SIZE_T) :: H5D_size_flags(H5D_SIZE_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5D_FLAGS/
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5D_SIZE_FLAGS/
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_COMPACT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_CONTIGUOUS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_CHUNKED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_ALLOC_TIME_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_ALLOC_TIME_DEFAULT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_ALLOC_TIME_EARLY_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_ALLOC_TIME_LATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_ALLOC_TIME_INCR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_SPACE_STS_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_SPACE_STS_NOT_ALLOCATED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_SPACE_STS_PART_ALLOCATED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_SPACE_STS_ALLOCATED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_FILL_TIME_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_FILL_TIME_ALLOC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_FILL_TIME_NEVER_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_FILL_VALUE_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_FILL_VALUE_UNDEFINED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_FILL_VALUE_DEFAULT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_FILL_VALUE_USER_DEFINED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_CHUNK_CACHE_NSLOTS_DFLT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_CHUNK_CACHE_NBYTES_DFLT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_CHUNK_CACHE_W0_DFLT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_NO_COLLECTIVE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_CHUNK_INDEPENDENT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_CHUNK_COLLECTIVE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_CHUNK_MIXED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_CONTIG_COLLECTIVE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_VDS_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_VDS_FIRST_MISSING_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_VDS_LAST_AVAILABLE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5D_VIRTUAL_F
   !DEC$endif
-  COMMON /H5D_FLAGS/ H5D_flags
-  COMMON /H5D_SIZE_FLAGS/ H5D_size_flags
-
+  
   INTEGER :: H5D_COMPACT_F
   INTEGER :: H5D_CONTIGUOUS_F
   INTEGER :: H5D_CHUNKED_F
@@ -406,13 +348,14 @@ MODULE H5GLOBAL
   INTEGER :: H5D_FILL_VALUE_DEFAULT_F
   INTEGER :: H5D_FILL_VALUE_USER_DEFINED_F
 
-! shortened "_DEFAULT" to "_DFLT" to satisfy the limit of 31
-! characters for variable names in Fortran.
-! shortened "_CONTIGUOUS" to "_CONTIG" to satisfy the limit of 31
-! characters for variable names in Fortran.
-
+  ! shortened "_DEFAULT" to "_DFLT" to satisfy the limit of 31
+  ! characters for variable names in Fortran.
+  ! shortened "_CONTIGUOUS" to "_CONTIG" to satisfy the limit of 31
+  ! characters for variable names in Fortran.
+  
   INTEGER(SIZE_T) :: H5D_CHUNK_CACHE_NSLOTS_DFLT_F
   INTEGER(SIZE_T) :: H5D_CHUNK_CACHE_NBYTES_DFLT_F
+
   INTEGER :: H5D_CHUNK_CACHE_W0_DFLT_F
   INTEGER :: H5D_MPIO_NO_COLLECTIVE_F
   INTEGER :: H5D_MPIO_CHUNK_INDEPENDENT_F
@@ -423,80 +366,45 @@ MODULE H5GLOBAL
   INTEGER :: H5D_VDS_FIRST_MISSING_F
   INTEGER :: H5D_VDS_LAST_AVAILABLE_F
   INTEGER :: H5D_VIRTUAL_F
-
-  EQUIVALENCE(H5D_flags(1), H5D_COMPACT_F)
-  EQUIVALENCE(H5D_flags(2), H5D_CONTIGUOUS_F)
-  EQUIVALENCE(H5D_flags(3), H5D_CHUNKED_F)
-
-  EQUIVALENCE(H5D_flags(4), H5D_ALLOC_TIME_ERROR_F)
-  EQUIVALENCE(H5D_flags(5), H5D_ALLOC_TIME_DEFAULT_F)
-  EQUIVALENCE(H5D_flags(6), H5D_ALLOC_TIME_EARLY_F)
-  EQUIVALENCE(H5D_flags(7), H5D_ALLOC_TIME_LATE_F)
-  EQUIVALENCE(H5D_flags(8), H5D_ALLOC_TIME_INCR_F)
-
-  EQUIVALENCE(H5D_flags(9), H5D_SPACE_STS_ERROR_F)
-  EQUIVALENCE(H5D_flags(10), H5D_SPACE_STS_NOT_ALLOCATED_F)
-  EQUIVALENCE(H5D_flags(11), H5D_SPACE_STS_PART_ALLOCATED_F)
-  EQUIVALENCE(H5D_flags(12), H5D_SPACE_STS_ALLOCATED_F)
-
-  EQUIVALENCE(H5D_flags(13), H5D_FILL_TIME_ERROR_F)
-  EQUIVALENCE(H5D_flags(14), H5D_FILL_TIME_ALLOC_F)
-  EQUIVALENCE(H5D_flags(15), H5D_FILL_TIME_NEVER_F)
-
-  EQUIVALENCE(H5D_flags(16), H5D_FILL_VALUE_ERROR_F)
-  EQUIVALENCE(H5D_flags(17), H5D_FILL_VALUE_UNDEFINED_F)
-  EQUIVALENCE(H5D_flags(18), H5D_FILL_VALUE_DEFAULT_F)
-  EQUIVALENCE(H5D_flags(19), H5D_FILL_VALUE_USER_DEFINED_F)
-
-  EQUIVALENCE(H5D_flags(20), H5D_CHUNK_CACHE_W0_DFLT_F)
-  EQUIVALENCE(H5D_flags(21), H5D_MPIO_NO_COLLECTIVE_F)
-  EQUIVALENCE(H5D_flags(22), H5D_MPIO_CHUNK_INDEPENDENT_F)
-  EQUIVALENCE(H5D_flags(23), H5D_MPIO_CHUNK_COLLECTIVE_F)
-  EQUIVALENCE(H5D_flags(24), H5D_MPIO_CHUNK_MIXED_F)
-  EQUIVALENCE(H5D_flags(25), H5D_MPIO_CONTIG_COLLECTIVE_F)
-  EQUIVALENCE(H5D_flags(26), H5D_VDS_ERROR_F)
-  EQUIVALENCE(H5D_flags(27), H5D_VDS_FIRST_MISSING_F)
-  EQUIVALENCE(H5D_flags(28), H5D_VDS_LAST_AVAILABLE_F)
-  EQUIVALENCE(H5D_flags(29), H5D_VIRTUAL_F)
-
-  EQUIVALENCE(H5D_size_flags(1), H5D_CHUNK_CACHE_NSLOTS_DFLT_F)
-  EQUIVALENCE(H5D_size_flags(2), H5D_CHUNK_CACHE_NBYTES_DFLT_F)
-
   !
   ! H5E flags declaration
   !
-  INTEGER, PARAMETER :: H5E_FLAGS_LEN = 4
-  INTEGER :: H5E_flags(H5E_FLAGS_LEN)
-  INTEGER, PARAMETER :: H5E_HID_FLAGS_LEN = 1
-  INTEGER(HID_T) :: H5E_hid_flags(H5E_HID_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5E_FLAGS/
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5E_HID_FLAGS/
+  !DEC$ATTRIBUTES DLLEXPORT :: H5E_DEFAULT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5E_MAJOR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5E_MINOR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5E_WALK_UPWARD_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5E_WALK_DOWNWARD_F
   !DEC$endif
-  COMMON /H5E_FLAGS/ H5E_flags
-  COMMON /H5E_HID_FLAGS/ H5E_hid_flags
 
   INTEGER(HID_T) :: H5E_DEFAULT_F
   INTEGER :: H5E_MAJOR_F
   INTEGER :: H5E_MINOR_F
   INTEGER :: H5E_WALK_UPWARD_F
   INTEGER :: H5E_WALK_DOWNWARD_F
-
-  EQUIVALENCE(H5E_hid_flags(1), H5E_DEFAULT_F)
-  EQUIVALENCE(H5E_flags(1)    , H5E_MAJOR_F)
-  EQUIVALENCE(H5E_flags(2)    , H5E_MINOR_F)
-  EQUIVALENCE(H5E_flags(3)    , H5E_WALK_UPWARD_F)
-  EQUIVALENCE(H5E_flags(4)    , H5E_WALK_DOWNWARD_F)
-
   !
-  ! H5FD flags declaration
+  ! H5FD file drivers flags declaration
   !
-  INTEGER, PARAMETER :: H5FD_FLAGS_LEN = 11
-  INTEGER :: H5FD_flags(H5FD_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5FD_FLAGS/
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MPIO_INDEPENDENT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MPIO_COLLECTIVE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_NOLIST_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_DEFAULT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_SUPER_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_BTREE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_DRAW_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_GHEAP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_LHEAP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_OHDR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MEM_NTYPES_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_CORE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_FAMILY_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_LOG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MPIO_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_MULTI_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_SEC2_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5FD_STDIO_F
   !DEC$endif
-  COMMON /H5FD_FLAGS/ H5FD_flags
 
   INTEGER :: H5FD_MPIO_INDEPENDENT_F
   INTEGER :: H5FD_MPIO_COLLECTIVE_F
@@ -509,28 +417,6 @@ MODULE H5GLOBAL
   INTEGER :: H5FD_MEM_LHEAP_F
   INTEGER :: H5FD_MEM_OHDR_F
   INTEGER :: H5FD_MEM_NTYPES_F
-
-  EQUIVALENCE(H5FD_flags(1), H5FD_MPIO_INDEPENDENT_F)
-  EQUIVALENCE(H5FD_flags(2), H5FD_MPIO_COLLECTIVE_F)
-  EQUIVALENCE(H5FD_flags(3), H5FD_MEM_NOLIST_F)
-  EQUIVALENCE(H5FD_flags(4), H5FD_MEM_DEFAULT_F)
-  EQUIVALENCE(H5FD_flags(5), H5FD_MEM_SUPER_F)
-  EQUIVALENCE(H5FD_flags(6), H5FD_MEM_BTREE_F)
-  EQUIVALENCE(H5FD_flags(7), H5FD_MEM_DRAW_F)
-  EQUIVALENCE(H5FD_flags(8), H5FD_MEM_GHEAP_F)
-  EQUIVALENCE(H5FD_flags(9), H5FD_MEM_LHEAP_F)
-  EQUIVALENCE(H5FD_flags(10), H5FD_MEM_OHDR_F)
-  EQUIVALENCE(H5FD_flags(11), H5FD_MEM_NTYPES_F)
-  !
-  ! H5FD file drivers flags declaration
-  !
-  INTEGER, PARAMETER :: H5FD_HID_FLAGS_LEN = 7
-  INTEGER(HID_T) :: H5FD_hid_flags(H5FD_HID_FLAGS_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5FD_HID_FLAGS/
-  !DEC$endif
-  COMMON /H5FD_HID_FLAGS/ H5FD_hid_flags
-
   INTEGER(HID_T) :: H5FD_CORE_F
   INTEGER(HID_T) :: H5FD_FAMILY_F
   INTEGER(HID_T) :: H5FD_LOG_F
@@ -538,24 +424,18 @@ MODULE H5GLOBAL
   INTEGER(HID_T) :: H5FD_MULTI_F
   INTEGER(HID_T) :: H5FD_SEC2_F
   INTEGER(HID_T) :: H5FD_STDIO_F
-
-  EQUIVALENCE(H5FD_hid_flags(1), H5FD_CORE_F)
-  EQUIVALENCE(H5FD_hid_flags(2), H5FD_FAMILY_F)
-  EQUIVALENCE(H5FD_hid_flags(3), H5FD_LOG_F)
-  EQUIVALENCE(H5FD_hid_flags(4), H5FD_MPIO_F)
-  EQUIVALENCE(H5FD_hid_flags(5), H5FD_MULTI_F)
-  EQUIVALENCE(H5FD_hid_flags(6), H5FD_SEC2_F)
-  EQUIVALENCE(H5FD_hid_flags(7), H5FD_STDIO_F)
-
   !
   ! H5I flags declaration
   !
-  INTEGER, PARAMETER :: H5I_FLAGS_LEN = 7
-  INTEGER :: H5I_flags(H5I_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5I_FLAGS/
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_FILE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_GROUP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_DATATYPE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_DATASPACE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_DATASET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_ATTR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5I_BADID_F
   !DEC$endif
-  COMMON /H5I_FLAGS/ H5I_flags
 
   INTEGER ::  H5I_FILE_F
   INTEGER ::  H5I_GROUP_F
@@ -564,48 +444,57 @@ MODULE H5GLOBAL
   INTEGER ::  H5I_DATASET_F
   INTEGER ::  H5I_ATTR_F
   INTEGER ::  H5I_BADID_F
-
-  EQUIVALENCE(H5I_flags(1), H5I_FILE_F)
-  EQUIVALENCE(H5I_flags(2), H5I_GROUP_F)
-  EQUIVALENCE(H5I_flags(3), H5I_DATATYPE_F)
-  EQUIVALENCE(H5I_flags(4), H5I_DATASPACE_F)
-  EQUIVALENCE(H5I_flags(5), H5I_DATASET_F)
-  EQUIVALENCE(H5I_flags(6), H5I_ATTR_F)
-  EQUIVALENCE(H5I_flags(7), H5I_BADID_F)
   !
   ! H5L flags declaration
   !
-  INTEGER, PARAMETER :: H5L_FLAGS_LEN = 6
-  INTEGER :: H5L_flags(H5L_FLAGS_LEN)
-
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5L_TYPE_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5L_TYPE_HARD_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5L_TYPE_SOFT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5L_TYPE_EXTERNAL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5L_SAME_LOC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5L_LINK_CLASS_T_VERS_F
+  !DEC$endif
+  
   INTEGER :: H5L_TYPE_ERROR_F
   INTEGER :: H5L_TYPE_HARD_F
   INTEGER :: H5L_TYPE_SOFT_F
   INTEGER :: H5L_TYPE_EXTERNAL_F
   INTEGER :: H5L_SAME_LOC_F
   INTEGER :: H5L_LINK_CLASS_T_VERS_F
-
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5L_FLAGS/
-  !DEC$endif
-  COMMON /H5L_FLAGS/ H5L_flags
-
-  EQUIVALENCE(H5L_flags(1), H5L_TYPE_ERROR_F)
-  EQUIVALENCE(H5L_flags(2), H5L_TYPE_HARD_F)
-  EQUIVALENCE(H5L_flags(3), H5L_TYPE_SOFT_F)
-  EQUIVALENCE(H5L_flags(4), H5L_TYPE_EXTERNAL_F)
-  EQUIVALENCE(H5L_flags(5), H5L_SAME_LOC_F)
-  EQUIVALENCE(H5L_flags(6), H5L_LINK_CLASS_T_VERS_F)
   !
   ! H5O flags declaration
   !
-  INTEGER, PARAMETER :: H5O_FLAGS_LEN = 27
-  INTEGER :: H5o_flags(H5O_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5O_FLAGS/
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_COPY_SHALLOW_HIERARCHY_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_COPY_EXPAND_SOFT_LINK_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_COPY_EXPAND_EXT_LINK_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_COPY_EXPAND_REFERENCE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_COPY_WITHOUT_ATTR_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_COPY_PRESERVE_NULL_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_COPY_ALL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_NONE_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_SDSPACE_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_DTYPE_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_FILL_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_PLINE_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_ATTR_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_ALL_FLAG_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_HDR_CHUNK0_SIZE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_HDR_ATTR_CRT_ORDER_TRACK_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_HDR_ATTR_CRT_ORDER_INDEX_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_HDR_ATTR_STORE_PHASE_CHA_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_HDR_STORE_TIMES_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_HDR_ALL_FLAGS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_MAX_NINDEXES_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_SHMESG_MAX_LIST_SIZE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_TYPE_UNKNOWN_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_TYPE_GROUP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_TYPE_DATASET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_TYPE_NAMED_DATATYPE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5O_TYPE_NTYPES_F
   !DEC$endif
-  COMMON /H5O_FLAGS/ H5O_flags
-
+  
   INTEGER :: H5O_COPY_SHALLOW_HIERARCHY_F ! *** THESE VARIABLES DO
   INTEGER :: H5O_COPY_EXPAND_SOFT_LINK_F  ! NOT MATCH THE C VARIABLE
   INTEGER :: H5O_COPY_EXPAND_EXT_LINK_F   ! IN ORDER
@@ -633,44 +522,31 @@ MODULE H5GLOBAL
   INTEGER :: H5O_TYPE_DATASET_F
   INTEGER :: H5O_TYPE_NAMED_DATATYPE_F
   INTEGER :: H5O_TYPE_NTYPES_F
-
-  EQUIVALENCE(h5o_flags(1) , H5O_COPY_SHALLOW_HIERARCHY_F)
-  EQUIVALENCE(h5o_flags(2) , H5O_COPY_EXPAND_SOFT_LINK_F)
-  EQUIVALENCE(h5o_flags(3) , H5O_COPY_EXPAND_EXT_LINK_F)
-  EQUIVALENCE(h5o_flags(4) , H5O_COPY_EXPAND_REFERENCE_F)
-  EQUIVALENCE(h5o_flags(5) , H5O_COPY_WITHOUT_ATTR_FLAG_F)
-  EQUIVALENCE(h5o_flags(6) , H5O_COPY_PRESERVE_NULL_FLAG_F)
-  EQUIVALENCE(h5o_flags(7) , H5O_COPY_ALL_F)
-  EQUIVALENCE(h5o_flags(8) , H5O_SHMESG_NONE_FLAG_F)
-  EQUIVALENCE(h5o_flags(9) , H5O_SHMESG_SDSPACE_FLAG_F)
-  EQUIVALENCE(h5o_flags(10) , H5O_SHMESG_DTYPE_FLAG_F)
-  EQUIVALENCE(h5o_flags(11) , H5O_SHMESG_FILL_FLAG_F)
-  EQUIVALENCE(h5o_flags(12) , H5O_SHMESG_PLINE_FLAG_F)
-  EQUIVALENCE(h5o_flags(13) , H5O_SHMESG_ATTR_FLAG_F)
-  EQUIVALENCE(h5o_flags(14) , H5O_SHMESG_ALL_FLAG_F)
-  EQUIVALENCE(h5o_flags(15) , H5O_HDR_CHUNK0_SIZE_F)
-  EQUIVALENCE(h5o_flags(16) , H5O_HDR_ATTR_CRT_ORDER_TRACK_F)
-  EQUIVALENCE(h5o_flags(17) , H5O_HDR_ATTR_CRT_ORDER_INDEX_F)
-  EQUIVALENCE(h5o_flags(18) , H5O_HDR_ATTR_STORE_PHASE_CHA_F)
-  EQUIVALENCE(h5o_flags(19) , H5O_HDR_STORE_TIMES_F)
-  EQUIVALENCE(h5o_flags(20) , H5O_HDR_ALL_FLAGS_F)
-  EQUIVALENCE(h5o_flags(21) , H5O_SHMESG_MAX_NINDEXES_F)
-  EQUIVALENCE(h5o_flags(22) , H5O_SHMESG_MAX_LIST_SIZE_F)
-  EQUIVALENCE(h5o_flags(23) , H5O_TYPE_UNKNOWN_F)
-  EQUIVALENCE(h5o_flags(24) , H5O_TYPE_GROUP_F)
-  EQUIVALENCE(h5o_flags(25) , H5O_TYPE_DATASET_F)
-  EQUIVALENCE(h5o_flags(26) , H5O_TYPE_NAMED_DATATYPE_F)
-  EQUIVALENCE(h5o_flags(27) , H5O_TYPE_NTYPES_F)
-
   !
   ! H5P flags declaration
   !
-  INTEGER, PARAMETER :: H5P_FLAGS_LEN = 18
-  INTEGER(HID_T) H5P_flags(H5P_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5P_FLAGS/
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_FILE_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_FILE_ACCESS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_DATASET_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_DATASET_XFER_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_FILE_MOUNT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_DEFAULT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_ROOT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_OBJECT_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_DATASET_ACCESS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_GROUP_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_GROUP_ACCESS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_DATATYPE_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_DATATYPE_ACCESS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_STRING_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_ATTRIBUTE_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_OBJECT_COPY_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_LINK_CREATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_LINK_ACCESS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_CRT_ORDER_INDEXED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5P_CRT_ORDER_TRACKED_F
   !DEC$endif
-  COMMON /H5P_FLAGS/ H5P_flags
 
   INTEGER(HID_T) :: H5P_FILE_CREATE_F
   INTEGER(HID_T) :: H5P_FILE_ACCESS_F
@@ -691,72 +567,44 @@ MODULE H5GLOBAL
   INTEGER(HID_T) :: H5P_LINK_CREATE_F
   INTEGER(HID_T) :: H5P_LINK_ACCESS_F
 
-  EQUIVALENCE(H5P_flags(1), H5P_FILE_CREATE_F)
-  EQUIVALENCE(H5P_flags(2), H5P_FILE_ACCESS_F)
-  EQUIVALENCE(H5P_flags(3), H5P_DATASET_CREATE_F)
-  EQUIVALENCE(H5P_flags(4), H5P_DATASET_XFER_F)
-  EQUIVALENCE(H5P_flags(5), H5P_FILE_MOUNT_F)
-  EQUIVALENCE(H5P_flags(6), H5P_DEFAULT_F)
-  EQUIVALENCE(H5P_flags(7), H5P_ROOT_F)
-  EQUIVALENCE(H5P_flags(8), H5P_OBJECT_CREATE_F)
-  EQUIVALENCE(H5P_flags(9), H5P_DATASET_ACCESS_F)
-  EQUIVALENCE(H5P_flags(10), H5P_GROUP_CREATE_F)
-  EQUIVALENCE(H5P_flags(11), H5P_GROUP_ACCESS_F)
-  EQUIVALENCE(H5P_flags(12), H5P_DATATYPE_CREATE_F)
-  EQUIVALENCE(H5P_flags(13), H5P_DATATYPE_ACCESS_F)
-  EQUIVALENCE(H5P_flags(14), H5P_STRING_CREATE_F)
-  EQUIVALENCE(H5P_flags(15), H5P_ATTRIBUTE_CREATE_F)
-  EQUIVALENCE(H5P_flags(16), H5P_OBJECT_COPY_F)
-  EQUIVALENCE(H5P_flags(17), H5P_LINK_CREATE_F)
-  EQUIVALENCE(H5P_flags(18), H5P_LINK_ACCESS_F)
-
-  !
-  ! H5P integers flags declaration
-  !
-  INTEGER, PARAMETER :: H5P_FLAGS_INT_LEN = 2
-  INTEGER :: H5P_flags_int(H5P_FLAGS_INT_LEN)
-  !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5P_FLAGS_INT/
-  !DEC$endif
-  COMMON /H5P_FLAGS_INT/ H5P_flags_int
   INTEGER :: H5P_CRT_ORDER_INDEXED_F
   INTEGER :: H5P_CRT_ORDER_TRACKED_F
-  EQUIVALENCE(H5P_flags_int(1), H5P_CRT_ORDER_INDEXED_F)
-  EQUIVALENCE(H5P_flags_int(2), H5P_CRT_ORDER_TRACKED_F)
   !
   ! H5R flags declaration
   !
-  INTEGER, PARAMETER :: H5R_FLAGS_LEN = 2
-  INTEGER :: H5R_flags(H5R_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5R_FLAGS/
+  !DEC$ATTRIBUTES DLLEXPORT :: H5R_OBJECT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5R_DATASET_REGION_F
   !DEC$endif
-  COMMON /H5R_FLAGS/ H5R_flags
 
   INTEGER :: H5R_OBJECT_F
   INTEGER :: H5R_DATASET_REGION_F
-
-  EQUIVALENCE(H5R_flags(1), H5R_OBJECT_F)
-  EQUIVALENCE(H5R_flags(2), H5R_DATASET_REGION_F)
-
   !
   ! H5S flags declaration
   !
-  INTEGER, PARAMETER :: H5S_FLAGS_LEN = 18
-  INTEGER :: H5S_flags(H5S_FLAGS_LEN)
-  INTEGER, PARAMETER :: H5S_HSIZE_FLAGS_LEN = 1
-  INTEGER(HSIZE_T) H5S_hsize_flags(H5S_HSIZE_FLAGS_LEN)
-  INTEGER, PARAMETER :: H5S_HID_FLAGS_LEN = 1
-  INTEGER(HSIZE_T) H5S_hid_flags(H5S_HID_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5S_FLAGS/
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5S_HID_FLAGS/
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5S_HSIZE_FLAGS/
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_UNLIMITED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_ALL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SCALAR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SIMPLE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_NULL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_NOOP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_SET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_OR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_AND_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_XOR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_NOTB_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_NOTA_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_APPEND_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_PREPEND_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SELECT_INVALID_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SEL_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SEL_NONE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SEL_POINTS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SEL_HYPERSLABS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5S_SEL_ALL_F
   !DEC$endif
-  COMMON /H5S_FLAGS/ H5S_flags
-  COMMON /H5S_HID_FLAGS/ H5S_hid_flags
-  COMMON /H5S_HSIZE_FLAGS/ H5S_hsize_flags
-
+  
   INTEGER(HSIZE_T) :: H5S_UNLIMITED_F
 
   INTEGER(HID_T) :: H5S_ALL_F
@@ -781,42 +629,46 @@ MODULE H5GLOBAL
   INTEGER :: H5S_SEL_POINTS_F
   INTEGER :: H5S_SEL_HYPERSLABS_F
   INTEGER :: H5S_SEL_ALL_F
-
-  EQUIVALENCE(H5S_hid_flags(1), H5S_ALL_F)
-
-  EQUIVALENCE(H5S_hsize_flags(1), H5S_UNLIMITED_F)
-
-  EQUIVALENCE(H5S_flags(1), H5S_SCALAR_F)
-  EQUIVALENCE(H5S_flags(2), H5S_SIMPLE_F)
-  EQUIVALENCE(H5S_flags(3), H5S_NULL_F)
-  EQUIVALENCE(H5S_flags(4), H5S_SELECT_SET_F)
-  EQUIVALENCE(H5S_flags(5), H5S_SELECT_OR_F)
-
-  EQUIVALENCE(H5S_flags(6), H5S_SELECT_NOOP_F)
-  EQUIVALENCE(H5S_flags(7), H5S_SELECT_AND_F)
-  EQUIVALENCE(H5S_flags(8), H5S_SELECT_XOR_F)
-  EQUIVALENCE(H5S_flags(9), H5S_SELECT_NOTB_F)
-  EQUIVALENCE(H5S_flags(10), H5S_SELECT_NOTA_F)
-
-  EQUIVALENCE(H5S_flags(11), H5S_SELECT_APPEND_F)
-  EQUIVALENCE(H5S_flags(12), H5S_SELECT_PREPEND_F)
-  EQUIVALENCE(H5S_flags(13), H5S_SELECT_INVALID_F)
-  EQUIVALENCE(H5S_flags(14), H5S_SEL_ERROR_F)
-  EQUIVALENCE(H5S_flags(15), H5S_SEL_NONE_F)
-
-  EQUIVALENCE(H5S_flags(16), H5S_SEL_POINTS_F)
-  EQUIVALENCE(H5S_flags(17), H5S_SEL_HYPERSLABS_F)
-  EQUIVALENCE(H5S_flags(18), H5S_SEL_ALL_F)
-
   !
   ! H5T flags declaration
   !
-  INTEGER, PARAMETER :: H5T_FLAGS_LEN = 35
-  INTEGER :: H5T_flags(H5T_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5T_FLAGS/
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NO_CLASS_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_INTEGER_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_FLOAT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_TIME_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STRING_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_BITFIELD_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_OPAQUE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_COMPOUND_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_REFERENCE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_ENUM_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_VLEN_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_ARRAY_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_ORDER_LE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_ORDER_BE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_ORDER_VAX_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_ORDER_NONE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_ORDER_MIXED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_PAD_ZERO_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_PAD_ONE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_PAD_BACKGROUND_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_PAD_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_SGN_NONE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_SGN_2_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_SGN_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NORM_IMPLIED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NORM_MSBSET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_NORM_NONE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_CSET_ASCII_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_CSET_UTF8_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STR_NULLTERM_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STR_NULLPAD_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STR_SPACEPAD_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_STR_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_DIR_ASCEND_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5T_DIR_DESCEND_F
   !DEC$endif
-  COMMON /H5T_FLAGS/ H5T_flags
 
   INTEGER :: H5T_NO_CLASS_F
   INTEGER :: H5T_INTEGER_F
@@ -853,51 +705,31 @@ MODULE H5GLOBAL
   INTEGER :: H5T_STR_ERROR_F
   INTEGER :: H5T_DIR_ASCEND_F
   INTEGER :: H5T_DIR_DESCEND_F
-
-  EQUIVALENCE(H5T_flags(1), H5T_NO_CLASS_F)
-  EQUIVALENCE(H5T_flags(2), H5T_INTEGER_F)
-  EQUIVALENCE(H5T_flags(3), H5T_FLOAT_F)
-  EQUIVALENCE(H5T_flags(4), H5T_TIME_F)
-  EQUIVALENCE(H5T_flags(5), H5T_STRING_F)
-  EQUIVALENCE(H5T_flags(6), H5T_BITFIELD_F)
-  EQUIVALENCE(H5T_flags(7), H5T_OPAQUE_F)
-  EQUIVALENCE(H5T_flags(8), H5T_COMPOUND_F)
-  EQUIVALENCE(H5T_flags(9), H5T_REFERENCE_F)
-  EQUIVALENCE(H5T_flags(10), H5T_ENUM_F)
-  EQUIVALENCE(H5T_flags(11), H5T_ORDER_LE_F)
-  EQUIVALENCE(H5T_flags(12), H5T_ORDER_BE_F)
-  EQUIVALENCE(H5T_flags(13), H5T_ORDER_MIXED_F)
-  EQUIVALENCE(H5T_flags(14), H5T_ORDER_VAX_F)
-  EQUIVALENCE(H5T_flags(15), H5T_ORDER_NONE_F)
-  EQUIVALENCE(H5T_flags(16), H5T_PAD_ZERO_F)
-  EQUIVALENCE(H5T_flags(17), H5T_PAD_ONE_F)
-  EQUIVALENCE(H5T_flags(18), H5T_PAD_BACKGROUND_F)
-  EQUIVALENCE(H5T_flags(19), H5T_PAD_ERROR_F)
-  EQUIVALENCE(H5T_flags(20), H5T_SGN_NONE_F)
-  EQUIVALENCE(H5T_flags(21), H5T_SGN_2_F)
-  EQUIVALENCE(H5T_flags(22), H5T_SGN_ERROR_F)
-  EQUIVALENCE(H5T_flags(23), H5T_NORM_IMPLIED_F)
-  EQUIVALENCE(H5T_flags(24), H5T_NORM_MSBSET_F)
-  EQUIVALENCE(H5T_flags(25), H5T_NORM_NONE_F)
-  EQUIVALENCE(H5T_flags(26), H5T_CSET_ASCII_F)
-  EQUIVALENCE(H5T_flags(27), H5T_CSET_UTF8_F)
-  EQUIVALENCE(H5T_flags(28), H5T_STR_NULLTERM_F)
-  EQUIVALENCE(H5T_flags(29), H5T_STR_NULLPAD_F)
-  EQUIVALENCE(H5T_flags(30), H5T_STR_SPACEPAD_F)
-  EQUIVALENCE(H5T_flags(31), H5T_STR_ERROR_F)
-  EQUIVALENCE(H5T_flags(32), H5T_VLEN_F)
-  EQUIVALENCE(H5T_flags(33), H5T_ARRAY_F)
-  EQUIVALENCE(H5T_flags(34), H5T_DIR_ASCEND_F)
-  EQUIVALENCE(H5T_flags(35), H5T_DIR_DESCEND_F)
   !
   ! H5Z flags declaration
   !
-  INTEGER, PARAMETER :: H5Z_FLAGS_LEN = 20
-  INTEGER :: H5Z_flags(H5Z_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5Z_FLAGS/
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_ERROR_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_NONE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_ALL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_DEFLATE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_SHUFFLE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_FLETCHER32_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_SZIP_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_ERROR_EDC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_DISABLE_EDC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_ENABLE_EDC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_NO_EDC_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FLAG_OPTIONAL_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_ENCODE_ENABLED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_DECODE_ENABLED_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_NBIT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_FILTER_SCALEOFFSET_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_SO_FLOAT_DSCALE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_SO_FLOAT_ESCALE_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_SO_INT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5Z_SO_INT_MINBITS_DEFAULT_F
   !DEC$endif
-  COMMON /H5Z_FLAGS/ H5Z_flags
 
   INTEGER :: H5Z_FILTER_ERROR_F
   INTEGER :: H5Z_FILTER_NONE_F
@@ -919,58 +751,16 @@ MODULE H5GLOBAL
   INTEGER :: H5Z_SO_FLOAT_ESCALE_F
   INTEGER :: H5Z_SO_INT_F
   INTEGER :: H5Z_SO_INT_MINBITS_DEFAULT_F
-
-  EQUIVALENCE(H5Z_flags(1), H5Z_FILTER_ERROR_F)
-  EQUIVALENCE(H5Z_flags(2), H5Z_FILTER_NONE_F)
-  EQUIVALENCE(H5Z_flags(3), H5Z_FILTER_DEFLATE_F)
-  EQUIVALENCE(H5Z_flags(4), H5Z_FILTER_SHUFFLE_F)
-  EQUIVALENCE(H5Z_flags(5), H5Z_FILTER_FLETCHER32_F)
-  EQUIVALENCE(H5Z_flags(6), H5Z_ERROR_EDC_F)
-  EQUIVALENCE(H5Z_flags(7), H5Z_DISABLE_EDC_F)
-  EQUIVALENCE(H5Z_flags(8), H5Z_ENABLE_EDC_F)
-  EQUIVALENCE(H5Z_flags(9), H5Z_NO_EDC_F)
-  EQUIVALENCE(H5Z_flags(10), H5Z_FILTER_SZIP_F)
-  EQUIVALENCE(H5Z_flags(11), H5Z_FLAG_OPTIONAL_F)
-  EQUIVALENCE(H5Z_flags(12), H5Z_FILTER_ENCODE_ENABLED_F)
-  EQUIVALENCE(H5Z_flags(13), H5Z_FILTER_DECODE_ENABLED_F)
-  EQUIVALENCE(H5Z_flags(14), H5Z_FILTER_ALL_F)
-  EQUIVALENCE(H5Z_flags(15), H5Z_FILTER_NBIT_F)
-  EQUIVALENCE(H5Z_flags(16), H5Z_FILTER_SCALEOFFSET_F)
-  EQUIVALENCE(H5Z_flags(17), H5Z_SO_FLOAT_DSCALE_F)
-  EQUIVALENCE(H5Z_flags(18), H5Z_SO_FLOAT_ESCALE_F)
-  EQUIVALENCE(H5Z_flags(19), H5Z_SO_INT_F)
-  EQUIVALENCE(H5Z_flags(20), H5Z_SO_INT_MINBITS_DEFAULT_F)
-
   !
   ! H5 Library flags declaration
   !
-  INTEGER, PARAMETER :: H5LIB_FLAGS_LEN =  2
-  INTEGER :: H5LIB_flags(H5LIB_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
-  !DEC$ATTRIBUTES DLLEXPORT :: /H5LIB_FLAGS/
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_SZIP_EC_OM_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_SZIP_NN_OM_F
   !DEC$endif
-  COMMON /H5LIB_FLAGS/ H5LIB_flags
+
   INTEGER :: H5_SZIP_EC_OM_F
   INTEGER :: H5_SZIP_NN_OM_F
-  !
-  EQUIVALENCE(H5LIB_flags(1), H5_SZIP_EC_OM_F)
-  EQUIVALENCE(H5LIB_flags(2), H5_SZIP_NN_OM_F)
-
-
-  ! General H5 flags declarations
-  !
-!!$      INTEGER, PARAMETER :: H5_FLAGS_LEN = 2
-!!$      INTEGER H5_flags(H5_FLAGS_LEN)
-!!$!DEC$if defined(BUILD_HDF5_DLL)
-!!$!DEC$ATTRIBUTES DLLEXPORT :: /H5_FLAGS/
-!!$!DEC$endif
-!!$      COMMON /H5_FLAGS/ H5_flags
-!!$
-!!$      INTEGER :: _F
-!!$      INTEGER :: H5F_SCOPE_LOCAL_F
-!!$
-!!$      EQUIVALENCE(H5F_flags(1), H5F_SCOPE_GLOBAL_F)
-!!$      EQUIVALENCE(H5F_flags(2), H5F_SCOPE_LOCAL_F)
 
 CONTAINS
 
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index 1661a10..b71a8eb 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -1,10 +1,10 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_FORTRAN_TESTS C CXX Fortran)
 
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
+INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_FORTRAN_TESTS_SOURCE_DIR} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
 
 #-----------------------------------------------------------------------------
 # Setup the Fortran auto-detection utilities
@@ -32,27 +32,19 @@ set_target_properties (H5_test_buildiface PROPERTIES
     Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
 )
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
-  file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared")
-  if (WIN32)
-    set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${CMAKE_BUILD_TYPE})
-  else ()
-    set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
-  endif ()
+if (BUILD_SHARED_LIBS)
+  file (MAKE_DIRECTORY "${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared")
+  set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF_CFG_BUILD_TYPE})
 endif ()
-if (WIN32)
-  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${CMAKE_BUILD_TYPE})
-else ()
-  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
-endif ()
-
-INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${MOD_BUILD_DIR})
+file (MAKE_DIRECTORY "${HDF5_FORTRAN_TESTS_BINARY_DIR}/static")
+set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF_CFG_BUILD_TYPE})
 
 #-----------------------------------------------------------------------------
 # Add Test Lib
 #-----------------------------------------------------------------------------
 add_library (${HDF5_F90_C_TEST_LIB_TARGET} STATIC t.c)
 set_source_files_properties (t.c PROPERTIES LANGUAGE C)
+target_include_directories(${HDF5_F90_C_TEST_LIB_TARGET} PUBLIC ${HDF5_F90_BINARY_DIR}/static)
 TARGET_C_PROPERTIES (${HDF5_F90_C_TEST_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_F90_C_TEST_LIB_TARGET}
     ${HDF5_F90_C_LIB_TARGET}
@@ -64,8 +56,9 @@ set_target_properties (${HDF5_F90_C_TEST_LIB_TARGET} PROPERTIES
     LINKER_LANGUAGE C
     INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
 )
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (BUILD_SHARED_LIBS)
   add_library (${HDF5_F90_C_TEST_LIBSH_TARGET} SHARED t.c)
+  target_include_directories(${HDF5_F90_C_TEST_LIBSH_TARGET} PUBLIC ${HDF5_F90_BINARY_DIR}/shared)
   TARGET_C_PROPERTIES (${HDF5_F90_C_TEST_LIBSH_TARGET} SHARED " " " ")
   target_link_libraries (${HDF5_F90_C_TEST_LIBSH_TARGET}
       ${HDF5_F90_C_LIBSH_TARGET}
@@ -81,46 +74,44 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   )
 endif ()
 
-set (CMD $<TARGET_FILE:H5_test_buildiface>)
 add_custom_command (
-    OUTPUT ${HDF5_F90_BINARY_DIR}/tf_gen.F90
-    COMMAND ${CMD}
-    WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}
+    OUTPUT ${HDF5_FORTRAN_TESTS_BINARY_DIR}/static/tf_gen.F90
+    COMMAND $<TARGET_FILE:H5_test_buildiface>
+    WORKING_DIRECTORY ${HDF5_FORTRAN_TESTS_BINARY_DIR}/static
     DEPENDS H5_test_buildiface
     COMMENT "Generating the tf_gen.F90 file"
 )
 add_custom_target (H5testgen ALL
-    DEPENDS ${HDF5_F90_BINARY_DIR}/tf_gen.F90
+    DEPENDS ${HDF5_FORTRAN_TESTS_BINARY_DIR}/static/tf_gen.F90
 )
-set_source_files_properties (${HDF5_F90_BINARY_DIR}/tf_gen.F90 PROPERTIES GENERATED TRUE)
+set_source_files_properties (${HDF5_FORTRAN_TESTS_BINARY_DIR}/static/tf_gen.F90 PROPERTIES GENERATED TRUE)
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
-  set (CMDSH $<TARGET_FILE:H5_test_buildiface>)
+if (BUILD_SHARED_LIBS)
   add_custom_command (
-      OUTPUT ${HDF5_F90_BINARY_DIR}/shared/tf_gen.F90
-      COMMAND ${CMDSH}
-      WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/shared
+      OUTPUT ${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared/tf_gen.F90
+      COMMAND $<TARGET_FILE:H5_test_buildiface>
+      WORKING_DIRECTORY ${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared
       DEPENDS H5_test_buildiface
       COMMENT "Generating the tf_gen.F90 shared file"
   )
   add_custom_target (H5testgenSH ALL
-      DEPENDS ${HDF5_F90_BINARY_DIR}/shared/tf_gen.F90
+      DEPENDS ${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared/tf_gen.F90
   )
-  set_source_files_properties (${HDF5_F90_BINARY_DIR}/shared/tf_gen.F90 PROPERTIES GENERATED TRUE)
+  set_source_files_properties (${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared/tf_gen.F90 PROPERTIES GENERATED TRUE)
 endif ()
 
 set (HDF5_F90_TF_SOURCES
     # generated files
-    ${HDF5_F90_BINARY_DIR}/tf_gen.F90
+    ${HDF5_FORTRAN_TESTS_BINARY_DIR}/static/tf_gen.F90
 
     # normal distribution
     tf.F90
 )
 set_source_files_properties (${HDF5_F90_TF_SOURCES} PROPERTIES LANGUAGE Fortran)
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (BUILD_SHARED_LIBS)
   set (HDF5_F90_TF_SOURCES_SHARED
       # generated file
-      ${HDF5_F90_BINARY_DIR}/shared/tf_gen.F90
+      ${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared/tf_gen.F90
 
       # normal distribution
       tf.F90
@@ -150,7 +141,7 @@ if (WIN32)
 endif ()
 add_dependencies(${HDF5_F90_TEST_LIB_TARGET} H5testgen)
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (BUILD_SHARED_LIBS)
   add_library (${HDF5_F90_TEST_LIBSH_TARGET} SHARED ${HDF5_F90_TF_SOURCES_SHARED})
   set (SHARED_LINK_FLAGS " ")
   if (WIN32 AND MSVC)
@@ -202,7 +193,6 @@ add_executable (testhdf5_fortran
     tH5Z.F90
     tHDF5.F90
 )
-TARGET_NAMING (testhdf5_fortran STATIC)
 TARGET_FORTRAN_PROPERTIES (testhdf5_fortran STATIC " " " ")
 target_link_libraries (testhdf5_fortran
     ${HDF5_F90_TEST_LIB_TARGET}
@@ -220,7 +210,7 @@ set_target_properties (testhdf5_fortran PROPERTIES
 )
 add_dependencies (testhdf5_fortran ${HDF5_F90_TEST_LIB_TARGET})
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (BUILD_SHARED_LIBS)
   add_executable (testhdf5_fortran-shared
       fortranlib_test.F90
       tH5A.F90
@@ -238,7 +228,6 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
       tH5Z.F90
       tHDF5.F90
   )
-  TARGET_NAMING (testhdf5_fortran-shared SHARED)
   TARGET_FORTRAN_PROPERTIES (testhdf5_fortran-shared SHARED " " " ")
   target_link_libraries (testhdf5_fortran-shared
       ${HDF5_F90_TEST_LIBSH_TARGET}
@@ -266,7 +255,6 @@ add_executable (testhdf5_fortran_1_8
     tH5MISC_1_8.F90
     tHDF5_1_8.F90
 )
-TARGET_NAMING (testhdf5_fortran_1_8 STATIC)
 TARGET_FORTRAN_PROPERTIES (testhdf5_fortran_1_8 STATIC " " " ")
 target_link_libraries (testhdf5_fortran_1_8
     ${HDF5_F90_TEST_LIB_TARGET}
@@ -284,7 +272,7 @@ set_target_properties (testhdf5_fortran_1_8 PROPERTIES
 )
 add_dependencies (testhdf5_fortran_1_8 ${HDF5_F90_TEST_LIB_TARGET})
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (BUILD_SHARED_LIBS)
   add_executable (testhdf5_fortran_1_8-shared
       fortranlib_test_1_8.F90
       tH5O.F90
@@ -293,7 +281,6 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
       tH5MISC_1_8.F90
       tHDF5_1_8.F90
   )
-  TARGET_NAMING (testhdf5_fortran_1_8-shared SHARED)
   TARGET_FORTRAN_PROPERTIES (testhdf5_fortran_1_8-shared SHARED " " " ")
   target_link_libraries (testhdf5_fortran_1_8-shared
       ${HDF5_F90_TEST_LIBSH_TARGET}
@@ -323,7 +310,6 @@ add_executable (fortranlib_test_F03
     tH5T_F03.F90
     tHDF5_F03.F90
 )
-TARGET_NAMING (fortranlib_test_F03 STATIC)
 TARGET_FORTRAN_PROPERTIES (fortranlib_test_F03 STATIC " " " ")
 target_link_libraries (fortranlib_test_F03
     ${HDF5_F90_TEST_LIB_TARGET}
@@ -341,7 +327,7 @@ set_target_properties (fortranlib_test_F03 PROPERTIES
 )
 add_dependencies (fortranlib_test_F03 ${HDF5_F90_TEST_LIB_TARGET})
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (BUILD_SHARED_LIBS)
   add_executable (fortranlib_test_F03-shared
       fortranlib_test_F03.F90
       tH5E_F03.F90
@@ -352,7 +338,6 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
       tH5T_F03.F90
       tHDF5_F03.F90
   )
-  TARGET_NAMING (fortranlib_test_F03-shared SHARED)
   TARGET_FORTRAN_PROPERTIES (fortranlib_test_F03-shared SHARED " " " ")
   target_link_libraries (fortranlib_test_F03-shared
       ${HDF5_F90_TEST_LIBSH_TARGET}
@@ -374,7 +359,6 @@ endif ()
 
 #-- Adding test for fflush1
 add_executable (fflush1 fflush1.F90)
-TARGET_NAMING (fflush1 STATIC)
 TARGET_FORTRAN_PROPERTIES (fflush1 STATIC " " " ")
 target_link_libraries (fflush1
     ${HDF5_F90_LIB_TARGET}
@@ -392,9 +376,8 @@ set_target_properties (fflush1 PROPERTIES
 )
 add_dependencies (fflush1 ${HDF5_F90_TEST_LIB_TARGET})
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (BUILD_SHARED_LIBS)
   add_executable (fflush1-shared fflush1.F90)
-  TARGET_NAMING (fflush1-shared SHARED)
   TARGET_FORTRAN_PROPERTIES (fflush1-shared SHARED " " " ")
   target_link_libraries (fflush1-shared
       ${HDF5_F90_LIBSH_TARGET}
@@ -415,7 +398,6 @@ endif ()
 
 #-- Adding test for fflush2
 add_executable (fflush2 fflush2.F90)
-TARGET_NAMING (fflush2 STATIC)
 TARGET_FORTRAN_PROPERTIES (fflush2 STATIC " " " ")
 target_link_libraries (fflush2
     ${HDF5_F90_TEST_LIB_TARGET}
@@ -433,9 +415,8 @@ set_target_properties (fflush2 PROPERTIES
 )
 add_dependencies (fflush2 ${HDF5_F90_TEST_LIB_TARGET})
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (BUILD_SHARED_LIBS)
   add_executable (fflush2-shared fflush2.F90)
-  TARGET_NAMING (fflush2-shared SHARED)
   TARGET_FORTRAN_PROPERTIES (fflush2-shared SHARED " " " ")
   target_link_libraries (fflush2-shared
       ${HDF5_F90_TEST_LIBSH_TARGET}
diff --git a/fortran/test/CMakeTests.cmake b/fortran/test/CMakeTests.cmake
index e171e7c..4d06359 100644
--- a/fortran/test/CMakeTests.cmake
+++ b/fortran/test/CMakeTests.cmake
@@ -132,7 +132,7 @@ set_tests_properties (FORTRAN_fflush1 PROPERTIES DEPENDS FORTRAN_testhdf5-clear-
 add_test (NAME FORTRAN_fflush2 COMMAND $<TARGET_FILE:fflush2>)
 set_tests_properties (FORTRAN_fflush2 PROPERTIES DEPENDS FORTRAN_fflush1)
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (BUILD_SHARED_LIBS)
   add_test (
     NAME FORTRAN_testhdf5-shared-clear-objects
     COMMAND    ${CMAKE_COMMAND}
diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt
index 4aa7f43..979d305 100644
--- a/fortran/testpar/CMakeLists.txt
+++ b/fortran/testpar/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_FORTRAN_TESTPAR C CXX Fortran)
 
 #-----------------------------------------------------------------------------
@@ -16,7 +16,6 @@ add_executable (parallel_test
     hyper.f90
     mdset.f90
 )
-TARGET_NAMING (parallel_test STATIC)
 TARGET_FORTRAN_PROPERTIES (parallel_test STATIC " " " ")
 target_link_libraries (parallel_test
     ${HDF5_F90_TEST_LIB_TARGET}