[svn-r26030] Merged changes from the trunk into the branch:

svn merge -r25629:26029 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

Tested: jam (--enable-fortran2003)

23 files changed, 484 insertions, 591 deletions

diff --git a/fortran/src/H5Af.c b/fortran/src/H5Af.c
index 896736d..8291320 100644
--- a/fortran/src/H5Af.c
+++ b/fortran/src/H5Af.c
@@ -2081,25 +2081,25 @@ done:
 }
 /****if* H5Af/h5awrite_f_c
  * NAME
- *        h5awrite_f_c
+ *  h5awrite_f_c
  * PURPOSE
- *     Call H5Awrite to write a dataset
+ *  Call H5Awrite to write a dataset
  * INPUTS
- *      attr_id - Identifier of an attribute to write.
- *              mem_type_id - Identifier of the attribute datatype (in memory).
- *              buf      - data pointer buffer
+ *  attr_id     - Identifier of an attribute to write.
+ *  mem_type_id - Identifier of the attribute datatype (in memory).
+ *  buf         - data pointer buffer
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              June 11, 2008
+ *  June 11, 2008
  * HISTORY
  *
  *
  * SOURCE
 */
 int_f
-nh5awrite_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf)
+h5awrite_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf)
 /******/
 {
   int ret_value = -1;
@@ -2114,25 +2114,25 @@ nh5awrite_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf)
 
 /****if* H5Af/h5aread_f_c
  * NAME
- *        h5aread_f_c
+ *  h5aread_f_c
  * PURPOSE
- *     Call H5Awrite to write a dataset
+ *  Call H5Awrite to write a dataset
  * INPUTS
- *      attr_id - Identifier of an attribute to write.
- *              mem_type_id - Identifier of the attribute datatype (in memory).
- *              buf      - data pointer buffer
+ *  attr_id     - Identifier of an attribute to write.
+ *  mem_type_id - Identifier of the attribute datatype (in memory).
+ *  buf         - data pointer buffer
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              June 11, 2008
+ *  June 11, 2008
  * HISTORY
  *
  *
  * SOURCE
 */
 int_f
-nh5aread_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf)
+h5aread_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf)
 /******/
 {
   int ret_value = -1;
diff --git a/fortran/src/H5Aff_F03.f90 b/fortran/src/H5Aff_F03.f90
index 807f6fa..5278280 100644
--- a/fortran/src/H5Aff_F03.f90
+++ b/fortran/src/H5Aff_F03.f90
@@ -143,12 +143,9 @@ MODULE H5A_PROVISIONAL
 !  to the C H5Awrite routine
 
   INTERFACE
-     INTEGER FUNCTION h5awrite_f_c(attr_id, mem_type_id, buf)
+     INTEGER FUNCTION h5awrite_f_c(attr_id, mem_type_id, buf) BIND(C, NAME='h5awrite_f_c')
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
        USE H5GLOBAL
-       USE, INTRINSIC :: ISO_C_BINDING
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_F_C'::h5awrite_f_c
-       !DEC$ENDIF
        INTEGER(HID_T), INTENT(IN) :: attr_id
        INTEGER(HID_T), INTENT(IN) :: mem_type_id
        TYPE(C_PTR), VALUE :: buf
@@ -159,12 +156,9 @@ MODULE H5A_PROVISIONAL
 !  to the C H5Aread routine
 
   INTERFACE
-     INTEGER FUNCTION h5aread_f_c(attr_id, mem_type_id, buf)
+     INTEGER FUNCTION h5aread_f_c(attr_id, mem_type_id, buf) BIND(C, NAME='h5aread_f_c')
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
        USE H5GLOBAL
-       USE, INTRINSIC :: ISO_C_BINDING
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5AREAD_F_C'::h5aread_f_c
-       !DEC$ENDIF
        INTEGER(HID_T), INTENT(IN) :: attr_id
        INTEGER(HID_T), INTENT(IN) :: mem_type_id
        TYPE(C_PTR), VALUE :: buf
diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c
index 799f40a..ecfa946 100644
--- a/fortran/src/H5Df.c
+++ b/fortran/src/H5Df.c
@@ -25,27 +25,26 @@
 
 /****if* H5Df/h5dcreate_c
  * NAME
- *        h5dcreate_c
+ *  h5dcreate_c
  * PURPOSE
- *     Call H5Dcreate2 to create a dataset
+ *  Call H5Dcreate2 to create a dataset
  * INPUTS
- *      loc_id - file or group identifier
- *              name - name of the dataset
- *              namelen - name length
- *              type_id - datatype identifier
- *              space_id - dataspace identifier
- *              crt_pr  - identifier of creation property list
+ *  loc_id   - file or group identifier
+ *  name     - name of the dataset
+ *  namelen  - name length
+ *  type_id  - datatype identifier
+ *  space_id - dataspace identifier
+ *  crt_pr   - identifier of creation property list
  * OUTPUTS
- *     dset_id - dataset identifier
+ *  dset_id  - dataset identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, August 4, 1999
+ *  Wednesday, August 4, 1999
  * HISTORY
- *
- *               - Added optional parameters introduced in version 1.8
- *                 February, 2008
+ *   - Added optional parameters introduced in version 1.8
+ *     February, 2008
  * SOURCE
 */
 int_f
@@ -81,9 +80,9 @@ DONE:
 
 /****if* H5Df/h5dopen_c
  * NAME
- *        h5dopen_c
+ *  h5dopen_c
  * PURPOSE
- *     Call H5Dopen2 to open a dataset
+ *  Call H5Dopen2 to open a dataset
  * INPUTS
  *      loc_id - file or group identifier
  *              name - name of the dataset
@@ -132,9 +131,9 @@ DONE:
 
 /****if* H5Df/h5dwritec_c
  * NAME
- *        h5dwritec_c
+ *  h5dwritec_c
  * PURPOSE
- *     Call h5dwrite_c to write a dataset of characters
+ *  Call h5dwrite_c to write a dataset of characters
  * INPUTS
  *      dset_id - dataset identifier
  *              mem_type_id - memory datatype identifier
@@ -281,9 +280,9 @@ nh5dwritec_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, h
 
 /****if* H5Df/h5dwrite_c
  * NAME
- *        h5dwrite_c
+ *  h5dwrite_c
  * PURPOSE
- *     Call H5Dwrite to write a dataset
+ *  Call H5Dwrite to write a dataset
  * INPUTS
  *      dset_id - dataset identifier
  *              mem_type_id - memory datatype identifier
@@ -589,9 +588,9 @@ nh5dwrite_double_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space
 
 /****if* H5Df/h5dwrite_ref_obj_c
  * NAME
- *        h5dwrite_ref_obj_c
+ *  h5dwrite_ref_obj_c
  * PURPOSE
- *     Call H5Dwrite to write a dataset  of object references
+ *  Call H5Dwrite to write a dataset  of object references
  * INPUTS
  *      dset_id - dataset identifier
  *              mem_type_id - memory datatype identifier
@@ -656,25 +655,25 @@ nh5dwrite_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_
 
 /****if* H5Df/h5dwrite_ref_reg_c
  * NAME
- *        h5dwrite_ref_reg_c
+ *  h5dwrite_ref_reg_c
  * PURPOSE
- *     Call H5Dwrite to write a dataset of dataset region references
+ *  Call H5Dwrite to write a dataset of dataset region references
  * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              mem_space_id - memory dataspace identifier
- *              file_space_id - memory dataspace identifier
- *              xfer_pr  - identifier of transfer property list
- *              buf      - data buffer with references to the objects.
- *              n - number of references to be stored.
+ *  dset_id       - dataset identifier
+ *  mem_type_id   - memory datatype identifier
+ *  mem_space_id  - memory dataspace identifier
+ *  file_space_id - memory dataspace identifier
+ *  xfer_pr       - identifier of transfer property list
+ *  buf           - data buffer with references to the objects.
+ *  n             - number of references to be stored.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Tuesday, May 14, 2002
+ *  Tuesday, May 14, 2002
  * HISTORY
- * This function was added to accomodate h5dwrite_f with the
- *                dims argument being of INTEGER(HSIZE_T) type
+ *  This function was added to accomodate h5dwrite_f with the
+ *  dims argument being of INTEGER(HSIZE_T) type
  * SOURCE
 */
 int_f
@@ -728,9 +727,9 @@ nh5dwrite_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_
 
 /****if* H5Df/h5dreadc_c
  * NAME
- *        h5dreadc_c
+ *  h5dreadc_c
  * PURPOSE
- *     Call h5dread_c to read a dataset of characters
+ *  Call h5dread_c to read a dataset of characters
  * INPUTS
  *      dset_id - dataset identifier
  *              mem_type_id - memory datatype identifier
@@ -877,9 +876,9 @@ nh5dreadc_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hi
 
 /****if* H5Df/h5dread_c
  * NAME
- *        h5dread_c
+ *  h5dread_c
  * PURPOSE
- *     Call H5Draed to read a dataset
+ *  Call H5Draed to read a dataset
  * INPUTS
  *      dset_id - dataset identifier
  *              mem_type_id - memory datatype identifier
@@ -1177,9 +1176,9 @@ nh5dread_double_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_
 
 /****if* H5Df/h5dread_ref_obj_c
  * NAME
- *        h5dread_ref_obj_c
+ *  h5dread_ref_obj_c
  * PURPOSE
- *     Call H5Dread to read a dataset  of object references
+ *  Call H5Dread to read a dataset  of object references
  * INPUTS
  *      dset_id - dataset identifier
  *              mem_type_id - memory datatype identifier
@@ -1244,9 +1243,9 @@ nh5dread_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i
 
 /****if* H5Df/h5dread_ref_reg_c
  * NAME
- *        h5dread_ref_reg_c
+ *  h5dread_ref_reg_c
  * PURPOSE
- *     Call H5Dread to read a dataset of dataset region references
+ *  Call H5Dread to read a dataset of dataset region references
  * INPUTS
  *      dset_id - dataset identifier
  *              mem_type_id - memory datatype identifier
@@ -1314,9 +1313,9 @@ nh5dread_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i
 
 /****if* H5Df/h5dclose_c
  * NAME
- *        h5dclose_c
+ *  h5dclose_c
  * PURPOSE
- *     Call H5Dclose to close a dataset
+ *  Call H5Dclose to close a dataset
  * INPUTS
  *      dset_id - identifier of the dataset to be closed
  * RETURNS
@@ -1342,9 +1341,9 @@ nh5dclose_c ( hid_t_f *dset_id )
 
 /****if* H5Df/h5dget_space_c
  * NAME
- *        h5dget_space_c
+ *  h5dget_space_c
  * PURPOSE
- *     Call H5Dget_space to obtain dataspace of a dataset
+ *  Call H5Dget_space to obtain dataspace of a dataset
  * INPUTS
  *      dset_id - identifier of the dataset
  * OUTPUTS
@@ -1377,9 +1376,9 @@ nh5dget_space_c ( hid_t_f *dset_id , hid_t_f *space_id)
 
 /****if* H5Df/h5dget_type_c
  * NAME
- *        h5dget_type_c
+ *  h5dget_type_c
  * PURPOSE
- *     Call H5Dget_type to obtain datatype of a dataset
+ *  Call H5Dget_type to obtain datatype of a dataset
  * INPUTS
  *      dset_id - identifier of the dataset
  * OUTPUTS
@@ -1414,9 +1413,9 @@ nh5dget_type_c ( hid_t_f *dset_id , hid_t_f *type_id)
 
 /****if* H5Df/h5dget_create_plist_c
  * NAME
- *        h5dget_create_plist_c
+ *  h5dget_create_plist_c
  * PURPOSE
- *     Call H5Dget_create_plist to obtain creation property list
+ *  Call H5Dget_create_plist to obtain creation property list
  *              of a dataset
  * INPUTS
  *      dset_id - identifier of the dataset
@@ -1453,9 +1452,9 @@ nh5dget_create_plist_c ( hid_t_f *dset_id , hid_t_f *plist_id)
 
 /****if* H5Df/h5dset_extent_c
  * NAME
- *        h5dset_extent_c
+ *  h5dset_extent_c
  * PURPOSE
- *     Call H5Dset_extent to extend dataset with unlimited dimensions
+ *  Call H5Dset_extent to extend dataset with unlimited dimensions
  * INPUTS
  *      dset_id - identifier of the dataset
  * OUTPUTS
@@ -1506,9 +1505,9 @@ nh5dset_extent_c ( hid_t_f *dset_id , hsize_t_f *dims)
 
 /****if* H5Df/nh5dget_storage_size_c
  * NAME
- *        nh5dget_storage_size_c
+ *  nh5dget_storage_size_c
  * PURPOSE
- *     Call H5Dget_storage_size to return the amount of storage
+ *  Call H5Dget_storage_size to return the amount of storage
  *              required for a dataset
  * INPUTS
  *      dset_id - identifier of the dataset
@@ -1542,9 +1541,9 @@ nh5dget_storage_size_c ( hid_t_f *dset_id , hsize_t_f *size)
 
 /****if* H5Df/nh5dvlen_get_max_len_c
  * NAME
- *        nh5dvlen_get_max_len_c
+ *  nh5dvlen_get_max_len_c
  * PURPOSE
- *     Get the maximum size of the VL dataset element
+ *  Get the maximum size of the VL dataset element
  * INPUTS
  *      dset_id - identifier of the dataset
  *              type_id - datatype identifier
@@ -1600,9 +1599,9 @@ DONE:
 }
 /****if* H5Df/nh5dwrite_vl_integer_c
  * NAME
- *        nh5dwrite_vl_integer_c
+ *  nh5dwrite_vl_integer_c
  * PURPOSE
- *     Write variable length dataset
+ *  Write variable length dataset
  * INPUTS
  *      dset_id - identifier of the dataset
  *              mem_type_id - datatype identifier
@@ -1673,9 +1672,9 @@ DONE:
 
 /****if* H5Df/nh5dread_vl_integer_c
  * NAME
- *        nh5dread_vl_integer_c
+ *  nh5dread_vl_integer_c
  * PURPOSE
- *     Read variable length dataset
+ *  Read variable length dataset
  * INPUTS
  *      dset_id - identifier of the dataset
  *              mem_type_id - datatype identifier
@@ -1745,9 +1744,9 @@ DONE:
 
 /****if* H5Df/nh5dwrite_vl_string_c
  * NAME
- *        nh5dwrite_vl_string_c
+ *  nh5dwrite_vl_string_c
  * PURPOSE
- *     Write variable length strings from Fortran program
+ *  Write variable length strings from Fortran program
  * INPUTS
  *      dset_id - identifier of the dataset
  *              mem_type_id - datatype identifier
@@ -1832,9 +1831,9 @@ DONE:
 }
 /****if* H5Df/nh5dread_vl_string_c
  * NAME
- *        nh5dread_vl_string_c
+ *  nh5dread_vl_string_c
  * PURPOSE
- *     Read variable length strings from Fortran program
+ *  Read variable length strings from Fortran program
  * INPUTS
  *      dset_id - identifier of the dataset
  *              mem_type_id - datatype identifier
@@ -1915,9 +1914,9 @@ nh5dread_vl_string_c( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_spa
 
 /****if* H5Df/nh5dwrite_vl_real_c
  * NAME
- *        nh5dwrite_vl_real_c
+ *  nh5dwrite_vl_real_c
  * PURPOSE
- *     Write variable length dataset
+ *  Write variable length dataset
  * INPUTS
  *      dset_id - identifier of the dataset
  *              mem_type_id - datatype identifier
@@ -1988,9 +1987,9 @@ DONE:
 
 /****if* H5Df/nh5dread_vl_real_c
  * NAME
- *        nh5dread_vl_real_c
+ *  nh5dread_vl_real_c
  * PURPOSE
- *     Read variable length dataset
+ *  Read variable length dataset
  * INPUTS
  *      dset_id - identifier of the dataset
  *              mem_type_id - datatype identifier
@@ -2061,20 +2060,20 @@ DONE:
 
 /****if* H5Df/h5dfillc_c
  * NAME
- *        h5dfillc_c
+ *  h5dfillc_c
  * PURPOSE
- *     Call h5fill_c to fill memory buffer with a fill value
+ *  Call h5fill_c to fill memory buffer with a fill value
  * INPUTS
- *      fill_value - fill value
- *              fill_type_id - fill value datatype identifier
- *              space_id - memory space selection identifier
- *              buf      - memory buffer to fill
- *              mem_type_id - memory buffer dtatype identifier
+ *  fill_value   - fill value
+ *  fill_type_id - fill value datatype identifier
+ *  space_id     - memory space selection identifier
+ *  buf          - memory buffer to fill
+ *  mem_type_id  - memory buffer dtatype identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, March 12, 2003
+ *  Wednesday, March 12, 2003
  * HISTORY
  *
  * SOURCE
@@ -2088,32 +2087,32 @@ nh5dfillc_c (_fcd fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, _fcd buf
      /*
       * Call h5dfill_c  function.
       */
-     ret_value = nh5dfill_c(_fcdtocp(fill_value), fill_type_id, space_id, _fcdtocp(buf), mem_type_id);
+     ret_value = h5dfill_c(_fcdtocp(fill_value), fill_type_id, space_id, _fcdtocp(buf), mem_type_id);
 
      return ret_value;
 }
 /****if* H5Df/h5dfill_c
  * NAME
- *        h5dfill_c
+ *  h5dfill_c
  * PURPOSE
- *     Call H5Dfill to fill memory buffer with a fill value
+ *  Call H5Dfill to fill memory buffer with a fill value
  * INPUTS
- *      fill_value - fill value
- *              fill_type_id - fill value datatype identifier
- *              space_id - memory space selection identifier
- *              buf      - memory buffer to fill
- *              mem_type_id - memory buffer dtatype identifier
+ *  fill_value   - fill value
+ *  fill_type_id - fill value datatype identifier
+ *  space_id     - memory space selection identifier
+ *  buf          - memory buffer to fill
+ *  mem_type_id  - memory buffer dtatype identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Wednesday, March 12, 2003
+ *  Wednesday, March 12, 2003
  * HISTORY
  *
  * SOURCE
 */
 int_f
