[svn-r26836] added BIND(C) to H5T APIs

4 files changed, 1029 insertions, 1303 deletions

diff --git a/fortran/src/H5Off.F90 b/fortran/src/H5Off.F90
index 2ec4eeb..41ec394 100644
--- a/fortran/src/H5Off.F90
+++ b/fortran/src/H5Off.F90
@@ -38,7 +38,6 @@ MODULE H5O
 
   USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_FUNPTR, C_CHAR, C_INT64_T, C_LONG, C_INT, C_LOC
   USE H5GLOBAL
-
   IMPLICIT NONE
 
 !****t* H5T (F03)/h5o_info_t
diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c
index 7e1aa42..7103ca2 100644
--- a/fortran/src/H5Tf.c
+++ b/fortran/src/H5Tf.c
@@ -46,7 +46,7 @@
  * SOURCE
 */
 int_f
-nh5topen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *tapl_id)
+h5topen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *tapl_id)
 /******/
 {
     char *c_name = NULL;
@@ -101,7 +101,7 @@ done:
  * SOURCE
 */
 int_f
-nh5tcommit_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id,
+h5tcommit_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id,
 	     hid_t_f *lcpl_id, hid_t_f *tcpl_id, hid_t_f *tapl_id)
 /******/
 {
@@ -142,7 +142,7 @@ done:
 */
 
 int_f
-nh5tclose_c ( hid_t_f *type_id )
+h5tclose_c ( hid_t_f *type_id )
 /******/
 {
   int ret_value = 0;
@@ -174,7 +174,7 @@ nh5tclose_c ( hid_t_f *type_id )
 */
 
 int_f
-nh5tcopy_c ( hid_t_f *type_id , hid_t_f *new_type_id)
+h5tcopy_c ( hid_t_f *type_id , hid_t_f *new_type_id)
 /******/
 {
   int ret_value = 0;
@@ -209,7 +209,7 @@ nh5tcopy_c ( hid_t_f *type_id , hid_t_f *new_type_id)
 */
 
 int_f
-nh5tequal_c ( hid_t_f *type1_id , hid_t_f *type2_id, int_f *c_flag)
+h5tequal_c ( hid_t_f *type1_id , hid_t_f *type2_id, int_f *c_flag)
 /******/
 {
   int ret_value = -1;
@@ -257,7 +257,7 @@ nh5tequal_c ( hid_t_f *type1_id , hid_t_f *type2_id, int_f *c_flag)
 */
 
 int_f
-nh5tget_class_c ( hid_t_f *type_id , int_f *classtype)
+h5tget_class_c ( hid_t_f *type_id , int_f *classtype)
 /******/
 {
   int ret_value = 0;
@@ -310,7 +310,7 @@ nh5tget_class_c ( hid_t_f *type_id , int_f *classtype)
 */
 
 int_f
-nh5tget_order_c ( hid_t_f *type_id , int_f *order)
+h5tget_order_c ( hid_t_f *type_id , int_f *order)
 /******/
 {
   int ret_value = -1;
@@ -353,7 +353,7 @@ nh5tget_order_c ( hid_t_f *type_id , int_f *order)
 */
 
 int_f
-nh5tset_order_c ( hid_t_f *type_id , int_f *order)
+h5tset_order_c ( hid_t_f *type_id , int_f *order)
 /******/
 {
   int ret_value = 0;
@@ -392,7 +392,7 @@ nh5tset_order_c ( hid_t_f *type_id , int_f *order)
 */
 
 int_f
-nh5tget_size_c ( hid_t_f *type_id , size_t_f *size)
+h5tget_size_c ( hid_t_f *type_id , size_t_f *size)
 /******/
 {
   int ret_value = -1;
@@ -427,7 +427,7 @@ nh5tget_size_c ( hid_t_f *type_id , size_t_f *size)
 */
 
 int_f
-nh5tset_size_c ( hid_t_f *type_id , size_t_f *size)
+h5tset_size_c ( hid_t_f *type_id , size_t_f *size)
 /******/
 {
   int ret_value = -1;
@@ -463,7 +463,7 @@ nh5tset_size_c ( hid_t_f *type_id , size_t_f *size)
 */
 
 int_f
-nh5tget_precision_c ( hid_t_f *type_id , size_t_f *precision)
+h5tget_precision_c ( hid_t_f *type_id , size_t_f *precision)
 /******/
 {
   int ret_value = -1;
@@ -497,7 +497,7 @@ nh5tget_precision_c ( hid_t_f *type_id , size_t_f *precision)
 */
 
 int_f
-nh5tset_precision_c ( hid_t_f *type_id , size_t_f *precision)
+h5tset_precision_c ( hid_t_f *type_id , size_t_f *precision)
 /******/
 {
   int ret_value = -1;
@@ -534,7 +534,7 @@ nh5tset_precision_c ( hid_t_f *type_id , size_t_f *precision)
 */
 
 int_f
-nh5tget_offset_c ( hid_t_f *type_id , size_t_f *offset)
+h5tget_offset_c ( hid_t_f *type_id , size_t_f *offset)
 /******/
 {
   int ret_value = -1;
@@ -570,7 +570,7 @@ nh5tget_offset_c ( hid_t_f *type_id , size_t_f *offset)
 */
 
 int_f
-nh5tset_offset_c ( hid_t_f *type_id , size_t_f *offset)
+h5tset_offset_c ( hid_t_f *type_id , size_t_f *offset)
 /******/
 {
   int ret_value = -1;
@@ -609,7 +609,7 @@ nh5tset_offset_c ( hid_t_f *type_id , size_t_f *offset)
 */
 
 int_f
-nh5tget_pad_c ( hid_t_f *type_id , int_f * lsbpad, int_f * msbpad)
+h5tget_pad_c ( hid_t_f *type_id , int_f * lsbpad, int_f * msbpad)
 /******/
 {
   int ret_value = -1;
@@ -651,7 +651,7 @@ nh5tget_pad_c ( hid_t_f *type_id , int_f * lsbpad, int_f * msbpad)
 */
 
 int_f
-nh5tset_pad_c ( hid_t_f *type_id, int_f * lsbpad, int_f* msbpad )
+h5tset_pad_c ( hid_t_f *type_id, int_f * lsbpad, int_f* msbpad )
 /******/
 {
   int ret_value = -1;
@@ -688,7 +688,7 @@ nh5tset_pad_c ( hid_t_f *type_id, int_f * lsbpad, int_f* msbpad )
 */
 
 int_f
-nh5tget_sign_c ( hid_t_f *type_id , int_f *sign)
+h5tget_sign_c ( hid_t_f *type_id , int_f *sign)
 /******/
 {
   int ret_value = -1;
@@ -722,7 +722,7 @@ nh5tget_sign_c ( hid_t_f *type_id , int_f *sign)
 */
 
 int_f
-nh5tset_sign_c ( hid_t_f *type_id , int_f* sign)
+h5tset_sign_c ( hid_t_f *type_id , int_f* sign)
 /******/
 {
   int ret_value = -1;
@@ -763,7 +763,7 @@ nh5tset_sign_c ( hid_t_f *type_id , int_f* sign)
 */
 
 int_f
-nh5tget_fields_c ( hid_t_f *type_id , size_t_f *spos, size_t_f *epos, size_t_f* esize, size_t_f* mpos, size_t_f* msize)
+h5tget_fields_c ( hid_t_f *type_id , size_t_f *spos, size_t_f *epos, size_t_f* esize, size_t_f* mpos, size_t_f* msize)
 /******/
 {
   int ret_value = -1;
@@ -806,7 +806,7 @@ nh5tget_fields_c ( hid_t_f *type_id , size_t_f *spos, size_t_f *epos, size_t_f*
 */
 
 int_f
-nh5tset_fields_c ( hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f* esize, size_t_f* mpos, size_t_f* msize)
+h5tset_fields_c ( hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f* esize, size_t_f* mpos, size_t_f* msize)
 /******/
 {
   int ret_value = -1;
@@ -848,7 +848,7 @@ nh5tset_fields_c ( hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f* e
 */
 
 int_f
-nh5tget_ebias_c ( hid_t_f *type_id , size_t_f *ebias)
+h5tget_ebias_c ( hid_t_f *type_id , size_t_f *ebias)
 /******/
 {
   int ret_value = -1;
@@ -884,7 +884,7 @@ nh5tget_ebias_c ( hid_t_f *type_id , size_t_f *ebias)
 */
 
 int_f
-nh5tset_ebias_c ( hid_t_f *type_id , size_t_f *ebias)
+h5tset_ebias_c ( hid_t_f *type_id , size_t_f *ebias)
 /******/
 {
   int ret_value = -1;
@@ -922,7 +922,7 @@ nh5tset_ebias_c ( hid_t_f *type_id , size_t_f *ebias)
 */
 
 int_f
-nh5tget_norm_c ( hid_t_f *type_id , int_f *norm)
+h5tget_norm_c ( hid_t_f *type_id , int_f *norm)
 /******/
 {
   int ret_value = -1;
@@ -958,7 +958,7 @@ nh5tget_norm_c ( hid_t_f *type_id , int_f *norm)
 */
 
 int_f
-nh5tset_norm_c ( hid_t_f *type_id , int_f *norm)
+h5tset_norm_c ( hid_t_f *type_id , int_f *norm)
 /******/
 {
   int ret_value = -1;
@@ -998,7 +998,7 @@ nh5tset_norm_c ( hid_t_f *type_id , int_f *norm)
 */
 
 int_f
-nh5tget_inpad_c ( hid_t_f *type_id , int_f * padtype)
+h5tget_inpad_c ( hid_t_f *type_id , int_f * padtype)
 /******/
 {
   int ret_value = -1;
@@ -1038,7 +1038,7 @@ nh5tget_inpad_c ( hid_t_f *type_id , int_f * padtype)
 */
 
 int_f
-nh5tset_inpad_c ( hid_t_f *type_id, int_f * padtype)
+h5tset_inpad_c ( hid_t_f *type_id, int_f * padtype)
 /******/
 {
   int ret_value = -1;
@@ -1077,7 +1077,7 @@ nh5tset_inpad_c ( hid_t_f *type_id, int_f * padtype)
 */
 
 int_f
-nh5tget_cset_c ( hid_t_f *type_id , int_f * cset)
+h5tget_cset_c ( hid_t_f *type_id , int_f * cset)
 /******/
 {
   int ret_value = -1;
@@ -1116,7 +1116,7 @@ nh5tget_cset_c ( hid_t_f *type_id , int_f * cset)
 */
 
 int_f
-nh5tset_cset_c ( hid_t_f *type_id, int_f * cset)
+h5tset_cset_c ( hid_t_f *type_id, int_f * cset)
 /******/
 {
   int ret_value = -1;
@@ -1153,7 +1153,7 @@ nh5tset_cset_c ( hid_t_f *type_id, int_f * cset)
  * SOURCE
 */
 int_f
-nh5tget_strpad_c ( hid_t_f *type_id , int_f * strpad)
+h5tget_strpad_c ( hid_t_f *type_id , int_f * strpad)
 /******/
 {
   int ret_value = -1;
@@ -1192,7 +1192,7 @@ nh5tget_strpad_c ( hid_t_f *type_id , int_f * strpad)
 */
 
 int_f
-nh5tset_strpad_c ( hid_t_f *type_id, int_f * strpad)
+h5tset_strpad_c ( hid_t_f *type_id, int_f * strpad)
 /******/
 {
   int ret_value = -1;
@@ -1230,7 +1230,7 @@ nh5tset_strpad_c ( hid_t_f *type_id, int_f * strpad)
 */
 
 int_f
-nh5tget_nmembers_c ( hid_t_f *type_id , int_f * num_members)
+h5tget_nmembers_c ( hid_t_f *type_id , int_f * num_members)
 /******/
 {
   int ret_value = -1;
@@ -1266,7 +1266,7 @@ nh5tget_nmembers_c ( hid_t_f *type_id , int_f * num_members)
 */
 
 int_f
-nh5tget_member_name_c ( hid_t_f *type_id ,int_f* idx, _fcd member_name, int_f *namelen)
+h5tget_member_name_c ( hid_t_f *type_id ,int_f* idx, _fcd member_name, int_f *namelen)
 /******/
 {
   int ret_value = -1;
@@ -1307,7 +1307,7 @@ nh5tget_member_name_c ( hid_t_f *type_id ,int_f* idx, _fcd member_name, int_f *n
  * SOURCE
 */
 int_f
-nh5tget_member_index_c (hid_t_f *type_id, _fcd name, int_f *namelen, int_f *idx)
+h5tget_member_index_c (hid_t_f *type_id, _fcd name, int_f *namelen, int_f *idx)
 /******/
 {
      int ret_value = -1;
@@ -1360,7 +1360,7 @@ DONE:
 */
 
 int_f
-nh5tget_member_offset_c ( hid_t_f *type_id ,int_f* member_no, size_t_f * offset)
+h5tget_member_offset_c ( hid_t_f *type_id ,int_f* member_no, size_t_f * offset)
 /******/
 {
   int ret_value = -1;
@@ -1393,7 +1393,7 @@ nh5tget_member_offset_c ( hid_t_f *type_id ,int_f* member_no, size_t_f * offset)
 */
 
 int_f
-nh5tget_array_dims_c ( hid_t_f *type_id , hsize_t_f * dims)
+h5tget_array_dims_c ( hid_t_f *type_id , hsize_t_f * dims)
 /******/
 {
     hsize_t c_dims[H5S_MAX_RANK];
@@ -1436,7 +1436,7 @@ DONE:
 */
 
 int_f
-nh5tget_array_ndims_c ( hid_t_f *type_id , int_f * ndims)
+h5tget_array_ndims_c ( hid_t_f *type_id , int_f * ndims)
 /******/
 {
   int ret_value = -1;
@@ -1473,7 +1473,7 @@ nh5tget_array_ndims_c ( hid_t_f *type_id , int_f * ndims)
 */
 
 int_f
-nh5tget_super_c ( hid_t_f *type_id , hid_t_f *base_type_id)
+h5tget_super_c ( hid_t_f *type_id , hid_t_f *base_type_id)
 /******/
 {
   int ret_value = -1;
@@ -1512,7 +1512,7 @@ nh5tget_super_c ( hid_t_f *type_id , hid_t_f *base_type_id)
 */
 
 int_f
-nh5tget_member_type_c ( hid_t_f *type_id ,int_f* field_idx, hid_t_f * datatype)
+h5tget_member_type_c ( hid_t_f *type_id ,int_f* field_idx, hid_t_f * datatype)
 /******/
 {
   int ret_value = -1;
@@ -1544,7 +1544,7 @@ nh5tget_member_type_c ( hid_t_f *type_id ,int_f* field_idx, hid_t_f * datatype)
 */
 
 int_f
-nh5tcreate_c(int_f *cls, size_t_f *size, hid_t_f *type_id)
+h5tcreate_c(int_f *cls, size_t_f *size, hid_t_f *type_id)
 /******/
 {
   int ret_value = -1;
@@ -1583,7 +1583,7 @@ nh5tcreate_c(int_f *cls, size_t_f *size, hid_t_f *type_id)
 */
 
 int_f
-nh5tinsert_c(hid_t_f *type_id, _fcd name, int_f* namelen, size_t_f *offset, hid_t_f * field_id)
+h5tinsert_c(hid_t_f *type_id, _fcd name, int_f* namelen, size_t_f *offset, hid_t_f * field_id)
 /******/
 {
   int ret_value = -1;
@@ -1622,7 +1622,7 @@ nh5tinsert_c(hid_t_f *type_id, _fcd name, int_f* namelen, size_t_f *offset, hid_
 */
 
 int_f
-nh5tpack_c(hid_t_f * type_id)
+h5tpack_c(hid_t_f * type_id)
 /******/
 {
   int ret_value = -1;
@@ -1657,7 +1657,7 @@ nh5tpack_c(hid_t_f * type_id)
  * SOURCE
 */
 int_f
-nh5tarray_create_c(hid_t_f * base_id, int_f *rank, hsize_t_f* dims, hid_t_f* type_id)
+h5tarray_create_c(hid_t_f * base_id, int_f *rank, hsize_t_f* dims, hid_t_f* type_id)
 /******/
 {
     hsize_t c_dims[H5S_MAX_RANK];
@@ -1704,7 +1704,7 @@ DONE:
 */
 
 int_f
-nh5tenum_create_c ( hid_t_f *parent_id , hid_t_f *new_type_id)
+h5tenum_create_c ( hid_t_f *parent_id , hid_t_f *new_type_id)
 /******/
 {
   int ret_value = 0;
@@ -1740,7 +1740,7 @@ nh5tenum_create_c ( hid_t_f *parent_id , hid_t_f *new_type_id)
 */
 
 int_f
-nh5tenum_insert_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value)
+h5tenum_insert_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value)
 /******/
 {
   int ret_value = -1;
@@ -1784,7 +1784,7 @@ nh5tenum_insert_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value)
 */
 
 int_f
-nh5tenum_nameof_c(hid_t_f *type_id, int_f* value, _fcd name, size_t_f* namelen)
+h5tenum_nameof_c(hid_t_f *type_id, int_f* value, _fcd name, size_t_f* namelen)
 /******/
 {
   int ret_value = -1;
@@ -1828,7 +1828,7 @@ nh5tenum_nameof_c(hid_t_f *type_id, int_f* value, _fcd name, size_t_f* namelen)
 */
 
 int_f
-nh5tenum_valueof_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value)
+h5tenum_valueof_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value)
 /******/
 {
   int ret_value = -1;
@@ -1867,7 +1867,7 @@ nh5tenum_valueof_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value)
 */
 
 int_f
-nh5tget_member_value_c(hid_t_f *type_id, int_f* member_no, int_f* value)
+h5tget_member_value_c(hid_t_f *type_id, int_f* member_no, int_f* value)
 /******/
 {
   int ret_value = -1;
@@ -1904,7 +1904,7 @@ nh5tget_member_value_c(hid_t_f *type_id, int_f* member_no, int_f* value)
  * SOURCE
 */
 int_f
-nh5tset_tag_c(hid_t_f* type_id, _fcd tag, int_f* namelen)
+h5tset_tag_c(hid_t_f* type_id, _fcd tag, int_f* namelen)
 /******/
 {
   int ret_value = -1;
@@ -1942,7 +1942,7 @@ nh5tset_tag_c(hid_t_f* type_id, _fcd tag, int_f* namelen)
  * SOURCE
 */
 int_f
-nh5tget_tag_c(hid_t_f* type_id, _fcd tag, size_t_f* tag_size, int_f* taglen)
+h5tget_tag_c(hid_t_f* type_id, _fcd tag, size_t_f* tag_size, int_f* taglen)
 /******/
 {
   int ret_value = -1;
@@ -1978,7 +1978,7 @@ nh5tget_tag_c(hid_t_f* type_id, _fcd tag, size_t_f* tag_size, int_f* taglen)
  * SOURCE
 */
 int_f
-nh5tvlen_create_c(hid_t_f* type_id, hid_t_f *vltype_id)
+h5tvlen_create_c(hid_t_f* type_id, hid_t_f *vltype_id)
 /******/
 {
   int ret_value = -1;
@@ -2014,7 +2014,7 @@ nh5tvlen_create_c(hid_t_f* type_id, hid_t_f *vltype_id)
 */
 
 int_f
-nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag )
+h5tis_variable_str_c ( hid_t_f *type_id , int_f *flag )
 /******/
 {
   int ret_value = 0;
@@ -2050,7 +2050,7 @@ nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag )
 */
 
 int_f
-nh5tget_member_class_c ( hid_t_f *type_id ,  int_f *member_no, int_f *cls )
+h5tget_member_class_c ( hid_t_f *type_id ,  int_f *member_no, int_f *cls )
 /******/
 {
   int ret_value = 0;
@@ -2087,7 +2087,7 @@ nh5tget_member_class_c ( hid_t_f *type_id ,  int_f *member_no, int_f *cls )
  * SOURCE
 */
 int_f
-nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id,
+h5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id,
 		  hid_t_f *tcpl_id, hid_t_f *tapl_id)
 /******/
 {
@@ -2121,7 +2121,7 @@ nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id,
  * SOURCE
 */
 int_f
-nh5tcommitted_c(hid_t_f *dtype_id)
+h5tcommitted_c(hid_t_f *dtype_id)
 /******/
 {
   int_f ret_value;
@@ -2157,7 +2157,7 @@ nh5tcommitted_c(hid_t_f *dtype_id)
 */
 
 int_f
-nh5tdecode_c ( _fcd buf, hid_t_f *obj_id )
+h5tdecode_c ( _fcd buf, hid_t_f *obj_id )
 /******/
 {
   int ret_value = -1;
@@ -2201,7 +2201,7 @@ nh5tdecode_c ( _fcd buf, hid_t_f *obj_id )
 */
 
 int_f
-nh5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
+h5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
 /******/
 {
   int ret_value = -1;
@@ -2270,7 +2270,7 @@ nh5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
 */
 
 int_f
-nh5tget_create_plist_c ( hid_t_f *dtype_id,  hid_t_f *dtpl_id)
+h5tget_create_plist_c ( hid_t_f *dtype_id,  hid_t_f *dtpl_id)
 /******/
 {
     int_f ret_value=-1;          /* Return value */
@@ -2304,7 +2304,7 @@ nh5tget_create_plist_c ( hid_t_f *dtype_id,  hid_t_f *dtpl_id)
 */
 
 int_f
-nh5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag)
+h5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag)
 /******/
 {
   int ret_value = -1;
@@ -2338,7 +2338,7 @@ nh5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag)
 */
 
 int_f
-nh5tget_native_type_c(hid_t_f *dtype_id, int_f *direction, hid_t_f *native_dtype_id)
+h5tget_native_type_c(hid_t_f *dtype_id, int_f *direction, hid_t_f *native_dtype_id)
 /******/
 {
   int ret_value = -1;
diff --git a/fortran/src/H5Tff.F90 b/fortran/src/H5Tff.F90
index d43db38..85666be 100644
--- a/fortran/src/H5Tff.F90
+++ b/fortran/src/H5Tff.F90
@@ -4,10 +4,7 @@
 !  MODULE H5T
 !
 ! PURPOSE
-!  This file contains Fortran interfaces for H5T functions. It includes
-!  all the functions that are independent on whether the Fortran 2003 functions
-!  are enabled or disabled.
-!
+!  This file contains Fortran interfaces for H5T functions.
 !
 ! COPYRIGHT
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -35,8 +32,9 @@
 
 MODULE H5T
 
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR,  C_CHAR, C_NULL_PTR
   USE H5GLOBAL
-  USE, INTRINSIC :: ISO_C_BINDING
+  IMPLICIT NONE
 
 !****t* H5T (F03)/hvl_t
 ! Fortran2003 Derived Type:
@@ -87,24 +85,22 @@ CONTAINS
 ! SOURCE
   SUBROUTINE h5topen_f(loc_id, name, type_id, hdferr, tapl_id)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name ! Datatype name within file or group
-    INTEGER(HID_T), INTENT(OUT) :: type_id  ! Datatype identifier
-    INTEGER, INTENT(OUT) :: hdferr ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tapl_id ! datatype access property list identifier
+    INTEGER(HID_T), INTENT(IN) :: loc_id 
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER(HID_T), INTENT(OUT) :: type_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tapl_id
 !*****
     INTEGER :: namelen                  ! Name length
     INTEGER(HID_T) :: tapl_id_default
 
     INTERFACE
-       INTEGER FUNCTION h5topen_c(loc_id, name, namelen, type_id, tapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TOPEN_C'::h5topen_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference ::name
+       INTEGER FUNCTION h5topen_c(loc_id, name, namelen, type_id, tapl_id_default) BIND(C,NAME='h5topen_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
          INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
+         CHARACTER(KIND=C_CHAR), INTENT(IN) :: name
          INTEGER :: namelen
          INTEGER(HID_T), INTENT(OUT) :: type_id
          INTEGER(HID_T) :: tapl_id_default
@@ -174,14 +170,12 @@ CONTAINS
 
     INTERFACE
        INTEGER FUNCTION h5tcommit_c(loc_id, name, namelen, type_id, &
-            lcpl_id_default, tcpl_id_default, tapl_id_default )
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCOMMIT_C'::h5tcommit_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference ::name
+            lcpl_id_default, tcpl_id_default, tapl_id_default ) BIND(C,NAME='h5tcommit_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
          INTEGER(HID_T), INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
          INTEGER :: namelen
          INTEGER(HID_T), INTENT(IN) :: type_id
          INTEGER(HID_T) :: lcpl_id_default
@@ -229,25 +223,21 @@ CONTAINS
 !
 ! SOURCE
   SUBROUTINE h5tcopy_f(type_id, new_type_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(HID_T), INTENT(OUT) :: new_type_id
-                                 ! Identifier of datatype's copy
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id 
+    INTEGER(HID_T), INTENT(OUT) :: new_type_id
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION  h5tcopy_c(type_id, new_type_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCOPY_C'::h5tcopy_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(HID_T), INTENT(OUT) :: new_type_id
-              END FUNCTION h5tcopy_c
-            END INTERFACE
-
-            hdferr = h5tcopy_c(type_id, new_type_id)
-          END SUBROUTINE h5tcopy_f
+    INTERFACE
+       INTEGER FUNCTION  h5tcopy_c(type_id, new_type_id) BIND(C,NAME='h5tcopy_c')
+         IMPORT :: HID_T
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HID_T), INTENT(OUT) :: new_type_id
+       END FUNCTION h5tcopy_c
+    END INTERFACE
+    
+    hdferr = h5tcopy_c(type_id, new_type_id)
+  END SUBROUTINE h5tcopy_f
 !
 !****s* H5T/h5tequal_f
 !
@@ -275,30 +265,27 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tequal_f(type1_id, type2_id, flag, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type1_id ! Datatype identifier
-            INTEGER(HID_T), INTENT(IN) :: type2_id ! Datatype identifier
-            LOGICAL, INTENT(OUT) :: flag ! TRUE/FALSE flag to indicate if two
-                                         ! datatypes are equal
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type1_id
+    INTEGER(HID_T), INTENT(IN) :: type2_id
+    LOGICAL, INTENT(OUT) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTEGER :: c_flag
-            INTERFACE
-              INTEGER FUNCTION h5tequal_c(type1_id, type2_id, c_flag)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TEQUAL_C'::h5tequal_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type1_id
-              INTEGER(HID_T), INTENT(IN) :: type2_id
-              INTEGER :: c_flag
-              END FUNCTION h5tequal_c
-            END INTERFACE
-
-            flag = .FALSE.
-            hdferr = h5tequal_c(type1_id, type2_id, c_flag)
-            if(c_flag .gt. 0) flag = .TRUE.
-          END SUBROUTINE h5tequal_f
+    INTEGER :: c_flag
+    INTERFACE
+       INTEGER FUNCTION h5tequal_c(type1_id, type2_id, c_flag) BIND(C,NAME='h5tequal_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type1_id
+         INTEGER(HID_T), INTENT(IN) :: type2_id
+         INTEGER :: c_flag
+       END FUNCTION h5tequal_c
+    END INTERFACE
+    
+    flag = .FALSE.
+    hdferr = h5tequal_c(type1_id, type2_id, c_flag)
+    IF(c_flag .GT. 0) flag = .TRUE.
+  END SUBROUTINE h5tequal_f
 !
 !****s* H5T/h5tclose_f
 !
@@ -324,22 +311,20 @@ CONTAINS
 !
 ! SOURCE
   SUBROUTINE h5tclose_f(type_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tclose_c(type_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCLOSE_C'::h5tclose_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              END FUNCTION h5tclose_c
-            END INTERFACE
-
-            hdferr = h5tclose_c(type_id)
-          END SUBROUTINE h5tclose_f
+    INTERFACE
+       INTEGER FUNCTION h5tclose_c(type_id) BIND(C,NAME='h5tclose_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+       END FUNCTION h5tclose_c
+    END INTERFACE
+    
+    hdferr = h5tclose_c(type_id)
+  END SUBROUTINE h5tclose_f
 !
 !****s* H5T/h5tget_class_f
 !
@@ -384,11 +369,9 @@ CONTAINS
     INTEGER, INTENT(OUT) :: hdferr
 !*****
     INTERFACE
-       INTEGER FUNCTION h5tget_class_c(type_id, class)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_CLASS_C'::h5tget_class_c
-         !DEC$ENDIF
+       INTEGER FUNCTION h5tget_class_c(type_id, class) BIND(C,NAME='h5tget_class_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
          INTEGER(HID_T), INTENT(IN) :: type_id
          INTEGER, INTENT(OUT) :: class
        END FUNCTION h5tget_class_c
@@ -422,24 +405,22 @@ CONTAINS
 !
 ! SOURCE
   SUBROUTINE h5tget_size_f(type_id, size, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(OUT) :: size ! Datatype size
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+    INTEGER(SIZE_T), INTENT(OUT) :: size ! Datatype size
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_size_c(type_id, size)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_SIZE_C'::h5tget_size_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(OUT) :: size
-              END FUNCTION h5tget_size_c
-            END INTERFACE
-
-            hdferr = h5tget_size_c(type_id, size)
-          END SUBROUTINE h5tget_size_f
+    INTERFACE
+       INTEGER FUNCTION h5tget_size_c(type_id, size) BIND(C,NAME='h5tget_size_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(OUT) :: size
+       END FUNCTION h5tget_size_c
+    END INTERFACE
+    
+    hdferr = h5tget_size_c(type_id, size)
+  END SUBROUTINE h5tget_size_f
 
 !
 !****s* H5T/h5tset_size_f
@@ -468,24 +449,22 @@ CONTAINS
 !
 ! SOURCE
   SUBROUTINE h5tset_size_f(type_id, size, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(IN) :: size ! Datatype size
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+    INTEGER(SIZE_T), INTENT(IN) :: size ! Datatype size
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_size_c(type_id, size)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_SIZE_C'::h5tset_size_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(IN) :: size
-              END FUNCTION h5tset_size_c
-            END INTERFACE
-
-            hdferr = h5tset_size_c(type_id, size)
-          END SUBROUTINE h5tset_size_f
+    INTERFACE
+       INTEGER FUNCTION h5tset_size_c(type_id, size) BIND(C,NAME='h5tset_size_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(IN) :: size
+       END FUNCTION h5tset_size_c
+    END INTERFACE
+    
+    hdferr = h5tset_size_c(type_id, size)
+  END SUBROUTINE h5tset_size_f
 
 !
 !****s* H5T/h5tget_order_f
@@ -526,11 +505,9 @@ CONTAINS
     INTEGER, INTENT(OUT) :: hdferr  ! Error code
 !*****
     INTERFACE
-       INTEGER FUNCTION h5tget_order_c(type_id, order)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_ORDER_C'::h5tget_order_c
-         !DEC$ENDIF
+       INTEGER FUNCTION h5tget_order_c(type_id, order) BIND(C,NAME='h5tget_order_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
          INTEGER(HID_T), INTENT(IN) :: type_id
          INTEGER, INTENT(OUT) :: order
        END FUNCTION h5tget_order_c
@@ -576,11 +553,9 @@ CONTAINS
     INTEGER, INTENT(OUT) :: hdferr ! Error code
 !*****
     INTERFACE
-       INTEGER FUNCTION h5tset_order_c(type_id, order)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_ORDER_C'::h5tset_order_c
-         !DEC$ENDIF
+       INTEGER FUNCTION h5tset_order_c(type_id, order) BIND(C,NAME='h5tset_order_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
          INTEGER(HID_T), INTENT(IN) :: type_id
          INTEGER, INTENT(IN) :: order
        END FUNCTION h5tset_order_c
@@ -614,25 +589,23 @@ CONTAINS
 !  port).  March 7, 2001
 !
 ! SOURCE
-  SUBROUTINE h5tget_precision_f(type_id, precision, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(OUT) :: precision ! Datatype precision
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+  SUBROUTINE h5tget_precision_f(type_id, PRECISION, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(OUT) :: precision
+    INTEGER, INTENT(OUT) :: hdferr        
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_precision_c (type_id, precision)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_PRECISION_C'::h5tget_precision_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(OUT) :: precision
-              END FUNCTION h5tget_precision_c
-            END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5tget_precision_c(type_id, PRECISION) BIND(C,NAME='h5tget_precision_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(OUT) :: PRECISION
+       END FUNCTION h5tget_precision_c
+    END INTERFACE
 
-            hdferr = h5tget_precision_c(type_id, precision)
-          END SUBROUTINE h5tget_precision_f
+    hdferr = h5tget_precision_c(type_id, PRECISION)
+  END SUBROUTINE h5tget_precision_f
 
 !
 !****s* H5T/h5tset_precision_f
@@ -659,25 +632,23 @@ CONTAINS
 !  port).  March 7, 2001
 !
 ! SOURCE
-  SUBROUTINE h5tset_precision_f(type_id, precision, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(IN) :: precision ! Datatype precision
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+  SUBROUTINE h5tset_precision_f(type_id, PRECISION, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(IN) :: PRECISION 
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_precision_c (type_id, precision)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_PRECISION_C'::h5tset_precision_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(IN) :: precision
-              END FUNCTION h5tset_precision_c
-            END INTERFACE
-
-            hdferr = h5tset_precision_c(type_id, precision)
-          END SUBROUTINE h5tset_precision_f
+    INTERFACE
+       INTEGER FUNCTION h5tset_precision_c (type_id, PRECISION) BIND(C,NAME='h5tset_precision_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(IN) :: PRECISION
+       END FUNCTION h5tset_precision_c
+    END INTERFACE
+    
+    hdferr = h5tset_precision_c(type_id, PRECISION)
+  END SUBROUTINE h5tset_precision_f
 
 !
 !****s* H5T/h5tget_offset_f
@@ -704,26 +675,23 @@ CONTAINS
 !
 ! SOURCE
   SUBROUTINE h5tget_offset_f(type_id, offset, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(OUT) :: offset ! Datatype bit offset of the
-                                           ! first significant bit
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(OUT) :: offset
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_offset_c(type_id, offset)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_OFFSET_C'::h5tget_offset_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(OUT) :: offset
-              END FUNCTION h5tget_offset_c
-            END INTERFACE
-
-            hdferr = h5tget_offset_c(type_id, offset)
-          END SUBROUTINE h5tget_offset_f
-
+    INTERFACE
+       INTEGER FUNCTION h5tget_offset_c(type_id, offset) BIND(C,NAME='h5tget_offset_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(OUT) :: offset
+       END FUNCTION h5tget_offset_c
+    END INTERFACE
+    
+    hdferr = h5tget_offset_c(type_id, offset)
+  END SUBROUTINE h5tget_offset_f
+  
 !
 !****s* H5T/h5tset_offset_f
 !
@@ -749,26 +717,23 @@ CONTAINS
 !
 ! SOURCE
   SUBROUTINE h5tset_offset_f(type_id, offset, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(IN) :: offset ! Datatype bit offset of the
-                                           ! first significant bit
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(IN) :: offset
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_offset_c(type_id, offset)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_OFFSET_C'::h5tset_offset_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(IN) :: offset
-              END FUNCTION h5tset_offset_c
-            END INTERFACE
-
-            hdferr = h5tset_offset_c(type_id, offset)
-          END SUBROUTINE h5tset_offset_f
-
+    INTERFACE
+       INTEGER FUNCTION h5tset_offset_c(type_id, offset) BIND(C,NAME='h5tset_offset_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(IN) :: offset
+       END FUNCTION h5tset_offset_c
+    END INTERFACE
+    
+    hdferr = h5tset_offset_c(type_id, offset)
+  END SUBROUTINE h5tset_offset_f
+  
 !
 !****s* H5T/h5tget_pad_f
 !
@@ -785,11 +750,11 @@ CONTAINS
 !  lsbpad 	 - least-significant bit padding type
 !  msbpad 	 - most-significant bit padding type
 !                  Possible values of padding type are:
-!                    H5T_PAD_ERROR_F      = -1
-!                    H5T_PAD_ZERO_F = 0
-!                    H5T_PAD_ONE_F = 1
-!                    H5T_PAD_BACKGROUND_F = 2
-!                    H5T_PAD_NPAD_F      = 3
+!                    H5T_PAD_ERROR_F 
+!                    H5T_PAD_ZERO_F
+!                    H5T_PAD_ONE_F
+!                    H5T_PAD_BACKGROUND_F
+!                    H5T_PAD_NPAD_F
 !  hdferr 	 - Returns 0 if successful and -1 if fails
 
 !
@@ -803,35 +768,24 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_pad_f(type_id, lsbpad, msbpad, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: lsbpad ! padding type of the
-                                           ! least significant bit
-            INTEGER, INTENT(OUT) :: msbpad ! padding type of the
-                                           ! most significant bit
-                                           ! Possible values of padding type are:
-                                           ! H5T__PAD_ZERO_F = 0
-                                           ! H5T__PAD_ONE_F = 1
-                                           ! H5T__PAD_BACKGROUND_F = 2
-                                           ! H5T_PAD_ERROR_F      = -1
-                                           ! H5T_PAD_NPAD_F      = 3
-
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: lsbpad
+    INTEGER, INTENT(OUT) :: msbpad
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_pad_c(type_id, lsbpad, msbpad)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_PAD_C'::h5tget_pad_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: lsbpad
-              INTEGER, INTENT(OUT) :: msbpad
-              END FUNCTION h5tget_pad_c
-            END INTERFACE
-
-            hdferr = h5tget_pad_c(type_id, lsbpad, msbpad)
-          END SUBROUTINE h5tget_pad_f
+    INTERFACE
+       INTEGER FUNCTION h5tget_pad_c(type_id, lsbpad, msbpad) BIND(C,NAME='h5tget_pad_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: lsbpad
+         INTEGER, INTENT(OUT) :: msbpad
+       END FUNCTION h5tget_pad_c
+    END INTERFACE
+    
+    hdferr = h5tget_pad_c(type_id, lsbpad, msbpad)
+  END SUBROUTINE h5tget_pad_f
 
 !
 !****s* H5T/h5tset_pad_f
@@ -865,35 +819,25 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tset_pad_f(type_id, lsbpad, msbpad, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: lsbpad ! padding type of the
-                                           ! least significant bit
-            INTEGER, INTENT(IN) :: msbpad ! padding type of the
-                                           ! most significant bit
-                                           ! Possible values of padding type are:
-                                           ! H5T_PAD_ZERO_F = 0
-                                           ! H5T_PAD_ONE_F = 1
-                                           ! H5T_PAD_BACKGROUND_F = 2
-                                           ! H5T_PAD_ERROR_F      = -1
-                                           ! H5T_PAD_NPAD_F      = 3
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: lsbpad
+    INTEGER, INTENT(IN) :: msbpad
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_pad_c(type_id, lsbpad, msbpad)
-              USE H5GLOBAL
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_PAD_C'::h5tset_pad_c
-              !DEC$ENDIF
-              INTEGER, INTENT(IN) :: lsbpad
-              INTEGER, INTENT(IN) :: msbpad
-              END FUNCTION h5tset_pad_c
-            END INTERFACE
-
-            hdferr = h5tset_pad_c(type_id, lsbpad, msbpad)
-          END SUBROUTINE h5tset_pad_f
-
+    INTERFACE
+       INTEGER FUNCTION h5tset_pad_c(type_id, lsbpad, msbpad) BIND(C,NAME='h5tset_pad_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: lsbpad
+         INTEGER, INTENT(IN) :: msbpad
+       END FUNCTION h5tset_pad_c
+    END INTERFACE
+    
+    hdferr = h5tset_pad_c(type_id, lsbpad, msbpad)
+  END SUBROUTINE h5tset_pad_f
+  
 !
 !****s* H5T/h5tget_sign_f
 !
@@ -925,31 +869,24 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_sign_f(type_id, sign, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: sign ! sign type for an integer type
-                                         !possible values are:
-                                         !Unsigned integer type H5T_SGN_NONE_F = 0
-                                         !Two's complement signed integer type
-                                         !H5T_SGN_2_F = 1
-                                         !or error value: H5T_SGN_ERROR_F=-1
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id 
+    INTEGER, INTENT(OUT) :: sign
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
 
-            INTERFACE
-              INTEGER FUNCTION h5tget_sign_c(type_id, sign)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_SIGN_C'::h5tget_sign_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: sign
-              END FUNCTION h5tget_sign_c
-            END INTERFACE
-
-            hdferr = h5tget_sign_c(type_id, sign)
-          END SUBROUTINE h5tget_sign_f
-
+    INTERFACE
+       INTEGER FUNCTION h5tget_sign_c(type_id, sign) BIND(C,NAME='h5tget_sign_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: sign
+       END FUNCTION h5tget_sign_c
+    END INTERFACE
+    
+    hdferr = h5tget_sign_c(type_id, sign)
+  END SUBROUTINE h5tget_sign_f
+  
 !
 !****s* H5T/h5tset_sign_f
 !
@@ -981,30 +918,22 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tset_sign_f(type_id, sign, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: sign !sign type for an integer type
-                                         !possible values are:
-                                         !Unsigned integer type H5T_SGN_NONE_F = 0
-                                         !Two's complement signed integer type
-                                         !H5T_SGN_2_F = 1
-                                         !or error value: H5T_SGN_ERROR_F=-1
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: sign
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tset_sign_c(type_id, sign)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_SIGN_C'::h5tset_sign_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: sign
-              END FUNCTION h5tset_sign_c
-            END INTERFACE
-
-            hdferr = h5tset_sign_c(type_id, sign)
-          END SUBROUTINE h5tset_sign_f
+    INTERFACE
+       INTEGER FUNCTION h5tset_sign_c(type_id, sign) BIND(C,NAME='h5tset_sign_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: sign
+       END FUNCTION h5tset_sign_c
+    END INTERFACE
+    
+    hdferr = h5tset_sign_c(type_id, sign)
+  END SUBROUTINE h5tset_sign_f
 
 !
 !****s* H5T/h5tget_fields_f
@@ -1035,33 +964,32 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_fields_f(type_id, spos, epos, esize, mpos, msize, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(OUT) :: spos   ! sign bit-position
-            INTEGER(SIZE_T), INTENT(OUT) :: epos   ! exponent bit-position
-            INTEGER(SIZE_T), INTENT(OUT) :: esize  ! size of exponent in bits
-            INTEGER(SIZE_T), INTENT(OUT) :: mpos   ! mantissa bit-position
-            INTEGER(SIZE_T), INTENT(OUT) :: msize  ! size of mantissa in bits
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(OUT) :: spos
+    INTEGER(SIZE_T), INTENT(OUT) :: epos
+    INTEGER(SIZE_T), INTENT(OUT) :: esize
+    INTEGER(SIZE_T), INTENT(OUT) :: mpos
+    INTEGER(SIZE_T), INTENT(OUT) :: msize
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
 
-            INTERFACE
-              INTEGER FUNCTION h5tget_fields_c(type_id, spos, epos, esize, mpos, msize)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_FIELDS_C'::h5tget_fields_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(OUT) :: spos
-              INTEGER(SIZE_T), INTENT(OUT) :: epos
-              INTEGER(SIZE_T), INTENT(OUT) :: esize
-              INTEGER(SIZE_T), INTENT(OUT) :: mpos
-              INTEGER(SIZE_T), INTENT(OUT) :: msize
-              END FUNCTION h5tget_fields_c
-            END INTERFACE
-
-            hdferr = h5tget_fields_c(type_id, spos, epos, esize, mpos, msize)
-          END SUBROUTINE h5tget_fields_f
+    INTERFACE
+       INTEGER FUNCTION h5tget_fields_c(type_id, spos, epos, esize, mpos, msize) &
+            BIND(C,NAME='h5tget_fields_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(OUT) :: spos
+         INTEGER(SIZE_T), INTENT(OUT) :: epos
+         INTEGER(SIZE_T), INTENT(OUT) :: esize
+         INTEGER(SIZE_T), INTENT(OUT) :: mpos
+         INTEGER(SIZE_T), INTENT(OUT) :: msize
+       END FUNCTION h5tget_fields_c
+    END INTERFACE
+    
+    hdferr = h5tget_fields_c(type_id, spos, epos, esize, mpos, msize)
+  END SUBROUTINE h5tget_fields_f
 
 !
 !****s* H5T/h5tset_fields_f
@@ -1092,34 +1020,33 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tset_fields_f(type_id, spos, epos, esize, mpos, msize, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(IN) :: spos   ! sign bit-position
-            INTEGER(SIZE_T), INTENT(IN) :: epos   ! exponent bit-position
-            INTEGER(SIZE_T), INTENT(IN) :: esize  ! size of exponent in bits
-            INTEGER(SIZE_T), INTENT(IN) :: mpos   ! mantissa bit-position
-            INTEGER(SIZE_T), INTENT(IN) :: msize  ! size of mantissa in bits
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id 
+    INTEGER(SIZE_T), INTENT(IN) :: spos
+    INTEGER(SIZE_T), INTENT(IN) :: epos
+    INTEGER(SIZE_T), INTENT(IN) :: esize
+    INTEGER(SIZE_T), INTENT(IN) :: mpos
+    INTEGER(SIZE_T), INTENT(IN) :: msize
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
 
-            INTERFACE
-              INTEGER FUNCTION h5tset_fields_c(type_id, spos, epos, esize, mpos, msize)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_FIELDS_C'::h5tset_fields_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(IN) :: spos
-              INTEGER(SIZE_T), INTENT(IN) :: epos
-              INTEGER(SIZE_T), INTENT(IN) :: esize
-              INTEGER(SIZE_T), INTENT(IN) :: mpos
-              INTEGER(SIZE_T), INTENT(IN) :: msize
-              END FUNCTION h5tset_fields_c
-            END INTERFACE
-
-            hdferr = h5tset_fields_c(type_id, spos, epos, esize, mpos, msize)
-          END SUBROUTINE h5tset_fields_f
-
+    INTERFACE
+       INTEGER FUNCTION h5tset_fields_c(type_id, spos, epos, esize, mpos, msize) &
+            BIND(C,NAME='h5tset_fields_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(IN) :: spos
+         INTEGER(SIZE_T), INTENT(IN) :: epos
+         INTEGER(SIZE_T), INTENT(IN) :: esize
+         INTEGER(SIZE_T), INTENT(IN) :: mpos
+         INTEGER(SIZE_T), INTENT(IN) :: msize
+       END FUNCTION h5tset_fields_c
+    END INTERFACE
+    
+    hdferr = h5tset_fields_c(type_id, spos, epos, esize, mpos, msize)
+  END SUBROUTINE h5tset_fields_f
+  
 !
 !****s* H5T/h5tget_ebias_f
 !
@@ -1145,25 +1072,23 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_ebias_f(type_id, ebias, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(OUT) :: ebias ! Datatype exponent bias of a floating-point type
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(OUT) :: ebias
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tget_ebias_c(type_id, ebias)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_EBIAS_C'::h5tget_ebias_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(OUT) :: ebias
-              END FUNCTION h5tget_ebias_c
-            END INTERFACE
-
-            hdferr = h5tget_ebias_c(type_id, ebias)
-          END SUBROUTINE h5tget_ebias_f
+    
+    INTERFACE
+       INTEGER FUNCTION h5tget_ebias_c(type_id, ebias) BIND(C,NAME='h5tget_ebias_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(OUT) :: ebias
+       END FUNCTION h5tget_ebias_c
+    END INTERFACE
+    
+    hdferr = h5tget_ebias_c(type_id, ebias)
+  END SUBROUTINE h5tget_ebias_f
 
 !
 !****s* H5T/h5tset_ebias_f
@@ -1190,25 +1115,22 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tset_ebias_f(type_id, ebias, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(IN) :: ebias !Datatype exponent bias of a floating-point type
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(SIZE_T), INTENT(IN) :: ebias
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tset_ebias_c(type_id, ebias)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_EBIAS_C'::h5tset_ebias_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(IN) :: ebias
-              END FUNCTION h5tset_ebias_c
-            END INTERFACE
-
-            hdferr = h5tset_ebias_c(type_id, ebias)
-          END SUBROUTINE h5tset_ebias_f
+    INTERFACE
+       INTEGER FUNCTION h5tset_ebias_c(type_id, ebias) BIND(C,NAME='h5tset_ebias_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(SIZE_T), INTENT(IN) :: ebias
+       END FUNCTION h5tset_ebias_c
+    END INTERFACE
+    
+    hdferr = h5tset_ebias_c(type_id, ebias)
+  END SUBROUTINE h5tset_ebias_f
 
 !
 !****s* H5T/h5tget_norm_f
@@ -1224,9 +1146,9 @@ CONTAINS
 !  type_id 	 - datatype identifier
 ! OUTPUTS
 !  norm 	 - normalization types, valid values are:
-!                    H5T_NORM_IMPLIED_F(0)
-!                    H5T_NORM_MSBSET_F(1)
-!                    H5T_NORM_NONE_F(2)
+!                    H5T_NORM_IMPLIED_F
+!                    H5T_NORM_MSBSET_F
+!                    H5T_NORM_NONE_F
 !  hdferr 	 - Returns 0 if successful and -1 if fails
 !
 ! AUTHOR
@@ -1239,30 +1161,23 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_norm_f(type_id, norm, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: norm !mantissa normalization of a floating-point datatype
-                                         !Valid normalization types are:
-                                         !H5T_NORM_IMPLIED_F(0),MSB of mantissa is not
-                                         !stored, always 1,  H5T_NORM_MSBSET_F(1), MSB of
-                                         !mantissa is always 1, H5T_NORM_NONE_F(2)
-                                         !Mantissa is not normalize
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: norm
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
 
-            INTERFACE
-              INTEGER FUNCTION h5tget_norm_c(type_id, norm)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_NORM_C'::h5tget_norm_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: norm
-              END FUNCTION h5tget_norm_c
-            END INTERFACE
-
-            hdferr = h5tget_norm_c(type_id, norm)
-          END SUBROUTINE h5tget_norm_f
+    INTERFACE
+       INTEGER FUNCTION h5tget_norm_c(type_id, norm) BIND(C,NAME='h5tget_norm_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: norm
+       END FUNCTION h5tget_norm_c
+    END INTERFACE
+    
+    hdferr = h5tget_norm_c(type_id, norm)
+  END SUBROUTINE h5tget_norm_f
 
 !
 !****s* H5T/h5tset_norm_f
@@ -1276,9 +1191,9 @@ CONTAINS
 ! INPUTS
 !  type_id 	 - datatype identifier
 !  norm 	 - normalization types, valid values are:
-!                    H5T_NORM_IMPLIED_F(0)
-!                    H5T_NORM_MSBSET_F(1)
-!                    H5T_NORM_NONE_F(2)
+!                    H5T_NORM_IMPLIED_F
+!                    H5T_NORM_MSBSET_F
+!                    H5T_NORM_NONE_F
 ! OUTPUTS
 !  hdferr 	 - Returns 0 if successful and -1 if fails
 !
@@ -1293,29 +1208,22 @@ CONTAINS
 !
 ! SOURCE
   SUBROUTINE h5tset_norm_f(type_id, norm, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: norm !mantissa normalization of a floating-point datatype
-                                         !Valid normalization types are:
-                                         !H5T_NORM_IMPLIED_F(0),MSB of mantissa is not
-                                         !stored, always 1,  H5T_NORM_MSBSET_F(1), MSB of
-                                         !mantissa is always 1, H5T_NORM_NONE_F(2)
-                                         !Mantissa is not normalize
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: norm
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_norm_c(type_id, norm)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_NORM_C'::h5tset_norm_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: norm
-              END FUNCTION h5tset_norm_c
-            END INTERFACE
-
-            hdferr = h5tset_norm_c(type_id, norm)
-          END SUBROUTINE h5tset_norm_f
+    INTERFACE
+       INTEGER FUNCTION h5tset_norm_c(type_id, norm) BIND(C,NAME='h5tset_norm_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: norm
+       END FUNCTION h5tset_norm_c
+    END INTERFACE
+    
+    hdferr = h5tset_norm_c(type_id, norm)
+  END SUBROUTINE h5tset_norm_f
 
 !
 !****s* H5T/h5tget_inpad_f
@@ -1332,9 +1240,9 @@ CONTAINS
 ! OUTPUTS
 !  padtype 	 - padding type for unused bits
 !                  Possible values of padding type are:
-!                    H5T_PAD_ZERO_F = 0
-!                    H5T_PAD_ONE_F = 1
-!                    H5T_PAD_BACKGROUND_F = 2
+!                    H5T_PAD_ZERO_F
+!                    H5T_PAD_ONE_F
+!                    H5T_PAD_BACKGROUND_F
 !  hdferr 	 - Returns 0 if successful and -1 if fails
 !
 ! AUTHOR
@@ -1347,30 +1255,22 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_inpad_f(type_id, padtype, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: padtype ! padding type for unused bits
-                                            ! in floating-point datatypes.
-                                            ! Possible values of padding type are:
-                                            ! H5T__PAD_ZERO_F = 0
-                                            ! H5T__PAD_ONE_F = 1
-                                            ! H5T__PAD_BACKGROUND_F = 2
-
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: padtype
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_inpad_c(type_id, padtype)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_INPAD_C'::h5tget_inpad_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: padtype
-              END FUNCTION h5tget_inpad_c
-            END INTERFACE
-
-            hdferr = h5tget_inpad_c(type_id, padtype)
-          END SUBROUTINE h5tget_inpad_f
+    INTERFACE
+       INTEGER FUNCTION h5tget_inpad_c(type_id, padtype) BIND(C,NAME='h5tget_inpad_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: padtype
+       END FUNCTION h5tget_inpad_c
+    END INTERFACE
+    
+    hdferr = h5tget_inpad_c(type_id, padtype)
+  END SUBROUTINE h5tget_inpad_f
 
 !
 !****s* H5T/h5tset_inpad_f
@@ -1385,9 +1285,9 @@ CONTAINS
 !  type_id 	 - datatype identifier
 !  padtype 	 - padding type for unused bits
 !                  Possible values of padding type are:
-!                    H5T_PAD_ZERO_F = 0
-!                    H5T_PAD_ONE_F = 1
-!                    H5T_PAD_BACKGROUND_F = 2
+!                    H5T_PAD_ZERO_F
+!                    H5T_PAD_ONE_F
+!                    H5T_PAD_BACKGROUND_F
 ! OUTPUTS
 !  hdferr 	 - Returns 0 if successful and -1 if fails
 !
@@ -1401,29 +1301,22 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tset_inpad_f(type_id, padtype, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: padtype ! padding type for unused bits
-                                           ! in floating-point datatypes.
-                                           ! Possible values of padding type are:
-                                           ! H5T__PAD_ZERO_F = 0
-                                           ! H5T__PAD_ONE_F = 1
-                                           ! H5T__PAD_BACKGROUND_F = 2
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: padtype
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_inpad_c(type_id, padtype)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_INPAD_C'::h5tset_inpad_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: padtype
-              END FUNCTION h5tset_inpad_c
-            END INTERFACE
-
-            hdferr = h5tset_inpad_c(type_id, padtype)
-          END SUBROUTINE h5tset_inpad_f
+    INTERFACE
+       INTEGER FUNCTION h5tset_inpad_c(type_id, padtype) BIND(C,NAME='h5tset_inpad_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: padtype
+       END FUNCTION h5tset_inpad_c
+    END INTERFACE
+    
+    hdferr = h5tset_inpad_c(type_id, padtype)
+  END SUBROUTINE h5tset_inpad_f
 
 !
 !****s* H5T/h5tget_cset_f
@@ -1439,8 +1332,8 @@ CONTAINS
 ! OUTPUTS
 !  cset     - Character set type of a string datatype
 !              Possible values are:
-!              H5T_CSET_ASCII_F = 0
-!              H5T_CSET_UTF8_F
+!                H5T_CSET_ASCII_F
+!                H5T_CSET_UTF8_F
 !  hdferr   - Returns 0 if successful and -1 if fails
 !
 ! AUTHOR
@@ -1453,27 +1346,22 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_cset_f(type_id, cset, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: cset   ! character set type of a string datatype
-                                           !  Possible values are:
-                                           !  H5T_CSET_ASCII_F = 0
-                                           !  H5T_CSET_UTF8_F
-            INTEGER, INTENT(OUT) :: hdferr ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: cset
+    INTEGER, INTENT(OUT) :: hdferr ! Error code
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_cset_c(type_id, cset)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_CSET_C'::h5tget_cset_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: cset
-              END FUNCTION h5tget_cset_c
-            END INTERFACE
-
-            hdferr = h5tget_cset_c(type_id, cset)
-          END SUBROUTINE h5tget_cset_f
+    INTERFACE
+       INTEGER FUNCTION h5tget_cset_c(type_id, cset) BIND(C,NAME='h5tget_cset_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: cset
+       END FUNCTION h5tget_cset_c
+    END INTERFACE
+    
+    hdferr = h5tget_cset_c(type_id, cset)
+  END SUBROUTINE h5tget_cset_f
 
 !
 !****s* H5T/h5tset_cset_f
@@ -1488,7 +1376,7 @@ CONTAINS
 !  type_id 	 - datatype identifier
 !  cset 	 - character set type of a string datatype
 !                    Possible values are:
-!                     H5T_CSET_ASCII_F = 0
+!                     H5T_CSET_ASCII_F
 !                     H5T_CSET_UTF8_F
 ! OUTPUTS
 !  hdferr 	 - Returns 0 if successful and -1 if fails
@@ -1503,28 +1391,22 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tset_cset_f(type_id, cset, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: cset !character set type of a string datatype
-                                           ! Possible values of padding type are:
-                                           ! H5T_CSET_ASCII_F = 0
-                                           ! H5T_CSET_UTF8_F
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: cset
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_cset_c(type_id, cset)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_CSET_C'::h5tset_cset_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: cset
-              END FUNCTION h5tset_cset_c
-            END INTERFACE
-
-            hdferr = h5tset_cset_c(type_id, cset)
-          END SUBROUTINE h5tset_cset_f
-
+    INTERFACE
+       INTEGER FUNCTION h5tset_cset_c(type_id, cset) BIND(C,NAME='h5tset_cset_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: cset
+       END FUNCTION h5tset_cset_c
+    END INTERFACE
+    
+    hdferr = h5tset_cset_c(type_id, cset)
+  END SUBROUTINE h5tset_cset_f
 !
 !****s* H5T/h5tget_strpad_f
 !
@@ -1555,24 +1437,22 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_strpad_f(type_id, strpad, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: strpad
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: strpad
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_strpad_c(type_id, strpad)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_STRPAD_C'::h5tget_strpad_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: strpad
-              END FUNCTION h5tget_strpad_c
-            END INTERFACE
-
-            hdferr = h5tget_strpad_c(type_id, strpad)
-          END SUBROUTINE h5tget_strpad_f
+    INTERFACE
+       INTEGER FUNCTION h5tget_strpad_c(type_id, strpad) BIND(C,NAME='h5tget_strpad_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: strpad
+       END FUNCTION h5tget_strpad_c
+    END INTERFACE
+    
+    hdferr = h5tget_strpad_c(type_id, strpad)
+  END SUBROUTINE h5tget_strpad_f
 
 !
 !****s* H5T/h5tset_strpad_f
@@ -1589,8 +1469,8 @@ CONTAINS
 !                  Possible values are:
 !                    H5T_STR_NULLTERM_F,
 !                    H5T_STR_NULLPAD_F,
-!                    H5T_STR_SPACEPAD_F
-!                    H5T_STR_ERROR_F
+!                    H5T_STR_SPACEPAD_F,
+!                    H5T_STR_ERROR_F.
 ! OUTPUTS
 !  hdferr 	 - Returns 0 if successful and -1 if fails
 !
@@ -1604,24 +1484,22 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tset_strpad_f(type_id, strpad, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: strpad ! string padding method for a string datatype
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: strpad
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tset_strpad_c(type_id, strpad)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_STRPAD_C'::h5tset_strpad_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: strpad
-              END FUNCTION h5tset_strpad_c
-            END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5tset_strpad_c(type_id, strpad) BIND(C,NAME='h5tset_strpad_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: strpad
+       END FUNCTION h5tset_strpad_c
+    END INTERFACE
 
-            hdferr = h5tset_strpad_c(type_id, strpad)
-          END SUBROUTINE h5tset_strpad_f
+    hdferr = h5tset_strpad_c(type_id, strpad)
+  END SUBROUTINE h5tset_strpad_f
 
 !
 !****s* H5T/h5tget_nmembers_f
@@ -1649,25 +1527,22 @@ CONTAINS
 !
 ! SOURCE
   SUBROUTINE h5tget_nmembers_f(type_id, num_members, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: num_members !number of fields in a compound datatype
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: num_members
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tget_nmembers_c(type_id, num_members)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_NMEMBERS_C'::h5tget_nmembers_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: num_members
-              END FUNCTION h5tget_nmembers_c
-            END INTERFACE
-
-            hdferr = h5tget_nmembers_c(type_id, num_members)
-          END SUBROUTINE h5tget_nmembers_f
+    INTERFACE
+       INTEGER FUNCTION h5tget_nmembers_c(type_id, num_members) BIND(C,NAME='h5tget_nmembers_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) :: num_members
+       END FUNCTION h5tget_nmembers_c
+    END INTERFACE
+    
+    hdferr = h5tget_nmembers_c(type_id, num_members)
+  END SUBROUTINE h5tget_nmembers_f
 
 !
 !****s* H5T/h5tget_member_name_f
@@ -1696,30 +1571,27 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_member_name_f(type_id, index, member_name,  namelen, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: index !Field index (0-based) of the field name to retrieve
-            CHARACTER(LEN=*), INTENT(OUT) :: member_name !name of a field of
-                                                         !a compound datatype
-            INTEGER, INTENT(OUT) :: namelen ! Length of the name
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: index
+    CHARACTER(LEN=*), INTENT(OUT) :: member_name
+    INTEGER, INTENT(OUT) :: namelen
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_member_name_c(type_id, index, member_name, namelen)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_NAME_C'::h5tget_member_name_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference :: member_name
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: index
-              CHARACTER(LEN=*), INTENT(OUT) :: member_name
-              INTEGER, INTENT(OUT) :: namelen
-              END FUNCTION
-            END INTERFACE
-
-            hdferr = h5tget_member_name_c(type_id, index, member_name, namelen)
-          END SUBROUTINE h5tget_member_name_f
+    INTERFACE
+       INTEGER FUNCTION h5tget_member_name_c(type_id, index, member_name, namelen) BIND(C,NAME='h5tget_member_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: index
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: member_name
+         INTEGER, INTENT(OUT) :: namelen
+       END FUNCTION h5tget_member_name_c
+    END INTERFACE
+    
+    hdferr = h5tget_member_name_c(type_id, index, member_name, namelen)
+  END SUBROUTINE h5tget_member_name_f
 
 !
 !****s* H5T/h5tget_member_offset_f
@@ -1747,27 +1619,24 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_member_offset_f(type_id, member_no, offset, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: member_no !Number of the field
-                                                       !whose offset is requested
-            INTEGER(SIZE_T), INTENT(OUT) :: offset !byte offset of the beginning of the field
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: member_no
+    INTEGER(SIZE_T), INTENT(OUT) :: offset
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_member_offset_c(type_id, member_no, offset )
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_OFFSET_C'::h5tget_member_offset_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: member_no
-              INTEGER(SIZE_T), INTENT(OUT) :: offset
-              END FUNCTION h5tget_member_offset_c
-            END INTERFACE
-
-            hdferr = h5tget_member_offset_c(type_id, member_no, offset )
-          END SUBROUTINE h5tget_member_offset_f
+    INTERFACE
+       INTEGER FUNCTION h5tget_member_offset_c(type_id, member_no, offset ) BIND(C,NAME='h5tget_member_offset_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: member_no
+         INTEGER(SIZE_T), INTENT(OUT) :: offset
+       END FUNCTION h5tget_member_offset_c
+    END INTERFACE
+    
+    hdferr = h5tget_member_offset_c(type_id, member_no, offset )
+  END SUBROUTINE h5tget_member_offset_f
 !
 !****s* H5T/h5tget_member_index_f
 !
@@ -1791,32 +1660,30 @@ CONTAINS
 !
 ! SOURCE
   SUBROUTINE h5tget_member_index_f(type_id, name, index, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier
-            CHARACTER(LEN=*), INTENT(IN) :: name   ! Field or member name
-            INTEGER, INTENT(OUT) :: index          ! Field or member index
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(OUT) :: index
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTEGER :: namelen          ! Name length
-
-            INTERFACE
-              INTEGER FUNCTION h5tget_member_index_c(type_id, name, namelen, index)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_INDEX_C'::h5tget_member_index_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference ::name
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER, INTENT(IN)  :: namelen
-              INTEGER, INTENT(OUT) :: index
-              END FUNCTION h5tget_member_index_c
-            END INTERFACE
-
-            namelen = LEN(name)
-            hdferr = h5tget_member_index_c(type_id, name, namelen, index)
-          END SUBROUTINE h5tget_member_index_f
+    INTEGER :: namelen          ! Name length
 
+    INTERFACE
+       INTEGER FUNCTION h5tget_member_index_c(type_id, name, namelen, index) BIND(C,NAME='h5tget_member_index_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER, INTENT(IN)  :: namelen
+         INTEGER, INTENT(OUT) :: index
+       END FUNCTION h5tget_member_index_c
+    END INTERFACE
+    
+    namelen = LEN(name)
+    hdferr = h5tget_member_index_c(type_id, name, namelen, index)
+  END SUBROUTINE h5tget_member_index_f
+  
 
 !  !$!
 !  !$!****s* H5T/h5tget_member_dim_f
@@ -1887,27 +1754,23 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_array_dims_f(type_id, dims, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Array datatype identifier
-            INTEGER(HSIZE_T),DIMENSION(*), INTENT(OUT) ::  dims !buffer to store array datatype
-                                                                ! dimensions
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(HSIZE_T),DIMENSION(*), INTENT(OUT) :: dims
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tget_array_dims_c(type_id, dims)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_ARRAY_DIMS_C'::h5tget_array_dims_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(HSIZE_T),DIMENSION(*), INTENT(OUT) ::  dims
-              END FUNCTION h5tget_array_dims_c
-            END INTERFACE
-
-            hdferr = h5tget_array_dims_c(type_id, dims)
-
-          END SUBROUTINE h5tget_array_dims_f
+    INTERFACE
+       INTEGER FUNCTION h5tget_array_dims_c(type_id, dims) BIND(C,NAME='h5tget_array_dims_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HSIZE_T),DIMENSION(*), INTENT(OUT) ::  dims
+       END FUNCTION h5tget_array_dims_c
+    END INTERFACE
+    
+    hdferr = h5tget_array_dims_c(type_id, dims)
+    
+  END SUBROUTINE h5tget_array_dims_f
 
 !
 !****s* H5T/h5tget_array_ndims_f
@@ -1934,25 +1797,23 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_array_ndims_f(type_id, ndims, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Array datatype identifier
-            INTEGER, INTENT(OUT) ::  ndims ! number of array dimensions
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: ndims
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_array_ndims_c(type_id, ndims)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_ARRAY_NDIMS_C'::h5tget_array_ndims_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) ::  ndims
-              END FUNCTION h5tget_array_ndims_c
-            END INTERFACE
-
-            hdferr = h5tget_array_ndims_c(type_id, ndims)
-
-          END SUBROUTINE h5tget_array_ndims_f
+    INTERFACE
+       INTEGER FUNCTION h5tget_array_ndims_c(type_id, ndims) BIND(C,NAME='h5tget_array_ndims_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(OUT) ::  ndims
+       END FUNCTION h5tget_array_ndims_c
+    END INTERFACE
+    
+    hdferr = h5tget_array_ndims_c(type_id, ndims)
+    
+  END SUBROUTINE h5tget_array_ndims_f
 
 !
 !****s* H5T/h5tget_super_f
@@ -1966,7 +1827,7 @@ CONTAINS
 ! INPUTS
 !  type_id 	 - datatype identifier
 ! OUTPUTS
-!  base_type_id 	 - identifier of the base type
+!  base_type_id  - identifier of the base type
 !  hdferr 	 - Returns 0 if successful and -1 if fails
 !
 ! AUTHOR
@@ -1979,26 +1840,23 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_super_f(type_id, base_type_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! datatype identifier
-            INTEGER(HID_T), INTENT(OUT) :: base_type_id ! identifier of the datatype
-                                           ! from which datatype (type_id) was derived
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER(HID_T), INTENT(OUT) :: base_type_id
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_super_c(type_id, base_type_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_SUPER_C'::h5tget_super_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(HID_T), INTENT(OUT) :: base_type_id
-              END FUNCTION h5tget_super_c
-            END INTERFACE
-
-            hdferr = h5tget_super_c(type_id, base_type_id)
-
-          END SUBROUTINE h5tget_super_f
+    INTERFACE
+       INTEGER FUNCTION h5tget_super_c(type_id, base_type_id) BIND(C,NAME='h5tget_super_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER(HID_T), INTENT(OUT) :: base_type_id
+       END FUNCTION h5tget_super_c
+    END INTERFACE
+    
+    hdferr = h5tget_super_c(type_id, base_type_id)
+    
+  END SUBROUTINE h5tget_super_f
 
 !
 !****s* H5T/h5tget_member_type_f
@@ -2014,7 +1872,7 @@ CONTAINS
 !  field_idx 	 - field index (0-based)
 !
 ! OUTPUTS
-!  datatype 	 - idnetifier of the member's datatype
+!  datatype 	 - identifier of the member's datatype
 !  hdferr 	 - Returns 0 if successful and -1 if fails
 !
 ! AUTHOR
@@ -2027,27 +1885,25 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_member_type_f(type_id,  field_idx, datatype, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: field_idx !Field index (0-based) of the field type to retrieve
-            INTEGER(HID_T), INTENT(OUT) :: datatype !identifier of a copy of
-                                                    !the datatype of the field
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: field_idx
+    INTEGER(HID_T), INTENT(OUT) :: datatype
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_member_type_c(type_id, field_idx , datatype)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_TYPE_C'::h5tget_member_type_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: field_idx
-              INTEGER(HID_T), INTENT(OUT) :: datatype
-              END FUNCTION h5tget_member_type_c
-            END INTERFACE
-
-            hdferr = h5tget_member_type_c(type_id, field_idx , datatype)
-          END SUBROUTINE h5tget_member_type_f
+    INTERFACE
+       INTEGER FUNCTION h5tget_member_type_c(type_id, field_idx , datatype) &
+            BIND(C,NAME='h5tget_member_type_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: field_idx
+         INTEGER(HID_T), INTENT(OUT) :: datatype
+       END FUNCTION h5tget_member_type_c
+    END INTERFACE
+    
+    hdferr = h5tget_member_type_c(type_id, field_idx , datatype)
+  END SUBROUTINE h5tget_member_type_f
 
 !
 !****s* H5T/h5tcreate_f
@@ -2087,11 +1943,9 @@ CONTAINS
     INTEGER        , INTENT(OUT) :: hdferr
 !*****
     INTERFACE
-       INTEGER FUNCTION h5tcreate_c(class, size, type_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCREATE_C'::h5tcreate_c
-         !DEC$ENDIF
+       INTEGER FUNCTION h5tcreate_c(class, size, type_id) BIND(C,NAME='h5tcreate_c')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
          INTEGER, INTENT(IN) :: class
          INTEGER(SIZE_T), INTENT(IN) :: size
          INTEGER(HID_T), INTENT(OUT) :: type_id
@@ -2111,7 +1965,7 @@ CONTAINS
 !  Adds a new member to a compound datatype.
 !
 ! INPUTS
-!  type_id 	 - compound dattype identifier
+!  type_id 	 - compound datatype identifier
 !  name 	 - name of the field to insert
 !  offset 	 - start of the member in an instance of
 !                  the compound datatype
@@ -2129,36 +1983,32 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tinsert_f(type_id,  name, offset, field_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            CHARACTER(LEN=*), INTENT(IN) :: name !Name of the field to insert
-            INTEGER(SIZE_T), INTENT(IN) :: offset !start of the member in an instance of
-                                                   !the compound datatype
-            INTEGER(HID_T), INTENT(IN) :: field_id !datatype identifier of the new member
-
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(IN) :: name 
+    INTEGER(SIZE_T), INTENT(IN) :: offset
+    INTEGER(HID_T), INTENT(IN) :: field_id
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTEGER :: namelen
-
-            INTERFACE
-              INTEGER FUNCTION h5tinsert_c(type_id, name, namelen, offset, field_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TINSERT_C'::h5tinsert_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER(SIZE_T), INTENT(IN) :: offset
-              INTEGER(HID_T), INTENT(IN) :: field_id
-              INTEGER :: namelen
-              END FUNCTION h5tinsert_c
-            END INTERFACE
-
-            namelen = LEN(name)
-            hdferr = h5tinsert_c(type_id, name, namelen, offset, field_id )
-          END SUBROUTINE h5tinsert_f
+    INTEGER :: namelen
 
+    INTERFACE
+       INTEGER FUNCTION h5tinsert_c(type_id, name, namelen, offset, field_id) BIND(C,NAME='h5tinsert_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER(SIZE_T), INTENT(IN) :: offset
+         INTEGER(HID_T), INTENT(IN) :: field_id
+         INTEGER :: namelen
+       END FUNCTION h5tinsert_c
+    END INTERFACE
+            
+    namelen = LEN(name)
+    hdferr = h5tinsert_c(type_id, name, namelen, offset, field_id )
+  END SUBROUTINE h5tinsert_f
+  
 !
 !****s* H5T/h5tpack_f
 !
@@ -2183,24 +2033,21 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tpack_f(type_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tpack_c(type_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TPACK_C'::h5tpack_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              END FUNCTION h5tpack_c
-            END INTERFACE
-
-            hdferr = h5tpack_c(type_id)
-          END SUBROUTINE h5tpack_f
-
+    INTERFACE
+       INTEGER FUNCTION h5tpack_c(type_id) BIND(C,NAME='h5tpack_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+       END FUNCTION h5tpack_c
+    END INTERFACE
+    
+    hdferr = h5tpack_c(type_id)
+  END SUBROUTINE h5tpack_f
+  
 !  !$!
 !  !$!****s* H5T/h5tinsert_array_f
 !  !$!
@@ -2279,29 +2126,27 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tarray_create_f(base_id, rank, dims, type_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: base_id ! identifier of array base datatype
-            INTEGER, INTENT(IN) ::  rank ! Rank of the array
-            INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims !Sizes of each array dimension
-            INTEGER(HID_T), INTENT(OUT) :: type_id ! identifier of the array datatype
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: base_id
+    INTEGER, INTENT(IN) ::  rank
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims
+    INTEGER(HID_T), INTENT(OUT) :: type_id
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tarray_create_c(base_id, rank, dims, type_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TARRAY_CREATE_C'::h5tarray_create_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: base_id
-              INTEGER, INTENT(IN) ::  rank
-              INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims
-              INTEGER(HID_T), INTENT(OUT) :: type_id
-              END FUNCTION h5tarray_create_c
-            END INTERFACE
-
-            hdferr = h5tarray_create_c(base_id, rank, dims, type_id)
-
-         END SUBROUTINE h5tarray_create_f
+    INTERFACE
+       INTEGER FUNCTION h5tarray_create_c(base_id, rank, dims, type_id) BIND(C,NAME='h5tarray_create_c')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: base_id
+         INTEGER, INTENT(IN) ::  rank
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims
+         INTEGER(HID_T), INTENT(OUT) :: type_id
+       END FUNCTION h5tarray_create_c
+    END INTERFACE
+    
+    hdferr = h5tarray_create_c(base_id, rank, dims, type_id)
+    
+  END SUBROUTINE h5tarray_create_f
 
 !
 !****s* H5T/h5tenum_create_f
@@ -2328,28 +2173,23 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tenum_create_f(parent_id, new_type_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: parent_id  ! Datatype identifier for
-                                                     ! the  base datatype
-            INTEGER(HID_T), INTENT(OUT) :: new_type_id
-                                                     !datatype identifier for the
-                                                     ! new enumeration datatype
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: parent_id
+    INTEGER(HID_T), INTENT(OUT) :: new_type_id
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
 
-            INTERFACE
-              INTEGER FUNCTION h5tenum_create_c(parent_id, new_type_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TENUM_CREATE_C'::h5tenum_create_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: parent_id
-              INTEGER(HID_T), INTENT(OUT) :: new_type_id
-              END FUNCTION h5tenum_create_c
-            END INTERFACE
-
-            hdferr = h5tenum_create_c(parent_id, new_type_id)
-          END SUBROUTINE h5tenum_create_f
+    INTERFACE
+       INTEGER FUNCTION h5tenum_create_c(parent_id, new_type_id) BIND(C,NAME='h5tenum_create_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: parent_id
+         INTEGER(HID_T), INTENT(OUT) :: new_type_id
+       END FUNCTION h5tenum_create_c
+    END INTERFACE
+    
+    hdferr = h5tenum_create_c(parent_id, new_type_id)
+  END SUBROUTINE h5tenum_create_f
 !
 !****s* H5T/h5tenum_nameof_f
 !
@@ -2384,33 +2224,29 @@ CONTAINS
 !   characters the "name' may contain upon entry, depending on compiler implementation.
 ! SOURCE
   SUBROUTINE h5tenum_nameof_f(type_id,  value, namelen, name, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            CHARACTER(LEN=*), INTENT(OUT) :: name  !Name of the  enumeration datatype.
-            INTEGER(SIZE_T), INTENT(IN) :: namelen !length of the name
-            INTEGER, INTENT(IN) :: value !value of the  enumeration datatype.
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(OUT) :: name
+    INTEGER(SIZE_T), INTENT(IN) :: namelen
+    INTEGER, INTENT(IN) :: value
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
+    INTERFACE
+       INTEGER FUNCTION h5tenum_nameof_c(type_id, value, name, namelen) BIND(C,NAME='h5tenum_nameof_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: name
+         INTEGER(SIZE_T), INTENT(IN) :: namelen
+         INTEGER, INTENT(IN) :: value
+       END FUNCTION h5tenum_nameof_c
+    END INTERFACE
+    
+    name(1:LEN(name)) = ' '
 
-            INTERFACE
-              INTEGER FUNCTION h5tenum_nameof_c(type_id, value, name, namelen)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TENUM_NAMEOF_C'::h5tenum_nameof_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              CHARACTER(LEN=*), INTENT(OUT) :: name
-              INTEGER(SIZE_T), INTENT(IN) :: namelen
-              INTEGER, INTENT(IN) :: value
-              END FUNCTION h5tenum_nameof_c
-            END INTERFACE
-
-            name(1:LEN(name)) = ' '
-
-            hdferr = h5tenum_nameof_c(type_id, value, name, namelen)
-          END SUBROUTINE h5tenum_nameof_f
-
+    hdferr = h5tenum_nameof_c(type_id, value, name, namelen)
+  END SUBROUTINE h5tenum_nameof_f
 !
 !****s* H5T/h5tenum_valuof_f
 !
@@ -2439,31 +2275,30 @@ CONTAINS
 !
 ! SOURCE
   SUBROUTINE h5tenum_valueof_f(type_id,  name, value, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            CHARACTER(LEN=*), INTENT(IN) :: name  !Name of the  enumeration datatype.
-            INTEGER, INTENT(OUT) :: value !value of the  enumeration datatype.
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(OUT) :: value
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTEGER :: namelen
-
-            INTERFACE
-              INTEGER FUNCTION h5tenum_valueof_c(type_id, name, namelen,  value)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TENUM_VALUEOF_C'::h5tenum_valueof_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER, INTENT(IN) :: namelen
-              INTEGER, INTENT(OUT) :: value
-              END FUNCTION h5tenum_valueof_c
-            END INTERFACE
-
-            namelen = LEN(name)
-            hdferr = h5tenum_valueof_c(type_id, name, namelen,  value)
-          END SUBROUTINE h5tenum_valueof_f
+    INTEGER :: namelen
+
+    INTERFACE
+       INTEGER FUNCTION h5tenum_valueof_c(type_id, name, namelen,  value) &
+            BIND(C,NAME='h5tenum_valueof_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
+         INTEGER, INTENT(IN) :: namelen
+         INTEGER, INTENT(OUT) :: value
+       END FUNCTION h5tenum_valueof_c
+    END INTERFACE
+    
+    namelen = LEN(name)
+    hdferr = h5tenum_valueof_c(type_id, name, namelen,  value)
+  END SUBROUTINE h5tenum_valueof_f
 
 !
 !****s* H5T/h5tget_member_value_f
@@ -2491,28 +2326,26 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_member_value_f(type_id,  member_no, value, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER, INTENT(IN) :: member_no !Number of the enumeration datatype member
-            INTEGER, INTENT(OUT) :: value !value of the  enumeration datatype.
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN) :: member_no
+    INTEGER, INTENT(OUT) :: value
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-
-            INTERFACE
-              INTEGER FUNCTION h5tget_member_value_c(type_id, member_no, value)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_VALUE_C'::h5tget_member_value_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN) :: member_no
-              INTEGER, INTENT(OUT) :: value
-              END FUNCTION
-            END INTERFACE
-
-            hdferr = h5tget_member_value_c(type_id, member_no, value)
-          END SUBROUTINE h5tget_member_value_f
-
+    INTERFACE
+       INTEGER FUNCTION h5tget_member_value_c(type_id, member_no, value) &
+            BIND(C,NAME='h5tget_member_value_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN) :: member_no
+         INTEGER, INTENT(OUT) :: value
+       END FUNCTION h5tget_member_value_c
+    END INTERFACE
+    
+    hdferr = h5tget_member_value_c(type_id, member_no, value)
+  END SUBROUTINE h5tget_member_value_f
+          
 !
 !****s* H5T/h5tset_tag_f
 !
@@ -2539,31 +2372,28 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tset_tag_f(type_id, tag, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            CHARACTER(LEN=*), INTENT(IN) :: tag !Unique ASCII string with which
-                                                !the opaque datatype is to be tagged
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(IN) :: tag
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTEGER :: taglen
-
-            INTERFACE
-              INTEGER FUNCTION h5tset_tag_c(type_id, tag, taglen)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TSET_TAG_C'::h5tset_tag_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference :: tag
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              CHARACTER(LEN=*), INTENT(IN) :: tag
-              INTEGER :: taglen
-              END FUNCTION h5tset_tag_c
-            END INTERFACE
-
-            taglen = LEN(tag)
-            hdferr = h5tset_tag_c(type_id, tag, taglen)
-          END SUBROUTINE h5tset_tag_f
-
+    INTEGER :: taglen
+    
+    INTERFACE
+       INTEGER FUNCTION h5tset_tag_c(type_id, tag, taglen) BIND(C,NAME='h5tset_tag_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: tag
+         INTEGER :: taglen
+       END FUNCTION h5tset_tag_c
+    END INTERFACE
+    
+    taglen = LEN(tag)
+    hdferr = h5tset_tag_c(type_id, tag, taglen)
+  END SUBROUTINE h5tset_tag_f
+  
 !
 !****s* H5T/h5tget_tag_f
 !
@@ -2578,6 +2408,7 @@ CONTAINS
 ! OUTPUTS
 !  tag 	         - unique ASCII string associated with opaque
 !                  datatype
+!  taglen        - Length of tag
 !  hdferr 	 - Returns 0 if successful and -1 if fails
 !
 ! AUTHOR
@@ -2590,33 +2421,30 @@ CONTAINS
 !  port).  March 7, 2001
 ! SOURCE
   SUBROUTINE h5tget_tag_f(type_id, tag,taglen, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            CHARACTER(LEN=*), INTENT(OUT) :: tag  ! Unique ASCII string with which
-                                                  !  the opaque datatype is to be tagged
-            INTEGER, INTENT(OUT) :: taglen        ! Length of tag
-            INTEGER(SIZE_T)      :: tag_size      ! Declared character length of tab 
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(OUT) :: tag
+    INTEGER, INTENT(OUT) :: taglen
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_tag_c(type_id, tag, tag_size, taglen)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_TAG_C'::h5tget_tag_c
-              !DEC$ENDIF
-              !DEC$ATTRIBUTES reference :: tag
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              CHARACTER(LEN=*), INTENT(OUT) :: tag
-              INTEGER(SIZE_T), INTENT(IN) :: tag_size
-              INTEGER, INTENT(OUT) :: taglen
-              END FUNCTION h5tget_tag_c
-            END INTERFACE
-
-            tag_size = LEN(tag)
-
-            hdferr = h5tget_tag_c(type_id, tag, tag_size, taglen )
-          END SUBROUTINE h5tget_tag_f
-
+    INTEGER(SIZE_T):: tag_size      ! Declared character length of tab 
+    INTERFACE
+       INTEGER FUNCTION h5tget_tag_c(type_id, tag, tag_size, taglen) &
+            BIND(C,NAME='h5tget_tag_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: tag
+         INTEGER(SIZE_T), INTENT(IN) :: tag_size
+         INTEGER, INTENT(OUT) :: taglen
+       END FUNCTION h5tget_tag_c
+    END INTERFACE
+    
+    tag_size = LEN(tag)
+    hdferr = h5tget_tag_c(type_id, tag, tag_size, taglen )
+  END SUBROUTINE h5tget_tag_f
+  
 !
 !****s* H5T/h5tvlen_create_f
 !
@@ -2641,24 +2469,22 @@ CONTAINS
 !
 ! SOURCE
   SUBROUTINE h5tvlen_create_f(type_id, vltype_id, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN)  :: type_id    ! Datatype identifier
-            INTEGER(HID_T), INTENT(OUT) :: vltype_id  ! VL datatype identifier
-            INTEGER, INTENT(OUT) :: hdferr            ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN)  :: type_id
+    INTEGER(HID_T), INTENT(OUT) :: vltype_id
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tvlen_create_c(type_id, vltype_id)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TVLEN_CREATE_C'::h5tvlen_create_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN)  :: type_id
-              INTEGER(HID_T), INTENT(OUT) :: vltype_id
-              END FUNCTION h5tvlen_create_c
-            END INTERFACE
-
-            hdferr = h5tvlen_create_c(type_id, vltype_id)
-          END SUBROUTINE h5tvlen_create_f
+    INTERFACE
+       INTEGER FUNCTION h5tvlen_create_c(type_id, vltype_id) BIND(C,NAME='h5tvlen_create_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN)  :: type_id
+         INTEGER(HID_T), INTENT(OUT) :: vltype_id
+       END FUNCTION h5tvlen_create_c
+    END INTERFACE
+    
+    hdferr = h5tvlen_create_c(type_id, vltype_id)
+  END SUBROUTINE h5tvlen_create_f
 
 !
 !****s* H5T/h5tis_variable_str_f
@@ -2673,7 +2499,7 @@ CONTAINS
 !  type_id 	 - datartpe identifier
 ! OUTPUTS
 !  status 	 - flag to indicate if datatype
-!                  is a variable string
+!                  is a variable string ( TRUE or FALSE)
 !  hdferr 	 - Returns 0 if successful and -1 if fails
 !
 ! AUTHOR
@@ -2682,32 +2508,29 @@ CONTAINS
 !
 ! SOURCE
   SUBROUTINE h5tis_variable_str_f(type_id, status, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier
-            LOGICAL, INTENT(OUT) :: status      ! Flag, idicates if datatype
-                                                ! is a variable string or not ( TRUE or
-                                                ! FALSE)
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    LOGICAL, INTENT(OUT) :: status 
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTEGER :: flag                     ! "TRUE/FALSE/ERROR from C"
-
-            INTERFACE
-              INTEGER FUNCTION h5tis_variable_str_c(type_id, flag)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TIS_VARIABLE_STR_C'::h5tis_variable_str_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER :: flag
-              END FUNCTION h5tis_variable_str_c
-            END INTERFACE
-
-            hdferr = h5tis_variable_str_c(type_id, flag)
-            status = .TRUE.
-            if (flag .EQ. 0) status = .FALSE.
-
-          END SUBROUTINE h5tis_variable_str_f
-
+    INTEGER :: flag                     ! "TRUE/FALSE/ERROR from C"
+    
+    INTERFACE
+       INTEGER FUNCTION h5tis_variable_str_c(type_id, flag) &
+            BIND(C,NAME='h5tis_variable_str_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER :: flag
+       END FUNCTION h5tis_variable_str_c
+    END INTERFACE
+    
+    hdferr = h5tis_variable_str_c(type_id, flag)
+    status = .TRUE.
+    IF (flag .EQ. 0) status = .FALSE.
+    
+  END SUBROUTINE h5tis_variable_str_f
+  
 !
 !****s* H5T/h5tget_member_class_f
 !
@@ -2743,27 +2566,26 @@ CONTAINS
 !
 ! SOURCE
   SUBROUTINE h5tget_member_class_f(type_id, member_no, class, hdferr)
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier
-            INTEGER, INTENT(IN)       :: member_no  ! Member number
-            INTEGER, INTENT(OUT)     :: class      ! Member class
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    INTEGER, INTENT(IN)       :: member_no
+    INTEGER, INTENT(OUT)     :: class
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
-            INTERFACE
-              INTEGER FUNCTION h5tget_member_class_c(type_id, member_no, class)
-              USE H5GLOBAL
-              !DEC$IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_CLASS_C'::h5tget_member_class_c
-              !DEC$ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN)       :: member_no
-              INTEGER, INTENT(OUT)     :: class
-              END FUNCTION h5tget_member_class_c
-            END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5tget_member_class_c(type_id, member_no, class) &
+            BIND(C,NAME='h5tget_member_class_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN) :: type_id
+         INTEGER, INTENT(IN)       :: member_no
+         INTEGER, INTENT(OUT)     :: class
+       END FUNCTION h5tget_member_class_c
+    END INTERFACE
 
-            hdferr = h5tget_member_class_c(type_id, member_no, class)
+    hdferr = h5tget_member_class_c(type_id, member_no, class)
 
-          END SUBROUTINE h5tget_member_class_f
+  END SUBROUTINE h5tget_member_class_f
 
 !
 !****s* H5T/h5tcommit_anon_f
@@ -2796,27 +2618,20 @@ CONTAINS
 ! SOURCE
   SUBROUTINE h5tcommit_anon_f(loc_id, dtype_id, hdferr, tcpl_id, tapl_id)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id  ! A file or group identifier specifying
-                                          ! the file in which the new named datatype
-                                          ! is to be created.
-    INTEGER(HID_T), INTENT(IN) :: dtype_id  ! Datatype identifier
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tcpl_id ! A datatype creation property
-                                                    ! list identifier.
-                                                    ! (H5P_DEFAULT_F for the default property list.)
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tapl_id ! A datatype access property list identifier.
-                                                    ! should always be passed as the value H5P_DEFAULT_F.
+    INTEGER(HID_T), INTENT(IN) :: loc_id
+    INTEGER(HID_T), INTENT(IN) :: dtype_id
+    INTEGER, INTENT(OUT) :: hdferr
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tcpl_id
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tapl_id
 !*****
     INTEGER(HID_T) :: tcpl_id_default
     INTEGER(HID_T) :: tapl_id_default
 
     INTERFACE
        INTEGER FUNCTION h5tcommit_anon_c(loc_id, dtype_id, &
-            tcpl_id_default, tapl_id_default)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCOMMIT_ANON_C'::h5tcommit_anon_c
-         !DEC$ENDIF
+            tcpl_id_default, tapl_id_default) BIND(C,NAME='h5tcommit_anon_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
          INTEGER(HID_T), INTENT(IN) :: loc_id
          INTEGER(HID_T), INTENT(IN) :: dtype_id
          INTEGER(HID_T) :: tcpl_id_default
@@ -2858,19 +2673,14 @@ CONTAINS
 ! SOURCE
   SUBROUTINE h5tcommitted_f(dtype_id, committed, hdferr)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dtype_id  ! A datatype identifier
-    LOGICAL, INTENT(OUT) :: committed ! .TRUE., if the datatype has been committed
-                                      !.FALSE., if the datatype has not been committed.
-    INTEGER, INTENT(OUT) :: hdferr     ! Error code:
-!  Success:  0
-!  Failure: -1
+    INTEGER(HID_T), INTENT(IN) :: dtype_id
+    LOGICAL, INTENT(OUT) :: committed
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
     INTERFACE
-       INTEGER FUNCTION h5tcommitted_c(dtype_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCOMMITTED_C'::h5tcommitted_c
-         !DEC$ENDIF
+       INTEGER FUNCTION h5tcommitted_c(dtype_id) BIND(C,NAME='h5tcommitted_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
          INTEGER(HID_T), INTENT(IN) :: dtype_id
        END FUNCTION h5tcommitted_c
     END INTERFACE
@@ -2887,7 +2697,6 @@ CONTAINS
        hdferr = -1
     ENDIF
 
-
   END SUBROUTINE h5tcommitted_f
 
 !
@@ -2899,10 +2708,10 @@ CONTAINS
 ! PURPOSE
 !  Decode a binary object description of data type and return a new object handle.
 ! INPUTS
-!  buf 	         -  Buffer for the data space object to be decoded.
-!  obj_id 	 - Object ID
+!  buf 	   - Buffer for the data space object to be decoded.
+!  obj_id  - Object ID
 ! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
+!  hdferr - Returns 0 if successful and -1 if fails
 !
 ! AUTHOR
 !  M. Scot Breitenfeld
@@ -2911,18 +2720,16 @@ CONTAINS
 ! SOURCE
   SUBROUTINE h5tdecode_f(buf, obj_id, hdferr)
     IMPLICIT NONE
-    CHARACTER(LEN=*), INTENT(IN) :: buf ! Buffer for the data space object to be decoded.
-    INTEGER(HID_T), INTENT(OUT) :: obj_id  ! Object ID
-    INTEGER, INTENT(OUT) :: hdferr     ! Error code
+    CHARACTER(LEN=*), INTENT(IN) :: buf
+    INTEGER(HID_T), INTENT(OUT) :: obj_id 
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
     INTERFACE
-       INTEGER FUNCTION h5tdecode_c(buf, obj_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TDECODE_C'::h5tdecode_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
-         CHARACTER(LEN=*), INTENT(IN) :: buf
+       INTEGER FUNCTION h5tdecode_c(buf, obj_id) BIND(C,NAME='h5tdecode_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: buf
          INTEGER(HID_T), INTENT(OUT) :: obj_id  ! Object ID
        END FUNCTION h5tdecode_c
     END INTERFACE
@@ -2954,21 +2761,19 @@ CONTAINS
 ! SOURCE
   SUBROUTINE h5tencode_f(obj_id, buf, nalloc, hdferr)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id ! Identifier of the object to be encoded.
-    CHARACTER(LEN=*), INTENT(OUT) :: buf ! Buffer for the object to be encoded into.
-    INTEGER(SIZE_T), INTENT(INOUT) :: nalloc ! The size of the allocated buffer.
-    INTEGER, INTENT(OUT) :: hdferr     ! Error code
+    INTEGER(HID_T), INTENT(IN) :: obj_id
+    CHARACTER(LEN=*), INTENT(OUT) :: buf
+    INTEGER(SIZE_T), INTENT(INOUT) :: nalloc
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
 
     INTERFACE
-       INTEGER FUNCTION h5tencode_c(buf, obj_id, nalloc)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TENCODE_C'::h5tencode_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: buf
+       INTEGER FUNCTION h5tencode_c(buf, obj_id, nalloc) BIND(C,NAME='h5tencode_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
          INTEGER(HID_T), INTENT(IN) :: obj_id
-         CHARACTER(LEN=*), INTENT(OUT) :: buf
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: buf
          INTEGER(SIZE_T), INTENT(INOUT) :: nalloc
        END FUNCTION h5tencode_c
     END INTERFACE
@@ -2999,17 +2804,14 @@ CONTAINS
 ! SOURCE
   SUBROUTINE h5tget_create_plist_f(dtype_id, dtpl_id, hdferr)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dtype_id  ! Datatype identifier
-    INTEGER(HID_T), INTENT(OUT) :: dtpl_id  ! Datatype property list identifier.
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
-                                         ! 0 on success and -1 on failure
+    INTEGER(HID_T), INTENT(IN) :: dtype_id 
+    INTEGER(HID_T), INTENT(OUT) :: dtpl_id
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
     INTERFACE
-       INTEGER FUNCTION h5tget_create_plist_c(dtype_id, dtpl_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_CREATE_PLIST_C'::h5tget_create_plist_c
-         !DEC$ENDIF
+       INTEGER FUNCTION h5tget_create_plist_c(dtype_id, dtpl_id) BIND(C,NAME='h5tget_create_plist_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
          INTEGER(HID_T), INTENT(IN) :: dtype_id
          INTEGER(HID_T), INTENT(OUT) :: dtpl_id
        END FUNCTION h5tget_create_plist_c
@@ -3040,20 +2842,17 @@ CONTAINS
 ! SOURCE
   SUBROUTINE h5tcompiler_conv_f( src_id, dst_id, flag, hdferr)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: src_id ! Identifier for the source datatype.
-    INTEGER(HID_T), INTENT(IN) :: dst_id ! Identifier for the destination datatype.
-    LOGICAL, INTENT(OUT) :: flag  ! .TRUE. for compiler conversion, .FALSE. for library conversion
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code:
-                                    ! 0 on success and -1 on failure
+    INTEGER(HID_T), INTENT(IN) :: src_id
+    INTEGER(HID_T), INTENT(IN) :: dst_id
+    LOGICAL, INTENT(OUT) :: flag
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
     INTEGER :: c_flag
 
     INTERFACE
-       INTEGER FUNCTION h5tcompiler_conv_c(src_id, dst_id, c_flag)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCOMPILER_CONV_C'::h5tcompiler_conv_c
-         !DEC$ENDIF
+       INTEGER FUNCTION h5tcompiler_conv_c(src_id, dst_id, c_flag) BIND(C,NAME='h5tcompiler_conv_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
          INTEGER(HID_T), INTENT(IN) :: src_id
          INTEGER(HID_T), INTENT(IN) :: dst_id
          INTEGER :: c_flag
@@ -3080,9 +2879,10 @@ CONTAINS
 !  dtype_id 	 - Datatype identifier for the dataset datatype.
 !  
 !  direction 	 - Direction of search:
-!                  H5T_DIR_DEFAULT     = 0,    /*default direction is inscendent */
-!                  H5T_DIR_ASCEND      = 1,    /*in inscendent order             */
-!                  H5T_DIR_DESCEND     = 2     /*in descendent order             */
+!                  H5T_DIR_DEFAULT,   default direction is inscendent,
+!                  H5T_DIR_ASCEND ,   in inscendent order,
+!                  H5T_DIR_DESCEND,   in descendent order.
+!
 !  * NOTE: In C it is defined as a structure: H5T_direction_t
 !
 ! OUTPUTS
@@ -3094,20 +2894,15 @@ CONTAINS
 ! SOURCE
   SUBROUTINE h5tget_native_type_f(dtype_id, direction, native_dtype_id, hdferr)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dtype_id  ! Datatype identifier
-    INTEGER, INTENT(IN) :: direction  ! Direction of search:
-                                      ! H5T_DIR_ASCEND_F      = 1  in inscendent order
-                                      ! H5T_DIR_DESCEND_F     = 2  in descendent order
-    INTEGER(HID_T), INTENT(OUT) :: native_dtype_id  ! The native datatype identifier
-    INTEGER, INTENT(OUT) :: hdferr    ! Error code:
-                                      ! 0 on success and -1 on failure
+    INTEGER(HID_T), INTENT(IN) :: dtype_id 
+    INTEGER, INTENT(IN) :: direction 
+    INTEGER(HID_T), INTENT(OUT) :: native_dtype_id
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
     INTERFACE
-       INTEGER FUNCTION h5tget_native_type_c(dtype_id, direction, native_dtype_id)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TGET_NATIVE_TYPE_C'::h5tget_native_type_c
-         !DEC$ENDIF
+       INTEGER FUNCTION h5tget_native_type_c(dtype_id, direction, native_dtype_id) BIND(C,NAME='h5tget_native_type_c')
+         IMPORT :: HID_T
+         IMPLICIT NONE
          INTEGER(HID_T), INTENT(IN) :: dtype_id
          INTEGER, INTENT(IN) :: direction
          INTEGER(HID_T), INTENT(OUT) :: native_dtype_id
@@ -3143,7 +2938,6 @@ CONTAINS
 !
 ! Fortran2003 Interface:
   SUBROUTINE h5tconvert_f(src_id, dst_id, nelmts, buf, hdferr, background, plist_id)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T) , INTENT(IN)               :: src_id
     INTEGER(HID_T) , INTENT(IN)               :: dst_id
@@ -3159,8 +2953,8 @@ CONTAINS
     INTERFACE
        INTEGER FUNCTION h5tconvert_c(src_id, dst_id, nelmts, buf, background, plist_id) &
             BIND(C, NAME='h5tconvert_c')
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-         USE H5GLOBAL
+         IMPORT :: c_ptr
+         IMPORT :: HID_T, SIZE_T
          IMPLICIT NONE
          INTEGER(HID_T) , INTENT(IN)           :: src_id
          INTEGER(HID_T) , INTENT(IN)           :: dst_id
@@ -3207,21 +3001,19 @@ CONTAINS
 ! SOURCE
   SUBROUTINE h5tenum_insert_f90(type_id,  name, value, hdferr)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  !Name of  the new member
-    INTEGER, INTENT(IN) :: value ! value of the new member
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    CHARACTER(LEN=*), INTENT(IN) :: name
+    INTEGER, INTENT(IN) :: value
+    INTEGER, INTENT(OUT) :: hdferr
 !*****
     INTEGER :: namelen
     INTERFACE
-       INTEGER FUNCTION h5tenum_insert_c(type_id, name, namelen, value)
-         USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TENUM_INSERT_C'::h5tenum_insert_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
+       INTEGER FUNCTION h5tenum_insert_c(type_id, name, namelen, value) BIND(C,NAME='h5tenum_insert_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
          INTEGER(HID_T), INTENT(IN) :: type_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
          INTEGER, INTENT(IN) :: value
          INTEGER :: namelen
        END FUNCTION h5tenum_insert_c
@@ -3255,8 +3047,6 @@ CONTAINS
 !  F2003 implementation of function
 ! SOURCE
   SUBROUTINE h5tenum_insert_f03(type_id, name, value, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr, c_char
-    USE H5GLOBAL
     IMPLICIT NONE
     INTEGER(HID_T)  , INTENT(IN) :: type_id
     CHARACTER(LEN=*), INTENT(IN) :: name
@@ -3268,10 +3058,10 @@ CONTAINS
     INTERFACE
        INTEGER FUNCTION h5tenum_insert_ptr_c(type_id, name, namelen, value) &
             BIND(C, NAME='h5tenum_insert_ptr_c')
-         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr, c_char
-         USE H5GLOBAL
+         IMPORT :: C_CHAR, C_PTR
+         IMPORT :: HID_T
          IMPLICIT NONE
-         INTEGER(HID_T)  , INTENT(IN) :: type_id
+         INTEGER(HID_T), INTENT(IN) :: type_id
          CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
          INTEGER :: namelen
          TYPE(C_PTR), VALUE :: value
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index fe3d37a..5140f30 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -498,135 +498,72 @@ H5_FCDLL int_f nh5arename_c( hid_t_f *loc_id,
 /*
  * Functions form H5Tf.c file
  */
-#define nh5topen_c         H5_FC_FUNC_(h5topen_c, H5TOPEN_C)
-#define nh5tcommit_c       H5_FC_FUNC_(h5tcommit_c, H5TCOMMIT_C)
-#define nh5tcommitted_c    H5_FC_FUNC_(h5tcommitted_c, H5TCOMMITTED_C)
-#define nh5tclose_c        H5_FC_FUNC_(h5tclose_c, H5TCLOSE_C)
-#define nh5tcopy_c         H5_FC_FUNC_(h5tcopy_c, H5TCOPY_C)
-#define nh5tequal_c        H5_FC_FUNC_(h5tequal_c, H5TEQUAL_C)
-#define nh5tget_class_c    H5_FC_FUNC_(h5tget_class_c, H5TGET_CLASS_C)
-#define nh5tget_order_c    H5_FC_FUNC_(h5tget_order_c, H5TGET_ORDER_C)
-#define nh5tset_order_c    H5_FC_FUNC_(h5tset_order_c, H5TSET_ORDER_C)
-#define nh5tget_size_c     H5_FC_FUNC_(h5tget_size_c, H5TGET_SIZE_C)
-#define nh5tset_size_c     H5_FC_FUNC_(h5tset_size_c, H5TSET_SIZE_C)
-#define nh5tget_precision_c     H5_FC_FUNC_(h5tget_precision_c, H5TGET_PRECISION_C)
-#define nh5tset_precision_c     H5_FC_FUNC_(h5tset_precision_c, H5TSET_PRECISION_C)
-#define nh5tget_offset_c        H5_FC_FUNC_(h5tget_offset_c, H5TGET_OFFSET_C)
-#define nh5tset_offset_c        H5_FC_FUNC_(h5tset_offset_c, H5TSET_OFFSET_C)
-#define nh5tget_pad_c        H5_FC_FUNC_(h5tget_pad_c, H5TGET_PAD_C)
-#define nh5tset_pad_c        H5_FC_FUNC_(h5tset_pad_c, H5TSET_PAD_C)
-#define nh5tget_sign_c       H5_FC_FUNC_(h5tget_sign_c, H5TGET_SIGN_C)
-#define nh5tset_sign_c       H5_FC_FUNC_(h5tset_sign_c, H5TSET_SIGN_C)
-#define nh5tget_fields_c       H5_FC_FUNC_(h5tget_fields_c, H5TGET_FIELDS_C)
-#define nh5tset_fields_c       H5_FC_FUNC_(h5tset_fields_c, H5TSET_FIELDS_C)
-#define nh5tget_ebias_c     H5_FC_FUNC_(h5tget_ebias_c, H5TGET_EBIAS_C)
-#define nh5tset_ebias_c     H5_FC_FUNC_(h5tset_ebias_c, H5TSET_EBIAS_C)
-#define nh5tget_norm_c     H5_FC_FUNC_(h5tget_norm_c, H5TGET_NORM_C)
-#define nh5tset_norm_c     H5_FC_FUNC_(h5tset_norm_c, H5TSET_NORM_C)
-#define nh5tget_inpad_c        H5_FC_FUNC_(h5tget_inpad_c, H5TGET_INPAD_C)
-#define nh5tset_inpad_c        H5_FC_FUNC_(h5tset_inpad_c, H5TSET_INPAD_C)
-#define nh5tget_cset_c        H5_FC_FUNC_(h5tget_cset_c, H5TGET_CSET_C)
-#define nh5tset_cset_c        H5_FC_FUNC_(h5tset_cset_c, H5TSET_CSET_C)
-#define nh5tget_strpad_c        H5_FC_FUNC_(h5tget_strpad_c, H5TGET_STRPAD_C)
-#define nh5tset_strpad_c        H5_FC_FUNC_(h5tset_strpad_c, H5TSET_STRPAD_C)
-#define nh5tget_nmembers_c        H5_FC_FUNC_(h5tget_nmembers_c, H5TGET_NMEMBERS_C)
-#define nh5tget_member_name_c        H5_FC_FUNC_(h5tget_member_name_c, H5TGET_MEMBER_NAME_C)
-#define nh5tget_member_offset_c        H5_FC_FUNC_(h5tget_member_offset_c, H5TGET_MEMBER_OFFSET_C)
-#define nh5tget_member_dims_c        H5_FC_FUNC_(h5tget_member_dims_c, H5TGET_MEMBER_DIMS_C)
-#define nh5tget_member_type_c        H5_FC_FUNC_(h5tget_member_type_c, H5TGET_MEMBER_TYPE_C)
-#define nh5tget_member_index_c        H5_FC_FUNC_(h5tget_member_index_c, H5TGET_MEMBER_INDEX_C)
-#define nh5tinsert_c        H5_FC_FUNC_(h5tinsert_c, H5TINSERT_C)
-#define nh5tcreate_c        H5_FC_FUNC_(h5tcreate_c, H5TCREATE_C)
-#define nh5tpack_c                   H5_FC_FUNC_(h5tpack_c, H5TPACK_C)
-#define nh5tinsert_array_c           H5_FC_FUNC_(h5tinsert_array_c, H5TINSERT_ARRAY_C)
-#define nh5tinsert_array_c2           H5_FC_FUNC_(h5tinsert_array_c2, H5TINSERT_ARRAY_C2)
-#define nh5tenum_create_c             H5_FC_FUNC_(h5tenum_create_c, H5TENUM_CREATE_C)
-#define nh5tenum_insert_c             H5_FC_FUNC_(h5tenum_insert_c, H5TENUM_INSERT_C)
-#define nh5tenum_nameof_c             H5_FC_FUNC_(h5tenum_nameof_c, H5TENUM_NAMEOF_C)
-#define nh5tenum_valueof_c             H5_FC_FUNC_(h5tenum_valueof_c, H5TENUM_VALUEOF_C)
-#define nh5tget_member_value_c         H5_FC_FUNC_(h5tget_member_value_c, H5TGET_MEMBER_VALUE_C)
-#define nh5tset_tag_c                  H5_FC_FUNC_(h5tset_tag_c, H5TSET_TAG_C)
-#define nh5tget_tag_c                  H5_FC_FUNC_(h5tget_tag_c, H5TGET_TAG_C)
-#define nh5tarray_create_c             H5_FC_FUNC_(h5tarray_create_c, H5TARRAY_CREATE_C)
-#define nh5tget_array_ndims_c          H5_FC_FUNC_(h5tget_array_ndims_c, H5TGET_ARRAY_NDIMS_C)
-#define nh5tget_array_dims_c          H5_FC_FUNC_(h5tget_array_dims_c, H5TGET_ARRAY_DIMS_C)
-#define nh5tget_super_c               H5_FC_FUNC_(h5tget_super_c, H5TGET_SUPER_C)
-#define nh5tvlen_create_c               H5_FC_FUNC_(h5tvlen_create_c, H5TVLEN_CREATE_C)
-#define nh5tis_variable_str_c         H5_FC_FUNC_(h5tis_variable_str_c, H5TIS_VARIABLE_STR_C)
-#define nh5tget_member_class_c         H5_FC_FUNC_(h5tget_member_class_c, H5TGET_MEMBER_CLASS_C)
-#define nh5tcommit_anon_c       H5_FC_FUNC_(h5tcommit_anon_c, H5TCOMMIT_ANON_C)
-#define nh5tdecode_c    H5_FC_FUNC_(h5tdecode_c, H5TDECODE_C)
-#define nh5tencode_c    H5_FC_FUNC_(h5tencode_c, H5TENCODE_C)
-#define nh5tget_create_plist_c H5_FC_FUNC_(h5tget_create_plist_c, H5TGET_CREATE_PLIST_C)
-#define nh5tcompiler_conv_c H5_FC_FUNC_(h5tcompiler_conv_c, H5TCOMPILER_CONV_C)
-#define nh5tget_native_type_c H5_FC_FUNC_(h5tget_native_type_c, H5TGET_NATIVE_TYPE_C )
 
-H5_FCDLL int_f nh5tcreate_c(int_f *cls, size_t_f *size, hid_t_f *type_id);
-H5_FCDLL int_f nh5topen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *tapl_id );
-H5_FCDLL int_f nh5tcommit_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *lcpl_id, hid_t_f *tcpl_id, hid_t_f *tapl_id);
-H5_FCDLL int_f nh5tclose_c ( hid_t_f *type_id );
-H5_FCDLL int_f nh5tequal_c ( hid_t_f *type1_id , hid_t_f *type2_id, int_f *c_flag);
-H5_FCDLL int_f nh5tcopy_c ( hid_t_f *type_id , hid_t_f *new_type_id);
-H5_FCDLL int_f nh5tget_class_c ( hid_t_f *type_id , int_f *classtype);
-H5_FCDLL int_f nh5tget_order_c ( hid_t_f *type_id , int_f *order);
-H5_FCDLL int_f nh5tset_order_c ( hid_t_f *type_id , int_f *order);
-H5_FCDLL int_f nh5tget_size_c ( hid_t_f *type_id , size_t_f *size);
-H5_FCDLL int_f nh5tset_size_c ( hid_t_f *type_id , size_t_f *size);
-H5_FCDLL int_f nh5tcommitted_c (hid_t_f *dtype_id);
-H5_FCDLL int_f nh5tget_precision_c ( hid_t_f *type_id , size_t_f *precision);
-H5_FCDLL int_f nh5tset_precision_c ( hid_t_f *type_id , size_t_f *precision);
-H5_FCDLL int_f nh5tget_offset_c ( hid_t_f *type_id , size_t_f *offset);
-H5_FCDLL int_f nh5tset_offset_c ( hid_t_f *type_id , size_t_f *offset);
-H5_FCDLL int_f nh5tget_pad_c ( hid_t_f *type_id , int_f * lsbpad, int_f * msbpad);
-H5_FCDLL int_f nh5tset_pad_c ( hid_t_f *type_id, int_f * lsbpad, int_f * msbpad );
-H5_FCDLL int_f nh5tget_sign_c ( hid_t_f *type_id , int_f* sign);
-H5_FCDLL int_f nh5tset_sign_c ( hid_t_f *type_id , int_f *sign);
-H5_FCDLL int_f nh5tget_fields_c ( hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f* esize, size_t_f* mpos, size_t_f* msize);
-H5_FCDLL int_f nh5tset_fields_c ( hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f* esize, size_t_f* mpos, size_t_f* msize);
-H5_FCDLL int_f nh5tget_ebias_c ( hid_t_f *type_id , size_t_f *ebias);
-H5_FCDLL int_f nh5tset_ebias_c ( hid_t_f *type_id , size_t_f *ebias);
-H5_FCDLL int_f nh5tget_norm_c ( hid_t_f *type_id , int_f *norm);
-H5_FCDLL int_f nh5tset_norm_c ( hid_t_f *type_id , int_f *norm);
-H5_FCDLL int_f nh5tget_inpad_c ( hid_t_f *type_id, int_f * padtype);
-H5_FCDLL int_f nh5tset_inpad_c ( hid_t_f *type_id, int_f * padtype);
-H5_FCDLL int_f nh5tget_cset_c ( hid_t_f *type_id, int_f * cset);
-H5_FCDLL int_f nh5tset_cset_c ( hid_t_f *type_id, int_f * cset);
-H5_FCDLL int_f nh5tget_strpad_c ( hid_t_f *type_id, int_f * strpad);
-H5_FCDLL int_f nh5tset_strpad_c ( hid_t_f *type_id, int_f * strpad);
-H5_FCDLL int_f nh5tget_nmembers_c ( hid_t_f *type_id , int_f * num_members);
-H5_FCDLL int_f nh5tget_member_name_c ( hid_t_f *type_id ,int_f* idx, _fcd member_name, int_f *namelen);
-H5_FCDLL int_f nh5tget_member_dims_c ( hid_t_f *type_id ,int_f* field_idx, int_f * dims, size_t_f * field_dims, int_f * perm );
-H5_FCDLL int_f nh5tget_member_offset_c ( hid_t_f *type_id ,int_f* member_no, size_t_f* offset);
-H5_FCDLL int_f nh5tget_member_type_c ( hid_t_f *type_id ,int_f* field_idx, hid_t_f * datatype);
-H5_FCDLL int_f nh5tget_member_index_c ( hid_t_f *type_id ,_fcd name, int_f* namelen, int_f *idx);
-H5_FCDLL int_f nh5tinsert_c(hid_t_f *type_id, _fcd name, int_f* namelen, size_t_f *offset, hid_t_f * field_id);
-H5_FCDLL int_f nh5tpack_c(hid_t_f * type_id);
-H5_FCDLL int_f nh5tinsert_array_c(hid_t_f * parent_id, _fcd name, int_f* namelen, size_t_f* offset, int_f* ndims, size_t_f* dims, hid_t_f* member_id, int_f* perm );
-H5_FCDLL int_f nh5tinsert_array_c2(hid_t_f * parent_id, _fcd name, int_f* namelen, size_t_f* offset, int_f* ndims, size_t_f* dims, hid_t_f* member_id);
-H5_FCDLL int_f nh5tenum_create_c ( hid_t_f *parent_id , hid_t_f *new_type_id);
-H5_FCDLL int_f nh5tenum_insert_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value);
+H5_FCDLL int_f h5tcreate_c(int_f *cls, size_t_f *size, hid_t_f *type_id);
+H5_FCDLL int_f h5topen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *tapl_id );
+H5_FCDLL int_f h5tcommit_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *lcpl_id, hid_t_f *tcpl_id, hid_t_f *tapl_id);
+H5_FCDLL int_f h5tclose_c ( hid_t_f *type_id );
+H5_FCDLL int_f h5tequal_c ( hid_t_f *type1_id , hid_t_f *type2_id, int_f *c_flag);
+H5_FCDLL int_f h5tcopy_c ( hid_t_f *type_id , hid_t_f *new_type_id);
+H5_FCDLL int_f h5tget_class_c ( hid_t_f *type_id , int_f *classtype);
+H5_FCDLL int_f h5tget_order_c ( hid_t_f *type_id , int_f *order);
+H5_FCDLL int_f h5tset_order_c ( hid_t_f *type_id , int_f *order);
+H5_FCDLL int_f h5tget_size_c ( hid_t_f *type_id , size_t_f *size);
+H5_FCDLL int_f h5tset_size_c ( hid_t_f *type_id , size_t_f *size);
+H5_FCDLL int_f h5tcommitted_c (hid_t_f *dtype_id);
+H5_FCDLL int_f h5tget_precision_c ( hid_t_f *type_id , size_t_f *precision);
+H5_FCDLL int_f h5tset_precision_c ( hid_t_f *type_id , size_t_f *precision);
+H5_FCDLL int_f h5tget_offset_c ( hid_t_f *type_id , size_t_f *offset);
+H5_FCDLL int_f h5tset_offset_c ( hid_t_f *type_id , size_t_f *offset);
+H5_FCDLL int_f h5tget_pad_c ( hid_t_f *type_id , int_f * lsbpad, int_f * msbpad);
+H5_FCDLL int_f h5tset_pad_c ( hid_t_f *type_id, int_f * lsbpad, int_f * msbpad );
+H5_FCDLL int_f h5tget_sign_c ( hid_t_f *type_id , int_f* sign);
+H5_FCDLL int_f h5tset_sign_c ( hid_t_f *type_id , int_f *sign);
+H5_FCDLL int_f h5tget_fields_c ( hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f* esize, size_t_f* mpos, size_t_f* msize);
+H5_FCDLL int_f h5tset_fields_c ( hid_t_f *type_id, size_t_f *spos, size_t_f *epos, size_t_f* esize, size_t_f* mpos, size_t_f* msize);
+H5_FCDLL int_f h5tget_ebias_c ( hid_t_f *type_id , size_t_f *ebias);
+H5_FCDLL int_f h5tset_ebias_c ( hid_t_f *type_id , size_t_f *ebias);
+H5_FCDLL int_f h5tget_norm_c ( hid_t_f *type_id , int_f *norm);
+H5_FCDLL int_f h5tset_norm_c ( hid_t_f *type_id , int_f *norm);
+H5_FCDLL int_f h5tget_inpad_c ( hid_t_f *type_id, int_f * padtype);
+H5_FCDLL int_f h5tset_inpad_c ( hid_t_f *type_id, int_f * padtype);
+H5_FCDLL int_f h5tget_cset_c ( hid_t_f *type_id, int_f * cset);
+H5_FCDLL int_f h5tset_cset_c ( hid_t_f *type_id, int_f * cset);
+H5_FCDLL int_f h5tget_strpad_c ( hid_t_f *type_id, int_f * strpad);
+H5_FCDLL int_f h5tset_strpad_c ( hid_t_f *type_id, int_f * strpad);
+H5_FCDLL int_f h5tget_nmembers_c ( hid_t_f *type_id , int_f * num_members);
+H5_FCDLL int_f h5tget_member_name_c ( hid_t_f *type_id ,int_f* idx, _fcd member_name, int_f *namelen);
+H5_FCDLL int_f h5tget_member_dims_c ( hid_t_f *type_id ,int_f* field_idx, int_f * dims, size_t_f * field_dims, int_f * perm );
+H5_FCDLL int_f h5tget_member_offset_c ( hid_t_f *type_id ,int_f* member_no, size_t_f* offset);
+H5_FCDLL int_f h5tget_member_type_c ( hid_t_f *type_id ,int_f* field_idx, hid_t_f * datatype);
+H5_FCDLL int_f h5tget_member_index_c ( hid_t_f *type_id ,_fcd name, int_f* namelen, int_f *idx);
+H5_FCDLL int_f h5tinsert_c(hid_t_f *type_id, _fcd name, int_f* namelen, size_t_f *offset, hid_t_f * field_id);
+H5_FCDLL int_f h5tpack_c(hid_t_f * type_id);
+H5_FCDLL int_f h5tinsert_array_c(hid_t_f * parent_id, _fcd name, int_f* namelen, size_t_f* offset, int_f* ndims, size_t_f* dims, hid_t_f* member_id, int_f* perm );
+H5_FCDLL int_f h5tinsert_array_c2(hid_t_f * parent_id, _fcd name, int_f* namelen, size_t_f* offset, int_f* ndims, size_t_f* dims, hid_t_f* member_id);
+H5_FCDLL int_f h5tenum_create_c ( hid_t_f *parent_id , hid_t_f *new_type_id);
+H5_FCDLL int_f h5tenum_insert_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value);
 H5_FCDLL int_f h5tenum_insert_ptr_c(hid_t_f *type_id, _fcd name, int_f* namelen, void *value);
-H5_FCDLL int_f nh5tenum_nameof_c(hid_t_f *type_id, int_f* value, _fcd name, size_t_f* namelen);
-H5_FCDLL int_f nh5tenum_valueof_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value);
-H5_FCDLL int_f nh5tget_member_value_c(hid_t_f *type_id, int_f* member_no, int_f* value);
-H5_FCDLL int_f nh5tset_tag_c(hid_t_f* type_id, _fcd tag, int_f* namelen);
-H5_FCDLL int_f nh5tget_tag_c(hid_t_f* type_id, _fcd tag, size_t_f* tag_size, int_f* namelen);
-H5_FCDLL int_f nh5tarray_create_c(hid_t_f * base_id, int_f *rank, hsize_t_f* dims, hid_t_f* type_id);
-H5_FCDLL int_f nh5tget_array_dims_c ( hid_t_f *type_id , hsize_t_f * dims);
-H5_FCDLL int_f nh5tget_array_ndims_c ( hid_t_f *type_id , int_f * ndims);
-H5_FCDLL int_f nh5tget_super_c ( hid_t_f *type_id , hid_t_f *base_type_id);
-H5_FCDLL int_f nh5tvlen_create_c ( hid_t_f *type_id , hid_t_f *vltype_id);
-H5_FCDLL int_f nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag );
-H5_FCDLL int_f nh5tget_member_class_c ( hid_t_f *type_id ,  int_f *member_no, int_f *cls );
-H5_FCDLL int_f nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id, hid_t_f *tcpl_id, hid_t_f *tapl_id);
-H5_FCDLL int_f nh5tdecode_c ( _fcd buf, hid_t_f *obj_id );
-H5_FCDLL int_f nh5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc );
-H5_FCDLL int_f nh5tget_create_plist_c ( hid_t_f *dtype_id,  hid_t_f *dtpl_id);
-H5_FCDLL int_f nh5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag);
-H5_FCDLL int_f nh5tget_native_type_c(hid_t_f *dtype_id, int_f *direction, hid_t_f *native_dtype_id);
+H5_FCDLL int_f h5tenum_nameof_c(hid_t_f *type_id, int_f* value, _fcd name, size_t_f* namelen);
+H5_FCDLL int_f h5tenum_valueof_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value);
+H5_FCDLL int_f h5tget_member_value_c(hid_t_f *type_id, int_f* member_no, int_f* value);
+H5_FCDLL int_f h5tset_tag_c(hid_t_f* type_id, _fcd tag, int_f* namelen);
+H5_FCDLL int_f h5tget_tag_c(hid_t_f* type_id, _fcd tag, size_t_f* tag_size, int_f* namelen);
+H5_FCDLL int_f h5tarray_create_c(hid_t_f * base_id, int_f *rank, hsize_t_f* dims, hid_t_f* type_id);
+H5_FCDLL int_f h5tget_array_dims_c ( hid_t_f *type_id , hsize_t_f * dims);
+H5_FCDLL int_f h5tget_array_ndims_c ( hid_t_f *type_id , int_f * ndims);
+H5_FCDLL int_f h5tget_super_c ( hid_t_f *type_id , hid_t_f *base_type_id);
+H5_FCDLL int_f h5tvlen_create_c ( hid_t_f *type_id , hid_t_f *vltype_id);
+H5_FCDLL int_f h5tis_variable_str_c ( hid_t_f *type_id , int_f *flag );
+H5_FCDLL int_f h5tget_member_class_c ( hid_t_f *type_id ,  int_f *member_no, int_f *cls );
+H5_FCDLL int_f h5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id, hid_t_f *tcpl_id, hid_t_f *tapl_id);
+H5_FCDLL int_f h5tdecode_c ( _fcd buf, hid_t_f *obj_id );
+H5_FCDLL int_f h5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc );
+H5_FCDLL int_f h5tget_create_plist_c ( hid_t_f *dtype_id,  hid_t_f *dtpl_id);
+H5_FCDLL int_f h5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag);
+H5_FCDLL int_f h5tget_native_type_c(hid_t_f *dtype_id, int_f *direction, hid_t_f *native_dtype_id);
 H5_FCDLL int_f h5tconvert_c(hid_t_f *src_id, hid_t_f *dst_id, size_t_f *nelmts, void *buf, void *background, hid_t_f *plist_id);
 
-
 /*
  * Functions from H5Of.c
  */