changed to referencing C APIs by empty brackets (Fortran) (#2167)

18 files changed, 463 insertions, 463 deletions

diff --git a/fortran/src/H5Aff.F90 b/fortran/src/H5Aff.F90
index c17ee9c..0009c31 100644
--- a/fortran/src/H5Aff.F90
+++ b/fortran/src/H5Aff.F90
@@ -136,7 +136,7 @@ CONTAINS
 !! \param acpl_id  Attribute creation property list identifier
 !! \param aapl_id  Attribute access property list identifier
 !!
-!! See C API: @ref hid_t H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id);
+!! See C API: @ref H5Acreate2()
 !!
   SUBROUTINE h5acreate_f(loc_id, name, type_id, space_id, attr_id, &
        hdferr, acpl_id, aapl_id )
@@ -193,7 +193,7 @@ CONTAINS
 !! \param attr_id Attribute identifier
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref hid_t H5Aopen_name(hid_t loc_id, const char *name);
+!! See C API: @ref H5Aopen_name()
 !!
   SUBROUTINE H5Aopen_name_f(obj_id, name, attr_id, hdferr)
     IMPLICIT NONE
@@ -232,7 +232,7 @@ CONTAINS
 !! \param attr_id Attribute identifier
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref hid_t H5Aopen_idx(hid_t loc_id, unsigned idx);
+!! See C API: @ref H5Aopen_idx()
 !!
   SUBROUTINE H5Aopen_idx_f(obj_id, index, attr_id, hdferr)
     IMPLICIT NONE
@@ -264,7 +264,7 @@ CONTAINS
 !! \param space_id Attribite dataspace identifier
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref hid_t H5Aget_space(hid_t attr_id);
+!! See C API: @ref H5Aget_space()
 !!
   SUBROUTINE H5Aget_space_f(attr_id, space_id, hdferr)
     IMPLICIT NONE
@@ -294,7 +294,7 @@ CONTAINS
 !! \param type_id Attribute datatype identifier
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref hid_t H5Aget_type(hid_t attr_id);
+!! See C API: @ref H5Aget_type()
 !!
   SUBROUTINE H5Aget_type_f(attr_id, type_id, hdferr)
     IMPLICIT NONE
@@ -325,7 +325,7 @@ CONTAINS
 !! \param buf     Buffer to read name in
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref ssize_t H5Aget_name(hid_t attr_id, size_t buf_size, char *buf);
+!! See C API: @ref H5Aget_name()
 !!
   SUBROUTINE h5aget_name_f(attr_id, size, buf, hdferr)
     IMPLICIT NONE
@@ -372,7 +372,7 @@ CONTAINS
 !! \param size     Size, in bytes, of attribute name
 !! \param lapl_id  Link access property list
 !!
-!! See C API: @ref ssize_t H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, char *name, size_t size, hid_t lapl_id);
+!! See C API: @ref H5Aget_name_by_idx()
 !!
   SUBROUTINE h5aget_name_by_idx_f(loc_id, obj_name, idx_type, order, &
        n, name, hdferr, size, lapl_id)
@@ -434,7 +434,7 @@ CONTAINS
 !! \param attr_num Number of attributes attached to the object
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref int H5Aget_num_attrs(hid_t loc_id);
+!! See C API: @ref H5Aget_num_attrs()
 !!
   SUBROUTINE h5aget_num_attrs_f(obj_id, attr_num, hdferr)
     IMPLICIT NONE
@@ -463,7 +463,7 @@ CONTAINS
 !!
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Adelete(hid_t loc_id, const char *attr_name);
+!! See C API: @ref H5Adelete()
 !!
   SUBROUTINE H5Adelete_f(obj_id, name, hdferr)
     IMPLICIT NONE
@@ -494,7 +494,7 @@ CONTAINS
 !! \param attr_id Attribute identifier
 !! \param  hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Aclose(hid_t attr_id);
+!! See C API: @ref H5Aclose()
 !!
   SUBROUTINE H5Aclose_f(attr_id, hdferr)
     IMPLICIT NONE
@@ -520,7 +520,7 @@ CONTAINS
 !! \param size    Attribute storage size
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref hsize_t H5Aget_storage_size(hid_t attr_id);
+!! See C API: @ref H5Aget_storage_size()
 !!
   SUBROUTINE H5Aget_storage_size_f(attr_id, size, hdferr)
     IMPLICIT NONE
@@ -551,7 +551,7 @@ CONTAINS
 !! \param creation_prop_id Identifier for the attribute’s creation property
 !! \param hdferr           \fortran_error
 !!
-!! See C API: @ref hid_t H5Aget_create_plist(hid_t attr_id);
+!! See C API: @ref H5Aget_create_plist()
 !!
   SUBROUTINE H5Aget_create_plist_f(attr_id, creation_prop_id, hdferr)
     IMPLICIT NONE
@@ -584,7 +584,7 @@ CONTAINS
 !! \param lapl_id       Link access property list identifier
 !! \param hdferr        \fortran_error
 !!
-!! See C API: @ref herr_t H5Arename_by_name_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, const char *obj_name, const char *old_attr_name, const char *new_attr_name, hid_t lapl_id, hid_t es_id);
+!! See C API: @ref H5Arename_by_name()
 !!
   SUBROUTINE H5Arename_by_name_f(loc_id, obj_name, old_attr_name, new_attr_name, &
         hdferr, lapl_id)
@@ -645,7 +645,7 @@ CONTAINS
 !! \param hdferr    \fortran_error
 !! \param aapl_id   Attribute access property list
 !!
-!! See C API: @ref hid_t H5Aopen(hid_t obj_id, const char *attr_name, hid_t aapl_id);
+!! See C API: @ref H5Aopen()
 !!
   SUBROUTINE H5Aopen_f(obj_id, attr_name, attr_id, hdferr, aapl_id)
     IMPLICIT NONE
@@ -704,7 +704,7 @@ CONTAINS
 !! \param hdferr   \fortran_error
 !! \param lapl_id  Link access property list
 !!
-!! See C API: @ref herr_t H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id);
+!! See C API: @ref H5Adelete_by_idx()
 !!
   SUBROUTINE H5Adelete_by_idx_f(loc_id, obj_name, idx_type, order, n, hdferr, lapl_id)
     IMPLICIT NONE
@@ -753,7 +753,7 @@ CONTAINS
 !! \param lapl_id   Link access property list
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t lapl_id);
+!! See C API: @ref H5Adelete_by_name()
 !!
   SUBROUTINE H5Adelete_by_name_f(loc_id, obj_name, attr_name, hdferr, lapl_id)
     IMPLICIT NONE
@@ -816,7 +816,7 @@ CONTAINS
 !! \param aapl_id  Attribute access property list.
 !! \param lapl_id  Link access property list.
 !!
-!! See C API: @ref hid_t H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t aapl_id, hid_t lapl_id);
+!! See C API: @ref H5Aopen_by_idx()
 !!
   SUBROUTINE H5Aopen_by_idx_f(loc_id, obj_name, idx_type, order, n, attr_id, hdferr, aapl_id, lapl_id)
     IMPLICIT NONE
@@ -877,7 +877,7 @@ CONTAINS
 !! \param data_size      Indicates the size, in the number of characters, of the attribute.
 !! \param hdferr         \fortran_error
 !!
-!! See C API: @ref herr_t H5Aget_info(hid_t attr_id, H5A_info_t *ainfo );
+!! See C API: @ref H5Aget_info()
 !!
   SUBROUTINE H5Aget_info_f(attr_id, f_corder_valid, corder, cset, data_size, hdferr)
     IMPLICIT NONE
@@ -927,7 +927,7 @@ CONTAINS
 !! \param hdferr         \fortran_error
 !! \param lapl_id        Link access property list
 !!
-!! See C API: @ref herr_t H5Aget_info_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5A_info_t *ainfo, hid_t lapl_id);
+!! See C API: @ref H5Aget_info_by_idx()
 !!
   SUBROUTINE H5Aget_info_by_idx_f(loc_id, obj_name, idx_type, order, n, &
        f_corder_valid, corder, cset, data_size, hdferr, lapl_id)
@@ -1000,7 +1000,7 @@ CONTAINS
 !! \param hdferr         \fortran_error
 !! \param lapl_id        Link access property list
 !!
-!! See C API: @ref herr_t H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, H5A_info_t *ainfo, hid_t lapl_id);
+!! See C API: @ref H5Aget_info_by_name()
 !!
   SUBROUTINE H5Aget_info_by_name_f(loc_id, obj_name, attr_name, &
        f_corder_valid, corder, cset, data_size, hdferr, lapl_id)
@@ -1071,7 +1071,7 @@ CONTAINS
 !! \param aapl_id   Attribute access property list identifier (Currently not used.)
 !! \param lapl_id   Link access property list
 !!
-!! See C API: @ref hid_t H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id);
+!! See C API: @ref H5Acreate_by_name()
 !!
   SUBROUTINE H5Acreate_by_name_f(loc_id, obj_name, attr_name, type_id, space_id, attr, hdferr, &
        acpl_id, aapl_id, lapl_id)
@@ -1141,7 +1141,7 @@ CONTAINS
 !! \param attr_exists Attribute exists status
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref htri_t H5Aexists(hid_t obj_id, const char *attr_name);
+!! See C API: @ref H5Aexists()
 !!
   SUBROUTINE H5Aexists_f(obj_id, attr_name, attr_exists, hdferr)
     IMPLICIT NONE
@@ -1185,7 +1185,7 @@ CONTAINS
 !! \param hdferr      \fortran_error
 !! \param lapl_id     Link access property list identifier
 !!
-!! See C API: @ref htri_t H5Aexists_by_name(hid_t obj_id, const char *obj_name, const char *attr_name, hid_t lapl_id);
+!! See C API: @ref H5Aexists_by_name()
 !!
   SUBROUTINE H5Aexists_by_name_f(loc_id, obj_name, attr_name, attr_exists, hdferr, lapl_id)
     IMPLICIT NONE
@@ -1242,7 +1242,7 @@ CONTAINS
 !! \param aapl_id   Attribute access property list (Currently unused; should be passed in as H5P_DEFAULT.)
 !! \param lapl_id   Link access property list identifier
 !!
-!! See C API: @ref hid_t H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, hid_t lapl_id);
+!! See C API: @ref H5Aopen_by_name()
 !!
   SUBROUTINE H5Aopen_by_name_f(loc_id, obj_name, attr_name, attr_id, hdferr, aapl_id, lapl_id)
     IMPLICIT NONE
@@ -1299,7 +1299,7 @@ CONTAINS
 !! \param new_attr_name New attribute name
 !! \param hdferr        \fortran_error
 !!
-!! See C API: @ref herr_t H5Arename(hid_t loc_id, const char *old_name, const char *new_name);
+!! See C API: @ref H5Arename()
 !!
   SUBROUTINE H5Arename_f(loc_id, old_attr_name, new_attr_name, hdferr)
     IMPLICIT NONE
@@ -1347,7 +1347,7 @@ CONTAINS
 !! \param buf	      Data to be written.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Awrite(hid_t attr_id, hid_t type_id, const void *buf);
+!! See C API: @ref H5Awrite()
 !!
   SUBROUTINE h5awrite_f(attr_id, memtype_id, buf, hdferr)
     INTEGER(HID_T)  , INTENT(IN)  :: attr_id
@@ -1370,7 +1370,7 @@ CONTAINS
 !!                    dim(k) has value of the k-th dimension of buffer buf; values are ignored if buf is a scalar.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Awrite(hid_t attr_id, hid_t type_id, const void *buf);
+!! See C API: @ref H5Awrite()
 !!
   SUBROUTINE h5awrite_f(attr_id, memtype_id, buf, dims, hdferr)
     INTEGER(HID_T)  , INTENT(IN)               :: attr_id
@@ -1391,7 +1391,7 @@ CONTAINS
 !! \param buf	      Buffer for data to be read.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Aread(hid_t attr_id, hid_t type_id, void *buf);
+!! See C API: @ref H5Aread()
 !!
   SUBROUTINE h5aread_f(attr_id, memtype_id, buf, hdferr)
     INTEGER(HID_T), INTENT(IN)    :: attr_id
@@ -1414,7 +1414,7 @@ CONTAINS
 !!                    dim(k) has value of the k-th dimension of buffer buf; values are ignored if buf is a scalar.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Aread(hid_t attr_id, hid_t type_id, void *buf);
+!! See C API: @ref H5Aread()
 !!
   SUBROUTINE h5aread_f(attr_id, memtype_id, buf, dims, hdferr)
     INTEGER(HID_T)  , INTENT(IN)               :: attr_id
diff --git a/fortran/src/H5Dff.F90 b/fortran/src/H5Dff.F90
index 07d2508..d15e59e 100644
--- a/fortran/src/H5Dff.F90
+++ b/fortran/src/H5Dff.F90
@@ -222,7 +222,7 @@ CONTAINS
 !! \param lcpl_id  Link creation property list
 !! \param dapl_id  Dataset access property list
 !!
-!! See C API: @ref hid_t H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id);
+!! See C API: @ref H5Dcreate2()
 !!
   SUBROUTINE h5dcreate_f(loc_id, name, type_id, space_id, dset_id, &
        hdferr, dcpl_id, lcpl_id, dapl_id)
@@ -289,7 +289,7 @@ CONTAINS
 !! \param hdferr  \fortran_error
 !! \param dapl_id Dataset access property list
 !!
-!! See C API: @ref hid_t H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id);
+!! See C API: @ref H5Dopen2()
 !!
   SUBROUTINE h5dopen_f(loc_id, name, dset_id, hdferr, dapl_id)
     IMPLICIT NONE
@@ -332,7 +332,7 @@ CONTAINS
 !! \param dset_id Dataset identifier
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Dclose(hid_t dset_id);
+!! See C API: @ref H5Dclose()
 !!
   SUBROUTINE h5dclose_f(dset_id, hdferr)
     IMPLICIT NONE
@@ -361,7 +361,7 @@ CONTAINS
 !! \param datatype_id Dataspace identifier
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref hid_t H5Dget_type(hid_t dset_id);
+!! See C API: @ref H5Dget_type()
 !!
   SUBROUTINE h5dget_type_f(dataset_id, datatype_id, hdferr)
     IMPLICIT NONE
@@ -390,7 +390,7 @@ CONTAINS
 !! \param size       Array containing the new magnitude of each dimension
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref herr_t H5Dset_extent(hid_t dset_id, const hsize_t size[]);
+!! See C API: @ref H5Dset_extent()
 !!
   SUBROUTINE h5dset_extent_f(dataset_id, size, hdferr)
     IMPLICIT NONE
@@ -419,7 +419,7 @@ CONTAINS
 !! \param plist_id   Creation property list identifier
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref hid_t H5Dget_create_plist(hid_t dset_id);
+!! See C API: @ref H5Dget_create_plist()
 !!
   SUBROUTINE h5dget_create_plist_f(dataset_id, plist_id, hdferr)
     IMPLICIT NONE
@@ -447,7 +447,7 @@ CONTAINS
 !! \param size       Datastorage size
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref hsize_t H5Dget_storage_size(hid_t dset_id);
+!! See C API: @ref H5Dget_storage_size()
 !!
   SUBROUTINE h5dget_storage_size_f(dataset_id, size, hdferr)
     IMPLICIT NONE
@@ -511,7 +511,7 @@ CONTAINS
 !!                \li H5D_SPACE_STS_ALLOCATED_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation);
+!! See C API: @ref H5Dget_space_status()
 !!
   SUBROUTINE h5dget_space_status_f(dset_id, flag, hdferr)
     IMPLICIT NONE
@@ -543,7 +543,7 @@ CONTAINS
 !! \param dcpl_id  Dataset creation property list identifier.
 !! \param dapl_id  Dataset access property list identifier.
 !!
-!! See C API: @ref hid_t H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t dapl_id);
+!! See C API: @ref H5Dcreate_anon()
 !!
   SUBROUTINE h5dcreate_anon_f(loc_id, type_id, space_id, dset_id, hdferr, dcpl_id, dapl_id)
     IMPLICIT NONE
@@ -978,7 +978,7 @@ CONTAINS
 !! \param offset  The offset in bytes.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref haddr_t H5Dget_offset(hid_t dset_id);
+!! See C API: @ref H5Dget_offset()
 !!
   SUBROUTINE h5dget_offset_f(dset_id, offset, hdferr)
     IMPLICIT NONE
@@ -1009,7 +1009,7 @@ CONTAINS
 !! \param dataspace_id Dataspace identifier.
 !! \param hdferr       \fortran_error
 !!
-!! See C API: @ref hid_t H5Dget_space(hid_t dset_id);
+!! See C API: @ref H5Dget_space()
 !!
   SUBROUTINE h5dget_space_f(dataset_id, dataspace_id, hdferr)
     IMPLICIT NONE
@@ -1037,7 +1037,7 @@ CONTAINS
 !! \param plist_id Dataset access property list identifier.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref hid_t H5Dget_access_plist(hid_t dset_id);
+!! See C API: @ref H5Dget_access_plist()
 !!
   SUBROUTINE h5dget_access_plist_f(dset_id, plist_id, hdferr)
     IMPLICIT NONE
@@ -1068,7 +1068,7 @@ CONTAINS
 !! \param buf      Pointer to the buffer to be reclaimed.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t dxpl_id, void *buf);
+!! See C API: @ref H5Dvlen_reclaim()
 !!
   SUBROUTINE h5dvlen_reclaim_f(type_id, space_id, plist_id, buf, hdferr)
     IMPLICIT NONE
@@ -1110,7 +1110,7 @@ CONTAINS
 !! \param file_space_id Identifier of the dataset's dataspace in the file.
 !! \param xfer_prp      Identifier of a transfer property list for this I/O operation.
 !!
-!! See C API: @ref herr_t H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, const void *buf);
+!! See C API: @ref H5Dwrite()
 !!
   SUBROUTINE h5dwrite_f(dset_id, mem_type_id, buf, hdferr, mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
@@ -1138,7 +1138,7 @@ CONTAINS
 !! \param file_space_id Identifier of dataset's dataspace in the file. (Default: H5S_ALL_F)
 !! \param xfer_prp      Identifier of a transfer property list for this I/O operation.
 !!
-!! See C API: @ref herr_t H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, void *buf);
+!! See C API: @ref H5Dread()
 !!
  SUBROUTINE h5dread_f(dset_id, mem_type_id, buf, hdferr, mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
@@ -1229,7 +1229,7 @@ CONTAINS
 !! \param buf        Buffer to receive data read from file.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref herr_t H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t buf_type_id, hid_t space_id);
+!! See C API: @ref H5Dfill()
 !!
   SUBROUTINE h5dfill_f(fill_value, space_id, buf,  hdferr)
     TYPE(TYPE), INTENT(IN) :: fill_value
@@ -1251,7 +1251,7 @@ CONTAINS
 !! \param space_id     Dataspace identifier.
 !! \param hdferr       \fortran_error
 !!
-!! See C API: @ref herr_t H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t buf_type_id, hid_t space_id);
+!! See C API: @ref H5Dfill()
 !!
   SUBROUTINE h5dfill_f(fill_value, fill_type_id, buf, buf_type_id, space_id, hdferr)
     USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
diff --git a/fortran/src/H5Eff.F90 b/fortran/src/H5Eff.F90
index d6cf664..febca2b 100644
--- a/fortran/src/H5Eff.F90
+++ b/fortran/src/H5Eff.F90
@@ -54,7 +54,7 @@ CONTAINS
 !! \param hdferr    \fortran_error
 !! \param estack_id Error Stack id
 !!
-!! See C API: @ref herr_t H5Eclear2(hid_t err_stack);
+!! See C API: @ref H5Eclear2()
 !!
   SUBROUTINE h5eclear_f(hdferr, estack_id)
     IMPLICIT NONE
@@ -84,7 +84,7 @@ CONTAINS
 !! \param hdferr \fortran_error
 !! \param name   Name of the file that contains print output
 !!
-!! See C API: @ref herr_t H5Eprint2(hid_t err_stack, FILE *stream);
+!! See C API: @ref H5Eprint2()
 !!
   SUBROUTINE h5eprint_f(hdferr, name)
     CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: name
@@ -122,7 +122,7 @@ CONTAINS
 !! \param namelen  Number of characters in the name buffer.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref char* H5Eget_major(H5E_major_t maj);
+!! See C API: @ref H5Eget_major()
 !!
   SUBROUTINE h5eget_major_f(error_no, name, namelen, hdferr)
     INTEGER, INTENT(IN) :: error_no
@@ -151,7 +151,7 @@ CONTAINS
 !! \param name     Character string describing the error.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref char* H5Eget_minor(H5E_minor_t min);
+!! See C API: @ref H5Eget_minor()
 !!
   SUBROUTINE h5eget_minor_f(error_no, name, hdferr)
     INTEGER, INTENT(IN) :: error_no
@@ -181,7 +181,7 @@ CONTAINS
 !! \param client_data Data passed to the error function.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Eset_auto2(hid_t estack_id, H5E_auto2_t func, void *client_data);
+!! See C API: @ref H5Eset_auto2()
 !!
   SUBROUTINE h5eset_auto_f(printflag, hdferr, estack_id, func, client_data)
     USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_FUNPTR
diff --git a/fortran/src/H5Fff.F90 b/fortran/src/H5Fff.F90
index 713b9cf..5d8d687 100644
--- a/fortran/src/H5Fff.F90
+++ b/fortran/src/H5Fff.F90
@@ -73,7 +73,7 @@ CONTAINS
 !! \param creation_prp File creation property list identifier.
 !! \param access_prp   File access property list identifier.
 !!
-!! See C API: @ref hid_t H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id);
+!! See C API: @ref H5Fcreate()
 !!
   SUBROUTINE h5fcreate_f(name, access_flags, file_id, hdferr, &
        creation_prp, access_prp)
@@ -123,7 +123,7 @@ CONTAINS
 !!                     \li H5F_SCOPE_LOCAL_F
 !! \param hdferr       \fortran_error
 !!
-!! See C API: @ref herr_t H5Fflush(hid_t object_id, H5F_scope_t scope);
+!! See C API: @ref H5Fflush()
 !!
   SUBROUTINE h5fflush_f(object_id, scope, hdferr)
     IMPLICIT NONE
@@ -154,7 +154,7 @@ CONTAINS
 !! \param hdferr     \fortran_error
 !! \param access_prp The identifier of the property list to be used.
 !!
-!! See C API: @ref herr_t H5Fmount(hid_t loc, const char *name, hid_t child, hid_t plist);
+!! See C API: @ref H5Fmount()
 !!
   SUBROUTINE h5fmount_f(loc_id, name, child_id, hdferr, access_prp)
     IMPLICIT NONE
@@ -196,7 +196,7 @@ CONTAINS
 !! \param name   The name of the mount point.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Funmount(hid_t loc, const char *name);
+!! See C API: @ref H5Funmount()
 !!
   SUBROUTINE h5funmount_f(loc_id, name, hdferr)
     IMPLICIT NONE
@@ -233,7 +233,7 @@ CONTAINS
 !! \param hdferr       \fortran_error
 !! \param access_prp   File access property list identifier.
 !!
-!! See C API: @ref hid_t H5Fopen(const char *filename, unsigned flags, hid_t fapl_id);
+!! See C API: @ref H5Fopen()
 !!
   SUBROUTINE h5fopen_f(name, access_flags, file_id, hdferr, access_prp)
     IMPLICIT NONE