-nh5dfill_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id)
+h5dfill_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id)
 /******/
 {
      int ret_value = -1;
@@ -2210,9 +2209,9 @@ nh5dfill_double_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id,
 
 /****if* H5Df/h5dget_space_status_c
  * NAME
- *        h5dget_space_status_c
+ *  h5dget_space_status_c
  * PURPOSE
- *     Call H5Dget_space_status to request dataspace allocation status
+ *  Call H5Dget_space_status to request dataspace allocation status
  * INPUTS
  *      dset_id - dataset identifier
  * OUTPUTS
@@ -2249,9 +2248,9 @@ nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag)
 }
 /****if* H5Df/h5dcreate_anon_c
  * NAME
- *        h5dcreate_anon_c
+ *  h5dcreate_anon_c
  * PURPOSE
- *     Call H5Dcreate_anon
+ *  Call H5Dcreate_anon
  * INPUTS
  *
  *		loc_id	   - Identifier of the file or group within which to create the dataset.
@@ -2290,30 +2289,30 @@ nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id,
   return ret_value;
 }
 
-/****if* H5Df/nh5dwrite_f_c
+/****if* H5Df/h5dwrite_f_c
  * NAME
- *        nh5dwrite_f_c
+ *  h5dwrite_f_c
  * PURPOSE
- *     Call H5Dwrite to write a dataset
+ *  Call H5Dwrite to write a dataset
  * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              mem_space_id - memory dataspace identifier
- *              file_space_id - memory dataspace identifier
- *              xfer_pr  - identifier of transfer property list
- *              buf      - data buffer
+ *  dset_id       - dataset identifier
+ *  mem_type_id   - memory datatype identifier
+ *  mem_space_id  - memory dataspace identifier
+ *  file_space_id - memory dataspace identifier
+ *  xfer_pr       - identifier of transfer property list
+ *  buf           - data buffer
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              May 28, 2008
+ *  May 28, 2008
  * HISTORY
  *
  *
  * SOURCE
 */
 int_f
-nh5dwrite_f_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
+h5dwrite_f_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
 		    hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf)
 /******/
 {
@@ -2325,24 +2324,6 @@ nh5dwrite_f_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
   hid_t c_file_space_id;
   hid_t c_xfer_prp;
 
-/*   int i, j; */
-/*   typedef struct { */
-/*     int x; */
-/*     float y; */
-/*   } r_dual_c; */
-
-/*   const r_dual_c *name=buf; */
-
-/*   r_dual_c access[4][4]; */
-
-/*   for ( i=0; i<4; ++i) */
-/*     for (j = 0; j<4; ++j) { */
-/*       access[i][j] = name[i*4+j]; */
-/*     /\* access[i].x = access[i].x + 1; *\/ */
-/*       printf("x = %i \n", access[i][j].x); */
-/*       printf("y = %f \n", access[i][j].y); */
-/*     } */
-
   /*
    * Define transfer property
    */
@@ -2361,36 +2342,36 @@ nh5dwrite_f_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
   ret_value = 0;
   return ret_value;
 }
-/****if* H5Df/nh5dread_f_c
+
+/****if* H5Df/h5dread_f_c
  * NAME
- *        nh5dread_f_c
+ *  h5dread_f_c
  * PURPOSE
- *     Read variable length dataset
+ *  Read variable length dataset
  * INPUTS
- *      dset_id - identifier of the dataset
- *              mem_type_id - datatype identifier
- *              mem_space_id - dataspace identifier
- *              file_space_id - file dataspace identifier
- *              xfer          - file transfer property
- *              dims          - one-demnsional array of size 2
- *                              dims[0] = MAXLENGTH
- *                              dims[1] = number of elements of VL type
+ *  dset_id       - identifier of the dataset
+ *  mem_type_id   - datatype identifier
+ *  mem_space_id  - dataspace identifier
+ *  file_space_id - file dataspace identifier
+ *  xfer          - file transfer property
+ *  dims          - one-demnsional array of size 2
+ *                   dims[0] = MAXLENGTH
+ *                   dims[1] = number of elements of VL type
  * OUTPUTS
- *     buf           - data buffer
- *              len           - array element lenghts
+ *  buf - data buffer
+ *  len - array element lenghts
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
- *  Elena Pourmal
- *              Wednesday, October 24, 2002
+ *  M. Scot Breitenfeld
+ *  May 28, 2008
  * HISTORY
  *
  * SOURCE
 */
-
 int_f
-nh5dread_f_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id,
-		    hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf)
+h5dread_f_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id,
+	      hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf)
 /******/
 {
   int ret_value = -1;
@@ -2417,22 +2398,21 @@ nh5dread_f_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id,
 }
 /****if* H5Df/nh5dget_access_plist_c
  * NAME
- *     nh5dget_access_plist_c
+ *  nh5dget_access_plist_c
  * PURPOSE
- *     Call H5Dget_access_plist
+ *  Call H5Dget_access_plist
  * INPUTS
- *     dset_id   - dataset identifier
+ *  dset_id   - dataset identifier
  * OUTPUTS
- *     plist_id  - the dataset access property list identifier
+ *  plist_id  - the dataset access property list identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
- *     M. Scot Breitenfeld
- *     April 13, 2009
+ *  M. Scot Breitenfeld
+ *  April 13, 2009
  *
  * SOURCE
 */
-
 int_f
 nh5dget_access_plist_c (hid_t_f *dset_id, hid_t_f *plist_id)
 /******/
@@ -2452,11 +2432,11 @@ nh5dget_access_plist_c (hid_t_f *dset_id, hid_t_f *plist_id)
 
 /****if* H5Df/nh5dvlen_reclaim_c
  * NAME
- *     nh5dvlen_reclaim_c
+ *  h5dvlen_reclaim_c
  * PURPOSE
- *     Call H5Dvlen_reclaim
+ *  Call H5Dvlen_reclaim
  * INPUTS
- *    type_id  - Identifier of the datatype. 
+ *   type_id   - Identifier of the datatype. 
  *   space_id  - Identifier of the dataspace. 
  *   plist_id  - Identifier of the property list used to create the buffer. 
  *   buf       - Pointer to the buffer to be reclaimed.    
@@ -2470,7 +2450,7 @@ nh5dget_access_plist_c (hid_t_f *dset_id, hid_t_f *plist_id)
  * SOURCE
 */
 int_f
-nh5dvlen_reclaim_c(hid_t_f *type_id, hid_t_f *space_id, hid_t_f *plist_id, void *buf)
+h5dvlen_reclaim_c(hid_t_f *type_id, hid_t_f *space_id, hid_t_f *plist_id, void *buf)
 /******/
 {
   int ret_value = -1;
diff --git a/fortran/src/H5Dff_F03.f90 b/fortran/src/H5Dff_F03.f90
index d39c200..7026ae3 100644
--- a/fortran/src/H5Dff_F03.f90
+++ b/fortran/src/H5Dff_F03.f90
@@ -159,12 +159,9 @@ MODULE H5D_PROVISIONAL
      INTEGER FUNCTION h5dwrite_f_c(dset_id, mem_type_id, &
           mem_space_id_default ,                         &
           file_space_id_default,                         &
-          xfer_prp_default, buf )
+          xfer_prp_default, buf ) BIND(C, NAME='h5dwrite_f_c')
        USE H5GLOBAL
-       USE, INTRINSIC :: ISO_C_BINDING
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_F_C'::h5dwrite_f_c
-       !DEC$ENDIF
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
        INTEGER(HID_T), INTENT(IN) :: dset_id
        INTEGER(HID_T), INTENT(IN) :: mem_type_id
        INTEGER(HID_T) :: mem_space_id_default
@@ -181,12 +178,9 @@ MODULE H5D_PROVISIONAL
      INTEGER FUNCTION h5dread_f_c(dset_id, mem_type_id, &
           mem_space_id_default,                         &
           file_space_id_default,                        &
-          xfer_prp_default, buf)
+          xfer_prp_default, buf) BIND(C, NAME='h5dread_f_c')
        USE H5GLOBAL
-       USE, INTRINSIC :: ISO_C_BINDING
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DREAD_F_C'::h5dread_f_c
-       !DEC$ENDIF
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
        INTEGER(HID_T), INTENT(IN) :: dset_id
        INTEGER(HID_T), INTENT(IN) :: mem_type_id
        INTEGER(HID_T) :: mem_space_id_default
@@ -207,12 +201,9 @@ MODULE H5D_PROVISIONAL
 
   INTERFACE
      INTEGER FUNCTION h5dfill_c(f_ptr_fill_value, fill_type_id, space_id, &
-          f_ptr_buf, mem_type_id)
+          f_ptr_buf, mem_type_id) BIND(C, NAME='h5dfill_c')
        USE H5GLOBAL
-       USE, INTRINSIC :: ISO_C_BINDING
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DFILL_C'::h5dfill_c
-       !DEC$ENDIF
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
        TYPE(C_PTR), VALUE :: f_ptr_fill_value
        INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
        INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
@@ -2369,7 +2360,7 @@ CONTAINS
 !
 ! Fortran2003 Interface:
   SUBROUTINE h5dvlen_reclaim_f(type_id, space_id, plist_id, buf, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+    USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN)    :: type_id
     INTEGER(HID_T), INTENT(IN)    :: space_id
@@ -2379,12 +2370,9 @@ CONTAINS
 !*****
 
     INTERFACE
-       INTEGER FUNCTION h5dvlen_reclaim_c(type_id, space_id, plist_id, buf)
+       INTEGER FUNCTION h5dvlen_reclaim_c(type_id, space_id, plist_id, buf) BIND(C, NAME='h5dvlen_reclaim_c')
          USE H5GLOBAL
-         USE, INTRINSIC :: ISO_C_BINDING
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5DVLEN_RECLAIM_C'::h5dvlen_reclaim_c
-         !DEC$ENDIF
+         USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
          INTEGER(HID_T) :: type_id
          INTEGER(HID_T) :: space_id
          INTEGER(HID_T) :: plist_id
diff --git a/fortran/src/H5Ef.c b/fortran/src/H5Ef.c
index 4848d9e..6e476ea 100644
--- a/fortran/src/H5Ef.c
+++ b/fortran/src/H5Ef.c
@@ -291,7 +291,7 @@ done:
 */
 
 int_f
