removed duplicate exports of DS subroutines

added missing parameter

added missing parameter

removed parameters

moved dll export to Module

clean-up

3 files changed, 340 insertions, 406 deletions

diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
index 9054522..078778a 100644
--- a/fortran/src/H5f90global.F90
+++ b/fortran/src/H5f90global.F90
@@ -70,16 +70,10 @@ MODULE H5GLOBAL
      INTEGER, DIMENSION(1:REF_REG_BUF_LEN) :: ref
   END TYPE hdset_reg_ref_t_f
 
-  ! Do not forget to change this value when new predefined
+  ! Do not forget to change these values when new predefined
   ! datatypes are added
   INTEGER, PARAMETER :: PREDEF_TYPES_LEN = 19
-
-  ! Do not forget to change the following line when new predefined
-  ! floating data types are added
   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
 
   ! These arrays need to be global because they are used in 
@@ -88,7 +82,56 @@ MODULE H5GLOBAL
   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
@@ -142,6 +185,19 @@ MODULE H5GLOBAL
   !
   ! H5generic flags declaration
   !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !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
+  
   INTEGER :: H5_INDEX_UNKNOWN_F
   INTEGER :: H5_INDEX_NAME_F
   INTEGER :: H5_INDEX_CRT_ORDER_F
@@ -156,6 +212,28 @@ MODULE H5GLOBAL
   !
   ! H5F flags declaration
   !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !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
+  
   INTEGER :: H5F_ACC_RDWR_F
   INTEGER :: H5F_ACC_RDONLY_F
   INTEGER :: H5F_ACC_TRUNC_F
@@ -178,6 +256,23 @@ MODULE H5GLOBAL
   !
   ! H5G flags declaration
   !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !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
+  
   INTEGER :: H5G_UNKNOWN_F
   INTEGER :: H5G_GROUP_F
   INTEGER :: H5G_DATASET_F
@@ -195,6 +290,40 @@ MODULE H5GLOBAL
   !
   ! H5D flags declaration
   !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !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
+  
   INTEGER :: H5D_COMPACT_F
   INTEGER :: H5D_CONTIGUOUS_F
   INTEGER :: H5D_CHUNKED_F
@@ -219,11 +348,11 @@ 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
 
@@ -240,6 +369,14 @@ MODULE H5GLOBAL
   !
   ! H5E flags declaration
   !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !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
+
   INTEGER(HID_T) :: H5E_DEFAULT_F
   INTEGER :: H5E_MAJOR_F
   INTEGER :: H5E_MINOR_F
@@ -248,6 +385,27 @@ MODULE H5GLOBAL
   !
   ! H5FD file drivers flags declaration
   !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !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
+
   INTEGER :: H5FD_MPIO_INDEPENDENT_F
   INTEGER :: H5FD_MPIO_COLLECTIVE_F
   INTEGER :: H5FD_MEM_NOLIST_F
@@ -269,6 +427,16 @@ MODULE H5GLOBAL
   !
   ! H5I flags declaration
   !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !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
+
   INTEGER ::  H5I_FILE_F
   INTEGER ::  H5I_GROUP_F
   INTEGER ::  H5I_DATATYPE_F
@@ -279,6 +447,15 @@ MODULE H5GLOBAL
   !
   ! H5L flags declaration
   !
+  !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
@@ -288,6 +465,36 @@ MODULE H5GLOBAL
   !
   ! H5O flags declaration
   !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !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
+  
   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
@@ -318,6 +525,29 @@ MODULE H5GLOBAL
   !
   ! H5P flags declaration
   !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !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
+
   INTEGER(HID_T) :: H5P_FILE_CREATE_F
   INTEGER(HID_T) :: H5P_FILE_ACCESS_F
   INTEGER(HID_T) :: H5P_DATASET_CREATE_F
@@ -342,11 +572,39 @@ MODULE H5GLOBAL
   !
   ! H5R flags declaration
   !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5R_OBJECT_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5R_DATASET_REGION_F