@@ -274,7 +274,7 @@ CONTAINS
 !! \param ret_file_id New file identifier.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref hid_t H5Freopen(hid_t file_id);
+!! See C API: @ref H5Freopen()
 !!
   SUBROUTINE h5freopen_f(file_id, ret_file_id, hdferr)
     IMPLICIT NONE
@@ -302,7 +302,7 @@ CONTAINS
 !! \param prop_id Creation property list identifier.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref hid_t H5Fget_create_plist(hid_t file_id);
+!! See C API: @ref H5Fget_create_plist()
 !!
   SUBROUTINE h5fget_create_plist_f(file_id, prop_id, hdferr)
     IMPLICIT NONE
@@ -330,7 +330,7 @@ CONTAINS
 !! \param access_id Access property list identifier.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref hid_t H5Fget_access_plist(hid_t file_id);
+!! See C API: @ref H5Fget_access_plist()
 !!
   SUBROUTINE h5fget_access_plist_f(file_id, access_id, hdferr)
     IMPLICIT NONE
@@ -360,7 +360,7 @@ CONTAINS
 !! \param hdferr     \fortran_error
 !! \param access_prp File access property list identifier.
 !!
-!! See C API: @ref htri_t H5Fis_accessible(const char *container_name, hid_t fapl_id);
+!! See C API: @ref H5Fis_accessible()
 !!
   SUBROUTINE h5fis_accessible_f(name, status, hdferr, access_prp)
     IMPLICIT NONE
@@ -400,7 +400,7 @@ CONTAINS
 !! \param status Indicates if file is and HDF5 file.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref htri_t H5Fis_hdf5(const char *file_name);
+!! See C API: @ref H5Fis_hdf5()
 !!
   SUBROUTINE h5fis_hdf5_f(name, status, hdferr)
     IMPLICIT NONE
@@ -431,7 +431,7 @@ CONTAINS
 !! \param file_id File identifier.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Fclose(hid_t file_id);
+!! See C API: @ref H5Fclose()
 !!
   SUBROUTINE h5fclose_f(file_id, hdferr)
     IMPLICIT NONE
@@ -464,7 +464,7 @@ CONTAINS
 !! \param obj_count Number of open objects.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref ssize_t H5Fget_obj_count(hid_t file_id, unsigned types);
+!! See C API: @ref H5Fget_obj_count()
 !!
   SUBROUTINE h5fget_obj_count_f(file_id, obj_type, obj_count, hdferr)
     IMPLICIT NONE
@@ -508,7 +508,7 @@ CONTAINS
 !! \param hdferr   \fortran_error
 !! \param num_objs Number of open objects.
 !!
-!! See C API: @ref ssize_t H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, hid_t *obj_id_list);
+!! See C API: @ref H5Fget_obj_ids()
 !!
   SUBROUTINE h5fget_obj_ids_f(file_id, obj_type, max_objs, obj_ids, hdferr, num_objs)
     IMPLICIT NONE
@@ -547,7 +547,7 @@ CONTAINS
 !! \param free_space Amount of free space in file.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref hssize_t H5Fget_freespace(hid_t file_id);
+!! See C API: @ref H5Fget_freespace()
 !!
   SUBROUTINE h5fget_freespace_f(file_id, free_space, hdferr)
     IMPLICIT NONE
@@ -577,7 +577,7 @@ CONTAINS
 !! \param size   Actual size of the name.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref ssize_t H5Fget_name(hid_t obj_id, char *name, size_t size);
+!! See C API: @ref H5Fget_name()
 !!
   SUBROUTINE h5fget_name_f(obj_id, buf, size, hdferr)
     IMPLICIT NONE
@@ -611,7 +611,7 @@ CONTAINS
 !! \param size    File size.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Fget_filesize(hid_t file_id, hsize_t *size);
+!! See C API: @ref H5Fget_filesize()
 !!
   SUBROUTINE h5fget_filesize_f(file_id, size, hdferr)
     IMPLICIT NONE
@@ -639,7 +639,7 @@ CONTAINS
 !! \param fileno  File number.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Fget_fileno(hid_t file_id, unsigned long *fileno);
+!! See C API: @ref H5Fget_fileno()
 !!
   SUBROUTINE h5fget_fileno_f(file_id, fileno, hdferr)
     IMPLICIT NONE
@@ -669,7 +669,7 @@ CONTAINS
 !! \param hdferr   \fortran_error
 !! \param buf_size Returns the size in bytes of the buffer required to store the file image, no data will be copied.
 !!
-!! See C API: @ref ssize_t H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len);
+!! See C API: @ref H5Fget_file_image()
 !!
   SUBROUTINE h5fget_file_image_f(file_id, buf_ptr, buf_len, hdferr, buf_size)
     IMPLICIT NONE
@@ -715,7 +715,7 @@ CONTAINS
 !! \param minimize Value of the setting.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Fget_dset_no_attrs_hint(hid_t file_id, hbool_t *minimize);
+!! See C API: @ref H5Fget_dset_no_attrs_hint()
 !!
   SUBROUTINE h5fget_dset_no_attrs_hint_f(file_id, minimize, hdferr)
     IMPLICIT NONE
@@ -750,7 +750,7 @@ CONTAINS
 !! \param minimize Value of the setting.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Fset_dset_no_attrs_hint(hid_t file_id, hbool_t minimize);
+!! See C API: @ref H5Fset_dset_no_attrs_hint()
 !!
   SUBROUTINE h5fset_dset_no_attrs_hint_f(file_id, minimize, hdferr)
     IMPLICIT NONE
diff --git a/fortran/src/H5Gff.F90 b/fortran/src/H5Gff.F90
index 6e89ee6..f003e2d 100644
--- a/fortran/src/H5Gff.F90
+++ b/fortran/src/H5Gff.F90
@@ -58,7 +58,7 @@ CONTAINS
 !! \param gcpl_id   Property list for group creation.
 !! \param gapl_id   Property list for group access.
 !!
-!! See C API: @ref hid_t H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id);
+!! See C API: @ref H5Gcreate2()
 !!
   SUBROUTINE h5gcreate_f(loc_id, name, grp_id, hdferr, size_hint, lcpl_id, gcpl_id, gapl_id)
     IMPLICIT NONE
@@ -121,7 +121,7 @@ CONTAINS
 !! \param hdferr  \fortran_error
 !! \param gapl_id Group access property list identifier.
 !!
-!! See C API: @ref hid_t H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id);
+!! See C API: @ref H5Gopen2()
 !!
   SUBROUTINE h5gopen_f(loc_id, name, grp_id, hdferr, gapl_id)
     IMPLICIT NONE
@@ -161,7 +161,7 @@ CONTAINS
 !! \param grp_id Group identifier.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Gclose(hid_t group_id);
+!! See C API: @ref H5Gclose()
 !!
   SUBROUTINE h5gclose_f(grp_id, hdferr)
     IMPLICIT NONE
@@ -272,7 +272,7 @@ CONTAINS
 !! \param new_name     New name for the object.
 !! \param hdferr       \fortran_error
 !!
-!! See C API: @ref herr_t H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new_name);
+!! See C API: @ref H5Glink()
 !!
   SUBROUTINE h5glink_f(loc_id, link_type, current_name, &
        new_name, hdferr)
@@ -324,7 +324,7 @@ CONTAINS
 !! \param new_name   New name for the object.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref herr_t H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, hid_t new_loc_id, const char *new_name);
+!! See C API: @ref H5Glink2()
 !!
   SUBROUTINE h5glink2_f(cur_loc_id, cur_name, link_type, new_loc_id, &
        new_name, hdferr)
@@ -372,7 +372,7 @@ CONTAINS
 !! \param name   Name of the object to unlink.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Gunlink(hid_t loc_id, const char *name);
+!! See C API: @ref H5Gunlink()
 !!
   SUBROUTINE h5gunlink_f(loc_id, name, hdferr)
     IMPLICIT NONE
@@ -405,7 +405,7 @@ CONTAINS
 !! \param new_name Object's new name.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name);
+!! See C API: @ref H5Gmove()
 !!
   SUBROUTINE h5gmove_f(loc_id, name, new_name, hdferr)
     IMPLICIT NONE
@@ -443,7 +443,7 @@ CONTAINS
 !! \param dst_name   Object's new name.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref herr_t H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name);
+!! See C API: @ref H5Gmove2()
 !!
   SUBROUTINE h5gmove2_f(src_loc_id, src_name, dst_loc_id, dst_name, hdferr)
     IMPLICIT NONE
@@ -484,7 +484,7 @@ CONTAINS
 !! \param buffer A buffer to hold the name of the object being sought.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf );
+!! See C API: @ref H5Gget_linkval()
 !!
   SUBROUTINE h5gget_linkval_f(loc_id, name, size, buffer, hdferr)
     IMPLICIT NONE
@@ -521,7 +521,7 @@ CONTAINS
 !! \param comment Comment to set for the object.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Gset_comment(hid_t loc_id, const char *name, const char *comment);
+!! See C API: @ref H5Gset_comment()
 !!
   SUBROUTINE h5gset_comment_f(loc_id, name, comment, hdferr)
     IMPLICIT NONE
@@ -560,7 +560,7 @@ CONTAINS
 !! \param buffer Buffer to hold object's comment.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref int H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf);
+!! See C API: @ref H5Gget_comment()
 !!
   SUBROUTINE h5gget_comment_f(loc_id, name, size, buffer, hdferr)
     IMPLICIT NONE
@@ -598,7 +598,7 @@ CONTAINS
 !! \param gcpl_id Group creation property list identifier.
 !! \param gapl_id Group access property list identifier.
 !!
-!! See C API: @ref hid_t H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id);
+!! See C API: @ref H5Gcreate_anon()
 !!
   SUBROUTINE h5Gcreate_anon_f(loc_id, grp_id, hdferr, gcpl_id, gapl_id)
     IMPLICIT NONE
@@ -639,7 +639,7 @@ CONTAINS
 !! \param gcpl_id Group creation property list identifier.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref hid_t H5Gget_create_plist(hid_t group_id);
+!! See C API: @ref H5Gget_create_plist()
 !!
   SUBROUTINE h5gget_create_plist_f(grp_id, gcpl_id, hdferr)
     IMPLICIT NONE
@@ -673,7 +673,7 @@ CONTAINS
 !! \param hdferr       \fortran_error
 !! \param mounted      Whether group has a file mounted on it.
 !!
-!! See C API: @ref herr_t H5Gget_info(hid_t loc_id, H5G_info_t *ginfo);
+!! See C API: @ref H5Gget_info()
 !!
   SUBROUTINE h5gget_info_f(group_id, storage_type, nlinks, max_corder, hdferr, mounted)
     IMPLICIT NONE
@@ -729,7 +729,7 @@ CONTAINS
 !! \param lapl_id      Link access property list.
 !! \param mounted      Whether group has a file mounted on it.
 !!
-!! See C API: @ref herr_t H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5G_info_t *ginfo, hid_t lapl_id);
+!! See C API: @ref H5Gget_info_by_idx()
 !!
   SUBROUTINE h5gget_info_by_idx_f(loc_id, group_name, index_type, order, n, &
        storage_type, nlinks, max_corder, hdferr, lapl_id, mounted)
@@ -806,7 +806,7 @@ CONTAINS
 !! \param lapl_id      Link access property list.
 !! \param mounted      Whether group has a file mounted on it.
 !!
-!! See C API: @ref herr_t H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *ginfo, hid_t lapl_id);
+!! See C API: @ref H5Gget_info_by_name()
 !!
   SUBROUTINE h5gget_info_by_name_f(loc_id, group_name, &
        storage_type, nlinks, max_corder, hdferr, lapl_id, mounted)
diff --git a/fortran/src/H5Iff.F90 b/fortran/src/H5Iff.F90
index 06f7f11..51322c4 100644
--- a/fortran/src/H5Iff.F90
+++ b/fortran/src/H5Iff.F90
@@ -59,7 +59,7 @@ CONTAINS
 !!               \li H5I_BADID_F
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref H5I_type_t H5Iget_type(hid_t id);
+!! See C API: @ref H5Iget_type()
 !!
   SUBROUTINE h5iget_type_f(obj_id, TYPE, hdferr)
     IMPLICIT NONE
@@ -88,7 +88,7 @@ CONTAINS
 !! \param name_size Name size.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref ssize_t H5Iget_name(hid_t id, char *name , size_t size);
+!! See C API: @ref H5Iget_name()
 !!
   SUBROUTINE h5iget_name_f(obj_id, buf, buf_size, name_size, hdferr)
     IMPLICIT NONE
@@ -121,7 +121,7 @@ CONTAINS
 !! \param ref_count Current reference count of the ID.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref int H5Iinc_ref(hid_t id);
+!! See C API: @ref H5Iinc_ref()
 !!
   SUBROUTINE h5iinc_ref_f(obj_id, ref_count, hdferr)
     IMPLICIT NONE
@@ -148,7 +148,7 @@ CONTAINS
 !! \param ref_count Current reference count of the ID.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref int H5Idec_ref(hid_t id);
+!! See C API: @ref H5Idec_ref()
 !!
   SUBROUTINE h5idec_ref_f(obj_id, ref_count, hdferr)
     IMPLICIT NONE
@@ -175,7 +175,7 @@ CONTAINS
 !! \param ref_count Current reference count of the ID.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref int H5Iget_ref(hid_t id);
+!! See C API: @ref H5Iget_ref()
 !!
   SUBROUTINE h5iget_ref_f(obj_id, ref_count, hdferr)
     IMPLICIT NONE
@@ -201,7 +201,7 @@ CONTAINS
 !! \param file_id File identifier.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref hid_t H5Iget_file_id(hid_t id);
+!! See C API: @ref H5Iget_file_id()
 !!
   SUBROUTINE h5iget_file_id_f(obj_id, file_id, hdferr)
     IMPLICIT NONE
@@ -227,7 +227,7 @@ CONTAINS
 !! \param valid   Status of id as a valid identifier.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref htri_t H5Iis_valid(hid_t id);
+!! See C API: @ref H5Iis_valid()
 !!
   SUBROUTINE h5iis_valid_f(id, valid, hdferr)
     IMPLICIT NONE
diff --git a/fortran/src/H5Lff.F90 b/fortran/src/H5Lff.F90
index 7f7a62c..e9d46a3 100644
--- a/fortran/src/H5Lff.F90
+++ b/fortran/src/H5Lff.F90
@@ -80,7 +80,7 @@ CONTAINS
 !! \param lcpl_id     Link creation property list identifier.
 !! \param lapl_id     Link access property list identifier.
 !!
-!! See C API: @ref herr_t H5Lcopy(hid_t src_loc, const char *src_name, hid_t dst_loc, const char *dst_name, hid_t lcpl_id, hid_t lapl_id);
+!! See C API: @ref H5Lcopy()
 !!
   SUBROUTINE h5lcopy_f(src_loc_id, src_name, dest_loc_id, dest_name, hdferr, &
        lcpl_id, lapl_id)
@@ -141,7 +141,7 @@ CONTAINS
 !! \param hdferr  \fortran_error
 !! \param lapl_id Link access property list identifier.
 !!
-!! See C API: @ref herr_t H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id);
+!! See C API: @ref H5Ldelete()
 !!
   SUBROUTINE h5ldelete_f(loc_id, name, hdferr, lapl_id)
     IMPLICIT NONE
@@ -185,7 +185,7 @@ CONTAINS
 !! \param lcpl_id     Link creation property list identifier.
 !! \param lapl_id     Link access property list identifier.
 !!
-!! See C API: @ref herr_t H5Lcreate_soft(const char *link_target, hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id);
+!! See C API: @ref H5Lcreate_soft()
 !!
   SUBROUTINE h5lcreate_soft_f(target_path, link_loc_id, link_name, hdferr, lcpl_id, lapl_id)
     IMPLICIT NONE
@@ -246,7 +246,7 @@ CONTAINS
 !! \param lcpl_id     Link creation property list identifier.
 !! \param lapl_id     Link access property list identifier.
 !!
-!! See C API: @ref herr_t H5Lcreate_hard(hid_t cur_loc, const char *cur_name, hid_t dst_loc, const char *dst_name, hid_t lcpl_id, hid_t lapl_id);
+!! See C API: @ref H5Lcreate_hard()
 !!
   SUBROUTINE h5lcreate_hard_f(obj_loc_id, obj_name, link_loc_id, link_name, hdferr, lcpl_id, lapl_id)
     IMPLICIT NONE
@@ -308,7 +308,7 @@ CONTAINS
 !! \param lcpl_id     Link creation property list identifier.
 !! \param lapl_id     Link access property list identifier.
 !!
-!! See C API: @ref herr_t H5Lcreate_external(const char *file_name, const char *obj_name, hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id);
+!! See C API: @ref H5Lcreate_external()
 !!
   SUBROUTINE h5lcreate_external_f(file_name, obj_name, link_loc_id, link_name, hdferr, lcpl_id, lapl_id)
     IMPLICIT NONE
@@ -382,7 +382,7 @@ CONTAINS
 !! \param hdferr      \fortran_error
 !! \param lapl_id     Link access property list.
 !!
-!! See C API: @ref herr_t H5Ldelete_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id);
+!! See C API: @ref H5Ldelete_by_idx()
 !!
   SUBROUTINE h5ldelete_by_idx_f(loc_id, group_name, index_field, order, n, hdferr, lapl_id)
     IMPLICIT NONE
@@ -431,7 +431,7 @@ CONTAINS
 !! \param hdferr      \fortran_error
 !! \param lapl_id     Link access property list identifier.
 !!
-!! See C API: @ref htri_t H5Lexists(hid_t loc_id, const char *name, hid_t lapl_id);
+!! See C API: @ref H5Lexists()
 !!
   SUBROUTINE h5lexists_f(loc_id, name, link_exists, hdferr, lapl_id)
     IMPLICIT NONE
@@ -493,7 +493,7 @@ CONTAINS
 !! \param hdferr       \fortran_error
 !! \param lapl_id      Link access property list.
 !!
-!! See C API: @ref herr_t H5Lget_info2(hid_t loc_id, const char *name, H5L_info2_t *linfo, hid_t lapl_id);
+!! See C API: @ref H5Lget_info2()
 !!
   SUBROUTINE h5lget_info_f(link_loc_id, link_name, &
        cset, corder, f_corder_valid, link_type, token, val_size, &
@@ -583,7 +583,7 @@ CONTAINS
 !!
 !! \param lapl_id        Link access property list.
 !!
-!! See C API: @ref herr_t H5Lget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5L_info2_t *linfo, hid_t lapl_id);
+!! See C API: @ref H5Lget_info_by_idx2()
 !!
   SUBROUTINE h5lget_info_by_idx_f(loc_id, group_name, index_field, order, n, &
        link_type, f_corder_valid, corder, cset, token, val_size, hdferr, lapl_id)
@@ -652,7 +652,7 @@ CONTAINS
 !! \param registered  .TRUE. if the link class has been registered.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref htri_t H5Lis_registered(H5L_type_t id);
+!! See C API: @ref H5Lis_registered()
 !!
   SUBROUTINE h5lis_registered_f(link_cls_id, registered, hdferr)
     IMPLICIT NONE
@@ -689,7 +689,7 @@ CONTAINS
 !! \param lcpl_id     Link creation property list identifier to be associated WITH the NEW link.
 !! \param lapl_id     Link access property list identifier to be associated WITH the NEW link.
 !!
-!! See C API: @ref herr_t H5Lmove(hid_t src_loc, const char *src_name, hid_t dst_loc, const char *dst_name, hid_t lcpl_id, hid_t lapl_id);
+!! See C API: @ref H5Lmove()
 !!
   SUBROUTINE h5lmove_f(src_loc_id, src_name, dest_loc_id, dest_name, hdferr, lcpl_id, lapl_id)
     IMPLICIT NONE
@@ -763,7 +763,7 @@ CONTAINS
 !! \param lapl_id     List access property list identifier.
 !! \param size        Maximum number of characters of link value to be returned.
 !!
-!! See C API: @ref ssize_t H5Lget_name_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, char *name, size_t size, hid_t lapl_id);
+!! See C API: @ref H5Lget_name_by_idx()
 !!
   SUBROUTINE h5lget_name_by_idx_f(loc_id, group_name, index_field, order, n, &
         name, hdferr, size, lapl_id)
@@ -960,7 +960,7 @@ CONTAINS
 !!                               library, or the negative value returned by one of the operators.
 !! \param hdferr        \fortran_error
 !!
-!! See C API: @ref herr_t H5Literate2(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx, H5L_iterate2_t op, void *op_data);
+!! See C API: @ref H5Literate2()
 !!
   SUBROUTINE h5literate_f(group_id, index_type, order, idx, op, op_data, return_value, hdferr)
     USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_FUNPTR
@@ -1024,7 +1024,7 @@ CONTAINS
 !! \param hdferr       \fortran_error
 !! \param lapl_id      Link access property list
 !!
-!! See C API: @ref herr_t H5Literate_by_name2(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx, H5L_iterate2_t op, void *op_data, hid_t lapl_id);
+!! See C API: @ref H5Literate_by_name2()
 !!
   SUBROUTINE h5literate_by_name_f(loc_id, group_name, index_type, order, &
        idx, op, op_data, return_value, hdferr, lapl_id)
diff --git a/fortran/src/H5Off.F90 b/fortran/src/H5Off.F90
index b673b29..5a4244f 100644
--- a/fortran/src/H5Off.F90
+++ b/fortran/src/H5Off.F90
@@ -151,7 +151,7 @@ CONTAINS
 !! \param lcpl_id       Link creation property list identifier.
 !! \param lapl_id       Link access property list identifier.
 !!
-!! See C API: @ref herr_t H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, hid_t lapl_id);
+!! See C API: @ref H5Olink()
 !!
   SUBROUTINE h5olink_f(object_id, new_loc_id, new_link_name, hdferr, lcpl_id, lapl_id)
     IMPLICIT NONE
@@ -204,7 +204,7 @@ CONTAINS
 !! \param hdferr  \fortran_error
 !! \param lapl_id Access property list identifier for the link pointing to the object.
 !!
-!! See C API: @ref hid_t H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id);
+!! See C API: @ref H5Oopen()
 !!
   SUBROUTINE h5oopen_f(loc_id, name, obj_id, hdferr, lapl_id)
     IMPLICIT NONE
@@ -245,7 +245,7 @@ CONTAINS
 !! \param object_id Object identifier.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Oclose(hid_t object_id);
+!! See C API: @ref H5Oclose()
 !!
   SUBROUTINE h5oclose_f(object_id, hdferr)
     IMPLICIT NONE
@@ -272,7 +272,7 @@ CONTAINS
 !! \param obj_id Object identifier for the opened object.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref hid_t H5Oopen_by_token(hid_t loc_id, H5O_token_t token);
+!! See C API: @ref H5Oopen_by_token()
 !!
   SUBROUTINE h5oopen_by_token_f(loc_id, token, obj_id, hdferr)
     IMPLICIT NONE
@@ -307,7 +307,7 @@ CONTAINS
 !! \param lcpl_id    Link creation property list for the new hard link.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref herr_t H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id);
+!! See C API: @ref H5Ocopy()
 !!
   SUBROUTINE h5ocopy_f(src_loc_id, src_name, dst_loc_id, dst_name, hdferr, ocpypl_id, lcpl_id)
     IMPLICIT NONE