-nh5eset_auto2_c(int_f *printflag, hid_t_f *estack_id, H5E_auto2_t func, void *client_data)
+h5eset_auto2_c(int_f *printflag, hid_t_f *estack_id, H5E_auto2_t func, void *client_data)
 /******/
 {
   int ret_val = -1;
diff --git a/fortran/src/H5Eff_F03.f90 b/fortran/src/H5Eff_F03.f90
index 3ba3ce96..ff8d11c 100644
--- a/fortran/src/H5Eff_F03.f90
+++ b/fortran/src/H5Eff_F03.f90
@@ -81,12 +81,10 @@ CONTAINS
     TYPE(C_FUNPTR) :: func_default
     TYPE(C_PTR)    :: client_data_default
     INTERFACE
-       INTEGER FUNCTION h5eset_auto2_c(printflag, estack_id, func, client_data)
-         USE, INTRINSIC :: ISO_C_BINDING
+       INTEGER FUNCTION h5eset_auto2_c(printflag, estack_id, func, client_data) &
+            BIND(C, NAME='h5eset_auto2_c')
+         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr, c_funptr
          USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ESET_AUTO2_C'::h5eset_auto2_c
-         !DEC$ENDIF
          INTEGER :: printflag
          INTEGER(HID_T) :: estack_id
 !!$         TYPE(C_FUNPTR) :: func
diff --git a/fortran/src/H5Ff.c b/fortran/src/H5Ff.c
index 4910aca..7455fca 100644
--- a/fortran/src/H5Ff.c
+++ b/fortran/src/H5Ff.c
@@ -699,7 +699,7 @@ done:
  * SOURCE
 */
 int_f
-nh5fget_file_image_c(hid_t_f *file_id, void *buf_ptr, size_t_f *buf_len, size_t_f *buf_req)
+h5fget_file_image_c(hid_t_f *file_id, void *buf_ptr, size_t_f *buf_len, size_t_f *buf_req)
 /******/
 {
     herr_t ret_value=0;          /* Return value */
diff --git a/fortran/src/H5Fff_F03.f90 b/fortran/src/H5Fff_F03.f90
index d819c34..8544870 100644
--- a/fortran/src/H5Fff_F03.f90
+++ b/fortran/src/H5Fff_F03.f90
@@ -74,12 +74,9 @@ CONTAINS
     INTEGER(SIZE_T) :: buf_size_default
 
     INTERFACE
-       INTEGER FUNCTION h5fget_file_image_c(file_id, buf_ptr, buf_len, buf_size)
-         USE, INTRINSIC :: ISO_C_BINDING
+       INTEGER FUNCTION h5fget_file_image_c(file_id, buf_ptr, buf_len, buf_size) BIND(C, NAME='h5fget_file_image_c')
+         USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
          USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5FGET_FILE_IMAGE_C'::h5fget_file_image_c
-         !DEC$ENDIF
          INTEGER(HID_T) , INTENT(IN) :: file_id
          TYPE(C_PTR)    , VALUE      :: buf_ptr
          INTEGER(SIZE_T), INTENT(IN) :: buf_len
diff --git a/fortran/src/H5Lf.c b/fortran/src/H5Lf.c
index c5138b6..7efa10a 100644
--- a/fortran/src/H5Lf.c
+++ b/fortran/src/H5Lf.c
@@ -987,7 +987,7 @@ done:
  * SOURCE
 */
 int_f
-nh5literate_c(hid_t_f *group_id, int_f *index_type, int_f *order, hsize_t_f *idx, H5L_iterate_t op, void *op_data )
+h5literate_c(hid_t_f *group_id, int_f *index_type, int_f *order, hsize_t_f *idx, H5L_iterate_t op, void *op_data )
 /******/
 {
   int_f ret_value = -1;  /* Return value */
@@ -1010,12 +1010,12 @@ nh5literate_c(hid_t_f *group_id, int_f *index_type, int_f *order, hsize_t_f *idx
 
 /****if* H5Lf/h5literate_by_name_c
  * NAME
- *        h5literate_by_name_c
+ *  h5literate_by_name_c
  * PURPOSE
- *     Call H5Literate_by_name
+ *  Call H5Literate_by_name
  * INPUTS
  *
- *     loc_id - Identifier specifying subject group
+ *      loc_id - Identifier specifying subject group
  *         name - Name of subject group
  *      namelen - Name length
  *   index_type - Type of index which determines the order
@@ -1030,14 +1030,14 @@ nh5literate_c(hid_t_f *group_id, int_f *index_type, int_f *order, hsize_t_f *idx
  *          idx - Position at which an interrupted iteration may be restarted
  *
  * RETURNS
- *     >0 on success, 0< on failure
+ *  >0 on success, 0< on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *              Augest 18, 2008
+ *  August 18, 2008
  * SOURCE
 */
 int_f
-nh5literate_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, int_f *index_type, int_f *order, hsize_t_f *idx, H5L_iterate_t op, void *op_data, hid_t_f *lapl_id)
+h5literate_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, int_f *index_type, int_f *order, hsize_t_f *idx, H5L_iterate_t op, void *op_data, hid_t_f *lapl_id)
 /******/
 {
   int_f ret_value = -1;       /* Return value */
diff --git a/fortran/src/H5Lff_F03.f90 b/fortran/src/H5Lff_F03.f90
index 7d8713e..0fe7243 100644
--- a/fortran/src/H5Lff_F03.f90
+++ b/fortran/src/H5Lff_F03.f90
@@ -126,12 +126,10 @@ CONTAINS
     INTEGER         , INTENT(OUT)   :: hdferr
 !*****
     INTERFACE
-       INTEGER FUNCTION h5literate_c(group_id, index_type, order, idx, op, op_data)
-         USE, INTRINSIC :: ISO_C_BINDING
+       INTEGER FUNCTION h5literate_c(group_id, index_type, order, idx, op, op_data) &
+            BIND(C, NAME='h5literate_c')
+         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr, c_funptr
          USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LITERATE_C'::h5literate_c
-         !DEC$ENDIF
          INTEGER(HID_T), INTENT(IN) :: group_id
          INTEGER, INTENT(IN) :: index_type
          INTEGER, INTENT(IN) :: order
@@ -193,7 +191,8 @@ CONTAINS
 !  Augest 18, 2008
 !
 ! Fortran2003 Interface:
-  SUBROUTINE h5literate_by_name_f(loc_id, group_name, index_type, order, idx, op, op_data, return_value, hdferr, lapl_id)
+  SUBROUTINE h5literate_by_name_f(loc_id, group_name, index_type, order, &
+       idx, op, op_data, return_value, hdferr, lapl_id)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T)  , INTENT(IN)           :: loc_id
@@ -211,14 +210,12 @@ CONTAINS
     INTEGER(SIZE_T) :: namelen
 
     INTERFACE
-       INTEGER FUNCTION  h5literate_by_name_c(loc_id, name, namelen, index_type, order, idx, op, op_data, lapl_id_default)
-         USE, INTRINSIC :: ISO_C_BINDING
+       INTEGER FUNCTION h5literate_by_name_c(loc_id, name, namelen, index_type, order,&
+            idx, op, op_data, lapl_id_default) BIND(C, NAME='h5literate_by_name_c')
+         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr, c_funptr
          USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LITERATE_BY_NAME_C'::h5literate_by_name_c
-         !DEC$ENDIF
          INTEGER(HID_T)  , INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
          INTEGER(SIZE_T) , INTENT(IN) :: namelen
          INTEGER         , INTENT(IN) :: index_type
          INTEGER         , INTENT(IN) :: order
diff --git a/fortran/src/H5Of.c b/fortran/src/H5Of.c
index 05eafcf..ad8b7ed 100644
--- a/fortran/src/H5Of.c
+++ b/fortran/src/H5Of.c
@@ -241,7 +241,7 @@ nh5oclose_c ( hid_t_f *object_id )
  * SOURCE
 */
 int_f
-nh5ovisit_c(hid_t_f *group_id, int_f *index_type, int_f *order, H5O_iterate_t op, void *op_data )
+h5ovisit_c(hid_t_f *group_id, int_f *index_type, int_f *order, H5O_iterate_t op, void *op_data )
 /******/
 {
   int_f ret_value = -1;       /* Return value */
@@ -313,7 +313,7 @@ nh5oopen_by_addr_c (hid_t_f *loc_id, haddr_t_f *addr, hid_t_f *obj_id)
  * SOURCE
 */
 int_f
-nh5oget_info_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id,
+h5oget_info_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id,
 			H5O_info_t_f *object_info)
 /******/
 {
@@ -363,7 +363,7 @@ nh5oget_info_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *
  * SOURCE
 */
 int_f
-nh5oget_info_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *namelen, 
+h5oget_info_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *namelen, 
 		       int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id, H5O_info_t_f *object_info)
 /******/
 {
@@ -415,7 +415,7 @@ nh5oget_info_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *namelen,
  * SOURCE
 */
 int_f
-nh5oget_info_c (hid_t_f *object_id, H5O_info_t_f *object_info)
+h5oget_info_c (hid_t_f *object_id, H5O_info_t_f *object_info)
 /******/
 {
   int_f ret_value = 0;          /* Return value */
@@ -508,14 +508,14 @@ nh5ocopy_c (hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_name_len,
  *          idx - Position at which an interrupted iteration may be restarted
  *
  * RETURNS
- *     >0 on success, 0< on failure
+ *  >0 on success, 0< on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  May 16, 2012
  * SOURCE
 */
 int_f
-nh5ovisit_by_name_c(hid_t_f *loc_id,  _fcd object_name, size_t_f *namelen, int_f *index_type, int_f *order,
+h5ovisit_by_name_c(hid_t_f *loc_id,  _fcd object_name, size_t_f *namelen, int_f *index_type, int_f *order,
 		    H5O_iterate_t op, void *op_data, hid_t_f *lapl_id )
 /******/
 {
@@ -523,7 +523,6 @@ nh5ovisit_by_name_c(hid_t_f *loc_id,  _fcd object_name, size_t_f *namelen, int_f
   herr_t func_ret_value;      /* H5Linterate return value */
   char *c_object_name = NULL; /* Buffer to hold C string */
 
-
   /*
    * Convert FORTRAN name to C name
    */
diff --git a/fortran/src/H5Off_F03.f90 b/fortran/src/H5Off_F03.f90
index cfb7d56..e6b87ea 100644
--- a/fortran/src/H5Off_F03.f90
+++ b/fortran/src/H5Off_F03.f90
@@ -146,12 +146,10 @@ CONTAINS
 !*****
 
     INTERFACE
-       INTEGER FUNCTION h5ovisit_c(object_id, index_type, order, op, op_data)
-         USE, INTRINSIC :: ISO_C_BINDING
+       INTEGER FUNCTION h5ovisit_c(object_id, index_type, order, op, op_data) &
+            BIND(C, NAME='h5ovisit_c')
+         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr, c_funptr
          USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OVISIT_C'::h5ovisit_c
-         !DEC$ENDIF
          INTEGER(HID_T), INTENT(IN) :: object_id
          INTEGER, INTENT(IN) :: index_type
          INTEGER, INTENT(IN) :: order
@@ -210,16 +208,12 @@ CONTAINS
     TYPE(C_PTR)     :: ptr
     
     INTERFACE
-       INTEGER FUNCTION h5oget_info_by_name_c(loc_id, name, namelen, lapl_id_default, &
-           object_info)
+       INTEGER FUNCTION h5oget_info_by_name_c(loc_id, name, namelen, lapl_id_default, object_info) &
+            BIND(C, NAME='h5oget_info_by_name_c')
+         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr
          USE H5GLOBAL
-         USE, INTRINSIC :: ISO_C_BINDING
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OGET_INFO_BY_NAME_C'::h5oget_info_by_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
          INTEGER(HID_T)  , INTENT(IN)  :: loc_id
-         CHARACTER(LEN=*), INTENT(IN)  :: name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
          INTEGER(SIZE_T) , INTENT(IN)  :: namelen
          INTEGER(HID_T)  , INTENT(IN)  :: lapl_id_default
          TYPE(C_PTR),VALUE             :: object_info
@@ -269,15 +263,12 @@ CONTAINS
     TYPE(C_PTR) :: ptr
     
     INTERFACE
-       INTEGER FUNCTION h5oget_info_c(object_id, object_info)
+       INTEGER FUNCTION h5oget_info_c(object_id, object_info) &
+            BIND(C, NAME='h5oget_info_c')
          USE H5GLOBAL
-         USE, INTRINSIC :: ISO_C_BINDING
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OGET_INFO_C'::h5oget_info_c
-         !DEC$ENDIF
+         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
          INTEGER(HID_T), INTENT(IN)  :: object_id
          TYPE(C_PTR), VALUE          :: object_info
-
        END FUNCTION h5oget_info_c
     END INTERFACE
 
@@ -334,15 +325,11 @@ CONTAINS
     
     INTERFACE
        INTEGER FUNCTION h5oget_info_by_idx_c(loc_id, group_name, namelen, &
-            index_field, order, n, lapl_id_default, object_info)
+            index_field, order, n, lapl_id_default, object_info) BIND(C, NAME='h5oget_info_by_idx_c')
          USE H5GLOBAL
-         USE, INTRINSIC :: ISO_C_BINDING
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OGET_INFO_BY_IDX_C'::h5oget_info_by_idx_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: group_name
+         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr, c_funptr
          INTEGER(HID_T)  , INTENT(IN)  :: loc_id
-         CHARACTER(LEN=*), INTENT(IN)  :: group_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: group_name
          INTEGER(SIZE_T) , INTENT(IN)  :: namelen
          INTEGER         , INTENT(IN)  :: index_field
          INTEGER         , INTENT(IN)  :: order
@@ -419,15 +406,11 @@ CONTAINS
 
     INTERFACE
        INTEGER FUNCTION h5ovisit_by_name_c(loc_id, object_name, namelen, index_type, order, &
-            op, op_data, lapl_id)
+            op, op_data, lapl_id) BIND(C, NAME='h5ovisit_by_name_c')
          USE, INTRINSIC :: ISO_C_BINDING
          USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5OVISIT_BY_NAME_C'::h5ovisit_by_name_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: object_name
          INTEGER(HID_T)  , INTENT(IN) :: loc_id
-         CHARACTER(LEN=*), INTENT(IN) :: object_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: object_name
          INTEGER(SIZE_T)              :: namelen
          INTEGER         , INTENT(IN) :: index_type
          INTEGER         , INTENT(IN) :: order
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index b66709a..fa4dc5b 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -388,16 +388,16 @@ nh5pget_chunk_c ( hid_t_f *prp_id, int_f *max_rank, hsize_t_f *dims )
 
 /****if* H5Pf/h5pset_fill_valuec_c
  * NAME
- *        h5pset_fill_valuec_c
+ *  h5pset_fill_valuec_c
  * PURPOSE
- *     Call h5pset_fill_value_c to a character fill value
+ *  Call h5pset_fill_value_c to a character fill value
  * INPUTS
- *      prp_id - property list identifier
- *              type_id - datatype identifier (fill value is of type type_id)
- *              fillvalue  - character value
+ *  prp_id - property list identifier
+ *  type_id - datatype identifier (fill value is of type type_id)
+ *  fillvalue  - character value
  * RETURNS
- *     0 on success, -1 on failure
- *              Saturday, August 14, 1999
+ *  0 on success, -1 on failure
+ *  Saturday, August 14, 1999
  * AUTHOR
  *  Elena Pourmal
  * SOURCE
@@ -411,7 +411,7 @@ nh5pset_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue)
      /*
       * Call h5pset_fill_value_c  function.
       */
-     ret_value = nh5pset_fill_value_c(prp_id, type_id, _fcdtocp(fillvalue));
+     ret_value = h5pset_fill_value_c(prp_id, type_id, _fcdtocp(fillvalue));
 
      return ret_value;
 }
@@ -433,7 +433,7 @@ nh5pset_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue)
  * SOURCE
 */
 int_f
-nh5pset_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
+h5pset_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
 /******/
 {
      int ret_value = -1;
@@ -460,7 +460,7 @@ nh5pset_fill_value_integer_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue
      /*
       * Call h5pset_fill_value_c  function.
       */
-     return nh5pset_fill_value_c(prp_id, type_id, fillvalue);
+     return h5pset_fill_value_c(prp_id, type_id, fillvalue);
 }
 
 int_f
@@ -469,7 +469,7 @@ nh5pset_fill_value_real_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
      /*
       * Call h5pset_fill_value_c  function.
       */
-     return nh5pset_fill_value_c(prp_id, type_id, fillvalue);
+     return h5pset_fill_value_c(prp_id, type_id, fillvalue);
 }
 
 int_f
@@ -478,7 +478,7 @@ nh5pset_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
      /*
       * Call h5pset_fill_value_c  function.
       */
-     return nh5pset_fill_value_c(prp_id, type_id, fillvalue);
+     return h5pset_fill_value_c(prp_id, type_id, fillvalue);
 }
 
 /****if* H5Pf/h5pget_fill_valuec_c
@@ -510,7 +510,7 @@ nh5pget_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue)
      /*
       * Call h5pget_fill_value_c function.
       */
-     ret_value = nh5pget_fill_value_c(prp_id, type_id, _fcdtocp(fillvalue));
+     ret_value = h5pget_fill_value_c(prp_id, type_id, _fcdtocp(fillvalue));
 
      return ret_value;
 }
@@ -532,7 +532,7 @@ nh5pget_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue)
  * SOURCE
 */
 int_f
-nh5pget_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
+h5pget_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
 /******/
 {
      int ret_value = -1;
@@ -558,7 +558,7 @@ nh5pget_fill_value_integer_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue
      /*
       * Call h5pget_fill_value_c  function.
       */
-     return nh5pget_fill_value_c(prp_id, type_id, fillvalue);
+     return h5pget_fill_value_c(prp_id, type_id, fillvalue);
 }
 
 int_f
