diff --git a/ompi/mpi/fortran/use-mpi-f08/Makefile.am b/ompi/mpi/fortran/use-mpi-f08/Makefile.am
index 979864f8d89..26a6b5d5026 100644
--- a/ompi/mpi/fortran/use-mpi-f08/Makefile.am
+++ b/ompi/mpi/fortran/use-mpi-f08/Makefile.am
@@ -50,7 +50,7 @@ MOSTLYCLEANFILES = *.mod
 CLEANFILES += *.i90
 
 lib_LTLIBRARIES = lib@OMPI_LIBMPI_NAME@_usempif08.la
-noinst_LTLIBRARIES = lib@OMPI_LIBMPI_NAME@_usempif08_pmpi.la
+noinst_LTLIBRARIES = lib@OMPI_LIBMPI_NAME@_usempif08_profile.la
 
 module_sentinel_files = \
         mod/libforce_usempif08_internal_modules_to_be_built.la \
@@ -543,13 +543,19 @@ lib@OMPI_LIBMPI_NAME@_usempif08_la_FCFLAGS = \
 #
 
 lib@OMPI_LIBMPI_NAME@_usempif08_la_LIBADD = \
-        lib@OMPI_LIBMPI_NAME@_usempif08_pmpi.la \
+        lib@OMPI_LIBMPI_NAME@_usempif08_profile.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 \
         mod/libusempif08_internal_modules.la \
         base/libusempif08_ccode.la
-lib@OMPI_LIBMPI_NAME@_usempif08_la_DEPENDENCIES = $(module_sentinel_files)
+#
+# I'm not sure why, but the profile library is not getting built before this
+# library even when listed in LIBADD, so adding it here as a dependency.
+#
+lib@OMPI_LIBMPI_NAME@_usempif08_la_DEPENDENCIES = \
+        $(module_sentinel_files) \
+        lib@OMPI_LIBMPI_NAME@_usempif08_profile.la
 lib@OMPI_LIBMPI_NAME@_usempif08_la_LDFLAGS = -version-info $(libmpi_usempif08_so_version)
 
 #
@@ -568,421 +574,14 @@ mpi-f08.F90: $(SIZEOF_H)
 # Profiling interface
 #
 
