diff --git a/src/mpi/f90/scripts/mpi.i.sh b/src/mpi/f90/scripts/mpi.i.sh
index 41e39a7fc1..ea5e3bbd9c 100755
--- a/src/mpi/f90/scripts/mpi.i.sh
+++ b/src/mpi/f90/scripts/mpi.i.sh
@@ -896,7 +896,7 @@ echo
 proc="${procedure}"
 echo "subroutine ${proc}(function, errhandler, ierr)"
 echo "  use mpi_kinds"
-echo "  external, intent(in) :: function"
+echo "  external :: function"
 echo "  integer, intent(out) :: errhandler"
 echo "  integer, intent(out) :: ierr"
 echo "end subroutine ${proc}"
@@ -913,8 +913,8 @@ echo
 proc="${procedure}"
 echo "subroutine ${proc}(comm_copy_attr_fn, comm_delete_attr_fn, comm_keyval, extra_state, ierr)"
 echo "  use mpi_kinds"
-echo "  external, intent(in) :: comm_copy_attr_fn"
-echo "  external, intent(in) :: comm_delete_attr_fn"
+echo "  external :: comm_copy_attr_fn"
+echo "  external :: comm_delete_attr_fn"
 echo "  integer, intent(out) :: comm_keyval"
 echo "  integer, intent(in) :: extra_state"
 echo "  integer, intent(out) :: ierr"
@@ -1243,7 +1243,7 @@ echo
 proc="${procedure}"
 echo "subroutine ${proc}(function, errhandler, ierr)"
 echo "  use mpi_kinds"
-echo "  external, intent(in) :: function"
+echo "  external :: function"
 echo "  integer, intent(out) :: errhandler"
 echo "  integer, intent(out) :: ierr"
 echo "end subroutine ${proc}"
@@ -1417,7 +1417,7 @@ echo
 proc="${procedure}"
 echo "subroutine ${proc}(function, errhandler, ierr)"
 echo "  use mpi_kinds"
-echo "  external, intent(in) :: function"
+echo "  external :: function"
 echo "  integer, intent(out) :: errhandler"
 echo "  integer, intent(out) :: ierr"
 echo "end subroutine ${proc}"
@@ -3372,9 +3372,9 @@ proc="${procedure}"
 echo "subroutine ${proc}(query_fn, free_fn, cancel_fn, extra_state, request&
         , ierr)"
 echo "  use mpi_kinds"
-echo "  external, intent(in) :: query_fn"
-echo "  external, intent(in) :: free_fn"
-echo "  external, intent(in) :: cancel_fn"
+echo "  external :: query_fn"
+echo "  external :: free_fn"
+echo "  external :: cancel_fn"
 echo "  integer, intent(in) :: extra_state"
 echo "  integer, intent(out) :: request"
 echo "  integer, intent(out) :: ierr"
@@ -4095,8 +4095,8 @@ echo
 proc="${procedure}"
 echo "subroutine ${proc}(copy_fn, delete_fn, keyval, extra_state, ierr)"
 echo "  use mpi_kinds"
-echo "  external, intent(in) :: copy_fn"
-echo "  external, intent(in) :: delete_fn"
+echo "  external :: copy_fn"
+echo "  external :: delete_fn"
 echo "  integer, intent(out) :: keyval"
 echo "  integer, intent(in) :: extra_state"
 echo "  integer, intent(out) :: ierr"
@@ -4130,7 +4130,7 @@ echo
 proc="${procedure}"
 echo "subroutine ${proc}(function, commute, op, ierr)"
 echo "  use mpi_kinds"
-echo "  external, intent(in) :: function"
+echo "  external :: function"
 echo "  integer, intent(in) :: commute"
 echo "  integer, intent(out) :: op"
 echo "  integer, intent(out) :: ierr"
@@ -4535,9 +4535,9 @@ echo "subroutine ${proc}(datarep, read_conversion_fn, write_conversion_fn, dtype
         , ierr)"
 echo "  use mpi_kinds"
 echo "  character(len=*), intent(in) :: datarep"
-echo "  external, intent(in) :: read_conversion_fn"
-echo "  external, intent(in) :: write_conversion_fn"
-echo "  external, intent(in) :: dtype_file_extent_fn"
+echo "  external :: read_conversion_fn"
+echo "  external :: write_conversion_fn"
+echo "  external :: dtype_file_extent_fn"
 echo "  integer, intent(in) :: extra_state"
 echo "  integer, intent(out) :: ierr"
 echo "end subroutine ${proc}"
@@ -5425,8 +5425,8 @@ echo
 proc="${procedure}"
 echo "subroutine ${proc}(type_copy_attr_fn, type_delete_attr_fn, type_keyval, extra_state, ierr)"
 echo "  use mpi_kinds"
-echo "  external, intent(in) :: type_copy_attr_fn"
-echo "  external, intent(in) :: type_delete_attr_fn"
+echo "  external :: type_copy_attr_fn"
+echo "  external :: type_delete_attr_fn"
 echo "  integer, intent(out) :: type_keyval"
 echo "  integer, intent(in) :: extra_state"
 echo "  integer, intent(out) :: ierr"
@@ -6126,7 +6126,7 @@ echo
 proc="${procedure}"
 echo "subroutine ${proc}(function, errhandler, ierr)"
 echo "  use mpi_kinds"
-echo "  external, intent(in) :: function"
+echo "  external :: function"
 echo "  integer, intent(out) :: errhandler"
 echo "  integer, intent(out) :: ierr"
 echo "end subroutine ${proc}"
@@ -6143,8 +6143,8 @@ echo
 proc="${procedure}"
 echo "subroutine ${proc}(win_copy_attr_fn, win_delete_attr_fn, win_keyval, extra_state, ierr)"
 echo "  use mpi_kinds"
-echo "  external, intent(in) :: win_copy_attr_fn"
-echo "  external, intent(in) :: win_delete_attr_fn"
+echo "  external :: win_copy_attr_fn"
+echo "  external :: win_delete_attr_fn"
 echo "  integer, intent(out) :: win_keyval"
 echo "  integer, intent(in) :: extra_state"
 echo "  integer, intent(out) :: ierr"