@@ -567,7 +567,7 @@ nh5pget_fill_value_real_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
      /*
       * Call h5pget_fill_value_c  function.
       */
-     return nh5pget_fill_value_c(prp_id, type_id, fillvalue);
+     return h5pget_fill_value_c(prp_id, type_id, fillvalue);
 }
 
 int_f
@@ -576,7 +576,7 @@ nh5pget_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
      /*
       * Call h5pget_fill_value_c  function.
       */
-     return nh5pget_fill_value_c(prp_id, type_id, fillvalue);
+     return h5pget_fill_value_c(prp_id, type_id, fillvalue);
 }
 
 /****if* H5Pf/h5pget_version_c
@@ -2742,20 +2742,50 @@ nh5pget_hyper_vector_size_c ( hid_t_f *prp_id , size_t_f *size)
   *size = (size_t_f)c_size;
   return ret_value;
 }
+/****if* H5Pf/h5pcreate_class_c
+ * NAME
+ *  h5pcreate_class_c
+ * PURPOSE
+ *  Call H5Pcreate_class to create a new property class
+ * INPUTS
+ *  parent - property list class identifier
+ *  name   - name of the new class
+ *  name_len - lenght of the "name" buffer
+ * OUTPUTS
+ *  cls - new class identifier
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *  October 11, 2002
+ *
+ * HISTORY
+ * SOURCE
+*/
+int_f
+nh5pcreate_class_f90_c(hid_t_f *parent, _fcd name, int_f *name_len, hid_t_f *cls)
+/******/
+{
+     int ret_value = -1;
+
+     ret_value = h5pcreate_class_c(parent, name, name_len, cls, NULL, NULL, NULL, NULL, NULL, NULL);
+     return  ret_value;
+}
+
 
 /****if* H5Pf/h5pcreate_class_c
  * NAME
- *        h5pcreate_class_c
+ *  h5pcreate_class_c
  * PURPOSE
- *     Call H5Pcreate_class ito create a new property class
+ *  Call H5Pcreate_class ito create a new property class
  * INPUTS
- *      parent - property list class identifier
- *              name   - name of the new class
- *              name_len - lenght of the "name" buffer
+ *  parent - property list class identifier
+ *  name   - name of the new class
+ *  name_len - lenght of the "name" buffer
  * OUTPUTS
- *     class - new class identifier
+ *  class - new class identifier
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  October 11, 2002
@@ -2766,7 +2796,7 @@ nh5pget_hyper_vector_size_c ( hid_t_f *prp_id , size_t_f *size)
  * SOURCE
 */
 int_f
-nh5pcreate_class_c(hid_t_f *parent, _fcd name, int_f *name_len, hid_t_f *cls,
+h5pcreate_class_c(hid_t_f *parent, _fcd name, int_f *name_len, hid_t_f *cls,
 		   H5P_cls_create_func_t create, void *create_data,
 		   H5P_cls_copy_func_t copy, void *copy_data,
 		   H5P_cls_close_func_t close, void *close_data)
@@ -2796,17 +2826,17 @@ DONE:
 
 /****if* H5Pf/h5pregisterc_c
  * NAME
- *        h5pregisterc_c
+ *  h5pregisterc_c
  * PURPOSE
- *     Call h5pregister_c to registers a permanent property
+ *  Call h5pregister_c to registers a permanent property
  * INPUTS
- *      class - property list class identifier
- *              name   - name of the new property
- *              name_len - length of the "name" buffer
- *              size - property size
- *              value - property value of character type
+ *  class - property list class identifier
+ *  name   - name of the new property
+ *  name_len - length of the "name" buffer
+ *  size - property size
+ *  value - property value of character type
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  October 11, 2002
@@ -2823,32 +2853,32 @@ nh5pregisterc_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, _fcd v
      /*
       * Call h5pregister_c function
       */
-      ret_value = nh5pregister_c(cls, name, name_len, size, _fcdtocp(value));
+      ret_value = h5pregister_c(cls, name, name_len, size, _fcdtocp(value));
       return ret_value;
 }
 
 /****if* H5Pf/h5pregister_c
  * NAME
- *        h5pregister_c
+ *  h5pregister_c
  * PURPOSE
- *     Call H5Pregister2 to registers a permanent property
+ *  Call H5Pregister2 to registers a permanent property
  * INPUTS
- *      class - property list class identifier
- *              name   - name of the new property
- *              name_len - length of the "name" buffer
- *              size - property size
- *              value - property value
+ *  class - property list class identifier
+ *  name   - name of the new property
+ *  name_len - length of the "name" buffer
+ *  size - property size
+ *  value - property value
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              October 11, 2002
+ *  October 11, 2002
  * HISTORY
  *
  * SOURCE
 */
 int_f
-nh5pregister_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, void UNUSED *value)
+h5pregister_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, void UNUSED *value)
 /******/
 {
      char* c_name = NULL;
@@ -2876,7 +2906,7 @@ nh5pregister_integer_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size,
      /*
       * Call h5pregister_c function
       */
-     return nh5pregister_c(cls, name, name_len, size, value);
+     return h5pregister_c(cls, name, name_len, size, value);
 }
 
 int_f
@@ -2885,7 +2915,7 @@ nh5pregister_real_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, vo
      /*
       * Call h5pregister_c function
       */
-     return nh5pregister_c(cls, name, name_len, size, value);
+     return h5pregister_c(cls, name, name_len, size, value);
 }
 
 int_f
@@ -2894,25 +2924,25 @@ nh5pregister_double_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size,
      /*
       * Call h5pregister_c function
       */
-     return nh5pregister_c(cls, name, name_len, size, value);
+     return h5pregister_c(cls, name, name_len, size, value);
 }
 
 /****if* H5Pf/h5pinsertc_c
  * NAME
- *        h5pinsertc_c
+ *  h5pinsertc_c
  * PURPOSE
- *     Call h5pinsert_c to register a temporary property
+ *  Call h5pinsert_c to register a temporary property
  * INPUTS
- *      plist - property list identifier
- *              name   - name of the new property
- *              name_len - length of the "name" buffer
- *              size - property size
- *              value - property value of character type
+ *  plist - property list identifier
+ *  name   - name of the new property
+ *  name_len - length of the "name" buffer
+ *  size - property size
+ *  value - property value of character type
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              October 11, 2002
+ *  October 11, 2002
  * HISTORY
  *
  * SOURCE
@@ -2926,32 +2956,32 @@ nh5pinsertc_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, _fcd v
      /*
       * Call h5pinsert_c function
       */
-      ret_value = nh5pinsert_c(plist, name, name_len, size, _fcdtocp(value));
+      ret_value = h5pinsert_c(plist, name, name_len, size, _fcdtocp(value));
       return ret_value;
 }
 
 /****if* H5Pf/h5pinsert_c
  * NAME
- *        h5pinsert_c
+ *  h5pinsert_c
  * PURPOSE
- *     Call H5Pinsert2 to iinsert a temporary property
+ *  Call H5Pinsert2 to iinsert a temporary property
  * INPUTS
- *      plist - property list class identifier
- *              name   - name of the new property
- *              name_len - length of the "name" buffer
- *              size - property size
- *              value - property value
+ *  plist - property list class identifier
+ *  name   - name of the new property
+ *  name_len - length of the "name" buffer
+ *  size - property size
+ *  value - property value
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              October 11, 2002
+ *  October 11, 2002
  * HISTORY
  *
  * SOURCE
 */
 int_f
-nh5pinsert_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, void UNUSED *value)
+h5pinsert_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, void UNUSED *value)
 /******/
 {
      char* c_name = NULL;
@@ -2979,7 +3009,7 @@ nh5pinsert_integer_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size,
      /*
       * Call h5pinsert_c function
       */
-     return nh5pinsert_c(plist, name, name_len, size, value);
+     return h5pinsert_c(plist, name, name_len, size, value);
 }
 
 int_f
@@ -2988,7 +3018,7 @@ nh5pinsert_real_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, vo
      /*
       * Call h5pinsert_c function
       */
-     return nh5pinsert_c(plist, name, name_len, size, value);
+     return h5pinsert_c(plist, name, name_len, size, value);
 }
 
 int_f
@@ -2997,7 +3027,7 @@ nh5pinsert_double_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size,
      /*
       * Call h5pinsert_c function
       */
-     return nh5pinsert_c(plist, name, name_len, size, value);
+     return h5pinsert_c(plist, name, name_len, size, value);
 }
 
 /****if* H5Pf/h5pexist_c
@@ -3424,22 +3454,22 @@ nh5psetc_c(hid_t_f *plist, _fcd name, int_f *name_len, _fcd value, int_f UNUSED
      /*
       * Call h5pset_c function
       */
-      ret_value = nh5pset_c(plist, name, name_len, _fcdtocp(value));
+      ret_value = h5pset_c(plist, name, name_len, _fcdtocp(value));
       return ret_value;
 }
 
 /****if* H5Pf/h5pset_c
  * NAME
- *        h5pset_c
+ *  h5pset_c
  * PURPOSE
- *     Call H5Pset to set property value
+ *  Call H5Pset to set property value
  * INPUTS
- *      plist - property list class identifier
- *              name   - name of the new property
- *              name_len - length of the "name" buffer
- *              value - property value
+ *  plist - property list class identifier
+ *  name   - name of the new property
+ *  name_len - length of the "name" buffer
+ *  value - property value
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
  *  October 11, 2002
@@ -3448,7 +3478,7 @@ nh5psetc_c(hid_t_f *plist, _fcd name, int_f *name_len, _fcd value, int_f UNUSED
  * SOURCE
 */
 int_f
-nh5pset_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
+h5pset_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
 /******/
 {
      int_f ret_value = -1;
@@ -3474,7 +3504,7 @@ nh5pset_integer_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
      /*
       * Call h5pset_c function
       */
-     return nh5pset_c(plist, name, name_len, value);
+     return h5pset_c(plist, name, name_len, value);
 }
 
 int_f
@@ -3483,7 +3513,7 @@ nh5pset_real_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
      /*
       * Call h5pset_c function
       */
-     return nh5pset_c(plist, name, name_len, value);
+     return h5pset_c(plist, name, name_len, value);
 }
 
 int_f
@@ -3492,7 +3522,7 @@ nh5pset_double_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
      /*
       * Call h5pset_c function
       */
-     return nh5pset_c(plist, name, name_len, value);
+     return h5pset_c(plist, name, name_len, value);
 }
 /****if* H5Pf/h5pgetc_c
  * NAME
@@ -3522,31 +3552,32 @@ nh5pgetc_c(hid_t_f *plist, _fcd name, int_f *name_len, _fcd value, int_f UNUSED
      /*
       * Call h5pget_c function
       */
-      ret_value = nh5pget_c(plist, name, name_len, _fcdtocp(value));
+      ret_value = h5pget_c(plist, name, name_len, _fcdtocp(value));
       return ret_value;
 }
 
 /****if* H5Pf/h5pget_c
  * NAME
- *        h5pget_c
+ *  h5pget_c
  * PURPOSE
- *     Call H5Pget to set property value
+ *  Call H5Pget to set property value
  * INPUTS
- *      plist - property list class identifier
- *              name   - name of the new property
- *              name_len - length of the "name" buffer
- * Output:      value - property value
+ *  plist   - property list class identifier
+ *  name     - name of the new property
+ *  name_len - length of the "name" buffer
+ * Output:  
+ *  value - property value
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              October 11, 2002
+ *  October 11, 2002
  * HISTORY
  *
  * SOURCE
 */
 int_f
-nh5pget_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
+h5pget_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
 /******/
 {
      int_f ret_value = -1;
@@ -3572,7 +3603,7 @@ nh5pget_integer_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
      /*
       * Call h5pget_c function
       */
-     return nh5pget_c(plist, name, name_len, value);
+     return h5pget_c(plist, name, name_len, value);
 }
 
 int_f
@@ -3581,7 +3612,7 @@ nh5pget_real_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
      /*
       * Call h5pget_c function
       */
-     return nh5pget_c(plist, name, name_len, value);
+     return h5pget_c(plist, name, name_len, value);
 }
 
 int_f
@@ -3590,7 +3621,7 @@ nh5pget_double_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
      /*
       * Call h5pget_c function
       */
-     return nh5pget_c(plist, name, name_len, value);
+     return h5pget_c(plist, name, name_len, value);
 }
 
 