+  !DEC$endif
+
   INTEGER :: H5R_OBJECT_F
   INTEGER :: H5R_DATASET_REGION_F
   !
   ! H5S flags declaration
   !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !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
+  
   INTEGER(HSIZE_T) :: H5S_UNLIMITED_F
 
   INTEGER(HID_T) :: H5S_ALL_F
@@ -374,6 +632,44 @@ MODULE H5GLOBAL
   !
   ! H5T flags declaration
   !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !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
+
   INTEGER :: H5T_NO_CLASS_F
   INTEGER :: H5T_INTEGER_F
   INTEGER :: H5T_FLOAT_F
@@ -412,6 +708,29 @@ MODULE H5GLOBAL
   !
   ! H5Z flags declaration
   !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !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
+
   INTEGER :: H5Z_FILTER_ERROR_F
   INTEGER :: H5Z_FILTER_NONE_F
   INTEGER :: H5Z_FILTER_ALL_F
@@ -435,6 +754,11 @@ MODULE H5GLOBAL
   !
   ! H5 Library flags declaration
   !
+  !DEC$if defined(BUILD_HDF5_DLL)
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_SZIP_EC_OM_F
+  !DEC$ATTRIBUTES DLLEXPORT :: H5_SZIP_NN_OM_F
+  !DEC$endif
+
   INTEGER :: H5_SZIP_EC_OM_F
   INTEGER :: H5_SZIP_NN_OM_F
 
diff --git a/fortran/src/hdf5_fortrandll.def.in b/fortran/src/hdf5_fortrandll.def.in
index 585602f..3a5a91f 100644
--- a/fortran/src/hdf5_fortrandll.def.in
+++ b/fortran/src/hdf5_fortrandll.def.in
@@ -1,335 +1,4 @@
 EXPORTS
