diff --git a/ompi/mpi/c/alltoall.c b/ompi/mpi/c/alltoall.c
index 34c493bba0..7426c01f46 100644
--- a/ompi/mpi/c/alltoall.c
+++ b/ompi/mpi/c/alltoall.c
@@ -98,7 +98,7 @@ int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
     ompi_datatype_type_size(recvtype, &recvtype_size);
     if (((MPI_IN_PLACE == sendbuf) ||
          (0 == sendcount) || (0 == sendtype_size)) &&
-        (0 == recvcount) || (0 == recvtype_size)) {
+        ((0 == recvcount) || (0 == recvtype_size))) {
         return MPI_SUCCESS;
     }
 
diff --git a/ompi/mpi/c/ialltoallv.c b/ompi/mpi/c/ialltoallv.c
index b1223c0cfc..579722567a 100644
--- a/ompi/mpi/c/ialltoallv.c
+++ b/ompi/mpi/c/ialltoallv.c
@@ -50,7 +50,6 @@ int MPI_Ialltoallv(const void *sendbuf, const int sendcounts[], const int sdispl
 {
     int i, size, err;
     size_t sendtype_size, recvtype_size;
-    bool zerosend=true, zerorecv=true;
 
     MEMCHECKER(
         ptrdiff_t recv_ext;
diff --git a/ompi/mpi/c/ialltoallw.c b/ompi/mpi/c/ialltoallw.c
index 7cf35cd894..980ee980e8 100644
--- a/ompi/mpi/c/ialltoallw.c
+++ b/ompi/mpi/c/ialltoallw.c
@@ -50,7 +50,6 @@ int MPI_Ialltoallw(const void *sendbuf, const int sendcounts[], const int sdispl
 {
     int i, size, err;
     size_t sendtype_size, recvtype_size;
-    bool zerosend=true, zerorecv=true;
 
     MEMCHECKER(
         ptrdiff_t recv_ext;
diff --git a/ompi/mpi/c/ineighbor_alltoallv.c b/ompi/mpi/c/ineighbor_alltoallv.c
index ee986deb92..1d40531638 100644
--- a/ompi/mpi/c/ineighbor_alltoallv.c
+++ b/ompi/mpi/c/ineighbor_alltoallv.c
@@ -50,7 +50,6 @@ int MPI_Ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], const i
 {
     int i, size, err;
     size_t sendtype_size, recvtype_size;
-    bool zerosend=true, zerorecv=true;
 
     MEMCHECKER(
         ptrdiff_t recv_ext;
diff --git a/ompi/mpi/c/ineighbor_alltoallw.c b/ompi/mpi/c/ineighbor_alltoallw.c
index 2c961a10dd..b5c6299cd6 100644
--- a/ompi/mpi/c/ineighbor_alltoallw.c
+++ b/ompi/mpi/c/ineighbor_alltoallw.c
@@ -50,7 +50,6 @@ int MPI_Ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], const M
 {
     int i, size, err;
     size_t sendtype_size, recvtype_size;
-    bool zerosend=true, zerorecv=true;
 
     MEMCHECKER(
         ptrdiff_t recv_ext;
diff --git a/ompi/mpi/c/neighbor_alltoall.c b/ompi/mpi/c/neighbor_alltoall.c
index c6fc9e679e..6c23fd96a0 100644
--- a/ompi/mpi/c/neighbor_alltoall.c
+++ b/ompi/mpi/c/neighbor_alltoall.c
@@ -98,8 +98,8 @@ int MPI_Neighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendt
     ompi_datatype_type_size(sendtype, &sendtype_size);
     ompi_datatype_type_size(recvtype, &recvtype_size);
     if (((MPI_IN_PLACE == sendbuf) ||
-         (0 == sendcount || 0 == sendtype_size)) &&
-        (0 == recvcount || 0 == recvtype_size)) {
+         (0 == sendcount) || (0 == sendtype_size)) &&
+        ((0 == recvcount) || 0 == (recvtype_size))) {
         return MPI_SUCCESS;
     }