-pmpi_api_files = \
-        profile_abort_f08.F90 \
-        profile_accumulate_f08.F90 \
-        profile_add_error_class_f08.F90 \
-        profile_add_error_code_f08.F90 \
-        profile_add_error_string_f08.F90 \
-        profile_paint_add_f08.F90 \
-        profile_paint_diff_f08.F90 \
-        profile_allgather_f08.F90 \
-        profile_allgather_init_f08.F90 \
-        profile_allgatherv_f08.F90 \
-        profile_allgatherv_init_f08.F90 \
-        profile_alloc_mem_f08.F90 \
-        profile_allreduce_f08.F90 \
-        profile_alltoall_f08.F90 \
-        profile_alltoall_init_f08.F90 \
-        profile_alltoallv_f08.F90 \
-        profile_alltoallv_init_f08.F90 \
-        profile_alltoallw_f08.F90 \
-        profile_alltoallw_init_f08.F90 \
-        profile_barrier_f08.F90 \
-        profile_barrier_init_f08.F90 \
-        profile_bcast_f08.F90 \
-        profile_bcast_init_f08.F90 \
-        profile_bsend_f08.F90 \
-        profile_bsend_init_f08.F90 \
-        profile_buffer_attach_f08.F90 \
-        profile_buffer_detach_f08.F90 \
-        profile_cancel_f08.F90 \
-        profile_cart_coords_f08.F90 \
-        profile_cart_create_f08.F90 \
-        profile_cartdim_get_f08.F90 \
-        profile_cart_get_f08.F90 \
-        profile_cart_map_f08.F90 \
-        profile_cart_rank_f08.F90 \
-        profile_cart_shift_f08.F90 \
-        profile_cart_sub_f08.F90 \
-        profile_close_port_f08.F90 \
-        profile_comm_accept_f08.F90 \
-        profile_comm_call_errhandler_f08.F90 \
-        profile_comm_compare_f08.F90 \
-        profile_comm_connect_f08.F90 \
-        profile_comm_create_errhandler_f08.F90 \
-        profile_comm_create_f08.F90 \
-        profile_comm_create_group_f08.F90 \
-        profile_comm_create_keyval_f08.F90 \
-        profile_comm_delete_attr_f08.F90 \
-        profile_comm_disconnect_f08.F90 \
-        profile_comm_dup_f08.F90 \
-        profile_comm_dup_with_info_f08.F90 \
-        profile_comm_idup_f08.F90 \
-        profile_comm_idup_with_info_f08.F90 \
-        profile_comm_free_f08.F90 \
-        profile_comm_free_keyval_f08.F90 \
-        profile_comm_get_attr_f08.F90 \
-        profile_comm_get_errhandler_f08.F90 \
-        profile_comm_get_info_f08.F90 \
-        profile_comm_get_name_f08.F90 \
-        profile_comm_get_parent_f08.F90 \
-        profile_comm_group_f08.F90 \
-        profile_comm_join_f08.F90 \
-        profile_comm_rank_f08.F90 \
-        profile_comm_remote_group_f08.F90 \
-        profile_comm_remote_size_f08.F90 \
-        profile_comm_set_attr_f08.F90 \
-        profile_comm_set_errhandler_f08.F90 \
-        profile_comm_set_info_f08.F90 \
-        profile_comm_set_name_f08.F90 \
-        profile_comm_size_f08.F90 \
-        profile_comm_spawn_f08.F90 \
-        profile_comm_spawn_multiple_f08.F90 \
-        profile_comm_split_f08.F90 \
-        profile_comm_split_type_f08.F90 \
-        profile_comm_test_inter_f08.F90 \
-        profile_compare_and_swap_f08.F90 \
-        profile_dims_create_f08.F90 \
-        profile_dist_graph_create_adjacent_f08.F90 \
-        profile_dist_graph_create_f08.F90 \
-        profile_dist_graph_neighbors_count_f08.F90 \
-        profile_dist_graph_neighbors_f08.F90 \
-        profile_errhandler_free_f08.F90 \
-        profile_error_class_f08.F90 \
-        profile_error_string_f08.F90 \
-        profile_exscan_f08.F90 \
-        profile_exscan_init_f08.F90 \
-        profile_f_sync_reg_f08.F90 \
-        profile_fetch_and_op_f08.F90 \
-        profile_file_call_errhandler_f08.F90 \
-        profile_file_close_f08.F90 \
-        profile_file_create_errhandler_f08.F90 \
-        profile_file_delete_f08.F90 \
-        profile_file_get_amode_f08.F90 \
-        profile_file_get_atomicity_f08.F90 \
-        profile_file_get_byte_offset_f08.F90 \
-        profile_file_get_errhandler_f08.F90 \
-        profile_file_get_group_f08.F90 \
-        profile_file_get_info_f08.F90 \
-        profile_file_get_position_f08.F90 \
-        profile_file_get_position_shared_f08.F90 \
-        profile_file_get_size_f08.F90 \
-        profile_file_get_type_extent_f08.F90 \
-        profile_file_get_view_f08.F90 \
-        profile_file_iread_at_f08.F90 \
-        profile_file_iread_f08.F90 \
-        profile_file_iread_at_all_f08.F90 \
-        profile_file_iread_all_f08.F90 \
-        profile_file_iread_shared_f08.F90 \
-        profile_file_iwrite_at_f08.F90 \
-        profile_file_iwrite_f08.F90 \
-        profile_file_iwrite_at_all_f08.F90 \
-        profile_file_iwrite_all_f08.F90 \
-        profile_file_iwrite_shared_f08.F90 \
-        profile_file_open_f08.F90 \
-        profile_file_preallocate_f08.F90 \
-        profile_file_read_all_begin_f08.F90 \
-        profile_file_read_all_end_f08.F90 \
-        profile_file_read_all_f08.F90 \
-        profile_file_read_at_all_begin_f08.F90 \
-        profile_file_read_at_all_end_f08.F90 \
-        profile_file_read_at_all_f08.F90 \
-        profile_file_read_at_f08.F90 \
-        profile_file_read_f08.F90 \
-        profile_file_read_ordered_begin_f08.F90 \
-        profile_file_read_ordered_end_f08.F90 \
-        profile_file_read_ordered_f08.F90 \
-        profile_file_read_shared_f08.F90 \
-        profile_file_seek_f08.F90 \
-        profile_file_seek_shared_f08.F90 \
-        profile_file_set_atomicity_f08.F90 \
-        profile_file_set_errhandler_f08.F90 \
-        profile_file_set_info_f08.F90 \
-        profile_file_set_size_f08.F90 \
-        profile_file_set_view_f08.F90 \
-        profile_file_sync_f08.F90 \
-        profile_file_write_all_begin_f08.F90 \
-        profile_file_write_all_end_f08.F90 \
-        profile_file_write_all_f08.F90 \
-        profile_file_write_at_all_begin_f08.F90 \
-        profile_file_write_at_all_end_f08.F90 \
-        profile_file_write_at_all_f08.F90 \
-        profile_file_write_at_f08.F90 \
-        profile_file_write_f08.F90 \
-        profile_file_write_ordered_begin_f08.F90 \
-        profile_file_write_ordered_end_f08.F90 \
-        profile_file_write_ordered_f08.F90 \
-        profile_file_write_shared_f08.F90 \
-        profile_finalized_f08.F90 \
-        profile_finalize_f08.F90 \
-        profile_free_mem_f08.F90 \
-        profile_gather_f08.F90 \
-        profile_gather_init_f08.F90 \
-        profile_gatherv_f08.F90 \
-        profile_gatherv_init_f08.F90 \
-        profile_get_accumulate_f08.F90 \
-        profile_get_address_f08.F90 \
-        profile_get_count_f08.F90 \
-        profile_get_elements_f08.F90 \
-        profile_get_elements_x_f08.F90 \
-        profile_get_f08.F90 \
-        profile_get_library_version_f08.F90 \
-        profile_get_processor_name_f08.F90 \
-        profile_get_version_f08.F90 \
-        profile_graph_create_f08.F90 \
-        profile_graphdims_get_f08.F90 \
-        profile_graph_get_f08.F90 \
-        profile_graph_map_f08.F90 \
-        profile_graph_neighbors_count_f08.F90 \
-        profile_graph_neighbors_f08.F90 \
-        profile_grequest_complete_f08.F90 \
-        profile_grequest_start_f08.F90 \
-        profile_group_compare_f08.F90 \
-        profile_group_difference_f08.F90 \
-        profile_group_excl_f08.F90 \
-        profile_group_free_f08.F90 \
-        profile_group_incl_f08.F90 \
-        profile_group_intersection_f08.F90 \
-        profile_group_range_excl_f08.F90 \
-        profile_group_range_incl_f08.F90 \
-        profile_group_rank_f08.F90 \
-        profile_group_size_f08.F90 \
-        profile_group_translate_ranks_f08.F90 \
-        profile_group_union_f08.F90 \
-        profile_iallgather_f08.F90 \
-        profile_iallgatherv_f08.F90 \
-        profile_iallreduce_f08.F90 \
-        profile_ialltoall_f08.F90 \
-        profile_ialltoallv_f08.F90 \
-        profile_ialltoallw_f08.F90 \
-        profile_ibarrier_f08.F90 \
-        profile_ibcast_f08.F90 \
-        profile_ibsend_f08.F90 \
-        profile_igather_f08.F90 \
-        profile_igatherv_f08.F90 \
-        profile_iexscan_f08.F90 \
-        profile_improbe_f08.F90 \
-        profile_imrecv_f08.F90 \
-        profile_ineighbor_allgather_f08.F90 \
-        profile_ineighbor_allgatherv_f08.F90 \
-        profile_ineighbor_alltoall_f08.F90 \
-        profile_ineighbor_alltoallv_f08.F90 \
-        profile_ineighbor_alltoallw_f08.F90 \
-        profile_info_create_f08.F90 \
-        profile_info_create_env_f08.F90 \
-        profile_info_delete_f08.F90 \
-        profile_info_dup_f08.F90 \
-        profile_info_free_f08.F90 \
-        profile_info_get_f08.F90 \
-        profile_info_get_nkeys_f08.F90 \
-        profile_info_get_nthkey_f08.F90 \
-        profile_info_get_string_f08.F90 \
-        profile_info_get_valuelen_f08.F90 \
-        profile_info_set_f08.F90 \
-        profile_init_f08.F90 \
-        profile_initialized_f08.F90 \
-        profile_init_thread_f08.F90 \
-        profile_intercomm_create_f08.F90 \
-        profile_intercomm_merge_f08.F90 \
-        profile_iprobe_f08.F90 \
-        profile_irecv_f08.F90 \
-        profile_ireduce_f08.F90 \
-        profile_ireduce_scatter_f08.F90 \
-        profile_ireduce_scatter_block_f08.F90 \
-        profile_irsend_f08.F90 \
-        profile_iscan_f08.F90 \
-        profile_iscatter_f08.F90 \
-        profile_iscatterv_f08.F90 \
-        profile_isend_f08.F90 \
-        profile_isendrecv_f08.F90 \
-        profile_isendrecv_replace_f08.F90 \
-        profile_issend_f08.F90 \
-        profile_is_thread_main_f08.F90 \
-        profile_lookup_name_f08.F90 \
-        profile_mprobe_f08.F90 \
-        profile_mrecv_f08.F90 \
-        profile_neighbor_allgather_f08.F90 \
-        profile_neighbor_allgather_init_f08.F90 \
-        profile_neighbor_allgatherv_f08.F90 \
-        profile_neighbor_allgatherv_init_f08.F90 \
-        profile_neighbor_alltoall_f08.F90 \
-        profile_neighbor_alltoall_init_f08.F90 \
-        profile_neighbor_alltoallv_f08.F90 \
-        profile_neighbor_alltoallv_init_f08.F90 \
-        profile_neighbor_alltoallw_f08.F90 \
-        profile_neighbor_alltoallw_init_f08.F90 \
-        profile_op_commutative_f08.F90 \
-        profile_op_create_f08.F90 \
-        profile_open_port_f08.F90 \
-        profile_op_free_f08.F90 \
-        profile_pack_external_f08.F90 \
-        profile_pack_external_size_f08.F90 \
-        profile_pack_f08.F90 \
-        profile_pack_size_f08.F90 \
-        profile_pcontrol_f08.F90 \
-        profile_probe_f08.F90 \
-        profile_publish_name_f08.F90 \
-        profile_put_f08.F90 \
-        profile_query_thread_f08.F90 \
-        profile_raccumulate_f08.F90 \
-        profile_recv_f08.F90 \
-        profile_recv_init_f08.F90 \
-        profile_reduce_f08.F90 \
-        profile_reduce_init_f08.F90 \
-        profile_reduce_local_f08.F90 \
-        profile_reduce_scatter_f08.F90 \
-        profile_reduce_scatter_init_f08.F90 \
-        profile_reduce_scatter_block_f08.F90 \
-        profile_reduce_scatter_block_init_f08.F90 \
-        profile_register_datarep_f08.F90 \
-        profile_request_free_f08.F90 \
-        profile_request_get_status_f08.F90 \
-        profile_rget_f08.F90 \
-        profile_rget_accumulate_f08.F90 \
-        profile_rput_f08.F90 \
-        profile_rsend_f08.F90 \
-        profile_rsend_init_f08.F90 \
-        profile_scan_f08.F90 \
-        profile_scan_init_f08.F90 \
-        profile_scatter_f08.F90 \
-        profile_scatter_init_f08.F90 \
-        profile_scatterv_f08.F90 \
-        profile_scatterv_init_f08.F90 \
-        profile_send_f08_generated.F90 \
-        profile_send_init_f08.F90 \
-        profile_sendrecv_f08.F90 \
-        profile_sendrecv_replace_f08.F90 \
-        profile_session_create_errhandler_f08.F90\
-        profile_session_get_errhandler_f08.F90\
-        profile_session_get_info_f08.F90 \
-        profile_session_get_nth_pset_f08.F90 \
-        profile_session_get_num_psets_f08.F90 \
-        profile_session_get_pset_info_f08.F90 \
-        profile_session_init_f08.F90 \
-        profile_session_finalize_f08.F90 \
-        profile_session_set_errhandler_f08.F90\
-        profile_ssend_f08.F90 \
-        profile_ssend_init_f08.F90 \
-        profile_startall_f08.F90 \
-        profile_start_f08.F90 \
-        profile_status_f082f_f08.F90 \
-        profile_status_f2f08_f08.F90 \
-        profile_status_set_cancelled_f08.F90 \
-        profile_status_set_elements_f08.F90 \
-        profile_status_set_elements_x_f08.F90 \
-        profile_testall_f08.F90 \
-        profile_testany_f08.F90 \
-        profile_test_cancelled_f08.F90 \
-        profile_test_f08.F90 \
-        profile_testsome_f08.F90 \
-        profile_topo_test_f08.F90 \
-        profile_type_commit_f08.F90 \
-        profile_type_contiguous_f08.F90 \
-        profile_type_create_darray_f08.F90 \
-        profile_type_create_f90_complex_f08.F90 \
-        profile_type_create_f90_integer_f08.F90 \
-        profile_type_create_f90_real_f08.F90 \
-        profile_type_create_hindexed_f08.F90 \
-        profile_type_create_hvector_f08.F90 \
-        profile_type_create_indexed_block_f08.F90 \
-        profile_type_create_hindexed_block_f08.F90 \
-        profile_type_create_keyval_f08.F90 \
-        profile_type_create_resized_f08.F90 \
-        profile_type_create_struct_f08.F90 \
-        profile_type_create_subarray_f08.F90 \
-        profile_type_delete_attr_f08.F90 \
-        profile_type_dup_f08.F90 \
-        profile_type_free_f08.F90 \
-        profile_type_free_keyval_f08.F90 \
-        profile_type_get_attr_f08.F90 \
-        profile_type_get_contents_f08.F90 \
-        profile_type_get_envelope_f08.F90 \
-        profile_type_get_extent_f08.F90 \
-        profile_type_get_extent_x_f08.F90 \
-        profile_type_get_name_f08.F90 \
-        profile_type_get_true_extent_f08.F90 \
-        profile_type_get_true_extent_x_f08.F90 \
-        profile_type_indexed_f08.F90 \
-        profile_type_match_size_f08.F90 \
-        profile_type_set_attr_f08.F90 \
-        profile_type_set_name_f08.F90 \
-        profile_type_size_f08.F90 \
-        profile_type_size_x_f08.F90 \
-        profile_type_vector_f08.F90 \
-        profile_unpack_external_f08.F90 \
-        profile_unpack_f08.F90 \
-        profile_unpublish_name_f08.F90 \
-        profile_waitall_f08.F90 \
-        profile_waitany_f08.F90 \
-        profile_wait_f08.F90 \
-        profile_waitsome_f08.F90 \
-        profile_win_allocate_f08.F90 \
-        profile_win_allocate_shared_f08.F90 \
-        profile_win_attach_f08.F90 \
-        profile_win_call_errhandler_f08.F90 \
-        profile_win_complete_f08.F90 \
-        profile_win_create_dynamic_f08.F90 \
-        profile_win_create_errhandler_f08.F90 \
-        profile_win_create_f08.F90 \
-        profile_win_create_keyval_f08.F90 \
-        profile_win_delete_attr_f08.F90 \
-        profile_win_detach_f08.F90 \
-        profile_win_fence_f08.F90 \
-        profile_win_flush_f08.F90 \
-        profile_win_flush_all_f08.F90 \
-        profile_win_flush_local_f08.F90 \
-        profile_win_flush_local_all_f08.F90 \
-        profile_win_free_f08.F90 \
-        profile_win_free_keyval_f08.F90 \
-        profile_win_get_attr_f08.F90 \
-        profile_win_get_errhandler_f08.F90 \
-        profile_win_get_group_f08.F90 \
-        profile_win_get_info_f08.F90 \
-        profile_win_get_name_f08.F90 \
-        profile_win_lock_f08.F90 \
-        profile_win_lock_all_f08.F90 \
-        profile_win_post_f08.F90 \
-        profile_win_set_attr_f08.F90 \
-        profile_win_set_errhandler_f08.F90 \
-        profile_win_set_info_f08.F90 \
-        profile_win_set_name_f08.F90 \
-        profile_win_shared_query_f08.F90 \
-        profile_win_start_f08.F90 \
-        profile_win_sync_f08.F90 \
-        profile_win_test_f08.F90 \
-        profile_win_unlock_f08.F90 \
-        profile_win_unlock_all_f08.F90 \
-        profile_win_wait_f08.F90
-
-pmpi_api_lo_files = $(pmpi_api_files:.F90=.lo)
-
-$(pmpi_api_lo_files): bindings/libforce_usempif08_internal_bindings_to_be_built.la
-
-lib@OMPI_LIBMPI_NAME@_usempif08_pmpi_la_SOURCES = \
-        $(pmpi_api_files)
-
-lib@OMPI_LIBMPI_NAME@_usempif08_pmpi_la_FCFLAGS = \
+lib@OMPI_LIBMPI_NAME@_usempif08_profile_la_SOURCES = \
+        $(mpi_api_files)
+
+lib@OMPI_LIBMPI_NAME@_usempif08_profile_la_FCFLAGS = \
         $(AM_FCFLAGS) \
         -DOMPI_BUILD_MPI_PROFILING=1