-; H5GLOBAL
-H5GLOBAL_mp_H5T_NATIVE_REAL_C_FLOAT
-H5GLOBAL_mp_H5T_NATIVE_REAL_C_DOUBLE
-H5GLOBAL_mp_H5T_NATIVE_REAL_C_LONG_DOUBLE
-H5GLOBAL_mp_H5T_NATIVE_INTEGER
-H5GLOBAL_mp_H5T_NATIVE_REAL
-H5GLOBAL_mp_H5T_NATIVE_DOUBLE
-H5GLOBAL_mp_H5T_NATIVE_CHARACTER 
-H5GLOBAL_mp_H5T_STD_REF_OBJ
-H5GLOBAL_mp_H5T_STD_REF_DSETREG
-H5GLOBAL_mp_H5T_IEEE_F32BE
-H5GLOBAL_mp_H5T_IEEE_F32LE
-H5GLOBAL_mp_H5T_IEEE_F64BE
-H5GLOBAL_mp_H5T_IEEE_F64LE
-H5GLOBAL_mp_H5T_STD_I8BE
-H5GLOBAL_mp_H5T_STD_I8LE
-H5GLOBAL_mp_H5T_STD_I16BE
-H5GLOBAL_mp_H5T_STD_I16LE
-H5GLOBAL_mp_H5T_STD_I32BE
-H5GLOBAL_mp_H5T_STD_I32LE
-H5GLOBAL_mp_H5T_STD_I64BE
-H5GLOBAL_mp_H5T_STD_I64LE
-H5GLOBAL_mp_H5T_STD_U8BE
-H5GLOBAL_mp_H5T_STD_U8LE
-H5GLOBAL_mp_H5T_STD_U16BE
-H5GLOBAL_mp_H5T_STD_U16LE
-H5GLOBAL_mp_H5T_STD_U32BE
-H5GLOBAL_mp_H5T_STD_U32LE
-H5GLOBAL_mp_H5T_STD_U64BE
-H5GLOBAL_mp_H5T_STD_U64LE
-H5GLOBAL_mp_H5T_STRING
-H5GLOBAL_mp_H5T_STD_B8BE
-H5GLOBAL_mp_H5T_STD_B8LE
-H5GLOBAL_mp_H5T_STD_B16BE
-H5GLOBAL_mp_H5T_STD_B16LE
-H5GLOBAL_mp_H5T_STD_B32BE
-H5GLOBAL_mp_H5T_STD_B32LE
-H5GLOBAL_mp_H5T_STD_B64BE
-H5GLOBAL_mp_H5T_STD_B64LE
-H5GLOBAL_mp_H5T_NATIVE_B8
-H5GLOBAL_mp_H5T_NATIVE_B16
-H5GLOBAL_mp_H5T_NATIVE_B32
-H5GLOBAL_mp_H5T_NATIVE_B64
-H5GLOBAL_mp_H5T_FORTRAN_S1
-H5GLOBAL_mp_H5T_C_S1
-H5GLOBAL_mp_H5T_NATIVE_FLOAT_128
-;
-; H5generic flags declaration
-;
-H5GLOBAL_mp_H5_INDEX_UNKNOWN_F
-H5GLOBAL_mp_H5_INDEX_NAME_F
-H5GLOBAL_mp_H5_INDEX_CRT_ORDER_F
-H5GLOBAL_mp_H5_INDEX_N_F
-H5GLOBAL_mp_H5_ITER_UNKNOWN_F
-H5GLOBAL_mp_H5_ITER_INC_F
-H5GLOBAL_mp_H5_ITER_DEC_F
-H5GLOBAL_mp_H5_ITER_NATIVE_F
-H5GLOBAL_mp_H5_ITER_N_F
-H5GLOBAL_mp_HADDR_UNDEF_F
-;
-; H5F flags declaration
-;
-H5GLOBAL_mp_H5F_ACC_RDWR_F
-H5GLOBAL_mp_H5F_ACC_RDONLY_F
-H5GLOBAL_mp_H5F_ACC_TRUNC_F
-H5GLOBAL_mp_H5F_ACC_EXCL_F
-H5GLOBAL_mp_H5F_ACC_DEBUG_F
-H5GLOBAL_mp_H5F_SCOPE_LOCAL_F
-H5GLOBAL_mp_H5F_SCOPE_GLOBAL_F
-H5GLOBAL_mp_H5F_CLOSE_DEFAULT_F
-H5GLOBAL_mp_H5F_CLOSE_WEAK_F
-H5GLOBAL_mp_H5F_CLOSE_SEMI_F
-H5GLOBAL_mp_H5F_CLOSE_STRONG_F
-H5GLOBAL_mp_H5F_OBJ_FILE_F
-H5GLOBAL_mp_H5F_OBJ_DATASET_F
-H5GLOBAL_mp_H5F_OBJ_GROUP_F
-H5GLOBAL_mp_H5F_OBJ_DATATYPE_F
-H5GLOBAL_mp_H5F_OBJ_ALL_F
-H5GLOBAL_mp_H5F_LIBVER_EARLIEST_F
-H5GLOBAL_mp_H5F_LIBVER_LATEST_F
-H5GLOBAL_mp_H5F_UNLIMITED_F
-;
-; H5G flags declaration
-;
-H5GLOBAL_mp_H5G_UNKNOWN_F
-H5GLOBAL_mp_H5G_GROUP_F
-H5GLOBAL_mp_H5G_DATASET_F
-H5GLOBAL_mp_H5G_TYPE_F
-H5GLOBAL_mp_H5G_LINK_F
-H5GLOBAL_mp_H5G_UDLINK_F
-H5GLOBAL_mp_H5G_SAME_LOC_F
-H5GLOBAL_mp_H5G_LINK_ERROR_F
-H5GLOBAL_mp_H5G_LINK_HARD_F
-H5GLOBAL_mp_H5G_LINK_SOFT_F
-H5GLOBAL_mp_H5G_STORAGE_TYPE_UNKNOWN_F
-H5GLOBAL_mp_H5G_STORAGE_TYPE_SYMBOL_TABLE_F
-H5GLOBAL_mp_H5G_STORAGE_TYPE_COMPACT_F
-H5GLOBAL_mp_H5G_STORAGE_TYPE_DENSE_F
-;
-; H5D flags declaration
-;
-H5GLOBAL_mp_H5D_COMPACT_F
-H5GLOBAL_mp_H5D_CONTIGUOUS_F
-H5GLOBAL_mp_H5D_CHUNKED_F
-H5GLOBAL_mp_H5D_ALLOC_TIME_ERROR_F
-H5GLOBAL_mp_H5D_ALLOC_TIME_DEFAULT_F
-H5GLOBAL_mp_H5D_ALLOC_TIME_EARLY_F
-H5GLOBAL_mp_H5D_ALLOC_TIME_LATE_F
-H5GLOBAL_mp_H5D_ALLOC_TIME_INCR_F
-H5GLOBAL_mp_H5D_SPACE_STS_ERROR_F
-H5GLOBAL_mp_H5D_SPACE_STS_NOT_ALLOCATED_F
-H5GLOBAL_mp_H5D_SPACE_STS_PART_ALLOCATED_F
-H5GLOBAL_mp_H5D_SPACE_STS_ALLOCATED_F
-H5GLOBAL_mp_H5D_FILL_TIME_ERROR_F
-H5GLOBAL_mp_H5D_FILL_TIME_ALLOC_F
-H5GLOBAL_mp_H5D_FILL_TIME_NEVER_F
-H5GLOBAL_mp_H5D_FILL_VALUE_ERROR_F
-H5GLOBAL_mp_H5D_FILL_VALUE_UNDEFINED_F
-H5GLOBAL_mp_H5D_FILL_VALUE_DEFAULT_F
-H5GLOBAL_mp_H5D_FILL_VALUE_USER_DEFINED_F
-H5GLOBAL_mp_H5D_CHUNK_CACHE_NSLOTS_DFLT_F
-H5GLOBAL_mp_H5D_CHUNK_CACHE_NBYTES_DFLT_F
-H5GLOBAL_mp_H5D_CHUNK_CACHE_W0_DFLT_F
-H5GLOBAL_mp_H5D_MPIO_NO_COLLECTIVE_F
-H5GLOBAL_mp_H5D_MPIO_CHUNK_INDEPENDENT_F
-H5GLOBAL_mp_H5D_MPIO_CHUNK_COLLECTIVE_F
-H5GLOBAL_mp_H5D_MPIO_CHUNK_MIXED_F
-H5GLOBAL_mp_H5D_MPIO_CONTIG_COLLECTIVE_F
-H5GLOBAL_mp_H5D_VDS_ERROR_F
-H5GLOBAL_mp_H5D_VDS_FIRST_MISSING_F
-H5GLOBAL_mp_H5D_VDS_LAST_AVAILABLE_F
-H5GLOBAL_mp_H5D_VIRTUAL_F
-;
-; H5E flags declaration
-;
-H5GLOBAL_mp_H5E_DEFAULT_F
-H5GLOBAL_mp_H5E_MAJOR_F
-H5GLOBAL_mp_H5E_MINOR_F
-H5GLOBAL_mp_H5E_WALK_UPWARD_F
-H5GLOBAL_mp_H5E_WALK_DOWNWARD_F
-;
-; H5FD file drivers flags declaration
-;
-H5GLOBAL_mp_H5FD_MPIO_INDEPENDENT_F
-H5GLOBAL_mp_H5FD_MPIO_COLLECTIVE_F
-H5GLOBAL_mp_H5FD_MEM_NOLIST_F
-H5GLOBAL_mp_H5FD_MEM_DEFAULT_F
-H5GLOBAL_mp_H5FD_MEM_SUPER_F
-H5GLOBAL_mp_H5FD_MEM_BTREE_F
-H5GLOBAL_mp_H5FD_MEM_DRAW_F
-H5GLOBAL_mp_H5FD_MEM_GHEAP_F
-H5GLOBAL_mp_H5FD_MEM_LHEAP_F
-H5GLOBAL_mp_H5FD_MEM_OHDR_F
-H5GLOBAL_mp_H5FD_MEM_NTYPES_F
-H5GLOBAL_mp_H5FD_CORE_F
-H5GLOBAL_mp_H5FD_FAMILY_F
-H5GLOBAL_mp_H5FD_LOG_F
-H5GLOBAL_mp_H5FD_MPIO_F
-H5GLOBAL_mp_H5FD_MULTI_F
-H5GLOBAL_mp_H5FD_SEC2_F
-H5GLOBAL_mp_H5FD_STDIO_F
-;
-; H5I flags declaration
-;
-H5GLOBAL_mp_H5I_FILE_F
-H5GLOBAL_mp_H5I_GROUP_F
-H5GLOBAL_mp_H5I_DATATYPE_F
-H5GLOBAL_mp_H5I_DATASPACE_F
-H5GLOBAL_mp_H5I_DATASET_F
-H5GLOBAL_mp_H5I_ATTR_F
-H5GLOBAL_mp_H5I_BADID_F
-;
-; H5L flags declaration
-;
-H5GLOBAL_mp_H5L_TYPE_ERROR_F
-H5GLOBAL_mp_H5L_TYPE_HARD_F
-H5GLOBAL_mp_H5L_TYPE_SOFT_F
-H5GLOBAL_mp_H5L_TYPE_EXTERNAL_F
-H5GLOBAL_mp_H5L_SAME_LOC_F
-H5GLOBAL_mp_H5L_LINK_CLASS_T_VERS_F
-;
-; H5O flags declaration
-;
-H5GLOBAL_mp_H5O_COPY_SHALLOW_HIERARCHY_F
-H5GLOBAL_mp_H5O_COPY_EXPAND_SOFT_LINK_F
-H5GLOBAL_mp_H5O_COPY_EXPAND_EXT_LINK_F
-H5GLOBAL_mp_H5O_COPY_EXPAND_REFERENCE_F
-H5GLOBAL_mp_H5O_COPY_WITHOUT_ATTR_FLAG_F
-H5GLOBAL_mp_H5O_COPY_PRESERVE_NULL_FLAG_F
-H5GLOBAL_mp_H5O_COPY_ALL_F
-H5GLOBAL_mp_H5O_SHMESG_NONE_FLAG_F
-H5GLOBAL_mp_H5O_SHMESG_SDSPACE_FLAG_F
-H5GLOBAL_mp_H5O_SHMESG_DTYPE_FLAG_F
-H5GLOBAL_mp_H5O_SHMESG_FILL_FLAG_F
-H5GLOBAL_mp_H5O_SHMESG_PLINE_FLAG_F
-H5GLOBAL_mp_H5O_SHMESG_ATTR_FLAG_F
-H5GLOBAL_mp_H5O_SHMESG_ALL_FLAG_F
-H5GLOBAL_mp_H5O_HDR_CHUNK0_SIZE_F
-H5GLOBAL_mp_H5O_HDR_ATTR_CRT_ORDER_TRACK_F
-H5GLOBAL_mp_H5O_HDR_ATTR_CRT_ORDER_INDEX_F
-H5GLOBAL_mp_H5O_HDR_ATTR_STORE_PHASE_CHA_F
-H5GLOBAL_mp_H5O_HDR_STORE_TIMES_F
-H5GLOBAL_mp_H5O_HDR_ALL_FLAGS_F
-H5GLOBAL_mp_H5O_SHMESG_MAX_NINDEXES_F
-H5GLOBAL_mp_H5O_SHMESG_MAX_LIST_SIZE_F
-H5GLOBAL_mp_H5O_TYPE_UNKNOWN_F
-H5GLOBAL_mp_H5O_TYPE_GROUP_F
-H5GLOBAL_mp_H5O_TYPE_DATASET_F
-H5GLOBAL_mp_H5O_TYPE_NAMED_DATATYPE_F
-H5GLOBAL_mp_H5O_TYPE_NTYPES_F
-;
-; H5P flags declaration
-;
-H5GLOBAL_mp_H5P_FILE_CREATE_F
-H5GLOBAL_mp_H5P_FILE_ACCESS_F
-H5GLOBAL_mp_H5P_DATASET_CREATE_F
-H5GLOBAL_mp_H5P_DATASET_XFER_F
-H5GLOBAL_mp_H5P_FILE_MOUNT_F
-H5GLOBAL_mp_H5P_DEFAULT_F
-H5GLOBAL_mp_H5P_ROOT_F
-H5GLOBAL_mp_H5P_OBJECT_CREATE_F
-H5GLOBAL_mp_H5P_DATASET_ACCESS_F
-H5GLOBAL_mp_H5P_GROUP_CREATE_F
-H5GLOBAL_mp_H5P_GROUP_ACCESS_F
-H5GLOBAL_mp_H5P_DATATYPE_CREATE_F
-H5GLOBAL_mp_H5P_DATATYPE_ACCESS_F
-H5GLOBAL_mp_H5P_STRING_CREATE_F
-H5GLOBAL_mp_H5P_ATTRIBUTE_CREATE_F
-H5GLOBAL_mp_H5P_OBJECT_COPY_F
-H5GLOBAL_mp_H5P_LINK_CREATE_F
-H5GLOBAL_mp_H5P_LINK_ACCESS_F
-H5GLOBAL_mp_H5P_CRT_ORDER_INDEXED_F
-H5GLOBAL_mp_H5P_CRT_ORDER_TRACKED_F
-;
-; H5R flags declaration
-;
-H5GLOBAL_mp_H5R_OBJECT_F
-H5GLOBAL_mp_H5R_DATASET_REGION_F
-;
-; H5S flags declaration
-;
-H5GLOBAL_mp_H5S_UNLIMITED_F
-H5GLOBAL_mp_H5S_ALL_F
-H5GLOBAL_mp_H5S_SCALAR_F
-H5GLOBAL_mp_H5S_SIMPLE_F
-H5GLOBAL_mp_H5S_NULL_F
-H5GLOBAL_mp_H5S_SELECT_NOOP_F
-H5GLOBAL_mp_H5S_SELECT_SET_F
-H5GLOBAL_mp_H5S_SELECT_OR_F
-H5GLOBAL_mp_H5S_SELECT_AND_F
-H5GLOBAL_mp_H5S_SELECT_XOR_F
-H5GLOBAL_mp_H5S_SELECT_NOTB_F
-H5GLOBAL_mp_H5S_SELECT_NOTA_F
-H5GLOBAL_mp_H5S_SELECT_APPEND_F
-H5GLOBAL_mp_H5S_SELECT_PREPEND_F
-H5GLOBAL_mp_H5S_SELECT_INVALID_F
-H5GLOBAL_mp_H5S_SEL_ERROR_F
-H5GLOBAL_mp_H5S_SEL_NONE_F
-H5GLOBAL_mp_H5S_SEL_POINTS_F
-H5GLOBAL_mp_H5S_SEL_HYPERSLABS_F
-H5GLOBAL_mp_H5S_SEL_ALL_F
-;
-; H5T flags declaration
-;
-H5GLOBAL_mp_H5T_NO_CLASS_F
-H5GLOBAL_mp_H5T_INTEGER_F
-H5GLOBAL_mp_H5T_FLOAT_F
-H5GLOBAL_mp_H5T_TIME_F
-H5GLOBAL_mp_H5T_STRING_F
-H5GLOBAL_mp_H5T_BITFIELD_F
-H5GLOBAL_mp_H5T_OPAQUE_F
-H5GLOBAL_mp_H5T_COMPOUND_F
-H5GLOBAL_mp_H5T_REFERENCE_F
-H5GLOBAL_mp_H5T_ENUM_F
-H5GLOBAL_mp_H5T_VLEN_F
-H5GLOBAL_mp_H5T_ARRAY_F
-H5GLOBAL_mp_H5T_ORDER_LE_F
-H5GLOBAL_mp_H5T_ORDER_BE_F
-H5GLOBAL_mp_H5T_ORDER_VAX_F
-H5GLOBAL_mp_H5T_ORDER_NONE_F
-H5GLOBAL_mp_H5T_ORDER_MIXED_F
-H5GLOBAL_mp_H5T_PAD_ZERO_F
-H5GLOBAL_mp_H5T_PAD_ONE_F
-H5GLOBAL_mp_H5T_PAD_BACKGROUND_F
-H5GLOBAL_mp_H5T_PAD_ERROR_F
-H5GLOBAL_mp_H5T_SGN_NONE_F
-H5GLOBAL_mp_H5T_SGN_2_F
-H5GLOBAL_mp_H5T_SGN_ERROR_F
-H5GLOBAL_mp_H5T_NORM_IMPLIED_F
-H5GLOBAL_mp_H5T_NORM_MSBSET_F
-H5GLOBAL_mp_H5T_NORM_NONE_F
-H5GLOBAL_mp_H5T_CSET_ASCII_F
-H5GLOBAL_mp_H5T_CSET_UTF8_F
-H5GLOBAL_mp_H5T_STR_NULLTERM_F
-H5GLOBAL_mp_H5T_STR_NULLPAD_F
-H5GLOBAL_mp_H5T_STR_SPACEPAD_F
-H5GLOBAL_mp_H5T_STR_ERROR_F
-H5GLOBAL_mp_H5T_DIR_ASCEND_F
-H5GLOBAL_mp_H5T_DIR_DESCEND_F
-;
-; H5Z flags declaration
-;
-H5GLOBAL_mp_H5Z_FILTER_ERROR_F
-H5GLOBAL_mp_H5Z_FILTER_NONE_F
-H5GLOBAL_mp_H5Z_FILTER_ALL_F
-H5GLOBAL_mp_H5Z_FILTER_DEFLATE_F
-H5GLOBAL_mp_H5Z_FILTER_SHUFFLE_F
-H5GLOBAL_mp_H5Z_FILTER_FLETCHER32_F
-H5GLOBAL_mp_H5Z_FILTER_SZIP_F
-H5GLOBAL_mp_H5Z_ERROR_EDC_F
-H5GLOBAL_mp_H5Z_DISABLE_EDC_F
-H5GLOBAL_mp_H5Z_ENABLE_EDC_F
-H5GLOBAL_mp_H5Z_NO_EDC_F
-H5GLOBAL_mp_H5Z_FLAG_OPTIONAL_F
-H5GLOBAL_mp_H5Z_FILTER_ENCODE_ENABLED_F
-H5GLOBAL_mp_H5Z_FILTER_DECODE_ENABLED_F
-H5GLOBAL_mp_H5Z_FILTER_NBIT_F
-H5GLOBAL_mp_H5Z_FILTER_SCALEOFFSET_F
-H5GLOBAL_mp_H5Z_SO_FLOAT_DSCALE_F
-H5GLOBAL_mp_H5Z_SO_FLOAT_ESCALE_F
-H5GLOBAL_mp_H5Z_SO_INT_F
-H5GLOBAL_mp_H5Z_SO_INT_MINBITS_DEFAULT_F
-;
-; H5 Library flags declaration
-;
-H5GLOBAL_mp_H5_SZIP_EC_OM_F
-H5GLOBAL_mp_H5_SZIP_NN_OM_F
-;
-; PROCEDURES
-; --------------
-;
 ; H5LIB
 H5LIB_mp_H5OPEN_F
 H5LIB_mp_H5CLOSE_F