@@ -5565,7 +5596,7 @@ nh5pget_chunk_cache_c(hid_t_f *dapl_id, size_t_f *rdcc_nslots, size_t_f *rdcc_nb
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5pset_file_image_c(hid_t_f *fapl_id, void *buf_ptr, size_t_f *buf_len)
+h5pset_file_image_c(hid_t_f *fapl_id, void *buf_ptr, size_t_f *buf_len)
 {
   int ret_value = -1;
   /*
@@ -5595,7 +5626,7 @@ nh5pset_file_image_c(hid_t_f *fapl_id, void *buf_ptr, size_t_f *buf_len)
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5pget_file_image_c(hid_t_f *fapl_id, void **buf_ptr, size_t_f *buf_len_ptr)
+h5pget_file_image_c(hid_t_f *fapl_id, void **buf_ptr, size_t_f *buf_len_ptr)
 {
   int ret_value = -1;
   size_t c_buf_len_ptr;
diff --git a/fortran/src/H5Pff_F03.f90 b/fortran/src/H5Pff_F03.f90
index 806c308..01d1d98 100644
--- a/fortran/src/H5Pff_F03.f90
+++ b/fortran/src/H5Pff_F03.f90
@@ -89,12 +89,10 @@ MODULE H5P_PROVISIONAL
   END INTERFACE
 
   INTERFACE
-     INTEGER FUNCTION h5pget_fill_value_c(prp_id, type_id, fillvalue)
+     INTEGER FUNCTION h5pget_fill_value_c(prp_id, type_id, fillvalue) &
+          BIND(C, NAME='h5pget_fill_value_c')
        USE H5GLOBAL
-       USE, INTRINSIC :: ISO_C_BINDING
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_FILL_VALUE_C'::h5pget_fill_value_c
-       !DEC$ENDIF
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
        INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
        INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
                                              ! of fillvalue datatype
@@ -104,12 +102,10 @@ MODULE H5P_PROVISIONAL
   END INTERFACE
 
   INTERFACE
-     INTEGER FUNCTION h5pset_fill_value_c(prp_id, type_id, fillvalue)
+     INTEGER FUNCTION h5pset_fill_value_c(prp_id, type_id, fillvalue) &
+          BIND(C, NAME='h5pset_fill_value_c')
        USE H5GLOBAL
-       USE, INTRINSIC :: ISO_C_BINDING
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FILL_VALUE_C'::h5pset_fill_value_c
-       !DEC$ENDIF
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
        INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
        INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
                                              ! of fillvalue datatype
@@ -119,43 +115,36 @@ MODULE H5P_PROVISIONAL
   END INTERFACE
 
   INTERFACE
-     INTEGER FUNCTION h5pset_c(prp_id, name, name_len, value)
+     INTEGER FUNCTION h5pset_c(prp_id, name, name_len, value) &
+          BIND(C, NAME='h5pset_c')
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr
        USE H5GLOBAL
-       USE, INTRINSIC :: ISO_C_BINDING
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_C'::h5pset_c
-       !DEC$ENDIF
        INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-       CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name  ! Name of property to modify
        INTEGER :: name_len
        TYPE(C_PTR), VALUE :: value ! Property value
      END FUNCTION h5pset_c
   END INTERFACE
 
   INTERFACE
-     INTEGER FUNCTION h5pget_c(prp_id, name, name_len, value)
-       USE, INTRINSIC :: ISO_C_BINDING
+     INTEGER FUNCTION h5pget_c(prp_id, name, name_len, value) &
+          BIND(C, NAME='h5pget_c')
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr
        USE H5GLOBAL
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_C'::h5pget_c
-       !DEC$ENDIF
        INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
-       CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name  ! Name of property to modify
        INTEGER :: name_len
        TYPE(C_PTR), VALUE :: value ! Property value
      END FUNCTION h5pget_c
   END INTERFACE
 
   INTERFACE
-     INTEGER FUNCTION h5pregister_c(class, name, name_len, size, value)
-       USE iso_c_binding
+     INTEGER FUNCTION h5pregister_c(class, name, name_len, size, value) &
+          BIND(C, NAME='h5pregister_c')
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr
        USE H5GLOBAL
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PREGISTER_C'::h5pregister_c
-       !DEC$ENDIF
-       !DEC$ATTRIBUTES reference :: name
        INTEGER(HID_T), INTENT(IN) :: class
-       CHARACTER(LEN=*), INTENT(IN) :: name
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
        INTEGER, INTENT(IN)         :: name_len
        INTEGER(SIZE_T), INTENT(IN) :: size
        TYPE(C_PTR), INTENT(IN), VALUE :: value
@@ -163,18 +152,15 @@ MODULE H5P_PROVISIONAL
   END INTERFACE
 
   INTERFACE
-     INTEGER FUNCTION h5pinsert_c(plist, name, name_len, size, value)
-       USE iso_c_binding
+     INTEGER FUNCTION h5pinsert_c(plist, name, name_len, size, value) &
+          BIND(C, NAME='h5pinsert_c')
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr
        USE H5GLOBAL
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PINSERT_C'::h5pinsert_c
-       !DEC$ENDIF
-       !DEC$ATTRIBUTES reference :: name
        INTEGER(HID_T), INTENT(IN) :: plist
-       CHARACTER(LEN=*), INTENT(IN) :: name
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
        INTEGER, INTENT(IN)         :: name_len
        INTEGER(SIZE_T), INTENT(IN) :: size
-       TYPE(c_ptr), INTENT(IN), value :: value
+       TYPE(C_PTR), INTENT(IN), VALUE :: value
      END FUNCTION h5pinsert_c
   END INTERFACE
 
@@ -1140,18 +1126,12 @@ CONTAINS
     TYPE(C_FUNPTR) :: create_default, copy_default, close_default
     INTERFACE
        INTEGER FUNCTION h5pcreate_class_c(parent, name, name_len, class, &
-            create, create_data, &
-            copy, copy_data, &
-            close, close_data)
-
-         USE iso_c_binding
+            create, create_data, copy, copy_data, close, close_data) &
+          BIND(C, NAME='h5pcreate_class_c')
+         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr, c_funptr
          USE H5GLOBAL
-         !DEC$IF DEFINED(HDCLOSEF90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PCREATE_CLASS_C'::h5pcreate_class_c
-         !DEC$ENDIF
-         !DEC$ATTRIBUTES reference :: name
          INTEGER(HID_T), INTENT(IN) :: parent
-         CHARACTER(LEN=*), INTENT(IN) :: name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
          INTEGER, INTENT(IN)         :: name_len
          INTEGER(HID_T), INTENT(OUT) :: class
          TYPE(C_PTR), VALUE :: create_data, copy_data, close_data
@@ -1213,12 +1193,10 @@ CONTAINS
     INTEGER        , INTENT(OUT) :: hdferr
 !*****
     INTERFACE
-       INTEGER FUNCTION h5pset_file_image_c(fapl_id, buf_ptr, buf_len)
-         USE iso_c_binding
+       INTEGER FUNCTION h5pset_file_image_c(fapl_id, buf_ptr, buf_len) &
+            BIND(C, NAME='h5pset_file_image_c')
+         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
          USE H5GLOBAL
-         !DEC$IF DEFINED(HDCLOSEF90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PSET_FILE_IMAGE_C'::h5pset_file_image_c
-         !DEC$ENDIF
          INTEGER(HID_T), INTENT(IN) :: fapl_id
          TYPE(C_PTR), VALUE :: buf_ptr
          INTEGER(SIZE_T), INTENT(IN)  :: buf_len
@@ -1271,12 +1249,10 @@ CONTAINS
     
 !*****
     INTERFACE
-       INTEGER FUNCTION h5pget_file_image_c(fapl_id, buf_ptr, buf_len_ptr)
-         USE iso_c_binding
+       INTEGER FUNCTION h5pget_file_image_c(fapl_id, buf_ptr, buf_len_ptr) &
+            BIND(C, NAME='h5pget_file_image_c')
+         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
          USE H5GLOBAL
-         !DEC$IF DEFINED(HDCLOSEF90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_FILE_IMAGE_C'::h5pget_file_image_c
-         !DEC$ENDIF
          INTEGER(HID_T), INTENT(IN) :: fapl_id
          TYPE(C_PTR), DIMENSION(*), INTENT(OUT)  :: buf_ptr
          INTEGER(SIZE_T), INTENT(OUT)  :: buf_len_ptr
diff --git a/fortran/src/H5Pff_F90.f90 b/fortran/src/H5Pff_F90.f90
index 5b75643..b5ea13d 100644
--- a/fortran/src/H5Pff_F90.f90
+++ b/fortran/src/H5Pff_F90.f90
@@ -927,22 +927,21 @@ SUBROUTINE h5pinsert_char(plist, name, size, value, hdferr)
     INTEGER :: name_len
 
     INTERFACE
-       INTEGER FUNCTION h5pcreate_class_c(parent, name, name_len,&
-            class)
+       INTEGER FUNCTION h5pcreate_class_f90_c(parent, name, name_len, class)
          USE H5GLOBAL
          !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PCREATE_CLASS_C'::h5pcreate_class_c
+         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PCREATE_CLASS_F90_C'::h5pcreate_class_f90_c
          !DEC$ENDIF
          !DEC$ATTRIBUTES reference :: name
          INTEGER(HID_T), INTENT(IN) :: parent
          CHARACTER(LEN=*), INTENT(IN) :: name
          INTEGER, INTENT(IN)         :: name_len
          INTEGER(HID_T), INTENT(OUT) :: class
-       END FUNCTION h5pcreate_class_c
+       END FUNCTION h5pcreate_class_f90_c
     END INTERFACE
 
     name_len = LEN(name)
-    hdferr = h5pcreate_class_c(parent, name, name_len, class)
+    hdferr = h5pcreate_class_f90_c(parent, name, name_len, class)
 
   END SUBROUTINE h5pcreate_class_f
 
diff --git a/fortran/src/H5Rf.c b/fortran/src/H5Rf.c
index 67d10e3..d2ed7a3 100644
--- a/fortran/src/H5Rf.c
+++ b/fortran/src/H5Rf.c
@@ -143,7 +143,7 @@ done:
  * SOURCE
 */
 int_f
-nh5rcreate_ptr_c (void *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *ref_type, hid_t_f *space_id)
+h5rcreate_ptr_c (void *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *ref_type, hid_t_f *space_id)
 /******/
 {
      int ret_value = -1;
@@ -252,18 +252,18 @@ done:
 
 /****if* H5Rf/h5rdereference_ptr_c
  * NAME
- *        h5rdereference_ptr_c
+ *  h5rdereference_ptr_c
  * PURPOSE
- *     Call H5Rdereference
+ *  Call H5Rdereference
  * INPUTS
- *      obj_id - Valid identifier for the file containing the
- *                       referenced object or any object in that file.
- *             ref_typ - The reference type of ref.
- *                 ref - Object reference
+ *  obj_id  - Valid identifier for the file containing the
+ *            referenced object or any object in that file.
+ *  ref_typ - The reference type of ref.
+ *  ref     - Object reference
  * OUTPUTS
- *     ref_obj_id - Identifier of referenced object
+ *  ref_obj_id - Identifier of referenced object
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  June 20, 2008
@@ -272,7 +272,7 @@ done:
  * SOURCE
 */
 int_f
-nh5rdereference_ptr_c (hid_t_f *obj_id, int_f *ref_type, void *ref, hid_t_f *ref_obj_id)
+h5rdereference_ptr_c (hid_t_f *obj_id, int_f *ref_type, void *ref, hid_t_f *ref_obj_id)
 /******/
 {
   int ret_value = -1;
@@ -351,7 +351,7 @@ done:
  * SOURCE
 */
 int_f
-nh5rget_region_ptr_c(hid_t_f *dset_id, void *ref, hid_t_f *space_id)
+h5rget_region_ptr_c(hid_t_f *dset_id, void *ref, hid_t_f *space_id)
 /******/
 {
      hid_t c_space_id;
@@ -532,9 +532,9 @@ done:
 
 /****if* H5Rf/h5rget_name_ptr_c
  * NAME
- *        h5rget_name_ptr_c
+ *  h5rget_name_ptr_c
  * PURPOSE
- *     Call H5Rget_name
+ *  Call H5Rget_name
  * INPUTS
  *
  *       loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
@@ -546,7 +546,7 @@ done:
  *     size - The size of the name buffer.
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  June 20, 2008
@@ -555,7 +555,7 @@ done:
  * SOURCE
 */
 int_f
-nh5rget_name_ptr_c (hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size_t_f *name_len, size_t_f *size_default)
+h5rget_name_ptr_c (hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size_t_f *name_len, size_t_f *size_default)
 /******/
 {
      int_f ret_value = -1;
@@ -601,12 +601,9 @@ nh5rget_name_ptr_c (hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size
  *   ref      - Reference to query.
  *
  * OUTPUTS
- *   obj_type - Type of referenced object. 
- *                H5G_UNKNOWN_F (-1)
- *                H5G_LINK_F      0
- *                H5G_GROUP_F     1
- *                H5G_DATASET_F   2
- *                H5G_TYPE_F      3
+ *   obj_type - Type of referenced object. These are defined in H5Opublic.h,
+ *              enum H5O_type_t
+ *              
  * RETURNS
  *   0 on success, -1 on failure
  * AUTHOR
@@ -616,7 +613,7 @@ nh5rget_name_ptr_c (hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size
  * SOURCE
 */
 int_f
-nh5rget_obj_type_c (hid_t_f *loc_id, int_f *ref_type, void *ref, int_f *obj_type)
+h5rget_obj_type_c (hid_t_f *loc_id, int_f *ref_type, void *ref, int_f *obj_type)
 /******/
 {
   int_f ret_value = -1;
diff --git a/fortran/src/H5Rff.f90 b/fortran/src/H5Rff.f90
index 64f1365..77a1ff8 100644
--- a/fortran/src/H5Rff.f90
+++ b/fortran/src/H5Rff.f90
@@ -75,11 +75,10 @@ CONTAINS
 !  ref 	         - reference to open
 ! OUTPUTS
 !  obj_type 	 - object_type, possible values:
-!                    H5G_UNKNOWN_F     (-1)
-!                    H5G_GROUP_F        0
-!                    H5G_DATASET_F      1
-!                    H5G_TYPE_F         2
-!                    H5G_LINK_F         3
+!                    H5G_UNKNOWN_F
+!                    H5G_GROUP_F 
+!                    H5G_DATASET_F
+!                    H5G_TYPE_F
 !  hdferr 	 - Returns 0 if successful and -1 if fails
 !
 ! AUTHOR
@@ -100,11 +99,10 @@ CONTAINS
     INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
     TYPE(hobj_ref_t_f), INTENT(IN) :: ref   ! Object reference
     INTEGER, INTENT(OUT) :: obj_type     ! Object type
-                                         !  H5G_UNKNOWN_F     (-1)
-                                         !  H5G_GROUP_F        0
-                                         !  H5G_DATASET_F      1
-                                         !  H5G_TYPE_F         2
-                                         !  H5G_LINK_F         3
+                                         !  H5G_UNKNOWN_F
+                                         !  H5G_GROUP_F
+                                         !  H5G_DATASET_F
+                                         !  H5G_TYPE_F
     INTEGER, INTENT(OUT) :: hdferr       ! Error code
 !*****
     INTEGER(HADDR_T) :: ref_f          ! Local buffer to pass reference
diff --git a/fortran/src/H5Rff_F03.f90 b/fortran/src/H5Rff_F03.f90
index e0ffa0a..fc4b2f3 100644
--- a/fortran/src/H5Rff_F03.f90
+++ b/fortran/src/H5Rff_F03.f90
@@ -90,29 +90,24 @@ MODULE H5R_PROVISIONAL
   END INTERFACE
 
   INTERFACE
-     INTEGER FUNCTION h5rget_name_ptr_c(loc_id, ref_type, ref, name, name_len, size_default)
-       USE, INTRINSIC :: ISO_C_BINDING
+     INTEGER FUNCTION h5rget_name_ptr_c(loc_id, ref_type, ref, name, name_len, size_default) &
+          BIND(C, NAME='h5rget_name_ptr_c')
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr
        USE H5GLOBAL
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RGET_NAME_PTR_C':: h5rget_name_ptr_c
-       !DEC$ENDIF
-       !DEC$ATTRIBUTES reference :: name
        INTEGER(HID_T), INTENT(IN) :: loc_id
        INTEGER, INTENT(IN) :: ref_type
        TYPE(C_PTR), INTENT(IN), VALUE :: ref
-       CHARACTER(LEN=*), INTENT(OUT) :: name
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
        INTEGER(SIZE_T) :: name_len
        INTEGER(SIZE_T) :: size_default
      END FUNCTION h5rget_name_ptr_c
   END INTERFACE
 
   INTERFACE
-     INTEGER FUNCTION h5rdereference_ptr_c(obj_id, ref_type, ref, ref_obj_id)
+     INTEGER FUNCTION h5rdereference_ptr_c(obj_id, ref_type, ref, ref_obj_id) &
+          BIND(C, NAME='h5rdereference_ptr_c')
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
        USE H5GLOBAL
-       USE, INTRINSIC :: ISO_C_BINDING
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RDEREFERENCE_PTR_C':: h5rdereference_ptr_c
-       !DEC$ENDIF
        INTEGER(HID_T), INTENT(IN) :: obj_id
        INTEGER, INTENT(IN) :: ref_type
        TYPE(C_PTR), INTENT(IN), VALUE :: ref
@@ -121,16 +116,13 @@ MODULE H5R_PROVISIONAL
   END INTERFACE
 
   INTERFACE
-     INTEGER FUNCTION h5rcreate_ptr_c(ref, loc_id, name, namelen, ref_type, space_id)
-       USE, INTRINSIC :: ISO_C_BINDING
+     INTEGER FUNCTION h5rcreate_ptr_c(ref, loc_id, name, namelen, ref_type, space_id) &
+          BIND(C, NAME='h5rcreate_ptr_c')
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_char, c_ptr
        USE H5GLOBAL
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RCREATE_PTR_C':: h5rcreate_ptr_c
-       !DEC$ENDIF
-       !DEC$ATTRIBUTES reference :: name
        TYPE(C_PTR), VALUE :: ref
        INTEGER(HID_T), INTENT(IN) :: loc_id
-       CHARACTER(LEN=*), INTENT(IN) :: name
+       CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
        INTEGER :: namelen
        INTEGER, INTENT(IN) :: ref_type
        INTEGER(HID_T), INTENT(IN) :: space_id
@@ -138,12 +130,10 @@ MODULE H5R_PROVISIONAL
   END INTERFACE
 
   INTERFACE
-     INTEGER FUNCTION h5rget_region_ptr_c(dset_id, ref, space_id)
-       USE, INTRINSIC :: ISO_C_BINDING
+     INTEGER FUNCTION h5rget_region_ptr_c(dset_id, ref, space_id) &
+          BIND(C, NAME='h5rget_region_ptr_c')
+       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
        USE H5GLOBAL
-       !DEC$IF DEFINED(HDF5F90_WINDOWS)
-       !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RGET_REGION_PTR_C':: h5rget_region_ptr_c
-       !DEC$ENDIF
        INTEGER(HID_T), INTENT(IN) :: dset_id
        TYPE(C_PTR), VALUE :: ref
        INTEGER(HID_T), INTENT(OUT) :: space_id
@@ -281,7 +271,6 @@ CONTAINS
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
 !*****
     INTEGER :: namelen                     ! Name length
-
     TYPE(C_PTR) :: f_ptr
 
     f_ptr = C_LOC(ref)
@@ -689,11 +678,10 @@ CONTAINS
   !
   ! Outputs:
   !  obj_type - Type of referenced object. 
-  !               H5G_UNKNOWN_F (-1)
-  !               H5G_LINK_F      0
-  !               H5G_GROUP_F     1
-  !               H5G_DATASET_F   2
-  !               H5G_TYPE_F      3
+  !               H5G_UNKNOWN_F
+  !               H5G_GROUP_F
+  !               H5G_DATASET_F
+  !               H5G_TYPE_F
   !              
   !  hdferr   - Returns 0 if successful and -1 if fails.
   !
@@ -713,12 +701,10 @@ CONTAINS
     !*****
 
     INTERFACE
-       INTEGER FUNCTION h5rget_obj_type_c(loc_id, ref_type, ref, obj_type)
-         USE, INTRINSIC :: ISO_C_BINDING
+       INTEGER FUNCTION h5rget_obj_type_c(loc_id, ref_type, ref, obj_type) &
+            BIND(C, NAME='h5rget_obj_type_c')
+         USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
          USE H5GLOBAL
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5RGET_OBJ_TYPE_C':: h5rget_obj_type_c
-         !DEC$ENDIF
          INTEGER(HID_T), INTENT(IN) :: loc_id
          INTEGER, INTENT(IN) :: ref_type
          TYPE(C_PTR), VALUE :: ref
diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c
index 8e17026..f6803ac 100644
--- a/fortran/src/H5Sf.c
+++ b/fortran/src/H5Sf.c
@@ -97,7 +97,7 @@ nh5sclose_c ( hid_t_f *space_id )
   int ret_value = 0;
   hid_t c_space_id;
 
-  c_space_id = *space_id;
+  c_space_id = (hid_t)*space_id;
   if ( H5Sclose(c_space_id) < 0  ) ret_value = -1;
   return ret_value;
 }
@@ -163,7 +163,7 @@ nh5scopy_c( hid_t_f *space_id , hid_t_f *new_space_id)
   hid_t c_new_space_id;
   hid_t c_space_id;
 
-  c_space_id = *space_id;
+  c_space_id = (hid_t)*space_id;
   c_new_space_id = H5Scopy(c_space_id);
   if ( c_new_space_id < 0  ) ret_value = -1;
 
@@ -201,7 +201,7 @@ nh5sget_select_hyper_nblocks_c( hid_t_f *space_id , hssize_t_f * num_blocks)
   hid_t c_space_id;
   hssize_t c_num_blocks;
 
-  c_space_id = *space_id;
+  c_space_id = (hid_t)*space_id;
   c_num_blocks = H5Sget_select_hyper_nblocks(c_space_id);
   if ( c_num_blocks < 0  ) ret_value = -1;
 
@@ -239,7 +239,7 @@ nh5sget_select_elem_npoints_c( hid_t_f *space_id , hssize_t_f * num_points)
   hid_t c_space_id;
   hssize_t c_num_points;
 
-  c_space_id = *space_id;
+  c_space_id = (hid_t)*space_id;
   c_num_points = H5Sget_select_elem_npoints(c_space_id);
   if ( c_num_points < 0  ) ret_value = -1;
 
@@ -278,8 +278,8 @@ nh5sget_select_elem_npoints_c( hid_t_f *space_id , hssize_t_f * num_points)
 */
 
 int_f
-nh5sget_select_hyper_blocklist_c( hid_t_f *space_id ,hsize_t_f * startblock,
-                                  hsize_t_f * num_blocks, hsize_t_f * buf)
+nh5sget_select_hyper_blocklist_c( hid_t_f *space_id ,hsize_t_f *startblock,
+                                  hsize_t_f *num_blocks, hsize_t_f *buf)
 /******/
 {
   int ret_value = -1;
@@ -291,8 +291,8 @@ nh5sget_select_hyper_blocklist_c( hid_t_f *space_id ,hsize_t_f * startblock,
   int rank;
   hsize_t c_startblock, *c_buf;
 
-  c_space_id = *space_id;
-  c_num_blocks = * num_blocks;
+  c_space_id = (hid_t)*space_id;
+  c_num_blocks = (hsize_t)*num_blocks;
 
   rank = H5Sget_simple_extent_ndims(c_space_id);
   if (rank < 0 ) return ret_value;
@@ -360,7 +360,7 @@ nh5sget_select_bounds_c( hid_t_f *space_id , hsize_t_f * start, hsize_t_f * end)
     int i, rank;
     int_f ret_value = 0;
 
-    c_space_id = *space_id;
+    c_space_id = (hid_t)*space_id;
     rank = H5Sget_simple_extent_ndims(c_space_id);
     if(rank < 0 )
         HGOTO_DONE(FAIL)
@@ -418,7 +418,7 @@ nh5sget_select_elem_pointlist_c( hid_t_f *space_id ,hsize_t_f * startpoint,
   int rank;
   int j,i2;
 
-  c_space_id = *space_id;
+  c_space_id = (hid_t)*space_id;
   c_num_points = (hsize_t)* numpoints;
 
   rank = H5Sget_simple_extent_ndims(c_space_id);
@@ -479,7 +479,7 @@ nh5sselect_all_c ( hid_t_f *space_id )
   int ret_value = 0;
   hid_t c_space_id;
 
-  c_space_id = *space_id;
+  c_space_id = (hid_t)*space_id;
   if ( H5Sselect_all(c_space_id) < 0  ) ret_value = -1;
   return ret_value;
 }
@@ -508,7 +508,7 @@ nh5sselect_none_c ( hid_t_f *space_id )
   int ret_value = 0;
   hid_t c_space_id;
 
-  c_space_id = *space_id;
+  c_space_id = (hid_t)*space_id;
   if ( H5Sselect_none(c_space_id) < 0  ) ret_value = -1;
   return ret_value;
 }
@@ -542,7 +542,7 @@ nh5sselect_valid_c ( hid_t_f *space_id , int_f *flag )
   hid_t c_space_id;
   htri_t status;
 
-  c_space_id = *space_id;
+  c_space_id = (hid_t)*space_id;
   status = H5Sselect_valid(c_space_id);
   *flag = (int_f)status;
   if ( status < 0  ) ret_value = -1;
@@ -577,7 +577,7 @@ nh5sget_simple_extent_npoints_c ( hid_t_f *space_id , hsize_t_f *npoints )
   hid_t c_space_id;
   hssize_t c_npoints;
 
-  c_space_id = *space_id;
+  c_space_id = (hid_t)*space_id;
   c_npoints = H5Sget_simple_extent_npoints(c_space_id);
   if ( c_npoints == 0  ) ret_value = -1;
   *npoints = (hsize_t_f)c_npoints;
@@ -612,7 +612,7 @@ nh5sget_select_npoints_c ( hid_t_f *space_id , hssize_t_f *npoints )
   hssize_t c_npoints;
   hid_t c_space_id;
 
-  c_space_id = *space_id;
+  c_space_id = (hid_t)*space_id;
   c_npoints = H5Sget_select_npoints(c_space_id);
   if ( c_npoints < 0  ) ret_value = -1;
   *npoints = (hssize_t_f)c_npoints;
@@ -647,7 +647,7 @@ nh5sget_simple_extent_ndims_c ( hid_t_f *space_id , int_f *ndims )
   hid_t c_space_id;
   int c_ndims;
 
-  c_space_id = *space_id;
+  c_space_id = (hid_t)*space_id;
   c_ndims = H5Sget_simple_extent_ndims(c_space_id);
   if ( c_ndims < 0  ) ret_value = -1;
   *ndims = (int_f)c_ndims;
@@ -683,7 +683,7 @@ nh5sget_simple_extent_type_c ( hid_t_f *space_id , int_f *classtype)
   hid_t c_space_id;
   H5S_class_t c_classtype;
 
-  c_space_id = *space_id;
+  c_space_id = (hid_t)*space_id;
   c_classtype = H5Sget_simple_extent_type(c_space_id);
   if ( c_classtype < 0  ) ret_value = -1;
    *classtype = c_classtype;
@@ -724,7 +724,7 @@ nh5soffset_simple_c ( hid_t_f *space_id , hssize_t_f *offset)
     int i;
     int_f ret_value = 0;
 
-    c_space_id = *space_id;
+    c_space_id = (hid_t)*space_id;
     rank = H5Sget_simple_extent_ndims(c_space_id);
     if(rank < 0)
         HGOTO_DONE(FAIL)
@@ -820,7 +820,7 @@ nh5sget_simple_extent_dims_c ( hid_t_f *space_id , hsize_t_f *dims, hsize_t_f *m
     int i;
     int_f ret_value;
 
-    c_space_id = *space_id;
+    c_space_id = (hid_t)*space_id;
     rank = H5Sget_simple_extent_ndims(c_space_id);
     if(rank < 0)
         HGOTO_DONE(FAIL)
@@ -871,7 +871,7 @@ nh5sis_simple_c ( hid_t_f *space_id , int_f *flag )
   hid_t c_space_id;
   htri_t status;
 
-  c_space_id = *space_id;
+  c_space_id = (hid_t)*space_id;
   status = H5Sis_simple(c_space_id);
   *flag = (int_f)status;
   if ( status < 0  ) ret_value = -1;
@@ -905,8 +905,8 @@ nh5sextent_copy_c ( hid_t_f *dest_space_id , hid_t_f *source_space_id)
   hid_t c_dest_space_id, c_source_space_id;
   herr_t status;
 
-  c_dest_space_id = *dest_space_id;
-  c_source_space_id = *source_space_id;
+  c_dest_space_id = (hid_t)*dest_space_id;
+  c_source_space_id = (hid_t)*source_space_id;
   status = H5Sextent_copy(c_dest_space_id, c_source_space_id);
   if ( status < 0  ) ret_value = -1;
   return ret_value;
@@ -937,7 +937,7 @@ nh5sset_extent_none_c ( hid_t_f *space_id )
   hid_t c_space_id;
   herr_t status;
 
-  c_space_id = *space_id;
+  c_space_id = (hid_t)*space_id;
   status = H5Sset_extent_none(c_space_id);
   if ( status < 0  ) ret_value = -1;
   return ret_value;
diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c
index 32cdb72..ca9c30f 100644
--- a/fortran/src/H5Tf.c
+++ b/fortran/src/H5Tf.c
@@ -2385,9 +2385,9 @@ nh5tget_native_type_c(hid_t_f *dtype_id, int_f *direction, hid_t_f *native_dtype
 
 /****if* H5Tf/h5tconvert_c
  * NAME
- *        h5tconvert_c
+ *  h5tconvert_c
  * PURPOSE
- *     Call H5Tconvert
+ *  Call H5Tconvert
  * INPUTS
  *
  *  src_id     - Identifier for the source datatype.
@@ -2401,7 +2401,7 @@ nh5tget_native_type_c(hid_t_f *dtype_id, int_f *direction, hid_t_f *native_dtype
  *  buf        - Array containing post-conversion values.
  *
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
  *  December 8, 2008
@@ -2409,7 +2409,7 @@ nh5tget_native_type_c(hid_t_f *dtype_id, int_f *direction, hid_t_f *native_dtype
  * SOURCE
 */
 int_f
-nh5tconvert_c(hid_t_f *src_id, hid_t_f *dst_id, size_t_f *nelmts, void *buf, void *background, hid_t_f *plist_id)
+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)
 /******/
 {
   int ret_value = -1;
diff --git a/fortran/src/H5Tff_F03.f90 b/fortran/src/H5Tff_F03.f90
index d16553a..2405837 100644
--- a/fortran/src/H5Tff_F03.f90
+++ b/fortran/src/H5Tff_F03.f90
@@ -89,12 +89,10 @@ CONTAINS
     TYPE(C_PTR) :: background_default
 
     INTERFACE
-       INTEGER FUNCTION h5tconvert_c(src_id, dst_id, nelmts, buf, background, plist_id)
-         USE, INTRINSIC :: ISO_C_BINDING
+       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
-         !DEC$IF DEFINED(HDF5F90_WINDOWS)
-         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5TCONVERT_C'::H5Tconvert_c
-         !DEC$ENDIF
          INTEGER(HID_T) , INTENT(IN)           :: src_id
          INTEGER(HID_T) , INTENT(IN)           :: dst_id
          INTEGER(SIZE_T), INTENT(IN)           :: nelmts
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index a0a4f64..284ffbd 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -93,7 +93,6 @@ typedef struct H5O_info_t_f {
 #define nh5fget_obj_count_c       H5_FC_FUNC_(h5fget_obj_count_c, H5FGET_OBJ_COUNT_C)
 #define nh5fget_obj_ids_c         H5_FC_FUNC_(h5fget_obj_ids_c, H5FGET_OBJ_IDS_C)
 #define nh5fget_freespace_c       H5_FC_FUNC_(h5fget_freespace_c, H5FGET_FREESPACE_C)
-#define nh5fget_file_image_c      H5_FC_FUNC_(h5fget_file_image_c, H5FGET_FILE_IMAGE_C)
 #define nh5fget_name_c            H5_FC_FUNC_(h5fget_name_c, H5FGET_NAME_C)
 #define nh5fget_filesize_c        H5_FC_FUNC_(h5fget_filesize_c, H5FGET_FILESIZE_C)
 
@@ -109,7 +108,7 @@ H5_FCDLL int_f nh5fget_access_plist_c (hid_t_f *file_id, hid_t_f *access_id);
 H5_FCDLL int_f nh5fget_obj_count_c (hid_t_f *file_id, int_f *obj_type, size_t_f *obj_count);
 H5_FCDLL int_f nh5fget_obj_ids_c (hid_t_f *file_id, int_f *obj_type, size_t_f *max_objs, hid_t_f *obj_ids, size_t_f *num_objs);
 H5_FCDLL int_f nh5fget_freespace_c (hid_t_f *file_id, hssize_t_f *free_space);
-H5_FCDLL int_f nh5fget_file_image_c(hid_t_f *file_id, void *buf_ptr, size_t_f *buf_len, size_t_f *buf_req);
+H5_FCDLL int_f h5fget_file_image_c(hid_t_f *file_id, void *buf_ptr, size_t_f *buf_len, size_t_f *buf_req);
 H5_FCDLL int_f nh5fflush_c (hid_t_f *obj_id, int_f *scope);
 H5_FCDLL int_f nh5fget_name_c(hid_t_f *obj_id, size_t_f *size, _fcd buf, size_t_f *buflen);
 H5_FCDLL int_f nh5fget_filesize_c(hid_t_f *file_id, hsize_t_f *size);
@@ -276,16 +275,12 @@ H5_FCDLL int_f nh5sextent_equal_c ( hid_t_f * space1_id, hid_t_f *space2_id, hid
 #define nh5dwrite_vl_string_c       H5_FC_FUNC_(h5dwrite_vl_string_c, H5DWRITE_VL_STRING_C)
 #define nh5dread_vl_string_c        H5_FC_FUNC_(h5dread_vl_string_c, H5DREAD_VL_STRING_C)
 #define nh5dfillc_c                 H5_FC_FUNC_(h5dfillc_c, H5DFILLC_C)
-#define nh5dfill_c                  H5_FC_FUNC_(h5dfill_c, H5DFILL_C)
 #define nh5dfill_integer_c                  H5_FC_FUNC_(h5dfill_integer_c, H5DFILL_INTEGER_C)
 #define nh5dfill_real_c                  H5_FC_FUNC_(h5dfill_real_c, H5DFILL_REAL_C)
 #define nh5dfill_double_c                  H5_FC_FUNC_(h5dfill_double_c, H5DFILL_DOUBLE_C)
 #define nh5dget_space_status_c    H5_FC_FUNC_(h5dget_space_status_c, H5DGET_SPACE_STATUS_C)
 #define nh5dcreate_anon_c         H5_FC_FUNC_(h5dcreate_anon_c, H5DCREATE_ANON_C)
-#define nh5dwrite_f_c             H5_FC_FUNC_(h5dwrite_f_c, H5DWRITE_F_C)
-#define nh5dread_f_c              H5_FC_FUNC_(h5dread_f_c, H5DREAD_F_C)
 #define nh5dget_access_plist_c    H5_FC_FUNC_(h5dget_access_plist_c, H5DGET_ACCESS_PLIST_C)
-#define nh5dvlen_reclaim_c        H5_FC_FUNC_(h5dvlen_reclaim_c, H5DVLEN_RECLAIM_C)
 
 
 H5_FCDLL int_f nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id,
@@ -392,18 +387,18 @@ H5_FCDLL int_f nh5dset_extent_c ( hid_t_f *dset_id , hsize_t_f *dims);
 H5_FCDLL int_f nh5dvlen_get_max_len_c(hid_t_f *dataset_id, hid_t_f *type_id, hid_t_f *space_id, size_t_f *len);
 H5_FCDLL int_f nh5dget_storage_size_c(hid_t_f *dataset_id, hsize_t_f *size);
 H5_FCDLL int_f nh5dfillc_c(_fcd fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, _fcd buf, hid_t_f *mem_type_id);
-H5_FCDLL int_f nh5dfill_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
+H5_FCDLL int_f h5dfill_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
 H5_FCDLL int_f nh5dfill_integer_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
 H5_FCDLL int_f nh5dfill_real_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
 H5_FCDLL int_f nh5dfill_double_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
 H5_FCDLL int_f nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag);
 H5_FCDLL int_f nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id,
 				  hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id);
-H5_FCDLL int_f nh5dwrite_f_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, 
+H5_FCDLL int_f h5dwrite_f_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, 
 				   hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf);
-H5_FCDLL int_f nh5dread_f_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, 
+H5_FCDLL int_f h5dread_f_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, 
 				   hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf);
-H5_FCDLL int_f nh5dvlen_reclaim_c (hid_t_f *type_id ,  hid_t_f *space_id, hid_t_f *plist_id, void *buf);
+H5_FCDLL int_f h5dvlen_reclaim_c (hid_t_f *type_id ,  hid_t_f *space_id, hid_t_f *plist_id, void *buf);
 /*
  * Functions from H5Gf.c
  */
@@ -490,7 +485,6 @@ H5_FCDLL int_f nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f
 #define nh5awritec_5_c      H5_FC_FUNC_(h5awritec_5_c, H5AWRITEC_5_C)
 #define nh5awritec_6_c      H5_FC_FUNC_(h5awritec_6_c, H5AWRITEC_6_C)
 #define nh5awritec_7_c      H5_FC_FUNC_(h5awritec_7_c, H5AWRITEC_7_C)
-#define nh5awrite_f_c       H5_FC_FUNC_(h5awrite_f_c, H5AWRITE_F_C)
 #define nh5aread_c                 H5_FC_FUNC_(h5aread_c, H5AREAD_C)
 #define nh5aread_integer_s_c        H5_FC_FUNC_(h5aread_integer_s_c, H5AREAD_INTEGER_S_C)
 #define nh5aread_integer_1_c        H5_FC_FUNC_(h5aread_integer_1_c, H5AREAD_INTEGER_1_C)
@@ -525,7 +519,6 @@ H5_FCDLL int_f nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f
 #define nh5areadc_5_c       H5_FC_FUNC_(h5areadc_5_c, H5AREADC_5_C)
 #define nh5areadc_6_c       H5_FC_FUNC_(h5areadc_6_c, H5AREADC_6_C)
 #define nh5areadc_7_c       H5_FC_FUNC_(h5areadc_7_c, H5AREADC_7_C)
-#define nh5aread_f_c        H5_FC_FUNC_(h5aread_f_c, H5AREAD_F_C)
 #define nh5aget_name_c    H5_FC_FUNC_(h5aget_name_c, H5AGET_NAME_C)
 #define nh5aopen_idx_c    H5_FC_FUNC_(h5aopen_idx_c, H5AOPEN_IDX_C)
 #define nh5aget_space_c   H5_FC_FUNC_(h5aget_space_c, H5AGET_SPACE_C)
@@ -586,7 +579,7 @@ H5_FCDLL int_f nh5awrite_double_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, voi
 H5_FCDLL int_f nh5awrite_double_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
 H5_FCDLL int_f nh5awrite_double_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
 H5_FCDLL int_f nh5awrite_double_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5awrite_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf);
+H5_FCDLL int_f h5awrite_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf);
 H5_FCDLL int_f nh5areadc_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
 H5_FCDLL int_f nh5areadc_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
 H5_FCDLL int_f nh5areadc_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
@@ -621,7 +614,7 @@ H5_FCDLL int_f nh5aread_double_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void
 H5_FCDLL int_f nh5aread_double_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
 H5_FCDLL int_f nh5aread_double_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
 H5_FCDLL int_f nh5aread_double_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f nh5aread_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf);
+H5_FCDLL int_f h5aread_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf);
 H5_FCDLL int_f nh5aclose_c ( hid_t_f *attr_id );
 H5_FCDLL int_f nh5adelete_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen);
 H5_FCDLL int_f nh5aopen_idx_c (hid_t_f *obj_id, int_f *idx, hid_t_f *attr_id);
@@ -675,7 +668,6 @@ H5_FCDLL int_f nh5arename_c( hid_t_f *loc_id,
 #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 nh5tconvert_c      H5_FC_FUNC_(h5tconvert_c, H5TCONVERT_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)
@@ -798,7 +790,7 @@ 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 nh5tconvert_c(hid_t_f *src_id, hid_t_f *dst_id, size_t_f *nelmts, void *buf, void *background, hid_t_f *plist_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);
 
 
 /*
@@ -808,11 +800,6 @@ H5_FCDLL int_f nh5tconvert_c(hid_t_f *src_id, hid_t_f *dst_id, size_t_f *nelmts,
 #define nh5olink_c       H5_FC_FUNC_(h5olink_c, H5OLINK_C)
 #define nh5oopen_c       H5_FC_FUNC_(h5oopen_c, H5OOPEN_C)
 #define nh5oclose_c      H5_FC_FUNC_(h5oclose_c, H5OCLOSE_C)
-#define nh5ovisit_c      H5_FC_FUNC_(h5ovisit_c, H5OVISIT_C)
-#define nh5ovisit_by_name_c H5_FC_FUNC_(h5ovisit_by_name_c, H5OVISIT_BY_NAME_C)
-#define nh5oget_info_c   H5_FC_FUNC_(h5oget_info_c, H5OGET_INFO_C)
-#define nh5oget_info_by_idx_c H5_FC_FUNC_(h5oget_info_by_idx_c ,H5OGET_INFO_BY_IDX_C)
-#define nh5oget_info_by_name_c H5_FC_FUNC_(h5oget_info_by_name_c ,H5OGET_INFO_BY_NAME_C)
 #define nh5oopen_by_addr_c H5_FC_FUNC_(h5oopen_by_addr_c, H5OOPEN_BY_ADDR_C)
 #define nh5ocopy_c         H5_FC_FUNC_(h5ocopy_c, H5OCOPY_C)
 #define nh5odecr_refcount_c H5_FC_FUNC_(h5odecr_refcount_c, H5ODECR_REFCOUNT_C)
@@ -829,13 +816,13 @@ H5_FCDLL int_f nh5oclose_c (hid_t_f *object_id );
 H5_FCDLL int_f nh5oopen_by_addr_c (hid_t_f *loc_id, haddr_t_f *addr, hid_t_f *obj_id);
 H5_FCDLL int_f nh5olink_c (hid_t_f *object_id, hid_t_f *new_loc_id, _fcd name, size_t_f *namelen,
 			   hid_t_f *lcpl_id, hid_t_f *lapl_id);
-H5_FCDLL int_f nh5ovisit_c (hid_t_f *group_id, int_f *index_type, int_f *order, H5O_iterate_t op, void *op_data);
-H5_FCDLL int_f nh5ovisit_by_name_c(hid_t_f *loc_id,  _fcd object_name, size_t_f *namelen, int_f *index_type, int_f *order,
+H5_FCDLL int_f h5ovisit_c (hid_t_f *group_id, int_f *index_type, int_f *order, H5O_iterate_t op, void *op_data);
+H5_FCDLL int_f h5ovisit_by_name_c(hid_t_f *loc_id,  _fcd object_name, size_t_f *namelen, int_f *index_type, int_f *order,
 				   H5O_iterate_t op, void *op_data, hid_t_f *lapl_id );
-H5_FCDLL int_f nh5oget_info_c (hid_t_f *object_id, H5O_info_t_f *object_info);
-H5_FCDLL int_f nh5oget_info_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *namelen, 
+H5_FCDLL int_f h5oget_info_c (hid_t_f *object_id, H5O_info_t_f *object_info);
+H5_FCDLL int_f h5oget_info_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *namelen, 
 				      int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id, H5O_info_t_f *object_info);
-H5_FCDLL int_f nh5oget_info_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id,
+H5_FCDLL int_f h5oget_info_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id,
 				       H5O_info_t_f *object_info);
 H5_FCDLL int_f nh5ocopy_c (hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_name_len,
 			   hid_t_f *dst_loc_id, _fcd dst_name, size_t_f *dst_name_len, 
@@ -856,6 +843,7 @@ H5_FCDLL int_f nh5oget_comment_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *
 #define nh5pcreate_c       H5_FC_FUNC_(h5pcreate_c, H5PCREATE_C)
 #define nh5pclose_c        H5_FC_FUNC_(h5pclose_c, H5PCLOSE_C)
 #define nh5pcopy_c         H5_FC_FUNC_(h5pcopy_c, H5PCOPY_C)
+#define nh5pcreate_class_f90_c H5_FC_FUNC_(h5pcreate_class_f90_c, H5PCREATE_CLASS_F90_C)
 #define nh5pequal_c         H5_FC_FUNC_(h5pequal_c, H5PEQUAL_C)
 #define nh5pget_class_c    H5_FC_FUNC_(h5pget_class_c, H5PGET_CLASS_C)
 #define nh5pset_deflate_c  H5_FC_FUNC_(h5pset_deflate_c, H5PSET_DEFLATE_C)
@@ -863,15 +851,11 @@ H5_FCDLL int_f nh5oget_comment_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *
 #define nh5pget_preserve_c  H5_FC_FUNC_(h5pget_preserve_c, H5PGET_PRESERVE_C)
 #define nh5pset_chunk_c    H5_FC_FUNC_(h5pset_chunk_c, H5PSET_CHUNK_C)
 #define nh5pget_chunk_c    H5_FC_FUNC_(h5pget_chunk_c, H5PGET_CHUNK_C)
-#define nh5pset_file_image_c H5_FC_FUNC_(h5pset_file_image_c,H5PSET_FILE_IMAGE_C)
 #define nh5pset_fill_valuec_c        H5_FC_FUNC_(h5pset_fill_valuec_c, H5PSET_FILL_VALUEC_C)
-#define nh5pset_fill_value_c         H5_FC_FUNC_(h5pset_fill_value_c, H5PSET_FILL_VALUE_C)
 #define nh5pset_fill_value_integer_c H5_FC_FUNC_(h5pset_fill_value_integer_c, H5PSET_FILL_VALUE_INTEGER_C)
 #define nh5pset_fill_value_real_c    H5_FC_FUNC_(h5pset_fill_value_real_c, H5PSET_FILL_VALUE_REAL_C)
 #define nh5pset_fill_value_double_c  H5_FC_FUNC_(h5pset_fill_value_double_c, H5PSET_FILL_VALUE_DOUBLE_C)
-#define nh5pget_file_image_c H5_FC_FUNC_(h5pget_file_image_c,H5PGET_FILE_IMAGE_C)
 #define nh5pget_fill_valuec_c        H5_FC_FUNC_(h5pget_fill_valuec_c, H5PGET_FILL_VALUEC_C)
-#define nh5pget_fill_value_c         H5_FC_FUNC_(h5pget_fill_value_c, H5PGET_FILL_VALUE_C)
 #define nh5pget_fill_value_integer_c H5_FC_FUNC_(h5pget_fill_value_integer_c, H5PGET_FILL_VALUE_INTEGER_C)
 #define nh5pget_fill_value_real_c    H5_FC_FUNC_(h5pget_fill_value_real_c, H5PGET_FILL_VALUE_REAL_C)
 #define nh5pget_fill_value_double_c  H5_FC_FUNC_(h5pget_fill_value_double_c, H5PGET_FILL_VALUE_DOUBLE_C)
@@ -935,23 +919,18 @@ H5_FCDLL int_f nh5oget_comment_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *
 #define nh5pget_hyper_vector_size_c    H5_FC_FUNC_(h5pget_hyper_vector_size_c, H5PGET_HYPER_VECTOR_SIZE_C)
 #define nh5pset_small_data_block_size_c    H5_FC_FUNC_(h5pset_small_data_block_size_c, H5PSET_SMALL_DATA_BLOCK_SIZE_C)
 #define nh5pget_small_data_block_size_c    H5_FC_FUNC_(h5pget_small_data_block_size_c, H5PGET_SMALL_DATA_BLOCK_SIZE_C)
-#define nh5pcreate_class_c             H5_FC_FUNC_(h5pcreate_class_c, H5PCREATE_CLASS_C)
-#define nh5pregister_c                 H5_FC_FUNC_(h5pregister_c, H5PREGISTER_C)
 #define nh5pregister_integer_c                 H5_FC_FUNC_(h5pregister_integer_c, H5PREGISTER_INTEGER_C)
 #define nh5pregister_real_c                    H5_FC_FUNC_(h5pregister_real_c, H5PREGISTER_REAL_C)
 #define nh5pregister_double_c                  H5_FC_FUNC_(h5pregister_double_c, H5PREGISTER_DOUBLE_C)
 #define nh5pregisterc_c                H5_FC_FUNC_(h5pregisterc_c, H5PREGISTERC_C)
-#define nh5pinsert_c                   H5_FC_FUNC_(h5pinsert_c, H5PINSERT_C)
 #define nh5pinsert_integer_c                   H5_FC_FUNC_(h5pinsert_integer_c, H5PINSERT_INTEGER_C)
 #define nh5pinsert_real_c                   H5_FC_FUNC_(h5pinsert_real_c, H5PINSERT_REAL_C)
 #define nh5pinsert_double_c                   H5_FC_FUNC_(h5pinsert_double_c, H5PINSERT_DOUBLE_C)
 #define nh5pinsertc_c                  H5_FC_FUNC_(h5pinsertc_c, H5PINSERTC_C)
-#define nh5pset_c                      H5_FC_FUNC_(h5pset_c, H5PSET_C)
 #define nh5pset_integer_c                      H5_FC_FUNC_(h5pset_integer_c, H5PSET_INTEGER_C)
 #define nh5pset_real_c                         H5_FC_FUNC_(h5pset_real_c, H5PSET_REAL_C)
 #define nh5pset_double_c                       H5_FC_FUNC_(h5pset_double_c, H5PSET_DOUBLE_C)
 #define nh5psetc_c                     H5_FC_FUNC_(h5psetc_c, H5PSETC_C)
-#define nh5pget_c                      H5_FC_FUNC_(h5pget_c, H5PGET_C)
 #define nh5pget_integer_c                      H5_FC_FUNC_(h5pget_integer_c, H5PGET_INTEGER_C)
 #define nh5pget_real_c                         H5_FC_FUNC_(h5pget_real_c, H5PGET_REAL_C)
 #define nh5pget_double_c                       H5_FC_FUNC_(h5pget_double_c, H5PGET_DOUBLE_C)
@@ -1019,15 +998,15 @@ H5_FCDLL int_f nh5pget_class_c ( hid_t_f *prp_id , int_f *classtype);
 H5_FCDLL int_f nh5pset_deflate_c ( hid_t_f *prp_id , int_f *level);
 H5_FCDLL int_f nh5pset_chunk_c ( hid_t_f *prp_id, int_f *rank, hsize_t_f *dims );
 H5_FCDLL int_f nh5pget_chunk_c ( hid_t_f *prp_id, int_f *max_rank, hsize_t_f *dims );
-H5_FCDLL int_f nh5pset_file_image_c (hid_t_f *fapl_id, void *buf_ptr, size_t_f *buf_len);
+H5_FCDLL int_f h5pset_file_image_c (hid_t_f *fapl_id, void *buf_ptr, size_t_f *buf_len);
 H5_FCDLL int_f nh5pset_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue);
-H5_FCDLL int_f nh5pset_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
+H5_FCDLL int_f h5pset_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
 H5_FCDLL int_f nh5pset_fill_value_integer_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
 H5_FCDLL int_f nh5pset_fill_value_real_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
 H5_FCDLL int_f nh5pset_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f nh5pget_file_image_c (hid_t_f *fapl_id, void **buf_ptr, size_t_f *buf_len);
+H5_FCDLL int_f h5pget_file_image_c (hid_t_f *fapl_id, void **buf_ptr, size_t_f *buf_len);
 H5_FCDLL int_f nh5pget_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue);
-H5_FCDLL int_f nh5pget_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
+H5_FCDLL int_f h5pget_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
 H5_FCDLL int_f nh5pget_fill_value_integer_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
 H5_FCDLL int_f nh5pget_fill_value_real_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
 H5_FCDLL int_f nh5pget_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
@@ -1092,26 +1071,27 @@ H5_FCDLL int_f nh5pset_small_data_block_size_c(hid_t_f *plist, hsize_t_f *size);
 H5_FCDLL int_f nh5pget_small_data_block_size_c(hid_t_f *plist, hsize_t_f *size);
 H5_FCDLL int_f nh5pset_hyper_vector_size_c(hid_t_f *plist, size_t_f *size);
 H5_FCDLL int_f nh5pget_hyper_vector_size_c(hid_t_f *plist, size_t_f *size);
-H5_FCDLL int_f nh5pcreate_class_c(hid_t_f *parent, _fcd name, int_f *name_len, hid_t_f *cls,
+H5_FCDLL int_f h5pcreate_class_c(hid_t_f *parent, _fcd name, int_f *name_len, hid_t_f *cls,
 				  H5P_cls_create_func_t create, void *create_data,
 				  H5P_cls_copy_func_t copy, void *copy_data,
 				  H5P_cls_close_func_t close, void *close_data);
-H5_FCDLL int_f nh5pregister_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, void *value);
+H5_FCDLL int_f nh5pcreate_class_f90_c(hid_t_f *parent, _fcd name, int_f *name_len, hid_t_f *cls);
+H5_FCDLL int_f h5pregister_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, void *value);
 H5_FCDLL int_f nh5pregister_integer_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, void *value);
 H5_FCDLL int_f nh5pregister_real_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, void *value);
 H5_FCDLL int_f nh5pregister_double_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, void *value);
 H5_FCDLL int_f nh5pregisterc_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, _fcd value, int_f *value_len);
-H5_FCDLL int_f nh5pinsert_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, void *value);
+H5_FCDLL int_f h5pinsert_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, void *value);
 H5_FCDLL int_f nh5pinsert_integer_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, void *value);
 H5_FCDLL int_f nh5pinsert_real_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, void *value);
 H5_FCDLL int_f nh5pinsert_double_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, void *value);
 H5_FCDLL int_f nh5pinsertc_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, _fcd value, int_f *value_len);
-H5_FCDLL int_f nh5pset_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
+H5_FCDLL int_f h5pset_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
 H5_FCDLL int_f nh5pset_integer_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
 H5_FCDLL int_f nh5pset_real_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
 H5_FCDLL int_f nh5pset_double_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
 H5_FCDLL int_f nh5psetc_c(hid_t_f *prp_id, _fcd name, int_f *name_len, _fcd value, int_f *value_len);
-H5_FCDLL int_f nh5pget_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
+H5_FCDLL int_f h5pget_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
 H5_FCDLL int_f nh5pget_double_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
 H5_FCDLL int_f nh5pget_integer_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
 H5_FCDLL int_f nh5pget_real_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
@@ -1176,32 +1156,27 @@ H5_FCDLL int_f nh5pget_mpio_actual_io_mode_c(hid_t_f *dxpl_id, int_f *actual_io_
  */
 #define nh5rcreate_object_c     H5_FC_FUNC_(h5rcreate_object_c, H5RCREATE_OBJECT_C)
 #define nh5rcreate_region_c     H5_FC_FUNC_(h5rcreate_region_c, H5RCREATE_REGION_C)
-#define nh5rcreate_ptr_c     H5_FC_FUNC_(h5rcreate_ptr_c, H5RCREATE_PTR_C)
 #define nh5rdereference_region_c H5_FC_FUNC_(h5rdereference_region_c, H5RDEREFERENCE_REGION_C)
 #define nh5rdereference_object_c H5_FC_FUNC_(h5rdereference_object_c, H5RDEREFERENCE_OBJECT_C)
-#define nh5rdereference_ptr_c H5_FC_FUNC_(h5rdereference_ptr_c, H5RDEREFERENCE_PTR_C)
 #define nh5rget_region_region_c H5_FC_FUNC_(h5rget_region_region_c, H5RGET_REGION_REGION_C)
-#define nh5rget_region_ptr_c H5_FC_FUNC_(h5rget_region_ptr_c, H5RGET_REGION_PTR_C)
 #define nh5rget_object_type_obj_c H5_FC_FUNC_(h5rget_object_type_obj_c, H5RGET_OBJECT_TYPE_OBJ_C)
 #define nh5rget_name_object_c H5_FC_FUNC_(h5rget_name_object_c, H5RGET_NAME_OBJECT_C)
 #define nh5rget_name_region_c H5_FC_FUNC_(h5rget_name_region_c, H5RGET_NAME_REGION_C)
-#define nh5rget_name_ptr_c H5_FC_FUNC_(h5rget_name_ptr_c, H5RGET_NAME_PTR_C)
-#define nh5rget_obj_type_c H5_FC_FUNC_(h5rget_obj_type_c, H5RGET_OBJ_TYPE_C)
 
 
 H5_FCDLL int_f nh5rcreate_object_c (haddr_t_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen);
 H5_FCDLL int_f nh5rcreate_region_c (int_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *space_id);
-H5_FCDLL int_f nh5rcreate_ptr_c (void *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *ref_type, hid_t_f *space_id);
+H5_FCDLL int_f h5rcreate_ptr_c (void *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *ref_type, hid_t_f *space_id);
 H5_FCDLL int_f nh5rdereference_region_c (hid_t_f *dset_id, int_f *ref, hid_t_f *obj_id);
 H5_FCDLL int_f nh5rdereference_object_c (hid_t_f *dset_id, haddr_t_f *ref, hid_t_f *obj_id);
-H5_FCDLL int_f nh5rdereference_ptr_c (hid_t_f *obj_id, int_f *ref_type, void *ref, hid_t_f *ref_obj_id);
+H5_FCDLL int_f h5rdereference_ptr_c (hid_t_f *obj_id, int_f *ref_type, void *ref, hid_t_f *ref_obj_id);
 H5_FCDLL int_f nh5rget_region_region_c (hid_t_f *dset_id, int_f *ref, hid_t_f *space_id);
-H5_FCDLL int_f nh5rget_region_ptr_c(hid_t_f *dset_id, void *ref, hid_t_f *space_id);
+H5_FCDLL int_f h5rget_region_ptr_c(hid_t_f *dset_id, void *ref, hid_t_f *space_id);
 H5_FCDLL int_f nh5rget_object_type_obj_c (hid_t_f *dset_id, haddr_t_f *ref, int_f *obj_type);
 H5_FCDLL int_f nh5rget_name_object_c (hid_t_f *loc_id, haddr_t_f *ref, _fcd name, size_t_f *name_len, size_t_f *size_default);
 H5_FCDLL int_f nh5rget_name_region_c (hid_t_f *loc_id, int_f *ref, _fcd name, size_t_f *name_len, size_t_f *size_default);
-H5_FCDLL int_f nh5rget_name_ptr_c (hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size_t_f *name_len, size_t_f *size_default);
-H5_FCDLL int_f nh5rget_obj_type_c (hid_t_f *loc_id, int_f *ref_type, void *ref, int_f *obj_type);
+H5_FCDLL int_f h5rget_name_ptr_c (hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size_t_f *name_len, size_t_f *size_default);
+H5_FCDLL int_f h5rget_obj_type_c (hid_t_f *loc_id, int_f *ref_type, void *ref, int_f *obj_type);
 /*
  * Functions from H5If.c
  */
@@ -1230,7 +1205,6 @@ H5_FCDLL int_f nh5iis_valid_c(hid_t_f *obj_id, int_f *c_valid);
 #define nh5eget_major_c H5_FC_FUNC_(h5eget_major_c, H5EGET_MAJOR_C)
 #define nh5eget_minor_c H5_FC_FUNC_(h5eget_minor_c, H5EGET_MINOR_C)
 #define nh5eset_auto_c  H5_FC_FUNC_(h5eset_auto_c, H5ESET_AUTO_C)
-#define nh5eset_auto2_c  H5_FC_FUNC_(h5eset_auto2_c, H5ESET_AUTO2_C)
 #define nprocess_buffer  H5_FC_FUNC_(process_buffer, PROCESS_BUFFER)
 
 
@@ -1240,7 +1214,7 @@ H5_FCDLL int_f nh5eprint_c2(void);
 H5_FCDLL int_f nh5eget_major_c(int_f* error_no, _fcd name, size_t_f* namelen);
 H5_FCDLL int_f nh5eget_minor_c(int_f* error_no, _fcd name, size_t_f* namelen);
 H5_FCDLL int_f nh5eset_auto_c(int_f* printflag);
-H5_FCDLL int_f nh5eset_auto2_c(int_f* printflag, hid_t_f *estack_id, H5E_auto2_t func, void *client_data);
+H5_FCDLL int_f h5eset_auto2_c(int_f* printflag, hid_t_f *estack_id, H5E_auto2_t func, void *client_data);
 H5_FCDLL int_f nprocess_buffer(hid_t_f *estack_id,void **buffer);
 
 /*
@@ -1301,9 +1275,7 @@ H5_FCDLL int_f nh5zget_filter_info_c (int_f *filter, int_f *flag);
 #define nh5lis_registered_c H5_FC_FUNC_(h5lis_registered_c, H5LIS_REGISTERED_C)
 #define nh5lmove_c H5_FC_FUNC_(h5lmove_c, H5LMOVE_C)
 #define nh5lget_name_by_idx_c H5_FC_FUNC_(h5lget_name_by_idx_c, H5LGET_NAME_BY_IDX_C)
-#define nh5lget_val_c H5_FC_FUNC_(h5lget_val_c, H5LGET_VAL_C) 
-#define nh5literate_c H5_FC_FUNC_(h5literate_c, H5LITERATE_C) 
-#define nh5literate_by_name_c H5_FC_FUNC_(h5literate_by_name_c, H5LITERATE_BY_NAME_C)
+#define nh5lget_val_c H5_FC_FUNC_(h5lget_val_c, H5LGET_VAL_C)
 
 H5_FCDLL int_f nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
 			  _fcd dest_name, size_t_f *dest_namelen,
@@ -1339,8 +1311,8 @@ H5_FCDLL int_f nh5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f
 H5_FCDLL int_f nh5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size,
 			     void *linkval_buff, hid_t_f *lapl_id) ;
 
-H5_FCDLL int_f nh5literate_c(hid_t_f *group_id, int_f *index_type, int_f *order, hsize_t_f *idx, H5L_iterate_t op, void *op_data );
-H5_FCDLL int_f nh5literate_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, int_f *index_type, int_f *order, hsize_t_f *idx, H5L_iterate_t op, void *op_data, hid_t_f *lapl_id);
+H5_FCDLL int_f h5literate_c(hid_t_f *group_id, int_f *index_type, int_f *order, hsize_t_f *idx, H5L_iterate_t op, void *op_data );
+H5_FCDLL int_f h5literate_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, int_f *index_type, int_f *order, hsize_t_f *idx, H5L_iterate_t op, void *op_data, hid_t_f *lapl_id);
 
 
 #endif /* _H5f90proto_H */
diff --git a/fortran/test/tH5P.f90 b/fortran/test/tH5P.f90
index c94d564..8b48be6 100644
--- a/fortran/test/tH5P.f90
+++ b/fortran/test/tH5P.f90
@@ -306,7 +306,7 @@ SUBROUTINE multi_file_test(cleanup, total_error)
   !
   CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
   CALL check("h5pcreate_f", error, total_error)
-  CALL h5pset_fapl_multi_f(fapl, relax, error)
+  CALL h5pset_fapl_multi_f(fapl, memb_map, memb_fapl, memb_name, memb_addr, relax, error)
   CALL check("h5pset_fapl_multi_f", error, total_error)
   CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error, access_prp = fapl)
   CALL check("h5fopen_f", error, total_error)