@@ -361,7 +361,7 @@ CONTAINS
 !! \param object_id Object identifier.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Odecr_refcount(hid_t object_id);
+!! See C API: @ref H5Odecr_refcount()
 !!
   SUBROUTINE h5odecr_refcount_f(object_id, hdferr)
     IMPLICIT NONE
@@ -393,7 +393,7 @@ CONTAINS
 !! \param link_exists Existing link resolves to an object.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref htri_t H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id);
+!! See C API: @ref H5Oexists_by_name()
 !!
   SUBROUTINE h5oexists_by_name_f(loc_id, name, link_exists, hdferr, lapl_id)
     IMPLICIT NONE
@@ -450,7 +450,7 @@ CONTAINS
 !! \param comment The comment.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref ssize_t H5Oget_comment(hid_t obj_id, char *comment, size_t bufsize);
+!! See C API: @ref H5Oget_comment()
 !!
   SUBROUTINE h5oget_comment_f(obj_id, comment, hdferr, bufsize)
     IMPLICIT NONE
@@ -495,7 +495,7 @@ CONTAINS
 !! \param bufsize Size of the comment buffer.
 !! \param lapl_id File access property list identifier.
 !!
-!! See C API: @ref ssize_t H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comment, size_t bufsize, hid_t lapl_id);
+!! See C API: @ref H5Oget_comment_by_name()
 !!
   SUBROUTINE h5oget_comment_by_name_f(loc_id, name, comment, hdferr, bufsize, lapl_id)
     IMPLICIT NONE
@@ -547,7 +547,7 @@ CONTAINS
 !! \param obj_id Object identifier.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Oincr_refcount(hid_t object_id);
+!! See C API: @ref H5Oincr_refcount()
 !!
   SUBROUTINE h5oincr_refcount_f(obj_id, hdferr)
     IMPLICIT NONE
@@ -581,7 +581,7 @@ CONTAINS
 !!
 !! \param lapl_id    Link access property list.
 !!
-!! See C API: @ref hid_t H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id);
+!! See C API: @ref H5Oopen_by_idx()
 !!
   SUBROUTINE h5oopen_by_idx_f(loc_id, group_name, index_type, order, n, obj_id, &
        hdferr, lapl_id)
@@ -633,7 +633,7 @@ CONTAINS
 !! \param comment The new comment.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Oset_comment(hid_t obj_id, const char *comment);
+!! See C API: @ref H5Oset_comment()
 !!
   SUBROUTINE h5oset_comment_f(obj_id, comment, hdferr)
     IMPLICIT NONE
@@ -671,7 +671,7 @@ CONTAINS
 !! \param hdferr  \fortran_error
 !! \param lapl_id Link access property list identifier.
 !!
-!! See C API: @ref herr_t H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment, hid_t lapl_id);
+!! See C API: @ref H5Oset_comment_by_name()
 !!
   SUBROUTINE h5oset_comment_by_name_f(loc_id, name, comment, hdferr, lapl_id)
     IMPLICIT NONE
@@ -729,7 +729,7 @@ CONTAINS
 !! \param hdferr       \fortran_error
 !! \param fields       Flags specifying the fields to include in object_info.
 !!
-!! See C API: @ref herr_t H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate2_t op, void *op_data, unsigned fields);
+!! See C API: @ref H5Ovisit3()
 !!
   SUBROUTINE h5ovisit_f(object_id, index_type, order, op, op_data, return_value, hdferr, fields)
     IMPLICIT NONE
@@ -784,7 +784,7 @@ CONTAINS
 !! \param lapl_id     Link access property list.
 !! \param fields      Flags specifying the fields to include in object_info.
 !!
-!! See C API: @ref herr_t H5Oget_info_by_name3(hid_t loc_id, const char *name, H5O_info2_t *oinfo, unsigned fields, hid_t lapl_id);
+!! See C API: @ref H5Oget_info_by_name3()
 !!
   SUBROUTINE h5oget_info_by_name_f(loc_id, name, object_info, hdferr, lapl_id, fields)
     IMPLICIT NONE
@@ -839,7 +839,7 @@ CONTAINS
 !! \param hdferr      \fortran_error
 !! \param fields      Flags specifying the fields to include in object_info.
 !!
-!! See C API: @ref herr_t H5Oget_info3(hid_t loc_id, H5O_info2_t *oinfo, unsigned fields);
+!! See C API: @ref H5Oget_info3()
 !!
   SUBROUTINE h5oget_info_f(object_id, object_info, hdferr, fields)
 
@@ -888,7 +888,7 @@ CONTAINS
 !! \param lapl_id     Link access property list. (Not currently used.).
 !! \param fields      Flags specifying the fields to include in object_info.
 !!
-!! See C API: @ref herr_t H5Oget_info_by_idx3(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_info2_t *oinfo, unsigned fields, hid_t lapl_id);
+!! See C API: @ref H5Oget_info_by_idx3()
 !!
   SUBROUTINE h5oget_info_by_idx_f(loc_id, group_name, index_field, order, n, &
        object_info, hdferr, lapl_id, fields)
@@ -962,7 +962,7 @@ CONTAINS
 !! \param lapl_id      Link access property list identifier.
 !! \param fields       Flags specifying the fields to include in object_info.
 !!
-!! See C API: @ref herr_t H5Ovisit_by_name3(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate2_t op, void *op_data, unsigned fields, hid_t lapl_id);
+!! See C API: @ref H5Ovisit_by_name3()
 !!
   SUBROUTINE h5ovisit_by_name_f(loc_id, object_name, index_type, order, op, op_data, &
        return_value, hdferr, lapl_id, fields)
@@ -1031,7 +1031,7 @@ CONTAINS
 !! \param cmp_value Returns 0 if tokens are equal, non-zero for unequal tokens.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Otoken_cmp(hid_t loc_id, const H5O_token_t *token1, const H5O_token_t *token2, int *cmp_value);
+!! See C API: @ref H5Otoken_cmp()
 !!
   SUBROUTINE h5otoken_cmp_f(loc_id, token1, token2, cmp_value, hdferr)
     IMPLICIT NONE
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index 4de2a9d..742cef5 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -240,7 +240,7 @@ CONTAINS
 !! \param prp_id Property list identifier.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref hid_t H5Pcreate(hid_t cls_id);
+!! See C API: @ref H5Pcreate()
 !!
   SUBROUTINE h5pcreate_f(class, prp_id, hdferr)
     IMPLICIT NONE
@@ -270,7 +270,7 @@ CONTAINS
 !! \param flag   Status flag.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_preserve(hid_t plist_id, hbool_t status);
+!! See C API: @ref H5Pset_preserve()
 !!
   SUBROUTINE h5pset_preserve_f(prp_id, flag, hdferr)
     IMPLICIT NONE
@@ -302,7 +302,7 @@ CONTAINS
 !! \param flag   Status flag.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref int H5Pget_preserve(hid_t plist_id);
+!! See C API: @ref H5Pget_preserve()
 !!
   SUBROUTINE h5pget_preserve_f(prp_id, flag, hdferr)
     IMPLICIT NONE
@@ -335,7 +335,7 @@ CONTAINS
 !! \param classtype Property list class.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref hid_t H5Pget_class(hid_t plist_id);
+!! See C API: @ref H5Pget_class()
 !!
   SUBROUTINE h5pget_class_f(prp_id, classtype, hdferr)
     IMPLICIT NONE
@@ -365,7 +365,7 @@ CONTAINS
 !! \param new_prp_id New property list identifier.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref hid_t H5Pcopy(hid_t plist_id);
+!! See C API: @ref H5Pcopy()
 !!
   SUBROUTINE h5pcopy_f(prp_id, new_prp_id, hdferr)
     IMPLICIT NONE
@@ -394,7 +394,7 @@ CONTAINS
 !! \param prp_id Identifier of the property list to terminate access to.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pclose(hid_t plist_id);
+!! See C API: @ref H5Pclose()
 !!
   SUBROUTINE h5pclose_f(prp_id, hdferr)
     IMPLICIT NONE
@@ -423,7 +423,7 @@ CONTAINS
 !! \param dims   Array with dimension sizes for each chunk.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[]);
+!! See C API: @ref H5Pset_chunk()
 !!
   SUBROUTINE h5pset_chunk_f(prp_id, ndims, dims, hdferr)
     IMPLICIT NONE
@@ -455,7 +455,7 @@ CONTAINS
 !! \param dims   Array with dimension sizes for each chunk.
 !! \param hdferr Returns number of chunk dimensions if successful and -1 if fails.
 !!
-!! See C API: @ref int H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[] );
+!! See C API: @ref H5Pget_chunk()
 !!
   SUBROUTINE h5pget_chunk_f(prp_id, ndims, dims, hdferr)
     IMPLICIT NONE
@@ -487,7 +487,7 @@ CONTAINS
 !! \param level  Compression level.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_deflate(hid_t plist_id, unsigned level);
+!! See C API: @ref H5Pset_deflate()
 !!
   SUBROUTINE h5pset_deflate_f(prp_id, level, hdferr)
     IMPLICIT NONE
@@ -523,7 +523,7 @@ CONTAINS
 !! \param shhdr    Shared object header version number.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_version(hid_t plist_id, unsigned *boot , unsigned *freelist, unsigned *stab, unsigned *shhdr);
+!! See C API: @ref H5Pget_version()
 !!
   SUBROUTINE h5pget_version_f(prp_id, boot, freelist, &
        stab, shhdr, hdferr)
@@ -561,7 +561,7 @@ CONTAINS
 !! \param size   Size of the user-block in bytes.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_userblock(hid_t plist_id, hsize_t size);
+!! See C API: @ref H5Pset_userblock()
 !!
   SUBROUTINE h5pset_userblock_f(prp_id, size, hdferr)
     IMPLICIT NONE
@@ -590,7 +590,7 @@ CONTAINS
 !! \param block_size Size of the user block in bytes.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_userblock(hid_t plist_id, hsize_t *size);
+!! See C API: @ref H5Pget_userblock()
 !!
   SUBROUTINE h5pget_userblock_f(prp_id, block_size, hdferr)
     IMPLICIT NONE
@@ -619,7 +619,7 @@ CONTAINS
 !! \param sizeof_size Size of an object length in bytes.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_sizes(hid_t plist_id, size_t sizeof_addr, size_t sizeof_size);
+!! See C API: @ref H5Pset_sizes()
 !!
   SUBROUTINE h5pset_sizes_f(prp_id, sizeof_addr, sizeof_size, hdferr)
     IMPLICIT NONE
@@ -651,7 +651,7 @@ CONTAINS
 !! \param sizeof_size Size of an object length in bytes.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_sizes(hid_t plist_id, size_t *sizeof_addr , size_t *sizeof_size);
+!! See C API: @ref H5Pget_sizes()
 !!
   SUBROUTINE h5pget_sizes_f(prp_id, sizeof_addr, sizeof_size, hdferr)
     IMPLICIT NONE
@@ -683,7 +683,7 @@ CONTAINS
 !! \param lk      Symbol table node size.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_sym_k(hid_t plist_id, unsigned ik, unsigned lk);
+!! See C API: @ref H5Pset_sym_k()
 !!
   SUBROUTINE h5pset_sym_k_f(prp_id, ik, lk, hdferr)
     IMPLICIT NONE
@@ -714,7 +714,7 @@ CONTAINS
 !! \param lk     Symbol table node 1/2 size.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_sym_k(hid_t plist_id, unsigned *ik, unsigned *lk);
+!! See C API: @ref H5Pget_sym_k()
 !!
   SUBROUTINE h5pget_sym_k_f(prp_id, ik, lk, hdferr)
     IMPLICIT NONE
@@ -744,7 +744,7 @@ CONTAINS
 !! \param ik      1/2 rank of chunked storage B-tree
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_istore_k(hid_t plist_id, unsigned ik);
+!! See C API: @ref H5Pset_istore_k()
 !!
   SUBROUTINE h5pset_istore_k_f(prp_id, ik, hdferr)
     IMPLICIT NONE
@@ -773,7 +773,7 @@ CONTAINS
 !! \param ik     Rank of chunked storage B-tree.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_istore_k(hid_t plist_id, unsigned *ik );
+!! See C API: @ref H5Pget_istore_k()
 !!
   SUBROUTINE h5pget_istore_k_f(prp_id, ik, hdferr)
     IMPLICIT NONE
@@ -802,7 +802,7 @@ CONTAINS
 !! \param driver Low-level driver identifier.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref hid_t H5Pget_driver(hid_t plist_id);
+!! See C API: @ref H5Pget_driver()
 !!
   SUBROUTINE h5pget_driver_f(prp_id, driver, hdferr)
     IMPLICIT NONE
@@ -830,7 +830,7 @@ CONTAINS
 !! \param prp_id File access property list identifier.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_fapl_stdio(hid_t fapl_id);
+!! See C API: @ref H5Pset_fapl_stdio()
 !!
   SUBROUTINE h5pset_fapl_stdio_f(prp_id, hdferr)
     IMPLICIT NONE
@@ -856,7 +856,7 @@ CONTAINS
 !! \param prp_id File access property list identifier.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_fapl_sec2(hid_t fapl_id);
+!! See C API: @ref H5Pset_fapl_sec2()
 !!
   SUBROUTINE h5pset_fapl_sec2_f(prp_id, hdferr)
     IMPLICIT NONE
@@ -884,7 +884,7 @@ CONTAINS
 !! \param alignment Alignment value.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_alignment(hid_t fapl_id, hsize_t threshold, hsize_t alignment);
+!! See C API: @ref H5Pset_alignment()
 !!
   SUBROUTINE h5pset_alignment_f(prp_id, threshold,  alignment, hdferr)
     IMPLICIT NONE
@@ -916,7 +916,7 @@ CONTAINS
 !! \param alignment Alignment value.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_alignment(hid_t fapl_id, hsize_t *threshold, hsize_t *alignment);
+!! See C API: @ref H5Pget_alignment()
 !!
   SUBROUTINE h5pget_alignment_f(prp_id, threshold,  alignment, hdferr)
     IMPLICIT NONE
@@ -948,7 +948,7 @@ CONTAINS
 !! \param backing_store Boolean flag indicating whether to write the file contents to disk when the file is closed.
 !! \param hdferr        \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_fapl_core(hid_t fapl_id, size_t *increment, hbool_t *backing_store);
+!! See C API: @ref H5Pset_fapl_core()
 !!
   SUBROUTINE h5pset_fapl_core_f(prp_id, increment, backing_store, hdferr)
     IMPLICIT NONE
@@ -982,7 +982,7 @@ CONTAINS
 !! \param backing_store Boolean flag indicating whether to write the file contents to disk when the file is closed.
 !! \param hdferr        \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_fapl_core(hid_t fapl_id, size_t *increment, hbool_t *backing_store);
+!! See C API: @ref H5Pget_fapl_core()
 !!
   SUBROUTINE h5pget_fapl_core_f(prp_id, increment, backing_store, hdferr)
     IMPLICIT NONE
@@ -1018,7 +1018,7 @@ CONTAINS
 !! \param memb_plist Identifier of the file access property list to be used for each family member
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_fapl_family(hid_t fapl_id, hsize_t memb_size, hid_t memb_fapl_id);
+!! See C API: @ref H5Pset_fapl_family()
 !!
   SUBROUTINE h5pset_fapl_family_f(prp_id, memb_size, memb_plist , hdferr)
     IMPLICIT NONE
@@ -1050,7 +1050,7 @@ CONTAINS
 !! \param memb_plist Identifier of the file access property list to be used for each family member
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_fapl_family(hid_t fapl_id, hsize_t *memb_size, hid_t *memb_fapl_id);
+!! See C API: @ref H5Pget_fapl_family()
 !!
   SUBROUTINE h5pget_fapl_family_f(prp_id, memb_size, memb_plist , hdferr)
     IMPLICIT NONE
@@ -1084,7 +1084,7 @@ CONTAINS
 !! \param rdcc_w0     Preemption policy (0 or 1).
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts, size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0);
+!! See C API: @ref H5Pset_cache()
 !!
   SUBROUTINE h5pset_cache_f(prp_id, mdc_nelmts,rdcc_nelmts, rdcc_nbytes, rdcc_w0, hdferr)
     IMPLICIT NONE
@@ -1122,7 +1122,7 @@ CONTAINS
 !! \param rdcc_w0     Preemption policy (0 or 1).
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_cache(hid_t plist_id, int *mdc_nelmts, size_t *rdcc_nslots, size_t *rdcc_nbytes, double *rdcc_w0);
+!! See C API: @ref H5Pget_cache()
 !!
   SUBROUTINE h5pget_cache_f(prp_id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0, hdferr)
     IMPLICIT NONE
@@ -1160,7 +1160,7 @@ CONTAINS
 !! \param raw_plist  Identifier of the raw file access property list.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: herr_t H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id, const char *raw_ext, hid_t raw_plist_id);
+!! See C API: @ref H5Pset_fapl_split()
 !!
   SUBROUTINE h5pset_fapl_split_f(prp_id, meta_ext, meta_plist, raw_ext, raw_plist, hdferr)
     IMPLICIT NONE
@@ -1200,7 +1200,7 @@ CONTAINS
 !! \param gc_reference Flag for setting garbage collection on and off (1 or 0).
 !! \param hdferr       \fortran_error
 !!
-!! See C API: herr_t H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref);
+!! See C API: @ref H5Pset_gc_references()
 !!
   SUBROUTINE h5pset_gc_references_f(prp_id, gc_reference, hdferr)
     IMPLICIT NONE
@@ -1229,7 +1229,7 @@ CONTAINS
 !! \param gc_reference Flag for setting garbage collection on and off (1 or 0)
 !! \param hdferr       \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_gc_references(hid_t fapl_id, unsigned *gc_ref );
+!! See C API: @ref H5Pget_gc_references()
 !!
   SUBROUTINE h5pget_gc_references_f(prp_id, gc_reference, hdferr)
     IMPLICIT NONE
@@ -1262,7 +1262,7 @@ CONTAINS
 !!               \li H5D_CHUNKED_F
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_layout(hid_t plist_id, H5D_layout_t layout);
+!! See C API: @ref H5Pset_layout()
 !!
   SUBROUTINE h5pset_layout_f(prp_id, layout, hdferr)
     IMPLICIT NONE
@@ -1295,7 +1295,7 @@ CONTAINS
 !!               \li H5D_CHUNKED_F
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref H5D_layout_t H5Pget_layout(hid_t plist_id);
+!! See C API: @ref H5Pget_layout()
 !!
   SUBROUTINE h5pget_layout_f(prp_id, layout, hdferr)
     IMPLICIT NONE
@@ -1328,7 +1328,7 @@ CONTAINS
 !! \param cd_values Auxiliary data for the filter.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts, const unsigned int c_values[]);
+!! See C API: @ref H5Pset_filter()
 !!
   SUBROUTINE h5pset_filter_f(prp_id, filter, flags, cd_nelmts, cd_values,  hdferr)
     IMPLICIT NONE
@@ -1396,7 +1396,7 @@ CONTAINS
 !! \param name          Buffer to retrieve filter name.
 !! \param hdferr        \fortran_error
 !!
-!! See C API: @ref H5Z_filter_t H5Pget_filter2(hid_t plist_id, unsigned idx, unsigned int *flags , size_t *cd_nelmts, unsigned cd_values[], size_t namelen, char name[], unsigned *filter_config);
+!! See C API: @ref H5Pget_filter2()
 !!
   SUBROUTINE h5pget_filter_f(prp_id, filter_number, flags, cd_nelmts, cd_values, namelen, name, filter_id, hdferr)
     IMPLICIT NONE
@@ -1446,7 +1446,7 @@ CONTAINS
 !! \param bytes  Size of the external file data.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_external(hid_t plist_id, const char *name, off_t offset, hsize_t size);
+!! See C API: @ref H5Pset_external()
 !!
   SUBROUTINE h5pset_external_f(prp_id, name, offset, bytes, hdferr)
     IMPLICIT NONE
@@ -1517,7 +1517,7 @@ CONTAINS
 !! \param bytes     Size of the external file data.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_external(hid_t plist_id, unsigned idx, size_t name_size, char *name , off_t *offset, hsize_t *size);
+!! See C API: @ref H5Pget_external()
 !!
   SUBROUTINE h5pget_external_f(prp_id, idx, name_size, name, offset,bytes, hdferr)
     IMPLICIT NONE
@@ -1557,7 +1557,7 @@ CONTAINS
 !! \param right  The B-tree split ratio for right-most nodes.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_btree_ratios(hid_t plist_id, double left, double middle, double right);
+!! See C API: @ref H5Pset_btree_ratios()
 !!
   SUBROUTINE h5pset_btree_ratios_f(prp_id, left, middle, right, hdferr)
     IMPLICIT NONE
@@ -1592,7 +1592,7 @@ CONTAINS
 !! \param right  The B-tree split ratio for right-most nodes.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_btree_ratios(hid_t plist_id, double *left , double *middle, double *right);
+!! See C API: @ref H5Pget_btree_ratios()
 !!
   SUBROUTINE h5pget_btree_ratios_f(prp_id, left, middle, right, hdferr)
     IMPLICIT NONE
@@ -1629,7 +1629,7 @@ CONTAINS
 !!                \li H5F_CLOSE_STRONG_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_fclose_degree(hid_t fapl_id, H5F_close_degree_t *degree);
+!! See C API: @ref H5Pget_fclose_degree()
 !!
   SUBROUTINE h5pget_fclose_degree_f(fapl_id, degree, hdferr)
     IMPLICIT NONE
@@ -1663,7 +1663,7 @@ CONTAINS
 !!                \li H5F_CLOSE_STRONG_F
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_fclose_degree(hid_t fapl_id, H5F_close_degree_t degree);
+!! See C API: @ref H5Pset_fclose_degree()
 !!
   SUBROUTINE h5pset_fclose_degree_f(fapl_id, degree, hdferr)
     IMPLICIT NONE
@@ -1694,7 +1694,7 @@ CONTAINS
 !! \param flag      Flag, Possible values: .TRUE. or .FALSE.
 !! \param hdferr:   \fortran_error and flag is set to .FALSE.
 !!
-!! See C API: @ref htri_t H5Pequal(hid_t id1, hid_t id2);
+!! See C API: @ref H5Pequal()
 !!
   SUBROUTINE h5pequal_f(plist1_id, plist2_id, flag, hdferr)
     IMPLICIT NONE
@@ -1729,7 +1729,7 @@ CONTAINS
 !! \param size     Buffer size.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_buffer(hid_t plist_id, size_t size, void *tconv, void *bkg);
+!! See C API: @ref H5Pset_buffer()
 !!
   SUBROUTINE h5pset_buffer_f(plist_id, size, hdferr)
     IMPLICIT NONE
@@ -1759,7 +1759,7 @@ CONTAINS
 !! \param size     Buffer size.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref size_t H5Pget_buffer(hid_t plist_id, void **tconv, void **bkg);
+!! See C API: @ref H5Pget_buffer()
 !!
   SUBROUTINE h5pget_buffer_f(plist_id, size, hdferr)
     IMPLICIT NONE
@@ -1793,7 +1793,7 @@ CONTAINS
 !!                 \li H5D_FILL_VALUE_USER_DEFINED_F
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pfill_value_defined(hid_t plist, H5D_fill_value_t *status);
+!! See C API: @ref H5Pfill_value_defined()
 !!
   SUBROUTINE h5pfill_value_defined_f(plist_id, flag, hdferr)
     IMPLICIT NONE