diff --git a/hl/fortran/src/H5DSff.F90 b/hl/fortran/src/H5DSff.F90
index 4f0d040..2dca479 100644
--- a/hl/fortran/src/H5DSff.F90
+++ b/hl/fortran/src/H5DSff.F90
@@ -44,13 +44,6 @@ CONTAINS
 
     IMPLICIT NONE
 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsset_scale_f
-!DEC$endif
-!
-
     INTEGER(hid_t),   INTENT(in) :: dsid               ! The dataset to be made a Dimension Scale
     CHARACTER(LEN=*), INTENT(in), OPTIONAL :: dimname  ! The dimension name
     INTEGER :: errcode                                 ! Error code
@@ -99,12 +92,6 @@ CONTAINS
 
     IMPLICIT NONE
 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsattach_scale_f
-!DEC$endif
-!
     INTEGER(hid_t), INTENT(in) :: did     ! the dataset
     INTEGER(hid_t), INTENT(in) :: dsid    ! the scale to be attached 
     INTEGER       , INTENT(in) :: idx     ! the dimension of did that dsid is associated with.
@@ -148,13 +135,7 @@ CONTAINS
   SUBROUTINE H5DSdetach_scale_f( did, dsid, idx, errcode)
     
     IMPLICIT NONE
-    
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsdetach_scale_f
-!DEC$endif
-!
+
     INTEGER(hid_t), INTENT(in) :: did     ! the dataset
     INTEGER(hid_t), INTENT(in) :: dsid    ! the scale to be detached 
     INTEGER       , INTENT(in) :: idx     ! the dimension of did to detach
