diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 079d0277a43..31cb0f714f4 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -3504,37 +3504,6 @@ h5pget_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags)
     ret_value = 0;
     return ret_value;
 }
-/****if* H5Pf/h5pset_link_creation_order_c
- * NAME
- *  h5pset_link_creation_order_c
- * PURPOSE
- *  Calls H5Pset_link_creation_order
- *
- * INPUTS
- *  gcpl_id         - Group creation property list identifier
- *  crt_order_flags - Creation order flag(s)
- * OUTPUTS
- *
- * RETURNS
- *  0 on success, -1 on failure
- * SOURCE
- */
-int_f
-h5pset_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags)
-/******/
-{
-    int    ret_value = -1;
-    herr_t ret;
-    /*
-     * Call H5Pset_link_creation_order function.
-     */
-    ret = H5Pset_link_creation_order((hid_t)*gcpl_id, (unsigned)*crt_order_flags);
-    if (ret < 0)
-        return ret_value;
-
-    ret_value = 0;
-    return ret_value;
-}
 
 /****if* H5Pf/h5pget_link_phase_change_c
  * NAME
@@ -3682,45 +3651,6 @@ h5pset_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group)
     return ret_value;
 }
 
-/****if* H5Pf/h5pget_link_creation_order_c
- * NAME
- *  h5pget_link_creation_order_c
- * PURPOSE
- *  Calls H5Pget_link_creation_order
- *
- * INPUTS
- *
- *  gcpl_id - Group creation property list identifier
- * OUTPUTS
- *
- *  crt_order_flags - Creation order flag(s)
- *
- * RETURNS
- *  0 on success, -1 on failure
- * SOURCE
- */
-int_f
-h5pget_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags)
-/******/
-{
-    int    ret_value = -1;
-    herr_t ret;
-
-    unsigned c_crt_order_flags;
-    /*
-     * Call h5pget_link_creation_order function.
-     */
-
-    ret = H5Pget_link_creation_order((hid_t)*gcpl_id, &c_crt_order_flags);
-    if (ret < 0)
-        return ret_value;
-
-    *crt_order_flags = (int_f)c_crt_order_flags;
-
-    ret_value = 0;
-    return ret_value;
-}
-
 /****if* H5Pf/h5pset_char_encoding_c
  * NAME
  *  h5pset_char_encoding_c
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index 7e73ac2255a..41529a17180 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -3470,17 +3470,17 @@ SUBROUTINE h5pset_link_creation_order_f(gcpl_id, crt_order_flags, hdferr)
     INTEGER, INTENT(IN) :: crt_order_flags
     INTEGER, INTENT(OUT) :: hdferr
     INTERFACE
-       INTEGER FUNCTION h5pset_link_creation_order_c(gcpl_id, crt_order_flags) &
-            BIND(C,NAME='h5pset_link_creation_order_c')
-         IMPORT :: HID_T
+       INTEGER FUNCTION h5pset_link_creation_order(gcpl_id, crt_order_flags) &
+            BIND(C,NAME='H5Pset_link_creation_order')
+         IMPORT :: HID_T, C_INT
          IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: gcpl_id
-         INTEGER, INTENT(IN) :: crt_order_flags
+         INTEGER(HID_T), VALUE :: gcpl_id
+         INTEGER(C_INT), VALUE :: crt_order_flags
 
-       END FUNCTION H5pset_link_creation_order_c
+       END FUNCTION H5pset_link_creation_order
     END INTERFACE
 
-    hdferr = h5pset_link_creation_order_c(gcpl_id, crt_order_flags)
+    hdferr = h5pset_link_creation_order(gcpl_id, INT(crt_order_flags, C_INT))
 
   END SUBROUTINE h5pset_link_creation_order_f
 
@@ -3634,18 +3634,21 @@ SUBROUTINE h5pget_link_creation_order_f(gcpl_id, crt_order_flags, hdferr)
     INTEGER(HID_T), INTENT(IN) :: gcpl_id
     INTEGER, INTENT(OUT) :: crt_order_flags
     INTEGER, INTENT(OUT) :: hdferr
+
+    INTEGER(C_INT) :: c_crt_order_flags
     INTERFACE
-       INTEGER FUNCTION h5pget_link_creation_order_c(gcpl_id, crt_order_flags) &
-            BIND(C,NAME='h5pget_link_creation_order_c')
-         IMPORT :: HID_T
+       INTEGER FUNCTION h5pget_link_creation_order(gcpl_id, crt_order_flags) &
+            BIND(C,NAME='H5Pget_link_creation_order')
+         IMPORT :: HID_T, C_INT
          IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: gcpl_id
-         INTEGER, INTENT(OUT) :: crt_order_flags
+         INTEGER(HID_T), VALUE :: gcpl_id
+         INTEGER(C_INT) :: crt_order_flags
 
-       END FUNCTION H5pget_link_creation_order_c
+       END FUNCTION H5pget_link_creation_order
     END INTERFACE
 
-    hdferr = h5pget_link_creation_order_c(gcpl_id, crt_order_flags)
+    hdferr = h5pget_link_creation_order(gcpl_id, c_crt_order_flags)
+    crt_order_flags = INT(c_crt_order_flags)
 
   END SUBROUTINE h5pget_link_creation_order_f