@@ -1828,7 +1828,7 @@ CONTAINS
 !!                 \li H5D_ALLOC_TIME_INCR_F
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t alloc_time);
+!! See C API: @ref H5Pset_alloc_time()
 !!
   SUBROUTINE h5pset_alloc_time_f(plist_id, flag, hdferr)
     IMPLICIT NONE
@@ -1863,7 +1863,7 @@ CONTAINS
 !!                 \li H5D_ALLOC_TIME_INCR_F
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t *alloc_time );
+!! See C API: @ref H5Pget_alloc_time()
 !!
   SUBROUTINE h5pget_alloc_time_f(plist_id, flag, hdferr)
     IMPLICIT NONE
@@ -1896,7 +1896,7 @@ CONTAINS
 !!                 \li H5D_FILL_TIME_NEVER_F
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_fill_time(hid_t plist_id, H5D_fill_time_t fill_time);
+!! See C API: @ref H5Pset_fill_time()
 !!
   SUBROUTINE h5pset_fill_time_f(plist_id, flag, hdferr)
     IMPLICIT NONE
@@ -1930,7 +1930,7 @@ CONTAINS
 !!                 \li H5D_FILL_TIME_NEVER_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t *fill_time );
+!! See C API: @ref H5Pget_fill_time()
 !!
   SUBROUTINE h5pget_fill_time_f(plist_id, flag, hdferr)
     IMPLICIT NONE
@@ -1960,7 +1960,7 @@ CONTAINS
 !! \param size     Metadata block size.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_meta_block_size(hid_t fapl_id, hsize_t size);
+!! See C API: @ref H5Pset_meta_block_size()
 !!
   SUBROUTINE h5pset_meta_block_size_f(plist_id, size, hdferr)
     IMPLICIT NONE
@@ -1989,7 +1989,7 @@ CONTAINS
 !! \param size     Metadata block size.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_meta_block_size(hid_t fapl_id, hsize_t *size);
+!! See C API: @ref H5Pget_meta_block_size()
 !!
   SUBROUTINE h5pget_meta_block_size_f(plist_id, size, hdferr)
     IMPLICIT NONE
@@ -2018,7 +2018,7 @@ CONTAINS
 !! \param size     Sieve buffer size.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_sieve_buf_size(hid_t fapl_id, size_t size);
+!! See C API: @ref H5Pset_sieve_buf_size()
 !!
   SUBROUTINE h5pset_sieve_buf_size_f(plist_id, size, hdferr)
     IMPLICIT NONE
@@ -2047,7 +2047,7 @@ CONTAINS
 !! \param size     Sieve buffer size.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_sieve_buf_size(hid_t fapl_id, size_t *size );
+!! See C API: @ref H5Pget_sieve_buf_size()
 !!
   SUBROUTINE h5pget_sieve_buf_size_f(plist_id, size, hdferr)
     IMPLICIT NONE
@@ -2076,7 +2076,7 @@ CONTAINS
 !! \param size     Small raw data block size.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_small_data_block_size(hid_t fapl_id, hsize_t size);
+!! See C API: @ref H5Pset_small_data_block_size()
 !!
   SUBROUTINE h5pset_small_data_block_size_f(plist_id, size, hdferr)
     IMPLICIT NONE
@@ -2105,7 +2105,7 @@ CONTAINS
 !! \param size     Small raw data block size.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_small_data_block_size(hid_t fapl_id, hsize_t *size );
+!! See C API: @ref H5Pget_small_data_block_size()
 !!
   SUBROUTINE h5pget_small_data_block_size_f(plist_id, size, hdferr)
     IMPLICIT NONE
@@ -2134,7 +2134,7 @@ CONTAINS
 !! \param size     Vector size.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_hyper_vector_size(hid_t plist_id, size_t size);
+!! See C API: @ref H5Pset_hyper_vector_size()
 !!
   SUBROUTINE h5pset_hyper_vector_size_f(plist_id, size, hdferr)
     IMPLICIT NONE
@@ -2163,7 +2163,7 @@ CONTAINS
 !! \param size     Vector size.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_hyper_vector_size(hid_t fapl_id, size_t *size );
+!! See C API: @ref H5Pget_hyper_vector_size()
 !!
   SUBROUTINE h5pget_hyper_vector_size_f(plist_id, size, hdferr)
     IMPLICIT NONE
@@ -2193,7 +2193,7 @@ CONTAINS
 !! \param flag   Logical flag.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref htri_t H5Pexist(hid_t plist_id, const char *name);
+!! See C API: @ref H5Pexist()
 !!
   SUBROUTINE h5pexist_f(prp_id, name, flag, hdferr)
     IMPLICIT NONE
@@ -2233,7 +2233,7 @@ CONTAINS
 !! \param size   Size of property in bytes.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_size(hid_t id, const char *name, size_t *size);
+!! See C API: @ref H5Pget_size()
 !!
   SUBROUTINE h5pget_size_f(prp_id, name, size, hdferr)
     IMPLICIT NONE
@@ -2268,7 +2268,7 @@ CONTAINS
 !! \param nprops Number of properties in property object.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_nprops(hid_t id, size_t *nprops);
+!! See C API: @ref H5Pget_nprops()
 !!
   SUBROUTINE h5pget_nprops_f(prp_id, nprops, hdferr)
     IMPLICIT NONE
@@ -2299,7 +2299,7 @@ CONTAINS
 !!                      truncated to fit into provided user buffer.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref char* H5Pget_class_name(hid_t pclass_id);
+!! See C API: @ref H5Pget_class_name()
 !!
   SUBROUTINE h5pget_class_name_f(prp_id, name, size, hdferr)
     IMPLICIT NONE
@@ -2338,7 +2338,7 @@ CONTAINS
 !! \param parent_id Identifier of the parent class.
 !! \param hdferr:   \fortran_error
 !!
-!! See C API: @ref hid_t H5Pget_class_parent(hid_t pclass_id);
+!! See C API: @ref H5Pget_class_parent()
 !!
   SUBROUTINE h5pget_class_parent_f(prp_id, parent_id, hdferr)
     IMPLICIT NONE
@@ -2367,7 +2367,7 @@ CONTAINS
 !! \param flag    TRUE. if a member, .FALSE. otherwise.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref htri_t H5Pisa_class(hid_t plist_id, hid_t pclass_id);
+!! See C API: @ref H5Pisa_class()
 !!
   SUBROUTINE h5pisa_class_f(plist, pclass, flag, hdferr)
     IMPLICIT NONE
@@ -2402,7 +2402,7 @@ CONTAINS
 !! \param name    Name of the property to copy.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Pcopy_prop(hid_t dst_id, hid_t src_id, const char *name);
+!! See C API: @ref H5Pcopy_prop()
 !!
   SUBROUTINE h5pcopy_prop_f(dst_id, src_id, name, hdferr)
     IMPLICIT NONE
@@ -2437,7 +2437,7 @@ CONTAINS
 !! \param name    Name of the property to remove.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Premove(hid_t plist_id, const char *name);
+!! See C API: @ref H5Premove()
 !!
   SUBROUTINE h5premove_f(plid, name, hdferr)
     IMPLICIT NONE
@@ -2470,7 +2470,7 @@ CONTAINS
 !! \param name    Name of the property to remove.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Punregister(hid_t pclass_id, const char *name);
+!! See C API: @ref H5Punregister()
 !!
   SUBROUTINE h5punregister_f(class, name, hdferr)
     IMPLICIT NONE
@@ -2502,7 +2502,7 @@ CONTAINS
 !! \param class  Property list class identifier.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pclose_class(hid_t plist_id);
+!! See C API: @ref H5Pclose_class()
 !!
   SUBROUTINE h5pclose_class_f(class, hdferr)
     IMPLICIT NONE
@@ -2527,7 +2527,7 @@ CONTAINS
 !! \param prp_id Dataset creation property list identifier.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_shuffle(hid_t plist_id);
+!! See C API: @ref H5Pset_shuffle()
 !!
   SUBROUTINE h5pset_shuffle_f(prp_id, hdferr)
     IMPLICIT NONE
@@ -2556,7 +2556,7 @@ CONTAINS
 !!               \li H5Z_ENABLE_EDC_F
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_edc_check(hid_t plist_id, H5Z_EDC_t check);
+!! See C API: @ref H5Pset_edc_check()
 !!
   SUBROUTINE h5pset_edc_check_f(prp_id, flag, hdferr)
     IMPLICIT NONE
@@ -2587,7 +2587,7 @@ CONTAINS
 !!               \li H5Z_ENABLE_EDC_F
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref H5Z_EDC_t H5Pget_edc_check(hid_t plist_id);
+!! See C API: @ref H5Pget_edc_check()
 !!
   SUBROUTINE h5pget_edc_check_f(prp_id, flag, hdferr)
     IMPLICIT NONE
@@ -2615,7 +2615,7 @@ CONTAINS
 !! \param prp_id Dataset creation property list identifier.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_fletcher32(hid_t plist_id);
+!! See C API: @ref H5Pset_fletcher32()
 !!
   SUBROUTINE h5pset_fletcher32_f(prp_id, hdferr)
     IMPLICIT NONE
@@ -2642,7 +2642,7 @@ CONTAINS
 !! \param offset File offset.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_family_offset(hid_t fapl_id, hsize_t offset);
+!! See C API: @ref H5Pset_family_offset()
 !!
   SUBROUTINE h5pset_family_offset_f(prp_id, offset, hdferr)
     IMPLICIT NONE
@@ -2846,7 +2846,7 @@ CONTAINS
 !! \param pixels_per_block Szip parameters.
 !! \param hdferr           \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_szip(hid_t plist_id, unsigned options_mask, unsigned pixels_per_block);
+!! See C API: @ref H5Pset_szip()
 !!
   SUBROUTINE h5pset_szip_f(prp_id, options_mask, pixels_per_block, hdferr)
     IMPLICIT NONE
@@ -2878,7 +2878,7 @@ CONTAINS
 !! \param flag   .TRUE. if all filters are available, .FALSE. otherwise.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref htri_t H5Pall_filters_avail(hid_t plist_id);
+!! See C API: @ref H5Pall_filters_avail()
 !!
   SUBROUTINE h5pall_filters_avail_f(prp_id, flag, hdferr)
     IMPLICIT NONE
@@ -2916,7 +2916,7 @@ CONTAINS
 !! \param name      Buffer to retrieve filter name.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t filter_id, unsigned int *flags, size_t *cd_nelmts, unsigned cd_values[], size_t namelen, char name[], unsigned *filter_config);
+!! See C API: @ref H5Pget_filter_by_id2()
 !!
   SUBROUTINE h5pget_filter_by_id_f(prp_id, filter_id, flags, cd_nelmts, cd_values, namelen, name, hdferr)
     IMPLICIT NONE
@@ -2961,7 +2961,7 @@ CONTAINS
 !! \param cd_values Auxiliary data for the filter.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[]);
+!! See C API: @ref H5Pmodify_filter()
 !!
   SUBROUTINE h5pmodify_filter_f(prp_id, filter, flags, cd_nelmts, cd_values,  hdferr)
     IMPLICIT NONE
@@ -2996,7 +2996,7 @@ CONTAINS
 !! \param filter Filter to be removed.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Premove_filter(hid_t plist_id, H5Z_filter_t filter);
+!! See C API: @ref H5Premove_filter()
 !!
   SUBROUTINE h5premove_filter_f(prp_id, filter, hdferr)
     IMPLICIT NONE
@@ -3026,7 +3026,7 @@ CONTAINS
 !! \param min_dense   Minimum number of attributes to be stored in dense storage (Default: 6).
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_attr_phase_change(hid_t plist_id, unsigned *max_compact, unsigned *min_dense);
+!! See C API: @ref H5Pget_attr_phase_change()
 !!
   SUBROUTINE h5pget_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
     IMPLICIT NONE
@@ -3058,7 +3058,7 @@ CONTAINS
 !! \param crt_order_flags Flags specifying whether to track and index attribute creation order.
 !! \param hdferr          \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_attr_creation_order(hid_t plist_id, unsigned crt_order_flags);
+!! See C API: @ref H5Pset_attr_creation_order()
 !!
   SUBROUTINE h5pset_attr_creation_order_f(ocpl_id, crt_order_flags , hdferr)
     IMPLICIT NONE
@@ -3088,7 +3088,7 @@ CONTAINS
 !! \param nindexes Number of shared object header message indexes to be available in files created with this property list.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_shared_mesg_nindexes(hid_t plist_id, unsigned nindexes);
+!! See C API: @ref H5Pset_shared_mesg_nindexes()
 !!
   SUBROUTINE h5pset_shared_mesg_nindexes_f( plist_id, nindexes, hdferr)
     IMPLICIT NONE
@@ -3123,7 +3123,7 @@ CONTAINS
 !! \param min_mesg_size   Minimum message size.
 !! \param hdferr          \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned mesg_type_flags, unsigned min_mesg_size);
+!! See C API: @ref H5Pset_shared_mesg_index()
 !!
   SUBROUTINE h5pset_shared_mesg_index_f(fcpl_id, index_num, mesg_type_flags, min_mesg_size, hdferr)
     IMPLICIT NONE
@@ -3159,7 +3159,7 @@ CONTAINS
 !! \param crt_order_flags Flags specifying whether to track and index attribute creation order.
 !! \param hdferr          \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_attr_creation_order(hid_t plist_id, unsigned *crt_order_flags);
+!! See C API: @ref H5Pget_attr_creation_order()
 !!
   SUBROUTINE h5pget_attr_creation_order_f(ocpl_id, crt_order_flags, hdferr)
     IMPLICIT NONE
@@ -3194,7 +3194,7 @@ CONTAINS
 !! \param hdferr  \fortran_error
 !!
 !! Fortran Interface:
-!! See C API: @ref herr_t H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low, H5F_libver_t *high);
+!! See C API: @ref H5Pget_libver_bounds()
 !!
   SUBROUTINE h5pget_libver_bounds_f(fapl_id, low, high, hdferr)
     IMPLICIT NONE
@@ -3238,7 +3238,7 @@ CONTAINS
 !! \param high    The latest version of the library that will be used for writing objects.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low, H5F_libver_t high);
+!! See C API: @ref H5Pset_libver_bounds()
 !!
   SUBROUTINE h5pset_libver_bounds_f(fapl_id, low, high, hdferr)
     IMPLICIT NONE
@@ -3277,7 +3277,7 @@ CONTAINS
 !! \param crt_order_flags Creation order flag(s).
 !! \param hdferr          \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_link_creation_order(hid_t plist_id, unsigned crt_order_flags);
+!! See C API: @ref H5Pset_link_creation_order()
 !!
   SUBROUTINE h5pset_link_creation_order_f(gcpl_id, crt_order_flags, hdferr)
     IMPLICIT NONE
@@ -3309,7 +3309,7 @@ CONTAINS
 !! \param min_dense   Minimum number of attributes to be stored in dense storage.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_link_phase_change(hid_t plist_id, unsigned *max_compact , unsigned *min_dense);
+!! See C API: @ref H5Pget_link_phase_change()
 !!
   SUBROUTINE h5pget_link_phase_change_f(gcpl_id, max_compact, min_dense, hdferr)
     IMPLICIT NONE
@@ -3341,7 +3341,7 @@ CONTAINS
 !! \param flag     Object timestamp setting, .TRUE. or .FALSE.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_obj_track_times(hid_t plist_id, hbool_t *track_times);
+!! See C API: @ref H5Pget_obj_track_times()
 !!
   SUBROUTINE h5pget_obj_track_times_f(plist_id, flag, hdferr)
     IMPLICIT NONE
@@ -3375,7 +3375,7 @@ CONTAINS
 !! \param flag     Object timestamp setting, .TRUE. or .FALSE.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_obj_track_times(hid_t plist_id, hbool_t track_times);
+!! See C API: @ref H5Pset_obj_track_times()
 !!
   SUBROUTINE h5pset_obj_track_times_f(plist_id, flag, hdferr)
     IMPLICIT NONE
@@ -3412,7 +3412,7 @@ CONTAINS
 !! \param crt_intermed_group Specifies whether to create intermediate groups upon the creation of an object.
 !! \param hdferr             \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_create_intermediate_group(hid_t plist_id, unsigned *crt_intmd);
+!! See C API: @ref H5Pset_create_intermediate_group()
 !!
   SUBROUTINE h5pset_create_inter_group_f(lcpl_id, crt_intermed_group, hdferr)
     IMPLICIT NONE
@@ -3442,7 +3442,7 @@ CONTAINS
 !! \param crt_order_flags Creation order flag(s).
 !! \param hdferr          \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_link_creation_order(hid_t plist_id, unsigned *crt_order_flags);
+!! See C API: @ref H5Pget_link_creation_order()
 !!
   SUBROUTINE h5pget_link_creation_order_f(gcpl_id, crt_order_flags, hdferr)
     IMPLICIT NONE
@@ -3475,7 +3475,7 @@ CONTAINS
 !!                 \li H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_char_encoding(hid_t plist_id, H5T_cset_t encoding);
+!! See C API: @ref H5Pset_char_encoding()
 !!
   SUBROUTINE h5pset_char_encoding_f(plist_id, encoding, hdferr)
     IMPLICIT NONE
@@ -3508,7 +3508,7 @@ CONTAINS
 !!                 \li H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_char_encoding(hid_t plist_id, H5T_cset_t *encoding );
+!! See C API: @ref H5Pget_char_encoding()
 !!
   SUBROUTINE  h5pget_char_encoding_f(plist_id, encoding, hdferr)
     IMPLICIT NONE
@@ -3540,7 +3540,7 @@ CONTAINS
 !! \param copy_options Copy option(s) to be set.
 !! \param hdferr       \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_copy_object(hid_t plist_id, unsigned copy_options);
+!! See C API: @ref H5Pset_copy_object()
 !!
   SUBROUTINE h5pset_copy_object_f(ocp_plist_id, copy_options, hdferr)
     IMPLICIT NONE
@@ -3570,7 +3570,7 @@ CONTAINS
 !! \param copy_options Copy option(s) to be get.
 !! \param hdferr       \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_copy_object(hid_t plist_id, unsigned *copy_options );
+!! See C API: @ref H5Pget_copy_object()
 !!
   SUBROUTINE h5pget_copy_object_f(ocp_plist_id, copy_options, hdferr)
     IMPLICIT NONE
@@ -3604,7 +3604,7 @@ CONTAINS
 !!                     Failure: -1
 !! \param size       Registered size of the transform expression
 !!
-!! See C API: @ref ssize_t H5Pget_data_transform(hid_t plist_id, char *expression , size_t size);
+!! See C API: @ref H5Pget_data_transform()
 !!
 SUBROUTINE h5pget_data_transform_f(plist_id, expression, hdferr, size)
     IMPLICIT NONE
@@ -3646,7 +3646,7 @@ SUBROUTINE h5pget_data_transform_f(plist_id, expression, hdferr, size)
 !! \param expression Buffer to hold transform expression.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_data_transform(hid_t plist_id, const char *expression);
+!! See C API: @ref H5Pset_data_transform()
 !!
   SUBROUTINE h5pset_data_transform_f(plist_id, expression, hdferr)
     IMPLICIT NONE
@@ -3681,7 +3681,7 @@ SUBROUTINE h5pget_data_transform_f(plist_id, expression, hdferr, size)
 !! \param size_hint Hint for size of local heap.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_local_heap_size_hint(hid_t plist_id, size_t *size_hint );
+!! See C API: @ref H5Pget_local_heap_size_hint()
 !!
   SUBROUTINE h5pget_local_heap_size_hint_f(gcpl_id, size_hint, hdferr)
     IMPLICIT NONE
@@ -3712,7 +3712,7 @@ SUBROUTINE h5pget_data_transform_f(plist_id, expression, hdferr, size)
 !! \param est_name_len    Estimated average length of link names.
 !! \param hdferr          \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_est_link_info(hid_t plist_id, unsigned *est_num_entries, unsigned *est_name_len);
+!! See C API: @ref H5Pget_est_link_info()
 !!
   SUBROUTINE h5pget_est_link_info_f(gcpl_id, est_num_entries, est_name_len, hdferr)
     IMPLICIT NONE
@@ -3744,7 +3744,7 @@ SUBROUTINE h5pget_data_transform_f(plist_id, expression, hdferr, size)
 !! \param size_hint Hint for size of local heap.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_local_heap_size_hint(hid_t plist_id, size_t size_hint);
+!! See C API: @ref H5Pset_local_heap_size_hint()
 !!
   SUBROUTINE h5pset_local_heap_size_hint_f(gcpl_id, size_hint, hdferr)
     IMPLICIT NONE
@@ -3775,7 +3775,7 @@ SUBROUTINE h5pget_data_transform_f(plist_id, expression, hdferr, size)
 !! \param est_name_len    Estimated average length of link names.
 !! \param hdferr          \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_est_link_info(hid_t plist_id, unsigned est_num_entries, unsigned est_name_len);
+!! See C API: @ref H5Pset_est_link_info()
 !!
   SUBROUTINE h5pset_est_link_info_f(gcpl_id, est_num_entries, est_name_len, hdferr)
     IMPLICIT NONE
@@ -3808,7 +3808,7 @@ SUBROUTINE h5pget_data_transform_f(plist_id, expression, hdferr, size)
 !! \param min_dense   Minimum number of attributes to be stored in dense storage.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_link_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dense);
+!! See C API: @ref H5Pset_link_phase_change()
 !!
 SUBROUTINE h5pset_link_phase_change_f(gcpl_id, max_compact, min_dense, hdferr)
     IMPLICIT NONE
@@ -3841,7 +3841,7 @@ SUBROUTINE h5pset_link_phase_change_f(gcpl_id, max_compact, min_dense, hdferr)
 !! \param cbuf_size  Copy buffer size.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_fapl_direct(hid_t fapl_id, size_t alignment, size_t block_size, size_t cbuf_size);
+!! See C API: @ref H5Pset_fapl_direct()
 !!
 SUBROUTINE h5pset_fapl_direct_f(fapl_id, alignment, block_size, cbuf_size, hdferr)
     IMPLICIT NONE
@@ -3876,7 +3876,7 @@ SUBROUTINE h5pset_fapl_direct_f(fapl_id, alignment, block_size, cbuf_size, hdfer
 !! \param cbuf_size  Copy buffer size.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary, size_t *block_size, size_t *cbuf_size);
+!! See C API: @ref H5Pget_fapl_direct()
 !!
   SUBROUTINE h5pget_fapl_direct_f(fapl_id, alignment, block_size, cbuf_size, hdferr)
     IMPLICIT NONE
@@ -3911,7 +3911,7 @@ SUBROUTINE h5pset_fapl_direct_f(fapl_id, alignment, block_size, cbuf_size, hdfer
 !! \param min_dense   Minimum number of attributes to be stored in dense storage, (Default: 6).
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_attr_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dense);
+!! See C API: @ref H5Pset_attr_phase_change()
 !!
 SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
     IMPLICIT NONE
@@ -3943,7 +3943,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param plist_id Dataset creation property list identifier.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_nbit(hid_t plist_id);
+!! See C API: @ref H5Pset_nbit()
 !!
   SUBROUTINE h5pset_nbit_f(plist_id, hdferr)
     IMPLICIT NONE