@@ -199,13 +180,7 @@ CONTAINS
   SUBROUTINE H5DSis_attached_f( did, dsid, idx, is_attached, errcode)
     
     IMPLICIT NONE
-    
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsis_attached_f
-!DEC$endif
-!
+
     INTEGER(hid_t), INTENT(in)  :: did         ! the dataset
     INTEGER(hid_t), INTENT(in)  :: dsid        ! the scale to be attached
     INTEGER       , INTENT(in)  :: idx         ! the dimension of did that dsid is associated with
@@ -264,13 +239,7 @@ CONTAINS
   SUBROUTINE H5DSis_scale_f( did, is_scale, errcode)
     
     IMPLICIT NONE
-    
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsis_scale_f
-!DEC$endif
-!
+
     INTEGER(hid_t), INTENT(in)  :: did         ! the data set to query
     LOGICAL       , INTENT(out) :: is_scale    ! logical:  
                                                ! .TRUE. if did is a Dimension Scale
@@ -319,13 +288,6 @@ CONTAINS
 
     IMPLICIT NONE
 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsset_label_f
-!DEC$endif
-!
-
     INTEGER(hid_t),   INTENT(in) :: did    ! The dataset
     INTEGER       ,   INTENT(in) :: idx    ! The dimension
     CHARACTER(LEN=*), INTENT(in) :: label  ! The label