-#
-# Sym link in the real sources
-#
-$(lib@OMPI_LIBMPI_NAME@_usempif08_pmpi_la_SOURCES):
-	$(OMPI_V_LN_S) if test ! -r $@ ; then \
-		pname=`echo $@ | cut -b '9-'` ; \
-		$(LN_S) $(top_srcdir)/ompi/mpi/fortran/use-mpi-f08/$$pname $@ ; \
-	fi
-
-# These files were created by targets above
-
-MAINTAINERCLEANFILES = $(lib@OMPI_LIBMPI_NAME@_usempif08_pmpi_la_SOURCES)
-
-#
-# Automake doesn't do Fortran dependency analysis, so must list them
-# manually here.  Bummer!
-#
 
+MAINTAINERCLEANFILES =
 
 #
 # Generate the Fortran bindings and C wrapper functions for bindings with a
diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_create_from_group_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_create_from_group_f08.F90
index 8f1befe0d8c..d81830a2d34 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_create_from_group_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_create_from_group_f08.F90
@@ -9,6 +9,8 @@
 !                         reserved.
 ! $COPYRIGHT$
 
+#include "mpi-f08-rename.h"
+
 subroutine MPI_Comm_create_from_group_f08(group, stringtag, info, errhandler, newcomm, ierror)
    use :: mpi_f08_types, only : MPI_Comm, MPI_Group, MPI_Errhandler, MPI_Info
    use :: ompi_mpifh_bindings, only : ompi_comm_create_from_group_f
