diff --git a/ompi/mca/coll/tuned/coll_tuned_allreduce.c b/ompi/mca/coll/tuned/coll_tuned_allreduce.c
index e9583c919c..886b2e7cce 100644
--- a/ompi/mca/coll/tuned/coll_tuned_allreduce.c
+++ b/ompi/mca/coll/tuned/coll_tuned_allreduce.c
@@ -32,35 +32,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-/* temp debug routines */
-static int dump_buf_int (char* ptr, int count, char *comment, int rank);
-
-static int dump_buf_int (char* ptr, int count, char *comment, int rank) {
-int i=0;
-int *tptr;
-int c=0;
-tptr=(int*)ptr;
-printf("%1d ", rank);
-if (comment) printf("%s ", comment);
-if (count <0) {
-    printf("cnt %d?\n", count);
-    return (0);
-}
-
-if (count>5) c = 5;
-else c = count;
-printf("Cnt %1d  ", count);
-for(i=0;i<c;i++) {
-    printf("%1d [%1d] ", i, *tptr++);
-    }
-if (c!=count) {
-    tptr=(int*)ptr;
-    printf(" ... %1d [%1d]", count-1, tptr[count-1]);
-}
-printf("\n");
-return (0);
-}
-
 /*
  * mca_coll_tuned_allreduce_intra_nonoverlapping
  *
diff --git a/ompi/mca/coll/tuned/coll_tuned_barrier.c b/ompi/mca/coll/tuned/coll_tuned_barrier.c
index e4ef69d55d..aaef702a25 100644
--- a/ompi/mca/coll/tuned/coll_tuned_barrier.c
+++ b/ompi/mca/coll/tuned/coll_tuned_barrier.c
@@ -235,7 +235,7 @@ int mca_coll_tuned_barrier_intra_two_procs(struct ompi_communicator_t *comm)
 
 /* copied function (with appropriate renaming) starts here */
 
-int mca_coll_tuned_barrier_intra_basic_linear(struct ompi_communicator_t *comm)
+static int mca_coll_tuned_barrier_intra_basic_linear(struct ompi_communicator_t *comm)
 {
     int i;
     int err;
diff --git a/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c b/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c
index 55978b66a4..1ced0f7701 100644
--- a/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c
+++ b/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c
@@ -66,7 +66,6 @@ mca_coll_tuned_allreduce_intra_dec_dynamic (void *sbuf, void *rbuf, int count,
 
        /* we do, so calc the message size or what ever we need and use this for the evaluation */
         int alg, faninout, segsize;
-/*         int contig; */
         int dsize;
 
         ompi_ddt_type_size (dtype, &dsize);
@@ -237,7 +236,6 @@ int mca_coll_tuned_reduce_intra_dec_dynamic( void *sendbuf, void *recvbuf,
        /* we do, so calc the message size or what ever we need and use this for the evaluation */
         int alg, faninout, segsize;
         int dsize;
-        int contig;
 
         ompi_ddt_type_size (datatype, &dsize);
         dsize *= count;
diff --git a/ompi/mca/coll/tuned/coll_tuned_module.c b/ompi/mca/coll/tuned/coll_tuned_module.c
index 52e2d60266..0190d2bb3b 100644
--- a/ompi/mca/coll/tuned/coll_tuned_module.c
+++ b/ompi/mca/coll/tuned/coll_tuned_module.c
@@ -292,7 +292,6 @@ mca_coll_tuned_module_init(struct ompi_communicator_t *comm)
   int size, rank;
   struct mca_coll_base_comm_t *data;
   /* fanout parameters */
-  int pre_allocate = 1;
   int rc=0;
   int i;
 
diff --git a/ompi/mca/coll/tuned/coll_tuned_reduce.c b/ompi/mca/coll/tuned/coll_tuned_reduce.c
index d4078f0edc..6d44191b68 100644
--- a/ompi/mca/coll/tuned/coll_tuned_reduce.c
+++ b/ompi/mca/coll/tuned/coll_tuned_reduce.c
@@ -32,35 +32,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-/* temp debug routines */
-static int dump_buf_int (char* ptr, int count, char *comment, int rank);
-
-static int dump_buf_int (char* ptr, int count, char *comment, int rank) {
-int i=0;
-int *tptr;
-int c=0;
-tptr=(int*)ptr;
-printf("%1d ", rank);
-if (comment) printf("%s ", comment);
-if (count <0) {
-    printf("cnt %d?\n", count);
-    return (0);
-}
-
-if (count>5) c = 5;
-else c = count;
-printf("Cnt %1d  ", count);
-for(i=0;i<c;i++) {
-    printf("%1d [%1d] ", i, *tptr++);
-    }
-if (c!=count) {
-    tptr=(int*)ptr;
-    printf(" ... %1d [%1d]", count-1, tptr[count-1]);
-}
-printf("\n");
-return (0);
-}
-
 /* Attention: this version of the reduce operations does not
    work for:
    - non-commutative operations
diff --git a/ompi/mca/coll/tuned/coll_tuned_util.c b/ompi/mca/coll/tuned/coll_tuned_util.c
index 31cc0695a4..29e9b92537 100644
--- a/ompi/mca/coll/tuned/coll_tuned_util.c
+++ b/ompi/mca/coll/tuned/coll_tuned_util.c
@@ -26,6 +26,7 @@
 #include "mca/coll/coll.h"
 #include "mca/coll/base/coll_tags.h"
 #include "mca/pml/pml.h"
+#include "coll_tuned_util.h"
 
 int coll_tuned_sendrecv_actual( void* sendbuf, int scount, ompi_datatype_t* sdatatype,
                               int dest, int stag,