diff --git a/config/ompi_config_files.m4 b/config/ompi_config_files.m4
index 274b404d75d..24e3143419d 100644
--- a/config/ompi_config_files.m4
+++ b/config/ompi_config_files.m4
@@ -1,8 +1,8 @@
 # -*- shell-script -*-
 #
 # Copyright (c) 2009-2017 Cisco Systems, Inc.  All rights reserved
-# Copyright (c) 2017-2018 Research Organization for Information Science
-#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2017-2019 Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # Copyright (c) 2018      Los Alamos National Security, LLC. All rights
 #                         reserved.
 # Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
@@ -38,6 +38,7 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
         ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-file-interfaces.h
         ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-removed-interfaces.h
         ompi/mpi/fortran/use-mpi-f08/Makefile
+        ompi/mpi/fortran/use-mpi-f08/profile/Makefile
         ompi/mpi/fortran/use-mpi-f08/bindings/Makefile
         ompi/mpi/fortran/use-mpi-f08/mod/Makefile
         ompi/mpi/fortran/mpiext-use-mpi/Makefile
diff --git a/ompi/mpi/fortran/base/fint_2_int.h b/ompi/mpi/fortran/base/fint_2_int.h
index 44ce1289567..3583711b428 100644
--- a/ompi/mpi/fortran/base/fint_2_int.h
+++ b/ompi/mpi/fortran/base/fint_2_int.h
@@ -47,6 +47,7 @@
   #define OMPI_SINGLE_FINT_2_INT(in)
   #define OMPI_SINGLE_INT_2_FINT(in)
   #define OMPI_ARRAY_INT_2_FINT(in, n)
+  #define OMPI_COND_STATEMENT(a)
 
 #elif OMPI_SIZEOF_FORTRAN_INTEGER > SIZEOF_INT
   #define OMPI_ARRAY_NAME_DECL(a) int *c_##a
@@ -105,6 +106,8 @@
       } \
       free(OMPI_ARRAY_NAME_CONVERT(in)); \
     } while (0)
+
+  #define OMPI_COND_STATEMENT(a) a
 #else /* int > MPI_Fint  */
   #define OMPI_ARRAY_NAME_DECL(a) int *c_##a
   #define OMPI_2_DIM_ARRAY_NAME_DECL(a, dim2) int (*c_##a)[dim2], dim2_index
@@ -157,6 +160,7 @@
       free(OMPI_ARRAY_NAME_CONVERT(in)); \
     } while (0)
 
+  #define OMPI_COND_STATEMENT(a) a
 #endif
 
 /*
diff --git a/ompi/mpi/fortran/mpif-h/allgather_f.c b/ompi/mpi/fortran/mpif-h/allgather_f.c
index 1e9c56caaf9..559df38d485 100644
--- a/ompi/mpi/fortran/mpif-h/allgather_f.c
+++ b/ompi/mpi/fortran/mpif-h/allgather_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -73,13 +74,16 @@ void ompi_allgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
 {
     int ierr_c;
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype;
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
+    if (OMPI_COMM_IS_INTER(c_comm) || !OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+        c_sendtype = PMPI_Type_f2c(*sendtype);
+    } else {
+        sendbuf = MPI_IN_PLACE;
+    }
     c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpi/fortran/mpif-h/allgatherv_f.c b/ompi/mpi/fortran/mpif-h/allgatherv_f.c
index 7917136c0f1..c6d611761aa 100644
--- a/ompi/mpi/fortran/mpif-h/allgatherv_f.c
+++ b/ompi/mpi/fortran/mpif-h/allgatherv_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -72,20 +73,28 @@ void ompi_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
 		      MPI_Fint *recvtype, MPI_Fint *comm, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
-    int size, ierr_c;
+    MPI_Datatype c_sendtype = NULL, c_recvtype;
+    int ierr_c;
+    OMPI_COND_STATEMENT(int size);
     OMPI_ARRAY_NAME_DECL(recvcounts);
     OMPI_ARRAY_NAME_DECL(displs);
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        OMPI_COND_STATEMENT(size = ompi_comm_remote_size(c_comm));
+    } else {
+        OMPI_COND_STATEMENT(size = ompi_comm_size(c_comm));
+        if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+            sendbuf = MPI_IN_PLACE;
+        } else {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    }
     c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    PMPI_Comm_size(c_comm, &size);
     OMPI_ARRAY_FINT_2_INT(recvcounts, size);
     OMPI_ARRAY_FINT_2_INT(displs, size);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpi/fortran/mpif-h/alltoall_f.c b/ompi/mpi/fortran/mpif-h/alltoall_f.c
index 2934fe97e49..b025d8aebdd 100644
--- a/ompi/mpi/fortran/mpif-h/alltoall_f.c
+++ b/ompi/mpi/fortran/mpif-h/alltoall_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -73,13 +74,18 @@ void ompi_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
 {
     int c_ierr;
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype;
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
+
+    if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+        sendbuf = MPI_IN_PLACE;
+    } else {
+        c_sendtype = PMPI_Type_f2c(*sendtype);
+    }
+
     c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpi/fortran/mpif-h/alltoallv_f.c b/ompi/mpi/fortran/mpif-h/alltoallv_f.c
index 3b7b588c5e7..04630d97a37 100644
--- a/ompi/mpi/fortran/mpif-h/alltoallv_f.c
+++ b/ompi/mpi/fortran/mpif-h/alltoallv_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -73,39 +74,45 @@ void ompi_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls,
 		     MPI_Fint *comm, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
-    int size, c_ierr;
+    MPI_Datatype c_sendtype = NULL, c_recvtype;
+    int c_ierr;
     OMPI_ARRAY_NAME_DECL(sendcounts);
     OMPI_ARRAY_NAME_DECL(sdispls);
     OMPI_ARRAY_NAME_DECL(recvcounts);
     OMPI_ARRAY_NAME_DECL(rdispls);
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
+    OMPI_COND_STATEMENT(int size = OMPI_COMM_IS_INTER(c_comm)?ompi_comm_remote_size(c_comm):ompi_comm_size(c_comm));
+
+    if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+        sendbuf = MPI_IN_PLACE;
+    } else {
+        c_sendtype = PMPI_Type_f2c(*sendtype);
+        OMPI_ARRAY_FINT_2_INT(sendcounts, size);
+        OMPI_ARRAY_FINT_2_INT(sdispls, size);
+    }
 
-    PMPI_Comm_size(c_comm, &size);
-    OMPI_ARRAY_FINT_2_INT(sendcounts, size);
-    OMPI_ARRAY_FINT_2_INT(sdispls, size);
+    c_recvtype = PMPI_Type_f2c(*recvtype);
     OMPI_ARRAY_FINT_2_INT(recvcounts, size);
     OMPI_ARRAY_FINT_2_INT(rdispls, size);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
     c_ierr = PMPI_Alltoallv(sendbuf,
-                           OMPI_ARRAY_NAME_CONVERT(sendcounts),
-                           OMPI_ARRAY_NAME_CONVERT(sdispls),
-                           c_sendtype,
-                           recvbuf,
-                           OMPI_ARRAY_NAME_CONVERT(recvcounts),
-                           OMPI_ARRAY_NAME_CONVERT(rdispls),
-                           c_recvtype, c_comm);
+                            OMPI_ARRAY_NAME_CONVERT(sendcounts),
+                            OMPI_ARRAY_NAME_CONVERT(sdispls),
+                            c_sendtype,
+                            recvbuf,
+                            OMPI_ARRAY_NAME_CONVERT(recvcounts),
+                            OMPI_ARRAY_NAME_CONVERT(rdispls),
+                            c_recvtype, c_comm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
-    OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts);
-    OMPI_ARRAY_FINT_2_INT_CLEANUP(sdispls);
+    if (MPI_IN_PLACE != sendbuf) {
+        OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts);
+        OMPI_ARRAY_FINT_2_INT_CLEANUP(sdispls);
+    }
     OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts);
     OMPI_ARRAY_FINT_2_INT_CLEANUP(rdispls);
 }
diff --git a/ompi/mpi/fortran/mpif-h/alltoallw_f.c b/ompi/mpi/fortran/mpif-h/alltoallw_f.c
index 55b782a7928..bb7ee99dee6 100644
--- a/ompi/mpi/fortran/mpif-h/alltoallw_f.c
+++ b/ompi/mpi/fortran/mpif-h/alltoallw_f.c
@@ -11,7 +11,7 @@
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2015-2019 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -85,7 +85,9 @@ void ompi_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts,
     c_comm = PMPI_Comm_f2c(*comm);
     size = OMPI_COMM_IS_INTER(c_comm)?ompi_comm_remote_size(c_comm):ompi_comm_size(c_comm);
 
-    if (!OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+    if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+        sendbuf = MPI_IN_PLACE;
+    } else {
         c_sendtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype));
         OMPI_ARRAY_FINT_2_INT(sendcounts, size);
         OMPI_ARRAY_FINT_2_INT(sdispls, size);
diff --git a/ompi/mpi/fortran/mpif-h/gather_f.c b/ompi/mpi/fortran/mpif-h/gather_f.c
index 0019d17d1c9..9fa3947435a 100644
--- a/ompi/mpi/fortran/mpif-h/gather_f.c
+++ b/ompi/mpi/fortran/mpif-h/gather_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -71,15 +72,29 @@ void ompi_gather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
 		  char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype,
 		  MPI_Fint *root, MPI_Fint *comm, MPI_Fint *ierr)
 {
-    int c_ierr;
+    int c_root, c_ierr;
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype = NULL;
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
+    c_root = OMPI_FINT_2_INT(*root);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        if (MPI_ROOT == c_root) {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        } else if (MPI_PROC_NULL != c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    } else {
+        if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+            sendbuf = MPI_IN_PLACE;
+        } else {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+        if (ompi_comm_rank(c_comm) == c_root) {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        }
+    }
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
@@ -87,7 +102,7 @@ void ompi_gather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
                         c_sendtype, recvbuf,
                         OMPI_FINT_2_INT(*recvcount),
                         c_recvtype,
-                        OMPI_FINT_2_INT(*root),
+                        c_root,
                         c_comm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 }
diff --git a/ompi/mpi/fortran/mpif-h/gatherv_f.c b/ompi/mpi/fortran/mpif-h/gatherv_f.c
index ef235ebe686..e989dc764f4 100644
--- a/ompi/mpi/fortran/mpif-h/gatherv_f.c
+++ b/ompi/mpi/fortran/mpif-h/gatherv_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -73,20 +74,36 @@ void ompi_gatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
 		   MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
-    int size, c_ierr;
+    MPI_Datatype c_sendtype = NULL, c_recvtype = NULL;
+    int c_root, c_ierr;
     OMPI_ARRAY_NAME_DECL(recvcounts);
     OMPI_ARRAY_NAME_DECL(displs);
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
+    c_root = OMPI_FINT_2_INT(*root);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        if (MPI_ROOT == c_root) {
+            OMPI_COND_STATEMENT(int size = ompi_comm_remote_size(c_comm));
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+            OMPI_ARRAY_FINT_2_INT(recvcounts, size);
+            OMPI_ARRAY_FINT_2_INT(displs, size);
+        } else if (MPI_PROC_NULL != c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    } else {
+        if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+            sendbuf = MPI_IN_PLACE;
+        } else {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+        if (ompi_comm_rank(c_comm) == c_root) {
+            OMPI_COND_STATEMENT(int size = ompi_comm_size(c_comm));
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+            OMPI_ARRAY_FINT_2_INT(recvcounts, size);
+            OMPI_ARRAY_FINT_2_INT(displs, size);
+        }
+    }
 
-    PMPI_Comm_size(c_comm, &size);
-    OMPI_ARRAY_FINT_2_INT(recvcounts, size);
-    OMPI_ARRAY_FINT_2_INT(displs, size);
-
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpi/fortran/mpif-h/iallgather_f.c b/ompi/mpi/fortran/mpif-h/iallgather_f.c
index 6b61cc55522..c3532aada3e 100644
--- a/ompi/mpi/fortran/mpif-h/iallgather_f.c
+++ b/ompi/mpi/fortran/mpif-h/iallgather_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -74,13 +75,18 @@ void ompi_iallgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
     int ierr_c;
     MPI_Comm c_comm;
     MPI_Request c_req;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype = NULL;
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
+    if (!OMPI_COMM_IS_INTER(c_comm)) {
+        if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+            sendbuf = MPI_IN_PLACE;
+        } else {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    }
     c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpi/fortran/mpif-h/iallgatherv_f.c b/ompi/mpi/fortran/mpif-h/iallgatherv_f.c
index 19671fea103..a834d405053 100644
--- a/ompi/mpi/fortran/mpif-h/iallgatherv_f.c
+++ b/ompi/mpi/fortran/mpif-h/iallgatherv_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -73,21 +74,29 @@ void ompi_iallgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
                         MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype;
     MPI_Request c_request;
-    int size, ierr_c;
+    int ierr_c;
+    OMPI_COND_STATEMENT(int size);
     OMPI_ARRAY_NAME_DECL(recvcounts);
     OMPI_ARRAY_NAME_DECL(displs);
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        OMPI_COND_STATEMENT(size = ompi_comm_remote_size(c_comm));
+    } else {
+        OMPI_COND_STATEMENT(size = ompi_comm_size(c_comm));
+        if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+            sendbuf = MPI_IN_PLACE;
+        } else {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    }
     c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    PMPI_Comm_size(c_comm, &size);
     OMPI_ARRAY_FINT_2_INT(recvcounts, size);
     OMPI_ARRAY_FINT_2_INT(displs, size);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpi/fortran/mpif-h/ialltoall_f.c b/ompi/mpi/fortran/mpif-h/ialltoall_f.c
index 27b8ca4bd64..59e09c85d83 100644
--- a/ompi/mpi/fortran/mpif-h/ialltoall_f.c
+++ b/ompi/mpi/fortran/mpif-h/ialltoall_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -74,15 +75,17 @@ void ompi_ialltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
     int c_ierr;
     MPI_Comm c_comm;
     MPI_Request c_req;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype;
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
+    if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+        sendbuf = MPI_IN_PLACE;
+    } else {
+        c_sendtype = PMPI_Type_f2c(*sendtype);
+    }
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
-    sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
-    recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
+    c_recvtype = PMPI_Type_f2c(*recvtype);
+    c_sendtype = PMPI_Type_f2c(*sendtype);
 
     c_ierr = PMPI_Ialltoall(sendbuf,
                            OMPI_FINT_2_INT(*sendcount),
diff --git a/ompi/mpi/fortran/mpif-h/ialltoallv_f.c b/ompi/mpi/fortran/mpif-h/ialltoallv_f.c
index 0a447f5d5b6..5c0f9632e73 100644
--- a/ompi/mpi/fortran/mpif-h/ialltoallv_f.c
+++ b/ompi/mpi/fortran/mpif-h/ialltoallv_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -73,41 +74,47 @@ void ompi_ialltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls,
                        MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype;
     MPI_Request c_request;
-    int size, c_ierr;
+    int c_ierr;
     OMPI_ARRAY_NAME_DECL(sendcounts);
     OMPI_ARRAY_NAME_DECL(sdispls);
     OMPI_ARRAY_NAME_DECL(recvcounts);
     OMPI_ARRAY_NAME_DECL(rdispls);
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
+    OMPI_COND_STATEMENT(int size = OMPI_COMM_IS_INTER(c_comm)?ompi_comm_remote_size(c_comm):ompi_comm_size(c_comm));
+
+    if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+        sendbuf = MPI_IN_PLACE;
+    } else {
+        c_sendtype = PMPI_Type_f2c(*sendtype);
+        OMPI_ARRAY_FINT_2_INT(sendcounts, size);
+        OMPI_ARRAY_FINT_2_INT(sdispls, size);
+    }
 
-    PMPI_Comm_size(c_comm, &size);
-    OMPI_ARRAY_FINT_2_INT(sendcounts, size);
-    OMPI_ARRAY_FINT_2_INT(sdispls, size);
+    c_recvtype = PMPI_Type_f2c(*recvtype);
     OMPI_ARRAY_FINT_2_INT(recvcounts, size);
     OMPI_ARRAY_FINT_2_INT(rdispls, size);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
     c_ierr = PMPI_Ialltoallv(sendbuf,
-                            OMPI_ARRAY_NAME_CONVERT(sendcounts),
-                            OMPI_ARRAY_NAME_CONVERT(sdispls),
-                            c_sendtype,
-                            recvbuf,
-                            OMPI_ARRAY_NAME_CONVERT(recvcounts),
-                            OMPI_ARRAY_NAME_CONVERT(rdispls),
-                            c_recvtype, c_comm, &c_request);
+                             OMPI_ARRAY_NAME_CONVERT(sendcounts),
+                             OMPI_ARRAY_NAME_CONVERT(sdispls),
+                             c_sendtype,
+                             recvbuf,
+                             OMPI_ARRAY_NAME_CONVERT(recvcounts),
+                             OMPI_ARRAY_NAME_CONVERT(rdispls),
+                             c_recvtype, c_comm, &c_request);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
     if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request);
 
-    OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts);
-    OMPI_ARRAY_FINT_2_INT_CLEANUP(sdispls);
+    if (MPI_IN_PLACE != sendbuf) {
+        OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts);
+        OMPI_ARRAY_FINT_2_INT_CLEANUP(sdispls);
+    }
     OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts);
     OMPI_ARRAY_FINT_2_INT_CLEANUP(rdispls);
 }
diff --git a/ompi/mpi/fortran/mpif-h/ialltoallw_f.c b/ompi/mpi/fortran/mpif-h/ialltoallw_f.c
index 75f8262bef5..d6bc0a67be0 100644
--- a/ompi/mpi/fortran/mpif-h/ialltoallw_f.c
+++ b/ompi/mpi/fortran/mpif-h/ialltoallw_f.c
@@ -86,7 +86,9 @@ void ompi_ialltoallw_f(char *sendbuf, MPI_Fint *sendcounts,
     c_comm = PMPI_Comm_f2c(*comm);
     size = OMPI_COMM_IS_INTER(c_comm)?ompi_comm_remote_size(c_comm):ompi_comm_size(c_comm);
 
-    if (!OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+    if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+        sendbuf = MPI_IN_PLACE;
+    } else {
         c_sendtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype));
         OMPI_ARRAY_FINT_2_INT(sendcounts, size);
         OMPI_ARRAY_FINT_2_INT(sdispls, size);
@@ -102,7 +104,6 @@ void ompi_ialltoallw_f(char *sendbuf, MPI_Fint *sendcounts,
         c_recvtypes[i] = PMPI_Type_f2c(recvtypes[i]);
     }
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpi/fortran/mpif-h/igather_f.c b/ompi/mpi/fortran/mpif-h/igather_f.c
index f234581d0c3..3c97609cff2 100644
--- a/ompi/mpi/fortran/mpif-h/igather_f.c
+++ b/ompi/mpi/fortran/mpif-h/igather_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -72,16 +73,30 @@ void ompi_igather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
                     MPI_Fint *root, MPI_Fint *comm, MPI_Fint *request,
                     MPI_Fint *ierr)
 {
-    int c_ierr;
+    int c_root, c_ierr;
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype = NULL;
     MPI_Request c_request;
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
+    c_root = OMPI_FINT_2_INT(*root);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        if (MPI_ROOT == c_root) {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        } else if (MPI_PROC_NULL != c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    } else {
+        if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+            sendbuf = MPI_IN_PLACE;
+        } else {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+        if (ompi_comm_rank(c_comm) == c_root) {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        }
+    }
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpi/fortran/mpif-h/igatherv_f.c b/ompi/mpi/fortran/mpif-h/igatherv_f.c
index c367c2f4abf..19bb030908f 100644
--- a/ompi/mpi/fortran/mpif-h/igatherv_f.c
+++ b/ompi/mpi/fortran/mpif-h/igatherv_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -73,21 +74,37 @@ void ompi_igatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
                      MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype = NULL;
     MPI_Request c_request;
-    int size, c_ierr;
+    int c_root, c_ierr;
     OMPI_ARRAY_NAME_DECL(recvcounts);
     OMPI_ARRAY_NAME_DECL(displs);
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
+    c_root = OMPI_FINT_2_INT(*root);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        if (MPI_ROOT == c_root) {
+            OMPI_COND_STATEMENT(int size = ompi_comm_remote_size(c_comm));
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+            OMPI_ARRAY_FINT_2_INT(recvcounts, size);
+            OMPI_ARRAY_FINT_2_INT(displs, size);
+        } else if (MPI_PROC_NULL != c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    } else {
+        if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+            sendbuf = MPI_IN_PLACE;
+        } else {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+        if (ompi_comm_rank(c_comm) == c_root) {
+            OMPI_COND_STATEMENT(int size = ompi_comm_size(c_comm));
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+            OMPI_ARRAY_FINT_2_INT(recvcounts, size);
+            OMPI_ARRAY_FINT_2_INT(displs, size);
+        }
+    }
 
-    PMPI_Comm_size(c_comm, &size);
-    OMPI_ARRAY_FINT_2_INT(recvcounts, size);
-    OMPI_ARRAY_FINT_2_INT(displs, size);
-
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_allgather_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_allgather_f.c
index ecd0221187a..a00c6c17a6c 100644
--- a/ompi/mpi/fortran/mpif-h/ineighbor_allgather_f.c
+++ b/ompi/mpi/fortran/mpif-h/ineighbor_allgather_f.c
@@ -13,8 +13,8 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -83,7 +83,7 @@ void ompi_ineighbor_allgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *se
     c_sendtype = PMPI_Type_f2c(*sendtype);
     c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
+    /* Ineighbor_allgather does not support MPI_IN_PLACE */
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_allgatherv_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_allgatherv_f.c
index db30c7451a6..7b27e5fad00 100644
--- a/ompi/mpi/fortran/mpif-h/ineighbor_allgatherv_f.c
+++ b/ompi/mpi/fortran/mpif-h/ineighbor_allgatherv_f.c
@@ -13,8 +13,8 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -26,6 +26,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/mca/topo/base/base.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -78,23 +79,30 @@ void ompi_ineighbor_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *s
     MPI_Comm c_comm;
     MPI_Datatype c_sendtype, c_recvtype;
     MPI_Request c_request;
-    int size, ierr_c;
+    int indegree, outdegree, c_ierr;
     OMPI_ARRAY_NAME_DECL(recvcounts);
     OMPI_ARRAY_NAME_DECL(displs);
 
     c_comm = PMPI_Comm_f2c(*comm);
+    c_ierr = mca_topo_base_neighbor_count (c_comm, &indegree, &outdegree);
+    if (OMPI_SUCCESS != c_ierr) {
+        if (NULL != ierr) {
+            *ierr = OMPI_INT_2_FINT(c_ierr);
+        }
+        return;
+    }
+
     c_sendtype = PMPI_Type_f2c(*sendtype);
     c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    PMPI_Comm_size(c_comm, &size);
-    OMPI_ARRAY_FINT_2_INT(recvcounts, size);
-    OMPI_ARRAY_FINT_2_INT(displs, size);
+    OMPI_ARRAY_FINT_2_INT(recvcounts, indegree);
+    OMPI_ARRAY_FINT_2_INT(displs, indegree);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
+    /* Ineighbor_allgatherv does not support MPI_IN_PLACE */
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
-    ierr_c = PMPI_Ineighbor_allgatherv(sendbuf,
+    c_ierr = PMPI_Ineighbor_allgatherv(sendbuf,
                                        OMPI_FINT_2_INT(*sendcount),
                                        c_sendtype,
                                        recvbuf,
@@ -102,8 +110,8 @@ void ompi_ineighbor_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *s
                                        OMPI_ARRAY_NAME_CONVERT(displs),
                                        c_recvtype, c_comm, &c_request);
 
-    if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c);
-    if (MPI_SUCCESS == ierr_c) *request = PMPI_Request_c2f(c_request);
+    if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
+    if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request);
 
     OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts);
     OMPI_ARRAY_FINT_2_INT_CLEANUP(displs);
diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_alltoall_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_alltoall_f.c
index b565f1b74ed..07dbf0f335d 100644
--- a/ompi/mpi/fortran/mpif-h/ineighbor_alltoall_f.c
+++ b/ompi/mpi/fortran/mpif-h/ineighbor_alltoall_f.c
@@ -13,8 +13,8 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -83,7 +83,7 @@ void ompi_ineighbor_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sen
     c_sendtype = PMPI_Type_f2c(*sendtype);
     c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
+    /* Ineighbor_alltoall does not support MPI_IN_PLACE */
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_alltoallv_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_alltoallv_f.c
index 89761ace66d..eafbdeeaf4e 100644
--- a/ompi/mpi/fortran/mpif-h/ineighbor_alltoallv_f.c
+++ b/ompi/mpi/fortran/mpif-h/ineighbor_alltoallv_f.c
@@ -13,8 +13,8 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -26,6 +26,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/mca/topo/base/base.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -78,34 +79,41 @@ void ompi_ineighbor_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *s
     MPI_Comm c_comm;
     MPI_Datatype c_sendtype, c_recvtype;
     MPI_Request c_request;
-    int size, c_ierr;
+    int indegree, outdegree, c_ierr;
     OMPI_ARRAY_NAME_DECL(sendcounts);
     OMPI_ARRAY_NAME_DECL(sdispls);
     OMPI_ARRAY_NAME_DECL(recvcounts);
     OMPI_ARRAY_NAME_DECL(rdispls);
 
     c_comm = PMPI_Comm_f2c(*comm);
+    c_ierr = mca_topo_base_neighbor_count (c_comm, &indegree, &outdegree);
+    if (OMPI_SUCCESS != c_ierr) {
+        if (NULL != ierr) {
+            *ierr = OMPI_INT_2_FINT(c_ierr);
+        }
+        return;
+    }
+
     c_sendtype = PMPI_Type_f2c(*sendtype);
     c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    PMPI_Comm_size(c_comm, &size);
-    OMPI_ARRAY_FINT_2_INT(sendcounts, size);
-    OMPI_ARRAY_FINT_2_INT(sdispls, size);
-    OMPI_ARRAY_FINT_2_INT(recvcounts, size);
-    OMPI_ARRAY_FINT_2_INT(rdispls, size);
+    OMPI_ARRAY_FINT_2_INT(sendcounts, outdegree);
+    OMPI_ARRAY_FINT_2_INT(sdispls, outdegree);
+    OMPI_ARRAY_FINT_2_INT(recvcounts, indegree);
+    OMPI_ARRAY_FINT_2_INT(rdispls, indegree);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
+    /* Ineighbor_alltoallv does not support MPI_IN_PLACE */
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
     c_ierr = PMPI_Ineighbor_alltoallv(sendbuf,
-                                     OMPI_ARRAY_NAME_CONVERT(sendcounts),
-                                     OMPI_ARRAY_NAME_CONVERT(sdispls),
-                                     c_sendtype,
-                                     recvbuf,
-                                     OMPI_ARRAY_NAME_CONVERT(recvcounts),
-                                     OMPI_ARRAY_NAME_CONVERT(rdispls),
-                                     c_recvtype, c_comm, &c_request);
+                                      OMPI_ARRAY_NAME_CONVERT(sendcounts),
+                                      OMPI_ARRAY_NAME_CONVERT(sdispls),
+                                      c_sendtype,
+                                      recvbuf,
+                                      OMPI_ARRAY_NAME_CONVERT(recvcounts),
+                                      OMPI_ARRAY_NAME_CONVERT(rdispls),
+                                      c_recvtype, c_comm, &c_request);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
     if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request);
 
diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_alltoallw_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_alltoallw_f.c
index 42116da7a81..43fc36299cb 100644
--- a/ompi/mpi/fortran/mpif-h/ineighbor_alltoallw_f.c
+++ b/ompi/mpi/fortran/mpif-h/ineighbor_alltoallw_f.c
@@ -13,8 +13,8 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -26,6 +26,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/mca/topo/base/base.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -79,23 +80,30 @@ void ompi_ineighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts,
     MPI_Comm c_comm;
     MPI_Datatype *c_sendtypes, *c_recvtypes;
     MPI_Request c_request;
-    int size, c_ierr;
+    int indegree, outdegree, c_ierr;
     OMPI_ARRAY_NAME_DECL(sendcounts);
     OMPI_ARRAY_NAME_DECL(recvcounts);
 
     c_comm = PMPI_Comm_f2c(*comm);
-    PMPI_Comm_size(c_comm, &size);
+    c_ierr = mca_topo_base_neighbor_count (c_comm, &indegree, &outdegree);
+    if (OMPI_SUCCESS != c_ierr) {
+        if (NULL != ierr) {
+            *ierr = OMPI_INT_2_FINT(c_ierr);
+        }
+        return;
+    }
 
-    c_sendtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype));
-    c_recvtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype));
+    c_sendtypes = (MPI_Datatype *) malloc(outdegree * sizeof(MPI_Datatype));
+    c_recvtypes = (MPI_Datatype *) malloc(indegree * sizeof(MPI_Datatype));
 
-    OMPI_ARRAY_FINT_2_INT(sendcounts, size);
-    OMPI_ARRAY_FINT_2_INT(recvcounts, size);
+    OMPI_ARRAY_FINT_2_INT(sendcounts, outdegree);
+    for (int i=0; i<outdegree; i++) {
+        c_sendtypes[i] = PMPI_Type_f2c(sendtypes[i]);
+    }
 
-    while (size > 0) {
-        c_sendtypes[size - 1] = PMPI_Type_f2c(sendtypes[size - 1]);
-        c_recvtypes[size - 1] = PMPI_Type_f2c(recvtypes[size - 1]);
-        --size;
+    OMPI_ARRAY_FINT_2_INT(recvcounts, indegree);
+    for (int i=0; i<indegree; i++) {
+        c_recvtypes[i] = PMPI_Type_f2c(recvtypes[i]);
     }
 
     /* Ineighbor_alltoallw does not support MPI_IN_PLACE */
@@ -103,13 +111,13 @@ void ompi_ineighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts,
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
     c_ierr = PMPI_Ineighbor_alltoallw(sendbuf,
-                                     OMPI_ARRAY_NAME_CONVERT(sendcounts),
-                                     sdispls,
-                                     c_sendtypes,
-                                     recvbuf,
-                                     OMPI_ARRAY_NAME_CONVERT(recvcounts),
-                                     rdispls,
-                                     c_recvtypes, c_comm, &c_request);
+                                      OMPI_ARRAY_NAME_CONVERT(sendcounts),
+                                      sdispls,
+                                      c_sendtypes,
+                                      recvbuf,
+                                      OMPI_ARRAY_NAME_CONVERT(recvcounts),
+                                      rdispls,
+                                      c_recvtypes, c_comm, &c_request);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
     if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request);
 
diff --git a/ompi/mpi/fortran/mpif-h/iscatter_f.c b/ompi/mpi/fortran/mpif-h/iscatter_f.c
index 9c954bdcf66..9d98b05c5bd 100644
--- a/ompi/mpi/fortran/mpif-h/iscatter_f.c
+++ b/ompi/mpi/fortran/mpif-h/iscatter_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
  * $COPYRIGHT$
  *
@@ -24,6 +24,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -74,23 +75,37 @@ void ompi_iscatter_f(char *sendbuf, MPI_Fint *sendcount,
                      MPI_Fint *root, MPI_Fint *comm, MPI_Fint *request,
                      MPI_Fint *ierr)
 {
-    int c_ierr;
-    MPI_Datatype c_sendtype, c_recvtype;
+    int c_root, c_ierr;
+    MPI_Datatype c_sendtype = NULL, c_recvtype = NULL;
     MPI_Request c_request;
     MPI_Comm c_comm = PMPI_Comm_f2c(*comm);
 
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
+    c_root = OMPI_FINT_2_INT(*root);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        if (MPI_ROOT == c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        } else if (MPI_PROC_NULL != c_root) {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        }
+    } else {
+        if (OMPI_IS_FORTRAN_IN_PLACE(recvbuf)) {
+            recvbuf = MPI_IN_PLACE;
+        } else {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        }
+        if (ompi_comm_rank(c_comm) == c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    }
 
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
-    recvbuf = (char *) OMPI_F2C_IN_PLACE(recvbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
     c_ierr = PMPI_Iscatter(sendbuf,OMPI_FINT_2_INT(*sendcount),
-                          c_sendtype, recvbuf,
-                          OMPI_FINT_2_INT(*recvcount),
-                          c_recvtype,
-                          OMPI_FINT_2_INT(*root), c_comm, &c_request);
+                           c_sendtype, recvbuf,
+                           OMPI_FINT_2_INT(*recvcount),
+                           c_recvtype,
+                           OMPI_FINT_2_INT(*root), c_comm, &c_request);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
     if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request);
 }
diff --git a/ompi/mpi/fortran/mpif-h/iscatterv_f.c b/ompi/mpi/fortran/mpif-h/iscatterv_f.c
index cceeb47ce30..d23d0aafafa 100644
--- a/ompi/mpi/fortran/mpif-h/iscatterv_f.c
+++ b/ompi/mpi/fortran/mpif-h/iscatterv_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
  * $COPYRIGHT$
  *
@@ -24,6 +24,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -75,31 +76,47 @@ void ompi_iscatterv_f(char *sendbuf, MPI_Fint *sendcounts,
                       MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype = NULL;
     MPI_Request c_request;
-    int size, c_ierr;
+    int c_root, c_ierr;
     OMPI_ARRAY_NAME_DECL(sendcounts);
     OMPI_ARRAY_NAME_DECL(displs);
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
-
-    PMPI_Comm_size(c_comm, &size);
-    OMPI_ARRAY_FINT_2_INT(sendcounts, size);
-    OMPI_ARRAY_FINT_2_INT(displs, size);
+    c_root = OMPI_FINT_2_INT(*root);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        if (MPI_ROOT == c_root) {
+            OMPI_COND_STATEMENT(int size = ompi_comm_remote_size(c_comm));
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+            OMPI_ARRAY_FINT_2_INT(sendcounts, size);
+            OMPI_ARRAY_FINT_2_INT(displs, size);
+        } else if (MPI_PROC_NULL != c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    } else {
+        if (OMPI_IS_FORTRAN_IN_PLACE(recvbuf)) {
+            recvbuf = MPI_IN_PLACE;
+        } else {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        }
+        if (ompi_comm_rank(c_comm) == c_root) {
+            OMPI_COND_STATEMENT(int size = ompi_comm_size(c_comm));
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+            OMPI_ARRAY_FINT_2_INT(sendcounts, size);
+            OMPI_ARRAY_FINT_2_INT(displs, size);
+        }
+    }
 
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
-    recvbuf = (char *) OMPI_F2C_IN_PLACE(recvbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
     c_ierr = PMPI_Iscatterv(sendbuf,
-                           OMPI_ARRAY_NAME_CONVERT(sendcounts),
-                           OMPI_ARRAY_NAME_CONVERT(displs),
-                           c_sendtype, recvbuf,
-                           OMPI_FINT_2_INT(*recvcount),
-                           c_recvtype,
-                           OMPI_FINT_2_INT(*root), c_comm, &c_request);
+                            OMPI_ARRAY_NAME_CONVERT(sendcounts),
+                            OMPI_ARRAY_NAME_CONVERT(displs),
+                            c_sendtype, recvbuf,
+                            OMPI_FINT_2_INT(*recvcount),
+                            c_recvtype,
+                            OMPI_FINT_2_INT(*root), c_comm, &c_request);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
     if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request);
 
diff --git a/ompi/mpi/fortran/mpif-h/neighbor_allgather_f.c b/ompi/mpi/fortran/mpif-h/neighbor_allgather_f.c
index e0ffdf083a1..0062c3092d7 100644
--- a/ompi/mpi/fortran/mpif-h/neighbor_allgather_f.c
+++ b/ompi/mpi/fortran/mpif-h/neighbor_allgather_f.c
@@ -13,8 +13,8 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -82,7 +82,7 @@ void ompi_neighbor_allgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sen
     c_sendtype = PMPI_Type_f2c(*sendtype);
     c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
+    /* Neighbor_allgather does not support MPI_IN_PLACE */
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpi/fortran/mpif-h/neighbor_allgatherv_f.c b/ompi/mpi/fortran/mpif-h/neighbor_allgatherv_f.c
index 0008ca3185c..feeeb399281 100644
--- a/ompi/mpi/fortran/mpif-h/neighbor_allgatherv_f.c
+++ b/ompi/mpi/fortran/mpif-h/neighbor_allgatherv_f.c
@@ -13,8 +13,8 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -26,6 +26,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/mca/topo/base/base.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -76,23 +77,30 @@ void ompi_neighbor_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *se
 {
     MPI_Comm c_comm;
     MPI_Datatype c_sendtype, c_recvtype;
-    int size, ierr_c;
+    int indegree, outdegree, c_ierr;
     OMPI_ARRAY_NAME_DECL(recvcounts);
     OMPI_ARRAY_NAME_DECL(displs);
 
     c_comm = PMPI_Comm_f2c(*comm);
+    c_ierr = mca_topo_base_neighbor_count (c_comm, &indegree, &outdegree);
+    if (OMPI_SUCCESS != c_ierr) {
+        if (NULL != ierr) {
+            *ierr = OMPI_INT_2_FINT(c_ierr);
+        }
+        return;
+    }
+
     c_sendtype = PMPI_Type_f2c(*sendtype);
     c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    PMPI_Comm_size(c_comm, &size);
-    OMPI_ARRAY_FINT_2_INT(recvcounts, size);
-    OMPI_ARRAY_FINT_2_INT(displs, size);
+    OMPI_ARRAY_FINT_2_INT(recvcounts, indegree);
+    OMPI_ARRAY_FINT_2_INT(displs, indegree);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
+    /* Neighbor_allgatherv does not support MPI_IN_PLACE */
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
-    ierr_c = PMPI_Neighbor_allgatherv(sendbuf,
+    c_ierr = PMPI_Neighbor_allgatherv(sendbuf,
                                       OMPI_FINT_2_INT(*sendcount),
                                       c_sendtype,
                                       recvbuf,
@@ -100,7 +108,7 @@ void ompi_neighbor_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *se
                                       OMPI_ARRAY_NAME_CONVERT(displs),
                                       c_recvtype, c_comm);
 
-    if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c);
+    if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
     OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts);
     OMPI_ARRAY_FINT_2_INT_CLEANUP(displs);
diff --git a/ompi/mpi/fortran/mpif-h/neighbor_alltoall_f.c b/ompi/mpi/fortran/mpif-h/neighbor_alltoall_f.c
index 57e28e2a119..f3ab0979866 100644
--- a/ompi/mpi/fortran/mpif-h/neighbor_alltoall_f.c
+++ b/ompi/mpi/fortran/mpif-h/neighbor_alltoall_f.c
@@ -13,8 +13,8 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -82,7 +82,7 @@ void ompi_neighbor_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *send
     c_sendtype = PMPI_Type_f2c(*sendtype);
     c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
+    /* Neighbor_alltoall does not support MPI_IN_PLACE */
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpi/fortran/mpif-h/neighbor_alltoallv_f.c b/ompi/mpi/fortran/mpif-h/neighbor_alltoallv_f.c
index e9b96425e94..1459926b829 100644
--- a/ompi/mpi/fortran/mpif-h/neighbor_alltoallv_f.c
+++ b/ompi/mpi/fortran/mpif-h/neighbor_alltoallv_f.c
@@ -13,8 +13,8 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -26,6 +26,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/mca/topo/base/base.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -77,34 +78,41 @@ void ompi_neighbor_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sd
 {
     MPI_Comm c_comm;
     MPI_Datatype c_sendtype, c_recvtype;
-    int size, c_ierr;
+    int indegree, outdegree, c_ierr;
     OMPI_ARRAY_NAME_DECL(sendcounts);
     OMPI_ARRAY_NAME_DECL(sdispls);
     OMPI_ARRAY_NAME_DECL(recvcounts);
     OMPI_ARRAY_NAME_DECL(rdispls);
 
     c_comm = PMPI_Comm_f2c(*comm);
+    c_ierr = mca_topo_base_neighbor_count (c_comm, &indegree, &outdegree);
+    if (OMPI_SUCCESS != c_ierr) {
+        if (NULL != ierr) {
+            *ierr = OMPI_INT_2_FINT(c_ierr);
+        }
+        return;
+    }
+
     c_sendtype = PMPI_Type_f2c(*sendtype);
     c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    PMPI_Comm_size(c_comm, &size);
-    OMPI_ARRAY_FINT_2_INT(sendcounts, size);
-    OMPI_ARRAY_FINT_2_INT(sdispls, size);
-    OMPI_ARRAY_FINT_2_INT(recvcounts, size);
-    OMPI_ARRAY_FINT_2_INT(rdispls, size);
+    OMPI_ARRAY_FINT_2_INT(sendcounts, outdegree);
+    OMPI_ARRAY_FINT_2_INT(sdispls, outdegree);
+    OMPI_ARRAY_FINT_2_INT(recvcounts, indegree);
+    OMPI_ARRAY_FINT_2_INT(rdispls, indegree);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
+    /* Neighbor_alltoallv does not support MPI_IN_PLACE */
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
     c_ierr = PMPI_Neighbor_alltoallv(sendbuf,
-                                    OMPI_ARRAY_NAME_CONVERT(sendcounts),
-                                    OMPI_ARRAY_NAME_CONVERT(sdispls),
-                                    c_sendtype,
-                                    recvbuf,
-                                    OMPI_ARRAY_NAME_CONVERT(recvcounts),
-                                    OMPI_ARRAY_NAME_CONVERT(rdispls),
-                                    c_recvtype, c_comm);
+                                     OMPI_ARRAY_NAME_CONVERT(sendcounts),
+                                     OMPI_ARRAY_NAME_CONVERT(sdispls),
+                                     c_sendtype,
+                                     recvbuf,
+                                     OMPI_ARRAY_NAME_CONVERT(recvcounts),
+                                     OMPI_ARRAY_NAME_CONVERT(rdispls),
+                                     c_recvtype, c_comm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
     OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts);
diff --git a/ompi/mpi/fortran/mpif-h/neighbor_alltoallw_f.c b/ompi/mpi/fortran/mpif-h/neighbor_alltoallw_f.c
index f5a34a36e1c..af615e8c1d7 100644
--- a/ompi/mpi/fortran/mpif-h/neighbor_alltoallw_f.c
+++ b/ompi/mpi/fortran/mpif-h/neighbor_alltoallw_f.c
@@ -13,8 +13,8 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -26,6 +26,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/mca/topo/base/base.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -78,37 +79,44 @@ void ompi_neighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts,
 {
     MPI_Comm c_comm;
     MPI_Datatype *c_sendtypes, *c_recvtypes;
-    int size, c_ierr;
+    int indegree, outdegree, c_ierr;
     OMPI_ARRAY_NAME_DECL(sendcounts);
     OMPI_ARRAY_NAME_DECL(recvcounts);
 
     c_comm = PMPI_Comm_f2c(*comm);
-    PMPI_Comm_size(c_comm, &size);
+    c_ierr = mca_topo_base_neighbor_count (c_comm, &indegree, &outdegree);
+    if (OMPI_SUCCESS != c_ierr) {
+        if (NULL != ierr) {
+            *ierr = OMPI_INT_2_FINT(c_ierr);
+        }
+        return;
+    }
 
-    c_sendtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype));
-    c_recvtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype));
+    c_sendtypes = (MPI_Datatype *) malloc(outdegree * sizeof(MPI_Datatype));
+    c_recvtypes = (MPI_Datatype *) malloc(indegree * sizeof(MPI_Datatype));
 
-    OMPI_ARRAY_FINT_2_INT(sendcounts, size);
-    OMPI_ARRAY_FINT_2_INT(recvcounts, size);
+    OMPI_ARRAY_FINT_2_INT(sendcounts, outdegree);
+    for (int i=0; i<outdegree; i++) {
+        c_sendtypes[i] = PMPI_Type_f2c(sendtypes[i]);
+    }
 
-    while (size > 0) {
-        c_sendtypes[size - 1] = PMPI_Type_f2c(sendtypes[size - 1]);
-        c_recvtypes[size - 1] = PMPI_Type_f2c(recvtypes[size - 1]);
-        --size;
+    OMPI_ARRAY_FINT_2_INT(recvcounts, indegree);
+    for (int i=0; i<indegree; i++) {
+        c_recvtypes[i] = PMPI_Type_f2c(recvtypes[i]);
     }
 
-    /* Alltoallw does not support MPI_IN_PLACE */
+    /* Neighbor_alltoallw does not support MPI_IN_PLACE */
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
     c_ierr = PMPI_Neighbor_alltoallw(sendbuf,
-                                    OMPI_ARRAY_NAME_CONVERT(sendcounts),
-                                    sdispls,
-                                    c_sendtypes,
-                                    recvbuf,
-                                    OMPI_ARRAY_NAME_CONVERT(recvcounts),
-                                    rdispls,
-                                    c_recvtypes, c_comm);
+                                     OMPI_ARRAY_NAME_CONVERT(sendcounts),
+                                     sdispls,
+                                     c_sendtypes,
+                                     recvbuf,
+                                     OMPI_ARRAY_NAME_CONVERT(recvcounts),
+                                     rdispls,
+                                     c_recvtypes, c_comm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
     OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts);
diff --git a/ompi/mpi/fortran/mpif-h/scatter_f.c b/ompi/mpi/fortran/mpif-h/scatter_f.c
index 667a7064dd5..4a77a9ec667 100644
--- a/ompi/mpi/fortran/mpif-h/scatter_f.c
+++ b/ompi/mpi/fortran/mpif-h/scatter_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2013 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -72,21 +73,35 @@ void ompi_scatter_f(char *sendbuf, MPI_Fint *sendcount,
 		   MPI_Fint *recvcount, MPI_Fint *recvtype,
 		   MPI_Fint *root, MPI_Fint *comm, MPI_Fint *ierr)
 {
-    int c_ierr;
-    MPI_Datatype c_sendtype, c_recvtype;
+    int c_root, c_ierr;
+    MPI_Datatype c_sendtype = NULL, c_recvtype = NULL;
     MPI_Comm c_comm = PMPI_Comm_f2c(*comm);
 
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
+    c_root = OMPI_FINT_2_INT(*root);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        if (MPI_ROOT == c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        } else if (MPI_PROC_NULL != c_root) {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        }
+    } else {
+        if (OMPI_IS_FORTRAN_IN_PLACE(recvbuf)) {
+            recvbuf = MPI_IN_PLACE;
+        } else {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        }
+        if (ompi_comm_rank(c_comm) == c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    }
 
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
-    recvbuf = (char *) OMPI_F2C_IN_PLACE(recvbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
     c_ierr = PMPI_Scatter(sendbuf,OMPI_FINT_2_INT(*sendcount),
-                         c_sendtype, recvbuf,
-                         OMPI_FINT_2_INT(*recvcount),
-                         c_recvtype,
-                         OMPI_FINT_2_INT(*root), c_comm);
+                          c_sendtype, recvbuf,
+                          OMPI_FINT_2_INT(*recvcount),
+                          c_recvtype,
+                          OMPI_FINT_2_INT(*root), c_comm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 }
diff --git a/ompi/mpi/fortran/mpif-h/scatterv_f.c b/ompi/mpi/fortran/mpif-h/scatterv_f.c
index 744a05fe02c..50ce59479f6 100644
--- a/ompi/mpi/fortran/mpif-h/scatterv_f.c
+++ b/ompi/mpi/fortran/mpif-h/scatterv_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2013 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
@@ -74,30 +75,46 @@ void ompi_scatterv_f(char *sendbuf, MPI_Fint *sendcounts,
 		    MPI_Fint *comm, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
-    int size, c_ierr;
+    MPI_Datatype c_sendtype = NULL, c_recvtype = NULL;
+    int c_root, c_ierr;
     OMPI_ARRAY_NAME_DECL(sendcounts);
     OMPI_ARRAY_NAME_DECL(displs);
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
-
-    PMPI_Comm_size(c_comm, &size);
-    OMPI_ARRAY_FINT_2_INT(sendcounts, size);
-    OMPI_ARRAY_FINT_2_INT(displs, size);
+    c_root = OMPI_FINT_2_INT(*root);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        if (MPI_ROOT == c_root) {
+            OMPI_COND_STATEMENT(int size = ompi_comm_remote_size(c_comm));
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+            OMPI_ARRAY_FINT_2_INT(sendcounts, size);
+            OMPI_ARRAY_FINT_2_INT(displs, size);
+        } else if (MPI_PROC_NULL != c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    } else {
+        if (OMPI_IS_FORTRAN_IN_PLACE(recvbuf)) {
+            recvbuf = MPI_IN_PLACE;
+        } else {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        }
+        if (ompi_comm_rank(c_comm) == c_root) {
+            OMPI_COND_STATEMENT(int size = ompi_comm_size(c_comm));
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+            OMPI_ARRAY_FINT_2_INT(sendcounts, size);
+            OMPI_ARRAY_FINT_2_INT(displs, size);
+        }
+    }
 
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
-    recvbuf = (char *) OMPI_F2C_IN_PLACE(recvbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
     c_ierr = PMPI_Scatterv(sendbuf,
-                          OMPI_ARRAY_NAME_CONVERT(sendcounts),
-                          OMPI_ARRAY_NAME_CONVERT(displs),
-                          c_sendtype, recvbuf,
-                          OMPI_FINT_2_INT(*recvcount),
-                          c_recvtype,
-                          OMPI_FINT_2_INT(*root), c_comm);
+                           OMPI_ARRAY_NAME_CONVERT(sendcounts),
+                           OMPI_ARRAY_NAME_CONVERT(displs),
+                           c_sendtype, recvbuf,
+                           OMPI_FINT_2_INT(*recvcount),
+                           c_recvtype,
+                           OMPI_FINT_2_INT(*root), c_comm);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
     OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts);
diff --git a/ompi/mpi/fortran/use-mpi-f08/Makefile.am b/ompi/mpi/fortran/use-mpi-f08/Makefile.am
index 92c587d02ba..398ed0f6b74 100644
--- a/ompi/mpi/fortran/use-mpi-f08/Makefile.am
+++ b/ompi/mpi/fortran/use-mpi-f08/Makefile.am
@@ -21,6 +21,8 @@
 # $HEADER$
 #
 
+SUBDIRS = profile
+
 include $(top_srcdir)/Makefile.ompi-rules
 
 # This Makefile is only relevant if we're building the "use mpi_f08"
@@ -32,7 +34,8 @@ AM_FCFLAGS = -I$(top_builddir)/ompi/include \
              $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/$(OMPI_FORTRAN_USEMPI_DIR) \
              $(OMPI_FC_MODULE_FLAG)mod \
              $(OMPI_FC_MODULE_FLAG)bindings \
-             -I$(top_srcdir) $(FCFLAGS_f90)
+             -I$(top_srcdir) $(FCFLAGS_f90) \
+             -DOMPI_BUILD_MPI_PROFILING=0
 
 MOSTLYCLEANFILES = *.mod
 
@@ -448,359 +451,8 @@ mpi_api_files = \
 # list.  :-(
 #pmpi_api_files = $(mpi_api_files:%=profile/p%)
 
-pmpi_api_files = \
-        profile/pabort_f08.F90 \
-        profile/paccumulate_f08.F90 \
-        profile/padd_error_class_f08.F90 \
-        profile/padd_error_code_f08.F90 \
-        profile/padd_error_string_f08.F90 \
-        profile/paint_add_f08.F90 \
-        profile/paint_diff_f08.F90 \
-        profile/pallgather_f08.F90 \
-        profile/pallgatherv_f08.F90 \
-        profile/palloc_mem_f08.F90 \
-        profile/pallreduce_f08.F90 \
-        profile/palltoall_f08.F90 \
-        profile/palltoallv_f08.F90 \
-        profile/palltoallw_f08.F90 \
-        profile/pbarrier_f08.F90 \
-        profile/pbcast_f08.F90 \
-        profile/pbsend_f08.F90 \
-        profile/pbsend_init_f08.F90 \
-        profile/pbuffer_attach_f08.F90 \
-        profile/pbuffer_detach_f08.F90 \
-        profile/pcancel_f08.F90 \
-        profile/pcart_coords_f08.F90 \
-        profile/pcart_create_f08.F90 \
-        profile/pcartdim_get_f08.F90 \
-        profile/pcart_get_f08.F90 \
-        profile/pcart_map_f08.F90 \
-        profile/pcart_rank_f08.F90 \
-        profile/pcart_shift_f08.F90 \
-        profile/pcart_sub_f08.F90 \
-        profile/pclose_port_f08.F90 \
-        profile/pcomm_accept_f08.F90 \
-        profile/pcomm_call_errhandler_f08.F90 \
-        profile/pcomm_compare_f08.F90 \
-        profile/pcomm_connect_f08.F90 \
-        profile/pcomm_create_errhandler_f08.F90 \
-        profile/pcomm_create_f08.F90 \
-        profile/pcomm_create_group_f08.F90 \
-        profile/pcomm_create_keyval_f08.F90 \
-        profile/pcomm_delete_attr_f08.F90 \
-        profile/pcomm_disconnect_f08.F90 \
-        profile/pcomm_dup_f08.F90 \
-        profile/pcomm_dup_with_info_f08.F90 \
-        profile/pcomm_idup_f08.F90 \
-        profile/pcomm_free_f08.F90 \
-        profile/pcomm_free_keyval_f08.F90 \
-        profile/pcomm_get_attr_f08.F90 \
-        profile/pcomm_get_errhandler_f08.F90 \
-        profile/pcomm_get_info_f08.F90 \
-        profile/pcomm_get_name_f08.F90 \
-        profile/pcomm_get_parent_f08.F90 \
-        profile/pcomm_group_f08.F90 \
-        profile/pcomm_join_f08.F90 \
-        profile/pcomm_rank_f08.F90 \
-        profile/pcomm_remote_group_f08.F90 \
-        profile/pcomm_remote_size_f08.F90 \
-        profile/pcomm_set_attr_f08.F90 \
-        profile/pcomm_set_errhandler_f08.F90 \
-        profile/pcomm_set_info_f08.F90 \
-        profile/pcomm_set_name_f08.F90 \
-        profile/pcomm_size_f08.F90 \
-        profile/pcomm_spawn_f08.F90 \
-        profile/pcomm_spawn_multiple_f08.F90 \
-        profile/pcomm_split_f08.F90 \
-        profile/pcomm_split_type_f08.F90 \
-        profile/pcomm_test_inter_f08.F90 \
-        profile/pcompare_and_swap_f08.F90 \
-        profile/pdims_create_f08.F90 \
-        profile/pdist_graph_create_adjacent_f08.F90 \
-        profile/pdist_graph_create_f08.F90 \
-        profile/pdist_graph_neighbors_count_f08.F90 \
-        profile/pdist_graph_neighbors_f08.F90 \
-        profile/perrhandler_free_f08.F90 \
-        profile/perror_class_f08.F90 \
-        profile/perror_string_f08.F90 \
-        profile/pexscan_f08.F90 \
-        profile/pf_sync_reg_f08.F90 \
-        profile/pfetch_and_op_f08.F90 \
-        profile/pfile_call_errhandler_f08.F90 \
-        profile/pfile_close_f08.F90 \
-        profile/pfile_create_errhandler_f08.F90 \
-        profile/pfile_delete_f08.F90 \
-        profile/pfile_get_amode_f08.F90 \
-        profile/pfile_get_atomicity_f08.F90 \
-        profile/pfile_get_byte_offset_f08.F90 \
-        profile/pfile_get_errhandler_f08.F90 \
-        profile/pfile_get_group_f08.F90 \
-        profile/pfile_get_info_f08.F90 \
-        profile/pfile_get_position_f08.F90 \
-        profile/pfile_get_position_shared_f08.F90 \
-        profile/pfile_get_size_f08.F90 \
-        profile/pfile_get_type_extent_f08.F90 \
-        profile/pfile_get_view_f08.F90 \
-        profile/pfile_iread_at_f08.F90 \
-        profile/pfile_iread_f08.F90 \
-        profile/pfile_iread_at_all_f08.F90 \
-        profile/pfile_iread_all_f08.F90 \
-        profile/pfile_iread_shared_f08.F90 \
-        profile/pfile_iwrite_at_f08.F90 \
-        profile/pfile_iwrite_f08.F90 \
-        profile/pfile_iwrite_at_all_f08.F90 \
-        profile/pfile_iwrite_all_f08.F90 \
-        profile/pfile_iwrite_shared_f08.F90 \
-        profile/pfile_open_f08.F90 \
-        profile/pfile_preallocate_f08.F90 \
-        profile/pfile_read_all_begin_f08.F90 \
-        profile/pfile_read_all_end_f08.F90 \
-        profile/pfile_read_all_f08.F90 \
-        profile/pfile_read_at_all_begin_f08.F90 \
-        profile/pfile_read_at_all_end_f08.F90 \
-        profile/pfile_read_at_all_f08.F90 \
-        profile/pfile_read_at_f08.F90 \
-        profile/pfile_read_f08.F90 \
-        profile/pfile_read_ordered_begin_f08.F90 \
-        profile/pfile_read_ordered_end_f08.F90 \
-        profile/pfile_read_ordered_f08.F90 \
-        profile/pfile_read_shared_f08.F90 \
-        profile/pfile_seek_f08.F90 \
-        profile/pfile_seek_shared_f08.F90 \
-        profile/pfile_set_atomicity_f08.F90 \
-        profile/pfile_set_errhandler_f08.F90 \
-        profile/pfile_set_info_f08.F90 \
-        profile/pfile_set_size_f08.F90 \
-        profile/pfile_set_view_f08.F90 \
-        profile/pfile_sync_f08.F90 \
-        profile/pfile_write_all_begin_f08.F90 \
-        profile/pfile_write_all_end_f08.F90 \
-        profile/pfile_write_all_f08.F90 \
-        profile/pfile_write_at_all_begin_f08.F90 \
-        profile/pfile_write_at_all_end_f08.F90 \
-        profile/pfile_write_at_all_f08.F90 \
-        profile/pfile_write_at_f08.F90 \
-        profile/pfile_write_f08.F90 \
-        profile/pfile_write_ordered_begin_f08.F90 \
-        profile/pfile_write_ordered_end_f08.F90 \
-        profile/pfile_write_ordered_f08.F90 \
-        profile/pfile_write_shared_f08.F90 \
-        profile/pfinalized_f08.F90 \
-        profile/pfinalize_f08.F90 \
-        profile/pfree_mem_f08.F90 \
-        profile/pgather_f08.F90 \
-        profile/pgatherv_f08.F90 \
-        profile/pget_accumulate_f08.F90 \
-        profile/pget_address_f08.F90 \
-        profile/pget_count_f08.F90 \
-        profile/pget_elements_f08.F90 \
-        profile/pget_elements_x_f08.F90 \
-        profile/pget_f08.F90 \
-        profile/pget_library_version_f08.F90 \
-        profile/pget_processor_name_f08.F90 \
-        profile/pget_version_f08.F90 \
-        profile/pgraph_create_f08.F90 \
-        profile/pgraphdims_get_f08.F90 \
-        profile/pgraph_get_f08.F90 \
-        profile/pgraph_map_f08.F90 \
-        profile/pgraph_neighbors_count_f08.F90 \
-        profile/pgraph_neighbors_f08.F90 \
-        profile/pgrequest_complete_f08.F90 \
-        profile/pgrequest_start_f08.F90 \
-        profile/pgroup_compare_f08.F90 \
-        profile/pgroup_difference_f08.F90 \
-        profile/pgroup_excl_f08.F90 \
-        profile/pgroup_free_f08.F90 \
-        profile/pgroup_incl_f08.F90 \
-        profile/pgroup_intersection_f08.F90 \
-        profile/pgroup_range_excl_f08.F90 \
-        profile/pgroup_range_incl_f08.F90 \
-        profile/pgroup_rank_f08.F90 \
-        profile/pgroup_size_f08.F90 \
-        profile/pgroup_translate_ranks_f08.F90 \
-        profile/pgroup_union_f08.F90 \
-        profile/piallgather_f08.F90 \
-        profile/piallgatherv_f08.F90 \
-        profile/piallreduce_f08.F90 \
-        profile/pialltoall_f08.F90 \
-        profile/pialltoallv_f08.F90 \
-        profile/pialltoallw_f08.F90 \
-        profile/pibarrier_f08.F90 \
-        profile/pibcast_f08.F90 \
-        profile/pibsend_f08.F90 \
-        profile/pigather_f08.F90 \
-        profile/pigatherv_f08.F90 \
-        profile/piexscan_f08.F90 \
-        profile/pimprobe_f08.F90 \
-        profile/pimrecv_f08.F90 \
-        profile/pineighbor_allgather_f08.F90 \
-        profile/pineighbor_allgatherv_f08.F90 \
-        profile/pineighbor_alltoall_f08.F90 \
-        profile/pineighbor_alltoallv_f08.F90 \
-        profile/pineighbor_alltoallw_f08.F90 \
-        profile/pinfo_create_f08.F90 \
-        profile/pinfo_delete_f08.F90 \
-        profile/pinfo_dup_f08.F90 \
-        profile/pinfo_free_f08.F90 \
-        profile/pinfo_get_f08.F90 \
-        profile/pinfo_get_nkeys_f08.F90 \
-        profile/pinfo_get_nthkey_f08.F90 \
-        profile/pinfo_get_valuelen_f08.F90 \
-        profile/pinfo_set_f08.F90 \
-        profile/pinit_f08.F90 \
-        profile/pinitialized_f08.F90 \
-        profile/pinit_thread_f08.F90 \
-        profile/pintercomm_create_f08.F90 \
-        profile/pintercomm_merge_f08.F90 \
-        profile/piprobe_f08.F90 \
-        profile/pirecv_f08.F90 \
-        profile/pireduce_f08.F90 \
-        profile/pireduce_scatter_f08.F90 \
-        profile/pireduce_scatter_block_f08.F90 \
-        profile/pirsend_f08.F90 \
-        profile/piscan_f08.F90 \
-        profile/piscatter_f08.F90 \
-        profile/piscatterv_f08.F90 \
-        profile/pisend_f08.F90 \
-        profile/pissend_f08.F90 \
-        profile/pis_thread_main_f08.F90 \
-        profile/plookup_name_f08.F90 \
-        profile/pmprobe_f08.F90 \
-        profile/pmrecv_f08.F90 \
-        profile/pneighbor_allgather_f08.F90 \
-        profile/pneighbor_allgatherv_f08.F90 \
-        profile/pneighbor_alltoall_f08.F90 \
-        profile/pneighbor_alltoallv_f08.F90 \
-        profile/pneighbor_alltoallw_f08.F90 \
-        profile/pop_commutative_f08.F90 \
-        profile/pop_create_f08.F90 \
-        profile/popen_port_f08.F90 \
-        profile/pop_free_f08.F90 \
-        profile/ppack_external_f08.F90 \
-        profile/ppack_external_size_f08.F90 \
-        profile/ppack_f08.F90 \
-        profile/ppack_size_f08.F90 \
-        profile/ppcontrol_f08.F90 \
-        profile/pprobe_f08.F90 \
-        profile/ppublish_name_f08.F90 \
-        profile/pput_f08.F90 \
-        profile/pquery_thread_f08.F90 \
-        profile/praccumulate_f08.F90 \
-        profile/precv_f08.F90 \
-        profile/precv_init_f08.F90 \
-        profile/preduce_f08.F90 \
-        profile/preduce_local_f08.F90 \
-        profile/preduce_scatter_f08.F90 \
-        profile/preduce_scatter_block_f08.F90 \
-        profile/pregister_datarep_f08.F90 \
-        profile/prequest_free_f08.F90 \
-        profile/prequest_get_status_f08.F90 \
-        profile/prget_f08.F90 \
-        profile/prget_accumulate_f08.F90 \
-        profile/prput_f08.F90 \
-        profile/prsend_f08.F90 \
-        profile/prsend_init_f08.F90 \
-        profile/pscan_f08.F90 \
-        profile/pscatter_f08.F90 \
-        profile/pscatterv_f08.F90 \
-        profile/psend_f08.F90 \
-        profile/psend_init_f08.F90 \
-        profile/psendrecv_f08.F90 \
-        profile/psendrecv_replace_f08.F90 \
-        profile/pssend_f08.F90 \
-        profile/pssend_init_f08.F90 \
-        profile/pstartall_f08.F90 \
-        profile/pstart_f08.F90 \
-        profile/pstatus_set_cancelled_f08.F90 \
-        profile/pstatus_set_elements_f08.F90 \
-        profile/pstatus_set_elements_x_f08.F90 \
-        profile/ptestall_f08.F90 \
-        profile/ptestany_f08.F90 \
-        profile/ptest_cancelled_f08.F90 \
-        profile/ptest_f08.F90 \
-        profile/ptestsome_f08.F90 \
-        profile/ptopo_test_f08.F90 \
-        profile/ptype_commit_f08.F90 \
-        profile/ptype_contiguous_f08.F90 \
-        profile/ptype_create_darray_f08.F90 \
-        profile/ptype_create_f90_complex_f08.F90 \
-        profile/ptype_create_f90_integer_f08.F90 \
-        profile/ptype_create_f90_real_f08.F90 \
-        profile/ptype_create_hindexed_f08.F90 \
-        profile/ptype_create_hvector_f08.F90 \
-        profile/ptype_create_indexed_block_f08.F90 \
-        profile/ptype_create_hindexed_block_f08.F90 \
-        profile/ptype_create_keyval_f08.F90 \
-        profile/ptype_create_resized_f08.F90 \
-        profile/ptype_create_struct_f08.F90 \
-        profile/ptype_create_subarray_f08.F90 \
-        profile/ptype_delete_attr_f08.F90 \
-        profile/ptype_dup_f08.F90 \
-        profile/ptype_free_f08.F90 \
-        profile/ptype_free_keyval_f08.F90 \
-        profile/ptype_get_attr_f08.F90 \
-        profile/ptype_get_contents_f08.F90 \
-        profile/ptype_get_envelope_f08.F90 \
-        profile/ptype_get_extent_f08.F90 \
-        profile/ptype_get_extent_x_f08.F90 \
-        profile/ptype_get_name_f08.F90 \
-        profile/ptype_get_true_extent_f08.F90 \
-        profile/ptype_get_true_extent_x_f08.F90 \
-        profile/ptype_indexed_f08.F90 \
-        profile/ptype_match_size_f08.F90 \
-        profile/ptype_set_attr_f08.F90 \
-        profile/ptype_set_name_f08.F90 \
-        profile/ptype_size_f08.F90 \
-        profile/ptype_size_x_f08.F90 \
-        profile/ptype_vector_f08.F90 \
-        profile/punpack_external_f08.F90 \
-        profile/punpack_f08.F90 \
-        profile/punpublish_name_f08.F90 \
-        profile/pwaitall_f08.F90 \
-        profile/pwaitany_f08.F90 \
-        profile/pwait_f08.F90 \
-        profile/pwaitsome_f08.F90 \
-        profile/pwin_allocate_f08.F90 \
-        profile/pwin_allocate_shared_f08.F90 \
-        profile/pwin_attach_f08.F90 \
-        profile/pwin_call_errhandler_f08.F90 \
-        profile/pwin_complete_f08.F90 \
-        profile/pwin_create_dynamic_f08.F90 \
-        profile/pwin_create_errhandler_f08.F90 \
-        profile/pwin_create_f08.F90 \
-        profile/pwin_create_keyval_f08.F90 \
-        profile/pwin_delete_attr_f08.F90 \
-        profile/pwin_detach_f08.F90 \
-        profile/pwin_fence_f08.F90 \
-        profile/pwin_flush_f08.F90 \
-        profile/pwin_flush_all_f08.F90 \
-        profile/pwin_flush_local_f08.F90 \
-        profile/pwin_flush_local_all_f08.F90 \
-        profile/pwin_free_f08.F90 \
-        profile/pwin_free_keyval_f08.F90 \
-        profile/pwin_get_attr_f08.F90 \
-        profile/pwin_get_errhandler_f08.F90 \
-        profile/pwin_get_group_f08.F90 \
-        profile/pwin_get_info_f08.F90 \
-        profile/pwin_get_name_f08.F90 \
-        profile/pwin_lock_f08.F90 \
-        profile/pwin_lock_all_f08.F90 \
-        profile/pwin_post_f08.F90 \
-        profile/pwin_set_attr_f08.F90 \
-        profile/pwin_set_errhandler_f08.F90 \
-        profile/pwin_set_info_f08.F90 \
-        profile/pwin_set_name_f08.F90 \
-        profile/pwin_shared_query_f08.F90 \
-        profile/pwin_start_f08.F90 \
-        profile/pwin_sync_f08.F90 \
-        profile/pwin_test_f08.F90 \
-        profile/pwin_unlock_f08.F90 \
-        profile/pwin_unlock_all_f08.F90 \
-        profile/pwin_wait_f08.F90
-
 lib@OMPI_LIBMPI_NAME@_usempif08_la_SOURCES = \
         $(mpi_api_files) \
-        $(pmpi_api_files) \
         mpi-f08.F90 \
         buffer_detach.c \
         constants.h \
@@ -822,6 +474,7 @@ endif
 #
 
 lib@OMPI_LIBMPI_NAME@_usempif08_la_LIBADD = \
+        profile/libmpi_usempif08_pmpi.la \
         $(OMPI_MPIEXT_USEMPIF08_LIBS) \
         $(top_builddir)/ompi/mpi/fortran/mpif-h/lib@OMPI_LIBMPI_NAME@_mpifh.la \
         $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
@@ -835,10 +488,8 @@ lib@OMPI_LIBMPI_NAME@_usempif08_la_LDFLAGS = -version-info $(libmpi_usempif08_so
 #
 
 mpi_api_lo_files = $(mpi_api_files:.F90=.lo)
-pmpi_api_lo_files = $(pmpi_api_files:.F90=.lo)
 
-$(mpi_api_lo_files): mpi-f08.lo bindings/libforce_usempif08_internal_bindings_to_be_built.la
-$(pmpi_api_lo_files): mpi-f08.lo bindings/libforce_usempif08_internal_bindings_to_be_built.la
+$(mpi_api_lo_files): bindings/libforce_usempif08_internal_bindings_to_be_built.la
 
 mpi-f08.lo: $(module_sentinel_files) $(SIZEOF_H)
 
diff --git a/ompi/mpi/fortran/use-mpi-f08/abort_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/abort_f08.F90
index 7e7240bbb58..9bce55f62b2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/abort_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/abort_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Abort_f08 PMPI_Abort_f08
+#endif
+
 subroutine MPI_Abort_f08(comm,errorcode,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_abort_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/accumulate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/accumulate_f08.F90
index 3b702236cdd..f1e02a9b44c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/accumulate_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/accumulate_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Accumulate_f08 PMPI_Accumulate_f08
+#endif
+
 subroutine MPI_Accumulate_f08(origin_addr,origin_count,origin_datatype,&
                               target_rank,target_disp,target_count,    &
                               target_datatype,op,win,ierror)
diff --git a/ompi/mpi/fortran/use-mpi-f08/add_error_class_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/add_error_class_f08.F90
index db1e1aeabb0..ba1a68d9fb1 100644
--- a/ompi/mpi/fortran/use-mpi-f08/add_error_class_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/add_error_class_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Add_error_class_f08 PMPI_Add_error_class_f08
+#endif
+
 subroutine MPI_Add_error_class_f08(errorclass,ierror)
    use :: ompi_mpifh_bindings, only : ompi_add_error_class_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/add_error_code_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/add_error_code_f08.F90
index 7945fcbf988..40bc4a13af4 100644
--- a/ompi/mpi/fortran/use-mpi-f08/add_error_code_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/add_error_code_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Add_error_code_f08 PMPI_Add_error_code_f08
+#endif
+
 subroutine MPI_Add_error_code_f08(errorclass,errorcode,ierror)
    use :: ompi_mpifh_bindings, only : ompi_add_error_code_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/add_error_string_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/add_error_string_f08.F90
index 2d6a52e1494..281b8d80e5e 100644
--- a/ompi/mpi/fortran/use-mpi-f08/add_error_string_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/add_error_string_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2011 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Add_error_string_f08 PMPI_Add_error_string_f08
+#endif
+
 subroutine MPI_Add_error_string_f08(errorcode,string,ierror)
    use :: ompi_mpifh_bindings, only : ompi_add_error_string_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/aint_add_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/aint_add_f08.F90
index 979ee41bf42..9ca62f21487 100644
--- a/ompi/mpi/fortran/use-mpi-f08/aint_add_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/aint_add_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2015 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Aint_add_f08 PMPI_Aint_add_f08
+#endif
+
 function MPI_Aint_add_f08(base, disp)
    use :: mpi_f08_types, only : MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_aint_add_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/aint_diff_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/aint_diff_f08.F90
index c03bf049752..36221f3c3f6 100644
--- a/ompi/mpi/fortran/use-mpi-f08/aint_diff_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/aint_diff_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2015 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Aint_diff_f08 PMPI_Aint_diff_f08
+#endif
+
 function MPI_Aint_diff_f08(addr1, addr2)
    use :: mpi_f08_types, only : MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_aint_diff_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/allgather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/allgather_f08.F90
index 2811cc5a73b..e270123a4e1 100644
--- a/ompi/mpi/fortran/use-mpi-f08/allgather_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/allgather_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Allgather_f08 PMPI_Allgather_f08
+#endif
+
 subroutine MPI_Allgather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_allgather_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/allgatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/allgatherv_f08.F90
index eef5e1d25d8..e29aa665832 100644
--- a/ompi/mpi/fortran/use-mpi-f08/allgatherv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/allgatherv_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Allgatherv_f08 PMPI_Allgatherv_f08
+#endif
+
 subroutine MPI_Allgatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
                               displs,recvtype,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
diff --git a/ompi/mpi/fortran/use-mpi-f08/alloc_mem_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/alloc_mem_f08.F90
index 4d01edf2365..129c50dba93 100644
--- a/ompi/mpi/fortran/use-mpi-f08/alloc_mem_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/alloc_mem_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Alloc_mem_f08 PMPI_Alloc_mem_f08
+#endif
+
 subroutine MPI_Alloc_mem_f08(size,info,baseptr,ierror)
    use, intrinsic :: ISO_C_BINDING, only : C_PTR
    use :: mpi_f08_types, only : MPI_Info, MPI_ADDRESS_KIND
diff --git a/ompi/mpi/fortran/use-mpi-f08/allreduce_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/allreduce_f08.F90
index 2298cd5b94e..2c5e6b9ebfd 100644
--- a/ompi/mpi/fortran/use-mpi-f08/allreduce_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/allreduce_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Allreduce_f08 PMPI_Allreduce_f08
+#endif
+
 subroutine MPI_Allreduce_f08(sendbuf,recvbuf,count,datatype,op,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_allreduce_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/alltoall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/alltoall_f08.F90
index 20bea7b302a..90634c4d267 100644
--- a/ompi/mpi/fortran/use-mpi-f08/alltoall_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/alltoall_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Alltoall_f08 PMPI_Alltoall_f08
+#endif
+
 subroutine MPI_Alltoall_f08(sendbuf,sendcount,sendtype,recvbuf,&
                             recvcount,recvtype,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
diff --git a/ompi/mpi/fortran/use-mpi-f08/alltoallv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/alltoallv_f08.F90
index b11ce4cb605..f57b4dc3a56 100644
--- a/ompi/mpi/fortran/use-mpi-f08/alltoallv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/alltoallv_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Alltoallv_f08 PMPI_Alltoallv_f08
+#endif
+
 subroutine MPI_Alltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
                              recvcounts,rdispls,recvtype,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
diff --git a/ompi/mpi/fortran/use-mpi-f08/alltoallw_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/alltoallw_f08.F90
index 6aae6277e95..3c1810a9de9 100644
--- a/ompi/mpi/fortran/use-mpi-f08/alltoallw_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/alltoallw_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Alltoallw_f08 PMPI_Alltoallw_f08
+#endif
+
 subroutine MPI_Alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,&
                              recvbuf,recvcounts,rdispls,recvtypes,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
diff --git a/ompi/mpi/fortran/use-mpi-f08/barrier_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/barrier_f08.F90
index b97a647de24..2148f2bafc5 100644
--- a/ompi/mpi/fortran/use-mpi-f08/barrier_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/barrier_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Barrier_f08 PMPI_Barrier_f08
+#endif
+
 subroutine MPI_Barrier_f08(comm,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_barrier_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/bcast_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/bcast_f08.F90
index a153bd02adb..e885572a1d2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/bcast_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/bcast_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Bcast_f08 PMPI_Bcast_f08
+#endif
+
 subroutine MPI_Bcast_f08(buffer,count,datatype,root,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_bcast_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/bsend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/bsend_f08.F90
index ce7479b9dd9..28e1ebdb5f9 100644
--- a/ompi/mpi/fortran/use-mpi-f08/bsend_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/bsend_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Bsend_f08 PMPI_Bsend_f08
+#endif
+
 subroutine MPI_Bsend_f08(buf,count,datatype,dest,tag,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_bsend_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/bsend_init_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/bsend_init_f08.F90
index 7f5ed2c5072..21ce12d72e6 100644
--- a/ompi/mpi/fortran/use-mpi-f08/bsend_init_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/bsend_init_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Bsend_init_f08 PMPI_Bsend_init_f08
+#endif
+
 subroutine MPI_Bsend_init_f08(buf,count,datatype,dest,tag,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_bsend_init_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/buffer_attach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/buffer_attach_f08.F90
index 2ab9073a602..467e78b3a3f 100644
--- a/ompi/mpi/fortran/use-mpi-f08/buffer_attach_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/buffer_attach_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Buffer_attach_f08 PMPI_Buffer_attach_f08
+#endif
+
 subroutine MPI_Buffer_attach_f08(buffer,size,ierror)
    use :: ompi_mpifh_bindings, only : ompi_buffer_attach_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/buffer_detach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/buffer_detach_f08.F90
index ee33b06d98f..beabf42a2e0 100644
--- a/ompi/mpi/fortran/use-mpi-f08/buffer_detach_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/buffer_detach_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Buffer_detach_f08 PMPI_Buffer_detach_f08
+#endif
+
 subroutine MPI_Buffer_detach_f08(buffer_addr,size,ierror)
    USE, INTRINSIC ::  ISO_C_BINDING, ONLY : C_PTR
    use :: ompi_mpifh_bindings, only : ompi_buffer_detach_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/cancel_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/cancel_f08.F90
index 33dfa7037a9..b319ddae5b6 100644
--- a/ompi/mpi/fortran/use-mpi-f08/cancel_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/cancel_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cancel_f08 PMPI_Cancel_f08
+#endif
+
 subroutine MPI_Cancel_f08(request,ierror)
    use :: mpi_f08_types, only : MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_cancel_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/cart_coords_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/cart_coords_f08.F90
index ec2b11dd5df..2d333c36541 100644
--- a/ompi/mpi/fortran/use-mpi-f08/cart_coords_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/cart_coords_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cart_coords_f08 PMPI_Cart_coords_f08
+#endif
+
 subroutine MPI_Cart_coords_f08(comm,rank,maxdims,coords,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_cart_coords_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/cart_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/cart_create_f08.F90
index 159985a9533..57f25a69930 100644
--- a/ompi/mpi/fortran/use-mpi-f08/cart_create_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/cart_create_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cart_create_f08 PMPI_Cart_create_f08
+#endif
+
 subroutine MPI_Cart_create_f08(comm_old,ndims,dims,periods,reorder,comm_cart,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/cart_get_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/cart_get_f08.F90
index eb41069e02f..4b3c02f63be 100644
--- a/ompi/mpi/fortran/use-mpi-f08/cart_get_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/cart_get_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cart_get_f08 PMPI_Cart_get_f08
+#endif
+
 subroutine MPI_Cart_get_f08(comm,maxdims,dims,periods,coords,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/cart_map_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/cart_map_f08.F90
index 801887e274e..143776a1f8e 100644
--- a/ompi/mpi/fortran/use-mpi-f08/cart_map_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/cart_map_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cart_map_f08 PMPI_Cart_map_f08
+#endif
+
 subroutine MPI_Cart_map_f08(comm,ndims,dims,periods,newrank,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/cart_rank_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/cart_rank_f08.F90
index 26b82822632..a335bbc7414 100644
--- a/ompi/mpi/fortran/use-mpi-f08/cart_rank_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/cart_rank_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cart_rank_f08 PMPI_Cart_rank_f08
+#endif
+
 subroutine MPI_Cart_rank_f08(comm,coords,rank,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_cart_rank_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/cart_shift_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/cart_shift_f08.F90
index 783fcddc7f0..b292429acfe 100644
--- a/ompi/mpi/fortran/use-mpi-f08/cart_shift_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/cart_shift_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cart_shift_f08 PMPI_Cart_shift_f08
+#endif
+
 subroutine MPI_Cart_shift_f08(comm,direction,disp,rank_source,rank_dest,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_cart_shift_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/cart_sub_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/cart_sub_f08.F90
index f7e4e4407bc..e59c16ecbf6 100644
--- a/ompi/mpi/fortran/use-mpi-f08/cart_sub_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/cart_sub_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cart_sub_f08 PMPI_Cart_sub_f08
+#endif
+
 subroutine MPI_Cart_sub_f08(comm,remain_dims,newcomm,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/cartdim_get_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/cartdim_get_f08.F90
index bf840dad1c8..3674ed604a2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/cartdim_get_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/cartdim_get_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cartdim_get_f08 PMPI_Cartdim_get_f08
+#endif
+
 subroutine MPI_Cartdim_get_f08(comm,ndims,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_cartdim_get_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/close_port_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/close_port_f08.F90
index 8de5ea548a8..a9035efb9e7 100644
--- a/ompi/mpi/fortran/use-mpi-f08/close_port_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/close_port_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Close_port_f08 PMPI_Close_port_f08
+#endif
+
 subroutine MPI_Close_port_f08(port_name,ierror)
    use :: ompi_mpifh_bindings, only : ompi_close_port_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_accept_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_accept_f08.F90
index 0c0a533350b..86c64397a08 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_accept_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_accept_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_accept_f08 PMPI_Comm_accept_f08
+#endif
+
 subroutine MPI_Comm_accept_f08(port_name,info,root,comm,newcomm,ierror)
    use :: mpi_f08_types, only : MPI_Info, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_accept_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_call_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_call_errhandler_f08.F90
index 9ba084cf197..f8ebc0798c9 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_call_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_call_errhandler_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_call_errhandler_f08 PMPI_Comm_call_errhandler_f08
+#endif
+
 subroutine MPI_Comm_call_errhandler_f08(comm,errorcode,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_call_errhandler_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_compare_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_compare_f08.F90
index 7244bcff9ed..416a19185ff 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_compare_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_compare_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_compare_f08 PMPI_Comm_compare_f08
+#endif
+
 subroutine MPI_Comm_compare_f08(comm1,comm2,result,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_compare_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_connect_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_connect_f08.F90
index f7e5d244a1f..e7941a58f20 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_connect_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_connect_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_connect_f08 PMPI_Comm_connect_f08
+#endif
+
 subroutine MPI_Comm_connect_f08(port_name,info,root,comm,newcomm,ierror)
    use :: mpi_f08_types, only : MPI_Info, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_connect_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_create_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_create_errhandler_f08.F90
index 0db3920e193..650a1685fc7 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_create_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_create_errhandler_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_create_errhandler_f08 PMPI_Comm_create_errhandler_f08
+#endif
+
 subroutine MPI_Comm_create_errhandler_f08(comm_errhandler_fn,errhandler,ierror)
    use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
    use :: mpi_f08_types, only : MPI_Errhandler
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_create_f08.F90
index c4dbaedf8d2..7561cd2b2e4 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_create_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_create_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_create_f08 PMPI_Comm_create_f08
+#endif
+
 subroutine MPI_Comm_create_f08(comm,group,newcomm,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_comm_create_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_create_group_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_create_group_f08.F90
index a930829c2fe..92b21758355 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_create_group_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_create_group_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_create_group_f08 PMPI_Comm_create_group_f08
+#endif
+
 subroutine MPI_Comm_create_group_f08(comm,group,tag,newcomm,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_comm_create_group_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_create_keyval_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_create_keyval_f08.F90
index a73475bc9fc..936c1cd39ac 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_create_keyval_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_create_keyval_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_create_keyval_f08 PMPI_Comm_create_keyval_f08
+#endif
+
 subroutine MPI_Comm_create_keyval_f08(comm_copy_attr_fn,comm_delete_attr_fn,&
                                       comm_keyval,extra_state,ierror)
    use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_delete_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_delete_attr_f08.F90
index 67abf233c21..be89a08e420 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_delete_attr_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_delete_attr_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_delete_attr_f08 PMPI_Comm_delete_attr_f08
+#endif
+
 subroutine MPI_Comm_delete_attr_f08(comm,comm_keyval,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_delete_attr_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_disconnect_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_disconnect_f08.F90
index 9a7106a87f4..d45c3b4ff13 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_disconnect_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_disconnect_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_disconnect_f08 PMPI_Comm_disconnect_f08
+#endif
+
 subroutine MPI_Comm_disconnect_f08(comm,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_disconnect_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_dup_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_dup_f08.F90
index a495a41ffc2..8e57a2ca0b0 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_dup_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_dup_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_dup_f08 PMPI_Comm_dup_f08
+#endif
+
 subroutine MPI_Comm_dup_f08(comm,newcomm,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_dup_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_dup_with_info_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_dup_with_info_f08.F90
index 379874a1dcb..6baf156ce88 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_dup_with_info_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_dup_with_info_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_dup_with_info_f08 PMPI_Comm_dup_with_info_f08
+#endif
+
 subroutine MPI_Comm_dup_with_info_f08(comm,info,newcomm,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_comm_dup_with_info_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_free_f08.F90
index 992548889cc..4709953edec 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_free_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_free_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_free_f08 PMPI_Comm_free_f08
+#endif
+
 subroutine MPI_Comm_free_f08(comm,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_free_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_free_keyval_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_free_keyval_f08.F90
index af9c3c16089..1012145249d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_free_keyval_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_free_keyval_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_free_keyval_f08 PMPI_Comm_free_keyval_f08
+#endif
+
 subroutine MPI_Comm_free_keyval_f08(comm_keyval,ierror)
    use :: ompi_mpifh_bindings, only : ompi_comm_free_keyval_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_get_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_get_attr_f08.F90
index 2cd414d4225..5b73e1b21d3 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_get_attr_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_get_attr_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_get_attr_f08 PMPI_Comm_get_attr_f08
+#endif
+
 subroutine MPI_Comm_get_attr_f08(comm,comm_keyval,attribute_val,flag,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_ADDRESS_KIND
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_get_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_get_errhandler_f08.F90
index 7960b500ac9..df3bc27e08d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_get_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_get_errhandler_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_get_errhandler_f08 PMPI_Comm_get_errhandler_f08
+#endif
+
 subroutine MPI_Comm_get_errhandler_f08(comm,errhandler,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Errhandler
    use :: ompi_mpifh_bindings, only : ompi_comm_get_errhandler_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_get_info_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_get_info_f08.F90
index 4d959472430..298cd820487 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_get_info_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_get_info_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_get_info_f08 PMPI_Comm_get_info_f08
+#endif
+
 subroutine MPI_Comm_get_info_f08(comm,info_used,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_comm_get_info_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_get_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_get_name_f08.F90
index 8e9af5bff17..985800422ba 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_get_name_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_get_name_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_get_name_f08 PMPI_Comm_get_name_f08
+#endif
+
 subroutine MPI_Comm_get_name_f08(comm,comm_name,resultlen,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_MAX_OBJECT_NAME
    use :: ompi_mpifh_bindings, only : ompi_comm_get_name_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_get_parent_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_get_parent_f08.F90
index f9294f69702..be8a56df130 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_get_parent_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_get_parent_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_get_parent_f08 PMPI_Comm_get_parent_f08
+#endif
+
 subroutine MPI_Comm_get_parent_f08(parent,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_get_parent_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_group_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_group_f08.F90
index 375625c8988..9d345a83e8c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_group_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_group_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_group_f08 PMPI_Comm_group_f08
+#endif
+
 subroutine MPI_Comm_group_f08(comm,group,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_comm_group_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_idup_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_idup_f08.F90
index d9a6ce00908..ea56f0c6029 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_idup_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_idup_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_idup_f08 PMPI_Comm_idup_f08
+#endif
+
 subroutine MPI_Comm_idup_f08(comm,newcomm,request,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_comm_idup_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_join_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_join_f08.F90
index cb4bd79de64..b14e99ba568 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_join_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_join_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_join_f08 PMPI_Comm_join_f08
+#endif
+
 subroutine MPI_Comm_join_f08(fd,intercomm,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_join_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_rank_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_rank_f08.F90
index 8fc8c4ed9b9..429781bbcf6 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_rank_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_rank_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_rank_f08 PMPI_Comm_rank_f08
+#endif
+
 subroutine MPI_Comm_rank_f08(comm,rank,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_rank_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_remote_group_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_remote_group_f08.F90
index 7a9e17538da..b86f47c153f 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_remote_group_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_remote_group_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_remote_group_f08 PMPI_Comm_remote_group_f08
+#endif
+
 subroutine MPI_Comm_remote_group_f08(comm,group,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_comm_remote_group_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_remote_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_remote_size_f08.F90
index f21b70051c3..5ad126ef3e7 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_remote_size_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_remote_size_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_remote_size_f08 PMPI_Comm_remote_size_f08
+#endif
+
 subroutine MPI_Comm_remote_size_f08(comm,size,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_remote_size_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_set_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_set_attr_f08.F90
index cc7833b36a1..5b6e8eb5ee2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_set_attr_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_set_attr_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_set_attr_f08 PMPI_Comm_set_attr_f08
+#endif
+
 subroutine MPI_Comm_set_attr_f08(comm,comm_keyval,attribute_val,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_comm_set_attr_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_set_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_set_errhandler_f08.F90
index 05d4d81758c..9de6b26e620 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_set_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_set_errhandler_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_set_errhandler_f08 PMPI_Comm_set_errhandler_f08
+#endif
+
 subroutine MPI_Comm_set_errhandler_f08(comm,errhandler,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Errhandler
    use :: ompi_mpifh_bindings, only : ompi_comm_set_errhandler_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_set_info_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_set_info_f08.F90
index 47c0fddd81d..07a8fb25365 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_set_info_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_set_info_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_set_info_f08 PMPI_Comm_set_info_f08
+#endif
+
 subroutine MPI_Comm_set_info_f08(comm,info,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_comm_set_info_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_set_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_set_name_f08.F90
index d1a0c0860ba..437c3c81354 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_set_name_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_set_name_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_set_name_f08 PMPI_Comm_set_name_f08
+#endif
+
 subroutine MPI_Comm_set_name_f08(comm,comm_name,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_set_name_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_size_f08.F90
index c00911e451a..9ce6bf7e475 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_size_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_size_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_size_f08 PMPI_Comm_size_f08
+#endif
+
 subroutine MPI_Comm_size_f08(comm,size,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_size_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_spawn_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_spawn_f08.F90
index c25f43d31e2..d6142c55644 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_spawn_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_spawn_f08.F90
@@ -3,11 +3,15 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_spawn_f08 PMPI_Comm_spawn_f08
+#endif
+
 subroutine MPI_Comm_spawn_f08(command,argv,maxprocs,info,root,comm,intercomm, &
                               array_of_errcodes,ierror)
    use :: mpi_f08_types, only : MPI_Info, MPI_Comm
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_spawn_multiple_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_spawn_multiple_f08.F90
index 1dd2d776b65..d64225df746 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_spawn_multiple_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_spawn_multiple_f08.F90
@@ -3,11 +3,15 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
+! Copyright (c) 2015-2019 Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_spawn_multiple_f08 PMPI_Comm_spawn_multiple_f08
+#endif
+
 subroutine MPI_Comm_spawn_multiple_f08(count,array_of_commands,array_of_argv, &
                                        array_of_maxprocs,array_of_info,root,  &
                                        comm,intercomm,array_of_errcodes,ierror)
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_split_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_split_f08.F90
index f2cd99d2905..7cabc799ca0 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_split_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_split_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_split_f08 PMPI_Comm_split_f08
+#endif
+
 subroutine MPI_Comm_split_f08(comm,color,key,newcomm,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_comm_split_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_split_type_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_split_type_f08.F90
index f2ba532028c..efad4721b47 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_split_type_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_split_type_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_split_type_f08 PMPI_Comm_split_type_f08
+#endif
+
 subroutine MPI_Comm_split_type_f08(comm,split_type,key,info,newcomm,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_comm_split_type_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_test_inter_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_test_inter_f08.F90
index 372552f0fb6..4879cfcc7ab 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_test_inter_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_test_inter_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_test_inter_f08 PMPI_Comm_test_inter_f08
+#endif
+
 subroutine MPI_Comm_test_inter_f08(comm,flag,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/compare_and_swap_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/compare_and_swap_f08.F90
index 93c1f1a32ec..80ad4755dde 100644
--- a/ompi/mpi/fortran/use-mpi-f08/compare_and_swap_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/compare_and_swap_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Compare_and_swap_f08 PMPI_Compare_and_swap_f08
+#endif
+
 subroutine MPI_Compare_and_swap_f08(origin_addr,compare_addr,result_addr,&
                                     datatype,target_rank,target_disp,win,&
                                     ierror)
diff --git a/ompi/mpi/fortran/use-mpi-f08/dims_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/dims_create_f08.F90
index 0f0d138527e..86ebe6fe30a 100644
--- a/ompi/mpi/fortran/use-mpi-f08/dims_create_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/dims_create_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Dims_create_f08 PMPI_Dims_create_f08
+#endif
+
 subroutine MPI_Dims_create_f08(nnodes,ndims,dims,ierror)
    use :: ompi_mpifh_bindings, only : ompi_dims_create_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/dist_graph_create_adjacent_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/dist_graph_create_adjacent_f08.F90
index b5f5b9ad7df..1af5105e6a2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/dist_graph_create_adjacent_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/dist_graph_create_adjacent_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Dist_graph_create_adjacent_f08 PMPI_Dist_graph_create_adjacent_f08
+#endif
+
 subroutine MPI_Dist_graph_create_adjacent_f08(comm_old,indegree,sources,sourceweights,&
                                               outdegree,destinations,destweights,info,&
                                               reorder,comm_dist_graph,ierror)
diff --git a/ompi/mpi/fortran/use-mpi-f08/dist_graph_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/dist_graph_create_f08.F90
index ff892fe308d..e59a7bac8d9 100644
--- a/ompi/mpi/fortran/use-mpi-f08/dist_graph_create_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/dist_graph_create_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Dist_graph_create_f08 PMPI_Dist_graph_create_f08
+#endif
+
 subroutine MPI_Dist_graph_create_f08(comm_old,n,sources,degrees,destinations,&
                                      weights,info,reorder,comm_dist_graph,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Info
diff --git a/ompi/mpi/fortran/use-mpi-f08/dist_graph_neighbors_count_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/dist_graph_neighbors_count_f08.F90
index 9b688c9066f..4a82d005d5d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/dist_graph_neighbors_count_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/dist_graph_neighbors_count_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Dist_graph_neighbors_count_f08 PMPI_Dist_graph_neighbors_count_f08
+#endif
+
 subroutine MPI_Dist_graph_neighbors_count_f08(comm,indegree,outdegree,weighted,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/dist_graph_neighbors_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/dist_graph_neighbors_f08.F90
index f47f21bb2c9..66a2f5e3a44 100644
--- a/ompi/mpi/fortran/use-mpi-f08/dist_graph_neighbors_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/dist_graph_neighbors_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Dist_graph_neighbors_f08 PMPI_Dist_graph_neighbors_f08
+#endif
+
 subroutine MPI_Dist_graph_neighbors_f08(comm,maxindegree,sources,sourceweights,&
                                         maxoutdegree,destinations,destweights,ierror)
    use :: mpi_f08_types, only : MPI_Comm
diff --git a/ompi/mpi/fortran/use-mpi-f08/errhandler_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/errhandler_free_f08.F90
index a0d6baccba4..f23c45e1815 100644
--- a/ompi/mpi/fortran/use-mpi-f08/errhandler_free_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/errhandler_free_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Errhandler_free_f08 PMPI_Errhandler_free_f08
+#endif
+
 subroutine MPI_Errhandler_free_f08(errhandler,ierror)
    use :: mpi_f08_types, only : MPI_Errhandler
    use :: ompi_mpifh_bindings, only : ompi_errhandler_free_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/error_class_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/error_class_f08.F90
index ca901818b37..02e5db1427c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/error_class_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/error_class_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Error_class_f08 PMPI_Error_class_f08
+#endif
+
 subroutine MPI_Error_class_f08(errorcode,errorclass,ierror)
    use :: ompi_mpifh_bindings, only : ompi_error_class_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/error_string_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/error_string_f08.F90
index fb0e2d8bffc..483fb3c2549 100644
--- a/ompi/mpi/fortran/use-mpi-f08/error_string_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/error_string_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Error_string_f08 PMPI_Error_string_f08
+#endif
+
 subroutine MPI_Error_string_f08(errorcode,string,resultlen,ierror)
    use :: ompi_mpifh_bindings, only : ompi_error_string_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/exscan_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/exscan_f08.F90
index 3631076e50e..04e1e65664f 100644
--- a/ompi/mpi/fortran/use-mpi-f08/exscan_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/exscan_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Exscan_f08 PMPI_Exscan_f08
+#endif
+
 subroutine MPI_Exscan_f08(sendbuf,recvbuf,count,datatype,op,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_exscan_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/f_sync_reg_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/f_sync_reg_f08.F90
index 4643cb2b162..76fad98fc30 100644
--- a/ompi/mpi/fortran/use-mpi-f08/f_sync_reg_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/f_sync_reg_f08.F90
@@ -4,12 +4,16 @@
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2012      University of Oregon.  All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_F_sync_reg_f08 PMPI_F_sync_reg_f08
+#endif
+
 subroutine MPI_F_sync_reg_f08(buf)
    use :: ompi_mpifh_bindings, only : ompi_f_sync_reg_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/fetch_and_op_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/fetch_and_op_f08.F90
index d1ab5024172..13c68bfc46d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/fetch_and_op_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/fetch_and_op_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Fetch_and_op_f08 PMPI_Fetch_and_op_f08
+#endif
+
 subroutine MPI_Fetch_and_op_f08(origin_addr,result_addr,datatype,target_rank, &
                                 target_disp,op,win,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_call_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_call_errhandler_f08.F90
index b075e65d66f..0d81fa6ea9b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_call_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_call_errhandler_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_call_errhandler_f08 PMPI_File_call_errhandler_f08
+#endif
+
 subroutine MPI_File_call_errhandler_f08(fh,errorcode,ierror)
    use :: mpi_f08_types, only : MPI_File
    use :: ompi_mpifh_bindings, only : ompi_file_call_errhandler_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_close_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_close_f08.F90
index ab3b6e3b7c6..38f9c7cc823 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_close_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_close_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_close_f08 PMPI_File_close_f08
+#endif
+
 subroutine MPI_File_close_f08(fh,ierror)
    use :: mpi_f08_types, only : MPI_File
    use :: ompi_mpifh_bindings, only : ompi_file_close_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_create_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_create_errhandler_f08.F90
index 199d2f25cdf..b531ae81f94 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_create_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_create_errhandler_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_create_errhandler_f08 PMPI_File_create_errhandler_f08
+#endif
+
 subroutine MPI_File_create_errhandler_f08(file_errhandler_fn,errhandler,ierror)
    use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
    use :: mpi_f08_types, only : MPI_Errhandler
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_delete_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_delete_f08.F90
index 853f2c39578..4be000eab75 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_delete_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_delete_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_delete_f08 PMPI_File_delete_f08
+#endif
+
 subroutine MPI_File_delete_f08(filename,info,ierror)
    use :: mpi_f08_types, only : MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_file_delete_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_get_amode_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_get_amode_f08.F90
index bed5bd5bd3e..23001e676a3 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_amode_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_amode_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_amode_f08 PMPI_File_get_amode_f08
+#endif
+
 subroutine MPI_File_get_amode_f08(fh,amode,ierror)
    use :: mpi_f08_types, only : MPI_File
    use :: ompi_mpifh_bindings, only : ompi_file_get_amode_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_get_atomicity_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_get_atomicity_f08.F90
index bafc7fbe4c0..095cde04320 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_atomicity_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_atomicity_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_atomicity_f08 PMPI_File_get_atomicity_f08
+#endif
+
 subroutine MPI_File_get_atomicity_f08(fh,flag,ierror)
    use :: mpi_f08_types, only : MPI_File
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_get_byte_offset_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_get_byte_offset_f08.F90
index 53ff9633e71..903f56710f2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_byte_offset_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_byte_offset_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_byte_offset_f08 PMPI_File_get_byte_offset_f08
+#endif
+
 subroutine MPI_File_get_byte_offset_f08(fh,offset,disp,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_get_byte_offset_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_get_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_get_errhandler_f08.F90
index 330db63fb04..b3cd03f48b7 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_errhandler_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_errhandler_f08 PMPI_File_get_errhandler_f08
+#endif
+
 subroutine MPI_File_get_errhandler_f08(file,errhandler,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Errhandler
    use :: ompi_mpifh_bindings, only : ompi_file_get_errhandler_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_get_group_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_get_group_f08.F90
index ead59f69f92..0b09c0d04f0 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_group_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_group_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_group_f08 PMPI_File_get_group_f08
+#endif
+
 subroutine MPI_File_get_group_f08(fh,group,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_file_get_group_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_get_info_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_get_info_f08.F90
index 17e02859399..aaaff2152ce 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_info_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_info_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_info_f08 PMPI_File_get_info_f08
+#endif
+
 subroutine MPI_File_get_info_f08(fh,info_used,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_file_get_info_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_get_position_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_get_position_f08.F90
index bc4a85e721d..846c49c695b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_position_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_position_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_position_f08 PMPI_File_get_position_f08
+#endif
+
 subroutine MPI_File_get_position_f08(fh,offset,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_get_position_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_get_position_shared_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_get_position_shared_f08.F90
index 11bffdc7494..cb8a42d7985 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_position_shared_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_position_shared_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_position_shared_f08 PMPI_File_get_position_shared_f08
+#endif
+
 subroutine MPI_File_get_position_shared_f08(fh,offset,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_get_position_shared_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_get_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_get_size_f08.F90
index d134f090f40..462b7912832 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_size_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_size_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_size_f08 PMPI_File_get_size_f08
+#endif
+
 subroutine MPI_File_get_size_f08(fh,size,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_get_size_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_get_type_extent_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_get_type_extent_f08.F90
index 0aa04b6e9fc..92bb596ed17 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_type_extent_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_type_extent_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_type_extent_f08 PMPI_File_get_type_extent_f08
+#endif
+
 subroutine MPI_File_get_type_extent_f08(fh,datatype,extent,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_get_type_extent_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_get_view_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_get_view_f08.F90
index 1d4db13d87b..aed89782a15 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_get_view_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_get_view_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_view_f08 PMPI_File_get_view_f08
+#endif
+
 subroutine MPI_File_get_view_f08(fh,disp,etype,filetype,datarep,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_get_view_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_iread_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_iread_all_f08.F90
index 2a02a3cdb1e..f9f7e990359 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_iread_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iread_all_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_iread_all_f08 PMPI_File_iread_all_f08
+#endif
+
 subroutine MPI_File_iread_all_f08(fh,buf,count,datatype,request,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_file_iread_all_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_iread_at_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_iread_at_all_f08.F90
index b3265617542..ded9a3b0eaa 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_iread_at_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iread_at_all_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_iread_at_all_f08 PMPI_File_iread_at_all_f08
+#endif
+
 subroutine MPI_File_iread_at_all_f08(fh,offset,buf,count,datatype,request,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_iread_at_all_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_iread_at_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_iread_at_f08.F90
index c382b602c6f..a038f7029e5 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_iread_at_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iread_at_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_iread_at_f08 PMPI_File_iread_at_f08
+#endif
+
 subroutine MPI_File_iread_at_f08(fh,offset,buf,count,datatype,request,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_iread_at_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_iread_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_iread_f08.F90
index 3bc13693a76..89382615ed2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_iread_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iread_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_iread_f08 PMPI_File_iread_f08
+#endif
+
 subroutine MPI_File_iread_f08(fh,buf,count,datatype,request,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_file_iread_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_iread_shared_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_iread_shared_f08.F90
index b5eabf4843b..af880c03256 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_iread_shared_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iread_shared_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_iread_shared_f08 PMPI_File_iread_shared_f08
+#endif
+
 subroutine MPI_File_iread_shared_f08(fh,buf,count,datatype,request,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_file_iread_shared_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_all_f08.F90
index 04499250c1a..7c73c109d2b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_all_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_iwrite_all_f08 PMPI_File_iwrite_all_f08
+#endif
+
 subroutine MPI_File_iwrite_all_f08(fh,buf,count,datatype,request,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_file_iwrite_all_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_all_f08.F90
index 792f591731a..b942cf936df 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_all_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_iwrite_at_all_f08 PMPI_File_iwrite_at_all_f08
+#endif
+
 subroutine MPI_File_iwrite_at_all_f08(fh,offset,buf,count,datatype,request,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_iwrite_at_all_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_f08.F90
index c67f5e17a01..08527ab27b0 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_at_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_iwrite_at_f08 PMPI_File_iwrite_at_f08
+#endif
+
 subroutine MPI_File_iwrite_at_f08(fh,offset,buf,count,datatype,request,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_iwrite_at_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_f08.F90
index f2f420597be..b41f3b76b7b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_iwrite_f08 PMPI_File_iwrite_f08
+#endif
+
 subroutine MPI_File_iwrite_f08(fh,buf,count,datatype,request,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_file_iwrite_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_shared_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_shared_f08.F90
index 3e61aec7f61..7d4341e2151 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_iwrite_shared_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_iwrite_shared_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_iwrite_shared_f08 PMPI_File_iwrite_shared_f08
+#endif
+
 subroutine MPI_File_iwrite_shared_f08(fh,buf,count,datatype,request,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_file_iwrite_shared_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_open_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_open_f08.F90
index d7855939490..82ecc7ea4ee 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_open_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_open_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_open_f08 PMPI_File_open_f08
+#endif
+
 subroutine MPI_File_open_f08(comm,filename,amode,info,fh,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Info, MPI_File
    use :: ompi_mpifh_bindings, only : ompi_file_open_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_preallocate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_preallocate_f08.F90
index 36cf7e918a4..9c7984d7e30 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_preallocate_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_preallocate_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_preallocate_f08 PMPI_File_preallocate_f08
+#endif
+
 subroutine MPI_File_preallocate_f08(fh,size,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_preallocate_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_read_all_begin_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_read_all_begin_f08.F90
index ba5f3f8d453..7383228a54c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_read_all_begin_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_read_all_begin_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_read_all_begin_f08 PMPI_File_read_all_begin_f08
+#endif
+
 subroutine MPI_File_read_all_begin_f08(fh,buf,count,datatype,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_file_read_all_begin_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_read_all_end_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_read_all_end_f08.F90
index be7da0df912..716915b5025 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_read_all_end_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_read_all_end_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_read_all_end_f08 PMPI_File_read_all_end_f08
+#endif
+
 subroutine MPI_File_read_all_end_f08(fh,buf,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_file_read_all_end_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_read_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_read_all_f08.F90
index 6805adb5711..b98e466edae 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_read_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_read_all_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_read_all_f08 PMPI_File_read_all_f08
+#endif
+
 subroutine MPI_File_read_all_f08(fh,buf,count,datatype,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_file_read_all_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_begin_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_begin_f08.F90
index 41bb7d6d171..c7568804391 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_begin_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_begin_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_read_at_all_begin_f08 PMPI_File_read_at_all_begin_f08
+#endif
+
 subroutine MPI_File_read_at_all_begin_f08(fh,offset,buf,count,datatype,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_read_at_all_begin_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_end_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_end_f08.F90
index 2173c5091a0..8a9c654ff0e 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_end_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_end_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_read_at_all_end_f08 PMPI_File_read_at_all_end_f08
+#endif
+
 subroutine MPI_File_read_at_all_end_f08(fh,buf,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_file_read_at_all_end_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_f08.F90
index 88efb71740f..c6c0b8e052c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_read_at_all_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_read_at_all_f08 PMPI_File_read_at_all_f08
+#endif
+
 subroutine MPI_File_read_at_all_f08(fh,offset,buf,count,datatype,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_read_at_all_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_read_at_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_read_at_f08.F90
index bd5964c7760..21286210ce9 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_read_at_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_read_at_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_read_at_f08 PMPI_File_read_at_f08
+#endif
+
 subroutine MPI_File_read_at_f08(fh,offset,buf,count,datatype,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_read_at_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_read_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_read_f08.F90
index 9e517bcf48f..56b566b7f82 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_read_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_read_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_read_f08 PMPI_File_read_f08
+#endif
+
 subroutine MPI_File_read_f08(fh,buf,count,datatype,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_file_read_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_begin_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_begin_f08.F90
index 814ac47b8cc..4204ed12016 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_begin_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_begin_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_read_ordered_begin_f08 PMPI_File_read_ordered_begin_f08
+#endif
+
 subroutine MPI_File_read_ordered_begin_f08(fh,buf,count,datatype,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_file_read_ordered_begin_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_end_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_end_f08.F90
index dfc6ceea1ed..60a757a881c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_end_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_end_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_read_ordered_end_f08 PMPI_File_read_ordered_end_f08
+#endif
+
 subroutine MPI_File_read_ordered_end_f08(fh,buf,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_file_read_ordered_end_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_f08.F90
index e929589523e..6190e3fdbcf 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_read_ordered_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_read_ordered_f08 PMPI_File_read_ordered_f08
+#endif
+
 subroutine MPI_File_read_ordered_f08(fh,buf,count,datatype,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_file_read_ordered_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_read_shared_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_read_shared_f08.F90
index b6d3fcb4686..87c5880e795 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_read_shared_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_read_shared_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_read_shared_f08 PMPI_File_read_shared_f08
+#endif
+
 subroutine MPI_File_read_shared_f08(fh,buf,count,datatype,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_file_read_shared_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_seek_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_seek_f08.F90
index 46b1fa23e9e..bd17f1ab134 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_seek_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_seek_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_seek_f08 PMPI_File_seek_f08
+#endif
+
 subroutine MPI_File_seek_f08(fh,offset,whence,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_seek_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_seek_shared_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_seek_shared_f08.F90
index 1b660da3c30..011b10a38a7 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_seek_shared_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_seek_shared_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_seek_shared_f08 PMPI_File_seek_shared_f08
+#endif
+
 subroutine MPI_File_seek_shared_f08(fh,offset,whence,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_seek_shared_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_set_atomicity_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_set_atomicity_f08.F90
index 9c798b358d7..b4b1dedb5c5 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_set_atomicity_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_set_atomicity_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_set_atomicity_f08 PMPI_File_set_atomicity_f08
+#endif
+
 subroutine MPI_File_set_atomicity_f08(fh,flag,ierror)
    use :: mpi_f08_types, only : MPI_File
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_set_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_set_errhandler_f08.F90
index 18ac24dc918..ff0540b9d69 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_set_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_set_errhandler_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_set_errhandler_f08 PMPI_File_set_errhandler_f08
+#endif
+
 subroutine MPI_File_set_errhandler_f08(file,errhandler,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Errhandler
    use :: ompi_mpifh_bindings, only : ompi_file_set_errhandler_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_set_info_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_set_info_f08.F90
index 6828f22295a..ae134b92dfa 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_set_info_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_set_info_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_set_info_f08 PMPI_File_set_info_f08
+#endif
+
 subroutine MPI_File_set_info_f08(fh,info,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_file_set_info_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_set_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_set_size_f08.F90
index 917d9ac4bd5..de4d330cc1e 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_set_size_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_set_size_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_set_size_f08 PMPI_File_set_size_f08
+#endif
+
 subroutine MPI_File_set_size_f08(fh,size,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_set_size_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_set_view_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_set_view_f08.F90
index 3f4bb690f50..61fc9e776bf 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_set_view_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_set_view_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_set_view_f08 PMPI_File_set_view_f08
+#endif
+
 subroutine MPI_File_set_view_f08(fh,disp,etype,filetype,datarep,info,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Info, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_set_view_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_sync_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_sync_f08.F90
index 2963ec0e2af..500225881c6 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_sync_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_sync_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_sync_f08 PMPI_File_sync_f08
+#endif
+
 subroutine MPI_File_sync_f08(fh,ierror)
    use :: mpi_f08_types, only : MPI_File
    use :: ompi_mpifh_bindings, only : ompi_file_sync_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_write_all_begin_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_write_all_begin_f08.F90
index 8f94cf04b83..500a7dded2e 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_write_all_begin_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_write_all_begin_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_write_all_begin_f08 PMPI_File_write_all_begin_f08
+#endif
+
 subroutine MPI_File_write_all_begin_f08(fh,buf,count,datatype,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_file_write_all_begin_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_write_all_end_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_write_all_end_f08.F90
index 3ebc884662d..26c9d8e65a5 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_write_all_end_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_write_all_end_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_write_all_end_f08 PMPI_File_write_all_end_f08
+#endif
+
 subroutine MPI_File_write_all_end_f08(fh,buf,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_file_write_all_end_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_write_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_write_all_f08.F90
index 9521b02ae3c..ff3bc7b9ee4 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_write_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_write_all_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_write_all_f08 PMPI_File_write_all_f08
+#endif
+
 subroutine MPI_File_write_all_f08(fh,buf,count,datatype,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_file_write_all_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_begin_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_begin_f08.F90
index 1e535cb26ba..60eb3087c98 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_begin_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_begin_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_write_at_all_begin_f08 PMPI_File_write_at_all_begin_f08
+#endif
+
 subroutine MPI_File_write_at_all_begin_f08(fh,offset,buf,count,datatype,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_write_at_all_begin_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_end_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_end_f08.F90
index a4bb87bb0d8..7d9cba834cd 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_end_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_end_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_write_at_all_end_f08 PMPI_File_write_at_all_end_f08
+#endif
+
 subroutine MPI_File_write_at_all_end_f08(fh,buf,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_file_write_at_all_end_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_f08.F90
index 2976bb6318f..1a11adbf418 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_write_at_all_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_write_at_all_f08 PMPI_File_write_at_all_f08
+#endif
+
 subroutine MPI_File_write_at_all_f08(fh,offset,buf,count,datatype,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_write_at_all_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_write_at_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_write_at_f08.F90
index d4beed26dec..ea51cbb3ce1 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_write_at_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_write_at_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_write_at_f08 PMPI_File_write_at_f08
+#endif
+
 subroutine MPI_File_write_at_f08(fh,offset,buf,count,datatype,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status, MPI_OFFSET_KIND
    use :: ompi_mpifh_bindings, only : ompi_file_write_at_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_write_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_write_f08.F90
index 073198ca000..3df3e942c79 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_write_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_write_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_write_f08 PMPI_File_write_f08
+#endif
+
 subroutine MPI_File_write_f08(fh,buf,count,datatype,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_file_write_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_begin_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_begin_f08.F90
index 0a8f798672a..b1ffdc7b074 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_begin_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_begin_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_write_ordered_begin_f08 PMPI_File_write_ordered_begin_f08
+#endif
+
 subroutine MPI_File_write_ordered_begin_f08(fh,buf,count,datatype,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_file_write_ordered_begin_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_end_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_end_f08.F90
index 19ad37e8271..813ac2d368f 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_end_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_end_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_write_ordered_end_f08 PMPI_File_write_ordered_end_f08
+#endif
+
 subroutine MPI_File_write_ordered_end_f08(fh,buf,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_file_write_ordered_end_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_f08.F90
index 3e06e606c9b..08683722aa8 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_write_ordered_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_write_ordered_f08 PMPI_File_write_ordered_f08
+#endif
+
 subroutine MPI_File_write_ordered_f08(fh,buf,count,datatype,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_file_write_ordered_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/file_write_shared_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/file_write_shared_f08.F90
index 239cd0d4993..a27ba53b52f 100644
--- a/ompi/mpi/fortran/use-mpi-f08/file_write_shared_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/file_write_shared_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_write_shared_f08 PMPI_File_write_shared_f08
+#endif
+
 subroutine MPI_File_write_shared_f08(fh,buf,count,datatype,status,ierror)
    use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_file_write_shared_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/finalize_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/finalize_f08.F90
index f61b2d56b49..95d835a42a5 100644
--- a/ompi/mpi/fortran/use-mpi-f08/finalize_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/finalize_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Finalize_f08 PMPI_Finalize_f08
+#endif
+
 subroutine MPI_Finalize_f08(ierror)
    use :: ompi_mpifh_bindings, only : ompi_finalize_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/finalized_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/finalized_f08.F90
index db984662360..a8cfa045960 100644
--- a/ompi/mpi/fortran/use-mpi-f08/finalized_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/finalized_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Finalized_f08 PMPI_Finalized_f08
+#endif
+
 subroutine MPI_Finalized_f08(flag,ierror)
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
    ! call a PMPI_* subroutine below.
diff --git a/ompi/mpi/fortran/use-mpi-f08/free_mem_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/free_mem_f08.F90
index fc84c6cdefe..84517a5ac46 100644
--- a/ompi/mpi/fortran/use-mpi-f08/free_mem_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/free_mem_f08.F90
@@ -1,12 +1,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All Rights reserved.
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
+! Copyright (c) 2015-2019 Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Free_mem_f08 PMPI_Free_mem_f08
+#endif
+
 subroutine MPI_Free_mem_f08(base,ierror)
    use :: ompi_mpifh_bindings, only : ompi_free_mem_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/gather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/gather_f08.F90
index 628424281d6..5e41bd00519 100644
--- a/ompi/mpi/fortran/use-mpi-f08/gather_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/gather_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Gather_f08 PMPI_Gather_f08
+#endif
+
 subroutine MPI_Gather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,&
                           recvtype,root,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
diff --git a/ompi/mpi/fortran/use-mpi-f08/gatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/gatherv_f08.F90
index 2eb58211e1d..4932bd64aa8 100644
--- a/ompi/mpi/fortran/use-mpi-f08/gatherv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/gatherv_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Gatherv_f08 PMPI_Gatherv_f08
+#endif
+
 subroutine MPI_Gatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
                            displs,recvtype,root,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
diff --git a/ompi/mpi/fortran/use-mpi-f08/get_accumulate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/get_accumulate_f08.F90
index 561e389a737..00570b7d429 100644
--- a/ompi/mpi/fortran/use-mpi-f08/get_accumulate_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/get_accumulate_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Get_accumulate_f08 PMPI_Get_accumulate_f08
+#endif
+
 subroutine MPI_Get_accumulate_f08(origin_addr,origin_count,origin_datatype,&
                                   result_addr,result_count,result_datatype,&
                                   target_rank,target_disp,target_count,    &
diff --git a/ompi/mpi/fortran/use-mpi-f08/get_address_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/get_address_f08.F90
index 5aa15420373..ead26bd754d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/get_address_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/get_address_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Get_address_f08 PMPI_Get_address_f08
+#endif
+
 subroutine MPI_Get_address_f08(location,address,ierror)
    use :: mpi_f08_types, only : MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_get_address_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/get_count_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/get_count_f08.F90
index d2fbc1eeda5..e7a5b829553 100644
--- a/ompi/mpi/fortran/use-mpi-f08/get_count_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/get_count_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Get_count_f08 PMPI_Get_count_f08
+#endif
+
 subroutine MPI_Get_count_f08(status,datatype,count,ierror)
    use :: mpi_f08_types, only : MPI_Status, MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_get_count_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/get_elements_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/get_elements_f08.F90
index b6914f0e1b8..900343667f9 100644
--- a/ompi/mpi/fortran/use-mpi-f08/get_elements_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/get_elements_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Get_elements_f08 PMPI_Get_elements_f08
+#endif
+
 subroutine MPI_Get_elements_f08(status,datatype,count,ierror)
    use :: mpi_f08_types, only : MPI_Status, MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_get_elements_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/get_elements_x_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/get_elements_x_f08.F90
index c01b6ffc1fb..49a26f30b0f 100644
--- a/ompi/mpi/fortran/use-mpi-f08/get_elements_x_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/get_elements_x_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Get_elements_x_f08 PMPI_Get_elements_x_f08
+#endif
+
 subroutine MPI_Get_elements_x_f08(status,datatype,count,ierror)
    use :: mpi_f08_types, only : MPI_Status, MPI_Datatype, MPI_COUNT_KIND
    use :: ompi_mpifh_bindings, only : ompi_get_elements_x_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/get_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/get_f08.F90
index 5baf5555348..acc209a18de 100644
--- a/ompi/mpi/fortran/use-mpi-f08/get_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/get_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2018 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Get_f08 PMPI_Get_f08
+#endif
+
 subroutine MPI_Get_f08(origin_addr,origin_count,origin_datatype,target_rank,&
                        target_disp,target_count,target_datatype,win,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
diff --git a/ompi/mpi/fortran/use-mpi-f08/get_library_version_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/get_library_version_f08.F90
index d916c5994cb..e2c999d464b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/get_library_version_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/get_library_version_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2010-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Get_library_version_f08 PMPI_Get_library_version_f08
+#endif
+
 subroutine MPI_Get_library_version_f08(version,resultlen,ierror)
    use :: mpi_f08_types, only : MPI_MAX_LIBRARY_VERSION_STRING
    use :: ompi_mpifh_bindings, only : ompi_get_library_version_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/get_processor_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/get_processor_name_f08.F90
index fe7e3545dfc..d32d6c50d8a 100644
--- a/ompi/mpi/fortran/use-mpi-f08/get_processor_name_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/get_processor_name_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Get_processor_name_f08 PMPI_Get_processor_name_f08
+#endif
+
 subroutine MPI_Get_processor_name_f08(name,resultlen,ierror)
    use :: ompi_mpifh_bindings, only : ompi_get_processor_name_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/get_version_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/get_version_f08.F90
index 1aaf04c060b..aaca211e122 100644
--- a/ompi/mpi/fortran/use-mpi-f08/get_version_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/get_version_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Get_version_f08 PMPI_Get_version_f08
+#endif
+
 subroutine MPI_Get_version_f08(version,subversion,ierror)
    use :: ompi_mpifh_bindings, only : ompi_get_version_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/graph_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/graph_create_f08.F90
index 59dc8b3cc1e..17546e15dd3 100644
--- a/ompi/mpi/fortran/use-mpi-f08/graph_create_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/graph_create_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Graph_create_f08 PMPI_Graph_create_f08
+#endif
+
 subroutine MPI_Graph_create_f08(comm_old,nnodes,index,edges,reorder,comm_graph,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/graph_get_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/graph_get_f08.F90
index 0d42f42d4b9..9f132a55367 100644
--- a/ompi/mpi/fortran/use-mpi-f08/graph_get_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/graph_get_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Graph_get_f08 PMPI_Graph_get_f08
+#endif
+
 subroutine MPI_Graph_get_f08(comm,maxindex,maxedges,index,edges,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_graph_get_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/graph_map_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/graph_map_f08.F90
index 43f788df614..52913ae4a6d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/graph_map_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/graph_map_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Graph_map_f08 PMPI_Graph_map_f08
+#endif
+
 subroutine MPI_Graph_map_f08(comm,nnodes,index,edges,newrank,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_graph_map_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/graph_neighbors_count_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/graph_neighbors_count_f08.F90
index 9ae6905ce8a..4a5213b14e7 100644
--- a/ompi/mpi/fortran/use-mpi-f08/graph_neighbors_count_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/graph_neighbors_count_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Graph_neighbors_count_f08 PMPI_Graph_neighbors_count_f08
+#endif
+
 subroutine MPI_Graph_neighbors_count_f08(comm,rank,nneighbors,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_graph_neighbors_count_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/graph_neighbors_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/graph_neighbors_f08.F90
index 3470b6c7aaf..1ab480f528c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/graph_neighbors_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/graph_neighbors_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Graph_neighbors_f08 PMPI_Graph_neighbors_f08
+#endif
+
 subroutine MPI_Graph_neighbors_f08(comm,rank,maxneighbors,neighbors,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_graph_neighbors_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/graphdims_get_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/graphdims_get_f08.F90
index e64b250b005..8724c5ecfcc 100644
--- a/ompi/mpi/fortran/use-mpi-f08/graphdims_get_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/graphdims_get_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Graphdims_get_f08 PMPI_Graphdims_get_f08
+#endif
+
 subroutine MPI_Graphdims_get_f08(comm,nnodes,nedges,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_graphdims_get_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/grequest_complete_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/grequest_complete_f08.F90
index 374ed639c8e..0f22b19ae72 100644
--- a/ompi/mpi/fortran/use-mpi-f08/grequest_complete_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/grequest_complete_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Grequest_complete_f08 PMPI_Grequest_complete_f08
+#endif
+
 subroutine MPI_Grequest_complete_f08(request,ierror)
    use :: mpi_f08_types, only : MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_grequest_complete_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/grequest_start_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/grequest_start_f08.F90
index 505c98ec9cd..63509fc52e4 100644
--- a/ompi/mpi/fortran/use-mpi-f08/grequest_start_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/grequest_start_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Grequest_start_f08 PMPI_Grequest_start_f08
+#endif
+
 subroutine MPI_Grequest_start_f08(query_fn,free_fn,cancel_fn,&
                                   extra_state,request,ierror)
    use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
diff --git a/ompi/mpi/fortran/use-mpi-f08/group_compare_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/group_compare_f08.F90
index 51c805085e9..81935d7ced2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/group_compare_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/group_compare_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Group_compare_f08 PMPI_Group_compare_f08
+#endif
+
 subroutine MPI_Group_compare_f08(group1,group2,result,ierror)
    use :: mpi_f08_types, only : MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_group_compare_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/group_difference_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/group_difference_f08.F90
index cb89f8f6c08..04cf4699813 100644
--- a/ompi/mpi/fortran/use-mpi-f08/group_difference_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/group_difference_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Group_difference_f08 PMPI_Group_difference_f08
+#endif
+
 subroutine MPI_Group_difference_f08(group1,group2,newgroup,ierror)
    use :: mpi_f08_types, only : MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_group_difference_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/group_excl_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/group_excl_f08.F90
index 52f1bd29759..89d9b2608d0 100644
--- a/ompi/mpi/fortran/use-mpi-f08/group_excl_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/group_excl_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Group_excl_f08 PMPI_Group_excl_f08
+#endif
+
 subroutine MPI_Group_excl_f08(group,n,ranks,newgroup,ierror)
    use :: mpi_f08_types, only : MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_group_excl_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/group_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/group_free_f08.F90
index 6e63efefdb9..f595b814796 100644
--- a/ompi/mpi/fortran/use-mpi-f08/group_free_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/group_free_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Group_free_f08 PMPI_Group_free_f08
+#endif
+
 subroutine MPI_Group_free_f08(group,ierror)
    use :: mpi_f08_types, only : MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_group_free_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/group_incl_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/group_incl_f08.F90
index 9447b451575..28b636b207b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/group_incl_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/group_incl_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Group_incl_f08 PMPI_Group_incl_f08
+#endif
+
 subroutine MPI_Group_incl_f08(group,n,ranks,newgroup,ierror)
    use :: mpi_f08_types, only : MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_group_incl_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/group_intersection_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/group_intersection_f08.F90
index b260b61a4f4..d895ee791ca 100644
--- a/ompi/mpi/fortran/use-mpi-f08/group_intersection_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/group_intersection_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Group_intersection_f08 PMPI_Group_intersection_f08
+#endif
+
 subroutine MPI_Group_intersection_f08(group1,group2,newgroup,ierror)
    use :: mpi_f08_types, only : MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_group_intersection_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/group_range_excl_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/group_range_excl_f08.F90
index c4379592551..3fe3cbb4287 100644
--- a/ompi/mpi/fortran/use-mpi-f08/group_range_excl_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/group_range_excl_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Group_range_excl_f08 PMPI_Group_range_excl_f08
+#endif
+
 subroutine MPI_Group_range_excl_f08(group,n,ranges,newgroup,ierror)
    use :: mpi_f08_types, only : MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_group_range_excl_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/group_range_incl_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/group_range_incl_f08.F90
index c236800d13d..3f52f9da27a 100644
--- a/ompi/mpi/fortran/use-mpi-f08/group_range_incl_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/group_range_incl_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Group_range_incl_f08 PMPI_Group_range_incl_f08
+#endif
+
 subroutine MPI_Group_range_incl_f08(group,n,ranges,newgroup,ierror)
    use :: mpi_f08_types, only : MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_group_range_incl_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/group_rank_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/group_rank_f08.F90
index 097e730e39c..882be738589 100644
--- a/ompi/mpi/fortran/use-mpi-f08/group_rank_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/group_rank_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Group_rank_f08 PMPI_Group_rank_f08
+#endif
+
 subroutine MPI_Group_rank_f08(group,rank,ierror)
    use :: mpi_f08_types, only : MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_group_rank_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/group_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/group_size_f08.F90
index ff88547125b..7d018c3c171 100644
--- a/ompi/mpi/fortran/use-mpi-f08/group_size_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/group_size_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Group_size_f08 PMPI_Group_size_f08
+#endif
+
 subroutine MPI_Group_size_f08(group,size,ierror)
    use :: mpi_f08_types, only : MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_group_size_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/group_translate_ranks_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/group_translate_ranks_f08.F90
index 07a4a2e82e9..5ce117ab830 100644
--- a/ompi/mpi/fortran/use-mpi-f08/group_translate_ranks_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/group_translate_ranks_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Group_translate_ranks_f08 PMPI_Group_translate_ranks_f08
+#endif
+
 subroutine MPI_Group_translate_ranks_f08(group1,n,ranks1,group2,ranks2,ierror)
    use :: mpi_f08_types, only : MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_group_translate_ranks_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/group_union_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/group_union_f08.F90
index b752fc5b45c..f8e52f299be 100644
--- a/ompi/mpi/fortran/use-mpi-f08/group_union_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/group_union_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Group_union_f08 PMPI_Group_union_f08
+#endif
+
 subroutine MPI_Group_union_f08(group1,group2,newgroup,ierror)
    use :: mpi_f08_types, only : MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_group_union_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/iallgather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/iallgather_f08.F90
index d6fa7c6624d..872c60ab161 100644
--- a/ompi/mpi/fortran/use-mpi-f08/iallgather_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/iallgather_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Iallgather_f08 PMPI_Iallgather_f08
+#endif
+
 subroutine MPI_Iallgather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_iallgather_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/iallgatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/iallgatherv_f08.F90
index 7fdb6a684dc..fb3e3bf6f0d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/iallgatherv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/iallgatherv_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Iallgatherv_f08 PMPI_Iallgatherv_f08
+#endif
+
 subroutine MPI_Iallgatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
                               displs,recvtype,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
diff --git a/ompi/mpi/fortran/use-mpi-f08/iallreduce_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/iallreduce_f08.F90
index d96015ff406..288b0d07f53 100644
--- a/ompi/mpi/fortran/use-mpi-f08/iallreduce_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/iallreduce_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Iallreduce_f08 PMPI_Iallreduce_f08
+#endif
+
 subroutine MPI_Iallreduce_f08(sendbuf,recvbuf,count,datatype,op,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_iallreduce_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/ialltoall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ialltoall_f08.F90
index 65661c3da31..ddbf450e144 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ialltoall_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ialltoall_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ialltoall_f08 PMPI_Ialltoall_f08
+#endif
+
 subroutine MPI_Ialltoall_f08(sendbuf,sendcount,sendtype,recvbuf,&
                              recvcount,recvtype,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
diff --git a/ompi/mpi/fortran/use-mpi-f08/ialltoallv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ialltoallv_f08.F90
index 96777dbbebe..af20acc120f 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ialltoallv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ialltoallv_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ialltoallv_f08 PMPI_Ialltoallv_f08
+#endif
+
 subroutine MPI_Ialltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
                              recvcounts,rdispls,recvtype,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
diff --git a/ompi/mpi/fortran/use-mpi-f08/ialltoallw_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ialltoallw_f08.F90
index 8e24f97e720..d95b9319721 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ialltoallw_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ialltoallw_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ialltoallw_f08 PMPI_Ialltoallw_f08
+#endif
+
 subroutine MPI_Ialltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,&
                              recvbuf,recvcounts,rdispls,recvtypes,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
diff --git a/ompi/mpi/fortran/use-mpi-f08/ibarrier_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ibarrier_f08.F90
index a8034a36d40..1c5a57c42a4 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ibarrier_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ibarrier_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ibarrier_f08 PMPI_Ibarrier_f08
+#endif
+
 subroutine MPI_Ibarrier_f08(comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_ibarrier_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/ibcast_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ibcast_f08.F90
index 4f01661b9ac..954b5f97834 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ibcast_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ibcast_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ibcast_f08 PMPI_Ibcast_f08
+#endif
+
 subroutine MPI_Ibcast_f08(buffer,count,datatype,root,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_ibcast_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/ibsend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ibsend_f08.F90
index 2700e677600..0be1d905136 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ibsend_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ibsend_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ibsend_f08 PMPI_Ibsend_f08
+#endif
+
 subroutine MPI_Ibsend_f08(buf,count,datatype,dest,tag,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_ibsend_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/iexscan_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/iexscan_f08.F90
index ffdb919f611..fa505e9f294 100644
--- a/ompi/mpi/fortran/use-mpi-f08/iexscan_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/iexscan_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Iexscan_f08 PMPI_Iexscan_f08
+#endif
+
 subroutine MPI_Iexscan_f08(sendbuf,recvbuf,count,datatype,op,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_iexscan_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/igather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/igather_f08.F90
index 32b1bd43fc3..b6eedb194f5 100644
--- a/ompi/mpi/fortran/use-mpi-f08/igather_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/igather_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Igather_f08 PMPI_Igather_f08
+#endif
+
 subroutine MPI_Igather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,&
                           recvtype,root,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
diff --git a/ompi/mpi/fortran/use-mpi-f08/igatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/igatherv_f08.F90
index 69521081177..b194d633322 100644
--- a/ompi/mpi/fortran/use-mpi-f08/igatherv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/igatherv_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Igatherv_f08 PMPI_Igatherv_f08
+#endif
+
 subroutine MPI_Igatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
                            displs,recvtype,root,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
diff --git a/ompi/mpi/fortran/use-mpi-f08/improbe_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/improbe_f08.F90
index 946c9730ebc..1bc4ad5cc2a 100644
--- a/ompi/mpi/fortran/use-mpi-f08/improbe_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/improbe_f08.F90
@@ -4,8 +4,14 @@
 ! Copyright (c) 2010-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Improbe_f08 PMPI_Improbe_f08
+#endif
+
 subroutine MPI_Improbe_f08(source,tag,comm,flag,message,status,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Message, MPI_Status
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/imrecv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/imrecv_f08.F90
index 17763bcc421..23cd84a577c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/imrecv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/imrecv_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Imrecv_f08 PMPI_Imrecv_f08
+#endif
+
 subroutine MPI_Imrecv_f08(buf,count,datatype,message,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Message, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_imrecv_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgather_f08.F90
index d2d4eb0eacb..f7bd08ace48 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgather_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgather_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ineighbor_allgather_f08 PMPI_Ineighbor_allgather_f08
+#endif
+
 subroutine MPI_Ineighbor_allgather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_ineighbor_allgather_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgatherv_f08.F90
index f5c29907f52..73e5092dc27 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgatherv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgatherv_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ineighbor_allgatherv_f08 PMPI_Ineighbor_allgatherv_f08
+#endif
+
 subroutine MPI_Ineighbor_allgatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
                                         displs,recvtype,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
diff --git a/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoall_f08.F90
index fd556250103..68fb45490c5 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoall_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoall_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ineighbor_alltoall_f08 PMPI_Ineighbor_alltoall_f08
+#endif
+
 subroutine MPI_Ineighbor_alltoall_f08(sendbuf,sendcount,sendtype,recvbuf,&
                                       recvcount,recvtype,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
diff --git a/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallv_f08.F90
index 8408d86e1bd..6b2c3cbec38 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallv_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ineighbor_alltoallv_f08 PMPI_Ineighbor_alltoallv_f08
+#endif
+
 subroutine MPI_Ineighbor_alltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
                                        recvcounts,rdispls,recvtype,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
diff --git a/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallw_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallw_f08.F90
index 750f0fad30d..3404b9c0df5 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallw_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallw_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ineighbor_alltoallw_f08 PMPI_Ineighbor_alltoallw_f08
+#endif
+
 subroutine MPI_Ineighbor_alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,&
                                        recvbuf,recvcounts,rdispls,recvtypes,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request, MPI_ADDRESS_KIND
diff --git a/ompi/mpi/fortran/use-mpi-f08/info_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/info_create_f08.F90
index 0e17545988c..ff7aa530cb9 100644
--- a/ompi/mpi/fortran/use-mpi-f08/info_create_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/info_create_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Info_create_f08 PMPI_Info_create_f08
+#endif
+
 subroutine MPI_Info_create_f08(info,ierror)
    use :: mpi_f08_types, only : MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_info_create_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/info_delete_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/info_delete_f08.F90
index 5ed9a68531b..ec9982e4718 100644
--- a/ompi/mpi/fortran/use-mpi-f08/info_delete_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/info_delete_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Info_delete_f08 PMPI_Info_delete_f08
+#endif
+
 subroutine MPI_Info_delete_f08(info,key,ierror)
    use :: mpi_f08_types, only : MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_info_delete_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/info_dup_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/info_dup_f08.F90
index b5ce0e0fa4d..daf076c202b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/info_dup_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/info_dup_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Info_dup_f08 PMPI_Info_dup_f08
+#endif
+
 subroutine MPI_Info_dup_f08(info,newinfo,ierror)
    use :: mpi_f08_types, only : MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_info_dup_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/info_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/info_free_f08.F90
index 201dbd3f5de..87fc5d69614 100644
--- a/ompi/mpi/fortran/use-mpi-f08/info_free_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/info_free_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Info_free_f08 PMPI_Info_free_f08
+#endif
+
 subroutine MPI_Info_free_f08(info,ierror)
    use :: mpi_f08_types, only : MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_info_free_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/info_get_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/info_get_f08.F90
index 0de609fe8b8..194f584463b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/info_get_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/info_get_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Info_get_f08 PMPI_Info_get_f08
+#endif
+
 subroutine MPI_Info_get_f08(info,key,valuelen,value,flag,ierror)
    use :: mpi_f08_types, only : MPI_Info
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/info_get_nkeys_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/info_get_nkeys_f08.F90
index 2368bba3279..82a4a62e064 100644
--- a/ompi/mpi/fortran/use-mpi-f08/info_get_nkeys_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/info_get_nkeys_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Info_get_nkeys_f08 PMPI_Info_get_nkeys_f08
+#endif
+
 subroutine MPI_Info_get_nkeys_f08(info,nkeys,ierror)
    use :: mpi_f08_types, only : MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_info_get_nkeys_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/info_get_nthkey_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/info_get_nthkey_f08.F90
index 0941bb7350a..2c1a6407a2a 100644
--- a/ompi/mpi/fortran/use-mpi-f08/info_get_nthkey_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/info_get_nthkey_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Info_get_nthkey_f08 PMPI_Info_get_nthkey_f08
+#endif
+
 subroutine MPI_Info_get_nthkey_f08(info,n,key,ierror)
    use :: mpi_f08_types, only : MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_info_get_nthkey_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/info_get_valuelen_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/info_get_valuelen_f08.F90
index 9541f466f97..cb15836a186 100644
--- a/ompi/mpi/fortran/use-mpi-f08/info_get_valuelen_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/info_get_valuelen_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Info_get_valuelen_f08 PMPI_Info_get_valuelen_f08
+#endif
+
 subroutine MPI_Info_get_valuelen_f08(info,key,valuelen,flag,ierror)
    use :: mpi_f08_types, only : MPI_Info
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/info_set_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/info_set_f08.F90
index dc71caf3bbe..0eed8db2252 100644
--- a/ompi/mpi/fortran/use-mpi-f08/info_set_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/info_set_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Info_set_f08 PMPI_Info_set_f08
+#endif
+
 subroutine MPI_Info_set_f08(info,key,value,ierror)
    use :: mpi_f08_types, only : MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_info_set_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/init_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/init_f08.F90
index 5cdc84830ae..90eea174f48 100644
--- a/ompi/mpi/fortran/use-mpi-f08/init_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/init_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Init_f08 PMPI_Init_f08
+#endif
+
 subroutine MPI_Init_f08(ierror)
    use :: ompi_mpifh_bindings, only : ompi_init_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/init_thread_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/init_thread_f08.F90
index c8e25c45dd9..c6befeb2cba 100644
--- a/ompi/mpi/fortran/use-mpi-f08/init_thread_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/init_thread_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Init_thread_f08 PMPI_Init_thread_f08
+#endif
+
 subroutine MPI_Init_thread_f08(required,provided,ierror)
    use :: ompi_mpifh_bindings, only : ompi_init_thread_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/initialized_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/initialized_f08.F90
index e31cc6125b7..d337406fab0 100644
--- a/ompi/mpi/fortran/use-mpi-f08/initialized_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/initialized_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Initialized_f08 PMPI_Initialized_f08
+#endif
+
 subroutine MPI_Initialized_f08(flag,ierror)
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
    ! call a PMPI_* subroutine below.
diff --git a/ompi/mpi/fortran/use-mpi-f08/intercomm_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/intercomm_create_f08.F90
index c5ebac96d32..ce5a3b18851 100644
--- a/ompi/mpi/fortran/use-mpi-f08/intercomm_create_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/intercomm_create_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Intercomm_create_f08 PMPI_Intercomm_create_f08
+#endif
+
 subroutine MPI_Intercomm_create_f08(local_comm,local_leader,peer_comm,&
                                     remote_leader,tag,newintercomm,ierror)
    use :: mpi_f08_types, only : MPI_Comm
diff --git a/ompi/mpi/fortran/use-mpi-f08/intercomm_merge_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/intercomm_merge_f08.F90
index b1f184efc84..fe0eba7546c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/intercomm_merge_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/intercomm_merge_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Intercomm_merge_f08 PMPI_Intercomm_merge_f08
+#endif
+
 subroutine MPI_Intercomm_merge_f08(intercomm,high,newintracomm,ierror)
    use :: mpi_f08_types, only : MPI_Comm
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/iprobe_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/iprobe_f08.F90
index 7d241770e24..c7689129cc9 100644
--- a/ompi/mpi/fortran/use-mpi-f08/iprobe_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/iprobe_f08.F90
@@ -3,9 +3,15 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 !
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Iprobe_f08 PMPI_Iprobe_f08
+#endif
+
 subroutine MPI_Iprobe_f08(source,tag,comm,flag,status,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Status
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/irecv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/irecv_f08.F90
index db607bcbb72..022a33363ed 100644
--- a/ompi/mpi/fortran/use-mpi-f08/irecv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/irecv_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Irecv_f08 PMPI_Irecv_f08
+#endif
+
 subroutine MPI_Irecv_f08(buf,count,datatype,source,tag,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_irecv_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/ireduce_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ireduce_f08.F90
index aa9bb7f8830..d93d3ab9b59 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ireduce_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ireduce_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ireduce_f08 PMPI_Ireduce_f08
+#endif
+
 subroutine MPI_Ireduce_f08(sendbuf,recvbuf,count,datatype,op,root,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_ireduce_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/ireduce_scatter_block_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ireduce_scatter_block_f08.F90
index ceebdce4d02..fa707935521 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ireduce_scatter_block_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ireduce_scatter_block_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ireduce_scatter_block_f08 PMPI_Ireduce_scatter_block_f08
+#endif
+
 subroutine MPI_Ireduce_scatter_block_f08(sendbuf,recvbuf,recvcount,datatype,op,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_ireduce_scatter_block_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/ireduce_scatter_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ireduce_scatter_f08.F90
index 2367e74d37a..aa3e72487e8 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ireduce_scatter_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ireduce_scatter_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ireduce_scatter_f08 PMPI_Ireduce_scatter_f08
+#endif
+
 subroutine MPI_Ireduce_scatter_f08(sendbuf,recvbuf,recvcounts,datatype,op,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_ireduce_scatter_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/irsend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/irsend_f08.F90
index e1b5f1ef35a..e0325111864 100644
--- a/ompi/mpi/fortran/use-mpi-f08/irsend_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/irsend_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Irsend_f08 PMPI_Irsend_f08
+#endif
+
 subroutine MPI_Irsend_f08(buf,count,datatype,dest,tag,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_irsend_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/is_thread_main_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/is_thread_main_f08.F90
index acd5326de2e..abf8bb8c0d2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/is_thread_main_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/is_thread_main_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Is_thread_main_f08 PMPI_Is_thread_main_f08
+#endif
+
 subroutine MPI_Is_thread_main_f08(flag,ierror)
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
    ! call a PMPI_* subroutine below.
diff --git a/ompi/mpi/fortran/use-mpi-f08/iscan_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/iscan_f08.F90
index 55ce8b9a9e9..d771d0517c6 100644
--- a/ompi/mpi/fortran/use-mpi-f08/iscan_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/iscan_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Iscan_f08 PMPI_Iscan_f08
+#endif
+
 subroutine MPI_Iscan_f08(sendbuf,recvbuf,count,datatype,op,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_iscan_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/iscatter_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/iscatter_f08.F90
index 86e31d1d5aa..c8499212031 100644
--- a/ompi/mpi/fortran/use-mpi-f08/iscatter_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/iscatter_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Iscatter_f08 PMPI_Iscatter_f08
+#endif
+
 subroutine MPI_Iscatter_f08(sendbuf,sendcount,sendtype,recvbuf,&
                            recvcount,recvtype,root,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
diff --git a/ompi/mpi/fortran/use-mpi-f08/iscatterv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/iscatterv_f08.F90
index 19f0ad8d3de..917c72c3b94 100644
--- a/ompi/mpi/fortran/use-mpi-f08/iscatterv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/iscatterv_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Iscatterv_f08 PMPI_Iscatterv_f08
+#endif
+
 subroutine MPI_Iscatterv_f08(sendbuf,sendcounts,displs,sendtype,recvbuf,&
                             recvcount,recvtype,root,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
diff --git a/ompi/mpi/fortran/use-mpi-f08/isend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/isend_f08.F90
index cbf92d820a8..6c783d6e40a 100644
--- a/ompi/mpi/fortran/use-mpi-f08/isend_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/isend_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Isend_f08 PMPI_Isend_f08
+#endif
+
 subroutine MPI_Isend_f08(buf,count,datatype,dest,tag,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_isend_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/issend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/issend_f08.F90
index 3ff0cb895e4..1be0e51086b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/issend_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/issend_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Issend_f08 PMPI_Issend_f08
+#endif
+
 subroutine MPI_Issend_f08(buf,count,datatype,dest,tag,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_issend_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/lookup_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/lookup_name_f08.F90
index 21a9b484868..6116287a082 100644
--- a/ompi/mpi/fortran/use-mpi-f08/lookup_name_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/lookup_name_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Lookup_name_f08 PMPI_Lookup_name_f08
+#endif
+
 subroutine MPI_Lookup_name_f08(service_name,info,port_name,ierror)
    use :: mpi_f08_types, only : MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_lookup_name_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/mprobe_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/mprobe_f08.F90
index c1a39889e40..5aaf91b39bb 100644
--- a/ompi/mpi/fortran/use-mpi-f08/mprobe_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/mprobe_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2010-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Mprobe_f08 PMPI_Mprobe_f08
+#endif
+
 subroutine MPI_Mprobe_f08(source,tag,comm,message,status,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Message, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_mprobe_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/mrecv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/mrecv_f08.F90
index 157a52d36f7..74b7a3456f3 100644
--- a/ompi/mpi/fortran/use-mpi-f08/mrecv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/mrecv_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Mrecv_f08 PMPI_Mrecv_f08
+#endif
+
 subroutine MPI_Mrecv_f08(buf,count,datatype,message,status,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Message, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_mrecv_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/neighbor_allgather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/neighbor_allgather_f08.F90
index 251a141182f..63989668234 100644
--- a/ompi/mpi/fortran/use-mpi-f08/neighbor_allgather_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/neighbor_allgather_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Neighbor_allgather_f08 PMPI_Neighbor_allgather_f08
+#endif
+
 subroutine MPI_Neighbor_allgather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_neighbor_allgather_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/neighbor_allgatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/neighbor_allgatherv_f08.F90
index b837ba44ff2..f05ccc98457 100644
--- a/ompi/mpi/fortran/use-mpi-f08/neighbor_allgatherv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/neighbor_allgatherv_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Neighbor_allgatherv_f08 PMPI_Neighbor_allgatherv_f08
+#endif
+
 subroutine MPI_Neighbor_allgatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
                                        displs,recvtype,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
diff --git a/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoall_f08.F90
index 1567bef7d5e..5c40baf016d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoall_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoall_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Neighbor_alltoall_f08 PMPI_Neighbor_alltoall_f08
+#endif
+
 subroutine MPI_Neighbor_alltoall_f08(sendbuf,sendcount,sendtype,recvbuf,&
                                      recvcount,recvtype,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
diff --git a/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallv_f08.F90
index 4e3a2e91c56..159c97ae12c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallv_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Neighbor_alltoallv_f08 PMPI_Neighbor_alltoallv_f08
+#endif
+
 subroutine MPI_Neighbor_alltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
                                       recvcounts,rdispls,recvtype,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
diff --git a/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallw_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallw_f08.F90
index 292b846acdc..c2fac1339aa 100644
--- a/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallw_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallw_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Neighbor_alltoallw_f08 PMPI_Neighbor_alltoallw_f08
+#endif
+
 subroutine MPI_Neighbor_alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,&
                                       recvbuf,recvcounts,rdispls,recvtypes,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_ADDRESS_KIND
diff --git a/ompi/mpi/fortran/use-mpi-f08/op_commutative_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/op_commutative_f08.F90
index bb152379fe2..9e3becd2859 100644
--- a/ompi/mpi/fortran/use-mpi-f08/op_commutative_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/op_commutative_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Op_commutative_f08 PMPI_Op_commutative_f08
+#endif
+
 subroutine MPI_Op_commutative_f08(op,commute,ierror)
    use :: mpi_f08_types, only : MPI_Op
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/op_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/op_create_f08.F90
index b4b549e78ad..0a15d49a6c7 100644
--- a/ompi/mpi/fortran/use-mpi-f08/op_create_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/op_create_f08.F90
@@ -3,10 +3,16 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Op_create_f08 PMPI_Op_create_f08
+#endif
+
 subroutine MPI_Op_create_f08(user_fn,commute,op,ierror)
    use :: mpi_f08_types, only : MPI_Op
    use :: mpi_f08_interfaces_callbacks, only : MPI_User_function
diff --git a/ompi/mpi/fortran/use-mpi-f08/op_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/op_free_f08.F90
index d8e36c75b41..a693bffead1 100644
--- a/ompi/mpi/fortran/use-mpi-f08/op_free_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/op_free_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Op_free_f08 PMPI_Op_free_f08
+#endif
+
 subroutine MPI_Op_free_f08(op,ierror)
    use :: mpi_f08_types, only : MPI_Op
    use :: ompi_mpifh_bindings, only : ompi_op_free_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/open_port_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/open_port_f08.F90
index 558f0842532..9f9f7dafefa 100644
--- a/ompi/mpi/fortran/use-mpi-f08/open_port_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/open_port_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Open_port_f08 PMPI_Open_port_f08
+#endif
+
 subroutine MPI_Open_port_f08(info,port_name,ierror)
    use :: mpi_f08_types, only : MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_open_port_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/pack_external_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/pack_external_f08.F90
index af84cdac291..c4f1e51976d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/pack_external_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/pack_external_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Pack_external_f08 PMPI_Pack_external_f08
+#endif
+
 subroutine MPI_Pack_external_f08(datarep,inbuf,incount,datatype,outbuf,outsize, &
                                  position,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
diff --git a/ompi/mpi/fortran/use-mpi-f08/pack_external_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/pack_external_size_f08.F90
index 3c7393f13e8..d076d3a66be 100644
--- a/ompi/mpi/fortran/use-mpi-f08/pack_external_size_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/pack_external_size_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Pack_external_size_f08 PMPI_Pack_external_size_f08
+#endif
+
 subroutine MPI_Pack_external_size_f08(datarep,incount,datatype,size,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_pack_external_size_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/pack_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/pack_f08.F90
index bee3d73a0e5..348d025e744 100644
--- a/ompi/mpi/fortran/use-mpi-f08/pack_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/pack_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Pack_f08 PMPI_Pack_f08
+#endif
+
 subroutine MPI_Pack_f08(inbuf,incount,datatype,outbuf,outsize,position,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_pack_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/pack_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/pack_size_f08.F90
index 502c7dfee86..32deb2f7297 100644
--- a/ompi/mpi/fortran/use-mpi-f08/pack_size_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/pack_size_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Pack_size_f08 PMPI_Pack_size_f08
+#endif
+
 subroutine MPI_Pack_size_f08(incount,datatype,comm,size,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_pack_size_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/pcontrol_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/pcontrol_f08.F90
index 6f9f7287061..a284066d95d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/pcontrol_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/pcontrol_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Pcontrol_f08 PMPI_Pcontrol_f08
+#endif
+
 subroutine MPI_Pcontrol_f08(level)
    use :: ompi_mpifh_bindings, only : ompi_pcontrol_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/probe_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/probe_f08.F90
index d4e8d180d43..0e573a5d9b2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/probe_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/probe_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Probe_f08 PMPI_Probe_f08
+#endif
+
 subroutine MPI_Probe_f08(source,tag,comm,status,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_probe_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/Makefile.am b/ompi/mpi/fortran/use-mpi-f08/profile/Makefile.am
new file mode 100644
index 00000000000..6f1bf55ed30
--- /dev/null
+++ b/ompi/mpi/fortran/use-mpi-f08/profile/Makefile.am
@@ -0,0 +1,430 @@
+
+# -*- makefile.am	 -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2013 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
+# Copyright (c) 2012      Oak Ridge National Laboratory. All rights reserved.
+# Copyright (c) 2012-2013 Inria.  All rights reserved.
+# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
+#                         reserved.
+# Copyright (c) 2015-2019 Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+include $(top_srcdir)/Makefile.ompi-rules
+
+# This Makefile is only relevant if we're building the "use mpi_f08"
+# MPI bindings.
+if OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS
+
+AM_FCFLAGS = -I$(top_builddir)/ompi/include \
+             -I$(top_srcdir)/ompi/include \
+             $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/$(OMPI_FORTRAN_USEMPI_DIR) \
+             $(OMPI_FC_MODULE_FLAG)../mod \
+             $(OMPI_FC_MODULE_FLAG)../bindings \
+             -I$(top_srcdir) $(FCFLAGS_f90) \
+             -DOMPI_BUILD_MPI_PROFILING=1
+
+CLEANFILES += *.i90
+
+noinst_LTLIBRARIES = libmpi_usempif08_pmpi.la
+
+pmpi_api_files = \
+        pabort_f08.F90 \
+        paccumulate_f08.F90 \
+        padd_error_class_f08.F90 \
+        padd_error_code_f08.F90 \
+        padd_error_string_f08.F90 \
+        paint_add_f08.F90 \
+        paint_diff_f08.F90 \
+        pallgather_f08.F90 \
+        pallgatherv_f08.F90 \
+        palloc_mem_f08.F90 \
+        pallreduce_f08.F90 \
+        palltoall_f08.F90 \
+        palltoallv_f08.F90 \
+        palltoallw_f08.F90 \
+        pbarrier_f08.F90 \
+        pbcast_f08.F90 \
+        pbsend_f08.F90 \
+        pbsend_init_f08.F90 \
+        pbuffer_attach_f08.F90 \
+        pbuffer_detach_f08.F90 \
+        pcancel_f08.F90 \
+        pcart_coords_f08.F90 \
+        pcart_create_f08.F90 \
+        pcartdim_get_f08.F90 \
+        pcart_get_f08.F90 \
+        pcart_map_f08.F90 \
+        pcart_rank_f08.F90 \
+        pcart_shift_f08.F90 \
+        pcart_sub_f08.F90 \
+        pclose_port_f08.F90 \
+        pcomm_accept_f08.F90 \
+        pcomm_call_errhandler_f08.F90 \
+        pcomm_compare_f08.F90 \
+        pcomm_connect_f08.F90 \
+        pcomm_create_errhandler_f08.F90 \
+        pcomm_create_f08.F90 \
+        pcomm_create_group_f08.F90 \
+        pcomm_create_keyval_f08.F90 \
+        pcomm_delete_attr_f08.F90 \
+        pcomm_disconnect_f08.F90 \
+        pcomm_dup_f08.F90 \
+        pcomm_dup_with_info_f08.F90 \
+        pcomm_idup_f08.F90 \
+        pcomm_free_f08.F90 \
+        pcomm_free_keyval_f08.F90 \
+        pcomm_get_attr_f08.F90 \
+        pcomm_get_errhandler_f08.F90 \
+        pcomm_get_info_f08.F90 \
+        pcomm_get_name_f08.F90 \
+        pcomm_get_parent_f08.F90 \
+        pcomm_group_f08.F90 \
+        pcomm_join_f08.F90 \
+        pcomm_rank_f08.F90 \
+        pcomm_remote_group_f08.F90 \
+        pcomm_remote_size_f08.F90 \
+        pcomm_set_attr_f08.F90 \
+        pcomm_set_errhandler_f08.F90 \
+        pcomm_set_info_f08.F90 \
+        pcomm_set_name_f08.F90 \
+        pcomm_size_f08.F90 \
+        pcomm_spawn_f08.F90 \
+        pcomm_spawn_multiple_f08.F90 \
+        pcomm_split_f08.F90 \
+        pcomm_split_type_f08.F90 \
+        pcomm_test_inter_f08.F90 \
+        pcompare_and_swap_f08.F90 \
+        pdims_create_f08.F90 \
+        pdist_graph_create_adjacent_f08.F90 \
+        pdist_graph_create_f08.F90 \
+        pdist_graph_neighbors_count_f08.F90 \
+        pdist_graph_neighbors_f08.F90 \
+        perrhandler_free_f08.F90 \
+        perror_class_f08.F90 \
+        perror_string_f08.F90 \
+        pexscan_f08.F90 \
+        pf_sync_reg_f08.F90 \
+        pfetch_and_op_f08.F90 \
+        pfile_call_errhandler_f08.F90 \
+        pfile_close_f08.F90 \
+        pfile_create_errhandler_f08.F90 \
+        pfile_delete_f08.F90 \
+        pfile_get_amode_f08.F90 \
+        pfile_get_atomicity_f08.F90 \
+        pfile_get_byte_offset_f08.F90 \
+        pfile_get_errhandler_f08.F90 \
+        pfile_get_group_f08.F90 \
+        pfile_get_info_f08.F90 \
+        pfile_get_position_f08.F90 \
+        pfile_get_position_shared_f08.F90 \
+        pfile_get_size_f08.F90 \
+        pfile_get_type_extent_f08.F90 \
+        pfile_get_view_f08.F90 \
+        pfile_iread_at_f08.F90 \
+        pfile_iread_f08.F90 \
+        pfile_iread_at_all_f08.F90 \
+        pfile_iread_all_f08.F90 \
+        pfile_iread_shared_f08.F90 \
+        pfile_iwrite_at_f08.F90 \
+        pfile_iwrite_f08.F90 \
+        pfile_iwrite_at_all_f08.F90 \
+        pfile_iwrite_all_f08.F90 \
+        pfile_iwrite_shared_f08.F90 \
+        pfile_open_f08.F90 \
+        pfile_preallocate_f08.F90 \
+        pfile_read_all_begin_f08.F90 \
+        pfile_read_all_end_f08.F90 \
+        pfile_read_all_f08.F90 \
+        pfile_read_at_all_begin_f08.F90 \
+        pfile_read_at_all_end_f08.F90 \
+        pfile_read_at_all_f08.F90 \
+        pfile_read_at_f08.F90 \
+        pfile_read_f08.F90 \
+        pfile_read_ordered_begin_f08.F90 \
+        pfile_read_ordered_end_f08.F90 \
+        pfile_read_ordered_f08.F90 \
+        pfile_read_shared_f08.F90 \
+        pfile_seek_f08.F90 \
+        pfile_seek_shared_f08.F90 \
+        pfile_set_atomicity_f08.F90 \
+        pfile_set_errhandler_f08.F90 \
+        pfile_set_info_f08.F90 \
+        pfile_set_size_f08.F90 \
+        pfile_set_view_f08.F90 \
+        pfile_sync_f08.F90 \
+        pfile_write_all_begin_f08.F90 \
+        pfile_write_all_end_f08.F90 \
+        pfile_write_all_f08.F90 \
+        pfile_write_at_all_begin_f08.F90 \
+        pfile_write_at_all_end_f08.F90 \
+        pfile_write_at_all_f08.F90 \
+        pfile_write_at_f08.F90 \
+        pfile_write_f08.F90 \
+        pfile_write_ordered_begin_f08.F90 \
+        pfile_write_ordered_end_f08.F90 \
+        pfile_write_ordered_f08.F90 \
+        pfile_write_shared_f08.F90 \
+        pfinalized_f08.F90 \
+        pfinalize_f08.F90 \
+        pfree_mem_f08.F90 \
+        pgather_f08.F90 \
+        pgatherv_f08.F90 \
+        pget_accumulate_f08.F90 \
+        pget_address_f08.F90 \
+        pget_count_f08.F90 \
+        pget_elements_f08.F90 \
+        pget_elements_x_f08.F90 \
+        pget_f08.F90 \
+        pget_library_version_f08.F90 \
+        pget_processor_name_f08.F90 \
+        pget_version_f08.F90 \
+        pgraph_create_f08.F90 \
+        pgraphdims_get_f08.F90 \
+        pgraph_get_f08.F90 \
+        pgraph_map_f08.F90 \
+        pgraph_neighbors_count_f08.F90 \
+        pgraph_neighbors_f08.F90 \
+        pgrequest_complete_f08.F90 \
+        pgrequest_start_f08.F90 \
+        pgroup_compare_f08.F90 \
+        pgroup_difference_f08.F90 \
+        pgroup_excl_f08.F90 \
+        pgroup_free_f08.F90 \
+        pgroup_incl_f08.F90 \
+        pgroup_intersection_f08.F90 \
+        pgroup_range_excl_f08.F90 \
+        pgroup_range_incl_f08.F90 \
+        pgroup_rank_f08.F90 \
+        pgroup_size_f08.F90 \
+        pgroup_translate_ranks_f08.F90 \
+        pgroup_union_f08.F90 \
+        piallgather_f08.F90 \
+        piallgatherv_f08.F90 \
+        piallreduce_f08.F90 \
+        pialltoall_f08.F90 \
+        pialltoallv_f08.F90 \
+        pialltoallw_f08.F90 \
+        pibarrier_f08.F90 \
+        pibcast_f08.F90 \
+        pibsend_f08.F90 \
+        pigather_f08.F90 \
+        pigatherv_f08.F90 \
+        piexscan_f08.F90 \
+        pimprobe_f08.F90 \
+        pimrecv_f08.F90 \
+        pineighbor_allgather_f08.F90 \
+        pineighbor_allgatherv_f08.F90 \
+        pineighbor_alltoall_f08.F90 \
+        pineighbor_alltoallv_f08.F90 \
+        pineighbor_alltoallw_f08.F90 \
+        pinfo_create_f08.F90 \
+        pinfo_delete_f08.F90 \
+        pinfo_dup_f08.F90 \
+        pinfo_free_f08.F90 \
+        pinfo_get_f08.F90 \
+        pinfo_get_nkeys_f08.F90 \
+        pinfo_get_nthkey_f08.F90 \
+        pinfo_get_valuelen_f08.F90 \
+        pinfo_set_f08.F90 \
+        pinit_f08.F90 \
+        pinitialized_f08.F90 \
+        pinit_thread_f08.F90 \
+        pintercomm_create_f08.F90 \
+        pintercomm_merge_f08.F90 \
+        piprobe_f08.F90 \
+        pirecv_f08.F90 \
+        pireduce_f08.F90 \
+        pireduce_scatter_f08.F90 \
+        pireduce_scatter_block_f08.F90 \
+        pirsend_f08.F90 \
+        piscan_f08.F90 \
+        piscatter_f08.F90 \
+        piscatterv_f08.F90 \
+        pisend_f08.F90 \
+        pissend_f08.F90 \
+        pis_thread_main_f08.F90 \
+        plookup_name_f08.F90 \
+        pmprobe_f08.F90 \
+        pmrecv_f08.F90 \
+        pneighbor_allgather_f08.F90 \
+        pneighbor_allgatherv_f08.F90 \
+        pneighbor_alltoall_f08.F90 \
+        pneighbor_alltoallv_f08.F90 \
+        pneighbor_alltoallw_f08.F90 \
+        pop_commutative_f08.F90 \
+        pop_create_f08.F90 \
+        popen_port_f08.F90 \
+        pop_free_f08.F90 \
+        ppack_external_f08.F90 \
+        ppack_external_size_f08.F90 \
+        ppack_f08.F90 \
+        ppack_size_f08.F90 \
+        ppcontrol_f08.F90 \
+        pprobe_f08.F90 \
+        ppublish_name_f08.F90 \
+        pput_f08.F90 \
+        pquery_thread_f08.F90 \
+        praccumulate_f08.F90 \
+        precv_f08.F90 \
+        precv_init_f08.F90 \
+        preduce_f08.F90 \
+        preduce_local_f08.F90 \
+        preduce_scatter_f08.F90 \
+        preduce_scatter_block_f08.F90 \
+        pregister_datarep_f08.F90 \
+        prequest_free_f08.F90 \
+        prequest_get_status_f08.F90 \
+        prget_f08.F90 \
+        prget_accumulate_f08.F90 \
+        prput_f08.F90 \
+        prsend_f08.F90 \
+        prsend_init_f08.F90 \
+        pscan_f08.F90 \
+        pscatter_f08.F90 \
+        pscatterv_f08.F90 \
+        psend_f08.F90 \
+        psend_init_f08.F90 \
+        psendrecv_f08.F90 \
+        psendrecv_replace_f08.F90 \
+        pssend_f08.F90 \
+        pssend_init_f08.F90 \
+        pstartall_f08.F90 \
+        pstart_f08.F90 \
+        pstatus_set_cancelled_f08.F90 \
+        pstatus_set_elements_f08.F90 \
+        pstatus_set_elements_x_f08.F90 \
+        ptestall_f08.F90 \
+        ptestany_f08.F90 \
+        ptest_cancelled_f08.F90 \
+        ptest_f08.F90 \
+        ptestsome_f08.F90 \
+        ptopo_test_f08.F90 \
+        ptype_commit_f08.F90 \
+        ptype_contiguous_f08.F90 \
+        ptype_create_darray_f08.F90 \
+        ptype_create_f90_complex_f08.F90 \
+        ptype_create_f90_integer_f08.F90 \
+        ptype_create_f90_real_f08.F90 \
+        ptype_create_hindexed_f08.F90 \
+        ptype_create_hvector_f08.F90 \
+        ptype_create_indexed_block_f08.F90 \
+        ptype_create_hindexed_block_f08.F90 \
+        ptype_create_keyval_f08.F90 \
+        ptype_create_resized_f08.F90 \
+        ptype_create_struct_f08.F90 \
+        ptype_create_subarray_f08.F90 \
+        ptype_delete_attr_f08.F90 \
+        ptype_dup_f08.F90 \
+        ptype_free_f08.F90 \
+        ptype_free_keyval_f08.F90 \
+        ptype_get_attr_f08.F90 \
+        ptype_get_contents_f08.F90 \
+        ptype_get_envelope_f08.F90 \
+        ptype_get_extent_f08.F90 \
+        ptype_get_extent_x_f08.F90 \
+        ptype_get_name_f08.F90 \
+        ptype_get_true_extent_f08.F90 \
+        ptype_get_true_extent_x_f08.F90 \
+        ptype_indexed_f08.F90 \
+        ptype_match_size_f08.F90 \
+        ptype_set_attr_f08.F90 \
+        ptype_set_name_f08.F90 \
+        ptype_size_f08.F90 \
+        ptype_size_x_f08.F90 \
+        ptype_vector_f08.F90 \
+        punpack_external_f08.F90 \
+        punpack_f08.F90 \
+        punpublish_name_f08.F90 \
+        pwaitall_f08.F90 \
+        pwaitany_f08.F90 \
+        pwait_f08.F90 \
+        pwaitsome_f08.F90 \
+        pwin_allocate_f08.F90 \
+        pwin_allocate_shared_f08.F90 \
+        pwin_attach_f08.F90 \
+        pwin_call_errhandler_f08.F90 \
+        pwin_complete_f08.F90 \
+        pwin_create_dynamic_f08.F90 \
+        pwin_create_errhandler_f08.F90 \
+        pwin_create_f08.F90 \
+        pwin_create_keyval_f08.F90 \
+        pwin_delete_attr_f08.F90 \
+        pwin_detach_f08.F90 \
+        pwin_fence_f08.F90 \
+        pwin_flush_f08.F90 \
+        pwin_flush_all_f08.F90 \
+        pwin_flush_local_f08.F90 \
+        pwin_flush_local_all_f08.F90 \
+        pwin_free_f08.F90 \
+        pwin_free_keyval_f08.F90 \
+        pwin_get_attr_f08.F90 \
+        pwin_get_errhandler_f08.F90 \
+        pwin_get_group_f08.F90 \
+        pwin_get_info_f08.F90 \
+        pwin_get_name_f08.F90 \
+        pwin_lock_f08.F90 \
+        pwin_lock_all_f08.F90 \
+        pwin_post_f08.F90 \
+        pwin_set_attr_f08.F90 \
+        pwin_set_errhandler_f08.F90 \
+        pwin_set_info_f08.F90 \
+        pwin_set_name_f08.F90 \
+        pwin_shared_query_f08.F90 \
+        pwin_start_f08.F90 \
+        pwin_sync_f08.F90 \
+        pwin_test_f08.F90 \
+        pwin_unlock_f08.F90 \
+        pwin_unlock_all_f08.F90 \
+        pwin_wait_f08.F90
+
+#
+# Automake doesn't do Fortran dependency analysis, so must list them
+# manually here.  Bummer!
+#
+
+pmpi_api_lo_files = $(pmpi_api_files:.F90=.lo)
+
+$(pmpi_api_lo_files): ../bindings/libforce_usempif08_internal_bindings_to_be_built.la
+
+nodist_libmpi_usempif08_pmpi_la_SOURCES = \
+        $(pmpi_api_files)
+
+#
+# Sym link in the sources from the real MPI directory
+#
+$(nodist_libmpi_usempif08_pmpi_la_SOURCES):
+	$(OMPI_V_LN_S) if test ! -r $@ ; then \
+		pname=`echo $@ | cut -b '2-'` ; \
+		$(LN_S) $(top_srcdir)/ompi/mpi/fortran/use-mpi-f08/$$pname $@ ; \
+	fi
+
+# These files were created by targets above
+
+MAINTAINERCLEANFILES = $(nodist_libmpi_usempif08_pmpi_la_SOURCES)
+
+endif
+
+# Don't want these targets in here
+
+tags-recursive:
+tags:
+TAGS:
+GTAGS:
+ID:
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pabort_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pabort_f08.F90
deleted file mode 100644
index 93725caef49..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pabort_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Abort_f08(comm,errorcode,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_abort_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: errorcode
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_abort_f(comm%MPI_VAL,errorcode,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Abort_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/paccumulate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/paccumulate_f08.F90
deleted file mode 100644
index d4a21acb5da..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/paccumulate_f08.F90
+++ /dev/null
@@ -1,34 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Accumulate_f08(origin_addr,origin_count,origin_datatype,&
-                               target_rank,target_disp,target_count,    &
-                               target_datatype,op,win,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_accumulate_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
-   INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
-   TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp
-   TYPE(MPI_Datatype), INTENT(IN) :: target_datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_accumulate_f(origin_addr,origin_count,origin_datatype%MPI_VAL,target_rank,&
-                          target_disp,target_count,target_datatype%MPI_VAL,&
-                          op%MPI_VAL,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Accumulate_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/padd_error_class_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/padd_error_class_f08.F90
deleted file mode 100644
index a5bb25bd57d..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/padd_error_class_f08.F90
+++ /dev/null
@@ -1,20 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Add_error_class_f08(errorclass,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_add_error_class_f
-   implicit none
-   INTEGER, INTENT(OUT) :: errorclass
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_add_error_class_f(errorclass,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Add_error_class_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/padd_error_code_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/padd_error_code_f08.F90
deleted file mode 100644
index 4667a587225..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/padd_error_code_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Add_error_code_f08(errorclass,errorcode,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_add_error_code_f
-   implicit none
-   INTEGER, INTENT(IN) :: errorclass
-   INTEGER, INTENT(OUT) :: errorcode
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_add_error_code_f(errorclass,errorcode,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Add_error_code_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/padd_error_string_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/padd_error_string_f08.F90
deleted file mode 100644
index 05a3a0e2504..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/padd_error_string_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2011 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Add_error_string_f08(errorcode,string,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_add_error_string_f
-   implicit none
-   integer, intent(in) :: errorcode
-   character(len=*), intent(in) :: string
-   integer, optional, intent(out) :: ierror
-   integer :: c_ierror
-
-   call ompi_add_error_string_f(errorcode, string, c_ierror, len(string))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Add_error_string_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/paint_add_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/paint_add_f08.F90
deleted file mode 100644
index 324de48ae75..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/paint_add_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2015 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-function PMPI_Aint_add_f08(base, disp)
-   use :: mpi_f08_types, only : MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_aint_add_f
-   implicit none
-   INTEGER(MPI_ADDRESS_KIND) :: PMPI_Aint_add_f08
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: base
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: disp
-   PMPI_Aint_add_f08 = ompi_aint_add_f(base, disp)
-end function PMPI_Aint_add_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/paint_diff_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/paint_diff_f08.F90
deleted file mode 100644
index c7673f5341e..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/paint_diff_f08.F90
+++ /dev/null
@@ -1,20 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2015 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-function PMPI_Aint_diff_f08(addr1, addr2)
-   use :: mpi_f08_types, only : MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_aint_diff_f
-   implicit none
-   INTEGER(MPI_ADDRESS_KIND) :: PMPI_Aint_diff_f08
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr1
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr2
-   PMPI_Aint_diff_f08 = ompi_aint_diff_f(addr1, addr2)
-end function PMPI_Aint_diff_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pallgather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pallgather_f08.F90
deleted file mode 100644
index cbf96e381c7..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pallgather_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Allgather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_allgather_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, recvcount
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_allgather_f(sendbuf,sendcount,sendtype%MPI_VAL,&
-                         recvbuf,recvcount,recvtype%MPI_VAL,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Allgather_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pallgatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pallgatherv_f08.F90
deleted file mode 100644
index 00752d9dd5b..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pallgatherv_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Allgatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
-                               displs,recvtype,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_allgatherv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount
-   INTEGER, INTENT(IN) :: recvcounts(*), displs(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_allgatherv_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,recvcounts,&
-                          displs,recvtype%MPI_VAL,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Allgatherv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/palloc_mem_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/palloc_mem_f08.F90
deleted file mode 100644
index db79bb3d9b8..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/palloc_mem_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Alloc_mem_f08(size,info,baseptr,ierror)
-   use, intrinsic :: ISO_C_BINDING, only : C_PTR
-   use :: mpi_f08_types, only : MPI_Info, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_alloc_mem_f
-   implicit none
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: size
-   TYPE(MPI_Info), INTENT(IN) :: info
-   TYPE(C_PTR), INTENT(OUT) :: baseptr
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_alloc_mem_f(size,info%MPI_VAL,baseptr,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Alloc_mem_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pallreduce_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pallreduce_f08.F90
deleted file mode 100644
index 93658337205..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pallreduce_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Allreduce_f08(sendbuf,recvbuf,count,datatype,op,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_allreduce_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_allreduce_f(sendbuf,recvbuf,count,datatype%MPI_VAL,&
-                         op%MPI_VAL,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Allreduce_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/palltoall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/palltoall_f08.F90
deleted file mode 100644
index 467bbaf1fe6..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/palltoall_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Alltoall_f08(sendbuf,sendcount,sendtype,recvbuf,&
-                             recvcount,recvtype,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_alltoall_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, recvcount
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_alltoall_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,&
-                        recvcount,recvtype%MPI_VAL,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Alltoall_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/palltoallv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/palltoallv_f08.F90
deleted file mode 100644
index 87646472532..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/palltoallv_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Alltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
-                              recvcounts,rdispls,recvtype,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_alltoallv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_alltoallv_f(sendbuf,sendcounts,sdispls,sendtype%MPI_VAL,&
-                         recvbuf,recvcounts,rdispls,recvtype%MPI_VAL,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Alltoallv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/palltoallw_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/palltoallw_f08.F90
deleted file mode 100644
index e237579e23c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/palltoallw_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,&
-                              recvbuf,recvcounts,rdispls,recvtypes,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_alltoallw_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtypes(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtypes(*)
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_alltoallw_f(sendbuf,sendcounts,sdispls,sendtypes(1)%MPI_VAL,&
-                         recvbuf,recvcounts,rdispls,recvtypes(1)%MPI_VAL,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Alltoallw_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pbarrier_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pbarrier_f08.F90
deleted file mode 100644
index bb1d9c5b7fc..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pbarrier_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Barrier_f08(comm,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_barrier_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_barrier_f(comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Barrier_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pbcast_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pbcast_f08.F90
deleted file mode 100644
index 94c7efd7ac2..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pbcast_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Bcast_f08(buffer,count,datatype,root,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_bcast_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: buffer
-   INTEGER, INTENT(IN) :: count, root
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_bcast_f(buffer,count,datatype%MPI_VAL,root,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Bcast_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pbsend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pbsend_f08.F90
deleted file mode 100644
index a443f9b9019..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pbsend_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Bsend_f08(buf,count,datatype,dest,tag,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_bsend_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count, dest, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_bsend_f(buf,count,datatype%MPI_VAL,dest,tag,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Bsend_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pbsend_init_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pbsend_init_f08.F90
deleted file mode 100644
index 488bce1bb7f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pbsend_init_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Bsend_init_f08(buf,count,datatype,dest,tag,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_bsend_init_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count, dest, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_bsend_init_f(buf,count,datatype%MPI_VAL,dest,tag,comm%MPI_VAL, &
-                          request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Bsend_init_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pbuffer_attach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pbuffer_attach_f08.F90
deleted file mode 100644
index 2be69db7fde..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pbuffer_attach_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Buffer_attach_f08(buffer,size,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_buffer_attach_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: buffer
-   INTEGER, INTENT(IN) :: size
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_buffer_attach_f(buffer,size,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Buffer_attach_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pbuffer_detach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pbuffer_detach_f08.F90
deleted file mode 100644
index e1f5cdbc44b..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pbuffer_detach_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Buffer_detach_f08(buffer_addr,size,ierror)
-   USE, INTRINSIC ::  ISO_C_BINDING, ONLY : C_PTR
-   use :: ompi_mpifh_bindings, only : ompi_buffer_detach_f
-   implicit none
-   TYPE(C_PTR), INTENT(OUT) ::  buffer_addr
-   INTEGER, INTENT(OUT) :: size
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_buffer_detach_f(buffer_addr,size,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Buffer_detach_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcancel_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcancel_f08.F90
deleted file mode 100644
index 99bfd9c86e8..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcancel_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Cancel_f08(request,ierror)
-   use :: mpi_f08_types, only : MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_cancel_f
-   implicit none
-   TYPE(MPI_Request), INTENT(IN) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_cancel_f(request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Cancel_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcart_coords_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcart_coords_f08.F90
deleted file mode 100644
index 1bd33bd1497..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcart_coords_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Cart_coords_f08(comm,rank,maxdims,coords,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_cart_coords_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: rank, maxdims
-   INTEGER, INTENT(OUT) :: coords(*)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_cart_coords_f(comm%MPI_VAL,rank,maxdims,coords,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Cart_coords_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcart_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcart_create_f08.F90
deleted file mode 100644
index 6e1ad724ab3..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcart_create_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Cart_create_f08(comm_old,ndims,dims,periods,reorder,comm_cart,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Cart_create
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm_old
-   INTEGER, INTENT(IN) :: ndims
-   INTEGER, INTENT(IN) :: dims(ndims)
-   LOGICAL, INTENT(IN) :: periods(ndims), reorder
-   TYPE(MPI_Comm), INTENT(OUT) :: comm_cart
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Cart_create(comm_old%MPI_VAL,ndims,dims,periods,&
-                           reorder,comm_cart%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Cart_create_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcart_get_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcart_get_f08.F90
deleted file mode 100644
index 6d1e920d61c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcart_get_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Cart_get_f08(comm,maxdims,dims,periods,coords,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Cart_get
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: maxdims
-   INTEGER, INTENT(OUT) :: dims(maxdims), coords(maxdims)
-   LOGICAL, INTENT(OUT) :: periods(maxdims)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Cart_get(comm%MPI_VAL,maxdims,dims,periods,coords,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Cart_get_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcart_map_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcart_map_f08.F90
deleted file mode 100644
index 9d026fc09bf..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcart_map_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Cart_map_f08(comm,ndims,dims,periods,newrank,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Cart_map
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: ndims, dims(ndims)
-   LOGICAL, INTENT(IN) :: periods(ndims)
-   INTEGER, INTENT(OUT) :: newrank
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Cart_map(comm%MPI_VAL,ndims,dims,periods,newrank,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Cart_map_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcart_rank_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcart_rank_f08.F90
deleted file mode 100644
index b0979cb0616..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcart_rank_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Cart_rank_f08(comm,coords,rank,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_cart_rank_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: coords(*)
-   INTEGER, INTENT(OUT) :: rank
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_cart_rank_f(comm%MPI_VAL,coords,rank,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Cart_rank_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcart_shift_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcart_shift_f08.F90
deleted file mode 100644
index 092cc179d01..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcart_shift_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Cart_shift_f08(comm,direction,disp,rank_source,rank_dest,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_cart_shift_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: direction, disp
-   INTEGER, INTENT(OUT) :: rank_source, rank_dest
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_cart_shift_f(comm%MPI_VAL,direction,disp,rank_source,rank_dest,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Cart_shift_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcart_sub_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcart_sub_f08.F90
deleted file mode 100644
index a621fac0a1e..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcart_sub_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Cart_sub_f08(comm,remain_dims,newcomm,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Cart_sub
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   LOGICAL, INTENT(IN) :: remain_dims(*)
-   TYPE(MPI_Comm), INTENT(OUT) :: newcomm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Cart_sub(comm%MPI_VAL,remain_dims,newcomm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Cart_sub_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcartdim_get_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcartdim_get_f08.F90
deleted file mode 100644
index 367325f48ed..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcartdim_get_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Cartdim_get_f08(comm,ndims,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_cartdim_get_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(OUT) :: ndims
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_cartdim_get_f(comm%MPI_VAL,ndims,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Cartdim_get_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pclose_port_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pclose_port_f08.F90
deleted file mode 100644
index a04dfff10c4..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pclose_port_f08.F90
+++ /dev/null
@@ -1,20 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Close_port_f08(port_name,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_close_port_f
-   implicit none
-   CHARACTER(LEN=*), INTENT(IN) :: port_name
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_close_port_f(port_name,c_ierror,len(port_name))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Close_port_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_accept_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_accept_f08.F90
deleted file mode 100644
index 8cc7c41f140..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_accept_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_accept_f08(port_name,info,root,comm,newcomm,ierror)
-   use :: mpi_f08_types, only : MPI_Info, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_accept_f
-   implicit none
-   CHARACTER(LEN=*), INTENT(IN) :: port_name
-   TYPE(MPI_Info), INTENT(IN) :: info
-   INTEGER, INTENT(IN) :: root
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Comm), INTENT(OUT) :: newcomm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_accept_f(port_name,info%MPI_VAL,root,comm%MPI_VAL,newcomm%MPI_VAL, &
-                           c_ierror,len(port_name))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_accept_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_call_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_call_errhandler_f08.F90
deleted file mode 100644
index c49d22cf713..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_call_errhandler_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_call_errhandler_f08(comm,errorcode,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_call_errhandler_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: errorcode
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_call_errhandler_f(comm%MPI_VAL,errorcode,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_call_errhandler_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_compare_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_compare_f08.F90
deleted file mode 100644
index 652630fe2bc..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_compare_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_compare_f08(comm1,comm2,result,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_compare_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm1
-   TYPE(MPI_Comm), INTENT(IN) :: comm2
-   INTEGER, INTENT(OUT) :: result
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_compare_f(comm1%MPI_VAL,comm2%MPI_VAL,result,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_compare_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_connect_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_connect_f08.F90
deleted file mode 100644
index 10108547b43..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_connect_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_connect_f08(port_name,info,root,comm,newcomm,ierror)
-   use :: mpi_f08_types, only : MPI_Info, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_connect_f
-   implicit none
-   CHARACTER(LEN=*), INTENT(IN) :: port_name
-   TYPE(MPI_Info), INTENT(IN) :: info
-   INTEGER, INTENT(IN) :: root
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Comm), INTENT(OUT) :: newcomm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_connect_f(port_name,info%MPI_VAL,root,comm%MPI_VAL,newcomm%MPI_VAL, &
-                            c_ierror,len(port_name))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_connect_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_errhandler_f08.F90
deleted file mode 100644
index 4fb5620828c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_errhandler_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Comm_create_errhandler_f08(comm_errhandler_fn,errhandler,ierror)
-   use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
-   use :: mpi_f08_types, only : MPI_Errhandler
-   use :: mpi_f08_interfaces_callbacks, only : MPI_Comm_errhandler_function
-   use :: ompi_mpifh_bindings, only : ompi_comm_create_errhandler_f
-   implicit none
-   PROCEDURE(MPI_Comm_errhandler_function) :: comm_errhandler_fn
-   TYPE(MPI_Errhandler), INTENT(OUT) :: errhandler
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-   type(c_funptr) :: fn
-
-   fn = c_funloc(comm_errhandler_fn)
-   call ompi_comm_create_errhandler_f(fn,errhandler%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_create_errhandler_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_f08.F90
deleted file mode 100644
index 393ee0ffdf9..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_create_f08(comm,group,newcomm,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_comm_create_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Group), INTENT(IN) :: group
-   TYPE(MPI_Comm), INTENT(OUT) :: newcomm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_create_f(comm%MPI_VAL,group%MPI_VAL,newcomm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_create_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_group_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_group_f08.F90
deleted file mode 100644
index db55ae35299..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_group_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_create_group_f08(comm,group,tag,newcomm,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_comm_create_group_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Group), INTENT(IN) :: group
-   INTEGER, INTENT(IN) :: tag
-   TYPE(MPI_Comm), INTENT(OUT) :: newcomm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_create_group_f(comm%MPI_VAL,group%MPI_VAL,tag,newcomm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_create_group_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_keyval_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_keyval_f08.F90
deleted file mode 100644
index 1a758ff4c3f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_keyval_f08.F90
+++ /dev/null
@@ -1,34 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Comm_create_keyval_f08(comm_copy_attr_fn,comm_delete_attr_fn,&
-                                       comm_keyval,extra_state,ierror)
-   use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
-   use :: mpi_f08_types, only : MPI_ADDRESS_KIND
-   use :: mpi_f08_interfaces_callbacks, only : MPI_Comm_copy_attr_function
-   use :: mpi_f08_interfaces_callbacks, only : MPI_Comm_delete_attr_function
-   use :: ompi_mpifh_bindings, only : ompi_comm_create_keyval_f
-   implicit none
-   PROCEDURE(MPI_Comm_copy_attr_function) :: comm_copy_attr_fn
-   PROCEDURE(MPI_Comm_delete_attr_function) :: comm_delete_attr_fn
-   INTEGER, INTENT(OUT) :: comm_keyval
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: extra_state
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-   type(c_funptr) :: fcopy_fn, fdelete_fn
-
-   fcopy_fn = c_funloc(comm_copy_attr_fn)
-   fdelete_fn = c_funloc(comm_delete_attr_fn)
-   call ompi_comm_create_keyval_f(fcopy_fn,fdelete_fn,&
-                                  comm_keyval,extra_state,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_create_keyval_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_delete_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_delete_attr_f08.F90
deleted file mode 100644
index dab6e70e228..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_delete_attr_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_delete_attr_f08(comm,comm_keyval,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_delete_attr_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: comm_keyval
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_delete_attr_f(comm%MPI_VAL,comm_keyval,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_delete_attr_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_disconnect_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_disconnect_f08.F90
deleted file mode 100644
index 05f8240f933..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_disconnect_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_disconnect_f08(comm,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_disconnect_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(INOUT) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_disconnect_f(comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_disconnect_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_dup_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_dup_f08.F90
deleted file mode 100644
index c6bd8d52754..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_dup_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_dup_f08(comm,newcomm,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_dup_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Comm), INTENT(OUT) :: newcomm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_dup_f(comm%MPI_VAL,newcomm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_dup_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_dup_with_info_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_dup_with_info_f08.F90
deleted file mode 100644
index f511fe01487..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_dup_with_info_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_dup_with_info_f08(comm,info,newcomm,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_comm_dup_with_info_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Info), INTENT(IN) :: info
-   TYPE(MPI_Comm), INTENT(OUT) :: newcomm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_dup_with_info_f(comm%MPI_VAL,info%MPI_VAL,newcomm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_dup_with_info_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_free_f08.F90
deleted file mode 100644
index b5b79e2d4e2..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_free_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_free_f08(comm,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_free_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(INOUT) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_free_f(comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_free_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_free_keyval_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_free_keyval_f08.F90
deleted file mode 100644
index 510bd8d8f7f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_free_keyval_f08.F90
+++ /dev/null
@@ -1,20 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_free_keyval_f08(comm_keyval,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_comm_free_keyval_f
-   implicit none
-   INTEGER, INTENT(INOUT) :: comm_keyval
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_free_keyval_f(comm_keyval,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_free_keyval_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_attr_f08.F90
deleted file mode 100644
index c39c85150f0..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_attr_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_get_attr_f08(comm,comm_keyval,attribute_val,flag,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_ADDRESS_KIND
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Comm_get_attr
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: comm_keyval
-   INTEGER(MPI_ADDRESS_KIND), INTENT(OUT) :: attribute_val
-   LOGICAL, INTENT(OUT) :: flag
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Comm_get_attr(comm%MPI_VAL,comm_keyval,attribute_val,flag,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Comm_get_attr_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_errhandler_f08.F90
deleted file mode 100644
index c76ed79b23e..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_errhandler_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_get_errhandler_f08(comm,errhandler,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Errhandler
-   use :: ompi_mpifh_bindings, only : ompi_comm_get_errhandler_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Errhandler), INTENT(OUT) :: errhandler
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_get_errhandler_f(comm%MPI_VAL,errhandler%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_get_errhandler_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_info_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_info_f08.F90
deleted file mode 100644
index a9fc1733007..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_info_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_get_info_f08(comm,info_used,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_comm_get_info_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Info), INTENT(OUT) :: info_used
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_get_info_f(comm%MPI_VAL,info_used%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_get_info_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_name_f08.F90
deleted file mode 100644
index bd6417c2561..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_name_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -
-!
-! Copyright (c) 2010-2011 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_get_name_f08(comm,comm_name,resultlen,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_MAX_OBJECT_NAME
-   use :: ompi_mpifh_bindings, only : ompi_comm_get_name_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   CHARACTER(LEN=*), INTENT(OUT) :: comm_name
-   INTEGER, INTENT(OUT) :: resultlen
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_get_name_f(comm%MPI_VAL,comm_name,resultlen,c_ierror,len(comm_name))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_get_name_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_parent_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_parent_f08.F90
deleted file mode 100644
index f30633b5b4d..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_get_parent_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_get_parent_f08(parent,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_get_parent_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(OUT) :: parent
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_get_parent_f(parent%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_get_parent_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_group_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_group_f08.F90
deleted file mode 100644
index 4905f9c8722..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_group_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_group_f08(comm,group,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_comm_group_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Group), INTENT(OUT) :: group
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_group_f(comm%MPI_VAL,group%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_group_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_idup_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_idup_f08.F90
deleted file mode 100644
index 7c93d18d903..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_idup_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_idup_f08(comm,newcomm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_comm_idup_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Comm), INTENT(OUT) :: newcomm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_idup_f(comm%MPI_VAL,newcomm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_idup_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_join_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_join_f08.F90
deleted file mode 100644
index c52bcff4517..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_join_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_join_f08(fd,intercomm,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_join_f
-   implicit none
-   INTEGER, INTENT(IN) :: fd
-   TYPE(MPI_Comm), INTENT(OUT) :: intercomm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_join_f(fd,intercomm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_join_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_rank_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_rank_f08.F90
deleted file mode 100644
index 357a376ea33..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_rank_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_rank_f08(comm,rank,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_rank_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(OUT) :: rank
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_rank_f(comm%MPI_VAL,rank,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_rank_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_remote_group_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_remote_group_f08.F90
deleted file mode 100644
index 965b0d8c840..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_remote_group_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_remote_group_f08(comm,group,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_comm_remote_group_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Group), INTENT(OUT) :: group
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_remote_group_f(comm%MPI_VAL,group%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_remote_group_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_remote_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_remote_size_f08.F90
deleted file mode 100644
index b8046954882..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_remote_size_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_remote_size_f08(comm,size,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_remote_size_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(OUT) :: size
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_remote_size_f(comm%MPI_VAL,size,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_remote_size_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_set_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_set_attr_f08.F90
deleted file mode 100644
index 1e46ebae7d1..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_set_attr_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_set_attr_f08(comm,comm_keyval,attribute_val,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_comm_set_attr_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: comm_keyval
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: attribute_val
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_set_attr_f(comm%MPI_VAL,comm_keyval,attribute_val,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_set_attr_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_set_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_set_errhandler_f08.F90
deleted file mode 100644
index 89404e7e68b..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_set_errhandler_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_set_errhandler_f08(comm,errhandler,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Errhandler
-   use :: ompi_mpifh_bindings, only : ompi_comm_set_errhandler_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Errhandler), INTENT(IN) :: errhandler
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_set_errhandler_f(comm%MPI_VAL,errhandler%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_set_errhandler_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_set_info_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_set_info_f08.F90
deleted file mode 100644
index 2ebfbcee4f4..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_set_info_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_set_info_f08(comm,info,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_comm_set_info_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Info), INTENT(IN) :: info
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_set_info_f(comm%MPI_VAL,info%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_set_info_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_set_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_set_name_f08.F90
deleted file mode 100644
index f82d27128a5..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_set_name_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_set_name_f08(comm,comm_name,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_set_name_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   CHARACTER(LEN=*), INTENT(IN) :: comm_name
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_set_name_f(comm%MPI_VAL,comm_name,c_ierror,len(comm_name))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_set_name_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_size_f08.F90
deleted file mode 100644
index 896044707c8..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_size_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_size_f08(comm,size,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_size_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(OUT) :: size
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_size_f(comm%MPI_VAL,size,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_size_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_spawn_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_spawn_f08.F90
deleted file mode 100644
index ae81928cfca..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_spawn_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_spawn_f08(command,argv,maxprocs,info,root,comm,intercomm, &
-                               array_of_errcodes,ierror)
-   use :: mpi_f08_types, only : MPI_Info, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_spawn_f
-   implicit none
-   CHARACTER(LEN=*), INTENT(IN) :: command, argv(*)
-   INTEGER, INTENT(IN) :: maxprocs, root
-   TYPE(MPI_Info), INTENT(IN) :: info
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Comm), INTENT(OUT) :: intercomm
-   INTEGER :: array_of_errcodes(*)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_spawn_f(command,argv,maxprocs,                            &
-                          info%MPI_VAL,root,comm%MPI_VAL,intercomm%MPI_VAL, &
-                          array_of_errcodes,c_ierror,                       &
-                          len(command), len(argv))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_spawn_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_spawn_multiple_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_spawn_multiple_f08.F90
deleted file mode 100644
index 6f1c00c1504..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_spawn_multiple_f08.F90
+++ /dev/null
@@ -1,38 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2011 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All Rights reserved.
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_spawn_multiple_f08(count,array_of_commands,array_of_argv, &
-                                        array_of_maxprocs,array_of_info,root,  &
-                                        comm,intercomm,array_of_errcodes,ierror)
-   use :: mpi_f08_types, only : MPI_Info, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_spawn_multiple_f
-   implicit none
-   INTEGER, INTENT(IN) :: count, root
-   INTEGER, INTENT(IN) :: array_of_maxprocs(count)
-   CHARACTER(LEN=*), INTENT(IN) :: array_of_commands(count), array_of_argv(count, *)
-   TYPE(MPI_Info), INTENT(IN) :: array_of_info(count)
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Comm), INTENT(OUT) :: intercomm
-   INTEGER :: array_of_errcodes(*)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-!
-! WARNING: array handling needs to be tested
-!
-
-   call ompi_comm_spawn_multiple_f(count,array_of_commands,array_of_argv, &
-                                   array_of_maxprocs,array_of_info(:)%MPI_VAL,root, &
-                                   comm%MPI_VAL,intercomm%MPI_VAL,array_of_errcodes,c_ierror, &
-                                   len(array_of_commands), len(array_of_argv))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_spawn_multiple_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_split_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_split_f08.F90
deleted file mode 100644
index 75419a6bca4..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_split_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_split_f08(comm,color,key,newcomm,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_comm_split_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: color, key
-   TYPE(MPI_Comm), INTENT(OUT) :: newcomm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_split_f(comm%MPI_VAL,color,key,newcomm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_split_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_split_type_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_split_type_f08.F90
deleted file mode 100644
index 8d23fb0613c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_split_type_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_split_type_f08(comm,split_type,key,info,newcomm,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_comm_split_type_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: split_type
-   INTEGER, INTENT(IN) :: key
-   TYPE(MPI_Info), INTENT(IN) :: info
-   TYPE(MPI_Comm), INTENT(OUT) :: newcomm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_comm_split_type_f(comm%MPI_VAL,split_type,key,info%MPI_VAL,newcomm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Comm_split_type_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_test_inter_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_test_inter_f08.F90
deleted file mode 100644
index 2896441620a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_test_inter_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Comm_test_inter_f08(comm,flag,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Comm_test_inter
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   LOGICAL, INTENT(OUT) :: flag
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Comm_test_inter(comm%MPI_VAL,flag,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Comm_test_inter_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcompare_and_swap_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcompare_and_swap_f08.F90
deleted file mode 100644
index 9f6f284bb8c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcompare_and_swap_f08.F90
+++ /dev/null
@@ -1,32 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Compare_and_swap_f08(origin_addr,compare_addr,result_addr,&
-                                    datatype,target_rank,target_disp,win,&
-                                    ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_compare_and_swap_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr, compare_addr
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: result_addr
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, INTENT(IN) :: target_rank
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_compare_and_swap_f(origin_addr,compare_addr,result_addr,datatype%MPI_VAL,&
-                                target_rank,target_disp,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Compare_and_swap_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pdims_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pdims_create_f08.F90
deleted file mode 100644
index be34c017244..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pdims_create_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Dims_create_f08(nnodes,ndims,dims,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_dims_create_f
-   implicit none
-   INTEGER, INTENT(IN) :: nnodes, ndims
-   INTEGER, INTENT(INOUT) :: dims(*)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_dims_create_f(nnodes,ndims,dims,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Dims_create_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pdist_graph_create_adjacent_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pdist_graph_create_adjacent_f08.F90
deleted file mode 100644
index 6d413a45004..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pdist_graph_create_adjacent_f08.F90
+++ /dev/null
@@ -1,32 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Dist_graph_create_adjacent_f08(comm_old,indegree,sources,sourceweights,&
-                                               outdegree,destinations,destweights,info,&
-                                               reorder,comm_dist_graph,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Info
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Dist_graph_create_adjacent
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm_old
-   INTEGER, INTENT(IN) :: indegree, outdegree
-   INTEGER, INTENT(IN) :: sources(*), sourceweights(*), destinations(*), destweights(*)
-   TYPE(MPI_Info), INTENT(IN) :: info
-   LOGICAL, INTENT(IN) :: reorder
-   TYPE(MPI_Comm), INTENT(OUT) :: comm_dist_graph
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Dist_graph_create_adjacent(comm_old%MPI_VAL,indegree,sources,&
-                                          sourceweights,outdegree,destinations,&
-                                          destweights,info%MPI_VAL,&
-                                          reorder,comm_dist_graph%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Dist_graph_create_adjacent_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pdist_graph_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pdist_graph_create_f08.F90
deleted file mode 100644
index 0ebe42ae121..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pdist_graph_create_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Dist_graph_create_f08(comm_old,n,sources,degrees,destinations,&
-                                      weights,info,reorder,comm_dist_graph,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Info
-   ! See note in ompi/mpi/fortran/use-mpi-f08/iprobe_f08.F90 about why
-   ! we "use mpi" here.
-   use :: mpi, only : PMPI_Dist_graph_create
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm_old
-   INTEGER, INTENT(IN) :: n
-   INTEGER, INTENT(IN) :: sources(*), degrees(*), destinations(*), weights(*)
-   TYPE(MPI_Info), INTENT(IN) :: info
-   LOGICAL, INTENT(IN) :: reorder
-   TYPE(MPI_Comm), INTENT(OUT) :: comm_dist_graph
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   ! See note in ompi/mpi/fortran/use-mpi-f08/iprobe_f08.F90 about why
-   ! we call a PMPI_* subroutine here
-   call PMPI_Dist_graph_create(comm_old%MPI_VAL,n,sources,degrees,destinations,&
-                                 weights,info%MPI_VAL,reorder,comm_dist_graph%MPI_VAL,&
-                                 c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Dist_graph_create_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pdist_graph_neighbors_count_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pdist_graph_neighbors_count_f08.F90
deleted file mode 100644
index 0e70ee144f8..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pdist_graph_neighbors_count_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Dist_graph_neighbors_count_f08(comm,indegree,outdegree,weighted,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Dist_graph_neighbors_count
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(OUT) :: indegree, outdegree
-   LOGICAL, INTENT(OUT) :: weighted
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Dist_graph_neighbors_count(comm%MPI_VAL,indegree,outdegree,weighted,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Dist_graph_neighbors_count_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pdist_graph_neighbors_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pdist_graph_neighbors_f08.F90
deleted file mode 100644
index fb63a8d976e..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pdist_graph_neighbors_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Dist_graph_neighbors_f08(comm,maxindegree,sources,sourceweights,&
-                                         maxoutdegree,destinations,destweights,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_dist_graph_neighbors_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: maxindegree, maxoutdegree
-   INTEGER, INTENT(OUT) :: sources(*), destinations(*)
-   INTEGER :: sourceweights(*), destweights(*)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_dist_graph_neighbors_f(comm%MPI_VAL,maxindegree,sources,sourceweights,&
-                                    maxoutdegree,destinations,destweights,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Dist_graph_neighbors_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/perrhandler_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/perrhandler_free_f08.F90
deleted file mode 100644
index 09e6dfbc697..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/perrhandler_free_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Errhandler_free_f08(errhandler,ierror)
-   use :: mpi_f08_types, only : MPI_Errhandler
-   use :: ompi_mpifh_bindings, only : ompi_errhandler_free_f
-   implicit none
-   TYPE(MPI_Errhandler), INTENT(INOUT) :: errhandler
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_errhandler_free_f(errhandler%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Errhandler_free_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/perror_class_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/perror_class_f08.F90
deleted file mode 100644
index 203d1199290..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/perror_class_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Error_class_f08(errorcode,errorclass,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_error_class_f
-   implicit none
-   INTEGER, INTENT(IN) :: errorcode
-   INTEGER, INTENT(OUT) :: errorclass
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_error_class_f(errorcode,errorclass,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Error_class_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/perror_string_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/perror_string_f08.F90
deleted file mode 100644
index c78a5e557fc..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/perror_string_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Error_string_f08(errorcode,string,resultlen,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_error_string_f
-   implicit none
-   integer, intent(in) :: errorcode
-   character(len=*), intent(out) :: string
-   integer, intent(out) :: resultlen
-   integer, optional, intent(out) :: ierror
-   integer :: c_ierror
-
-   call ompi_error_string_f(errorcode,string,resultlen,c_ierror,len(string))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Error_string_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pexscan_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pexscan_f08.F90
deleted file mode 100644
index 62d6a632358..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pexscan_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Exscan_f08(sendbuf,recvbuf,count,datatype,op,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_exscan_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_exscan_f(sendbuf,recvbuf,count,datatype%MPI_VAL,&
-                      op%MPI_VAL,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Exscan_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pf_sync_reg_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pf_sync_reg_f08.F90
deleted file mode 100644
index f7f03e0fe37..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pf_sync_reg_f08.F90
+++ /dev/null
@@ -1,20 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2012      University of Oregon.  All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_F_sync_reg_f08(buf)
-   use :: ompi_mpifh_bindings, only : ompi_f_sync_reg_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf
-
-   call ompi_f_sync_reg_f(buf)
-
-end subroutine PMPI_F_sync_reg_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfetch_and_op_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfetch_and_op_f08.F90
deleted file mode 100644
index bbdc91a4a87..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfetch_and_op_f08.F90
+++ /dev/null
@@ -1,32 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Fetch_and_op_f08(origin_addr,result_addr,datatype,target_rank, &
-                                target_disp,op,win,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_fetch_and_op_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: result_addr
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, INTENT(IN) :: target_rank
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_fetch_and_op_f(origin_addr,result_addr,datatype%MPI_VAL,target_rank,&
-                            target_disp,op%MPI_VAL,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Fetch_and_op_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_call_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_call_errhandler_f08.F90
deleted file mode 100644
index ac45688ef23..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_call_errhandler_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_call_errhandler_f08(fh,errorcode,ierror)
-   use :: mpi_f08_types, only : MPI_File
-   use :: ompi_mpifh_bindings, only : ompi_file_call_errhandler_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER, INTENT(IN) :: errorcode
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_call_errhandler_f(fh%MPI_VAL,errorcode,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_call_errhandler_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_close_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_close_f08.F90
deleted file mode 100644
index 290f687ee8a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_close_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_close_f08(fh,ierror)
-   use :: mpi_f08_types, only : MPI_File
-   use :: ompi_mpifh_bindings, only : ompi_file_close_f
-   implicit none
-   TYPE(MPI_File), INTENT(INOUT) :: fh
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_close_f(fh%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_close_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_create_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_create_errhandler_f08.F90
deleted file mode 100644
index 8daba5d8d39..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_create_errhandler_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_create_errhandler_f08(file_errhandler_fn,errhandler,ierror)
-   use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
-   use :: mpi_f08_types, only : MPI_Errhandler
-   use :: mpi_f08_interfaces_callbacks, only : MPI_File_errhandler_function
-   use :: ompi_mpifh_bindings, only : ompi_file_create_errhandler_f
-   implicit none
-   PROCEDURE(MPI_File_errhandler_function) :: file_errhandler_fn
-   TYPE(MPI_Errhandler), INTENT(OUT) :: errhandler
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-   type(c_funptr) :: fn
-
-   fn = c_funloc(file_errhandler_fn)
-   call ompi_file_create_errhandler_f(fn,errhandler%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_create_errhandler_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_delete_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_delete_f08.F90
deleted file mode 100644
index 031e545bf02..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_delete_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_delete_f08(filename,info,ierror)
-   use :: mpi_f08_types, only : MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_file_delete_f
-   implicit none
-   CHARACTER(LEN=*), INTENT(IN) :: filename
-   TYPE(MPI_Info), INTENT(IN) :: info
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_delete_f(filename,info%MPI_VAL,c_ierror,len(filename))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_delete_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_amode_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_amode_f08.F90
deleted file mode 100644
index fa04303627e..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_amode_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_get_amode_f08(fh,amode,ierror)
-   use :: mpi_f08_types, only : MPI_File
-   use :: ompi_mpifh_bindings, only : ompi_file_get_amode_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER, INTENT(OUT) :: amode
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_get_amode_f(fh%MPI_VAL,amode,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_get_amode_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_atomicity_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_atomicity_f08.F90
deleted file mode 100644
index 3c35c5b6ab9..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_atomicity_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_get_atomicity_f08(fh,flag,ierror)
-   use :: mpi_f08_types, only : MPI_File
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_File_get_atomicity
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   LOGICAL, INTENT(OUT) :: flag
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_File_get_atomicity(fh%MPI_VAL,flag,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_File_get_atomicity_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_byte_offset_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_byte_offset_f08.F90
deleted file mode 100644
index fa4d6efd142..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_byte_offset_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_get_byte_offset_f08(fh,offset,disp,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_get_byte_offset_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
-   INTEGER(MPI_OFFSET_KIND), INTENT(OUT) :: disp
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_get_byte_offset_f(fh%MPI_VAL,offset,disp,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_get_byte_offset_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_errhandler_f08.F90
deleted file mode 100644
index 6efdb7d12f5..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_errhandler_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_get_errhandler_f08(file,errhandler,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Errhandler
-   use :: ompi_mpifh_bindings, only : ompi_file_get_errhandler_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: file
-   TYPE(MPI_Errhandler), INTENT(OUT) :: errhandler
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_get_errhandler_f(file%MPI_VAL,errhandler%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_get_errhandler_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_group_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_group_f08.F90
deleted file mode 100644
index a6e885915c8..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_group_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_get_group_f08(fh,group,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_file_get_group_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   TYPE(MPI_Group), INTENT(OUT) :: group
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_get_group_f(fh%MPI_VAL,group%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_get_group_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_info_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_info_f08.F90
deleted file mode 100644
index 8bd7be4a6f7..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_info_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_get_info_f08(fh,info_used,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_file_get_info_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   TYPE(MPI_Info), INTENT(OUT) :: info_used
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_get_info_f(fh%MPI_VAL,info_used%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_get_info_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_position_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_position_f08.F90
deleted file mode 100644
index 1ec18cedf55..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_position_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_get_position_f08(fh,offset,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_get_position_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(OUT) :: offset
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_get_position_f(fh%MPI_VAL,offset,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_get_position_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_position_shared_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_position_shared_f08.F90
deleted file mode 100644
index ec59baccbce..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_position_shared_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_get_position_shared_f08(fh,offset,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_get_position_shared_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(OUT) :: offset
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_get_position_shared_f(fh%MPI_VAL,offset,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_get_position_shared_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_size_f08.F90
deleted file mode 100644
index f76664ae737..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_size_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_get_size_f08(fh,size,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_get_size_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(OUT) :: size
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_get_size_f(fh%MPI_VAL,size,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_get_size_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_type_extent_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_type_extent_f08.F90
deleted file mode 100644
index 055921897a9..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_type_extent_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_get_type_extent_f08(fh,datatype,extent,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_get_type_extent_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER(MPI_ADDRESS_KIND), INTENT(OUT) :: extent
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_get_type_extent_f(fh%MPI_VAL,datatype%MPI_VAL,extent,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_get_type_extent_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_view_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_view_f08.F90
deleted file mode 100644
index 037de339c7f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_get_view_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_get_view_f08(fh,disp,etype,filetype,datarep,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_get_view_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(OUT) :: disp
-   TYPE(MPI_Datatype), INTENT(OUT) :: etype
-   TYPE(MPI_Datatype), INTENT(OUT) :: filetype
-   CHARACTER(LEN=*), INTENT(OUT) :: datarep
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_get_view_f(fh%MPI_VAL,disp,etype%MPI_VAL,filetype%MPI_VAL, &
-                             datarep,c_ierror,len(datarep))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_get_view_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_all_f08.F90
deleted file mode 100644
index ba12743a939..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_all_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2017      FUJITSU LIMITED.  All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_iread_all_f08(fh,buf,count,datatype,request,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_file_iread_all_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_iread_all_f(fh%MPI_VAL,buf,count,datatype%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_iread_all_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_at_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_at_all_f08.F90
deleted file mode 100644
index 276e9175917..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_at_all_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2017      FUJITSU LIMITED.  All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_iread_at_all_f08(fh,offset,buf,count,datatype,request,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_iread_at_all_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_iread_at_all_f(fh%MPI_VAL,offset,buf,count,&
-                             datatype%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_iread_at_all_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_at_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_at_f08.F90
deleted file mode 100644
index 62c2aedf2c9..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_at_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_iread_at_f08(fh,offset,buf,count,datatype,request,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_iread_at_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_iread_at_f(fh%MPI_VAL,offset,buf,count,&
-                             datatype%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_iread_at_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_f08.F90
deleted file mode 100644
index 173361f0839..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_iread_f08(fh,buf,count,datatype,request,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_file_iread_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_iread_f(fh%MPI_VAL,buf,count,datatype%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_iread_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_shared_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_shared_f08.F90
deleted file mode 100644
index a6e17c928d4..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iread_shared_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_iread_shared_f08(fh,buf,count,datatype,request,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_file_iread_shared_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_iread_shared_f(fh%MPI_VAL,buf,count,&
-                                 datatype%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_iread_shared_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_all_f08.F90
deleted file mode 100644
index 59124a90891..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_all_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2017      FUJITSU LIMITED.  All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_iwrite_all_f08(fh,buf,count,datatype,request,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_file_iwrite_all_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_iwrite_all_f(fh%MPI_VAL,buf,count,&
-                           datatype%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_iwrite_all_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_at_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_at_all_f08.F90
deleted file mode 100644
index ef557c46b89..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_at_all_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2017      FUJITSU LIMITED.  All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_iwrite_at_all_f08(fh,offset,buf,count,datatype,request,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_iwrite_at_all_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_iwrite_at_all_f(fh%MPI_VAL,offset,buf,count,&
-                              datatype%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_iwrite_at_all_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_at_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_at_f08.F90
deleted file mode 100644
index 67b67fe1dc6..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_at_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_iwrite_at_f08(fh,offset,buf,count,datatype,request,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_iwrite_at_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_iwrite_at_f(fh%MPI_VAL,offset,buf,count,&
-                              datatype%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_iwrite_at_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_f08.F90
deleted file mode 100644
index e128db458dc..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_iwrite_f08(fh,buf,count,datatype,request,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_file_iwrite_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_iwrite_f(fh%MPI_VAL,buf,count,&
-                           datatype%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_iwrite_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_shared_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_shared_f08.F90
deleted file mode 100644
index 77d03ac5323..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_iwrite_shared_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_iwrite_shared_f08(fh,buf,count,datatype,request,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_file_iwrite_shared_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_iwrite_shared_f(fh%MPI_VAL,buf,count,&
-                                  datatype%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_iwrite_shared_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_open_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_open_f08.F90
deleted file mode 100644
index 1325d00e7aa..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_open_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_open_f08(comm,filename,amode,info,fh,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Info, MPI_File
-   use :: ompi_mpifh_bindings, only : ompi_file_open_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   CHARACTER(LEN=*), INTENT(IN) :: filename
-   INTEGER, INTENT(IN) :: amode
-   TYPE(MPI_Info), INTENT(IN) :: info
-   TYPE(MPI_File), INTENT(OUT) :: fh
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_open_f(comm%MPI_VAL,filename,amode,info%MPI_VAL,fh%MPI_VAL, &
-                         c_ierror, len(filename))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_open_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_preallocate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_preallocate_f08.F90
deleted file mode 100644
index a6e6d4bee96..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_preallocate_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_preallocate_f08(fh,size,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_preallocate_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: size
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_preallocate_f(fh%MPI_VAL,size,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_preallocate_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_all_begin_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_all_begin_f08.F90
deleted file mode 100644
index 4b7998597a0..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_all_begin_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_read_all_begin_f08(fh,buf,count,datatype,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_file_read_all_begin_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_read_all_begin_f(fh%MPI_VAL,buf,count,datatype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_read_all_begin_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_all_end_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_all_end_f08.F90
deleted file mode 100644
index 6cebaee1386..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_all_end_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_read_all_end_f08(fh,buf,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_file_read_all_end_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_read_all_end_f(fh%MPI_VAL,buf,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_read_all_end_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_all_f08.F90
deleted file mode 100644
index 11c6ec3ff42..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_all_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_read_all_f08(fh,buf,count,datatype,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_file_read_all_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_read_all_f(fh%MPI_VAL,buf,count,datatype%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_read_all_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_at_all_begin_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_at_all_begin_f08.F90
deleted file mode 100644
index 03548e738a7..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_at_all_begin_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_read_at_all_begin_f08(fh,offset,buf,count,datatype,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_read_at_all_begin_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_read_at_all_begin_f(fh%MPI_VAL,offset,buf,count,&
-                                      datatype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_read_at_all_begin_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_at_all_end_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_at_all_end_f08.F90
deleted file mode 100644
index 2454a723f2f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_at_all_end_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_read_at_all_end_f08(fh,buf,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_file_read_at_all_end_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_read_at_all_end_f(fh%MPI_VAL,buf,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_read_at_all_end_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_at_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_at_all_f08.F90
deleted file mode 100644
index 308c0288a6f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_at_all_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_read_at_all_f08(fh,offset,buf,count,datatype,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_read_at_all_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_read_at_all_f(fh%MPI_VAL,offset,buf,count,&
-                                datatype%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_read_at_all_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_at_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_at_f08.F90
deleted file mode 100644
index 369749cc885..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_at_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_read_at_f08(fh,offset,buf,count,datatype,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_read_at_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_read_at_f(fh%MPI_VAL,offset,buf,count,datatype%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_read_at_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_f08.F90
deleted file mode 100644
index 8f5c1a32fcb..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_read_f08(fh,buf,count,datatype,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_file_read_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_read_f(fh%MPI_VAL,buf,count,datatype%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_read_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_ordered_begin_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_ordered_begin_f08.F90
deleted file mode 100644
index f36ecd396d3..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_ordered_begin_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_read_ordered_begin_f08(fh,buf,count,datatype,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_file_read_ordered_begin_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_read_ordered_begin_f(fh%MPI_VAL,buf,count,datatype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_read_ordered_begin_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_ordered_end_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_ordered_end_f08.F90
deleted file mode 100644
index 19ee13308ee..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_ordered_end_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_read_ordered_end_f08(fh,buf,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_file_read_ordered_end_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_read_ordered_end_f(fh%MPI_VAL,buf,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_read_ordered_end_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_ordered_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_ordered_f08.F90
deleted file mode 100644
index 07f144d6210..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_ordered_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_read_ordered_f08(fh,buf,count,datatype,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_file_read_ordered_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_read_ordered_f(fh%MPI_VAL,buf,count,&
-                                 datatype%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_read_ordered_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_shared_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_shared_f08.F90
deleted file mode 100644
index d198dfe7cf8..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_read_shared_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_read_shared_f08(fh,buf,count,datatype,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_file_read_shared_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_read_shared_f(fh%MPI_VAL,buf,count,datatype%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_read_shared_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_seek_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_seek_f08.F90
deleted file mode 100644
index 01f1697381c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_seek_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_seek_f08(fh,offset,whence,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_seek_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
-   INTEGER, INTENT(IN) :: whence
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_seek_f(fh%MPI_VAL,offset,whence,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_seek_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_seek_shared_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_seek_shared_f08.F90
deleted file mode 100644
index 3d0fee10c1d..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_seek_shared_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_seek_shared_f08(fh,offset,whence,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_seek_shared_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
-   INTEGER, INTENT(IN) :: whence
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_seek_shared_f(fh%MPI_VAL,offset,whence,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_seek_shared_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_atomicity_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_atomicity_f08.F90
deleted file mode 100644
index fa5564667be..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_atomicity_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_set_atomicity_f08(fh,flag,ierror)
-   use :: mpi_f08_types, only : MPI_File
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_File_set_atomicity
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   LOGICAL, INTENT(IN) :: flag
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_File_set_atomicity(fh%MPI_VAL,flag,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_File_set_atomicity_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_errhandler_f08.F90
deleted file mode 100644
index 5c2b4892b8a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_errhandler_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_set_errhandler_f08(file,errhandler,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Errhandler
-   use :: ompi_mpifh_bindings, only : ompi_file_set_errhandler_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: file
-   TYPE(MPI_Errhandler), INTENT(IN) :: errhandler
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_set_errhandler_f(file%MPI_VAL,errhandler%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_set_errhandler_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_info_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_info_f08.F90
deleted file mode 100644
index 17f9222fe2d..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_info_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_set_info_f08(fh,info,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_file_set_info_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   TYPE(MPI_Info), INTENT(IN) :: info
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_set_info_f(fh%MPI_VAL,info%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_set_info_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_size_f08.F90
deleted file mode 100644
index bc0ac14527a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_size_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_set_size_f08(fh,size,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_set_size_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: size
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_set_size_f(fh%MPI_VAL,size,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_set_size_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_view_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_view_f08.F90
deleted file mode 100644
index 3be7bcf327c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_set_view_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_set_view_f08(fh,disp,etype,filetype,datarep,info,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Info, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_set_view_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: disp
-   TYPE(MPI_Datatype), INTENT(IN) :: etype
-   TYPE(MPI_Datatype), INTENT(IN) :: filetype
-   CHARACTER(LEN=*), INTENT(IN) :: datarep
-   TYPE(MPI_Info), INTENT(IN) :: info
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_set_view_f(fh%MPI_VAL,disp,etype%MPI_VAL,filetype%MPI_VAL, &
-                             datarep,info%MPI_VAL,c_ierror,len(datarep))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_set_view_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_sync_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_sync_f08.F90
deleted file mode 100644
index d098f572e3a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_sync_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_File_sync_f08(fh,ierror)
-   use :: mpi_f08_types, only : MPI_File
-   use :: ompi_mpifh_bindings, only : ompi_file_sync_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_sync_f(fh%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_sync_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_all_begin_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_all_begin_f08.F90
deleted file mode 100644
index 07621641398..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_all_begin_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_write_all_begin_f08(fh,buf,count,datatype,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_file_write_all_begin_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_write_all_begin_f(fh%MPI_VAL,buf,count,datatype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_write_all_begin_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_all_end_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_all_end_f08.F90
deleted file mode 100644
index c27b759bf27..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_all_end_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_write_all_end_f08(fh,buf,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_file_write_all_end_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_write_all_end_f(fh%MPI_VAL,buf,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_write_all_end_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_all_f08.F90
deleted file mode 100644
index c3b270de144..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_all_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_write_all_f08(fh,buf,count,datatype,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_file_write_all_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_write_all_f(fh%MPI_VAL,buf,count,&
-                             datatype%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_write_all_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_at_all_begin_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_at_all_begin_f08.F90
deleted file mode 100644
index 64438ae6968..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_at_all_begin_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_write_at_all_begin_f08(fh,offset,buf,count,datatype,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_write_at_all_begin_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_write_at_all_begin_f(fh%MPI_VAL,offset,buf,count,&
-                                      datatype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_write_at_all_begin_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_at_all_end_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_at_all_end_f08.F90
deleted file mode 100644
index 8db21a6b10e..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_at_all_end_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_write_at_all_end_f08(fh,buf,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_file_write_at_all_end_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_write_at_all_end_f(fh%MPI_VAL,buf,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_write_at_all_end_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_at_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_at_all_f08.F90
deleted file mode 100644
index 0ea870a8c87..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_at_all_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_write_at_all_f08(fh,offset,buf,count,datatype,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_write_at_all_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_write_at_all_f(fh%MPI_VAL,offset,buf,count,&
-                                 datatype%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_write_at_all_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_at_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_at_f08.F90
deleted file mode 100644
index b89101e3f01..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_at_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_write_at_f08(fh,offset,buf,count,datatype,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status, MPI_OFFSET_KIND
-   use :: ompi_mpifh_bindings, only : ompi_file_write_at_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   INTEGER(MPI_OFFSET_KIND), INTENT(IN) :: offset
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_write_at_f(fh%MPI_VAL,offset,buf,count,&
-                             datatype%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_write_at_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_f08.F90
deleted file mode 100644
index 64d62bd2bb0..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_write_f08(fh,buf,count,datatype,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_file_write_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_write_f(fh%MPI_VAL,buf,count,&
-                          datatype%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_write_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_ordered_begin_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_ordered_begin_f08.F90
deleted file mode 100644
index be44d72e993..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_ordered_begin_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_write_ordered_begin_f08(fh,buf,count,datatype,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_file_write_ordered_begin_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_write_ordered_begin_f(fh%MPI_VAL,buf,count,datatype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_write_ordered_begin_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_ordered_end_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_ordered_end_f08.F90
deleted file mode 100644
index 41f5a7672fb..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_ordered_end_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_write_ordered_end_f08(fh,buf,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_file_write_ordered_end_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_write_ordered_end_f(fh%MPI_VAL,buf,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_write_ordered_end_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_ordered_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_ordered_f08.F90
deleted file mode 100644
index 7fe51236db2..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_ordered_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_write_ordered_f08(fh,buf,count,datatype,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_file_write_ordered_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_write_ordered_f(fh%MPI_VAL,buf,count,&
-                                  datatype%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_write_ordered_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_shared_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_shared_f08.F90
deleted file mode 100644
index f3bf683e3e7..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfile_write_shared_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_File_write_shared_f08(fh,buf,count,datatype,status,ierror)
-   use :: mpi_f08_types, only : MPI_File, MPI_Datatype, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_file_write_shared_f
-   implicit none
-   TYPE(MPI_File), INTENT(IN) :: fh
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_file_write_shared_f(fh%MPI_VAL,buf,count,&
-                                 datatype%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_File_write_shared_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfinalize_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfinalize_f08.F90
deleted file mode 100644
index 782609b5ad8..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfinalize_f08.F90
+++ /dev/null
@@ -1,19 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Finalize_f08(ierror)
-   use :: ompi_mpifh_bindings, only : ompi_finalize_f
-   implicit none
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_finalize_f(c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Finalize_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfinalized_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfinalized_f08.F90
deleted file mode 100644
index 9c81cd72bdd..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfinalized_f08.F90
+++ /dev/null
@@ -1,19 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Finalized_f08(flag,ierror)
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Finalized
-   implicit none
-   LOGICAL, INTENT(OUT) :: flag
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Finalized(flag,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Finalized_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfree_mem_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfree_mem_f08.F90
deleted file mode 100644
index 1ec5228faf3..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pfree_mem_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All Rights reserved.
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Free_mem_f08(base,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_free_mem_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: base
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_free_mem_f(base,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Free_mem_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgather_f08.F90
deleted file mode 100644
index e5a948c3995..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgather_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Gather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,&
-                          recvtype,root,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_gather_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, recvcount, root
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_gather_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,recvcount,&
-                      recvtype%MPI_VAL,root,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Gather_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgatherv_f08.F90
deleted file mode 100644
index 60108f91570..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgatherv_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Gatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
-                           displs,recvtype,root,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_gatherv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, root
-   INTEGER, INTENT(IN) :: recvcounts(*), displs(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_gatherv_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,recvcounts,&
-                       displs,recvtype%MPI_VAL,root,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Gatherv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pget_accumulate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pget_accumulate_f08.F90
deleted file mode 100644
index 52d16d81bf6..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pget_accumulate_f08.F90
+++ /dev/null
@@ -1,38 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Get_accumulate_f08(origin_addr,origin_count,origin_datatype,&
-                                  result_addr,result_count,result_datatype,&
-                                  target_rank,target_disp,target_count,    &
-                                  target_datatype,op,win,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_get_accumulate_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
-   INTEGER, INTENT(IN) :: origin_count, result_count, target_rank, target_count
-   TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: result_addr
-   TYPE(MPI_Datatype), INTENT(IN) :: result_datatype
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp
-   TYPE(MPI_Datatype), INTENT(IN) :: target_datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_get_accumulate_f(origin_addr,origin_count,origin_datatype%MPI_VAL,&
-                              result_addr,result_count,result_datatype%MPI_VAL,&
-                              target_rank,target_disp,target_count,target_datatype%MPI_VAL,&
-                              op%MPI_VAL,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Get_accumulate_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pget_address_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pget_address_f08.F90
deleted file mode 100644
index eb2283a801e..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pget_address_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Get_address_f08(location,address,ierror)
-   use :: mpi_f08_types, only : MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_get_address_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: location
-   INTEGER(MPI_ADDRESS_KIND), INTENT(OUT) :: address
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_get_address_f(location,address,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Get_address_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pget_count_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pget_count_f08.F90
deleted file mode 100644
index 0378b64c16f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pget_count_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Get_count_f08(status,datatype,count,ierror)
-   use :: mpi_f08_types, only : MPI_Status, MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_get_count_f
-   implicit none
-   TYPE(MPI_Status), INTENT(IN) :: status
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, INTENT(OUT) :: count
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_get_count_f(status,datatype%MPI_VAL,count,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Get_count_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pget_elements_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pget_elements_f08.F90
deleted file mode 100644
index ef2c0dbc241..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pget_elements_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Get_elements_f08(status,datatype,count,ierror)
-   use :: mpi_f08_types, only : MPI_Status, MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_get_elements_f
-   implicit none
-   TYPE(MPI_Status), INTENT(IN) :: status
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, INTENT(OUT) :: count
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_get_elements_f(status,datatype%MPI_VAL,count,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Get_elements_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pget_elements_x_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pget_elements_x_f08.F90
deleted file mode 100644
index aa323c25568..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pget_elements_x_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Get_elements_x_f08(status,datatype,count,ierror)
-   use :: mpi_f08_types, only : MPI_Status, MPI_Datatype, MPI_COUNT_KIND
-   use :: ompi_mpifh_bindings, only : ompi_get_elements_x_f
-   implicit none
-   TYPE(MPI_Status), INTENT(IN) :: status
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER(MPI_COUNT_KIND), INTENT(OUT) :: count
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_get_elements_x_f(status,datatype%MPI_VAL,count,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Get_elements_x_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pget_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pget_f08.F90
deleted file mode 100644
index 1f4fcbac8a4..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pget_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Get_f08(origin_addr,origin_count,origin_datatype,target_rank,&
-                        target_disp,target_count,target_datatype,win,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_get_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: origin_addr
-   INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
-   TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp
-   TYPE(MPI_Datatype), INTENT(IN) :: target_datatype
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_get_f(origin_addr,origin_count,origin_datatype%MPI_VAL,target_rank,&
-                   target_disp,target_count,target_datatype%MPI_VAL,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Get_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pget_library_version_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pget_library_version_f08.F90
deleted file mode 100644
index fb7d8536db4..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pget_library_version_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2010-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Get_library_version_f08(version,resultlen,ierror)
-   use :: mpi_f08_types, only : MPI_MAX_LIBRARY_VERSION_STRING
-   use :: ompi_mpifh_bindings, only : ompi_get_library_version_f
-   implicit none
-   character(len=MPI_MAX_LIBRARY_VERSION_STRING), intent(out) :: version
-   integer, intent(out) :: resultlen
-   integer, optional, intent(out) :: ierror
-   integer :: c_ierror
-
-   call ompi_get_library_version_f(version,resultlen,c_ierror,len(version))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Get_library_version_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pget_processor_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pget_processor_name_f08.F90
deleted file mode 100644
index ec8e0ecb905..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pget_processor_name_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Get_processor_name_f08(name,resultlen,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_get_processor_name_f
-   implicit none
-   character(len=*), intent(out) :: name
-   integer, intent(out) :: resultlen
-   integer, optional, intent(out) :: ierror
-   integer :: c_ierror
-
-   call ompi_get_processor_name_f(name,resultlen,c_ierror,len(name))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Get_processor_name_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pget_version_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pget_version_f08.F90
deleted file mode 100644
index 196ffcc0799..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pget_version_f08.F90
+++ /dev/null
@@ -1,20 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Get_version_f08(version,subversion,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_get_version_f
-   implicit none
-   INTEGER, INTENT(OUT) :: version, subversion
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_get_version_f(version,subversion,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Get_version_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_create_f08.F90
deleted file mode 100644
index fcdf82917ca..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_create_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Graph_create_f08(comm_old,nnodes,index,edges,reorder,comm_graph,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Graph_create
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm_old
-   INTEGER, INTENT(IN) :: nnodes
-   INTEGER, INTENT(IN) :: index(*), edges(*)
-   LOGICAL, INTENT(IN) :: reorder
-   TYPE(MPI_Comm), INTENT(OUT) :: comm_graph
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Graph_create(comm_old%MPI_VAL,nnodes,index,edges,reorder,&
-                            comm_graph%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Graph_create_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_get_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_get_f08.F90
deleted file mode 100644
index d8adffd8649..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_get_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Graph_get_f08(comm,maxindex,maxedges,index,edges,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_graph_get_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: maxindex, maxedges
-   INTEGER, INTENT(OUT) :: index(*), edges(*)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_graph_get_f(comm%MPI_VAL,maxindex,maxedges,index,edges,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Graph_get_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_map_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_map_f08.F90
deleted file mode 100644
index 6b617977b1a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_map_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Graph_map_f08(comm,nnodes,index,edges,newrank,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_graph_map_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: nnodes
-   INTEGER, INTENT(IN) :: index(*), edges(*)
-   INTEGER, INTENT(OUT) :: newrank
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_graph_map_f(comm%MPI_VAL,nnodes,index,edges,newrank,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Graph_map_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_neighbors_count_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_neighbors_count_f08.F90
deleted file mode 100644
index 677de5fd10b..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_neighbors_count_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Graph_neighbors_count_f08(comm,rank,nneighbors,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_graph_neighbors_count_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: rank
-   INTEGER, INTENT(OUT) :: nneighbors
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_graph_neighbors_count_f(comm%MPI_VAL,rank,nneighbors,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Graph_neighbors_count_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_neighbors_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_neighbors_f08.F90
deleted file mode 100644
index df483ca9dc7..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgraph_neighbors_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Graph_neighbors_f08(comm,rank,maxneighbors,neighbors,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_graph_neighbors_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(IN) :: rank, maxneighbors
-   INTEGER, INTENT(OUT) :: neighbors(*)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_graph_neighbors_f(comm%MPI_VAL,rank,maxneighbors,neighbors,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Graph_neighbors_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgraphdims_get_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgraphdims_get_f08.F90
deleted file mode 100644
index 38e7f20f9e7..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgraphdims_get_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Graphdims_get_f08(comm,nnodes,nedges,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_graphdims_get_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(OUT) :: nnodes, nedges
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_graphdims_get_f(comm%MPI_VAL,nnodes,nedges,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Graphdims_get_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgrequest_complete_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgrequest_complete_f08.F90
deleted file mode 100644
index 40ed64842da..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgrequest_complete_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Grequest_complete_f08(request,ierror)
-   use :: mpi_f08_types, only : MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_grequest_complete_f
-   implicit none
-   TYPE(MPI_Request), INTENT(IN) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_grequest_complete_f(request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Grequest_complete_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgrequest_start_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgrequest_start_f08.F90
deleted file mode 100644
index 7bb64b34f1f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgrequest_start_f08.F90
+++ /dev/null
@@ -1,37 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Grequest_start_f08(query_fn,free_fn,cancel_fn,&
-                                  extra_state,request,ierror)
-   use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
-   use :: mpi_f08_types, only : MPI_Request, MPI_ADDRESS_KIND
-   use :: mpi_f08_interfaces_callbacks, only : MPI_Grequest_query_function
-   use :: mpi_f08_interfaces_callbacks, only : MPI_Grequest_free_function
-   use :: mpi_f08_interfaces_callbacks, only : MPI_Grequest_cancel_function
-   use :: ompi_mpifh_bindings, only : ompi_grequest_start_f
-   implicit none
-   PROCEDURE(MPI_Grequest_query_function) :: query_fn
-   PROCEDURE(MPI_Grequest_free_function) :: free_fn
-   PROCEDURE(MPI_Grequest_cancel_function) :: cancel_fn
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: extra_state
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-   type(c_funptr) :: fquery_fn, ffree_fn, fcancel_fn
-
-   fquery_fn = c_funloc(query_fn)
-   ffree_fn = c_funloc(free_fn)
-   fcancel_fn = c_funloc(cancel_fn)
-   call ompi_grequest_start_f(fquery_fn,ffree_fn,fcancel_fn,&
-                              extra_state,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Grequest_start_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_compare_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_compare_f08.F90
deleted file mode 100644
index 4354e141540..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_compare_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Group_compare_f08(group1,group2,result,ierror)
-   use :: mpi_f08_types, only : MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_group_compare_f
-   implicit none
-   TYPE(MPI_Group), INTENT(IN) :: group1
-   TYPE(MPI_Group), INTENT(IN) :: group2
-   INTEGER, INTENT(OUT) :: result
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_group_compare_f(group1%MPI_VAL,group2%MPI_VAL,result,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Group_compare_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_difference_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_difference_f08.F90
deleted file mode 100644
index 7f3ebe8f60a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_difference_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Group_difference_f08(group1,group2,newgroup,ierror)
-   use :: mpi_f08_types, only : MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_group_difference_f
-   implicit none
-   TYPE(MPI_Group), INTENT(IN) :: group1
-   TYPE(MPI_Group), INTENT(IN) :: group2
-   TYPE(MPI_Group), INTENT(OUT) :: newgroup
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_group_difference_f(group1%MPI_VAL,group2%MPI_VAL,newgroup%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Group_difference_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_excl_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_excl_f08.F90
deleted file mode 100644
index 8481e4d9a08..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_excl_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Group_excl_f08(group,n,ranks,newgroup,ierror)
-   use :: mpi_f08_types, only : MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_group_excl_f
-   implicit none
-   TYPE(MPI_Group), INTENT(IN) :: group
-   INTEGER, INTENT(IN) :: n
-   INTEGER, INTENT(IN) :: ranks(*)
-   TYPE(MPI_Group), INTENT(OUT) :: newgroup
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_group_excl_f(group%MPI_VAL,n,ranks,newgroup%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Group_excl_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_free_f08.F90
deleted file mode 100644
index b7591ea596f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_free_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Group_free_f08(group,ierror)
-   use :: mpi_f08_types, only : MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_group_free_f
-   implicit none
-   TYPE(MPI_Group), INTENT(INOUT) :: group
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_group_free_f(group%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Group_free_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_incl_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_incl_f08.F90
deleted file mode 100644
index 21c20b845ef..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_incl_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Group_incl_f08(group,n,ranks,newgroup,ierror)
-   use :: mpi_f08_types, only : MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_group_incl_f
-   implicit none
-   INTEGER, INTENT(IN) :: n
-   INTEGER, INTENT(IN) :: ranks(*)
-   TYPE(MPI_Group), INTENT(IN) :: group
-   TYPE(MPI_Group), INTENT(OUT) :: newgroup
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_group_incl_f(group%MPI_VAL,n,ranks,newgroup%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Group_incl_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_intersection_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_intersection_f08.F90
deleted file mode 100644
index 2e5f5962bf5..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_intersection_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Group_intersection_f08(group1,group2,newgroup,ierror)
-   use :: mpi_f08_types, only : MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_group_intersection_f
-   implicit none
-   TYPE(MPI_Group), INTENT(IN) :: group1
-   TYPE(MPI_Group), INTENT(IN) :: group2
-   TYPE(MPI_Group), INTENT(OUT) :: newgroup
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_group_intersection_f(group1%MPI_VAL,group2%MPI_VAL,newgroup%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Group_intersection_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_range_excl_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_range_excl_f08.F90
deleted file mode 100644
index ab305400163..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_range_excl_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Group_range_excl_f08(group,n,ranges,newgroup,ierror)
-   use :: mpi_f08_types, only : MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_group_range_excl_f
-   implicit none
-   TYPE(MPI_Group), INTENT(IN) :: group
-   INTEGER, INTENT(IN) :: n
-   INTEGER, INTENT(IN) :: ranges(*)
-   TYPE(MPI_Group), INTENT(OUT) :: newgroup
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_group_range_excl_f(group%MPI_VAL,n,ranges,newgroup%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Group_range_excl_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_range_incl_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_range_incl_f08.F90
deleted file mode 100644
index b46e0864ba0..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_range_incl_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Group_range_incl_f08(group,n,ranges,newgroup,ierror)
-   use :: mpi_f08_types, only : MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_group_range_incl_f
-   implicit none
-   TYPE(MPI_Group), INTENT(IN) :: group
-   INTEGER, INTENT(IN) :: n
-   INTEGER, INTENT(IN) :: ranges(*)
-   TYPE(MPI_Group), INTENT(OUT) :: newgroup
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_group_range_incl_f(group%MPI_VAL,n,ranges,newgroup%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Group_range_incl_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_rank_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_rank_f08.F90
deleted file mode 100644
index cd7e16157ca..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_rank_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Group_rank_f08(group,rank,ierror)
-   use :: mpi_f08_types, only : MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_group_rank_f
-   implicit none
-   TYPE(MPI_Group), INTENT(IN) :: group
-   INTEGER, INTENT(OUT) :: rank
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_group_rank_f(group%MPI_VAL,rank,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Group_rank_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_size_f08.F90
deleted file mode 100644
index 50bb58c8360..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_size_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Group_size_f08(group,size,ierror)
-   use :: mpi_f08_types, only : MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_group_size_f
-   implicit none
-   TYPE(MPI_Group), INTENT(IN) :: group
-   INTEGER, INTENT(OUT) :: size
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_group_size_f(group%MPI_VAL,size,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Group_size_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_translate_ranks_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_translate_ranks_f08.F90
deleted file mode 100644
index 739bdce56db..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_translate_ranks_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Group_translate_ranks_f08(group1,n,ranks1,group2,ranks2,ierror)
-   use :: mpi_f08_types, only : MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_group_translate_ranks_f
-   implicit none
-   TYPE(MPI_Group), INTENT(IN) :: group1, group2
-   INTEGER, INTENT(IN) :: n
-   INTEGER, INTENT(IN) :: ranks1(*)
-   INTEGER, INTENT(OUT) :: ranks2(*)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_group_translate_ranks_f(group1%MPI_VAL,n,ranks1,group2%MPI_VAL,ranks2,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Group_translate_ranks_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_union_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_union_f08.F90
deleted file mode 100644
index a11070156b2..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pgroup_union_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Group_union_f08(group1,group2,newgroup,ierror)
-   use :: mpi_f08_types, only : MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_group_union_f
-   implicit none
-   TYPE(MPI_Group), INTENT(IN) :: group1, group2
-   TYPE(MPI_Group), INTENT(OUT) :: newgroup
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_group_union_f(group1%MPI_VAL,group2%MPI_VAL,newgroup%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Group_union_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/piallgather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/piallgather_f08.F90
deleted file mode 100644
index 79d7d21fcd4..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/piallgather_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Iallgather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_iallgather_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, recvcount
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_iallgather_f(sendbuf,sendcount,sendtype%MPI_VAL,&
-                          recvbuf,recvcount,recvtype%MPI_VAL,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Iallgather_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/piallgatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/piallgatherv_f08.F90
deleted file mode 100644
index ca6736c3cc0..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/piallgatherv_f08.F90
+++ /dev/null
@@ -1,32 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Iallgatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
-                              displs,recvtype,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_iallgatherv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount
-   INTEGER, INTENT(IN), ASYNCHRONOUS :: recvcounts(*), displs(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_iallgatherv_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,recvcounts,&
-                          displs,recvtype%MPI_VAL,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Iallgatherv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/piallreduce_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/piallreduce_f08.F90
deleted file mode 100644
index b515ecd60a2..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/piallreduce_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Iallreduce_f08(sendbuf,recvbuf,count,datatype,op,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_iallreduce_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_iallreduce_f(sendbuf,recvbuf,count,datatype%MPI_VAL,&
-                         op%MPI_VAL,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Iallreduce_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pialltoall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pialltoall_f08.F90
deleted file mode 100644
index 1febbe64042..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pialltoall_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ialltoall_f08(sendbuf,sendcount,sendtype,recvbuf,&
-                             recvcount,recvtype,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_ialltoall_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, recvcount
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ialltoall_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,&
-                         recvcount,recvtype%MPI_VAL,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ialltoall_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pialltoallv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pialltoallv_f08.F90
deleted file mode 100644
index 2d2923af0d0..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pialltoallv_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ialltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
-                             recvcounts,rdispls,recvtype,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_ialltoallv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ialltoallv_f(sendbuf,sendcounts,sdispls,sendtype%MPI_VAL,&
-                         recvbuf,recvcounts,rdispls,recvtype%MPI_VAL,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ialltoallv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pialltoallw_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pialltoallw_f08.F90
deleted file mode 100644
index a19eb1cc010..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pialltoallw_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ialltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,&
-                             recvbuf,recvcounts,rdispls,recvtypes,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_ialltoallw_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
-   TYPE(MPI_Datatype), INTENT(IN), ASYNCHRONOUS :: sendtypes(*), recvtypes(*)
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ialltoallw_f(sendbuf,sendcounts,sdispls,sendtypes(1)%MPI_VAL,&
-                         recvbuf,recvcounts,rdispls,recvtypes(1)%MPI_VAL,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ialltoallw_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pibarrier_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pibarrier_f08.F90
deleted file mode 100644
index 7d2d9d16111..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pibarrier_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Ibarrier_f08(comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_ibarrier_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ibarrier_f(comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ibarrier_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pibcast_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pibcast_f08.F90
deleted file mode 100644
index 06bb1a82b32..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pibcast_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ibcast_f08(buffer,count,datatype,root,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_ibcast_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: buffer
-   INTEGER, INTENT(IN) :: count, root
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ibcast_f(buffer,count,datatype%MPI_VAL,root,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ibcast_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pibsend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pibsend_f08.F90
deleted file mode 100644
index 06bf415e9cc..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pibsend_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ibsend_f08(buf,count,datatype,dest,tag,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_ibsend_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count, dest, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ibsend_f(buf,count,datatype%MPI_VAL,dest,tag,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ibsend_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/piexscan_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/piexscan_f08.F90
deleted file mode 100644
index c7e270e6d36..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/piexscan_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Iexscan_f08(sendbuf,recvbuf,count,datatype,op,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_iexscan_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_iexscan_f(sendbuf,recvbuf,count,datatype%MPI_VAL,&
-                      op%MPI_VAL,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Iexscan_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pigather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pigather_f08.F90
deleted file mode 100644
index 5e0d0bc2c3f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pigather_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Igather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,&
-                          recvtype,root,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_igather_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, recvcount, root
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_igather_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,recvcount,&
-                      recvtype%MPI_VAL,root,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Igather_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pigatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pigatherv_f08.F90
deleted file mode 100644
index ebe2a14a07b..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pigatherv_f08.F90
+++ /dev/null
@@ -1,32 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Igatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
-                           displs,recvtype,root,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_igatherv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, root
-   INTEGER, INTENT(IN), ASYNCHRONOUS :: recvcounts(*), displs(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_igatherv_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,recvcounts,&
-                       displs,recvtype%MPI_VAL,root,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Igatherv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pimprobe_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pimprobe_f08.F90
deleted file mode 100644
index e7a11a76ea2..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pimprobe_f08.F90
+++ /dev/null
@@ -1,37 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2010-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Improbe_f08(source,tag,comm,flag,message,status,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Message, MPI_Status
-   implicit none
-   INTEGER, INTENT(IN) :: source, tag
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   LOGICAL, INTENT(OUT) :: flag
-   TYPE(MPI_Message), INTENT(OUT) :: message
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   ! See note in mpi-f-interfaces-bind.h for why we include an
-   ! interface here and call a PMPI_* subroutine below.
-   interface
-      subroutine PMPI_Improbe(source, tag, comm, flag, message, status, ierror)
-        use :: mpi_f08_types, only : MPI_Status
-        integer, intent(in) :: source
-        integer, intent(in) :: tag
-        integer, intent(in) :: comm
-        logical, intent(out) :: flag
-        integer, intent(out) :: message
-        type(MPI_STATUS), intent(out) :: status
-        integer, intent(out) :: ierror
-      end subroutine PMPI_Improbe
-   end interface
-
-   call PMPI_Improbe(source,tag,comm%MPI_VAL,flag,message%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Improbe_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pimrecv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pimrecv_f08.F90
deleted file mode 100644
index 12e197c08ce..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pimrecv_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Imrecv_f08(buf,count,datatype,message,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Message, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_imrecv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Message), INTENT(INOUT) :: message
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_imrecv_f(buf,count,datatype%MPI_VAL,message%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Imrecv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_allgather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_allgather_f08.F90
deleted file mode 100644
index 750e4358d47..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_allgather_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ineighbor_allgather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_ineighbor_allgather_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, recvcount
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ineighbor_allgather_f(sendbuf,sendcount,sendtype%MPI_VAL,&
-                                   recvbuf,recvcount,recvtype%MPI_VAL,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ineighbor_allgather_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_allgatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_allgatherv_f08.F90
deleted file mode 100644
index d0fb5864493..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_allgatherv_f08.F90
+++ /dev/null
@@ -1,33 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ineighbor_allgatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
-                                        displs,recvtype,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_ineighbor_allgatherv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount
-   INTEGER, INTENT(IN) :: recvcounts(*), displs(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ineighbor_allgatherv_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,recvcounts,&
-                                    displs,recvtype%MPI_VAL,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ineighbor_allgatherv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoall_f08.F90
deleted file mode 100644
index e54522aec63..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoall_f08.F90
+++ /dev/null
@@ -1,32 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ineighbor_alltoall_f08(sendbuf,sendcount,sendtype,recvbuf,&
-                                      recvcount,recvtype,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_ineighbor_alltoall_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, recvcount
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ineighbor_alltoall_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,&
-                                  recvcount,recvtype%MPI_VAL,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ineighbor_alltoall_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallv_f08.F90
deleted file mode 100644
index ced4f992c69..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallv_f08.F90
+++ /dev/null
@@ -1,33 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ineighbor_alltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
-                                       recvcounts,rdispls,recvtype,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_ineighbor_alltoallv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ineighbor_alltoallv_f(sendbuf,sendcounts,sdispls,sendtype%MPI_VAL,&
-                                   recvbuf,recvcounts,rdispls,recvtype%MPI_VAL,&
-                                   comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ineighbor_alltoallv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallw_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallw_f08.F90
deleted file mode 100644
index 5e17b850ce6..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallw_f08.F90
+++ /dev/null
@@ -1,34 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ineighbor_alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,&
-                                       recvbuf,recvcounts,rdispls,recvtypes,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_ineighbor_alltoallw_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcounts(*), recvcounts(*)
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: sdispls(*), rdispls(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtypes(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtypes(*)
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ineighbor_alltoallw_f(sendbuf,sendcounts,sdispls,sendtypes(1)%MPI_VAL,&
-                                   recvbuf,recvcounts,rdispls,recvtypes(1)%MPI_VAL,&
-                                   comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ineighbor_alltoallw_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_create_f08.F90
deleted file mode 100644
index 91d826d557c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_create_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Info_create_f08(info,ierror)
-   use :: mpi_f08_types, only : MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_info_create_f
-   implicit none
-   TYPE(MPI_Info), INTENT(OUT) :: info
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_info_create_f(info%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Info_create_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_delete_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_delete_f08.F90
deleted file mode 100644
index ab92a99f366..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_delete_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Info_delete_f08(info,key,ierror)
-   use :: mpi_f08_types, only : MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_info_delete_f
-   implicit none
-   TYPE(MPI_Info), INTENT(IN) :: info
-   CHARACTER(LEN=*), INTENT(IN) :: key
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_info_delete_f(info%MPI_VAL,key,c_ierror,len(key))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Info_delete_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_dup_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_dup_f08.F90
deleted file mode 100644
index 7d542dc02cf..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_dup_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Info_dup_f08(info,newinfo,ierror)
-   use :: mpi_f08_types, only : MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_info_dup_f
-   implicit none
-   TYPE(MPI_Info), INTENT(IN) :: info
-   TYPE(MPI_Info), INTENT(OUT) :: newinfo
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_info_dup_f(info%MPI_VAL,newinfo%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Info_dup_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_free_f08.F90
deleted file mode 100644
index cccbf57f26b..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_free_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Info_free_f08(info,ierror)
-   use :: mpi_f08_types, only : MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_info_free_f
-   implicit none
-   TYPE(MPI_Info), INTENT(INOUT) :: info
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_info_free_f(info%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Info_free_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_f08.F90
deleted file mode 100644
index 837dd143523..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Info_get_f08(info,key,valuelen,value,flag,ierror)
-   use :: mpi_f08_types, only : MPI_Info
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Info_get
-   implicit none
-   TYPE(MPI_Info), INTENT(IN) :: info
-   CHARACTER(LEN=*), INTENT(IN) :: key
-   INTEGER, INTENT(IN) :: valuelen
-   CHARACTER(LEN=*), INTENT(OUT) :: value
-   LOGICAL, INTENT(OUT) :: flag
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Info_get(info%MPI_VAL,key,valuelen,value,flag,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Info_get_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_nkeys_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_nkeys_f08.F90
deleted file mode 100644
index e5db42815ca..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_nkeys_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Info_get_nkeys_f08(info,nkeys,ierror)
-   use :: mpi_f08_types, only : MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_info_get_nkeys_f
-   implicit none
-   TYPE(MPI_Info), INTENT(IN) :: info
-   INTEGER, INTENT(OUT) :: nkeys
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_info_get_nkeys_f(info%MPI_VAL,nkeys,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Info_get_nkeys_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_nthkey_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_nthkey_f08.F90
deleted file mode 100644
index ec10bf4298d..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_nthkey_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Info_get_nthkey_f08(info,n,key,ierror)
-   use :: mpi_f08_types, only : MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_info_get_nthkey_f
-   implicit none
-   TYPE(MPI_Info), INTENT(IN) :: info
-   INTEGER, INTENT(IN) :: n
-   CHARACTER(lEN=*), INTENT(OUT) :: key
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_info_get_nthkey_f(info%MPI_VAL,n,key,c_ierror,len(key))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Info_get_nthkey_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_valuelen_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_valuelen_f08.F90
deleted file mode 100644
index 6a3cb523288..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_valuelen_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Info_get_valuelen_f08(info,key,valuelen,flag,ierror)
-   use :: mpi_f08_types, only : MPI_Info
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Info_get_valuelen
-   implicit none
-   TYPE(MPI_Info), INTENT(IN) :: info
-   CHARACTER(LEN=*), INTENT(IN) :: key
-   INTEGER, INTENT(OUT) :: valuelen
-   LOGICAL, INTENT(OUT) :: flag
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Info_get_valuelen(info%MPI_VAL,key,valuelen,flag,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Info_get_valuelen_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_set_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_set_f08.F90
deleted file mode 100644
index c9a67b4b5fe..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_set_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Info_set_f08(info,key,value,ierror)
-   use :: mpi_f08_types, only : MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_info_set_f
-   implicit none
-   TYPE(MPI_Info), INTENT(IN) :: info
-   CHARACTER(LEN=*), INTENT(IN) :: key, value
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_info_set_f(info%MPI_VAL,key,value,c_ierror,len(key),len(value))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Info_set_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pinit_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pinit_f08.F90
deleted file mode 100644
index 54b2ba7737f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pinit_f08.F90
+++ /dev/null
@@ -1,19 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Init_f08(ierror)
-   use :: ompi_mpifh_bindings, only : ompi_init_f
-   implicit none
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_init_f(c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Init_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pinit_thread_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pinit_thread_f08.F90
deleted file mode 100644
index 628bc8e9713..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pinit_thread_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Init_thread_f08(required,provided,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_init_thread_f
-   implicit none
-   INTEGER, INTENT(IN) :: required
-   INTEGER, INTENT(OUT) :: provided
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_init_thread_f(required,provided,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Init_thread_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pinitialized_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pinitialized_f08.F90
deleted file mode 100644
index dd3611702eb..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pinitialized_f08.F90
+++ /dev/null
@@ -1,19 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Initialized_f08(flag,ierror)
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Initialized
-   implicit none
-   LOGICAL, INTENT(OUT) :: flag
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Initialized(flag,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Initialized_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pintercomm_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pintercomm_create_f08.F90
deleted file mode 100644
index c6647c605f1..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pintercomm_create_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Intercomm_create_f08(local_comm,local_leader,peer_comm,&
-                                    remote_leader,tag,newintercomm,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_intercomm_create_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: local_comm, peer_comm
-   INTEGER, INTENT(IN) :: local_leader, remote_leader, tag
-   TYPE(MPI_Comm), INTENT(OUT) :: newintercomm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_intercomm_create_f(local_comm%MPI_VAL,local_leader,peer_comm%MPI_VAL,&
-                                remote_leader,tag,newintercomm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Intercomm_create_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pintercomm_merge_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pintercomm_merge_f08.F90
deleted file mode 100644
index c5a3e8b2b70..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pintercomm_merge_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Intercomm_merge_f08(intercomm,high,newintracomm,ierror)
-   use :: mpi_f08_types, only : MPI_Comm
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Intercomm_merge
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: intercomm
-   LOGICAL, INTENT(IN) :: high
-   TYPE(MPI_Comm), INTENT(OUT) :: newintracomm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Intercomm_merge(intercomm%MPI_VAL,high,newintracomm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Intercomm_merge_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/piprobe_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/piprobe_f08.F90
deleted file mode 100644
index 5c4eadda03b..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/piprobe_f08.F90
+++ /dev/null
@@ -1,36 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Iprobe_f08(source,tag,comm,flag,status,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Status
-   implicit none
-   INTEGER, INTENT(IN) :: source, tag
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   LOGICAL, INTENT(OUT) :: flag
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   ! See note in mpi-f-interfaces-bind.h for why we include an
-   ! interface here and call a PMPI_* subroutine below.
-   interface
-      subroutine PMPI_Iprobe(source, tag, comm, flag, status, ierror)
-        use :: mpi_f08_types, only : MPI_Status
-        integer, intent(in) :: source
-        integer, intent(in) :: tag
-        integer, intent(in) :: comm
-        logical, intent(out) :: flag
-        TYPE(MPI_Status), intent(out) :: status
-        integer, intent(out) :: ierror
-      end subroutine PMPI_Iprobe
-   end interface
-
-   call PMPI_Iprobe(source,tag,comm%MPI_VAL,flag,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Iprobe_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pirecv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pirecv_f08.F90
deleted file mode 100644
index 1fc53d7853b..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pirecv_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Irecv_f08(buf,count,datatype,source,tag,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_irecv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: buf
-   INTEGER, INTENT(IN) :: count, source, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_irecv_f(buf,count,datatype%MPI_VAL,source,tag,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Irecv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pireduce_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pireduce_f08.F90
deleted file mode 100644
index e5c8ea3f1d7..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pireduce_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ireduce_f08(sendbuf,recvbuf,count,datatype,op,root,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_ireduce_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN) :: count, root
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ireduce_f(sendbuf,recvbuf,count,datatype%MPI_VAL,&
-                      op%MPI_VAL,root,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ireduce_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pireduce_scatter_block_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pireduce_scatter_block_f08.F90
deleted file mode 100644
index ff3680d5f6a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pireduce_scatter_block_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ireduce_scatter_block_f08(sendbuf,recvbuf,recvcount,datatype,op,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_ireduce_scatter_block_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN) :: recvcount
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ireduce_scatter_block_f(sendbuf,recvbuf,recvcount,&
-                                    datatype%MPI_VAL,op%MPI_VAL,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ireduce_scatter_block_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pireduce_scatter_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pireduce_scatter_f08.F90
deleted file mode 100644
index a81f24e0dab..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pireduce_scatter_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ireduce_scatter_f08(sendbuf,recvbuf,recvcounts,datatype,op,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_ireduce_scatter_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN), ASYNCHRONOUS :: recvcounts(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ireduce_scatter_f(sendbuf,recvbuf,recvcounts,datatype%MPI_VAL,&
-                              op%MPI_VAL,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ireduce_scatter_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pirsend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pirsend_f08.F90
deleted file mode 100644
index fe449809dfb..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pirsend_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Irsend_f08(buf,count,datatype,dest,tag,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_irsend_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: buf
-   INTEGER, INTENT(IN) :: count, dest, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_irsend_f(buf,count,datatype%MPI_VAL,dest,tag,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Irsend_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pis_thread_main_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pis_thread_main_f08.F90
deleted file mode 100644
index f14154ac320..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pis_thread_main_f08.F90
+++ /dev/null
@@ -1,19 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Is_thread_main_f08(flag,ierror)
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Is_thread_main
-   implicit none
-   LOGICAL, INTENT(OUT) :: flag
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Is_thread_main(flag,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Is_thread_main_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/piscan_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/piscan_f08.F90
deleted file mode 100644
index 84cbb23f048..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/piscan_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Iscan_f08(sendbuf,recvbuf,count,datatype,op,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_iscan_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_iscan_f(sendbuf,recvbuf,count,datatype%MPI_VAL,&
-                    op%MPI_VAL,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Iscan_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/piscatter_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/piscatter_f08.F90
deleted file mode 100644
index 54cf67a7809..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/piscatter_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Iscatter_f08(sendbuf,sendcount,sendtype,recvbuf,&
-                           recvcount,recvtype,root,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_iscatter_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, recvcount, root
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_iscatter_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,recvcount,&
-                       recvtype%MPI_VAL,root,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Iscatter_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/piscatterv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/piscatterv_f08.F90
deleted file mode 100644
index 944736e3ce2..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/piscatterv_f08.F90
+++ /dev/null
@@ -1,32 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Iscatterv_f08(sendbuf,sendcounts,displs,sendtype,recvbuf,&
-                            recvcount,recvtype,root,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_iscatterv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
-   INTEGER, INTENT(IN) :: recvcount, root
-   INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcounts(*), displs(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_iscatterv_f(sendbuf,sendcounts,displs,sendtype%MPI_VAL,recvbuf,&
-                        recvcount,recvtype%MPI_VAL,root,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Iscatterv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pisend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pisend_f08.F90
deleted file mode 100644
index 0d9cd32ea6d..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pisend_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Isend_f08(buf,count,datatype,dest,tag,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_isend_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: buf
-   INTEGER, INTENT(IN) :: count, dest, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_isend_f(buf,count,datatype%MPI_VAL,dest,tag,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Isend_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pissend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pissend_f08.F90
deleted file mode 100644
index 77a03003f78..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pissend_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Issend_f08(buf,count,datatype,dest,tag,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_issend_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count, dest, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_issend_f(buf,count,datatype%MPI_VAL,dest,tag,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Issend_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/plookup_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/plookup_name_f08.F90
deleted file mode 100644
index c121b0f5d95..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/plookup_name_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Lookup_name_f08(service_name,info,port_name,ierror)
-   use :: mpi_f08_types, only : MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_lookup_name_f
-   implicit none
-   CHARACTER(LEN=*), INTENT(IN) :: service_name
-   TYPE(MPI_Info), INTENT(IN) :: info
-   CHARACTER(LEN=*), INTENT(OUT) :: port_name
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_lookup_name_f(service_name,info%MPI_VAL,port_name,c_ierror, &
-                           len(service_name),len(port_name))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Lookup_name_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pmprobe_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pmprobe_f08.F90
deleted file mode 100644
index 23f9c74fd95..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pmprobe_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2010-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Mprobe_f08(source,tag,comm,message,status,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Message, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_mprobe_f
-   implicit none
-   INTEGER, INTENT(IN) :: source, tag
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Message), INTENT(OUT) :: message
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_mprobe_f(source,tag,comm%MPI_VAL,message%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Mprobe_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pmrecv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pmrecv_f08.F90
deleted file mode 100644
index 35d085520b3..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pmrecv_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Mrecv_f08(buf,count,datatype,message,status,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Message, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_mrecv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Message), INTENT(INOUT) :: message
-   TYPE(MPI_Status) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_mrecv_f(buf,count,datatype%MPI_VAL,message%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Mrecv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_allgather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_allgather_f08.F90
deleted file mode 100644
index aa0a778ab8d..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_allgather_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Neighbor_allgather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_neighbor_allgather_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, recvcount
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_neighbor_allgather_f(sendbuf,sendcount,sendtype%MPI_VAL,&
-                                  recvbuf,recvcount,recvtype%MPI_VAL,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Neighbor_allgather_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_allgatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_allgatherv_f08.F90
deleted file mode 100644
index 512571e948e..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_allgatherv_f08.F90
+++ /dev/null
@@ -1,32 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Neighbor_allgatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
-                                       displs,recvtype,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_neighbor_allgatherv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount
-   INTEGER, INTENT(IN) :: recvcounts(*), displs(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_neighbor_allgatherv_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,recvcounts,&
-                                   displs,recvtype%MPI_VAL,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Neighbor_allgatherv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoall_f08.F90
deleted file mode 100644
index 5af98ad064b..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoall_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Neighbor_alltoall_f08(sendbuf,sendcount,sendtype,recvbuf,&
-                                     recvcount,recvtype,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_neighbor_alltoall_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, recvcount
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_neighbor_alltoall_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,&
-                                 recvcount,recvtype%MPI_VAL,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Neighbor_alltoall_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallv_f08.F90
deleted file mode 100644
index 1ef59e429ec..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallv_f08.F90
+++ /dev/null
@@ -1,32 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Neighbor_alltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
-                                      recvcounts,rdispls,recvtype,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_neighbor_alltoallv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_neighbor_alltoallv_f(sendbuf,sendcounts,sdispls,sendtype%MPI_VAL,&
-                                  recvbuf,recvcounts,rdispls,recvtype%MPI_VAL,&
-                                  comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Neighbor_alltoallv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallw_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallw_f08.F90
deleted file mode 100644
index f1fe0d5a733..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallw_f08.F90
+++ /dev/null
@@ -1,33 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Neighbor_alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,&
-                                      recvbuf,recvcounts,rdispls,recvtypes,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_neighbor_alltoallw_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcounts(*), recvcounts(*)
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: sdispls(*), rdispls(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtypes(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtypes(*)
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_neighbor_alltoallw_f(sendbuf,sendcounts,sdispls,sendtypes(1)%MPI_VAL,&
-                                  recvbuf,recvcounts,rdispls,recvtypes(1)%MPI_VAL,&
-                                  comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Neighbor_alltoallw_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pop_commutative_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pop_commutative_f08.F90
deleted file mode 100644
index fc9f0f6186a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pop_commutative_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Op_commutative_f08(op,commute,ierror)
-   use :: mpi_f08_types, only : MPI_Op
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Op_commutative
-   implicit none
-   TYPE(MPI_Op), INTENT(IN) :: op
-   LOGICAL, INTENT(OUT) :: commute
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Op_commutative(op%MPI_VAL,commute,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Op_commutative_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pop_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pop_create_f08.F90
deleted file mode 100644
index 787122f11bb..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pop_create_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Op_create_f08(user_fn,commute,op,ierror)
-   use :: mpi_f08_types, only : MPI_Op
-   use :: mpi_f08_interfaces_callbacks, only : MPI_User_function
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Op_create
-   implicit none
-   PROCEDURE(MPI_User_function) :: user_fn
-   LOGICAL, INTENT(IN) :: commute
-   TYPE(MPI_Op), INTENT(OUT) :: op
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Op_create(user_fn,commute,op%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Op_create_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pop_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pop_free_f08.F90
deleted file mode 100644
index f190ae70076..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pop_free_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Op_free_f08(op,ierror)
-   use :: mpi_f08_types, only : MPI_Op
-   use :: ompi_mpifh_bindings, only : ompi_op_free_f
-   implicit none
-   TYPE(MPI_Op), INTENT(INOUT) :: op
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_op_free_f(op%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Op_free_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/popen_port_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/popen_port_f08.F90
deleted file mode 100644
index 399e4991a41..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/popen_port_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Open_port_f08(info,port_name,ierror)
-   use :: mpi_f08_types, only : MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_open_port_f
-   implicit none
-   TYPE(MPI_Info), INTENT(IN) :: info
-   CHARACTER(LEN=*), INTENT(OUT) :: port_name
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_open_port_f(info%MPI_VAL,port_name,c_ierror,len(port_name))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Open_port_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ppack_external_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ppack_external_f08.F90
deleted file mode 100644
index ab6c6d1df7b..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ppack_external_f08.F90
+++ /dev/null
@@ -1,32 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Pack_external_f08(datarep,inbuf,incount,datatype,outbuf,outsize, &
-                                 position,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_pack_external_f
-   implicit none
-   CHARACTER(LEN=*), INTENT(IN) :: datarep
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: outbuf
-   INTEGER, INTENT(IN) :: incount
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: outsize
-   INTEGER(MPI_ADDRESS_KIND), INTENT(INOUT) :: position
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_pack_external_f(datarep,inbuf,incount,datatype%MPI_VAL,outbuf, &
-                             outsize,position,c_ierror,len(datarep))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Pack_external_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ppack_external_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ppack_external_size_f08.F90
deleted file mode 100644
index a6b4e2e7b6d..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ppack_external_size_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Pack_external_size_f08(datarep,incount,datatype,size,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_pack_external_size_f
-   implicit none
-   CHARACTER(LEN=*), INTENT(IN) :: datarep
-   INTEGER, INTENT(IN) :: incount
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER(MPI_ADDRESS_KIND), INTENT(OUT) :: size
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_pack_external_size_f(datarep,incount,datatype%MPI_VAL,size,c_ierror,len(datarep))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Pack_external_size_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ppack_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ppack_f08.F90
deleted file mode 100644
index 866668a17fd..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ppack_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Pack_f08(inbuf,incount,datatype,outbuf,outsize,position,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_pack_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: outbuf
-   INTEGER, INTENT(IN) :: incount, outsize
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, INTENT(INOUT) :: position
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_pack_f(inbuf,incount,datatype%MPI_VAL,outbuf,outsize, &
-                    position,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Pack_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ppack_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ppack_size_f08.F90
deleted file mode 100644
index eb67787774f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ppack_size_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Pack_size_f08(incount,datatype,comm,size,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_pack_size_f
-   implicit none
-   INTEGER, INTENT(IN) :: incount
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(OUT) :: size
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_pack_size_f(incount,datatype%MPI_VAL,comm%MPI_VAL,size,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Pack_size_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ppcontrol_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ppcontrol_f08.F90
deleted file mode 100644
index 3322dae9a61..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ppcontrol_f08.F90
+++ /dev/null
@@ -1,17 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Pcontrol_f08(level)
-   use :: ompi_mpifh_bindings, only : ompi_pcontrol_f
-   implicit none
-   INTEGER, INTENT(IN) :: level
-
-   call ompi_pcontrol_f(level)
-
-end subroutine PMPI_Pcontrol_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pprobe_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pprobe_f08.F90
deleted file mode 100644
index ef2697c242d..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pprobe_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Probe_f08(source,tag,comm,status,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_probe_f
-   implicit none
-   INTEGER, INTENT(IN) :: source, tag
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_probe_f(source,tag,comm%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Probe_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ppublish_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ppublish_name_f08.F90
deleted file mode 100644
index 714b0597976..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ppublish_name_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Publish_name_f08(service_name,info,port_name,ierror)
-   use :: mpi_f08_types, only : MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_publish_name_f
-   implicit none
-   TYPE(MPI_Info), INTENT(IN) :: info
-   CHARACTER(LEN=*), INTENT(IN) :: service_name, port_name
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_publish_name_f(service_name,info%MPI_VAL,port_name,c_ierror, &
-                            len(service_name), len(port_name))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Publish_name_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pput_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pput_f08.F90
deleted file mode 100644
index 5fe3dd82369..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pput_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Put_f08(origin_addr,origin_count,origin_datatype,target_rank,&
-                        target_disp,target_count,target_datatype,win,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_put_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
-   INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
-   TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp
-   TYPE(MPI_Datatype), INTENT(IN) :: target_datatype
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_put_f(origin_addr,origin_count,origin_datatype%MPI_VAL,target_rank,&
-                   target_disp,target_count,target_datatype%MPI_VAL,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Put_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pquery_thread_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pquery_thread_f08.F90
deleted file mode 100644
index a74fea3f95e..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pquery_thread_f08.F90
+++ /dev/null
@@ -1,20 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Query_thread_f08(provided,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_query_thread_f
-   implicit none
-   INTEGER, INTENT(OUT) :: provided
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_query_thread_f(provided,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Query_thread_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/praccumulate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/praccumulate_f08.F90
deleted file mode 100644
index fbf91d6dbfe..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/praccumulate_f08.F90
+++ /dev/null
@@ -1,35 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Raccumulate_f08(origin_addr,origin_count,origin_datatype,&
-                               target_rank,target_disp,target_count,    &
-                               target_datatype,op,win,request, ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_Request, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_raccumulate_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
-   INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
-   TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp
-   TYPE(MPI_Datatype), INTENT(IN) :: target_datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Win), INTENT(IN) :: win
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_raccumulate_f(origin_addr,origin_count,origin_datatype%MPI_VAL,target_rank,&
-                           target_disp,target_count,target_datatype%MPI_VAL,&
-                           op%MPI_VAL,win%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Raccumulate_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/precv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/precv_f08.F90
deleted file mode 100644
index 0baccbcf63d..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/precv_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Recv_f08(buf,count,datatype,source,tag,comm,status,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_recv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf
-   INTEGER, INTENT(IN) :: count, source, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_recv_f(buf,count,datatype%MPI_VAL,source,tag,comm%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Recv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/precv_init_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/precv_init_f08.F90
deleted file mode 100644
index 3425aca80bc..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/precv_init_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Recv_init_f08(buf,count,datatype,source,tag,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_recv_init_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf
-   INTEGER, INTENT(IN) :: count, source, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_recv_init_f(buf,count,datatype%MPI_VAL,source,tag,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Recv_init_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/preduce_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/preduce_f08.F90
deleted file mode 100644
index af0043bbce9..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/preduce_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Reduce_f08(sendbuf,recvbuf,count,datatype,op,root,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_reduce_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: count, root
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_reduce_f(sendbuf,recvbuf,count,datatype%MPI_VAL,&
-                      op%MPI_VAL,root,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Reduce_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/preduce_local_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/preduce_local_f08.F90
deleted file mode 100644
index a6bab4c675c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/preduce_local_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Reduce_local_f08(inbuf,inoutbuf,count,datatype,op,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op
-   use :: ompi_mpifh_bindings, only : ompi_reduce_local_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: inoutbuf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_reduce_local_f(inbuf,inoutbuf,count,datatype%MPI_VAL,op%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Reduce_local_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/preduce_scatter_block_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/preduce_scatter_block_f08.F90
deleted file mode 100644
index 688b817b9e0..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/preduce_scatter_block_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Reduce_scatter_block_f08(sendbuf,recvbuf,recvcount,datatype,op,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_reduce_scatter_block_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: recvcount
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_reduce_scatter_block_f(sendbuf,recvbuf,recvcount,&
-                                    datatype%MPI_VAL,op%MPI_VAL,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Reduce_scatter_block_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/preduce_scatter_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/preduce_scatter_f08.F90
deleted file mode 100644
index 56fd71ab980..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/preduce_scatter_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Reduce_scatter_f08(sendbuf,recvbuf,recvcounts,datatype,op,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_reduce_scatter_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: recvcounts(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_reduce_scatter_f(sendbuf,recvbuf,recvcounts,datatype%MPI_VAL,&
-                              op%MPI_VAL,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Reduce_scatter_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pregister_datarep_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pregister_datarep_f08.F90
deleted file mode 100644
index 8d635342c75..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pregister_datarep_f08.F90
+++ /dev/null
@@ -1,36 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Register_datarep_f08(datarep,read_conversion_fn,write_conversion_fn, &
-                                    dtype_file_extent_fn,extra_state,ierror)
-   use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
-   use :: mpi_f08_types, only : MPI_ADDRESS_KIND
-   use :: mpi_f08_interfaces_callbacks, only : MPI_Datarep_conversion_function
-   use :: mpi_f08_interfaces_callbacks, only : MPI_Datarep_extent_function
-   use :: ompi_mpifh_bindings, only : ompi_register_datarep_f
-   implicit none
-   PROCEDURE(MPI_Datarep_conversion_function) :: read_conversion_fn
-   PROCEDURE(MPI_Datarep_conversion_function) :: write_conversion_fn
-   PROCEDURE(MPI_Datarep_extent_function) :: dtype_file_extent_fn
-   CHARACTER(LEN=*), INTENT(IN) :: datarep
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: extra_state
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-   type(c_funptr) :: fread_fn, fwrite_fn, fdtype_fn
-
-   fread_fn = c_funloc(read_conversion_fn)
-   fwrite_fn = c_funloc(write_conversion_fn)
-   fdtype_fn = c_funloc(dtype_file_extent_fn)
-   call ompi_register_datarep_f(datarep,fread_fn,fwrite_fn, &
-                                fdtype_fn,extra_state,c_ierror,len(datarep))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Register_datarep_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/prequest_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/prequest_free_f08.F90
deleted file mode 100644
index 24a80ce9ce6..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/prequest_free_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Request_free_f08(request,ierror)
-   use :: mpi_f08_types, only : MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_request_free_f
-   implicit none
-   TYPE(MPI_Request), INTENT(INOUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_request_free_f(request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Request_free_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/prequest_get_status_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/prequest_get_status_f08.F90
deleted file mode 100644
index 0e1fa3f3eb8..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/prequest_get_status_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Request_get_status_f08(request,flag,status,ierror)
-   use :: mpi_f08_types, only : MPI_Request, MPI_Status
-   implicit none
-   TYPE(MPI_Request), INTENT(IN) :: request
-   LOGICAL, INTENT(OUT) :: flag
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   ! See note in mpi-f-interfaces-bind.h for why we include an
-   ! interface here and call a PMPI_* subroutine below.
-   interface
-      subroutine PMPI_Request_get_status(request, flag, status, ierror)
-        use :: mpi_f08_types, only : MPI_Status
-        integer, intent(in) :: request
-        logical, intent(out) :: flag
-        type(MPI_Status), intent(out) :: status
-        integer, intent(out) :: ierror
-      end subroutine PMPI_Request_get_status
-   end interface
-
-   call PMPI_Request_get_status(request%MPI_VAL,flag,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Request_get_status_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/prget_accumulate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/prget_accumulate_f08.F90
deleted file mode 100644
index 06ccfec1d13..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/prget_accumulate_f08.F90
+++ /dev/null
@@ -1,39 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Rget_accumulate_f08(origin_addr,origin_count,origin_datatype,&
-                                   result_addr,result_count,result_datatype,&
-                                   target_rank,target_disp,target_count,    &
-                                   target_datatype,op,win,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_Request, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_rget_accumulate_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
-   INTEGER, INTENT(IN) :: origin_count, result_count, target_rank, target_count
-   TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: result_addr
-   TYPE(MPI_Datatype), INTENT(IN) :: result_datatype
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp
-   TYPE(MPI_Datatype), INTENT(IN) :: target_datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Win), INTENT(IN) :: win
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_rget_accumulate_f(origin_addr,origin_count,origin_datatype%MPI_VAL,&
-                               result_addr,result_count,result_datatype%MPI_VAL,&
-                               target_rank,target_disp,target_count,target_datatype%MPI_VAL,&
-                               op%MPI_VAL,win%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Rget_accumulate_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/prget_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/prget_f08.F90
deleted file mode 100644
index fd7cba0447c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/prget_f08.F90
+++ /dev/null
@@ -1,33 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Rget_f08(origin_addr,origin_count,origin_datatype,target_rank,&
-                        target_disp,target_count,target_datatype,win,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_Request, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_rget_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: origin_addr
-   INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
-   TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp
-   TYPE(MPI_Datatype), INTENT(IN) :: target_datatype
-   TYPE(MPI_Win), INTENT(IN) :: win
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_rget_f(origin_addr,origin_count,origin_datatype%MPI_VAL,target_rank,&
-                    target_disp,target_count,target_datatype%MPI_VAL,win%MPI_VAL,&
-                    request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Rget_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/prput_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/prput_f08.F90
deleted file mode 100644
index 5a3a4dc6d9f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/prput_f08.F90
+++ /dev/null
@@ -1,33 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Rput_f08(origin_addr,origin_count,origin_datatype,target_rank,&
-                        target_disp,target_count,target_datatype,win,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_Request, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_rput_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
-   INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
-   TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp
-   TYPE(MPI_Datatype), INTENT(IN) :: target_datatype
-   TYPE(MPI_Win), INTENT(IN) :: win
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_rput_f(origin_addr,origin_count,origin_datatype%MPI_VAL,target_rank,&
-                    target_disp,target_count,target_datatype%MPI_VAL,win%MPI_VAL,&
-                    request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Rput_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/prsend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/prsend_f08.F90
deleted file mode 100644
index 66cb5d0e5aa..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/prsend_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Rsend_f08(buf,count,datatype,dest,tag,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_rsend_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count, dest, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_rsend_f(buf,count,datatype%MPI_VAL,dest,tag,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Rsend_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/prsend_init_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/prsend_init_f08.F90
deleted file mode 100644
index 1b65ed987d7..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/prsend_init_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Rsend_init_f08(buf,count,datatype,dest,tag,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_rsend_init_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count, dest, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_rsend_init_f(buf,count,datatype%MPI_VAL,dest,tag,comm%MPI_VAL,request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Rsend_init_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pscan_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pscan_f08.F90
deleted file mode 100644
index 9538f82e35d..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pscan_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Scan_f08(sendbuf,recvbuf,count,datatype,op,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_scan_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Op), INTENT(IN) :: op
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_scan_f(sendbuf,recvbuf,count,datatype%MPI_VAL,&
-                    op%MPI_VAL,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Scan_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pscatter_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pscatter_f08.F90
deleted file mode 100644
index 446d83f13e3..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pscatter_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Scatter_f08(sendbuf,sendcount,sendtype,recvbuf,&
-                           recvcount,recvtype,root,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_scatter_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, recvcount, root
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_scatter_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,recvcount,&
-                       recvtype%MPI_VAL,root,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Scatter_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pscatterv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pscatterv_f08.F90
deleted file mode 100644
index 2bdb115107c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pscatterv_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Scatterv_f08(sendbuf,sendcounts,displs,sendtype,recvbuf,&
-                             recvcount,recvtype,root,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_scatterv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: recvcount, root
-   INTEGER, INTENT(IN) :: sendcounts(*), displs(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_scatterv_f(sendbuf,sendcounts,displs,sendtype%MPI_VAL,recvbuf,&
-                        recvcount,recvtype%MPI_VAL,root,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Scatterv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/psend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/psend_f08.F90
deleted file mode 100644
index 6467dbced7e..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/psend_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Send_f08(buf,count,datatype,dest,tag,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_send_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count, dest, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_send_f(buf,count,datatype%MPI_VAL,dest,tag,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Send_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/psend_init_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/psend_init_f08.F90
deleted file mode 100644
index 7ca1544ee35..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/psend_init_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Send_init_f08(buf,count,datatype,dest,tag,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_send_init_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count, dest, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_send_init_f(buf,count,datatype%MPI_VAL,dest,tag,comm%MPI_VAL, &
-                         request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Send_init_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/psendrecv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/psendrecv_f08.F90
deleted file mode 100644
index 1fe911e9632..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/psendrecv_f08.F90
+++ /dev/null
@@ -1,32 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Sendrecv_f08(sendbuf,sendcount,sendtype,dest,sendtag,recvbuf, &
-                        recvcount,recvtype,source,recvtag,comm,status,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_sendrecv_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
-   INTEGER, INTENT(IN) :: sendcount, dest, sendtag, recvcount, source, recvtag
-   TYPE(MPI_Datatype), INTENT(IN) :: sendtype
-   TYPE(MPI_Datatype), INTENT(IN) :: recvtype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_sendrecv_f(sendbuf,sendcount,sendtype%MPI_VAL,dest,sendtag,recvbuf, &
-                        recvcount,recvtype%MPI_VAL,source,recvtag,comm%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Sendrecv_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/psendrecv_replace_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/psendrecv_replace_f08.F90
deleted file mode 100644
index 7f6bede48f3..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/psendrecv_replace_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Sendrecv_replace_f08(buf,count,datatype,dest,sendtag,source, &
-                                    recvtag,comm,status,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_sendrecv_replace_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf
-   INTEGER, INTENT(IN) :: count, dest, sendtag, source, recvtag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_sendrecv_replace_f(buf,count,datatype%MPI_VAL,dest,sendtag,source, &
-                                recvtag,comm%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Sendrecv_replace_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pssend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pssend_f08.F90
deleted file mode 100644
index 970d9f9defe..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pssend_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ssend_f08(buf,count,datatype,dest,tag,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_ssend_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count, dest, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ssend_f(buf,count,datatype%MPI_VAL,dest,tag,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ssend_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pssend_init_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pssend_init_f08.F90
deleted file mode 100644
index f1f89d533f1..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pssend_init_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Ssend_init_f08(buf,count,datatype,dest,tag,comm,request,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_ssend_init_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf
-   INTEGER, INTENT(IN) :: count, dest, tag
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Request), INTENT(OUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_ssend_init_f(buf,count,datatype%MPI_VAL,dest,tag,comm%MPI_VAL, &
-                          request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Ssend_init_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pstart_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pstart_f08.F90
deleted file mode 100644
index 86acfc5b5d0..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pstart_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Start_f08(request,ierror)
-   use :: mpi_f08_types, only : MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_start_f
-   implicit none
-   TYPE(MPI_Request), INTENT(INOUT) :: request
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_start_f(request%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Start_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pstartall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pstartall_f08.F90
deleted file mode 100644
index d4b7bacf446..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pstartall_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Startall_f08(count,array_of_requests,ierror)
-   use :: mpi_f08_types, only : MPI_Request
-   use :: ompi_mpifh_bindings, only : ompi_startall_f
-   implicit none
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Request), INTENT(INOUT) :: array_of_requests(count)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_startall_f(count,array_of_requests(:)%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Startall_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_set_cancelled_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_set_cancelled_f08.F90
deleted file mode 100644
index fc2a1f57bcb..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_set_cancelled_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2018 Cisco Systems, Inc.  All rights reserved
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Status_set_cancelled_f08(status,flag,ierror)
-   use :: mpi_f08_types, only : MPI_Status
-   implicit none
-   TYPE(MPI_Status), INTENT(INOUT) :: status
-   LOGICAL, INTENT(IN) :: flag
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   ! See note in mpi-f-interfaces-bind.h for why we include an
-   ! interface here and call a PMPI_* subroutine below.
-   interface
-      subroutine PMPI_Status_set_cancelled(status, flag, ierror)
-        use :: mpi_f08_types, only : MPI_Status
-        type(MPI_Status), intent(inout) :: status
-        logical, intent(in) :: flag
-        integer, intent(out) :: ierror
-      end subroutine PMPI_Status_set_cancelled
-   end interface
-
-   call PMPI_Status_set_cancelled(status,flag,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Status_set_cancelled_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_set_elements_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_set_elements_f08.F90
deleted file mode 100644
index 42d5a85ffe1..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_set_elements_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Status_set_elements_f08(status,datatype,count,ierror)
-   use :: mpi_f08_types, only : MPI_Status, MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_status_set_elements_f
-   implicit none
-   TYPE(MPI_Status), INTENT(INOUT) :: status
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, INTENT(IN) :: count
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_status_set_elements_f(status,datatype%MPI_VAL,count,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Status_set_elements_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_set_elements_x_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_set_elements_x_f08.F90
deleted file mode 100644
index 82b63714b86..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_set_elements_x_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Status_set_elements_x_f08(status,datatype,count,ierror)
-   use :: mpi_f08_types, only : MPI_Status, MPI_Datatype, MPI_COUNT_KIND
-   use :: ompi_mpifh_bindings, only : ompi_status_set_elements_x_f
-   implicit none
-   TYPE(MPI_Status), INTENT(INOUT) :: status
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER(MPI_COUNT_KIND), INTENT(IN) :: count
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_status_set_elements_x_f(status,datatype%MPI_VAL,count,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Status_set_elements_x_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptest_cancelled_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptest_cancelled_f08.F90
deleted file mode 100644
index 4fc9c14609a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptest_cancelled_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Test_cancelled_f08(status,flag,ierror)
-   use :: mpi_f08_types, only : MPI_Status
-   implicit none
-   TYPE(MPI_Status), INTENT(IN) :: status
-   LOGICAL, INTENT(OUT) :: flag
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   ! See note in mpi-f-interfaces-bind.h for why we include an
-   ! interface here and call a PMPI_* subroutine below.
-   interface
-      subroutine PMPI_Test_cancelled(status, flag, ierror)
-        use :: mpi_f08_types, only : MPI_Status
-        type(MPI_Status), intent(in) :: status
-        logical, intent(out) :: flag
-        integer, intent(out) :: ierror
-      end subroutine PMPI_Test_cancelled
-   end interface
-
-   call PMPI_Test_cancelled(status,flag,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Test_cancelled_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptest_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptest_f08.F90
deleted file mode 100644
index 3dce1270895..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptest_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Test_f08(request,flag,status,ierror)
-   use :: mpi_f08_types, only : MPI_Request, MPI_Status
-   implicit none
-   TYPE(MPI_Request), INTENT(INOUT) :: request
-   LOGICAL, INTENT(OUT) :: flag
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   ! See note in mpi-f-interfaces-bind.h for why we include an
-   ! interface here and call a PMPI_* subroutine below.
-   interface
-      subroutine PMPI_Test(request, flag, status, ierror)
-        use :: mpi_f08_types, only : MPI_Status
-        integer, intent(inout) :: request
-        logical, intent(out) :: flag
-        TYPE(MPI_Status) :: status
-        integer, intent(out) :: ierror
-      end subroutine PMPI_Test
-   end interface
-
-   call PMPI_Test(request%MPI_VAL,flag,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Test_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptestall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptestall_f08.F90
deleted file mode 100644
index 131d480c3da..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptestall_f08.F90
+++ /dev/null
@@ -1,33 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Testall_f08(count,array_of_requests,flag,array_of_statuses,ierror)
-   use :: mpi_f08_types, only : MPI_Request, MPI_Status
-   implicit none
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Request), INTENT(INOUT) :: array_of_requests(count)
-   LOGICAL, INTENT(OUT) :: flag
-   TYPE(MPI_Status), INTENT(OUT) :: array_of_statuses(*)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   ! See note in mpi-f-interfaces-bind.h for why we include an
-   ! interface here and call a PMPI_* subroutine below.
-   interface
-      subroutine PMPI_Testall(count, array_of_requests, flag, array_of_statuses, ierror)
-        use :: mpi_f08_types, only : MPI_Status
-        integer, intent(in) :: count
-        integer, dimension(count), intent(inout) :: array_of_requests
-        logical, intent(out) :: flag
-        type(MPI_Status), dimension(*), intent(out) :: array_of_statuses
-        integer, intent(out) :: ierror
-      end subroutine PMPI_Testall
-   end interface
-
-   call PMPI_Testall(count,array_of_requests(:)%MPI_VAL,flag,array_of_statuses,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Testall_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptestany_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptestany_f08.F90
deleted file mode 100644
index b5035c12ecb..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptestany_f08.F90
+++ /dev/null
@@ -1,36 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Testany_f08(count,array_of_requests,index,flag,status,ierror)
-   use :: mpi_f08_types, only : MPI_Request, MPI_Status
-   implicit none
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Request), INTENT(INOUT) :: array_of_requests(count)
-   INTEGER, INTENT(OUT) :: index
-   LOGICAL, INTENT(OUT) :: flag
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   ! See note in mpi-f-interfaces-bind.h for why we include an
-   ! interface here and call a PMPI_* subroutine below.
-   interface
-      subroutine PMPI_Testany(count, array_of_requests, index, flag, status&
-           , ierror)
-        use :: mpi_f08_types, only : MPI_Status
-        integer, intent(in) :: count
-        integer, dimension(count), intent(inout) :: array_of_requests
-        integer, intent(out) :: index
-        logical, intent(out) :: flag
-        type(MPI_Status), intent(out) :: status
-        integer, intent(out) :: ierror
-      end subroutine PMPI_Testany
-   end interface
-
-   call PMPI_Testany(count,array_of_requests(:)%MPI_VAL,index,flag,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Testany_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptestsome_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptestsome_f08.F90
deleted file mode 100644
index 6da3d353631..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptestsome_f08.F90
+++ /dev/null
@@ -1,38 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Testsome_f08(incount,array_of_requests,outcount, &
-                             array_of_indices,array_of_statuses,ierror)
-   use :: mpi_f08_types, only : MPI_Request, MPI_Status
-   implicit none
-   INTEGER, INTENT(IN) :: incount
-   TYPE(MPI_Request), INTENT(INOUT) :: array_of_requests(incount)
-   INTEGER, INTENT(OUT) :: outcount
-   INTEGER, INTENT(OUT) :: array_of_indices(*)
-   TYPE(MPI_Status), INTENT(OUT) :: array_of_statuses(*)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   ! See note in mpi-f-interfaces-bind.h for why we include an
-   ! interface here and call a PMPI_* subroutine below.
-   interface
-      subroutine PMPI_Testsome(incount, array_of_requests, outcount, array_of_indices, array_of_statuses&
-           , ierror)
-        use :: mpi_f08_types, only : MPI_Status
-        integer, intent(in) :: incount
-        integer, dimension(incount), intent(inout) :: array_of_requests
-        integer, intent(out) :: outcount
-        integer, dimension(*), intent(out) :: array_of_indices
-        type(MPI_Status), dimension(*), intent(out) :: array_of_statuses
-        integer, intent(out) :: ierror
-      end subroutine PMPI_Testsome
-   end interface
-
-   call PMPI_Testsome(incount,array_of_requests(:)%MPI_VAL,outcount, &
-                        array_of_indices,array_of_statuses,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Testsome_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptopo_test_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptopo_test_f08.F90
deleted file mode 100644
index e4c0228dda6..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptopo_test_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Topo_test_f08(comm,status,ierror)
-   use :: mpi_f08_types, only : MPI_Comm, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_topo_test_f
-   implicit none
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_topo_test_f(comm%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Topo_test_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_commit_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_commit_f08.F90
deleted file mode 100644
index 33b880c851f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_commit_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_commit_f08(datatype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_type_commit_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(INOUT) :: datatype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_commit_f(datatype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_commit_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_contiguous_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_contiguous_f08.F90
deleted file mode 100644
index eabcecae488..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_contiguous_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_contiguous_f08(count,oldtype,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_type_contiguous_f
-   implicit none
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Datatype), INTENT(IN) :: oldtype
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_contiguous_f(count,oldtype%MPI_VAL,newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_contiguous_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_darray_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_darray_f08.F90
deleted file mode 100644
index aff07168693..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_darray_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_create_darray_f08(size,rank,ndims,&
-                     array_of_gsizes,array_of_distribs,array_of_dargs,array_of_psizes,&
-                     order,oldtype,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_type_create_darray_f
-   implicit none
-   INTEGER, INTENT(IN) :: size, rank, ndims, order
-   INTEGER, INTENT(IN) :: array_of_gsizes(*), array_of_distribs(*), array_of_dargs(*), array_of_psizes(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: oldtype
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_create_darray_f(size,rank,ndims, &
-                    array_of_gsizes,array_of_distribs,array_of_dargs,array_of_psizes, &
-                    order,oldtype%MPI_VAL,newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_create_darray_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_f90_complex_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_f90_complex_f08.F90
deleted file mode 100644
index 6400d8a63ec..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_f90_complex_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_create_f90_complex_f08(p,r,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_type_create_f90_complex_f
-   implicit none
-   INTEGER, INTENT(IN) :: p, r
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_create_f90_complex_f(p,r,newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_create_f90_complex_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_f90_integer_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_f90_integer_f08.F90
deleted file mode 100644
index 4a5b5de7a83..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_f90_integer_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_create_f90_integer_f08(r,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_type_create_f90_integer_f
-   implicit none
-   INTEGER, INTENT(IN) :: r
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_create_f90_integer_f(r,newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_create_f90_integer_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_f90_real_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_f90_real_f08.F90
deleted file mode 100644
index 1dc6aa3da0f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_f90_real_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_create_f90_real_f08(p,r,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_type_create_f90_real_f
-   implicit none
-   INTEGER, INTENT(IN) :: p, r
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_create_f90_real_f(p,r,newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_create_f90_real_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_hindexed_block_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_hindexed_block_f08.F90
deleted file mode 100644
index af73a97edc6..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_hindexed_block_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2012      The University of Tennessee and The University
-!                         of Tennessee Research Foundation.  All rights
-!                         reserved.
-! Copyright (c) 2012      Inria.  All rights reserved.
-! Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_create_hindexed_block_f08(count,blocklength, &
-                           array_of_displacements,oldtype,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_create_hindexed_block_f
-   implicit none
-   INTEGER, INTENT(IN) :: count, blocklength
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: array_of_displacements(count)
-   TYPE(MPI_Datatype), INTENT(IN) :: oldtype
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_create_hindexed_block_f(count,blocklength,array_of_displacements, &
-                                         oldtype%MPI_VAL,newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_create_hindexed_block_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_hindexed_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_hindexed_f08.F90
deleted file mode 100644
index 766309222fe..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_hindexed_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_create_hindexed_f08(count,array_of_blocklengths, &
-                                         array_of_displacements,oldtype,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_create_hindexed_f
-   implicit none
-   INTEGER, INTENT(IN) :: count
-   INTEGER, INTENT(IN) :: array_of_blocklengths(count)
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: array_of_displacements(count)
-   TYPE(MPI_Datatype), INTENT(IN) :: oldtype
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_create_hindexed_f(count,array_of_blocklengths, &
-                                    array_of_displacements,oldtype%MPI_VAL, &
-                                    newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_create_hindexed_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_hvector_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_hvector_f08.F90
deleted file mode 100644
index 39c150fd8b4..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_hvector_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_create_hvector_f08(count,blocklength,stride,oldtype,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_create_hvector_f
-   implicit none
-   INTEGER, INTENT(IN) :: count, blocklength
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: stride
-   TYPE(MPI_Datatype), INTENT(IN) :: oldtype
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_create_hvector_f(count,blocklength,stride, &
-                                   oldtype%MPI_VAL,newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_create_hvector_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_indexed_block_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_indexed_block_f08.F90
deleted file mode 100644
index af902e64dd5..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_indexed_block_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_create_indexed_block_f08(count,blocklength, &
-                            array_of_displacements,oldtype,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_type_create_indexed_block_f
-   implicit none
-   INTEGER, INTENT(IN) :: count, blocklength
-   INTEGER, INTENT(IN) :: array_of_displacements(count)
-   TYPE(MPI_Datatype), INTENT(IN) :: oldtype
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_create_indexed_block_f(count,blocklength,array_of_displacements, &
-                                         oldtype%MPI_VAL,newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_create_indexed_block_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_keyval_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_keyval_f08.F90
deleted file mode 100644
index 3b9205ad69f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_keyval_f08.F90
+++ /dev/null
@@ -1,34 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Type_create_keyval_f08(type_copy_attr_fn,type_delete_attr_fn,&
-                                       type_keyval,extra_state,ierror)
-   use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
-   use :: mpi_f08_types, only : MPI_ADDRESS_KIND
-   use :: mpi_f08_interfaces_callbacks, only : MPI_Type_copy_attr_function
-   use :: mpi_f08_interfaces_callbacks, only : MPI_Type_delete_attr_function
-   use :: ompi_mpifh_bindings, only : ompi_type_create_keyval_f
-   implicit none
-   PROCEDURE(MPI_Type_copy_attr_function) :: type_copy_attr_fn
-   PROCEDURE(MPI_Type_delete_attr_function) :: type_delete_attr_fn
-   INTEGER, INTENT(OUT) :: type_keyval
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: extra_state
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-   type(c_funptr) :: fcopy_fn, fdelete_fn
-
-   fcopy_fn = c_funloc(type_copy_attr_fn)
-   fdelete_fn = c_funloc(type_delete_attr_fn)
-   call ompi_type_create_keyval_f(fcopy_fn,fdelete_fn,&
-                                  type_keyval,extra_state,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_create_keyval_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_resized_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_resized_f08.F90
deleted file mode 100644
index d6e8af8cd58..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_resized_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_create_resized_f08(oldtype,lb,extent,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_create_resized_f
-   implicit none
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: lb, extent
-   TYPE(MPI_Datatype), INTENT(IN) :: oldtype
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_create_resized_f(oldtype%MPI_VAL,lb,extent,newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_create_resized_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_struct_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_struct_f08.F90
deleted file mode 100644
index 32aef155769..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_struct_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_create_struct_f08(count,array_of_blocklengths,array_of_displacements, &
-                                      array_of_types,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_create_struct_f
-   implicit none
-   INTEGER, INTENT(IN) :: count
-   INTEGER, INTENT(IN) :: array_of_blocklengths(count)
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: array_of_displacements(count)
-   TYPE(MPI_Datatype), INTENT(IN) :: array_of_types(count)
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_create_struct_f(count,array_of_blocklengths,array_of_displacements, &
-                                  array_of_types(:)%MPI_VAL,newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_create_struct_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_subarray_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_subarray_f08.F90
deleted file mode 100644
index 5e77c98232d..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_create_subarray_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_create_subarray_f08(ndims,array_of_sizes,array_of_subsizes, &
-                                         array_of_starts,order,oldtype,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_type_create_subarray_f
-   implicit none
-   INTEGER, INTENT(IN) :: ndims, order
-   INTEGER, INTENT(IN) :: array_of_sizes(*), array_of_subsizes(*), array_of_starts(*)
-   TYPE(MPI_Datatype), INTENT(IN) :: oldtype
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_create_subarray_f(ndims,array_of_sizes, &
-                                    array_of_subsizes,array_of_starts, &
-                                    order,oldtype%MPI_VAL,newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_create_subarray_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_delete_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_delete_attr_f08.F90
deleted file mode 100644
index c0996b74fc4..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_delete_attr_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_delete_attr_f08(datatype,type_keyval,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_type_delete_attr_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, INTENT(IN) :: type_keyval
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_delete_attr_f(datatype%MPI_VAL,type_keyval,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_delete_attr_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_dup_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_dup_f08.F90
deleted file mode 100644
index b2751ba74ec..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_dup_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_dup_f08(oldtype,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_type_dup_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(IN) :: oldtype
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_dup_f(oldtype%MPI_VAL,newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_dup_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_free_f08.F90
deleted file mode 100644
index 4a649af19e0..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_free_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_free_f08(datatype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_type_free_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(INOUT) :: datatype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_free_f(datatype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_free_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_free_keyval_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_free_keyval_f08.F90
deleted file mode 100644
index 079d902d0f1..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_free_keyval_f08.F90
+++ /dev/null
@@ -1,20 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_free_keyval_f08(type_keyval,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_type_free_keyval_f
-   implicit none
-   INTEGER, INTENT(INOUT) :: type_keyval
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_free_keyval_f(type_keyval,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_free_keyval_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_attr_f08.F90
deleted file mode 100644
index 4ad25f8e667..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_attr_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_get_attr_f08(datatype,type_keyval,attribute_val,flag,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Type_get_attr
-   implicit none
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, INTENT(IN) :: type_keyval
-   INTEGER(MPI_ADDRESS_KIND), INTENT(OUT) :: attribute_val
-   LOGICAL, INTENT(OUT) :: flag
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Type_get_attr(datatype%MPI_VAL,type_keyval,attribute_val,flag,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Type_get_attr_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_contents_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_contents_f08.F90
deleted file mode 100644
index d6b200560a8..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_contents_f08.F90
+++ /dev/null
@@ -1,29 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_get_contents_f08(datatype,max_integers,max_addresses, &
-                     max_datatypes,array_of_integers,array_of_addresses, &
-                     array_of_datatypes,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_get_contents_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, INTENT(IN) :: max_integers, max_addresses, max_datatypes
-   INTEGER, INTENT(OUT) :: array_of_integers(max_integers)
-   INTEGER(MPI_ADDRESS_KIND), INTENT(OUT) :: array_of_addresses(max_addresses)
-   TYPE(MPI_Datatype), INTENT(OUT) :: array_of_datatypes(max_datatypes)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_get_contents_f(datatype%MPI_VAL,max_integers,max_addresses, &
-                    max_datatypes,array_of_integers,array_of_addresses, &
-                    array_of_datatypes(:)%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_get_contents_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_envelope_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_envelope_f08.F90
deleted file mode 100644
index 042a92c012c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_envelope_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_get_envelope_f08(datatype,num_integers,num_addresses, &
-                                      num_datatypes,combiner,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_get_envelope_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, INTENT(OUT) :: num_integers, num_addresses, num_datatypes, combiner
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_get_envelope_f(datatype%MPI_VAL,num_integers,num_addresses, &
-                                 num_datatypes,combiner,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_get_envelope_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_extent_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_extent_f08.F90
deleted file mode 100644
index 7a034233c0e..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_extent_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_get_extent_f08(datatype,lb,extent,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_get_extent_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER(MPI_ADDRESS_KIND), INTENT(OUT) :: lb, extent
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_get_extent_f(datatype%MPI_VAL,lb,extent,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_get_extent_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_extent_x_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_extent_x_f08.F90
deleted file mode 100644
index 5e8e270eba7..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_extent_x_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_get_extent_x_f08(datatype,lb,extent,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND, MPI_COUNT_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_get_extent_x_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER(MPI_COUNT_KIND), INTENT(OUT) :: lb, extent
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_get_extent_x_f(datatype%MPI_VAL,lb,extent,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_get_extent_x_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_name_f08.F90
deleted file mode 100644
index 18398f7c367..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_name_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2011 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_get_name_f08(datatype,type_name,resultlen,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_MAX_OBJECT_NAME
-   use :: ompi_mpifh_bindings, only : ompi_type_get_name_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   CHARACTER(LEN=*), INTENT(OUT) :: type_name
-   INTEGER, INTENT(OUT) :: resultlen
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_get_name_f(datatype%MPI_VAL,type_name,resultlen,c_ierror,len(type_name))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_get_name_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_true_extent_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_true_extent_f08.F90
deleted file mode 100644
index fcf3fb64fbd..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_true_extent_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_get_true_extent_f08(datatype,true_lb,true_extent,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_get_true_extent_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER(MPI_ADDRESS_KIND), INTENT(OUT) :: true_lb, true_extent
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_get_true_extent_f(datatype%MPI_VAL,true_lb,true_extent,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_get_true_extent_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_true_extent_x_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_true_extent_x_f08.F90
deleted file mode 100644
index a4efb6f3fec..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_get_true_extent_x_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_get_true_extent_x_f08(datatype,true_lb,true_extent,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND, MPI_COUNT_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_get_true_extent_x_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER(MPI_COUNT_KIND), INTENT(OUT) :: true_lb, true_extent
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_get_true_extent_x_f(datatype%MPI_VAL,true_lb,true_extent,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_get_true_extent_x_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_indexed_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_indexed_f08.F90
deleted file mode 100644
index a3a1f21b71a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_indexed_f08.F90
+++ /dev/null
@@ -1,26 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_indexed_f08(count,array_of_blocklengths, &
-                                array_of_displacements,oldtype,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_indexed_f
-   implicit none
-   INTEGER, INTENT(IN) :: count
-   INTEGER, INTENT(IN) :: array_of_blocklengths(count), array_of_displacements(count)
-   TYPE(MPI_Datatype), INTENT(IN) :: oldtype
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_indexed_f(count,array_of_blocklengths,array_of_displacements, &
-                            oldtype%MPI_VAL,newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_indexed_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_match_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_match_size_f08.F90
deleted file mode 100644
index 162137ada6e..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_match_size_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_match_size_f08(typeclass,size,datatype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_type_match_size_f
-   implicit none
-   INTEGER, INTENT(IN) :: typeclass, size
-   TYPE(MPI_Datatype), INTENT(OUT) :: datatype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_match_size_f(typeclass,size,datatype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_match_size_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_set_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_set_attr_f08.F90
deleted file mode 100644
index 525f1ea03e5..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_set_attr_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_set_attr_f08(datatype,type_keyval,attribute_val,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_set_attr_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, INTENT(IN) :: type_keyval
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: attribute_val
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_set_attr_f(datatype%MPI_VAL,type_keyval,attribute_val,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_set_attr_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_set_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_set_name_f08.F90
deleted file mode 100644
index 0b0b7b9927a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_set_name_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2011 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_set_name_f08(datatype,type_name,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_type_set_name_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   CHARACTER(LEN=*), INTENT(IN) :: type_name
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_set_name_f(datatype%MPI_VAL,type_name,c_ierror,len(type_name))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_set_name_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_size_f08.F90
deleted file mode 100644
index fa4725bb9ca..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_size_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_size_f08(datatype,size,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_size_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, INTENT(OUT) :: size
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_size_f(datatype%MPI_VAL,size,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_size_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_size_x_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_size_x_f08.F90
deleted file mode 100644
index 3739b278cec..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_size_x_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_size_x_f08(datatype,size,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_COUNT_KIND
-   use :: ompi_mpifh_bindings, only : ompi_type_size_x_f
-   implicit none
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER(MPI_COUNT_KIND), INTENT(OUT) :: size
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_size_x_f(datatype%MPI_VAL,size,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_size_x_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_vector_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_vector_f08.F90
deleted file mode 100644
index 4c035c607b4..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_vector_f08.F90
+++ /dev/null
@@ -1,25 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Type_vector_f08(count,blocklength,stride,oldtype,newtype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype
-   use :: ompi_mpifh_bindings, only : ompi_type_vector_f
-   implicit none
-   INTEGER, INTENT(IN) :: count, blocklength, stride
-   TYPE(MPI_Datatype), INTENT(IN) :: oldtype
-   TYPE(MPI_Datatype), INTENT(OUT) :: newtype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_type_vector_f(count,blocklength,stride, &
-                           oldtype%MPI_VAL,newtype%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Type_vector_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/punpack_external_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/punpack_external_f08.F90
deleted file mode 100644
index 783eb2e4362..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/punpack_external_f08.F90
+++ /dev/null
@@ -1,31 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Unpack_external_f08(datarep,inbuf,insize,position,outbuf,outcount,datatype,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_unpack_external_f
-   implicit none
-   CHARACTER(LEN=*), INTENT(IN) :: datarep
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: outbuf
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: insize
-   INTEGER(MPI_ADDRESS_KIND), INTENT(INOUT) :: position
-   INTEGER, INTENT(IN) :: outcount
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_unpack_external_f(datarep,inbuf,insize,position,outbuf,&
-                               outcount,datatype%MPI_VAL,c_ierror,len(datarep))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Unpack_external_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/punpack_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/punpack_f08.F90
deleted file mode 100644
index 5ff77842262..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/punpack_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Unpack_f08(inbuf,insize,position,outbuf,outcount,datatype,comm,ierror)
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
-   use :: ompi_mpifh_bindings, only : ompi_unpack_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: outbuf
-   INTEGER, INTENT(IN) :: insize, outcount
-   INTEGER, INTENT(INOUT) :: position
-   TYPE(MPI_Datatype), INTENT(IN) :: datatype
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_unpack_f(inbuf,insize,position,outbuf,outcount, &
-                      datatype%MPI_VAL,comm%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Unpack_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/punpublish_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/punpublish_name_f08.F90
deleted file mode 100644
index d000993ee20..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/punpublish_name_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Unpublish_name_f08(service_name,info,port_name,ierror)
-   use :: mpi_f08_types, only : MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_unpublish_name_f
-   implicit none
-   CHARACTER(LEN=*), INTENT(IN) :: service_name, port_name
-   TYPE(MPI_Info), INTENT(IN) :: info
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_unpublish_name_f(service_name,info%MPI_VAL,port_name,c_ierror, &
-                              len(service_name), len(port_name))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Unpublish_name_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwait_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwait_f08.F90
deleted file mode 100644
index 9e41083603e..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwait_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Wait_f08(request,status,ierror)
-   use :: mpi_f08_types, only : MPI_Request, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_wait_f
-   implicit none
-   TYPE(MPI_Request), INTENT(INOUT) :: request
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_wait_f(request%MPI_VAL,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Wait_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwaitall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwaitall_f08.F90
deleted file mode 100644
index 26173405845..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwaitall_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Waitall_f08(count,array_of_requests,array_of_statuses,ierror)
-   use :: mpi_f08_types, only : MPI_Request, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_waitall_f
-   implicit none
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Request), INTENT(INOUT) :: array_of_requests(count)
-   TYPE(MPI_Status), INTENT(OUT) :: array_of_statuses(*)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_waitall_f(count,array_of_requests(:)%MPI_VAL,array_of_statuses,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Waitall_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwaitany_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwaitany_f08.F90
deleted file mode 100644
index 5b4420b66dd..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwaitany_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Waitany_f08(count,array_of_requests,index,status,ierror)
-   use :: mpi_f08_types, only : MPI_Request, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_waitany_f
-   implicit none
-   INTEGER, INTENT(IN) :: count
-   TYPE(MPI_Request), INTENT(INOUT) :: array_of_requests(count)
-   INTEGER, INTENT(OUT) :: index
-   TYPE(MPI_Status), INTENT(OUT) :: status
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_waitany_f(count,array_of_requests(:)%MPI_VAL,index,status,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Waitany_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwaitsome_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwaitsome_f08.F90
deleted file mode 100644
index d68bf7eea0d..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwaitsome_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Waitsome_f08(incount,array_of_requests,outcount, &
-                             array_of_indices,array_of_statuses,ierror)
-   use :: mpi_f08_types, only : MPI_Request, MPI_Status
-   use :: ompi_mpifh_bindings, only : ompi_waitsome_f
-   implicit none
-   INTEGER, INTENT(IN) :: incount
-   TYPE(MPI_Request), INTENT(INOUT) :: array_of_requests(incount)
-   INTEGER, INTENT(OUT) :: outcount
-   INTEGER, INTENT(OUT) :: array_of_indices(*)
-   TYPE(MPI_Status), INTENT(OUT) :: array_of_statuses(*)
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_waitsome_f(incount,array_of_requests(:)%MPI_VAL,outcount, &
-                        array_of_indices,array_of_statuses,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Waitsome_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_allocate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_allocate_f08.F90
deleted file mode 100644
index 418be004d35..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_allocate_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2004-2014 High Performance Computing Center Stuttgart,
-!                         University of Stuttgart.  All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_allocate_f08(size, disp_unit, info, comm, &
-      baseptr, win, ierror)
-   USE, INTRINSIC ::  ISO_C_BINDING, ONLY : C_PTR
-   use :: mpi_f08_types, only : MPI_Info, MPI_Comm, MPI_Win, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_win_allocate_f
-   implicit none
-   INTEGER(KIND=MPI_ADDRESS_KIND), INTENT(IN) ::  size
-   INTEGER, INTENT(IN) ::  disp_unit
-   TYPE(MPI_Info), INTENT(IN) ::  info
-   TYPE(MPI_Comm), INTENT(IN) ::  comm
-   TYPE(C_PTR), INTENT(OUT) ::  baseptr
-   TYPE(MPI_Win), INTENT(OUT) ::  win
-   INTEGER, OPTIONAL, INTENT(OUT) ::  ierror
-   integer :: c_ierror
-
-  call ompi_win_allocate_f(size, disp_unit, info%MPI_VAL, comm%MPI_VAL, baseptr, win%MPI_VAL, c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_allocate_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_allocate_shared_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_allocate_shared_f08.F90
deleted file mode 100644
index 1d11b7e3c1a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_allocate_shared_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_allocate_shared_f08(size, disp_unit, info, comm, &
-      baseptr, win, ierror)
-   USE, INTRINSIC ::  ISO_C_BINDING, ONLY : C_PTR
-   use :: mpi_f08_types, only : MPI_Info, MPI_Comm, MPI_Win, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_win_allocate_shared_f
-   implicit none
-   INTEGER(KIND=MPI_ADDRESS_KIND), INTENT(IN) ::  size
-   INTEGER, INTENT(IN) ::  disp_unit
-   TYPE(MPI_Info), INTENT(IN) ::  info
-   TYPE(MPI_Comm), INTENT(IN) ::  comm
-   TYPE(C_PTR), INTENT(OUT) ::  baseptr
-   TYPE(MPI_Win), INTENT(OUT) ::  win
-   INTEGER, OPTIONAL, INTENT(OUT) ::  ierror
-   integer :: c_ierror
-
-  call ompi_win_allocate_shared_f(size, disp_unit, info%MPI_VAL, comm%MPI_VAL, baseptr, win%MPI_VAL, c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_allocate_shared_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_attach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_attach_f08.F90
deleted file mode 100644
index c483e7620d6..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_attach_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Win_attach_f08(win,base,size,ierror)
-   use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_win_attach_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: base
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: size
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_attach_f(win%MPI_VAL,base,size,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_attach_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_call_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_call_errhandler_f08.F90
deleted file mode 100644
index 879e5ad774c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_call_errhandler_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_call_errhandler_f08(win,errorcode,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_call_errhandler_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, INTENT(IN) :: errorcode
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_call_errhandler_f(win%MPI_VAL,errorcode,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_call_errhandler_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_complete_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_complete_f08.F90
deleted file mode 100644
index 7481c80240c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_complete_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_complete_f08(win,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_complete_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_complete_f(win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_complete_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_dynamic_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_dynamic_f08.F90
deleted file mode 100644
index f00b05c6e62..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_dynamic_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Win_create_dynamic_f08(info,comm,win,ierror)
-   use :: mpi_f08_types, only : MPI_Info, MPI_Comm, MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_create_dynamic_f
-   implicit none
-   TYPE(MPI_Info), INTENT(IN) :: info
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Win), INTENT(OUT) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_create_dynamic_f(info%MPI_VAL,&
-                          comm%MPI_VAL,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_create_dynamic_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_errhandler_f08.F90
deleted file mode 100644
index f38c6be6f8a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_errhandler_f08.F90
+++ /dev/null
@@ -1,28 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Win_create_errhandler_f08(win_errhandler_fn,errhandler,ierror)
-   use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
-   use :: mpi_f08_types, only : MPI_Errhandler
-   use :: mpi_f08_interfaces_callbacks, only : MPI_Win_errhandler_function
-   use :: ompi_mpifh_bindings, only : ompi_win_create_errhandler_f
-   implicit none
-   PROCEDURE(MPI_Win_errhandler_function) :: win_errhandler_fn
-   TYPE(MPI_Errhandler), INTENT(OUT) :: errhandler
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-   type(c_funptr) :: fn
-
-   fn = c_funloc(win_errhandler_fn)
-   call ompi_win_create_errhandler_f(fn,errhandler%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_create_errhandler_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_f08.F90
deleted file mode 100644
index 636f0d5b1d8..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_f08.F90
+++ /dev/null
@@ -1,30 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Win_create_f08(base,size,disp_unit,info,comm,win,ierror)
-   use :: mpi_f08_types, only : MPI_Info, MPI_Comm, MPI_Win, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_win_create_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: base
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: size
-   INTEGER, INTENT(IN) :: disp_unit
-   TYPE(MPI_Info), INTENT(IN) :: info
-   TYPE(MPI_Comm), INTENT(IN) :: comm
-   TYPE(MPI_Win), INTENT(OUT) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_create_f(base,size,disp_unit,info%MPI_VAL,&
-                          comm%MPI_VAL,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_create_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_keyval_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_keyval_f08.F90
deleted file mode 100644
index d911fff5f72..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_keyval_f08.F90
+++ /dev/null
@@ -1,34 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Win_create_keyval_f08(win_copy_attr_fn,win_delete_attr_fn,&
-                                      win_keyval,extra_state,ierror)
-   use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
-   use :: mpi_f08_types, only : MPI_ADDRESS_KIND
-   use :: mpi_f08_interfaces_callbacks, only : MPI_Win_copy_attr_function
-   use :: mpi_f08_interfaces_callbacks, only : MPI_Win_delete_attr_function
-   use :: ompi_mpifh_bindings, only : ompi_win_create_keyval_f
-   implicit none
-   PROCEDURE(MPI_Win_copy_attr_function) :: win_copy_attr_fn
-   PROCEDURE(MPI_Win_delete_attr_function) :: win_delete_attr_fn
-   INTEGER, INTENT(OUT) :: win_keyval
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: extra_state
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-   type(c_funptr) :: fcopy_fn, fdelete_fn
-
-   fcopy_fn = c_funloc(win_copy_attr_fn)
-   fdelete_fn = c_funloc(win_delete_attr_fn)
-   call ompi_win_create_keyval_f(fcopy_fn,fdelete_fn,&
-                                 win_keyval,extra_state,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_create_keyval_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_delete_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_delete_attr_f08.F90
deleted file mode 100644
index b2786d01abd..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_delete_attr_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_delete_attr_f08(win,win_keyval,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_delete_attr_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, INTENT(IN) :: win_keyval
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_delete_attr_f(win%MPI_VAL,win_keyval,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_delete_attr_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_detach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_detach_f08.F90
deleted file mode 100644
index 962a6c270ae..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_detach_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-#include "ompi/mpi/fortran/configure-fortran-output.h"
-
-subroutine PMPI_Win_detach_f08(win,base,ierror)
-   use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_win_detach_f
-   implicit none
-   OMPI_FORTRAN_IGNORE_TKR_TYPE :: base
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_detach_f(win%MPI_VAL,base,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_detach_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_fence_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_fence_f08.F90
deleted file mode 100644
index 2dd924125e3..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_fence_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_fence_f08(assert,win,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_fence_f
-   implicit none
-   INTEGER, INTENT(IN) :: assert
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_fence_f(assert,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_fence_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_flush_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_flush_all_f08.F90
deleted file mode 100644
index 4ccd00bf651..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_flush_all_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_flush_all_f08(win,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_flush_all_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_flush_all_f(win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_flush_all_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_flush_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_flush_f08.F90
deleted file mode 100644
index 3893ff6ee5c..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_flush_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_flush_f08(rank,win,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_flush_f
-   implicit none
-   INTEGER, INTENT(IN) :: rank
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_flush_f(rank,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_flush_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_flush_local_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_flush_local_all_f08.F90
deleted file mode 100644
index a43ff460133..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_flush_local_all_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_flush_local_all_f08(win,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_flush_local_all_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_flush_local_all_f(win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_flush_local_all_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_flush_local_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_flush_local_f08.F90
deleted file mode 100644
index 8e80552a29a..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_flush_local_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_flush_local_f08(rank,win,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_flush_local_f
-   implicit none
-   INTEGER, INTENT(IN) :: rank
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_flush_local_f(rank,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_flush_local_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_free_f08.F90
deleted file mode 100644
index 6a5fba6e409..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_free_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_free_f08(win,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_free_f
-   implicit none
-   TYPE(MPI_Win), INTENT(INOUT) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_free_f(win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_free_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_free_keyval_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_free_keyval_f08.F90
deleted file mode 100644
index 9846436f824..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_free_keyval_f08.F90
+++ /dev/null
@@ -1,20 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_free_keyval_f08(win_keyval,ierror)
-   use :: ompi_mpifh_bindings, only : ompi_win_free_keyval_f
-   implicit none
-   INTEGER, INTENT(INOUT) :: win_keyval
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_free_keyval_f(win_keyval,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_free_keyval_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_attr_f08.F90
deleted file mode 100644
index 7d95d69ed29..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_attr_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_get_attr_f08(win,win_keyval,attribute_val,flag,ierror)
-   use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Win_get_attr
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, INTENT(IN) :: win_keyval
-   INTEGER(MPI_ADDRESS_KIND), INTENT(OUT) :: attribute_val
-   LOGICAL, INTENT(OUT) :: flag
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Win_get_attr(win%MPI_VAL,win_keyval,attribute_val,flag,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Win_get_attr_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_errhandler_f08.F90
deleted file mode 100644
index c5809ce0f29..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_errhandler_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_get_errhandler_f08(win,errhandler,ierror)
-   use :: mpi_f08_types, only : MPI_Win, MPI_Errhandler
-   use :: ompi_mpifh_bindings, only : ompi_win_get_errhandler_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   TYPE(MPI_Errhandler), INTENT(OUT) :: errhandler
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_get_errhandler_f(win%MPI_VAL,errhandler%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_get_errhandler_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_group_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_group_f08.F90
deleted file mode 100644
index 0f505d76e53..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_group_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_get_group_f08(win,group,ierror)
-   use :: mpi_f08_types, only : MPI_Win, MPI_Group
-   use :: ompi_mpifh_bindings, only : ompi_win_get_group_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   TYPE(MPI_Group), INTENT(OUT) :: group
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_get_group_f(win%MPI_VAL,group%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_get_group_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_info_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_info_f08.F90
deleted file mode 100644
index cdb5b982d93..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_info_f08.F90
+++ /dev/null
@@ -1,19 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_get_info_f08(win,info,ierror)
-   use :: mpi_f08_types, only : MPI_Win, MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_win_get_info_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   TYPE(MPI_Info), INTENT(OUT) :: info
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_get_info_f(win%MPI_VAL,info%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_get_info_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_name_f08.F90
deleted file mode 100644
index 14a290db1ef..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_get_name_f08.F90
+++ /dev/null
@@ -1,24 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2011 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_get_name_f08(win,win_name,resultlen,ierror)
-   use, intrinsic :: ISO_C_BINDING, only : C_CHAR
-   use :: mpi_f08_types, only : MPI_Win, MPI_MAX_OBJECT_NAME
-   use :: ompi_mpifh_bindings, only : ompi_win_get_name_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: win_name
-   INTEGER, INTENT(OUT) :: resultlen
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_get_name_f(win%MPI_VAL,win_name,resultlen,c_ierror,len(win_name))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_get_name_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_lock_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_lock_all_f08.F90
deleted file mode 100644
index 7c55df952b6..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_lock_all_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_lock_all_f08(assert,win,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_lock_all_f
-   implicit none
-   INTEGER, INTENT(IN) :: assert
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_lock_all_f(assert,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_lock_all_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_lock_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_lock_f08.F90
deleted file mode 100644
index ec2af3dfd91..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_lock_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_lock_f08(lock_type,rank,assert,win,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_lock_f
-   implicit none
-   INTEGER, INTENT(IN) :: lock_type, rank, assert
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_lock_f(lock_type,rank,assert,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_lock_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_post_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_post_f08.F90
deleted file mode 100644
index 1bf8732a7ff..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_post_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_post_f08(group,assert,win,ierror)
-   use :: mpi_f08_types, only : MPI_Group, MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_post_f
-   implicit none
-   TYPE(MPI_Group), INTENT(IN) :: group
-   INTEGER, INTENT(IN) :: assert
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_post_f(group%MPI_VAL,assert,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_post_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_set_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_set_attr_f08.F90
deleted file mode 100644
index 0cff6690b64..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_set_attr_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_set_attr_f08(win,win_keyval,attribute_val,ierror)
-   use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_win_set_attr_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, INTENT(IN) :: win_keyval
-   INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: attribute_val
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_set_attr_f(win%MPI_VAL,win_keyval,attribute_val,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_set_attr_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_set_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_set_errhandler_f08.F90
deleted file mode 100644
index 8d27af33592..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_set_errhandler_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_set_errhandler_f08(win,errhandler,ierror)
-   use :: mpi_f08_types, only : MPI_Win, MPI_Errhandler
-   use :: ompi_mpifh_bindings, only : ompi_win_set_errhandler_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   TYPE(MPI_Errhandler), INTENT(IN) :: errhandler
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_set_errhandler_f(win%MPI_VAL,errhandler%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_set_errhandler_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_set_info_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_set_info_f08.F90
deleted file mode 100644
index 2d0324d3297..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_set_info_f08.F90
+++ /dev/null
@@ -1,19 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_set_info_f08(win,info,ierror)
-   use :: mpi_f08_types, only : MPI_Win, MPI_Info
-   use :: ompi_mpifh_bindings, only : ompi_win_set_info_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   TYPE(MPI_Info), INTENT(IN) :: info
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_set_info_f(win%MPI_VAL,info%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_set_info_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_set_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_set_name_f08.F90
deleted file mode 100644
index 69ef6f59dd4..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_set_name_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_set_name_f08(win,win_name,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_set_name_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   CHARACTER(LEN=*), INTENT(IN) :: win_name
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_set_name_f(win%MPI_VAL,win_name,c_ierror,len(win_name))
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_set_name_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_shared_query_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_shared_query_f08.F90
deleted file mode 100644
index c0b92ff6c97..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_shared_query_f08.F90
+++ /dev/null
@@ -1,27 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_shared_query_f08(win, rank, size, disp_unit, baseptr,&
-      ierror)
-   USE, INTRINSIC ::  ISO_C_BINDING, ONLY : C_PTR
-   use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND
-   use :: ompi_mpifh_bindings, only : ompi_win_shared_query_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) ::  win
-   INTEGER, INTENT(IN) ::  rank
-   INTEGER(KIND=MPI_ADDRESS_KIND), INTENT(OUT) ::  size
-   INTEGER, INTENT(OUT) ::  disp_unit
-   TYPE(C_PTR), INTENT(OUT) ::  baseptr
-   INTEGER, OPTIONAL, INTENT(OUT) ::  ierror
-   integer :: c_ierror
-
-   call ompi_win_shared_query_f(win%MPI_VAL, rank, size, disp_unit, baseptr, c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_shared_query_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_start_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_start_f08.F90
deleted file mode 100644
index 22d05cf0152..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_start_f08.F90
+++ /dev/null
@@ -1,23 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_start_f08(group,assert,win,ierror)
-   use :: mpi_f08_types, only : MPI_Group, MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_start_f
-   implicit none
-   TYPE(MPI_Group), INTENT(IN) :: group
-   INTEGER, INTENT(IN) :: assert
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_start_f(group%MPI_VAL,assert,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_start_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_sync_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_sync_f08.F90
deleted file mode 100644
index 0961908dfb8..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_sync_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_sync_f08(win,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_sync_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_sync_f(win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_sync_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_test_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_test_f08.F90
deleted file mode 100644
index 85ef0d6de8f..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_test_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_test_f08(win,flag,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
-   ! call a PMPI_* subroutine below.
-   use :: mpi, only : PMPI_Win_test
-   implicit none
-   LOGICAL, INTENT(OUT) :: flag
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call PMPI_Win_test(win%MPI_VAL,flag,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-end subroutine PMPI_Win_test_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_unlock_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_unlock_all_f08.F90
deleted file mode 100644
index 98cbfa090e0..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_unlock_all_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_unlock_all_f08(win,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_unlock_all_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_unlock_all_f(win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_unlock_all_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_unlock_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_unlock_f08.F90
deleted file mode 100644
index 974f9c36965..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_unlock_f08.F90
+++ /dev/null
@@ -1,22 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_unlock_f08(rank,win,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_unlock_f
-   implicit none
-   INTEGER, INTENT(IN) :: rank
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_unlock_f(rank,win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_unlock_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_wait_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_wait_f08.F90
deleted file mode 100644
index 2ec3b802812..00000000000
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_wait_f08.F90
+++ /dev/null
@@ -1,21 +0,0 @@
-! -*- f90 -*-
-!
-! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
-!               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
-!                         and Technology (RIST).  All rights reserved.
-! $COPYRIGHT$
-
-subroutine PMPI_Win_wait_f08(win,ierror)
-   use :: mpi_f08_types, only : MPI_Win
-   use :: ompi_mpifh_bindings, only : ompi_win_wait_f
-   implicit none
-   TYPE(MPI_Win), INTENT(IN) :: win
-   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-   integer :: c_ierror
-
-   call ompi_win_wait_f(win%MPI_VAL,c_ierror)
-   if (present(ierror)) ierror = c_ierror
-
-end subroutine PMPI_Win_wait_f08
diff --git a/ompi/mpi/fortran/use-mpi-f08/publish_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/publish_name_f08.F90
index d22b5463d23..00d8e021c2d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/publish_name_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/publish_name_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Publish_name_f08 PMPI_Publish_name_f08
+#endif
+
 subroutine MPI_Publish_name_f08(service_name,info,port_name,ierror)
    use :: mpi_f08_types, only : MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_publish_name_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/put_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/put_f08.F90
index 74660532391..5ee9a0d30cd 100644
--- a/ompi/mpi/fortran/use-mpi-f08/put_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/put_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Put_f08 PMPI_Put_f08
+#endif
+
 subroutine MPI_Put_f08(origin_addr,origin_count,origin_datatype,target_rank,&
                        target_disp,target_count,target_datatype,win,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND
diff --git a/ompi/mpi/fortran/use-mpi-f08/query_thread_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/query_thread_f08.F90
index 3d06e211c50..9316fe02f6d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/query_thread_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/query_thread_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Query_thread_f08 PMPI_Query_thread_f08
+#endif
+
 subroutine MPI_Query_thread_f08(provided,ierror)
    use :: ompi_mpifh_bindings, only : ompi_query_thread_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/raccumulate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/raccumulate_f08.F90
index 2e07d077660..da0e33c1fa1 100644
--- a/ompi/mpi/fortran/use-mpi-f08/raccumulate_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/raccumulate_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Raccumulate_f08 PMPI_Raccumulate_f08
+#endif
+
 subroutine MPI_Raccumulate_f08(origin_addr,origin_count,origin_datatype,&
                                target_rank,target_disp,target_count,    &
                                target_datatype,op,win,request, ierror)
diff --git a/ompi/mpi/fortran/use-mpi-f08/recv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/recv_f08.F90
index 17a32d644bb..b6154edf327 100644
--- a/ompi/mpi/fortran/use-mpi-f08/recv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/recv_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Recv_f08 PMPI_Recv_f08
+#endif
+
 subroutine MPI_Recv_f08(buf,count,datatype,source,tag,comm,status,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_recv_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/recv_init_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/recv_init_f08.F90
index 70491ffd169..b16bc43f9f9 100644
--- a/ompi/mpi/fortran/use-mpi-f08/recv_init_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/recv_init_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Recv_init_f08 PMPI_Recv_init_f08
+#endif
+
 subroutine MPI_Recv_init_f08(buf,count,datatype,source,tag,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_recv_init_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/reduce_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/reduce_f08.F90
index 8172184ea99..4ec98f693a0 100644
--- a/ompi/mpi/fortran/use-mpi-f08/reduce_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/reduce_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Reduce_f08 PMPI_Reduce_f08
+#endif
+
 subroutine MPI_Reduce_f08(sendbuf,recvbuf,count,datatype,op,root,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_reduce_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/reduce_local_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/reduce_local_f08.F90
index f1679394509..3ba24bac466 100644
--- a/ompi/mpi/fortran/use-mpi-f08/reduce_local_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/reduce_local_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Reduce_local_f08 PMPI_Reduce_local_f08
+#endif
+
 subroutine MPI_Reduce_local_f08(inbuf,inoutbuf,count,datatype,op,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op
    use :: ompi_mpifh_bindings, only : ompi_reduce_local_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/reduce_scatter_block_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/reduce_scatter_block_f08.F90
index 04a55345ee3..b84b5c6e5ca 100644
--- a/ompi/mpi/fortran/use-mpi-f08/reduce_scatter_block_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/reduce_scatter_block_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Reduce_scatter_block_f08 PMPI_Reduce_scatter_block_f08
+#endif
+
 subroutine MPI_Reduce_scatter_block_f08(sendbuf,recvbuf,recvcount,datatype,op,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_reduce_scatter_block_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/reduce_scatter_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/reduce_scatter_f08.F90
index 1a6ebee885d..5ca2d7fef12 100644
--- a/ompi/mpi/fortran/use-mpi-f08/reduce_scatter_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/reduce_scatter_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Reduce_scatter_f08 PMPI_Reduce_scatter_f08
+#endif
+
 subroutine MPI_Reduce_scatter_f08(sendbuf,recvbuf,recvcounts,datatype,op,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_reduce_scatter_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/register_datarep_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/register_datarep_f08.F90
index 10b82e395bc..cebf524ad0c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/register_datarep_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/register_datarep_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Register_datarep_f08 PMPI_Register_datarep_f08
+#endif
+
 subroutine MPI_Register_datarep_f08(datarep,read_conversion_fn,write_conversion_fn, &
                                     dtype_file_extent_fn,extra_state,ierror)
    use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
diff --git a/ompi/mpi/fortran/use-mpi-f08/request_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/request_free_f08.F90
index c8e1b818b8f..7c5fe27b962 100644
--- a/ompi/mpi/fortran/use-mpi-f08/request_free_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/request_free_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Request_free_f08 PMPI_Request_free_f08
+#endif
+
 subroutine MPI_Request_free_f08(request,ierror)
    use :: mpi_f08_types, only : MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_request_free_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/request_get_status_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/request_get_status_f08.F90
index 01f51fbe6f9..f115a89a04c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/request_get_status_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/request_get_status_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Request_get_status_f08 PMPI_Request_get_status_f08
+#endif
+
 subroutine MPI_Request_get_status_f08(request,flag,status,ierror)
    use :: mpi_f08_types, only : MPI_Request, MPI_Status
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/rget_accumulate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/rget_accumulate_f08.F90
index 3eec2c60d97..3760b817020 100644
--- a/ompi/mpi/fortran/use-mpi-f08/rget_accumulate_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/rget_accumulate_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Rget_accumulate_f08 PMPI_Rget_accumulate_f08
+#endif
+
 subroutine MPI_Rget_accumulate_f08(origin_addr,origin_count,origin_datatype,&
                                    result_addr,result_count,result_datatype,&
                                    target_rank,target_disp,target_count,    &
diff --git a/ompi/mpi/fortran/use-mpi-f08/rget_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/rget_f08.F90
index 6947329ba3f..2b3404f85bd 100644
--- a/ompi/mpi/fortran/use-mpi-f08/rget_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/rget_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Rget_f08 PMPI_Rget_f08
+#endif
+
 subroutine MPI_Rget_f08(origin_addr,origin_count,origin_datatype,target_rank,&
                         target_disp,target_count,target_datatype,win,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_Request, MPI_ADDRESS_KIND
diff --git a/ompi/mpi/fortran/use-mpi-f08/rput_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/rput_f08.F90
index e0104c97de3..c527542614e 100644
--- a/ompi/mpi/fortran/use-mpi-f08/rput_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/rput_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Rput_f08 PMPI_Rput_f08
+#endif
+
 subroutine MPI_Rput_f08(origin_addr,origin_count,origin_datatype,target_rank,&
                         target_disp,target_count,target_datatype,win,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_Request, MPI_ADDRESS_KIND
diff --git a/ompi/mpi/fortran/use-mpi-f08/rsend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/rsend_f08.F90
index 06b08e30fa3..cfcc3cb79ce 100644
--- a/ompi/mpi/fortran/use-mpi-f08/rsend_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/rsend_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Rsend_f08 PMPI_Rsend_f08
+#endif
+
 subroutine MPI_Rsend_f08(buf,count,datatype,dest,tag,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_rsend_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/rsend_init_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/rsend_init_f08.F90
index 7945d6d7575..dff53901758 100644
--- a/ompi/mpi/fortran/use-mpi-f08/rsend_init_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/rsend_init_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Rsend_init_f08 PMPI_Rsend_init_f08
+#endif
+
 subroutine MPI_Rsend_init_f08(buf,count,datatype,dest,tag,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_rsend_init_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/scan_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/scan_f08.F90
index 97f48071c01..158b7bbf762 100644
--- a/ompi/mpi/fortran/use-mpi-f08/scan_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/scan_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Scan_f08 PMPI_Scan_f08
+#endif
+
 subroutine MPI_Scan_f08(sendbuf,recvbuf,count,datatype,op,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_scan_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/scatter_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/scatter_f08.F90
index 09e43c86e95..d5f313a68c5 100644
--- a/ompi/mpi/fortran/use-mpi-f08/scatter_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/scatter_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Scatter_f08 PMPI_Scatter_f08
+#endif
+
 subroutine MPI_Scatter_f08(sendbuf,sendcount,sendtype,recvbuf,&
                            recvcount,recvtype,root,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
diff --git a/ompi/mpi/fortran/use-mpi-f08/scatterv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/scatterv_f08.F90
index 44f07c54788..dba5326575e 100644
--- a/ompi/mpi/fortran/use-mpi-f08/scatterv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/scatterv_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Scatterv_f08 PMPI_Scatterv_f08
+#endif
+
 subroutine MPI_Scatterv_f08(sendbuf,sendcounts,displs,sendtype,recvbuf,&
                             recvcount,recvtype,root,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
diff --git a/ompi/mpi/fortran/use-mpi-f08/send_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/send_f08.F90
index ff2903b2c58..233bf9a5d99 100644
--- a/ompi/mpi/fortran/use-mpi-f08/send_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/send_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Send_f08 PMPI_Send_f08
+#endif
+
 subroutine MPI_Send_f08(buf,count,datatype,dest,tag,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_send_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/send_init_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/send_init_f08.F90
index 84ab38e6043..98179f23103 100644
--- a/ompi/mpi/fortran/use-mpi-f08/send_init_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/send_init_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Send_init_f08 PMPI_Send_init_f08
+#endif
+
 subroutine MPI_Send_init_f08(buf,count,datatype,dest,tag,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_send_init_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/sendrecv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/sendrecv_f08.F90
index 44bb08570f6..e89140c5f15 100644
--- a/ompi/mpi/fortran/use-mpi-f08/sendrecv_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/sendrecv_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Sendrecv_f08 PMPI_Sendrecv_f08
+#endif
+
 subroutine MPI_Sendrecv_f08(sendbuf,sendcount,sendtype,dest,sendtag,recvbuf, &
                         recvcount,recvtype,source,recvtag,comm,status,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Status
diff --git a/ompi/mpi/fortran/use-mpi-f08/sendrecv_replace_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/sendrecv_replace_f08.F90
index a1d56ef662f..0f03ddb631b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/sendrecv_replace_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/sendrecv_replace_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Sendrecv_replace_f08 PMPI_Sendrecv_replace_f08
+#endif
+
 subroutine MPI_Sendrecv_replace_f08(buf,count,datatype,dest,sendtag,source, &
                                     recvtag,comm,status,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Status
diff --git a/ompi/mpi/fortran/use-mpi-f08/ssend_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ssend_f08.F90
index 5c235e4aece..8f80492efec 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ssend_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ssend_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ssend_f08 PMPI_Ssend_f08
+#endif
+
 subroutine MPI_Ssend_f08(buf,count,datatype,dest,tag,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_ssend_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/ssend_init_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ssend_init_f08.F90
index b95680ed603..51caf5d97b9 100644
--- a/ompi/mpi/fortran/use-mpi-f08/ssend_init_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/ssend_init_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Ssend_init_f08 PMPI_Ssend_init_f08
+#endif
+
 subroutine MPI_Ssend_init_f08(buf,count,datatype,dest,tag,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_ssend_init_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/start_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/start_f08.F90
index 8129b6132d8..2f871284829 100644
--- a/ompi/mpi/fortran/use-mpi-f08/start_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/start_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Start_f08 PMPI_Start_f08
+#endif
+
 subroutine MPI_Start_f08(request,ierror)
    use :: mpi_f08_types, only : MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_start_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/startall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/startall_f08.F90
index 256d02ceba9..bdc01f4941b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/startall_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/startall_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Startall_f08 PMPI_Startall_f08
+#endif
+
 subroutine MPI_Startall_f08(count,array_of_requests,ierror)
    use :: mpi_f08_types, only : MPI_Request
    use :: ompi_mpifh_bindings, only : ompi_startall_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/status_set_cancelled_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/status_set_cancelled_f08.F90
index d8f0e0cf372..7eea213664e 100644
--- a/ompi/mpi/fortran/use-mpi-f08/status_set_cancelled_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/status_set_cancelled_f08.F90
@@ -4,8 +4,14 @@
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Status_set_cancelled_f08 PMPI_Status_set_cancelled_f08
+#endif
+
 subroutine MPI_Status_set_cancelled_f08(status,flag,ierror)
    use :: mpi_f08_types, only : MPI_Status
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/status_set_elements_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/status_set_elements_f08.F90
index cbf35d9cbf1..33a1ae0dbeb 100644
--- a/ompi/mpi/fortran/use-mpi-f08/status_set_elements_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/status_set_elements_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Status_set_elements_f08 PMPI_Status_set_elements_f08
+#endif
+
 subroutine MPI_Status_set_elements_f08(status,datatype,count,ierror)
    use :: mpi_f08_types, only : MPI_Status, MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_status_set_elements_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/status_set_elements_x_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/status_set_elements_x_f08.F90
index 02752bd58b4..a2039d002bf 100644
--- a/ompi/mpi/fortran/use-mpi-f08/status_set_elements_x_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/status_set_elements_x_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Status_set_elements_x_f08 PMPI_Status_set_elements_x_f08
+#endif
+
 subroutine MPI_Status_set_elements_x_f08(status,datatype,count,ierror)
    use :: mpi_f08_types, only : MPI_Status, MPI_Datatype, MPI_COUNT_KIND
    use :: ompi_mpifh_bindings, only : ompi_status_set_elements_x_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/test_cancelled_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/test_cancelled_f08.F90
index bafaaa0b358..a781dcc24ac 100644
--- a/ompi/mpi/fortran/use-mpi-f08/test_cancelled_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/test_cancelled_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Test_cancelled_f08 PMPI_Test_cancelled_f08
+#endif
+
 subroutine MPI_Test_cancelled_f08(status,flag,ierror)
    use :: mpi_f08_types, only : MPI_Status
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/test_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/test_f08.F90
index b78f8e97160..c6e7ea193e2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/test_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/test_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Test_f08 PMPI_Test_f08
+#endif
+
 subroutine MPI_Test_f08(request,flag,status,ierror)
    use :: mpi_f08_types, only : MPI_Request, MPI_Status
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/testall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/testall_f08.F90
index cbdfd6345c7..3d8d979cf05 100644
--- a/ompi/mpi/fortran/use-mpi-f08/testall_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/testall_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Testall_f08 PMPI_Testall_f08
+#endif
+
 subroutine MPI_Testall_f08(count,array_of_requests,flag,array_of_statuses,ierror)
    use :: mpi_f08_types, only : MPI_Request, MPI_Status
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/testany_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/testany_f08.F90
index 7f9aa2935c2..1ce45c387ca 100644
--- a/ompi/mpi/fortran/use-mpi-f08/testany_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/testany_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Testany_f08 PMPI_Testany_f08
+#endif
+
 subroutine MPI_Testany_f08(count,array_of_requests,index,flag,status,ierror)
    use :: mpi_f08_types, only : MPI_Request, MPI_Status
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/testsome_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/testsome_f08.F90
index 0a771daf4b9..0ecabda52af 100644
--- a/ompi/mpi/fortran/use-mpi-f08/testsome_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/testsome_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Testsome_f08 PMPI_Testsome_f08
+#endif
+
 subroutine MPI_Testsome_f08(incount,array_of_requests,outcount, &
                             array_of_indices,array_of_statuses,ierror)
    use :: mpi_f08_types, only : MPI_Request, MPI_Status
diff --git a/ompi/mpi/fortran/use-mpi-f08/topo_test_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/topo_test_f08.F90
index fc4d5f22951..10d36b0a03f 100644
--- a/ompi/mpi/fortran/use-mpi-f08/topo_test_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/topo_test_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Topo_test_f08 PMPI_Topo_test_f08
+#endif
+
 subroutine MPI_Topo_test_f08(comm,status,ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_topo_test_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_commit_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_commit_f08.F90
index a1c6d35a859..601b77c0f25 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_commit_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_commit_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_commit_f08 PMPI_Type_commit_f08
+#endif
+
 subroutine MPI_Type_commit_f08(datatype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_type_commit_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_contiguous_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_contiguous_f08.F90
index efc93cc0fed..2ec66b93af6 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_contiguous_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_contiguous_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_contiguous_f08 PMPI_Type_contiguous_f08
+#endif
+
 subroutine MPI_Type_contiguous_f08(count,oldtype,newtype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_type_contiguous_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_create_darray_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_create_darray_f08.F90
index abb21464b78..944f5878936 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_create_darray_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_create_darray_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_create_darray_f08 PMPI_Type_create_darray_f08
+#endif
+
 subroutine MPI_Type_create_darray_f08(size,rank,ndims,&
                     array_of_gsizes,array_of_distribs,array_of_dargs,array_of_psizes,&
                     order,oldtype,newtype,ierror)
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_create_f90_complex_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_create_f90_complex_f08.F90
index 60be9f0bad8..647f6374fde 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_create_f90_complex_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_create_f90_complex_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_create_f90_complex_f08 PMPI_Type_create_f90_complex_f08
+#endif
+
 subroutine MPI_Type_create_f90_complex_f08(p,r,newtype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_type_create_f90_complex_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_create_f90_integer_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_create_f90_integer_f08.F90
index 7622b9c610b..20cd774c41f 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_create_f90_integer_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_create_f90_integer_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_create_f90_integer_f08 PMPI_Type_create_f90_integer_f08
+#endif
+
 subroutine MPI_Type_create_f90_integer_f08(r,newtype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_type_create_f90_integer_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_create_f90_real_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_create_f90_real_f08.F90
index 2477d518484..dbb408f5b58 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_create_f90_real_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_create_f90_real_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_create_f90_real_f08 PMPI_Type_create_f90_real_f08
+#endif
+
 subroutine MPI_Type_create_f90_real_f08(p,r,newtype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_type_create_f90_real_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_create_hindexed_block_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_create_hindexed_block_f08.F90
index 1e668ed2985..076d1423e2f 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_create_hindexed_block_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_create_hindexed_block_f08.F90
@@ -5,10 +5,14 @@
 !                         reserved.
 ! Copyright (c) 2012      Inria.  All rights reserved.
 ! Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_create_hindexed_block_f08 PMPI_Type_create_hindexed_block_f08
+#endif
+
 subroutine MPI_Type_create_hindexed_block_f08(count,blocklength, &
                            array_of_displacements,oldtype,newtype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_create_hindexed_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_create_hindexed_f08.F90
index 2bf23df1afd..d87ffebbefe 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_create_hindexed_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_create_hindexed_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_create_hindexed_f08 PMPI_Type_create_hindexed_f08
+#endif
+
 subroutine MPI_Type_create_hindexed_f08(count,array_of_blocklengths, &
                                         array_of_displacements,oldtype,newtype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_create_hvector_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_create_hvector_f08.F90
index 92c0d0a3910..5fa16044a48 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_create_hvector_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_create_hvector_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_create_hvector_f08 PMPI_Type_create_hvector_f08
+#endif
+
 subroutine MPI_Type_create_hvector_f08(count,blocklength,stride,oldtype,newtype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_type_create_hvector_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_create_indexed_block_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_create_indexed_block_f08.F90
index 70a6e29d7fd..b92a89da72b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_create_indexed_block_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_create_indexed_block_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_create_indexed_block_f08 PMPI_Type_create_indexed_block_f08
+#endif
+
 subroutine MPI_Type_create_indexed_block_f08(count,blocklength, &
                            array_of_displacements,oldtype,newtype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_create_keyval_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_create_keyval_f08.F90
index ed7090d5c48..54a2bc33824 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_create_keyval_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_create_keyval_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_create_keyval_f08 PMPI_Type_create_keyval_f08
+#endif
+
 subroutine MPI_Type_create_keyval_f08(type_copy_attr_fn,type_delete_attr_fn,&
                                       type_keyval,extra_state,ierror)
    use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_create_resized_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_create_resized_f08.F90
index 820e5b86deb..06dcd4ee385 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_create_resized_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_create_resized_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_create_resized_f08 PMPI_Type_create_resized_f08
+#endif
+
 subroutine MPI_Type_create_resized_f08(oldtype,lb,extent,newtype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_type_create_resized_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_create_struct_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_create_struct_f08.F90
index 80fccb9fdd7..a61e6328435 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_create_struct_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_create_struct_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_create_struct_f08 PMPI_Type_create_struct_f08
+#endif
+
 subroutine MPI_Type_create_struct_f08(count,array_of_blocklengths,array_of_displacements, &
                                       array_of_types,newtype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_create_subarray_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_create_subarray_f08.F90
index 2356c592c93..2e6e4a398b8 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_create_subarray_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_create_subarray_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_create_subarray_f08 PMPI_Type_create_subarray_f08
+#endif
+
 subroutine MPI_Type_create_subarray_f08(ndims,array_of_sizes,array_of_subsizes, &
                                         array_of_starts,order,oldtype,newtype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_delete_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_delete_attr_f08.F90
index 441e0fe1f96..af59de7a761 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_delete_attr_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_delete_attr_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2018 Cisco Systems, Inc.  All rights reserved
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_delete_attr_f08 PMPI_Type_delete_attr_f08
+#endif
+
 subroutine MPI_Type_delete_attr_f08(datatype,type_keyval,ierror)
    use :: mpi_f08_types, only : MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_type_delete_attr_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_dup_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_dup_f08.F90
index b9b1e0a0de0..931cf01dae2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_dup_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_dup_f08.F90
@@ -3,11 +3,15 @@
 ! Copyright (c) 2009-2018 Cisco Systems, Inc.  All rights reserved
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_dup_f08 PMPI_Type_dup_f08
+#endif
+
 subroutine MPI_Type_dup_f08(oldtype,newtype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_type_dup_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_free_f08.F90
index 5e8af8af4f1..b78434d070c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_free_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_free_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_free_f08 PMPI_Type_free_f08
+#endif
+
 subroutine MPI_Type_free_f08(datatype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_type_free_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_free_keyval_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_free_keyval_f08.F90
index 7d9757b66ce..33842ce8faa 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_free_keyval_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_free_keyval_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_free_keyval_f08 PMPI_Type_free_keyval_f08
+#endif
+
 subroutine MPI_Type_free_keyval_f08(type_keyval,ierror)
    use :: ompi_mpifh_bindings, only : ompi_type_free_keyval_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_get_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_get_attr_f08.F90
index 4ddb6a0a8a5..c4b06634c90 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_get_attr_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_get_attr_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2009-2018 Cisco Systems, Inc.  All rights reserved
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_get_attr_f08 PMPI_Type_get_attr_f08
+#endif
+
 subroutine MPI_Type_get_attr_f08(datatype,type_keyval,attribute_val,flag,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_get_contents_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_get_contents_f08.F90
index 16e42a38756..86123417bd0 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_get_contents_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_get_contents_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_get_contents_f08 PMPI_Type_get_contents_f08
+#endif
+
 subroutine MPI_Type_get_contents_f08(datatype,max_integers,max_addresses, &
                     max_datatypes,array_of_integers,array_of_addresses, &
                     array_of_datatypes,ierror)
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_get_envelope_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_get_envelope_f08.F90
index fcd591e4224..57e98a9000a 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_get_envelope_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_get_envelope_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_get_envelope_f08 PMPI_Type_get_envelope_f08
+#endif
+
 subroutine MPI_Type_get_envelope_f08(datatype,num_integers,num_addresses, &
                                      num_datatypes,combiner,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_get_extent_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_get_extent_f08.F90
index 1e7805344ad..c937f623cf2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_get_extent_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_get_extent_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_get_extent_f08 PMPI_Type_get_extent_f08
+#endif
+
 subroutine MPI_Type_get_extent_f08(datatype,lb,extent,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_type_get_extent_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_get_extent_x_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_get_extent_x_f08.F90
index 63d61845530..490e1c2ab52 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_get_extent_x_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_get_extent_x_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_get_extent_x_f08 PMPI_Type_get_extent_x_f08
+#endif
+
 subroutine MPI_Type_get_extent_x_f08(datatype,lb,extent,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND, MPI_COUNT_KIND
    use :: ompi_mpifh_bindings, only : ompi_type_get_extent_x_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_get_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_get_name_f08.F90
index 86a9639ed50..9ec2c643625 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_get_name_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_get_name_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2018 Cisco Systems, Inc.  All rights reserved
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_get_name_f08 PMPI_Type_get_name_f08
+#endif
+
 subroutine MPI_Type_get_name_f08(datatype,type_name,resultlen,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_MAX_OBJECT_NAME
    use :: ompi_mpifh_bindings, only : ompi_type_get_name_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_get_true_extent_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_get_true_extent_f08.F90
index 28d69bfd4fd..f7cf82102d4 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_get_true_extent_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_get_true_extent_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_get_true_extent_f08 PMPI_Type_get_true_extent_f08
+#endif
+
 subroutine MPI_Type_get_true_extent_f08(datatype,true_lb,true_extent,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_type_get_true_extent_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_get_true_extent_x_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_get_true_extent_x_f08.F90
index 7197f2bc4b7..8ba7ba6cc3f 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_get_true_extent_x_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_get_true_extent_x_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_get_true_extent_x_f08 PMPI_Type_get_true_extent_x_f08
+#endif
+
 subroutine MPI_Type_get_true_extent_x_f08(datatype,true_lb,true_extent,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND, MPI_COUNT_KIND
    use :: ompi_mpifh_bindings, only : ompi_type_get_true_extent_x_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_indexed_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_indexed_f08.F90
index fed67730b07..9da7e4baabd 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_indexed_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_indexed_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_indexed_f08 PMPI_Type_indexed_f08
+#endif
+
 subroutine MPI_Type_indexed_f08(count,array_of_blocklengths, &
                                 array_of_displacements,oldtype,newtype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_match_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_match_size_f08.F90
index cd33116c6f3..303cbf54b84 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_match_size_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_match_size_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2018 Cisco Systems, Inc.  All rights reserved
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_match_size_f08 PMPI_Type_match_size_f08
+#endif
+
 subroutine MPI_Type_match_size_f08(typeclass,size,datatype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_type_match_size_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_set_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_set_attr_f08.F90
index 12e1a14b694..87dcda4793f 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_set_attr_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_set_attr_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2018 Cisco Systems, Inc.  All rights reserved
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_set_attr_f08 PMPI_Type_set_attr_f08
+#endif
+
 subroutine MPI_Type_set_attr_f08(datatype,type_keyval,attribute_val,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_type_set_attr_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_set_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_set_name_f08.F90
index c06a08863b9..896929b710e 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_set_name_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_set_name_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2018 Cisco Systems, Inc.  All rights reserved
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_set_name_f08 PMPI_Type_set_name_f08
+#endif
+
 subroutine MPI_Type_set_name_f08(datatype,type_name,ierror)
    use :: mpi_f08_types, only : MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_type_set_name_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_size_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_size_f08.F90
index e9f9a0eb6e3..3c0522ad64d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_size_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_size_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_size_f08 PMPI_Type_size_f08
+#endif
+
 subroutine MPI_Type_size_f08(datatype,size,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_type_size_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_size_x_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_size_x_f08.F90
index d7e38bd553a..5784bdb5093 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_size_x_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_size_x_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2013 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
+! Copyright (c) 2015-2019 Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_size_x_f08 PMPI_Type_size_x_f08
+#endif
+
 subroutine MPI_Type_size_x_f08(datatype,size,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_COUNT_KIND
    use :: ompi_mpifh_bindings, only : ompi_type_size_x_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/type_vector_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_vector_f08.F90
index 9328d80734e..145ed3f71c7 100644
--- a/ompi/mpi/fortran/use-mpi-f08/type_vector_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/type_vector_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Type_vector_f08 PMPI_Type_vector_f08
+#endif
+
 subroutine MPI_Type_vector_f08(count,blocklength,stride,oldtype,newtype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype
    use :: ompi_mpifh_bindings, only : ompi_type_vector_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/unpack_external_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/unpack_external_f08.F90
index 5cbd47c5e2f..7a0bf071a4f 100644
--- a/ompi/mpi/fortran/use-mpi-f08/unpack_external_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/unpack_external_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Unpack_external_f08 PMPI_Unpack_external_f08
+#endif
+
 subroutine MPI_Unpack_external_f08(datarep,inbuf,insize,position,outbuf,outcount,datatype,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_unpack_external_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/unpack_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/unpack_f08.F90
index 929a58ebda5..a38ec23044b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/unpack_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/unpack_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Unpack_f08 PMPI_Unpack_f08
+#endif
+
 subroutine MPI_Unpack_f08(inbuf,insize,position,outbuf,outcount,datatype,comm,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
    use :: ompi_mpifh_bindings, only : ompi_unpack_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/unpublish_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/unpublish_name_f08.F90
index 59de5151fc4..7df43998453 100644
--- a/ompi/mpi/fortran/use-mpi-f08/unpublish_name_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/unpublish_name_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Unpublish_name_f08 PMPI_Unpublish_name_f08
+#endif
+
 subroutine MPI_Unpublish_name_f08(service_name,info,port_name,ierror)
    use :: mpi_f08_types, only : MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_unpublish_name_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/wait_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/wait_f08.F90
index 611080881b3..e5babeed84b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/wait_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/wait_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Wait_f08 PMPI_Wait_f08
+#endif
+
 subroutine MPI_Wait_f08(request,status,ierror)
    use :: mpi_f08_types, only : MPI_Request, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_wait_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/waitall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/waitall_f08.F90
index 80862785279..9d831d46049 100644
--- a/ompi/mpi/fortran/use-mpi-f08/waitall_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/waitall_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Waitall_f08 PMPI_Waitall_f08
+#endif
+
 subroutine MPI_Waitall_f08(count,array_of_requests,array_of_statuses,ierror)
    use :: mpi_f08_types, only : MPI_Request, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_waitall_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/waitany_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/waitany_f08.F90
index 0545fd1c75a..0113bc6ed6d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/waitany_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/waitany_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Waitany_f08 PMPI_Waitany_f08
+#endif
+
 subroutine MPI_Waitany_f08(count,array_of_requests,index,status,ierror)
    use :: mpi_f08_types, only : MPI_Request, MPI_Status
    use :: ompi_mpifh_bindings, only : ompi_waitany_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/waitsome_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/waitsome_f08.F90
index 208c547aa66..9954e40871a 100644
--- a/ompi/mpi/fortran/use-mpi-f08/waitsome_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/waitsome_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Waitsome_f08 PMPI_Waitsome_f08
+#endif
+
 subroutine MPI_Waitsome_f08(incount,array_of_requests,outcount, &
                             array_of_indices,array_of_statuses,ierror)
    use :: mpi_f08_types, only : MPI_Request, MPI_Status
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_allocate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_allocate_f08.F90
index e55216e5e0b..c0e0b50c32b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_allocate_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_allocate_f08.F90
@@ -5,10 +5,14 @@
 !               All Rights reserved.
 ! Copyright (c) 2004-2014 High Performance Computing Center Stuttgart,
 !                         University of Stuttgart.  All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_allocate_f08 PMPI_Win_allocate_f08
+#endif
+
 subroutine MPI_Win_allocate_f08(size, disp_unit, info, comm, &
       baseptr, win, ierror)
    USE, INTRINSIC ::  ISO_C_BINDING, ONLY : C_PTR
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_allocate_shared_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_allocate_shared_f08.F90
index a9d2e7f21c7..5e0c0c63d07 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_allocate_shared_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_allocate_shared_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_allocate_shared_f08 PMPI_Win_allocate_shared_f08
+#endif
+
 subroutine MPI_Win_allocate_shared_f08(size, disp_unit, info, comm, &
       baseptr, win, ierror)
    USE, INTRINSIC ::  ISO_C_BINDING, ONLY : C_PTR
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_attach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_attach_f08.F90
index f932ed50b68..047f25fbf9d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_attach_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_attach_f08.F90
@@ -1,12 +1,16 @@
 ! -*- f90 -*-
 !
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
+! Copyright (c) 2015-2019 Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_attach_f08 PMPI_Win_attach_f08
+#endif
+
 subroutine MPI_Win_attach_f08(win,base,size,ierror)
    use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_win_attach_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_call_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_call_errhandler_f08.F90
index 746d3a4fe9b..e9d5fc6fdbe 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_call_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_call_errhandler_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_call_errhandler_f08 PMPI_Win_call_errhandler_f08
+#endif
+
 subroutine MPI_Win_call_errhandler_f08(win,errorcode,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_call_errhandler_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_complete_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_complete_f08.F90
index 910593058ba..adf39f20976 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_complete_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_complete_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_complete_f08 PMPI_Win_complete_f08
+#endif
+
 subroutine MPI_Win_complete_f08(win,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_complete_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_create_dynamic_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_create_dynamic_f08.F90
index fe534eeebb4..43aec765219 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_create_dynamic_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_create_dynamic_f08.F90
@@ -1,11 +1,15 @@
 ! -*- f90 -*-
 !
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
+! Copyright (c) 2015-2019 Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_create_dynamic_f08 PMPI_Win_create_dynamic_f08
+#endif
+
 subroutine MPI_Win_create_dynamic_f08(info,comm,win,ierror)
    use :: mpi_f08_types, only : MPI_Info, MPI_Comm, MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_create_dynamic_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_create_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_create_errhandler_f08.F90
index ad0c19be698..e37d9bf3c71 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_create_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_create_errhandler_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_create_errhandler_f08 PMPI_Win_create_errhandler_f08
+#endif
+
 subroutine MPI_Win_create_errhandler_f08(win_errhandler_fn,errhandler,ierror)
    use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
    use :: mpi_f08_types, only : MPI_Errhandler
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_create_f08.F90
index 4e24943fb83..393d8e628b4 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_create_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_create_f08.F90
@@ -3,13 +3,17 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_create_f08 PMPI_Win_create_f08
+#endif
+
 subroutine MPI_Win_create_f08(base,size,disp_unit,info,comm,win,ierror)
    use :: mpi_f08_types, only : MPI_Info, MPI_Comm, MPI_Win, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_win_create_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_create_keyval_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_create_keyval_f08.F90
index 4e90aae360b..2f9fb2a463c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_create_keyval_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_create_keyval_f08.F90
@@ -3,12 +3,16 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_create_keyval_f08 PMPI_Win_create_keyval_f08
+#endif
+
 subroutine MPI_Win_create_keyval_f08(win_copy_attr_fn,win_delete_attr_fn,&
                                      win_keyval,extra_state,ierror)
    use, intrinsic :: iso_c_binding, only: c_funptr, c_funloc
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_delete_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_delete_attr_f08.F90
index 1b4cddaed6f..476760f7a39 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_delete_attr_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_delete_attr_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_delete_attr_f08 PMPI_Win_delete_attr_f08
+#endif
+
 subroutine MPI_Win_delete_attr_f08(win,win_keyval,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_delete_attr_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_detach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_detach_f08.F90
index 976333a118e..c777198d057 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_detach_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_detach_f08.F90
@@ -1,12 +1,16 @@
 ! -*- f90 -*-
 !
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
+! Copyright (c) 2015-2019 Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_detach_f08 PMPI_Win_detach_f08
+#endif
+
 subroutine MPI_Win_detach_f08(win,base,ierror)
    use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_win_detach_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_fence_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_fence_f08.F90
index 0afe8ad39a5..b1284eb84b2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_fence_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_fence_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_fence_f08 PMPI_Win_fence_f08
+#endif
+
 subroutine MPI_Win_fence_f08(assert,win,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_fence_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_flush_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_flush_all_f08.F90
index 90b22a1f444..35dc4f88099 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_flush_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_flush_all_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_flush_all_f08 PMPI_Win_flush_all_f08
+#endif
+
 subroutine MPI_Win_flush_all_f08(win,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_flush_all_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_flush_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_flush_f08.F90
index 4642213bf1f..19412a6f9b0 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_flush_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_flush_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_flush_f08 PMPI_Win_flush_f08
+#endif
+
 subroutine MPI_Win_flush_f08(rank,win,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_flush_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_flush_local_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_flush_local_all_f08.F90
index 31e3074f022..2ff6ca1eb0d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_flush_local_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_flush_local_all_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_flush_local_all_f08 PMPI_Win_flush_local_all_f08
+#endif
+
 subroutine MPI_Win_flush_local_all_f08(win,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_flush_local_all_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_flush_local_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_flush_local_f08.F90
index 2cadfa601f7..1c50efd5b1d 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_flush_local_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_flush_local_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2014 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_flush_local_f08 PMPI_Win_flush_local_f08
+#endif
+
 subroutine MPI_Win_flush_local_f08(rank,win,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_flush_local_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_free_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_free_f08.F90
index 812011817b7..52055142db3 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_free_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_free_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_free_f08 PMPI_Win_free_f08
+#endif
+
 subroutine MPI_Win_free_f08(win,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_free_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_free_keyval_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_free_keyval_f08.F90
index f7f8af9fbbb..6a95460a9d2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_free_keyval_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_free_keyval_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_free_keyval_f08 PMPI_Win_free_keyval_f08
+#endif
+
 subroutine MPI_Win_free_keyval_f08(win_keyval,ierror)
    use :: ompi_mpifh_bindings, only : ompi_win_free_keyval_f
    implicit none
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_get_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_get_attr_f08.F90
index 1c87d7bd8d1..de366339bf9 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_get_attr_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_get_attr_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_get_attr_f08 PMPI_Win_get_attr_f08
+#endif
+
 subroutine MPI_Win_get_attr_f08(win,win_keyval,attribute_val,flag,ierror)
    use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_get_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_get_errhandler_f08.F90
index ff33f9dfec4..724d8d1ee3e 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_get_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_get_errhandler_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_get_errhandler_f08 PMPI_Win_get_errhandler_f08
+#endif
+
 subroutine MPI_Win_get_errhandler_f08(win,errhandler,ierror)
    use :: mpi_f08_types, only : MPI_Win, MPI_Errhandler
    use :: ompi_mpifh_bindings, only : ompi_win_get_errhandler_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_get_group_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_get_group_f08.F90
index dec2160d07f..182fbb7e37a 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_get_group_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_get_group_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_get_group_f08 PMPI_Win_get_group_f08
+#endif
+
 subroutine MPI_Win_get_group_f08(win,group,ierror)
    use :: mpi_f08_types, only : MPI_Win, MPI_Group
    use :: ompi_mpifh_bindings, only : ompi_win_get_group_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_get_info_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_get_info_f08.F90
index e090282ad45..f7feda19044 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_get_info_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_get_info_f08.F90
@@ -1,9 +1,13 @@
 ! -*- f90 -*-
 !
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
+! Copyright (c) 2015-2019 Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_get_info_f08 PMPI_Win_get_info_f08
+#endif
+
 subroutine MPI_Win_get_info_f08(win,info,ierror)
    use :: mpi_f08_types, only : MPI_Win, MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_win_get_info_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_get_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_get_name_f08.F90
index 6d177039d54..65d16af1fdb 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_get_name_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_get_name_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_get_name_f08 PMPI_Win_get_name_f08
+#endif
+
 subroutine MPI_Win_get_name_f08(win,win_name,resultlen,ierror)
    use, intrinsic :: ISO_C_BINDING, only : C_CHAR
    use :: mpi_f08_types, only : MPI_Win, MPI_MAX_OBJECT_NAME
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_lock_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_lock_all_f08.F90
index e4ec9eb0144..5a9b7cfe727 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_lock_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_lock_all_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_lock_all_f08 PMPI_Win_lock_all_f08
+#endif
+
 subroutine MPI_Win_lock_all_f08(assert,win,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_lock_all_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_lock_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_lock_f08.F90
index a0c54d183b2..62b8246f76a 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_lock_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_lock_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_lock_f08 PMPI_Win_lock_f08
+#endif
+
 subroutine MPI_Win_lock_f08(lock_type,rank,assert,win,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_lock_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_post_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_post_f08.F90
index 35ff323d3f8..e3b5537e917 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_post_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_post_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_post_f08 PMPI_Win_post_f08
+#endif
+
 subroutine MPI_Win_post_f08(group,assert,win,ierror)
    use :: mpi_f08_types, only : MPI_Group, MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_post_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_set_attr_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_set_attr_f08.F90
index 26c3fb6bcb7..dbe399c6b01 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_set_attr_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_set_attr_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_set_attr_f08 PMPI_Win_set_attr_f08
+#endif
+
 subroutine MPI_Win_set_attr_f08(win,win_keyval,attribute_val,ierror)
    use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND
    use :: ompi_mpifh_bindings, only : ompi_win_set_attr_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_set_errhandler_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_set_errhandler_f08.F90
index c9b32763be4..2afad0f665c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_set_errhandler_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_set_errhandler_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_set_errhandler_f08 PMPI_Win_set_errhandler_f08
+#endif
+
 subroutine MPI_Win_set_errhandler_f08(win,errhandler,ierror)
    use :: mpi_f08_types, only : MPI_Win, MPI_Errhandler
    use :: ompi_mpifh_bindings, only : ompi_win_set_errhandler_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_set_info_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_set_info_f08.F90
index 99342ab1554..dd231da98cf 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_set_info_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_set_info_f08.F90
@@ -1,9 +1,13 @@
 ! -*- f90 -*-
 !
-! Copyright (c) 2015-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
+! Copyright (c) 2015-2019 Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_set_info_f08 PMPI_Win_set_info_f08
+#endif
+
 subroutine MPI_Win_set_info_f08(win,info,ierror)
    use :: mpi_f08_types, only : MPI_Win, MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_win_set_info_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_set_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_set_name_f08.F90
index 2902ecdba9e..80152ffc494 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_set_name_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_set_name_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_set_name_f08 PMPI_Win_set_name_f08
+#endif
+
 subroutine MPI_Win_set_name_f08(win,win_name,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_set_name_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_shared_query_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_shared_query_f08.F90
index c8579f5d0df..10735453530 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_shared_query_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_shared_query_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_shared_query_f08 PMPI_Win_shared_query_f08
+#endif
+
 subroutine MPI_Win_shared_query_f08(win, rank, size, disp_unit, baseptr,&
       ierror)
    USE, INTRINSIC ::  ISO_C_BINDING, ONLY : C_PTR
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_start_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_start_f08.F90
index cef75e40079..1ea3a99a538 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_start_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_start_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_start_f08 PMPI_Win_start_f08
+#endif
+
 subroutine MPI_Win_start_f08(group,assert,win,ierror)
    use :: mpi_f08_types, only : MPI_Group, MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_start_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_sync_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_sync_f08.F90
index fa3f21cbf54..9c04ac8ff6b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_sync_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_sync_f08.F90
@@ -3,11 +3,15 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_sync_f08 PMPI_Win_sync_f08
+#endif
+
 subroutine MPI_Win_sync_f08(win,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_sync_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_test_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_test_f08.F90
index 65c92553248..8238f99f611 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_test_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_test_f08.F90
@@ -3,8 +3,14 @@
 ! Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_test_f08 PMPI_Win_test_f08
+#endif
+
 subroutine MPI_Win_test_f08(win,flag,ierror)
    use :: mpi_f08_types, only : MPI_Win
    ! See note in mpi-f-interfaces-bind.h for why we "use mpi" here and
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_unlock_all_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_unlock_all_f08.F90
index 6cd653b8171..bd805804287 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_unlock_all_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_unlock_all_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_unlock_all_f08 PMPI_Win_unlock_all_f08
+#endif
+
 subroutine MPI_Win_unlock_all_f08(win,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_unlock_all_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_unlock_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_unlock_f08.F90
index a7395a0f601..87b1e40e0a3 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_unlock_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_unlock_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_unlock_f08 PMPI_Win_unlock_f08
+#endif
+
 subroutine MPI_Win_unlock_f08(rank,win,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_unlock_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/win_wait_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_wait_f08.F90
index e9590882073..a614597e1cf 100644
--- a/ompi/mpi/fortran/use-mpi-f08/win_wait_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/win_wait_f08.F90
@@ -3,10 +3,14 @@
 ! Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !               All Rights reserved.
-! Copyright (c) 2018      Research Organization for Information Science
+! Copyright (c) 2018-2019 Research Organization for Information Science
 !                         and Technology (RIST).  All rights reserved.
 ! $COPYRIGHT$
 
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Win_wait_f08 PMPI_Win_wait_f08
+#endif
+
 subroutine MPI_Win_wait_f08(win,ierror)
    use :: mpi_f08_types, only : MPI_Win
    use :: ompi_mpifh_bindings, only : ompi_win_wait_f
diff --git a/ompi/mpiext/pcollreq/mpif-h/allgather_init_f.c b/ompi/mpiext/pcollreq/mpif-h/allgather_init_f.c
index 84e3f4259da..355bd234038 100644
--- a/ompi/mpiext/pcollreq/mpif-h/allgather_init_f.c
+++ b/ompi/mpiext/pcollreq/mpif-h/allgather_init_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015-2018 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 #include "ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h"
 
 #if OMPI_BUILD_MPI_PROFILING
@@ -75,15 +76,20 @@ void ompix_allgather_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendty
     int ierr_c;
     MPI_Comm c_comm;
     MPI_Request c_req;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype;
     MPI_Info c_info;
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
     c_info = PMPI_Info_f2c(*info);
+    if (!OMPI_COMM_IS_INTER(c_comm)) {
+        if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+            sendbuf = MPI_IN_PLACE;
+        } else {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    }
+    c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpiext/pcollreq/mpif-h/allgatherv_init_f.c b/ompi/mpiext/pcollreq/mpif-h/allgatherv_init_f.c
index 9a1576c9e00..53cd3d3808f 100644
--- a/ompi/mpiext/pcollreq/mpif-h/allgatherv_init_f.c
+++ b/ompi/mpiext/pcollreq/mpif-h/allgatherv_init_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015-2018 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 #include "ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h"
 
 #if OMPI_BUILD_MPI_PROFILING
@@ -74,23 +75,32 @@ void ompix_allgatherv_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendt
                              MPI_Fint *info, MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype;
     MPI_Request c_request;
     MPI_Info c_info;
-    int size, ierr_c;
+    int ierr_c;
+    OMPI_COND_STATEMENT(int size);
     OMPI_ARRAY_NAME_DECL(recvcounts);
     OMPI_ARRAY_NAME_DECL(displs);
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
     c_info = PMPI_Info_f2c(*info);
+    c_comm = PMPI_Comm_f2c(*comm);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        OMPI_COND_STATEMENT(size = ompi_comm_remote_size(c_comm));
+    } else {
+        OMPI_COND_STATEMENT(size = ompi_comm_size(c_comm));
+        if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+            sendbuf = MPI_IN_PLACE;
+        } else {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    }
+    c_recvtype = PMPI_Type_f2c(*recvtype);
 
-    PMPI_Comm_size(c_comm, &size);
     OMPI_ARRAY_FINT_2_INT(recvcounts, size);
     OMPI_ARRAY_FINT_2_INT(displs, size);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpiext/pcollreq/mpif-h/alltoall_init_f.c b/ompi/mpiext/pcollreq/mpif-h/alltoall_init_f.c
index 0dd6049d813..74cccbb4908 100644
--- a/ompi/mpiext/pcollreq/mpif-h/alltoall_init_f.c
+++ b/ompi/mpiext/pcollreq/mpif-h/alltoall_init_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015-2018 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 #include "ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h"
 
 #if OMPI_BUILD_MPI_PROFILING
@@ -75,15 +76,20 @@ void ompix_alltoall_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtyp
     int c_ierr;
     MPI_Comm c_comm;
     MPI_Request c_req;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype;
     MPI_Info c_info;
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
     c_info = PMPI_Info_f2c(*info);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
+    if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+        sendbuf = MPI_IN_PLACE;
+    } else {
+        c_sendtype = PMPI_Type_f2c(*sendtype);
+    }
+
+    c_recvtype = PMPI_Type_f2c(*recvtype);
+
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpiext/pcollreq/mpif-h/alltoallv_init_f.c b/ompi/mpiext/pcollreq/mpif-h/alltoallv_init_f.c
index 562b10863ea..d35826f9407 100644
--- a/ompi/mpiext/pcollreq/mpif-h/alltoallv_init_f.c
+++ b/ompi/mpiext/pcollreq/mpif-h/alltoallv_init_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015-2018 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 #include "ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h"
 
 #if OMPI_BUILD_MPI_PROFILING
@@ -74,27 +75,31 @@ void ompix_alltoallv_init_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdisp
                        MPI_Fint *comm, MPI_Fint *info, MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype;
     MPI_Info c_info;
     MPI_Request c_request;
-    int size, c_ierr;
+    int c_ierr;
     OMPI_ARRAY_NAME_DECL(sendcounts);
     OMPI_ARRAY_NAME_DECL(sdispls);
     OMPI_ARRAY_NAME_DECL(recvcounts);
     OMPI_ARRAY_NAME_DECL(rdispls);
 
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
     c_info = PMPI_Info_f2c(*info);
+    OMPI_COND_STATEMENT(int size = OMPI_COMM_IS_INTER(c_comm)?ompi_comm_remote_size(c_comm):ompi_comm_size(c_comm));
+
+    if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+        sendbuf = MPI_IN_PLACE;
+    } else {
+        c_sendtype = PMPI_Type_f2c(*sendtype);
+        OMPI_ARRAY_FINT_2_INT(sendcounts, size);
+        OMPI_ARRAY_FINT_2_INT(sdispls, size);
+    }
 
-    PMPI_Comm_size(c_comm, &size);
-    OMPI_ARRAY_FINT_2_INT(sendcounts, size);
-    OMPI_ARRAY_FINT_2_INT(sdispls, size);
+    c_recvtype = PMPI_Type_f2c(*recvtype);
     OMPI_ARRAY_FINT_2_INT(recvcounts, size);
     OMPI_ARRAY_FINT_2_INT(rdispls, size);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpiext/pcollreq/mpif-h/alltoallw_init_f.c b/ompi/mpiext/pcollreq/mpif-h/alltoallw_init_f.c
index 0fae1e194db..15fbdab4efa 100644
--- a/ompi/mpiext/pcollreq/mpif-h/alltoallw_init_f.c
+++ b/ompi/mpiext/pcollreq/mpif-h/alltoallw_init_f.c
@@ -89,7 +89,9 @@ void ompix_alltoallw_init_f(char *sendbuf, MPI_Fint *sendcounts,
     c_info = PMPI_Info_f2c(*info);
     size = OMPI_COMM_IS_INTER(c_comm)?ompi_comm_remote_size(c_comm):ompi_comm_size(c_comm);
 
-    if (!OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+    if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+        sendbuf = MPI_IN_PLACE;
+    } else {
         c_sendtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype));
         OMPI_ARRAY_FINT_2_INT(sendcounts, size);
         OMPI_ARRAY_FINT_2_INT(sdispls, size);
@@ -105,7 +107,6 @@ void ompix_alltoallw_init_f(char *sendbuf, MPI_Fint *sendcounts,
         c_recvtypes[i] = PMPI_Type_f2c(recvtypes[i]);
     }
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpiext/pcollreq/mpif-h/gather_init_f.c b/ompi/mpiext/pcollreq/mpif-h/gather_init_f.c
index 87abd523926..aabbdf549e4 100644
--- a/ompi/mpiext/pcollreq/mpif-h/gather_init_f.c
+++ b/ompi/mpiext/pcollreq/mpif-h/gather_init_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015-2018 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 #include "ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h"
 
 #if OMPI_BUILD_MPI_PROFILING
@@ -73,18 +74,32 @@ void ompix_gather_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
                     MPI_Fint *root, MPI_Fint *comm, MPI_Fint *info, MPI_Fint *request,
                     MPI_Fint *ierr)
 {
-    int c_ierr;
+    int c_root, c_ierr;
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype = NULL;
     MPI_Info c_info;
     MPI_Request c_request;
 
+    c_root = OMPI_FINT_2_INT(*root);
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
     c_info = PMPI_Info_f2c(*info);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        if (MPI_ROOT == c_root) {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        } else if (MPI_PROC_NULL != c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    } else {
+        if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+            sendbuf = MPI_IN_PLACE;
+        } else {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+        if (ompi_comm_rank(c_comm) == c_root) {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        }
+    }
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpiext/pcollreq/mpif-h/gatherv_init_f.c b/ompi/mpiext/pcollreq/mpif-h/gatherv_init_f.c
index 96376b78ca0..0451e3ddb31 100644
--- a/ompi/mpiext/pcollreq/mpif-h/gatherv_init_f.c
+++ b/ompi/mpiext/pcollreq/mpif-h/gatherv_init_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015-2018 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 #include "ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h"
 
 #if OMPI_BUILD_MPI_PROFILING
@@ -74,23 +75,39 @@ void ompix_gatherv_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype
                           MPI_Fint *info, MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype = NULL;
+    int c_root, c_ierr;
     MPI_Info c_info;
     MPI_Request c_request;
-    int size, c_ierr;
     OMPI_ARRAY_NAME_DECL(recvcounts);
     OMPI_ARRAY_NAME_DECL(displs);
 
+    c_root = OMPI_FINT_2_INT(*root);
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
     c_info = PMPI_Info_f2c(*info);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        if (MPI_ROOT == c_root) {
+            OMPI_COND_STATEMENT(int size = ompi_comm_remote_size(c_comm));
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+            OMPI_ARRAY_FINT_2_INT(recvcounts, size);
+            OMPI_ARRAY_FINT_2_INT(displs, size);
+        } else if (MPI_PROC_NULL != c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    } else {
+        if (OMPI_IS_FORTRAN_IN_PLACE(sendbuf)) {
+            sendbuf = MPI_IN_PLACE;
+        } else {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+        if (ompi_comm_rank(c_comm) == c_root) {
+            OMPI_COND_STATEMENT(int size = ompi_comm_size(c_comm));
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+            OMPI_ARRAY_FINT_2_INT(recvcounts, size);
+            OMPI_ARRAY_FINT_2_INT(displs, size);
+        }
+    }
 
-    PMPI_Comm_size(c_comm, &size);
-    OMPI_ARRAY_FINT_2_INT(recvcounts, size);
-    OMPI_ARRAY_FINT_2_INT(displs, size);
-
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpiext/pcollreq/mpif-h/neighbor_alltoallv_init_f.c b/ompi/mpiext/pcollreq/mpif-h/neighbor_alltoallv_init_f.c
index b11679ac411..000e6c6ffc2 100644
--- a/ompi/mpiext/pcollreq/mpif-h/neighbor_alltoallv_init_f.c
+++ b/ompi/mpiext/pcollreq/mpif-h/neighbor_alltoallv_init_f.c
@@ -13,8 +13,8 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2015-2018 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -26,6 +26,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/mca/topo/base/base.h"
 #include "ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h"
 
 #if OMPI_BUILD_MPI_PROFILING
@@ -80,24 +81,31 @@ void ompix_neighbor_alltoallv_init_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fi
     MPI_Datatype c_sendtype, c_recvtype;
     MPI_Info c_info;
     MPI_Request c_request;
-    int size, c_ierr;
+    int indegree, outdegree, c_ierr;
     OMPI_ARRAY_NAME_DECL(sendcounts);
     OMPI_ARRAY_NAME_DECL(sdispls);
     OMPI_ARRAY_NAME_DECL(recvcounts);
     OMPI_ARRAY_NAME_DECL(rdispls);
 
     c_comm = PMPI_Comm_f2c(*comm);
+    c_info = PMPI_Info_f2c(*info);
+    c_ierr = mca_topo_base_neighbor_count (c_comm, &indegree, &outdegree);
+    if (OMPI_SUCCESS != c_ierr) {
+        if (NULL != ierr) {
+            *ierr = OMPI_INT_2_FINT(c_ierr);
+        }
+        return;
+    }
+
     c_sendtype = PMPI_Type_f2c(*sendtype);
     c_recvtype = PMPI_Type_f2c(*recvtype);
-    c_info = PMPI_Info_f2c(*info);
 
-    PMPI_Comm_size(c_comm, &size);
-    OMPI_ARRAY_FINT_2_INT(sendcounts, size);
-    OMPI_ARRAY_FINT_2_INT(sdispls, size);
-    OMPI_ARRAY_FINT_2_INT(recvcounts, size);
-    OMPI_ARRAY_FINT_2_INT(rdispls, size);
+    OMPI_ARRAY_FINT_2_INT(sendcounts, outdegree);
+    OMPI_ARRAY_FINT_2_INT(sdispls, outdegree);
+    OMPI_ARRAY_FINT_2_INT(recvcounts, indegree);
+    OMPI_ARRAY_FINT_2_INT(rdispls, indegree);
 
-    sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
+    /* Neighbor_alltoallv does not support MPI_IN_PLACE */
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
diff --git a/ompi/mpiext/pcollreq/mpif-h/neighbor_alltoallw_init_f.c b/ompi/mpiext/pcollreq/mpif-h/neighbor_alltoallw_init_f.c
index d7a0fbf6bf8..d7bf1d20884 100644
--- a/ompi/mpiext/pcollreq/mpif-h/neighbor_alltoallw_init_f.c
+++ b/ompi/mpiext/pcollreq/mpif-h/neighbor_alltoallw_init_f.c
@@ -13,8 +13,8 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2015-2018 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -26,6 +26,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/mca/topo/base/base.h"
 #include "ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h"
 
 #if OMPI_BUILD_MPI_PROFILING
@@ -81,24 +82,31 @@ void ompix_neighbor_alltoallw_init_f(char *sendbuf, MPI_Fint *sendcounts,
     MPI_Datatype *c_sendtypes, *c_recvtypes;
     MPI_Info c_info;
     MPI_Request c_request;
-    int size, c_ierr;
+    int indegree, outdegree, c_ierr;
     OMPI_ARRAY_NAME_DECL(sendcounts);
     OMPI_ARRAY_NAME_DECL(recvcounts);
 
     c_comm = PMPI_Comm_f2c(*comm);
     c_info = PMPI_Info_f2c(*info);
-    PMPI_Comm_size(c_comm, &size);
+    c_ierr = mca_topo_base_neighbor_count (c_comm, &indegree, &outdegree);
+    if (OMPI_SUCCESS != c_ierr) {
+        if (NULL != ierr) {
+            *ierr = OMPI_INT_2_FINT(c_ierr);
+        }
+        return;
+    }
 
-    c_sendtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype));
-    c_recvtypes = (MPI_Datatype *) malloc(size * sizeof(MPI_Datatype));
+    c_sendtypes = (MPI_Datatype *) malloc(outdegree * sizeof(MPI_Datatype));
+    c_recvtypes = (MPI_Datatype *) malloc(indegree * sizeof(MPI_Datatype));
 
-    OMPI_ARRAY_FINT_2_INT(sendcounts, size);
-    OMPI_ARRAY_FINT_2_INT(recvcounts, size);
+    OMPI_ARRAY_FINT_2_INT(sendcounts, outdegree);
+    for (int i=0; i<outdegree; i++) {
+        c_sendtypes[i] = PMPI_Type_f2c(sendtypes[i]);
+    }
 
-    while (size > 0) {
-        c_sendtypes[size - 1] = PMPI_Type_f2c(sendtypes[size - 1]);
-        c_recvtypes[size - 1] = PMPI_Type_f2c(recvtypes[size - 1]);
-        --size;
+    OMPI_ARRAY_FINT_2_INT(recvcounts, indegree);
+    for (int i=0; i<indegree; i++) {
+        c_recvtypes[i] = PMPI_Type_f2c(recvtypes[i]);
     }
 
     /* Neighbor_alltoallw_init does not support MPI_IN_PLACE */
diff --git a/ompi/mpiext/pcollreq/mpif-h/scatter_init_f.c b/ompi/mpiext/pcollreq/mpif-h/scatter_init_f.c
index ae48bac6929..d95394272c6 100644
--- a/ompi/mpiext/pcollreq/mpif-h/scatter_init_f.c
+++ b/ompi/mpiext/pcollreq/mpif-h/scatter_init_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015-2018 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 #include "ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h"
 
 #if OMPI_BUILD_MPI_PROFILING
@@ -74,18 +75,32 @@ void ompix_scatter_init_f(char *sendbuf, MPI_Fint *sendcount,
                           MPI_Fint *root, MPI_Fint *comm, MPI_Fint *info, MPI_Fint *request,
                           MPI_Fint *ierr)
 {
-    int c_ierr;
-    MPI_Datatype c_sendtype, c_recvtype;
+    int c_root, c_ierr;
+    MPI_Datatype c_sendtype = NULL, c_recvtype = NULL;
     MPI_Info c_info;
     MPI_Request c_request;
     MPI_Comm c_comm = PMPI_Comm_f2c(*comm);
 
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
+    c_root = OMPI_FINT_2_INT(*root);
     c_info = PMPI_Info_f2c(*info);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        if (MPI_ROOT == c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        } else if (MPI_PROC_NULL != c_root) {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        }
+    } else {
+        if (OMPI_IS_FORTRAN_IN_PLACE(recvbuf)) {
+            recvbuf = MPI_IN_PLACE;
+        } else {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        }
+        if (ompi_comm_rank(c_comm) == c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    }
 
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
-    recvbuf = (char *) OMPI_F2C_IN_PLACE(recvbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
     c_ierr = PMPIX_Scatter_init(sendbuf,OMPI_FINT_2_INT(*sendcount),
diff --git a/ompi/mpiext/pcollreq/mpif-h/scatterv_init_f.c b/ompi/mpiext/pcollreq/mpif-h/scatterv_init_f.c
index 84c535fac98..f5180eaed16 100644
--- a/ompi/mpiext/pcollreq/mpif-h/scatterv_init_f.c
+++ b/ompi/mpiext/pcollreq/mpif-h/scatterv_init_f.c
@@ -10,8 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2015-2018 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,6 +23,7 @@
 
 #include "ompi/mpi/fortran/mpif-h/bindings.h"
 #include "ompi/mpi/fortran/base/constants.h"
+#include "ompi/communicator/communicator.h"
 #include "ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h"
 
 #if OMPI_BUILD_MPI_PROFILING
@@ -75,24 +76,40 @@ void ompix_scatterv_init_f(char *sendbuf, MPI_Fint *sendcounts,
                            MPI_Fint *comm, MPI_Fint *info, MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
-    MPI_Datatype c_sendtype, c_recvtype;
+    MPI_Datatype c_sendtype = NULL, c_recvtype = NULL;
+    int c_root, c_ierr;
     MPI_Info c_info;
     MPI_Request c_request;
-    int size, c_ierr;
     OMPI_ARRAY_NAME_DECL(sendcounts);
     OMPI_ARRAY_NAME_DECL(displs);
 
+    c_root = OMPI_FINT_2_INT(*root);
     c_comm = PMPI_Comm_f2c(*comm);
-    c_sendtype = PMPI_Type_f2c(*sendtype);
-    c_recvtype = PMPI_Type_f2c(*recvtype);
     c_info = PMPI_Info_f2c(*info);
-
-    PMPI_Comm_size(c_comm, &size);
-    OMPI_ARRAY_FINT_2_INT(sendcounts, size);
-    OMPI_ARRAY_FINT_2_INT(displs, size);
+    if (OMPI_COMM_IS_INTER(c_comm)) {
+        if (MPI_ROOT == c_root) {
+            OMPI_COND_STATEMENT(int size = ompi_comm_remote_size(c_comm));
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+            OMPI_ARRAY_FINT_2_INT(sendcounts, size);
+            OMPI_ARRAY_FINT_2_INT(displs, size);
+        } else if (MPI_PROC_NULL != c_root) {
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+        }
+    } else {
+        if (OMPI_IS_FORTRAN_IN_PLACE(recvbuf)) {
+            recvbuf = MPI_IN_PLACE;
+        } else {
+            c_recvtype = PMPI_Type_f2c(*recvtype);
+        }
+        if (ompi_comm_rank(c_comm) == c_root) {
+            OMPI_COND_STATEMENT(int size = ompi_comm_size(c_comm));
+            c_sendtype = PMPI_Type_f2c(*sendtype);
+            OMPI_ARRAY_FINT_2_INT(sendcounts, size);
+            OMPI_ARRAY_FINT_2_INT(displs, size);
+        }
+    }
 
     sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
-    recvbuf = (char *) OMPI_F2C_IN_PLACE(recvbuf);
     recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
 
     c_ierr = PMPIX_Scatterv_init(sendbuf,