diff --git a/ompi/mpi/fortran/use-mpi-f08/intercomm_create_from_groups_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/intercomm_create_from_groups_f08.F90
index 9b92a9db9ab..5cfb6acbaf0 100644
--- a/ompi/mpi/fortran/use-mpi-f08/intercomm_create_from_groups_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/intercomm_create_from_groups_f08.F90
@@ -9,6 +9,8 @@
 !                         reserved.
 ! $COPYRIGHT$
 
+#include "mpi-f08-rename.h"
+
 subroutine MPI_Intercomm_create_from_groups_f08(local_group, local_leader, remote_group, &
                                                 remote_leader, stringtag, info, errhandler, &
                                                 newintercomm, ierror)
diff --git a/ompi/mpi/fortran/use-mpi-f08/parrived_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/parrived_f08.F90
index 7116fb1511b..f79523993b2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/parrived_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/parrived_f08.F90
@@ -8,6 +8,7 @@
 ! Copyright (c) 2020      Sandia National Laboratories. All rights reserved.
 ! $COPYRIGHT$
 
+#include "mpi-f08-rename.h"
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
 subroutine MPI_Parrived_f08(request,partition,flag,ierror)
diff --git a/ompi/mpi/fortran/use-mpi-f08/pready_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/pready_f08.F90
index 45ff490c4b1..a21f4f4b5e9 100644
--- a/ompi/mpi/fortran/use-mpi-f08/pready_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/pready_f08.F90
@@ -8,6 +8,7 @@
 ! Copyright (c) 2020      Sandia National Laboratories. All rights reserved.
 ! $COPYRIGHT$
 