@@ -3975,7 +3975,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param scale_factor Parameter related to scale.
 !! \param hdferr       \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_scaleoffset(hid_t plist_id, H5Z_SO_scale_type_t scale_type, int scale_factor);
+!! See C API: @ref H5Pset_scaleoffset()
 !!
   SUBROUTINE h5pset_scaleoffset_f(plist_id, scale_type, scale_factor, hdferr)
     IMPLICIT NONE
@@ -4008,7 +4008,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param nlinks  Maximum number of links to traverse.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_nlinks(hid_t plist_id, size_t nlinks);
+!! See C API: @ref H5Pset_nlinks()
 !!
   SUBROUTINE h5pset_nlinks_f(lapl_id, nlinks, hdferr)
     IMPLICIT NONE
@@ -4038,7 +4038,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param nlinks  Maximum number of links to traverse.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_nlinks(hid_t plist_id, size_t *nlinks);
+!! See C API: @ref H5Pget_nlinks()
 !!
   SUBROUTINE h5pget_nlinks_f(lapl_id, nlinks, hdferr)
     IMPLICIT NONE
@@ -4068,7 +4068,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param crt_intermed_group Specifying whether to create intermediate groups upon the creation of an object.
 !! \param hdferr             \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_create_intermediate_group(hid_t plist_id, unsigned *crt_intmd);
+!! See C API: @ref H5Pget_create_intermediate_group()
 !!
   SUBROUTINE h5pget_create_inter_group_f(lcpl_id, crt_intermed_group, hdferr)
     IMPLICIT NONE
@@ -4115,7 +4115,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param rdcc_w0     The chunk preemption policy for this dataset.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_chunk_cache(hid_t dapl_id, size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0);
+!! See C API: @ref H5Pset_chunk_cache()
 !!
   SUBROUTINE h5pset_chunk_cache_f(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0, hdferr)
     IMPLICIT NONE
@@ -4152,7 +4152,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param rdcc_w0     Preemption policy.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_chunk_cache(hid_t dapl_id, size_t *rdcc_nslots , size_t *rdcc_nbytes, double *rdcc_w0);
+!! See C API: @ref H5Pget_chunk_cache()
 !!
   SUBROUTINE h5pget_chunk_cache_f(dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0, hdferr)
     IMPLICIT NONE
@@ -4190,7 +4190,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param fillvalue Fillvalue.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value);
+!! See C API: @ref H5Pset_fill_value()
 !!
   SUBROUTINE h5pset_fill_value_f(prp_id, type_id, fillvalue, hdferr)
     INTEGER(HID_T), INTENT(IN)  :: prp_id
@@ -4211,7 +4211,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param fillvalue Fillvalue.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value );
+!! See C API: @ref H5Pget_fill_value()
 !!
   SUBROUTINE h5pget_fill_value_f(prp_id, type_id, fillvalue, hdferr)
     INTEGER(HID_T), INTENT(IN)  :: prp_id
@@ -4232,7 +4232,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param fillvalue Fillvalue.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value);
+!! See C API: @ref H5Pset_fill_value()
 !!
   SUBROUTINE h5pset_fill_value_f(prp_id, type_id, fillvalue, hdferr)
     INTEGER(HID_T), INTENT(IN)  :: prp_id
@@ -4253,7 +4253,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param fillvalue Fillvalue.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value );
+!! See C API: @ref H5Pget_fill_value()
 !!
   SUBROUTINE h5pget_fill_value_f(prp_id, type_id, fillvalue, hdferr)
     INTEGER(HID_T), INTENT(IN)  :: prp_id
@@ -4274,7 +4274,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param value  Pointer to value to set the property to.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset(hid_t plist_id, const char *name, const void *value);
+!! See C API: @ref H5Pset()
 !!
   SUBROUTINE h5pset_f(prp_id, name, value, hdferr)
     INTEGER(HID_T)  , INTENT(IN)  :: prp_id
@@ -4299,7 +4299,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!               \li CHARACTER(LEN=*)
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset(hid_t plist_id, const char *name, const void *value);
+!! See C API: @ref H5Pset()
 !!
   SUBROUTINE h5pset_f(prp_id, name, value, hdferr)
     INTEGER(HID_T)  , INTENT(IN)  :: prp_id
@@ -4324,7 +4324,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!               \li CHARACTER(LEN=*)
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset(hid_t plist_id, const char *name, const void *value);
+!! See C API: @ref H5Pset()
 !!
   SUBROUTINE h5pset_f(prp_id, name, value, hdferr)
     INTEGER(HID_T), INTENT(IN) :: prp_id
@@ -4344,7 +4344,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param value  Pointer to a location to which to copy the value of of the property.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget(hid_t plist_id, const char *name, void *value);
+!! See C API: @ref H5Pget()
 !!
   SUBROUTINE h5pget_f(prp_id, name, value, hdferr)
     INTEGER(HID_T)  , INTENT(IN)  :: prp_id
@@ -4369,7 +4369,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!               \li CHARACTER(LEN=*)
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget(hid_t plist_id, const char *name, void *value);
+!! See C API: @ref H5Pget()
 !!
   SUBROUTINE h5pget_f(prp_id, name, value, hdferr)
     INTEGER(HID_T)  , INTENT(IN)  :: prp_id
@@ -4390,7 +4390,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param value Pointer to value to set the property to.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pregister2(hid_t cls_id, const char *name, size_t size, void *def_value, H5P_prp_create_func_t create, H5P_prp_set_func_t set, H5P_prp_get_func_t get, H5P_prp_delete_func_t prp_del, H5P_prp_copy_func_t copy, H5P_prp_compare_func_t compare, H5P_prp_close_func_t close);
+!! See C API: @ref H5Pregister2()
 !!
   SUBROUTINE h5pregister_f(class, name, size, value, hdferr)
     INTEGER(HID_T)  , INTENT(IN)  :: class
@@ -4416,7 +4416,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!              \li CHARACTER(LEN=*)
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pregister2(hid_t cls_id, const char *name, size_t size, void *def_value, H5P_prp_create_func_t create, H5P_prp_set_func_t set, H5P_prp_get_func_t get, H5P_prp_delete_func_t prp_del, H5P_prp_copy_func_t copy, H5P_prp_compare_func_t compare, H5P_prp_close_func_t close);
+!! See C API: @ref H5Pregister2()
 !!
   SUBROUTINE h5pregister_f(class, name, size, value, hdferr)
     INTEGER(HID_T)  , INTENT(IN)  :: class
@@ -4439,7 +4439,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param value  Pointer to new value pointer for the property being modified.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pinsert2(hid_t plist_id, const char *name, size_t size, void *value, H5P_prp_set_func_t set, H5P_prp_get_func_t get, H5P_prp_delete_func_t prp_del, H5P_prp_copy_func_t copy, H5P_prp_compare_func_t compare, H5P_prp_close_func_t close);
+!! See C API: @ref H5Pinsert2()
 !!
   SUBROUTINE h5pinsert_f(plist, name, size, value, hdferr)
     INTEGER(HID_T)  , INTENT(IN)  :: plist
@@ -4466,7 +4466,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!               \li CHARACTER(LEN=*)
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pinsert2(hid_t plist_id, const char *name, size_t size, void *value, H5P_prp_set_func_t set, H5P_prp_get_func_t get, H5P_prp_delete_func_t prp_del, H5P_prp_copy_func_t copy, H5P_prp_compare_func_t compare, H5P_prp_close_func_t close);
+!! See C API: @ref H5Pinsert2()
 !!
   SUBROUTINE h5pinsert_f(plist, name, size, value, hdferr)
     IMPLICIT NONE
@@ -4881,7 +4881,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param close       (H5P_cls_close_func_t)  - Callback routine called when a property list is being closed.
 !! \param close_data  User pointer to any class close information needed.
 !!
-!! See C API: @ref hid_t H5Pcreate_class(hid_t parent, const char *name, 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);
+!! See C API: @ref H5Pcreate_class()
 !!
   SUBROUTINE h5pcreate_class_f(parent, name, class, hdferr, create, create_data, &
        copy, copy_data, close, close_data)
@@ -4942,7 +4942,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param buf_len Size of the supplied buffer, or 0 (zero) if no initial image is desired.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len);
+!! See C API: @ref H5Pset_file_image()
 !!
   SUBROUTINE h5pset_file_image_f(fapl_id, buf_ptr, buf_len, hdferr)
     IMPLICIT NONE
@@ -4978,7 +4978,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!                    will be 0 if no initial image is set.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_file_image(hid_t fapl_id, void **buf_ptr_ptr, size_t *buf_len_ptr);
+!! See C API: @ref H5Pget_file_image()
 !!
   SUBROUTINE h5pget_file_image_f(fapl_id, buf_ptr, buf_len_ptr, hdferr)
     IMPLICIT NONE
@@ -5017,7 +5017,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param info   MPI-2 info object.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info);
+!! See C API: @ref H5Pset_fapl_mpio()
 !!
   SUBROUTINE h5pset_fapl_mpio_f(prp_id, comm, info, hdferr)
     IMPLICIT NONE
@@ -5050,7 +5050,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param info   MPI-2 info object.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm, MPI_Info *info);
+!! See C API: @ref H5Pget_fapl_mpio()
 !!
   SUBROUTINE h5pget_fapl_mpio_f(prp_id, comm, info, hdferr)
     IMPLICIT NONE
@@ -5083,7 +5083,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param hdferr     \fortran_error
 !! \param vfd_config #H5FD_SUBFILING driver configuration derived type.
 !!
-!! See C API: @ref herr_t H5Pset_fapl_subfiling(hid_t fapl_id, const H5FD_subfiling_config_t *vfd_config);
+!! See C API: @ref H5Pset_fapl_subfiling()
 !!
  SUBROUTINE h5pset_fapl_subfiling_f(prp_id, hdferr, vfd_config)
     IMPLICIT NONE
@@ -5121,7 +5121,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param vfd_config #H5FD_SUBFILING driver configuration derived type.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_fapl_subfiling(hid_t fapl_id, H5FD_subfiling_config_t *config_out);
+!! See C API: @ref H5Pget_fapl_subfiling()
 !!
   SUBROUTINE h5pget_fapl_subfiling_f(prp_id, vfd_config, hdferr)
     IMPLICIT NONE
@@ -5154,7 +5154,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param hdferr     \fortran_error
 !! \param vfd_config #H5FD_IOC driver configuration derived type.
 !!
-!! See C API: @ref herr_t H5Pset_fapl_ioc(hid_t fapl_id, const H5FD_ioc_config_t *vfd_config);
+!! See C API: @ref H5Pset_fapl_ioc()
 !!
  SUBROUTINE h5pset_fapl_ioc_f(prp_id, hdferr, vfd_config)
     IMPLICIT NONE
@@ -5192,7 +5192,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param vfd_config #H5FD_IOC driver configuration derived type.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_fapl_ioc(hid_t fapl_id, H5FD_ioc_config_t *config_out);
+!! See C API: @ref H5Pget_fapl_ioc()
 !!
   SUBROUTINE h5pget_fapl_ioc_f(prp_id, vfd_config, hdferr)
     IMPLICIT NONE
@@ -5227,7 +5227,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param info   The MPI info object.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_mpi_params(hid_t plist_id, MPI_Comm comm, MPI_Info info);
+!! See C API: @ref H5Pset_mpi_params()
 !!
   SUBROUTINE H5Pset_mpi_params_f(prp_id, comm, info, hdferr)
     IMPLICIT NONE
@@ -5261,7 +5261,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param info   The MPI info object.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_mpi_params(hid_t fapl_id, MPI_Comm *comm, MPI_Info *info);
+!! See C API: @ref H5Pget_mpi_params()
 !!
   SUBROUTINE H5Pget_mpi_params_f(prp_id, comm, info, hdferr)
     IMPLICIT NONE
@@ -5296,7 +5296,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!                       \li H5FD_MPIO_COLLECTIVE_F
 !! \param hdferr         \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode);
+!! See C API: @ref H5Pset_dxpl_mpio()
 !!
   SUBROUTINE h5pset_dxpl_mpio_f(prp_id, data_xfer_mode, hdferr)
     IMPLICIT NONE
@@ -5327,7 +5327,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!                       \li H5FD_MPIO_COLLECTIVE_F
 !! \param hdferr         \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode);
+!! See C API: @ref H5Pget_dxpl_mpio()
 !!
   SUBROUTINE h5pget_dxpl_mpio_f(prp_id, data_xfer_mode, hdferr)
     IMPLICIT NONE
@@ -5357,7 +5357,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param actual_io_mode The type of I/O performed by this process.
 !! \param hdferr         \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_mpio_actual_io_mode(hid_t plist_id, H5D_mpio_actual_io_mode_t *actual_io_mode);
+!! See C API: @ref H5Pget_mpio_actual_io_mode()
 !!
   SUBROUTINE h5pget_mpio_actual_io_mode_f(dxpl_id, actual_io_mode, hdferr)
     IMPLICIT NONE
@@ -5392,7 +5392,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param is_collective Indicates if metadata writes are collective or not.
 !! \param hdferr        \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_all_coll_metadata_ops(hid_t plist_id, hbool_t is_collective);
+!! See C API: @ref H5Pset_all_coll_metadata_ops()
 !!
   SUBROUTINE h5pset_all_coll_metadata_ops_f(plist_id, is_collective, hdferr)
     IMPLICIT NONE
@@ -5426,7 +5426,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param is_collective Collective access setting.
 !! \param hdferr        \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_all_coll_metadata_ops(hid_t plist_id, hbool_t *is_collective);
+!! See C API: @ref H5Pget_all_coll_metadata_ops()
 !!
   SUBROUTINE h5pget_all_coll_metadata_ops_f(plist_id, is_collective, hdferr)
 
@@ -5461,7 +5461,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param is_collective Indicates if metadata writes are collective or not.
 !! \param hdferr        \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_coll_metadata_write(hid_t plist_id, hbool_t is_collective);
+!! See C API: @ref H5Pset_coll_metadata_write()
 !!
   SUBROUTINE h5pset_coll_metadata_write_f(plist_id, is_collective, hdferr)
     IMPLICIT NONE
@@ -5495,7 +5495,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param is_collective Collective access setting.
 !! \param hdferr        \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_coll_metadata_write(hid_t plist_id, hbool_t *is_collective);
+!! See C API: @ref H5Pget_coll_metadata_write()
 !!
   SUBROUTINE h5pget_coll_metadata_write_f(plist_id, is_collective, hdferr)
 
@@ -5538,7 +5538,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!                \li H5D_VDS_LAST_AVAILABLE_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_virtual_view(hid_t dapl_id, H5D_vds_view_t view);
+!! See C API: @ref H5Pset_virtual_view()
 !!
   SUBROUTINE h5pset_virtual_view_f(dapl_id, view, hdferr)
     IMPLICIT NONE
@@ -5571,7 +5571,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!                \li H5D_VDS_LAST_AVAILABLE_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_virtual_view(hid_t dapl_id, H5D_vds_view_t *view);
+!! See C API: @ref H5Pget_virtual_view()
 !!
   SUBROUTINE h5pget_virtual_view_f(dapl_id, view, hdferr)
     IMPLICIT NONE
@@ -5605,7 +5605,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!                 the extent of an unlimited virtual dataset with printf-style mappings.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_virtual_printf_gap(hid_t dapl_id, hsize_t gap_size);
+!! See C API: @ref H5Pset_virtual_printf_gap()
 !!
   SUBROUTINE h5pset_virtual_printf_gap_f(dapl_id, gap_size, hdferr)
     IMPLICIT NONE
@@ -5636,7 +5636,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !!                 determining the extent of an unlimited virtual dataset with printf-style mappings.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_virtual_printf_gap(hid_t dapl_id, hsize_t *gap_size);
+!! See C API: @ref H5Pget_virtual_printf_gap()
 !!
   SUBROUTINE h5pget_virtual_printf_gap_f(dapl_id, gap_size, hdferr)
     IMPLICIT NONE
@@ -5669,7 +5669,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param src_space_id  The source dataset’s dataspace identifier with a selection applied, possibly an unlimited selection.
 !! \param hdferr        \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_virtual(hid_t dcpl_id, hid_t vspace_id, const char *src_file_name, const char *src_dset_name, hid_t src_space_id);
+!! See C API: @ref H5Pset_virtual()
 !!
   SUBROUTINE h5pset_virtual_f(dcpl_id, vspace_id, src_file_name, src_dset_name, src_space_id, hdferr)
     IMPLICIT NONE
@@ -5713,7 +5713,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param count   The number of mappings.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_virtual_count(hid_t dcpl_id, size_t *count );
+!! See C API: @ref H5Pget_virtual_count()
 !!
   SUBROUTINE h5pget_virtual_count_f(dcpl_id, count, hdferr)
 
@@ -5746,7 +5746,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 !! \param ds_id   Valid dataspace identifier identifier if successful; otherwise returns H5I_INVALID_HID_F.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref hid_t H5Pget_virtual_vspace(hid_t dcpl_id, size_t index);
+!! See C API: @ref H5Pget_virtual_vspace()
 !!
   SUBROUTINE h5pget_virtual_vspace_f(dcpl_id, index, ds_id, hdferr)
     IMPLICIT NONE
@@ -5783,7 +5783,7 @@ END SUBROUTINE h5pget_virtual_vspace_f
 !! \param ds_id   Dataspace identifier.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref hid_t H5Pget_virtual_srcspace(hid_t dcpl_id, size_t index);
+!! See C API: @ref H5Pget_virtual_srcspace()
 !!
 SUBROUTINE h5pget_virtual_srcspace_f(dcpl_id, index, ds_id, hdferr)
   IMPLICIT NONE
@@ -5822,7 +5822,7 @@ END SUBROUTINE h5pget_virtual_srcspace_f
 !! \param name_len The size of name needed to hold the filename. (OUT)
 !!
 !!
-!! See C API: @ref ssize_t H5Pget_virtual_filename(hid_t dcpl_id, size_t index, char *name , size_t size);
+!! See C API: @ref H5Pget_virtual_filename()
 !!
 SUBROUTINE h5pget_virtual_filename_f(dcpl_id, index, name, hdferr, name_len)
 
@@ -5876,7 +5876,7 @@ END SUBROUTINE h5pget_virtual_filename_f
 !! \param hdferr   \fortran_error
 !! \param name_len The size of name needed to hold the source dataset name.
 !!
-!! See C API: @ref ssize_t H5Pget_virtual_dsetname(hid_t dcpl_id, size_t index, char *name , size_t size);
+!! See C API: @ref H5Pget_virtual_dsetname()
 !!
 SUBROUTINE h5pget_virtual_dsetname_f(dcpl_id, index, name, hdferr, name_len)
 
@@ -5927,7 +5927,7 @@ END SUBROUTINE h5pget_virtual_dsetname_f
 !! \param minimize Value of the setting.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_dset_no_attrs_hint(hid_t dcpl_id, hbool_t *minimize);
+!! See C API: @ref H5Pget_dset_no_attrs_hint()
 !!
   SUBROUTINE h5pget_dset_no_attrs_hint_f(dcpl_id, minimize, hdferr)
     IMPLICIT NONE
@@ -5962,7 +5962,7 @@ END SUBROUTINE h5pget_virtual_dsetname_f
 !! \param minimize Value of the setting.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_dset_no_attrs_hint(hid_t dcpl_id, hbool_t minimize);
+!! See C API: @ref H5Pset_dset_no_attrs_hint()
 !!
   SUBROUTINE h5pset_dset_no_attrs_hint_f(dcpl_id, minimize, hdferr)
     IMPLICIT NONE
@@ -5997,7 +5997,7 @@ END SUBROUTINE h5pget_virtual_dsetname_f
 !! \param hdferr       \fortran_error
 !! \param new_vol_info VOL connector info.
 !!
-!! See C API: @ref herr_t H5Pset_vol(hid_t plist_id, hid_t new_vol_id, const void *new_vol_info);
+!! See C API: @ref H5Pset_vol()
 !!
   SUBROUTINE h5pset_vol_f(plist_id, new_vol_id, hdferr, new_vol_info)
     IMPLICIT NONE
@@ -6034,7 +6034,7 @@ END SUBROUTINE h5pget_virtual_dsetname_f
 !! \param vol_id   VOL connector id.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_vol_id(hid_t plist_id, hid_t *vol_id);
+!! See C API: @ref H5Pget_vol_id()
 !!
   SUBROUTINE h5pget_vol_id_f(plist_id, vol_id, hdferr)
     IMPLICIT NONE
@@ -6065,7 +6065,7 @@ END SUBROUTINE h5pget_virtual_dsetname_f
 !! \param ignore_disabled_locks Whether or not to ignore file locks when locking is disabled on a file system.
 !! \param hdferr                \fortran_error
 !!
-!! See C API: @ref herr_t H5Pget_file_locking(hid_t fapl_id, hbool_t *use_file_locking, hbool_t *ignore_when_disabled);
+!! See C API: @ref H5Pget_file_locking()
 !!
   SUBROUTINE h5pget_file_locking_f(fapl_id, use_file_locking, ignore_disabled_locks, hdferr)
     IMPLICIT NONE
@@ -6104,7 +6104,7 @@ END SUBROUTINE h5pget_virtual_dsetname_f
 !! \param ignore_disabled_locks Whether or not to ignore file locks when locking is disabled on a file system.
 !! \param hdferr                \fortran_error
 !!
-!! See C API: @ref herr_t H5Pset_file_locking(hid_t fapl_id, hbool_t use_file_locking, hbool_t ignore_when_disabled);
+!! See C API: @ref H5Pset_file_locking()
 !!
   SUBROUTINE h5pset_file_locking_f(fapl_id, use_file_locking, ignore_disabled_locks, hdferr)
     IMPLICIT NONE
diff --git a/fortran/src/H5Rff.F90 b/fortran/src/H5Rff.F90
index f55014f..82b91dd 100644
--- a/fortran/src/H5Rff.F90
+++ b/fortran/src/H5Rff.F90
@@ -258,7 +258,7 @@ CONTAINS
 !! \param space_id Dataspace identifier.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref hid_t H5Rget_region(hid_t dataset, H5R_type_t ref_type, const void *ref);
