diff --git a/ompi/mpi/c/cart_create.c.in b/ompi/mpi/c/cart_create.c.in
index 0cafecc0be1..5f982a48b62 100644
--- a/ompi/mpi/c/cart_create.c.in
+++ b/ompi/mpi/c/cart_create.c.in
@@ -32,8 +32,8 @@
 #include "ompi/mca/topo/base/base.h"
 #include "ompi/memchecker.h"
 
-PROTOTYPE ERROR_CLASS cart_create(COMM old_comm, INT  ndims, COUNT_ARRAY dims,
-                                  COUNT_ARRAY periods, INT reorder, COMM_OUT comm_cart)
+PROTOTYPE ERROR_CLASS cart_create(COMM old_comm, INT  ndims, INT_ARRAY dims,
+                                  INT_ARRAY periods, INT reorder, COMM_OUT comm_cart)
 {
     mca_topo_base_module_t* topo;
     int err;
diff --git a/ompi/mpi/c/cart_map.c.in b/ompi/mpi/c/cart_map.c.in
index 0ef66e14398..8876cd95fbd 100644
--- a/ompi/mpi/c/cart_map.c.in
+++ b/ompi/mpi/c/cart_map.c.in
@@ -32,8 +32,8 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"
 
-PROTOTYPE ERROR_CLASS cart_map(COMM comm, INT ndims, COUNT_ARRAY dims,
-                               COUNT_ARRAY periods, INT_OUT newrank)
+PROTOTYPE ERROR_CLASS cart_map(COMM comm, INT ndims, INT_ARRAY dims,
+                               INT_ARRAY periods, INT_OUT newrank)
 {
     int err = MPI_SUCCESS;
 
diff --git a/ompi/mpi/c/cart_rank.c.in b/ompi/mpi/c/cart_rank.c.in
index 002fbdf056e..bf9f41be0ee 100644
--- a/ompi/mpi/c/cart_rank.c.in
+++ b/ompi/mpi/c/cart_rank.c.in
@@ -32,7 +32,7 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"
 
-PROTOTYPE ERROR_CLASS cart_rank(COMM comm, COUNT_ARRAY coords, INT_OUT rank)
+PROTOTYPE ERROR_CLASS cart_rank(COMM comm, INT_ARRAY coords, INT_OUT rank)
 {
     int i, err;
 
diff --git a/ompi/mpi/c/cart_sub.c.in b/ompi/mpi/c/cart_sub.c.in
index 456dbdb1ad4..07cc6bfc533 100644
--- a/ompi/mpi/c/cart_sub.c.in
+++ b/ompi/mpi/c/cart_sub.c.in
@@ -32,7 +32,7 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"
 
-PROTOTYPE ERROR_CLASS cart_sub(COMM comm, COUNT_ARRAY remain_dims, COMM_OUT new_comm)
+PROTOTYPE ERROR_CLASS cart_sub(COMM comm, INT_ARRAY remain_dims, COMM_OUT new_comm)
 {
     int err;