+#include "mpi-f08-rename.h"
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
 subroutine MPI_Pready_f08(partition,request,ierror)
diff --git a/ompi/mpi/fortran/use-mpi-f08/pready_list_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/pready_list_f08.F90
index 179e4fdf840..f021e107cf2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/pready_list_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/pready_list_f08.F90
@@ -8,6 +8,7 @@
 ! Copyright (c) 2020      Sandia National Laboratories. All rights reserved.
 ! $COPYRIGHT$
 
+#include "mpi-f08-rename.h"
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
 subroutine MPI_Pready_list_f08(length,partitions,request,ierror)
diff --git a/ompi/mpi/fortran/use-mpi-f08/pready_range_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/pready_range_f08.F90
index d85d617295a..5f6290c4eac 100644
--- a/ompi/mpi/fortran/use-mpi-f08/pready_range_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/pready_range_f08.F90
@@ -8,6 +8,7 @@
 ! Copyright (c) 2020      Sandia National Laboratories. All rights reserved.
 ! $COPYRIGHT$
 
+#include "mpi-f08-rename.h"
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
 subroutine MPI_Pready_range_f08(partition_low,partition_high,request,ierror)
diff --git a/ompi/mpi/fortran/use-mpi-f08/psend_init_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/psend_init_f08.F90
index 3c68b2c1cae..b61809ddec0 100644
--- a/ompi/mpi/fortran/use-mpi-f08/psend_init_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/psend_init_f08.F90
@@ -9,6 +9,7 @@
 ! Copyright (c) 2021      Bull S.A.S. All rights reserved.
 ! $COPYRIGHT$
 
+#include "mpi-f08-rename.h"
 #include "ompi/mpi/fortran/configure-fortran-output.h"
 
 subroutine MPI_Psend_init_f08(buf,partitions,count,datatype,dest,tag,comm,info,request,ierror)