diff --git a/ompi/mpi/fortran/base/mpi-f08-interfaces.F90 b/ompi/mpi/fortran/base/mpi-f08-interfaces.F90
index dbf773ca7c..52250dd95d 100644
--- a/ompi/mpi/fortran/base/mpi-f08-interfaces.F90
+++ b/ompi/mpi/fortran/base/mpi-f08-interfaces.F90
@@ -4416,7 +4416,7 @@ interface  MPI_Neighbor_alltoallw
 subroutine MPI_Neighbor_alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,recvbuf,recvcounts, &
                              rdispls,recvtypes,comm,ierror &
            ) OMPI_F08_INTERFACE_BIND_C("MPI_Neighbor_alltoallw_f08")
-   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Aint
+   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Aint, MPI_ADDRESS_KIND
    implicit none
    !DEC$ ATTRIBUTES NO_ARG_CHECK :: sendbuf, recvbuf
    !$PRAGMA IGNORE_TKR sendbuf, recvbuf
diff --git a/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in b/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in
index 93987e655c..45221b1535 100644
--- a/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in
+++ b/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in
@@ -1705,6 +1705,7 @@ interface MPI_Ineighbor_alltoallw
 
 subroutine MPI_Ineighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, &
         recvcounts, rdispls, recvtypes, comm, request, ierror)
+  include 'mpif-config.h'
   @OMPI_FORTRAN_IGNORE_TKR_PREDECL@ sendbuf
   @OMPI_FORTRAN_IGNORE_TKR_TYPE@, intent(in) :: sendbuf
   integer, dimension(*), intent(in) :: sendcounts
@@ -2253,6 +2254,7 @@ interface MPI_Neighbor_alltoallw
 
 subroutine MPI_Neighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, &
         recvcounts, rdispls, recvtypes, comm, ierror)
+  include 'mpif-config.h'
   @OMPI_FORTRAN_IGNORE_TKR_PREDECL@ sendbuf
   @OMPI_FORTRAN_IGNORE_TKR_TYPE@, intent(in) :: sendbuf
   integer, dimension(*), intent(in) :: sendcounts