diff --git a/ompi/mpi/fortran/use-mpi-f08/allreduce_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/allreduce_ts.c.in
index a5a519e747b..c0c5a6cb363 100644
--- a/ompi/mpi/fortran/use-mpi-f08/allreduce_ts.c.in
+++ b/ompi/mpi/fortran/use-mpi-f08/allreduce_ts.c.in
@@ -23,7 +23,7 @@ PROTOTYPE VOID allreduce(BUFFER x1, BUFFER_OUT x2, COUNT count,
                          DATATYPE datatype, OP op, COMM comm)
 {
     int c_ierr;
-    int c_count = OMPI_FINT_2_INT(*count);
+    @COUNT_TYPE@ c_count = (@COUNT_TYPE@) *count;
     MPI_Comm c_comm = PMPI_Comm_f2c(*comm);
     MPI_Datatype c_type;
     MPI_Op c_op;
diff --git a/ompi/mpi/fortran/use-mpi-f08/irecv_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/irecv_ts.c.in
index 26b60593bfa..2a4883eae4a 100644
--- a/ompi/mpi/fortran/use-mpi-f08/irecv_ts.c.in
+++ b/ompi/mpi/fortran/use-mpi-f08/irecv_ts.c.in
@@ -28,7 +28,7 @@ PROTOTYPE void irecv(BUFFER_OUT x, COUNT count, DATATYPE datatype,
     MPI_Request c_req;
     MPI_Comm c_comm = PMPI_Comm_f2c (*comm);
     void *buf = OMPI_CFI_BASE_ADDR(x);
-    int c_count = OMPI_FINT_2_INT(*count);
+    @COUNT_TYPE@ c_count = (@COUNT_TYPE@) *count;
 
     OMPI_CFI_2_C(x, c_count, c_type, c_datatype, c_ierr);
     if (MPI_SUCCESS != c_ierr) {
diff --git a/ompi/mpi/fortran/use-mpi-f08/isend_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/isend_ts.c.in
index d5ba569355f..39adaafe28b 100644
--- a/ompi/mpi/fortran/use-mpi-f08/isend_ts.c.in
+++ b/ompi/mpi/fortran/use-mpi-f08/isend_ts.c.in
@@ -28,7 +28,7 @@ PROTOTYPE VOID isend(BUFFER x, COUNT count, DATATYPE datatype, RANK dest,
     MPI_Comm c_comm = PMPI_Comm_f2c (*comm);
 
     void *buf = OMPI_CFI_BASE_ADDR(x);
-    int c_count =  OMPI_FINT_2_INT(*count);
+    @COUNT_TYPE@ c_count =  (@COUNT_TYPE@) *count;
 
     OMPI_CFI_2_C(x, c_count, c_type, c_datatype, c_ierr);
     if (MPI_SUCCESS != c_ierr) {
diff --git a/ompi/mpi/fortran/use-mpi-f08/recv_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/recv_ts.c.in
index 9877398931b..af572d7ad6a 100644
--- a/ompi/mpi/fortran/use-mpi-f08/recv_ts.c.in
+++ b/ompi/mpi/fortran/use-mpi-f08/recv_ts.c.in
@@ -20,15 +20,6 @@
  * $HEADER$
  */
 
-/*
-#include "ompi_config.h"
-
-#include "ompi/communicator/communicator.h"
-#include "ompi/errhandler/errhandler.h"
-#include "ompi/mpi/fortran/use-mpi-f08/ts/bindings.h"
-#include "ompi/mpi/fortran/mpif-h/status-conversion.h"
-#include "ompi/mpi/fortran/base/constants.h"
-*/
 
 PROTOTYPE VOID recv(BUFFER_OUT x, COUNT count, DATATYPE datatype,
                     RANK source, TAG tag, COMM comm, STATUS_OUT status)
@@ -38,7 +29,7 @@ PROTOTYPE VOID recv(BUFFER_OUT x, COUNT count, DATATYPE datatype,
     MPI_Datatype c_datatype, c_type = PMPI_Type_f2c(*datatype);
     int c_ierr;
     void *buf = OMPI_CFI_BASE_ADDR(x);
-    int c_count = OMPI_FINT_2_INT(*count);
+    @COUNT_TYPE@ c_count = (@COUNT_TYPE@) *count;
 
     OMPI_CFI_2_C(x, c_count, c_type, c_datatype, c_ierr);
     if (MPI_SUCCESS != c_ierr) {
diff --git a/ompi/mpi/fortran/use-mpi-f08/send_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/send_ts.c.in
index a5382770b13..62d1792ac40 100644
--- a/ompi/mpi/fortran/use-mpi-f08/send_ts.c.in
+++ b/ompi/mpi/fortran/use-mpi-f08/send_ts.c.in
@@ -19,15 +19,6 @@
  * $HEADER$
  */
 
-#include "ompi_config.h"
-
-#include "ompi/communicator/communicator.h"
-#include "ompi/errhandler/errhandler.h"
-#include "ompi/mpi/fortran/use-mpi-f08/ts/bindings.h"
-#include "ompi/mpi/fortran/base/constants.h"
-
-/* void ompi_send_ts(CFI_cdesc_t* x, MPI_Fint *count, MPI_Fint *datatype,
-                     MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr) */
 PROTOTYPE VOID send(BUFFER x, COUNT count, DATATYPE datatype, RANK dest,
                     TAG tag, COMM comm)
 {
@@ -36,7 +27,7 @@ PROTOTYPE VOID send(BUFFER x, COUNT count, DATATYPE datatype, RANK dest,
     MPI_Comm c_comm = PMPI_Comm_f2c(*comm);
     MPI_Datatype c_datatype, c_type = PMPI_Type_f2c(*datatype);
     void *buf = OMPI_CFI_BASE_ADDR(x);
-    int c_count =  OMPI_FINT_2_INT(*count);
+    @COUNT_TYPE@ c_count = (@COUNT_TYPE@) *count;
 
     OMPI_CFI_2_C(x, c_count, c_type, c_datatype, c_ierr);
     if (MPI_SUCCESS != c_ierr) {