+!! See C API: @ref H5Rget_region()
 !!
 #ifdef H5_DOXYGEN_FORTRAN
   SUBROUTINE h5rget_region_f(&
@@ -292,7 +292,7 @@ CONTAINS
 !! \param ref    Reference to the specified object.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Rcreate_object(hid_t loc_id, const char *name, hid_t oapl_id, H5R_ref_t *ref_ptr);
+!! See C API: @ref H5Rcreate_object()
 !!
   SUBROUTINE h5rcreate_object_f(loc_id, name, ref, hdferr)
     USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
@@ -325,7 +325,7 @@ CONTAINS
 !! \param ref      Reference to the dataset region.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Rcreate_region(hid_t loc_id, const char *name, hid_t space_id, hid_t oapl_id, H5R_ref_t *ref_ptr);
+!! See C API: @ref H5Rcreate_region()
 !!
   SUBROUTINE h5rcreate_region_f(loc_id, name, space_id, ref, hdferr)
     IMPLICIT NONE
@@ -374,7 +374,7 @@ CONTAINS
 !! \param space_id Dataspace identifier that describes selected region.
 !!
 #ifdef H5_DOXYGEN_FORTRAN
-!! See C API: @ref herr_t H5Rcreate_object(hid_t loc_id, const char *name, hid_t oapl_id, H5R_ref_t *ref_ptr);
+!! See C API: @ref H5Rcreate_object()
 !!
   SUBROUTINE h5rcreate_f(&
 #else
@@ -567,7 +567,7 @@ CONTAINS
 !!
 
 #ifdef H5_DOXYGEN_FORTRAN
-!! See C API: @ref ssize_t H5Rget_name(hid_t loc_id, H5R_type_t ref_type, const void *ref, char *name, size_t size);
+!! See C API: @ref H5Rget_name()
 !!
   SUBROUTINE h5rget_name_f(&
 #else
@@ -612,7 +612,7 @@ CONTAINS
 !!             \li H H5G_TYPE_F
 !!  hdferr   - \fortran_error
 !!
-!! See C API: @ref herr_t H5Rget_obj_type3(H5R_ref_t *ref_ptr, hid_t rapl_id, H5O_type_t *obj_type);
+!! See C API: @ref H5Rget_obj_type3()
 !!
   SUBROUTINE h5rget_obj_type_f(loc_id, ref_type, ref, obj_type, hdferr)
 
diff --git a/fortran/src/H5Sff.F90 b/fortran/src/H5Sff.F90
index b068deb..95d61da 100644
--- a/fortran/src/H5Sff.F90
+++ b/fortran/src/H5Sff.F90
@@ -53,7 +53,7 @@ CONTAINS
 !! \param hdferr   \fortran_error
 !! \param maxdims  An array of the maximum size of each dimension.
 !!
-!! See C API: @ref hid_t H5Screate_simple(int rank, const hsize_t dims[], const hsize_t maxdims[]);
+!! See C API: @ref H5Screate_simple()
 !!
   SUBROUTINE h5screate_simple_f(rank, dims, space_id, hdferr, maxdims)
 
@@ -99,7 +99,7 @@ CONTAINS
 !! \param space_id Identifier of dataspace to release.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Sclose(hid_t space_id);
+!! See C API: @ref H5Sclose()
 !!
   SUBROUTINE h5sclose_f(space_id, hdferr)
     IMPLICIT NONE
@@ -129,7 +129,7 @@ CONTAINS
 !! \param space_id  Dataspace identifier.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref hid_t H5Screate(H5S_class_t type);
+!! See C API: @ref H5Screate()
 !!
   SUBROUTINE h5screate_f(classtype, space_id, hdferr)
     IMPLICIT NONE
@@ -158,7 +158,7 @@ CONTAINS
 !! \param new_space_id Identifier of dataspace's copy.
 !! \param hdferr       \fortran_error
 !!
-!! See C API: @ref hid_t H5Scopy(hid_t space_id);
+!! See C API: @ref H5Scopy()
 !!
   SUBROUTINE h5scopy_f(space_id, new_space_id, hdferr)
     IMPLICIT NONE
@@ -187,7 +187,7 @@ CONTAINS
 !! \param num_blocks Number of hyperslab blocks in the current hyperslab selection.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref hssize_t H5Sget_select_hyper_nblocks(hid_t spaceid);
+!! See C API: @ref H5Sget_select_hyper_nblocks()
 !!
   SUBROUTINE h5sget_select_hyper_nblocks_f(space_id, num_blocks, hdferr)
     IMPLICIT NONE
@@ -219,7 +219,7 @@ CONTAINS
 !! \param buf        Buffer to hold block list.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref herr_t H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numblocks, hsize_t buf[]);
+!! See C API: @ref H5Sget_select_hyper_blocklist()
 !!
   SUBROUTINE h5sget_select_hyper_blocklist_f(space_id, startblock, &
                                                     num_blocks, buf, hdferr)
@@ -255,7 +255,7 @@ CONTAINS
 !! \param end      Ending coordinates of bounding box, i.e., the coordinates of the diagonally opposite corner.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Sget_select_bounds(hid_t spaceid, hsize_t start[], hsize_t end[]);
+!! See C API: @ref H5Sget_select_bounds()
 !!
   SUBROUTINE  h5sget_select_bounds_f(space_id, start, END, hdferr)
     IMPLICIT NONE
@@ -287,7 +287,7 @@ CONTAINS
 !! \param num_points Number of element points in the current dataspace selection
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref hssize_t H5Sget_select_elem_npoints(hid_t spaceid);
+!! See C API: @ref H5Sget_select_elem_npoints()
 !!
   SUBROUTINE h5sget_select_elem_npoints_f(space_id, num_points, hdferr)
     IMPLICIT NONE
@@ -317,7 +317,7 @@ CONTAINS
 !! \param buf        Buffer with element points selected.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref herr_t H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoints, hsize_t buf[]);
+!! See C API: @ref H5Sget_select_elem_pointlist()
 !!
   SUBROUTINE h5sget_select_elem_pointlist_f(space_id, startpoint, &
        num_points, buf, hdferr)
@@ -360,7 +360,7 @@ CONTAINS
 !!                     array is stored in 2D as (num_element x rank).
 !! \param hdferr       \fortran_error
 !!
-!! See C API: @ref herr_t H5Sselect_elements(hid_t space_id, H5S_seloper_t op, size_t num_elem, const hsize_t *coord);
+!! See C API: @ref H5Sselect_elements()
 !!
   SUBROUTINE h5sselect_elements_f(space_id, OPERATOR, rank, &
        num_elements, coord, hdferr)
@@ -418,7 +418,7 @@ CONTAINS
 !! \param space_id Identifier for the dataspace in which selection being made.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Sselect_all(hid_t spaceid);
+!! See C API: @ref H5Sselect_all()
 !!
   SUBROUTINE h5sselect_all_f(space_id, hdferr)
     IMPLICIT NONE
@@ -444,7 +444,7 @@ CONTAINS
 !! \param space_id The identifier for the dataspace in which the selection is being reset.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Sselect_none(hid_t spaceid);
+!! See C API: @ref H5Sselect_none()
 !!
   SUBROUTINE h5sselect_none_f(space_id, hdferr)
     IMPLICIT NONE
@@ -471,7 +471,7 @@ CONTAINS
 !! \param status   TRUE if the selection is contained within the extent, FALSE otherwise.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref htri_t H5Sselect_valid(hid_t spaceid);
+!! See C API: @ref H5Sselect_valid()
 !!
   SUBROUTINE h5sselect_valid_f(space_id, status, hdferr)
     IMPLICIT NONE
@@ -504,7 +504,7 @@ CONTAINS
 !! \param npoints  Number of elements in the dataspace.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref hssize_t H5Sget_simple_extent_npoints(hid_t space_id);
+!! See C API: @ref H5Sget_simple_extent_npoints()
 !!
   SUBROUTINE h5sget_simple_extent_npoints_f(space_id, npoints, hdferr)
     IMPLICIT NONE
@@ -533,7 +533,7 @@ CONTAINS
 !! \param npoints  Number of points in the dataspace selection.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref hssize_t H5Sget_select_npoints(hid_t spaceid);
+!! See C API: @ref H5Sget_select_npoints()
 !!
   SUBROUTINE h5sget_select_npoints_f(space_id, npoints, hdferr)
     IMPLICIT NONE
@@ -562,7 +562,7 @@ CONTAINS
 !! \param rank     Number of dataspace dimensions.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref int H5Sget_simple_extent_ndims(hid_t space_id);
+!! See C API: @ref H5Sget_simple_extent_ndims()
 !!
   SUBROUTINE h5sget_simple_extent_ndims_f(space_id, rank, hdferr)
     IMPLICIT NONE
@@ -591,7 +591,7 @@ CONTAINS
 !! \param maxdims  Array to store maximum size of each dimension.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref int H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[], hsize_t maxdims[]);
+!! See C API: @ref H5Sget_simple_extent_dims()
 !!
   SUBROUTINE h5sget_simple_extent_dims_f(space_id, dims, maxdims, hdferr)
     IMPLICIT NONE
@@ -626,7 +626,7 @@ CONTAINS
 !!                  \li H5S_NULL_F
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref H5S_class_t H5Sget_simple_extent_type(hid_t space_id);
+!! See C API: @ref H5Sget_simple_extent_type()
 !!
   SUBROUTINE h5sget_simple_extent_type_f(space_id, classtype, hdferr)
     IMPLICIT NONE
@@ -657,7 +657,7 @@ CONTAINS
 !! \param maximum_size Array with the new maximum sizes of dimensions.
 !! \param hdferr       \fortran_error
 !!
-!! See C API: @ref herr_t H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[], const hsize_t max[]);
+!! See C API: @ref H5Sset_extent_simple()
 !!
   SUBROUTINE h5sset_extent_simple_f(space_id, rank, current_size, &
        maximum_size, hdferr)
@@ -691,7 +691,7 @@ CONTAINS
 !! \param status   Flag to indicate if dataspace is simple or not (TRUE or FALSE).
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref htri_t H5Sis_simple(hid_t space_id);
+!! See C API: @ref H5Sis_simple()
 !!
   SUBROUTINE h5sis_simple_f(space_id, status, hdferr)
     IMPLICIT NONE
@@ -724,7 +724,7 @@ CONTAINS
 !! \param offset   The offset at which to position the selection.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Soffset_simple(hid_t space_id, const hssize_t *offset);
+!! See C API: @ref H5Soffset_simple()
 !!
   SUBROUTINE h5soffset_simple_f(space_id, offset, hdferr)
     IMPLICIT NONE
@@ -753,7 +753,7 @@ CONTAINS
 !! \param source_space_id The identifier for the dataspace from which the extent is copied.
 !! \param hdferr          \fortran_error
 !!
-!! See C API: @ref herr_t H5Sextent_copy(hid_t dst_id, hid_t src_id);
+!! See C API: @ref H5Sextent_copy()
 !!
   SUBROUTINE h5sextent_copy_f(dest_space_id, source_space_id, hdferr)
     IMPLICIT NONE
@@ -781,7 +781,7 @@ CONTAINS
 !! \param space_id Dataspace identifier.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Sset_extent_none(hid_t space_id);
+!! See C API: @ref H5Sset_extent_none()
 !!
   SUBROUTINE h5sset_extent_none_f(space_id, hdferr)
     IMPLICIT NONE
@@ -814,7 +814,7 @@ CONTAINS
 !! \param stride   Array with hyperslab strides.
 !! \param block    Array with hyperslab block sizes.
 !!
-!! See C API: @ref herr_t H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[], const hsize_t stride[], const hsize_t count[], const hsize_t block[]);
+!! See C API: @ref H5Sselect_hyperslab()
 !!
   SUBROUTINE h5sselect_hyperslab_f(space_id, OPERATOR, start, count, &
        hdferr, stride, BLOCK)
@@ -1157,7 +1157,7 @@ CONTAINS
 !!                 \li H5S_SEL_ALL_F
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref H5S_sel_type H5Sget_select_type(hid_t spaceid);
+!! See C API: @ref H5Sget_select_type()
 !!
   SUBROUTINE h5sget_select_type_f(space_id, TYPE, hdferr)
     IMPLICIT NONE
@@ -1187,7 +1187,7 @@ CONTAINS
 !! \param obj_id Object ID.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref hid_t H5Sdecode(const void *buf);
+!! See C API: @ref H5Sdecode()
 !!
   SUBROUTINE h5sdecode_f(buf, obj_id, hdferr)
     IMPLICIT NONE
@@ -1218,7 +1218,7 @@ CONTAINS
 !! \param hdferr  \fortran_error
 !! \param fapl_id File access property list identifier.
 !!
-!! See C API: @ref herr_t H5Sencode2(hid_t obj_id, void *buf, size_t *nalloc, hid_t fapl);
+!! See C API: @ref H5Sencode2()
 !!
   SUBROUTINE h5sencode_f(obj_id, buf, nalloc, hdferr, fapl_id)
     IMPLICIT NONE
@@ -1258,7 +1258,7 @@ CONTAINS
 !! \param Equal     .TRUE. if equal, .FALSE. if unequal.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref htri_t H5Sextent_equal(hid_t space1_id, hid_t space2_id);
+!! See C API: @ref H5Sextent_equal()
 !!
   SUBROUTINE h5sextent_equal_f(space1_id, space2_id, equal, hdferr)
     IMPLICIT NONE
@@ -1296,7 +1296,7 @@ CONTAINS
 !! \param block    Size of a block in the regular hyperslab.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref htri_t H5Sget_regular_hyperslab(hid_t spaceid, hsize_t start[], hsize_t stride[], hsize_t count[], hsize_t block[]);
+!! See C API: @ref H5Sget_regular_hyperslab()
 !!
   SUBROUTINE h5sget_regular_hyperslab_f(space_id, start, stride, count, block, hdferr)
 
@@ -1352,7 +1352,7 @@ CONTAINS
 !! \param IsRegular TRUE or FALSE for hyperslab selection if successful.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref htri_t H5Sis_regular_hyperslab(hid_t spaceid);
+!! See C API: @ref H5Sis_regular_hyperslab()
 !!
   SUBROUTINE h5sis_regular_hyperslab_f(space_id, IsRegular, hdferr)
     IMPLICIT NONE
diff --git a/fortran/src/H5Tff.F90 b/fortran/src/H5Tff.F90
index bb088f5..60630b7 100644
--- a/fortran/src/H5Tff.F90
+++ b/fortran/src/H5Tff.F90
@@ -73,7 +73,7 @@ CONTAINS
 !! \param hdferr  \fortran_error
 !! \param tapl_id Datatype access property list identifier.
 !!
-!! See C API: @ref hid_t H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id);
+!! See C API: @ref H5Topen2()
 !!
   SUBROUTINE h5topen_f(loc_id, name, type_id, hdferr, tapl_id)
     IMPLICIT NONE
@@ -118,7 +118,7 @@ CONTAINS
 !! \param tcpl_id Datatype creation property list.
 !! \param tapl_id Datatype access property list.
 !!
-!! See C API: @ref herr_t H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id);
+!! See C API: @ref H5Tcommit2()
 !!
   SUBROUTINE h5tcommit_f(loc_id, name, type_id, hdferr, &
        lcpl_id, tcpl_id, tapl_id  )
@@ -176,7 +176,7 @@ CONTAINS
 !! \param new_type_id Identifier of datatype's copy.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref hid_t H5Tcopy(hid_t type_id);
+!! See C API: @ref H5Tcopy()
 !!
   SUBROUTINE h5tcopy_f(type_id, new_type_id, hdferr)
     IMPLICIT NONE
@@ -203,7 +203,7 @@ CONTAINS
 !! \param flag     TRUE/FALSE flag to indicate if two datatypes are equal.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref htri_t H5Tequal(hid_t type1_id, hid_t type2_id);
+!! See C API: @ref H5Tequal()
 !!
   SUBROUTINE h5tequal_f(type1_id, type2_id, flag, hdferr)
     IMPLICIT NONE
@@ -234,7 +234,7 @@ CONTAINS
 !! \param type_id Datatype identifier.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tclose(hid_t type_id);
+!! See C API: @ref H5Tclose()
 !!
   SUBROUTINE h5tclose_f(type_id, hdferr)
     IMPLICIT NONE
@@ -271,7 +271,7 @@ CONTAINS
 !!                \li H5T_ARRAY_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref H5T_class_t H5Tget_class(hid_t type_id);
+!! See C API: @ref H5Tget_class()
 !!
   SUBROUTINE h5tget_class_f(type_id, class, hdferr)
     IMPLICIT NONE
@@ -298,7 +298,7 @@ CONTAINS
 !! \param size    Datatype size.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref size_t H5Tget_size(hid_t type_id);
+!! See C API: @ref H5Tget_size()
 !!
   SUBROUTINE h5tget_size_f(type_id, size, hdferr)
     IMPLICIT NONE
@@ -326,7 +326,7 @@ CONTAINS
 !! \param size    Size of the datatype.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tset_size(hid_t type_id, size_t size);
+!! See C API: @ref H5Tset_size()
 !!
   SUBROUTINE h5tset_size_f(type_id, size, hdferr)
     IMPLICIT NONE
@@ -357,7 +357,7 @@ CONTAINS
 !!                \li H5T_ORDER_VAX_F (not implemented yet)
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref H5T_order_t H5Tget_order(hid_t type_id);
+!! See C API: @ref H5Tget_order()
 !!
   SUBROUTINE h5tget_order_f(type_id, order, hdferr)
     IMPLICIT NONE
@@ -388,7 +388,7 @@ CONTAINS
 !!                \li H5T_ORDER_VAX_F (not implemented yet)
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tset_order(hid_t type_id, H5T_order_t order);
+!! See C API: @ref H5Tset_order()
 !!
   SUBROUTINE h5tset_order_f(type_id, order, hdferr)
     IMPLICIT NONE
@@ -417,7 +417,7 @@ CONTAINS
 !! \param precision Precision of the datatype.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref size_t H5Tget_precision(hid_t type_id);
+!! See C API: @ref H5Tget_precision()
 !!
   SUBROUTINE h5tget_precision_f(type_id, PRECISION, hdferr)
     IMPLICIT NONE
@@ -445,7 +445,7 @@ CONTAINS
 !! \param precision Datatype precision.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Tset_precision(hid_t type_id, size_t prec);
+!! See C API: @ref H5Tset_precision()
 !!
   SUBROUTINE h5tset_precision_f(type_id, PRECISION, hdferr)
     IMPLICIT NONE
@@ -473,7 +473,7 @@ CONTAINS
 !! \param offset  Offset value.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref int H5Tget_offset(hid_t type_id);
+!! See C API: @ref H5Tget_offset()
 !!
   SUBROUTINE h5tget_offset_f(type_id, offset, hdferr)
     IMPLICIT NONE
@@ -501,7 +501,7 @@ CONTAINS
 !! \param offset  Offset value.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tset_offset(hid_t type_id, size_t offset);
+!! See C API: @ref H5Tset_offset()
 !!
   SUBROUTINE h5tset_offset_f(type_id, offset, hdferr)
     IMPLICIT NONE
@@ -535,7 +535,7 @@ CONTAINS
 !!                \li H5T_PAD_NPAD_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tget_pad(hid_t type_id, H5T_pad_t *lsb , H5T_pad_t *msb);
+!! See C API: @ref H5Tget_pad()
 !!
   SUBROUTINE h5tget_pad_f(type_id, lsbpad, msbpad, hdferr)
     IMPLICIT NONE
@@ -571,7 +571,7 @@ CONTAINS
 !!                \li H5T_PAD_NPAD_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tset_pad(hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb);
+!! See C API: @ref H5Tset_pad()
 !!
   SUBROUTINE h5tset_pad_f(type_id, lsbpad, msbpad, hdferr)
     IMPLICIT NONE
@@ -607,7 +607,7 @@ CONTAINS
 !!                     H5T_SGN_ERROR_F = -1
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref H5T_sign_t H5Tget_sign(hid_t type_id);
+!! See C API: @ref H5Tget_sign()
 !!
   SUBROUTINE h5tget_sign_f(type_id, sign, hdferr)
     IMPLICIT NONE
@@ -642,7 +642,7 @@ CONTAINS
 !!                     H5T_SGN_ERROR_F = -1
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Tset_sign(hid_t type_id, H5T_sign_t sign);
+!! See C API: @ref H5Tset_sign()
 !!
   SUBROUTINE h5tset_sign_f(type_id, sign, hdferr)
     IMPLICIT NONE
@@ -674,7 +674,7 @@ CONTAINS
 !! \param msize   Size of mantissa in bits.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tget_fields(hid_t type_id, size_t *spos , size_t *epos, size_t *esize, size_t *mpos, size_t *msize);
+!! See C API: @ref H5Tget_fields()
 !!
   SUBROUTINE h5tget_fields_f(type_id, spos, epos, esize, mpos, msize, hdferr)
     IMPLICIT NONE
@@ -716,7 +716,7 @@ CONTAINS
 !! \param msize   Size of mantissa in bits.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tset_fields(hid_t type_id, size_t spos, size_t epos, size_t esize, size_t mpos, size_t msize);
+!! See C API: @ref H5Tset_fields()
 !!
   SUBROUTINE h5tset_fields_f(type_id, spos, epos, esize, mpos, msize, hdferr)
     IMPLICIT NONE
@@ -754,7 +754,7 @@ CONTAINS
 !! \param ebias   Datatype exponent bias.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref size_t H5Tget_ebias(hid_t type_id);
+!! See C API: @ref H5Tget_ebias()
 !!
   SUBROUTINE h5tget_ebias_f(type_id, ebias, hdferr)
     IMPLICIT NONE
@@ -783,7 +783,7 @@ CONTAINS
 !! \param ebias   Datatype exponent bias.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tset_ebias(hid_t type_id, size_t ebias);
+!! See C API: @ref H5Tset_ebias()
 !!
   SUBROUTINE h5tset_ebias_f(type_id, ebias, hdferr)
     IMPLICIT NONE
@@ -814,7 +814,7 @@ CONTAINS
 !!                \li H5T_NORM_NONE_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref H5T_norm_t H5Tget_norm(hid_t type_id);
+!! See C API: @ref H5Tget_norm()
 !!
   SUBROUTINE h5tget_norm_f(type_id, norm, hdferr)
     IMPLICIT NONE
@@ -846,7 +846,7 @@ CONTAINS
 !!                \li H5T_NORM_NONE_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tset_norm(hid_t type_id, H5T_norm_t norm);
+!! See C API: @ref H5Tset_norm()
 !!
   SUBROUTINE h5tset_norm_f(type_id, norm, hdferr)
     IMPLICIT NONE
@@ -877,7 +877,7 @@ CONTAINS
 !!                \li H5T_PAD_BACKGROUND_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref H5T_pad_t H5Tget_inpad(hid_t type_id);
+!! See C API: @ref H5Tget_inpad()
 !!
   SUBROUTINE h5tget_inpad_f(type_id, padtype, hdferr)
     IMPLICIT NONE
@@ -908,7 +908,7 @@ CONTAINS
 !!                \li H5T_PAD_BACKGROUND_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tset_inpad(hid_t type_id, H5T_pad_t pad);
+!! See C API: @ref H5Tset_inpad()
 !!
   SUBROUTINE h5tset_inpad_f(type_id, padtype, hdferr)
     IMPLICIT NONE
@@ -938,7 +938,7 @@ CONTAINS
 !!                \li H5T_CSET_UTF8_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref H5T_cset_t H5Tget_cset(hid_t type_id);
+!! See C API: @ref H5Tget_cset()
 !!
   SUBROUTINE h5tget_cset_f(type_id, cset, hdferr)
     IMPLICIT NONE
@@ -968,7 +968,7 @@ CONTAINS
 !!                \li H5T_CSET_UTF8_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tset_cset(hid_t type_id, H5T_cset_t cset);
+!! See C API: @ref H5Tset_cset()
 !!
   SUBROUTINE h5tset_cset_f(type_id, cset, hdferr)
     IMPLICIT NONE
@@ -999,7 +999,7 @@ CONTAINS
 !!                \li H5T_STR_ERROR_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref H5T_str_t H5Tget_strpad(hid_t type_id);
+!! See C API: @ref H5Tget_strpad()
 !!
   SUBROUTINE h5tget_strpad_f(type_id, strpad, hdferr)
     IMPLICIT NONE
@@ -1031,7 +1031,7 @@ CONTAINS
 !!                \li H5T_STR_ERROR_F
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tset_strpad(hid_t type_id, H5T_str_t strpad);
+!! See C API: @ref H5Tset_strpad()
 !!
   SUBROUTINE h5tset_strpad_f(type_id, strpad, hdferr)
     IMPLICIT NONE