@@ -375,13 +337,6 @@ CONTAINS
 
     IMPLICIT NONE
 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsget_label_f
-!DEC$endif
-!
-
     INTEGER(hid_t),   INTENT(in) :: did     ! The dataget
     INTEGER       ,   INTENT(in) :: idx     ! The dimension
     CHARACTER(LEN=*), INTENT(in) :: label   ! The label
@@ -430,13 +385,6 @@ CONTAINS
 
     IMPLICIT NONE
 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsget_scale_name_f
-!DEC$endif
-!
-
     INTEGER(hid_t),   INTENT(in) :: did     ! The dataget
     CHARACTER(LEN=*), INTENT(out) :: name   ! The name
     INTEGER(size_t) , INTENT(inout) :: size ! The length of the name buffer
@@ -478,13 +426,6 @@ CONTAINS
   SUBROUTINE H5DSget_num_scales_f( did, idx, num_scales, errcode)
 
     IMPLICIT NONE
-
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_HL_DLL)
-!DEC$attributes dllexport :: h5dsget_num_scales_f
-!DEC$endif
-!
     INTEGER(hid_t), INTENT(in)  :: did         ! the dataset
     INTEGER       , INTENT(in)  :: idx         ! the dimension of did to query
     INTEGER       , INTENT(out) :: num_scales  ! the number of Dimension Scales associated with did