diff --git a/ompi/mca/coll/tuned/coll_tuned_util.c b/ompi/mca/coll/tuned/coll_tuned_util.c
index 5e85fd2ce9..1120065cdc 100644
--- a/ompi/mca/coll/tuned/coll_tuned_util.c
+++ b/ompi/mca/coll/tuned/coll_tuned_util.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -67,24 +67,6 @@ int ompi_coll_tuned_sendrecv_actual( void* sendbuf, int scount,
     return (err);
 }
 
-inline int 
-ompi_coll_tuned_sendrecv( void* sendbuf, int scount, ompi_datatype_t* sdatatype,
-                          int dest, int stag,
-                          void* recvbuf, int rcount, ompi_datatype_t* rdatatype,
-                          int source, int rtag, 
-                          struct ompi_communicator_t* comm,
-                          ompi_status_public_t* status, int myid )
-{
-    if ((dest == myid) && (source == myid)) {
-        return (int) ompi_ddt_sndrcv(sendbuf, (int32_t) scount, sdatatype, 
-                                     recvbuf, (int32_t) rcount, rdatatype);
-    }
-    return ompi_coll_tuned_sendrecv_actual (sendbuf, scount, sdatatype, 
-                                            dest, stag, 
-                                            recvbuf, rcount, rdatatype,
-                                            source, rtag, comm, status);
-}
-
 /*
  * localcompleted version that makes sure the send has completed locally 
  * Currently this is a sync call, but will change to locally completed
diff --git a/ompi/mca/coll/tuned/coll_tuned_util.h b/ompi/mca/coll/tuned/coll_tuned_util.h
index e0609e2225..5454961b48 100644
--- a/ompi/mca/coll/tuned/coll_tuned_util.h
+++ b/ompi/mca/coll/tuned/coll_tuned_util.h
@@ -45,13 +45,23 @@ int ompi_coll_tuned_sendrecv_actual( void* sendbuf, int scount,
 
 /* inline functions */
 
-int 
+static inline int
 ompi_coll_tuned_sendrecv( void* sendbuf, int scount, ompi_datatype_t* sdatatype,
                           int dest, int stag,
                           void* recvbuf, int rcount, ompi_datatype_t* rdatatype,
                           int source, int rtag, 
                           struct ompi_communicator_t* comm,
-                          ompi_status_public_t* status, int myid );
+                          ompi_status_public_t* status, int myid )
+{
+    if ((dest == myid) && (source == myid)) {
+        return (int) ompi_ddt_sndrcv(sendbuf, (int32_t) scount, sdatatype, 
+                                     recvbuf, (int32_t) rcount, rdatatype);
+    }
+    return ompi_coll_tuned_sendrecv_actual (sendbuf, scount, sdatatype, 
+                                            dest, stag, 
+                                            recvbuf, rcount, rdatatype,
+                                            source, rtag, comm, status);
+}
 
 int 
 ompi_coll_tuned_sendrecv_actual_localcompleted( void* sendbuf, int scount,