@@ -1059,7 +1059,7 @@ CONTAINS
 !! \param num_members Number of members.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref int H5Tget_nmembers(hid_t type_id);
+!! See C API: @ref H5Tget_nmembers()
 !!
   SUBROUTINE h5tget_nmembers_f(type_id, num_members, hdferr)
     IMPLICIT NONE
@@ -1089,7 +1089,7 @@ CONTAINS
 !! \param namelen     Name length.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref char* H5Tget_member_name(hid_t type_id, unsigned membno);
+!! See C API: @ref H5Tget_member_name()
 !!
   SUBROUTINE h5tget_member_name_f(type_id, index, member_name,  namelen, hdferr)
     IMPLICIT NONE
@@ -1123,7 +1123,7 @@ CONTAINS
 !! \param offset    Byte offset of the requested field.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref size_t H5Tget_member_offset(hid_t type_id, unsigned membno);
+!! See C API: @ref H5Tget_member_offset()
 !!
   SUBROUTINE h5tget_member_offset_f(type_id, member_no, offset, hdferr)
     IMPLICIT NONE
@@ -1153,7 +1153,7 @@ CONTAINS
 !! \param index   Based index of the filed or member (0 to N-1).
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref int H5Tget_member_index(hid_t type_id, const char *name);
+!! See C API: @ref H5Tget_member_index()
 !!
   SUBROUTINE h5tget_member_index_f(type_id, name, index, hdferr)
     IMPLICIT NONE
@@ -1188,7 +1188,7 @@ CONTAINS
 !! \param dims    Buffer to store array datatype dimensions.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref int H5Tget_array_dims2(hid_t type_id, hsize_t dims[]);
+!! See C API: @ref H5Tget_array_dims2()
 !!
   SUBROUTINE h5tget_array_dims_f(type_id, dims, hdferr)
     IMPLICIT NONE
@@ -1217,7 +1217,7 @@ CONTAINS
 !! \param ndims   Number of array dimensions.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref int H5Tget_array_ndims(hid_t type_id);
+!! See C API: @ref H5Tget_array_ndims()
 !!
   SUBROUTINE h5tget_array_ndims_f(type_id, ndims, hdferr)
     IMPLICIT NONE
@@ -1246,7 +1246,7 @@ CONTAINS
 !! \param base_type_id Identifier of the base type.
 !! \param hdferr       \fortran_error
 !!
-!! See C API: @ref hid_t H5Tget_super(hid_t type);
+!! See C API: @ref H5Tget_super()
 !!
   SUBROUTINE h5tget_super_f(type_id, base_type_id, hdferr)
     IMPLICIT NONE
@@ -1276,7 +1276,7 @@ CONTAINS
 !! \param datatype  Identifier of the member's datatype.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref hid_t H5Tget_member_type(hid_t type_id, unsigned membno);
+!! See C API: @ref H5Tget_member_type()
 !!
   SUBROUTINE h5tget_member_type_f(type_id,  field_idx, datatype, hdferr)
     IMPLICIT NONE
@@ -1312,7 +1312,7 @@ CONTAINS
 !! \param type_id Datatype identifier.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref hid_t H5Tcreate(H5T_class_t type, size_t size);
+!! See C API: @ref H5Tcreate()
 !!
   SUBROUTINE h5tcreate_f(class, size, type_id, hdferr)
     IMPLICIT NONE
@@ -1344,7 +1344,7 @@ CONTAINS
 !! \param field_id Datatype identifier of the field to insert.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref herr_t H5Tinsert(hid_t parent_id, const char *name, size_t offset, hid_t member_id);
+!! See C API: @ref H5Tinsert()
 !!
   SUBROUTINE h5tinsert_f(type_id,  name, offset, field_id, hdferr)
     IMPLICIT NONE
@@ -1380,7 +1380,7 @@ CONTAINS
 !! \param type_id Compound datatype identifier.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tpack(hid_t type_id);
+!! See C API: @ref H5Tpack()
 !!
   SUBROUTINE h5tpack_f(type_id, hdferr)
     IMPLICIT NONE
@@ -1443,7 +1443,7 @@ CONTAINS
 !! \param type_id Array datatype identifier.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref hid_t H5Tarray_create2(hid_t base_id, unsigned ndims, const hsize_t dim[]);
+!! See C API: @ref H5Tarray_create2()
 !!
   SUBROUTINE h5tarray_create_f(base_id, rank, dims, type_id, hdferr)
     IMPLICIT NONE
@@ -1476,7 +1476,7 @@ CONTAINS
 !! \param new_type_id Datatype identifier for the enumeration datatype.
 !! \param hdferr      \fortran_error
 !!
-!! See C API: @ref hid_t H5Tenum_create(hid_t base_id);
+!! See C API: @ref H5Tenum_create()
 !!
   SUBROUTINE h5tenum_create_f(parent_id, new_type_id, hdferr)
     IMPLICIT NONE
@@ -1506,7 +1506,7 @@ CONTAINS
 !! \param name    Buffer to hold symbol name.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tenum_nameof(hid_t type, const void *value, char *name , size_t size);
+!! See C API: @ref H5Tenum_nameof()
 !!
   SUBROUTINE h5tenum_nameof_f(type_id,  value, namelen, name, hdferr)
     IMPLICIT NONE
@@ -1541,7 +1541,7 @@ CONTAINS
 !! \param value   Value of the enumeration datatype.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tenum_valueof(hid_t type, const char *name, void *value );
+!! See C API: @ref H5Tenum_valueof()
 !!
   SUBROUTINE h5tenum_valueof_f(type_id,  name, value, hdferr)
     IMPLICIT NONE
@@ -1578,7 +1578,7 @@ CONTAINS
 !! \param value     Value of the enumeration datatype.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref herr_t H5Tget_member_value(hid_t type_id, unsigned membno, void *value );
+!! See C API: @ref H5Tget_member_value()
 !!
   SUBROUTINE h5tget_member_value_f(type_id,  member_no, value, hdferr)
     IMPLICIT NONE
@@ -1609,7 +1609,7 @@ CONTAINS
 !! \param tag     Unique ASCII string with which the opaque datatype is to be tagged.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref herr_t H5Tset_tag(hid_t type, const char *tag);
+!! See C API: @ref H5Tset_tag()
 !!
   SUBROUTINE h5tset_tag_f(type_id, tag, hdferr)
     IMPLICIT NONE
@@ -1643,7 +1643,7 @@ CONTAINS
 !! \param taglen  Length of tag.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref char* H5Tget_tag(hid_t type);
+!! See C API: @ref H5Tget_tag()
 !!
   SUBROUTINE h5tget_tag_f(type_id, tag,taglen, hdferr)
     IMPLICIT NONE
@@ -1678,7 +1678,7 @@ CONTAINS
 !! \param vltype_id Identifier for VL datatype.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref hid_t H5Tvlen_create(hid_t base_id);
+!! See C API: @ref H5Tvlen_create()
 !!
   SUBROUTINE h5tvlen_create_f(type_id, vltype_id, hdferr)
     IMPLICIT NONE
@@ -1706,7 +1706,7 @@ CONTAINS
 !! \param status  Flag to indicate if datatype is a variable string ( TRUE or FALSE).
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref htri_t H5Tis_variable_str(hid_t type_id);
+!! See C API: @ref H5Tis_variable_str()
 !!
   SUBROUTINE h5tis_variable_str_f(type_id, status, hdferr)
     IMPLICIT NONE
@@ -1753,7 +1753,7 @@ CONTAINS
 !!                  \li H5T_ARRAY_F
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref H5T_class_t H5Tget_member_class(hid_t type_id, unsigned membno);
+!! See C API: @ref H5Tget_member_class()
 !!
   SUBROUTINE h5tget_member_class_f(type_id, member_no, class, hdferr)
     IMPLICIT NONE
@@ -1787,7 +1787,7 @@ CONTAINS
 !! \param tcpl_id  A datatype creation property list identifier (H5P_DEFAULT_F for the default property list.)
 !! \param tapl_id  A datatype access property list identifier should always be passed as the value H5P_DEFAULT_F.
 !!
-!! See C API: @ref herr_t H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t tapl_id);
+!! See C API: @ref H5Tcommit_anon()
 !!
   SUBROUTINE h5tcommit_anon_f(loc_id, dtype_id, hdferr, tcpl_id, tapl_id)
     IMPLICIT NONE
@@ -1831,7 +1831,7 @@ CONTAINS
 !! \param committed .TRUE. if the datatype has been committed, and .FALSE. if the datatype has not been committed.
 !! \param hdferr    \fortran_error
 !!
-!! See C API: @ref htri_t H5Tcommitted(hid_t type_id);
+!! See C API: @ref H5Tcommitted()
 !!
   SUBROUTINE h5tcommitted_f(dtype_id, committed, hdferr)
     IMPLICIT NONE
@@ -1869,7 +1869,7 @@ CONTAINS
 !! \param obj_id Object ID.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref hid_t H5Tdecode(const void *buf);
+!! See C API: @ref H5Tdecode()
 !!
   SUBROUTINE h5tdecode_f(buf, obj_id, hdferr)
     IMPLICIT NONE
@@ -1900,7 +1900,7 @@ CONTAINS
 !! \param nalloc If set to zero, returns the size of the buffer needed. Otherwise, it sets the size of \p buf allocated.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Tencode(hid_t obj_id, void *buf, size_t *nalloc);
+!! See C API: @ref H5Tencode()
 !!
   SUBROUTINE h5tencode_f(obj_id, buf, nalloc, hdferr)
     IMPLICIT NONE
@@ -1933,7 +1933,7 @@ CONTAINS
 !! \param dtpl_id  Datatype property list identifier.
 !! \param hdferr   \fortran_error
 !!
-!! See C API: @ref hid_t H5Tget_create_plist(hid_t type_id);
+!! See C API: @ref H5Tget_create_plist()
 !!
   SUBROUTINE h5tget_create_plist_f(dtype_id, dtpl_id, hdferr)
     IMPLICIT NONE
@@ -1962,7 +1962,7 @@ CONTAINS
 !! \param flag   .TRUE. for compiler conversion, .FALSE. for library conversion.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref htri_t H5Tcompiler_conv(hid_t src_id, hid_t dst_id);
+!! See C API: @ref H5Tcompiler_conv()
 !!
   SUBROUTINE h5tcompiler_conv_f(src_id, dst_id, flag, hdferr)
     IMPLICIT NONE
@@ -2003,7 +2003,7 @@ CONTAINS
 !! \param native_dtype_id The native datatype identifier for the specified dataset datatype.
 !! \param hdferr          \fortran_error
 !!
-!! See C API: @ref hid_t H5Tget_native_type(hid_t type_id, H5T_direction_t direction);
+!! See C API: @ref H5Tget_native_type()
 !!
   SUBROUTINE h5tget_native_type_f(dtype_id, direction, native_dtype_id, hdferr)
     IMPLICIT NONE
@@ -2037,7 +2037,7 @@ CONTAINS
 !! \param background Background buffer.
 !! \param plist_id   Dataset transfer property list identifier.
 !!
-!! See C API: @ref herr_t H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, void *background, hid_t plist_id);
+!! See C API: @ref H5Tconvert()
 !!
   SUBROUTINE h5tconvert_f(src_id, dst_id, nelmts, buf, hdferr, background, plist_id)
     IMPLICIT NONE
@@ -2089,7 +2089,7 @@ CONTAINS
 !! \param hdferr  \fortran_error
 !!
 #ifdef H5_DOXYGEN_FORTRAN
-!! See C API: @ref herr_t H5Tenum_insert(hid_t type, const char *name, const void *value);
+!! See C API: @ref H5Tenum_insert()
 !!
   SUBROUTINE h5tenum_insert_f(&
 #else
@@ -2137,7 +2137,7 @@ CONTAINS
 !! \param hdferr  \fortran_error
 !!
 #ifdef H5_DOXYGEN_FORTRAN
-!! See C API: @ref herr_t H5Tenum_insert(hid_t type, const char *name, const void *value);
+!! See C API: @ref H5Tenum_insert()
 !!
   SUBROUTINE h5tenum_insert_f(type_id,  name, value, hdferr)
 #else
diff --git a/fortran/src/H5VLff.F90 b/fortran/src/H5VLff.F90
index 237e30d..da92979 100644
--- a/fortran/src/H5VLff.F90
+++ b/fortran/src/H5VLff.F90
@@ -58,7 +58,7 @@ CONTAINS
 !! \param hdferr  \fortran_error
 !! \param vipl_id VOL initialization property list identifier.
 !!
-!! See C API: @ref hid_t H5VLregister_connector_by_name(const char *connector_name, hid_t vipl_id);
+!! See C API: @ref H5VLregister_connector_by_name()
 !!
   SUBROUTINE H5VLregister_connector_by_name_f(name, vol_id, hdferr, vipl_id)
     IMPLICIT NONE
@@ -99,7 +99,7 @@ CONTAINS
 !! \param hdferr          \fortran_error
 !! \param vipl_id         VOL initialization property list identifier.
 !!
-!! See C API: @ref hid_t H5VLregister_connector_by_value(H5VL_class_value_t connector_value, hid_t vipl_id);
+!! See C API: @ref H5VLregister_connector_by_value()
 !!
   SUBROUTINE H5VLregister_connector_by_value_f(connector_value, vol_id, hdferr, vipl_id)
     IMPLICIT NONE
@@ -138,7 +138,7 @@ CONTAINS
 !! \param registered State of VOL class registration.
 !! \param hdferr     \fortran_error
 !!
-!! See C API: @ref htri_t H5VLis_connector_registered_by_name(const char *name);
+!! See C API: @ref H5VLis_connector_registered_by_name()
 !!
   SUBROUTINE H5VLis_connector_registered_by_name_f(name, registered,  hdferr)
     IMPLICIT NONE
@@ -175,7 +175,7 @@ CONTAINS
 !! \param registered State of VOL class registration.
 !! \param hdferr Retu\fortran_error
 !!
-!! See C API: @ref htri_t H5VLis_connector_registered_by_value(H5VL_class_value_t connector_value);
+!! See C API: @ref H5VLis_connector_registered_by_value()
 !!
   SUBROUTINE H5VLis_connector_registered_by_value_f(value, registered,  hdferr)
     IMPLICIT NONE
@@ -209,7 +209,7 @@ CONTAINS
 !! \param vol_id Connector id.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref hid_t H5VLget_connector_id(hid_t obj_id);
+!! See C API: @ref H5VLget_connector_id()
 !!
   SUBROUTINE H5VLget_connector_id_f(obj_id, vol_id, hdferr)
     IMPLICIT NONE
@@ -242,7 +242,7 @@ CONTAINS
 !! \param vol_id Connector id.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref hid_t H5VLget_connector_id_by_name(const char *name);
+!! See C API: @ref H5VLget_connector_id_by_name()
 !!
   SUBROUTINE H5VLget_connector_id_by_name_f(name, vol_id, hdferr)
     IMPLICIT NONE
@@ -279,7 +279,7 @@ CONTAINS
 !! \param vol_id Connector id.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref hid_t H5VLget_connector_id_by_value(H5VL_class_value_t connector_value);
+!! See C API: @ref H5VLget_connector_id_by_value()
 !!
   SUBROUTINE H5VLget_connector_id_by_value_f(value, vol_id, hdferr)
     IMPLICIT NONE
@@ -313,7 +313,7 @@ CONTAINS
 !! \param hdferr   \fortran_error
 !! \param name_len Maximum length of the name to retrieve.
 !!
-!! See C API: @ref ssize_t H5VLget_connector_name(hid_t id, char *name , size_t size);
+!! See C API: @ref H5VLget_connector_name()
 !!
   SUBROUTINE H5VLget_connector_name_f(obj_id, name, hdferr, name_len)
     IMPLICIT NONE
@@ -358,7 +358,7 @@ CONTAINS
 !! \param vol_id A valid identifier of the connectory to unregister.
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5VLclose(hid_t connector_id);
+!! See C API: @ref H5VLclose()
 !!
   SUBROUTINE H5VLclose_f(vol_id, hdferr)
     IMPLICIT NONE
@@ -384,7 +384,7 @@ CONTAINS
 !! \param plugin_id A valid identifier of the connector to unregister..
 !! \param hdferr Ret\fortran_error
 !!
-!! See C API: @ref herr_t H5VLunregister_connector(hid_t connector_id);
+!! See C API: @ref H5VLunregister_connector()
 !!
   SUBROUTINE H5VLunregister_connector_f(plugin_id, hdferr)
     IMPLICIT NONE
diff --git a/fortran/src/H5Zff.F90 b/fortran/src/H5Zff.F90
index 42b3841..071a2eb 100644
--- a/fortran/src/H5Zff.F90
+++ b/fortran/src/H5Zff.F90
@@ -56,7 +56,7 @@ CONTAINS
 !!               \li H5Z_FILTER_FLETCHER32_F
 !! \param hdferr \fortran_error
 !!
-!! See C API: @ref herr_t H5Zunregister(H5Z_filter_t id);
+!! See C API: @ref H5Zunregister()
 !!
   SUBROUTINE h5zunregister_f(filter, hdferr)
     IMPLICIT NONE
@@ -85,7 +85,7 @@ CONTAINS
 !! \param status  Flag; .TRUE. if filter is available, .FALSE. otherwise.
 !! \param hdferr  \fortran_error
 !!
-!! See C API: @ref htri_t H5Zfilter_avail(H5Z_filter_t id);
+!! See C API: @ref H5Zfilter_avail()
 !!
   SUBROUTINE h5zfilter_avail_f(filter, status, hdferr)
     IMPLICIT NONE
@@ -125,7 +125,7 @@ CONTAINS
 !!                     \li H5Z_FILTER_DECODE_ENABLED_F
 !! \param hdferr       \fortran_error
 !!
-!! See C API: @ref herr_t H5Zget_filter_info(H5Z_filter_t filter, unsigned int *filter_config_flags);
+!! See C API: @ref H5Zget_filter_info()
 !!
   SUBROUTINE h5zget_filter_info_f(filter, config_flags, hdferr)
     IMPLICIT NONE
diff --git a/hl/fortran/src/H5DSff.F90 b/hl/fortran/src/H5DSff.F90
index 73d62b1..f3c069a 100644
--- a/hl/fortran/src/H5DSff.F90
+++ b/hl/fortran/src/H5DSff.F90
@@ -50,7 +50,7 @@ CONTAINS
 !! \param errcode \fortran_error
 !! \param dimname The dimension name
 !!
-!! See C API: @ref herr_t H5DSset_scale(hid_t dsid, const char *dimname);
+!! See C API: @ref H5DSset_scale()
 !!
   SUBROUTINE H5DSset_scale_f( dsid, errcode, dimname)
 
@@ -93,7 +93,7 @@ CONTAINS
 !! \param idx     The dimension of \p did that \p dsid is associated with.
 !! \param errcode \fortran_error
 !!
-!! See C API: @ref herr_t H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx);
+!! See C API: @ref H5DSattach_scale()
 !!
   SUBROUTINE H5DSattach_scale_f( did, dsid, idx, errcode)
 
@@ -133,7 +133,7 @@ CONTAINS
 !! \param errcode \fortran_error
 !!
 
-!! See C API: @ref herr_t H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx);
+!! See C API: @ref H5DSdetach_scale()
 !!
   SUBROUTINE H5DSdetach_scale_f( did, dsid, idx, errcode)
 
@@ -173,7 +173,7 @@ CONTAINS
 !! \param is_attached If dimension scale \p dsid is currently attached to dimension \p idx of dataset \p did.
 !! \param errcode     \fortran_error
 !!
-!! See C API: @ref  htri_t H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx);
+!! See C API: @ref H5DSis_attached()
 !!
   SUBROUTINE H5DSis_attached_f( did, dsid, idx, is_attached, errcode)
 
@@ -224,7 +224,7 @@ CONTAINS
 !! \param is_scale    If is a Dimension Scale.
 !! \param errcode     \fortran_error
 !!
-!! See C API: @ref  htri_t H5DSis_scale(hid_t did);
+!! See C API: @ref H5DSis_scale()
 !!
   SUBROUTINE H5DSis_scale_f( did, is_scale, errcode)
 
@@ -266,7 +266,7 @@ CONTAINS
 !! \param label   The label.
 !! \param errcode \fortran_error
 !!
-!! See C API: @ref herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label);
+!! See C API: @ref H5DSset_label()
 !!
   SUBROUTINE H5DSset_label_f( did, idx, label, errcode)
 
@@ -311,7 +311,7 @@ CONTAINS
 !! \param size    The length of the \p label buffer.
 !! \param errcode \fortran_error
 !!
-!! See C API: @ref ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size);
+!! See C API: @ref H5DSget_label()
 !!
   SUBROUTINE H5DSget_label_f( did, idx, label, size, errcode)
 
@@ -353,7 +353,7 @@ CONTAINS
 !! \param size    Size in bytes, of the name buffer.
 !! \param errcode \fortran_error
 !!
-!! See C API: @ref ssize_t H5DSget_scale_name(hid_t did, char *name, size_t size);
+!! See C API: @ref H5DSget_scale_name()
 !!
   SUBROUTINE H5DSget_scale_name_f(did, name, size, errcode)
 
@@ -390,7 +390,7 @@ CONTAINS
 !! \param num_scales Number of Dimension Scales associated with \p did.
 !! \param errcode    \fortran_error
 !!
-!! See C API: @ref int H5DSget_num_scales(hid_t did, unsigned int idx);
+!! See C API: @ref H5DSget_num_scales()
 !!
   SUBROUTINE H5DSget_num_scales_f( did, idx, num_scales, errcode)
 
diff --git a/hl/fortran/src/H5IMff.F90 b/hl/fortran/src/H5IMff.F90
index d8d5366..9f5c68e 100644
--- a/hl/fortran/src/H5IMff.F90
+++ b/hl/fortran/src/H5IMff.F90
@@ -51,7 +51,7 @@ CONTAINS
 !! \param buf       Buffer with data to be written to the dataset
 !! \param errcode   \fortran_error
 !!
-!! See C API: @ref herr_t H5IMmake_image_8bit(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t height, const unsigned char *buffer);
+!! See C API: @ref H5IMmake_image_8bit()
 !!
   SUBROUTINE h5immake_image_8bit_f(loc_id,&
        dset_name,&
@@ -100,7 +100,7 @@ CONTAINS
 !! \param buf       Buffer with data to store the image.
 !! \param errcode   \fortran_error
 !!
-!! See C API: @ref herr_t H5IMread_image(hid_t loc_id, const char *dset_name, unsigned char *buffer);
+!! See C API: @ref H5IMread_image()
 !!
   SUBROUTINE h5imread_image_f(loc_id,&
        dset_name,&
@@ -146,7 +146,7 @@ CONTAINS
 !! \param buf       Buffer with data to be written to the dataset.
 !! \param errcode   \fortran_error
 !!
-!! See C API: @ref herr_t H5IMmake_image_24bit(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t height, const char *interlace, const unsigned char *buffer);
+!! See C API: @ref H5IMmake_image_24bit()
 !!
   SUBROUTINE h5immake_image_24bit_f(loc_id, dset_name, width, height, il, buf, errcode)
 
@@ -200,7 +200,7 @@ CONTAINS
 !! \param npals     The number of palettes associated to the image.
 !! \param errcode   \fortran_error
 !!
-!! See C API: @ref herr_t H5IMget_image_info(hid_t loc_id, const char *dset_name, hsize_t *width, hsize_t *height, hsize_t *planes, char *interlace, hssize_t *npals);
+!! See C API: @ref H5IMget_image_info()
 !!
   SUBROUTINE h5imget_image_info_f(loc_id,&
        dset_name,&
@@ -256,7 +256,7 @@ CONTAINS
 !! \param loc_id    Location identifier. The identifier may be that of a file or group.
 !! \param dset_name The name of the dataset.
 !!
-!! See C API: @ref herr_t H5IMis_image(hid_t loc_id, const char *dset_name);
+!! See C API: @ref H5IMis_image()
 !!
   INTEGER FUNCTION h5imis_image_f(loc_id, dset_name)
 
@@ -296,7 +296,7 @@ CONTAINS
 !! \param pal_data Buffer with data to be written to the dataset.
 !! \param errcode  \fortran_error
 !!
-!! See C API: @ref herr_t H5IMmake_palette(hid_t loc_id, const char *pal_name, const hsize_t *pal_dims, const unsigned char *pal_data);
+!! See C API: @ref H5IMmake_palette()
 !!
   SUBROUTINE h5immake_palette_f(loc_id,&
        pal_name,&
@@ -342,7 +342,7 @@ CONTAINS
 !! \param pal_name   The name of the palette.
 !! \param errcode    \fortran_error
 !!
-!! See C API: @ref herr_t H5IMlink_palette(hid_t loc_id, const char *image_name, const char *pal_name);
+!! See C API: @ref H5IMlink_palette()
 !!
   SUBROUTINE h5imlink_palette_f(loc_id,&
        image_name,&
@@ -388,7 +388,7 @@ CONTAINS
 !! \param pal_name   The name of the palette.
 !! \param errcode    \fortran_error
 !!
-!! See C API: @ref herr_t H5IMunlink_palette(hid_t loc_id, const char *image_name, const char *pal_name);
+!! See C API: @ref H5IMunlink_palette()
 !!
   SUBROUTINE h5imunlink_palette_f(loc_id,&
        image_name,&
@@ -434,7 +434,7 @@ CONTAINS
 !! \param npals      The number of palettes.
 !! \param errcode    \fortran_error
 !!
-!! See C API: @ref herr_t H5IMget_npalettes(hid_t loc_id, const char *image_name, hssize_t *npals);
+!! See C API: @ref H5IMget_npalettes()
 !!
   SUBROUTINE h5imget_npalettes_f(loc_id,&
        image_name,&
@@ -478,7 +478,7 @@ CONTAINS
 !! \param pal_dims   The dimensions of the palette dataset.
 !! \param  errcode   \fortran_error
 !!
-!! See C API: @ref herr_t H5IMget_palette_info(hid_t loc_id, const char *image_name, int pal_number, hsize_t *pal_dims);
+!! See C API: @ref H5IMget_palette_info()
 !!
   SUBROUTINE h5imget_palette_info_f(loc_id,&
        image_name,&
@@ -525,7 +525,7 @@ CONTAINS
 !! \param pal_data   The palette dataset.
 !! \param errcode    \fortran_error
 !!
-!! See C API: @ref herr_t H5IMget_palette_info(hid_t loc_id, const char *image_name, int pal_number, hsize_t *pal_dims);
+!! See C API: @ref H5IMget_palette_info()
 !!
   SUBROUTINE h5imget_palette_f(loc_id,&
        image_name,&
@@ -569,7 +569,7 @@ CONTAINS
 !! \param loc_id    Location identifier. The identifier may be that of a file or group.
 !! \param dset_name The name of the dataset.
 !!
-!! See C API: @ref herr_t H5IMis_palette(hid_t loc_id, const char *dset_name);
+!! See C API: @ref H5IMis_palette()
 !!
   INTEGER FUNCTION h5imis_palette_f(loc_id, dset_name)
 
diff --git a/hl/fortran/src/H5LTff.F90 b/hl/fortran/src/H5LTff.F90
index 2469dbb..f5fa703 100644
--- a/hl/fortran/src/H5LTff.F90
+++ b/hl/fortran/src/H5LTff.F90
@@ -136,7 +136,7 @@ CONTAINS
   !!
   !! \brief Creates and writes a dataset of a type \p type_id.
   !!
-  !! \note  \fortran_approved
+  !! \attention  \fortran_approved
   !!
   !! \param loc_id    Location identifier. The identifier may be that of a file or group.
   !! \param dset_name The name of the dataset to create.
@@ -146,7 +146,7 @@ CONTAINS
   !! \param buf       Buffer with data to be written to the dataset.
   !! \param errcode   \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTmake_dataset(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims, hid_t type_id, const void *buffer);
+  !! See C API: @ref H5LTmake_dataset()
   !!
   SUBROUTINE h5ltmake_dataset_f(&
 #else
@@ -185,7 +185,7 @@ CONTAINS
   !!
   !! \brief Creates and writes a dataset of a type \p type_id.
   !!
-  !! \note \fortran_obsolete
+  !! \attention \fortran_obsolete
   !!
   !! \param loc_id    Location identifier. The identifier may be that of a file or group.
   !! \param dset_name The name of the dataset to create.
@@ -195,7 +195,7 @@ CONTAINS
   !! \param buf       Buffer with data to be written to the dataset.
   !! \param errcode   \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTmake_dataset(hid_t loc_id, const char *dset_name, int rank, const hsize_t *dims, hid_t type_id, const void *buffer);
+  !! See C API: @ref H5LTmake_dataset()
   !!
    SUBROUTINE h5ltmake_dataset_f(&
 #else
@@ -381,7 +381,7 @@ CONTAINS
   !!
   !! \brief Reads a dataset of a type \p type_id.
   !!
-  !! \note \fortran_approved
+  !! \attention \fortran_approved
   !!
   !! \param loc_id    Location identifier. The identifier may be that of a file or group.
   !! \param dset_name The name of the dataset to create.
@@ -389,7 +389,7 @@ CONTAINS
   !! \param buf       Buffer with data to be written to the dataset.
   !! \param errcode   \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTread_dataset(hid_t loc_id, const char *dset_name, hid_t type_id, void *buffer);
+  !! See C API: @ref H5LTread_dataset()
   !!
   SUBROUTINE h5ltread_dataset_f(&
 #else
@@ -423,7 +423,7 @@ CONTAINS
   !!
   !! \brief Reads a dataset of a type \p type_id.
   !!
-  !! \note \fortran_obsolete
+  !! \attention \fortran_obsolete
   !!
   !! \param loc_id    Location identifier. The identifier may be that of a file or group.
   !! \param dset_name The name of the dataset to create.
@@ -432,7 +432,7 @@ CONTAINS
   !! \param dims      An array of the size of each dimension. Limited to seven dimensions.
   !! \param errcode   \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTread_dataset(hid_t loc_id, const char *dset_name, hid_t type_id, void *buffer);
+  !! See C API: @ref H5LTread_dataset()
   !!
    SUBROUTINE h5ltread_dataset_f(&
 #else
@@ -1050,7 +1050,7 @@ CONTAINS
   !! \brief Creates and writes an attribute and is a generic replacement for data type specific
   !!        Fortran h5ltset_attribute_*_f APIs. There is no C equivalent API.
   !!
-  !! \note  \fortran_approved
+  !! \attention  \fortran_approved
   !!
   !! \param loc_id          Location identifier. The identifier may be that of a file or group.
   !! \param dset_name       The name of the dataset to create.
@@ -1107,7 +1107,7 @@ CONTAINS
   !!
   !! \brief Creates and writes an attribute.
   !!
-  !! \note  \fortran_obsolete
+  !! \attention  \fortran_obsolete
   !!
   !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
   !! \param obj_name  The name of the object to attach the attribute.
@@ -1117,7 +1117,7 @@ CONTAINS
   !!                  This value is used by H5Screate_simple() to create the dataspace.
   !! \param errcode   \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTset_attribute_int(hid_t loc_id, const char *obj_name, const char *attr_name, const int *buffer, size_t size);
+  !! See C API: @ref H5LTset_attribute_int()
   !!
   SUBROUTINE h5ltset_attribute_int_f(loc_id,&
        obj_name,&
@@ -1158,7 +1158,7 @@ CONTAINS
   !!
   !! \brief Creates and writes an attribute.
   !!
-  !! \note  \fortran_obsolete
+  !! \attention  \fortran_obsolete
   !!
   !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
   !! \param obj_name  The name of the object to attach the attribute.
@@ -1168,7 +1168,7 @@ CONTAINS
   !!                  This value is used by H5Screate_simple() to create the dataspace.
   !! \param errcode   \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTset_attribute_float(hid_t loc_id, const char *obj_name, const char *attr_name, const float *buffer, size_t size);
+  !! See C API: @ref H5LTset_attribute_float()
   !!
   SUBROUTINE h5ltset_attribute_float_f(loc_id,&
        obj_name,&
@@ -1208,7 +1208,7 @@ CONTAINS
   !!
   !! \brief Creates and writes an attribute.
   !!
-  !! \note  \fortran_obsolete
+  !! \attention  \fortran_obsolete
   !!
   !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
   !! \param obj_name  The name of the object to attach the attribute.
@@ -1218,7 +1218,7 @@ CONTAINS
   !!                  This value is used by H5Screate_simple() to create the dataspace.
   !! \param errcode   \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTset_attribute_double(hid_t loc_id, const char *obj_name, const char *attr_name, const double *buffer, size_t size);
+  !! See C API: @ref H5LTset_attribute_double()
   !!
   SUBROUTINE h5ltset_attribute_double_f(loc_id,&
        obj_name,&
@@ -1259,7 +1259,7 @@ CONTAINS
   !!
   !! \brief Creates and writes an attribute.
   !!
-  !! \note  \fortran_obsolete
+  !! \attention  \fortran_obsolete
   !!
   !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
   !! \param obj_name  The name of the object to attach the attribute.
@@ -1267,7 +1267,7 @@ CONTAINS
   !! \param buf       Buffer with data to be written to the attribute.
   !! \param errcode   \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTset_attribute_string(hid_t loc_id, const char *obj_name, const char *attr_name, const char *attr_data);
+  !! See C API: @ref H5LTset_attribute_string()
   !!
   SUBROUTINE h5ltset_attribute_string_f(loc_id,&
        obj_name,&
@@ -1307,7 +1307,7 @@ CONTAINS
   !!
   !! \brief Reads an attribute from disk.
   !!
-  !! \note  \fortran_approved
+  !! \attention  \fortran_approved
   !!
   !! \param loc_id          Location identifier. The identifier may be that of a file or group.
   !! \param obj_name        The name of the object that the attribute is attached to.
@@ -1318,7 +1318,7 @@ CONTAINS
   !! \param SizeOf_buf_type Size of \p buf's data type, in bytes.
   !! \param errcode         \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTget_attribute(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t mem_type_id, void *data);
+  !! See C API: @ref H5LTget_attribute()
   !!
   SUBROUTINE h5ltget_attribute_f(loc_id,&
        obj_name,&
@@ -1359,7 +1359,7 @@ CONTAINS
   !!
   !! \brief Reads an attribute from disk.
   !!
-  !! \note  \fortran_obsolete
+  !! \attention  \fortran_obsolete
   !!
   !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
   !! \param obj_name  The name of the object that the attribute is attached to.
@@ -1367,7 +1367,7 @@ CONTAINS
   !! \param buf       Buffer with data to be written to the attribute.
   !! \param errcode   \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTget_attribute_int(hid_t loc_id, const char *obj_name, const char *attr_name, int *data);
+  !! See C API: @ref H5LTget_attribute_int()
   !!
   SUBROUTINE h5ltget_attribute_int_f(loc_id,&
        obj_name,&
@@ -1404,7 +1404,7 @@ CONTAINS
   !!
   !! \brief Reads an attribute from disk.
   !!
-  !! \note  \fortran_obsolete
+  !! \attention  \fortran_obsolete
   !!
   !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
   !! \param obj_name  The name of the object that the attribute is attached to.
@@ -1412,7 +1412,7 @@ CONTAINS
   !! \param buf       Buffer with data to be written to the attribute.
   !! \param errcode   \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTget_attribute_float(hid_t loc_id, const char *obj_name, const char *attr_name, float *data);
+  !! See C API: @ref H5LTget_attribute_float()
   !!
   SUBROUTINE h5ltget_attribute_float_f(loc_id,&
        obj_name,&
@@ -1448,7 +1448,7 @@ CONTAINS
   !!
   !! \brief Reads an attribute from disk.
   !!
-  !! \note  \fortran_obsolete
+  !! \attention  \fortran_obsolete
   !!
   !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
   !! \param obj_name  The name of the object that the attribute is attached to.
@@ -1456,7 +1456,7 @@ CONTAINS
   !! \param buf       Buffer with data to be written to the attribute.
   !! \param errcode   \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTget_attribute_double(hid_t loc_id, const char *obj_name, const char *attr_name, double *data);
+  !! See C API: @ref H5LTget_attribute_double()
   !!
   SUBROUTINE h5ltget_attribute_double_f(loc_id,&
        obj_name,&
@@ -1493,7 +1493,7 @@ CONTAINS
   !!
   !! \brief Reads an attribute from disk.
   !!
-  !! \note  \fortran_obsolete
+  !! \attention  \fortran_obsolete
   !!
   !! \param loc_id    Identifier of the object (dataset or group) to create the attribute within
   !! \param obj_name  The name of the object that the attribute is attached to.
@@ -1501,7 +1501,7 @@ CONTAINS
   !! \param buf       Buffer with data to be written to the attribute.
   !! \param errcode   \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTget_attribute_string(hid_t loc_id, const char *obj_name, const char *attr_name, char *data);
+  !! See C API: @ref H5LTget_attribute_string()
   !!
   SUBROUTINE h5ltget_attribute_string_f(loc_id,&
        obj_name,&
@@ -1557,7 +1557,7 @@ CONTAINS
   !! \param rank      The dimensionality of the dataset.
   !! \param errcode   \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTget_dataset_ndims(hid_t loc_id, const char *dset_name, int *rank);
+  !! See C API: @ref H5LTget_dataset_ndims()
   !!
   SUBROUTINE h5ltget_dataset_ndims_f(loc_id,&
        dset_name,&
@@ -1599,7 +1599,7 @@ CONTAINS
   !!
   !! \result Returns zero (false), a positive (true) or a negative (failure) value.
   !!
-  !! See C API: @ref herr_t H5LTfind_dataset(hid_t loc_id, const char *name);
+  !! See C API: @ref H5LTfind_dataset()
   !!
   INTEGER FUNCTION h5ltfind_dataset_f(loc_id, dset_name)
 
@@ -1639,7 +1639,7 @@ CONTAINS
   !! \param type_size  The size of the datatype in bytes.
   !! \param errcode    \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTget_dataset_info(hid_t loc_id, const char *dset_name, hsize_t *dims, H5T_class_t *type_class, size_t *type_size);
+  !! See C API: @ref H5LTget_dataset_info()
   !!
   SUBROUTINE h5ltget_dataset_info_f(loc_id,&
        dset_name,&
@@ -1693,7 +1693,7 @@ CONTAINS
   !! \param rank       The dimensionality of the attribute.
   !! \param errcode    \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTget_attribute_ndims(hid_t loc_id, const char *obj_name, const char *attr_name, int *rank);
+  !! See C API: @ref H5LTget_attribute_ndims()
   !!
   SUBROUTINE h5ltget_attribute_ndims_f(loc_id,&
        obj_name,&
@@ -1744,7 +1744,7 @@ CONTAINS
   !! \param type_size  The size of the datatype in bytes.
   !! \param errcode    \fortran_error
   !!
-  !! See C API: @ref herr_t H5LTget_attribute_info(hid_t loc_id, const char *obj_name, const char *attr_name, hsize_t *dims, H5T_class_t *type_class, size_t *type_size);
+  !! See C API: @ref H5LTget_attribute_info()
   !!
   SUBROUTINE h5ltget_attribute_info_f(loc_id,&
        obj_name,&
@@ -1799,7 +1799,7 @@ CONTAINS
   !! \param path_valid          Object status.
   !! \param errcode             \fortran_error
   !!
-  !! See C API: @ref htri_t H5LTpath_valid(hid_t loc_id, const char *path, hbool_t check_object_valid);
+  !! See C API: @ref H5LTpath_valid()
   !!
   SUBROUTINE h5ltpath_valid_f(loc_id, path, check_object_valid, path_valid, errcode)
 
diff --git a/hl/fortran/src/H5TBff.F90 b/hl/fortran/src/H5TBff.F90
index 9985ab8..4798f2e 100644
--- a/hl/fortran/src/H5TBff.F90
+++ b/hl/fortran/src/H5TBff.F90
@@ -201,7 +201,7 @@ CONTAINS
 !!
 !! \brief Creates (DOES NOT WRITE) a dataset named \p dset_name attached to the object specified by the identifier \p loc_id.
 !!
-!! \note  \fortran_obsolete
+!! \attention  \fortran_obsolete
 !!
 !! \param table_title   The title of the table.
 !! \param loc_id        Location identifier. The identifier may be that of a file or group.
@@ -216,7 +216,7 @@ CONTAINS
 !! \param compress      Flag that turns compression on or off.
 !! \param errcode       \fortran_error
 !!
-!! See C API: @ref herr_t H5TBmake_table(const char *table_title, hid_t loc_id, const char *dset_name, hsize_t nfields, hsize_t nrecords, size_t type_size, const char *field_names[], const size_t *field_offset, const hid_t *field_types, hsize_t chunk_size, void *fill_data, int compress, const void *buf);
+!! See C API: @ref H5TBmake_table()
 !!
 #ifdef H5_DOXYGEN_FORTRAN
   SUBROUTINE h5tbmake_table_f(&
@@ -318,7 +318,7 @@ CONTAINS
 !!
 !! \brief Creates and writes a dataset named \p dset_name attached to the object specified by the identifier \p loc_id.
 !!
-!! \note  \fortran_approved
+!! \attention  \fortran_approved
 !!
 !! \param table_title   The title of the table
 !! \param loc_id        Location identifier. The identifier may be that of a file or group.
@@ -335,7 +335,7 @@ CONTAINS
 !! \param data	        Buffer with data to be written to the table
 !! \param errcode       \fortran_error
 !!
-!! See C API: @ref herr_t H5TBmake_table(const char *table_title, hid_t loc_id, const char *dset_name, hsize_t nfields, hsize_t nrecords, size_t type_size, const char *field_names[], const size_t *field_offset, const hid_t *field_types, hsize_t chunk_size, void *fill_data, int compress, const void *buf);
+!! See C API: @ref H5TBmake_table()
 !!
 #ifdef H5_DOXYGEN_FORTRAN
   SUBROUTINE h5tbmake_table_f(&
@@ -454,7 +454,7 @@ CONTAINS
 !! \param dst_buf    Pointer to buffer with data.
 !! \param errcode    \fortran_error
 !!
-!! See C API: @ref herr_t H5TBread_table(hid_t loc_id, const char *dset_name, size_t dst_size, const size_t *dst_offset, const size_t *dst_sizes, void *dst_buf);
+!! See C API: @ref H5TBread_table()
 !!
   SUBROUTINE h5tbread_table_f(loc_id, dset_name, nfields, dst_size, dst_offset, &
        dst_sizes, dst_buf, errcode)
@@ -525,7 +525,7 @@ CONTAINS
 !! \param buf         Buffer with data.
 !! \param errcode     \fortran_error
 !!
-!! See similar C API: @ref herr_t H5TBwrite_fields_name(hid_t loc_id, const char *dset_name, const char *field_names, hsize_t start, hsize_t nrecords, size_t type_size, const size_t *field_offset, const size_t *dst_sizes, const void *buf);
+!! See similar C API: @ref H5TBwrite_fields_name()
 !!
   SUBROUTINE h5tbwrite_field_name_f(&
 #else
@@ -617,7 +617,7 @@ CONTAINS
 !! \param buf         Buffer with data
 !! \param errcode     \fortran_error
 !!
-!! See similar C API: @ref herr_t H5TBread_fields_name(hid_t loc_id, const char *dset_name, const char *field_names, hsize_t start, hsize_t nrecords, size_t type_size, const size_t *field_offset, const size_t *dst_sizes, void *buf);
+!! See similar C API: @ref H5TBread_fields_name()
 !!
   SUBROUTINE h5tbread_field_name_f(&
 #else
@@ -711,7 +711,7 @@ CONTAINS
 !! \param buf	       Buffer with data.
 !! \param errcode      \fortran_error
 !!
-!! See similar C API: herr_t H5TBwrite_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields, const int *field_index, hsize_t start, hsize_t nrecords, size_t type_size, const size_t *field_offset, const size_t *dst_sizes, const void *buf);
+!! See similar C API: @ref H5TBwrite_fields_index()
 !!
   SUBROUTINE h5tbwrite_field_index_f(&
 #else
@@ -799,7 +799,7 @@ CONTAINS
 !! \param buf          Buffer with data.
 !! \param errcode      \fortran_error
 !!
-!! See similar C API: herr_t H5TBread_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields, const int *field_index, hsize_t start, hsize_t nrecords, size_t type_size, const size_t *field_offset, const size_t *dst_sizes,void *buf);
+!! See similar C API: @ref H5TBread_fields_index()
 !!
   SUBROUTINE h5tbread_field_index_f(&
 #else
@@ -884,7 +884,7 @@ CONTAINS
 !! \param buf	     Buffer with data.
 !! \param errcode    \fortran_error
 !!
-!! See C API: @ref herr_t H5TBinsert_field(hid_t loc_id, const char *dset_name, const char *field_name, hid_t field_type, hsize_t position, const void *fill_data, const void *buf);
+!! See C API: @ref H5TBinsert_field()
 !!
   SUBROUTINE h5tbinsert_field_f(&
 #else
@@ -968,7 +968,7 @@ CONTAINS
 !! \param field_name	The name of the field to delete.
 !! \param errcode       \fortran_error
 !!
-!! See C API: @ref herr_t H5TBdelete_field(hid_t loc_id, const char *dset_name, const char *field_name);
+!! See C API: @ref H5TBdelete_field()
 !!
   SUBROUTINE h5tbdelete_field_f(loc_id,&
        dset_name,&
@@ -1015,7 +1015,7 @@ CONTAINS
 !! \param nrecords  The number of records.
 !! \param errcode   \fortran_error
 !!
-!! See C API: @ref herr_t H5TBget_table_info(hid_t loc_id, const char *dset_name, hsize_t *nfields, hsize_t *nrecords);
+!! See C API: @ref H5TBget_table_info()
 !!
   SUBROUTINE h5tbget_table_info_f(loc_id,&
        dset_name,&
@@ -1066,7 +1066,7 @@ CONTAINS
 !! \param errcode       \fortran_error
 !! \param maxlen_out    Maximum character length of the field names.
 !!
-!! See C API: @ref herr_t H5TBget_field_info(hid_t loc_id, const char *dset_name, char *field_names[], size_t *field_sizes, size_t *field_offsets, size_t *type_size);
+!! See C API: @ref H5TBget_field_info()
 !!
   SUBROUTINE h5tbget_field_info_f(loc_id,&
        dset_name,&