diff --git a/core/net/rime/mesh.c b/core/net/rime/mesh.c
index be04e2b77cf158bff52a884a8d665742370778f5..8cf15d54c20fbb234e87981339fed38c383300d6 100644
--- a/core/net/rime/mesh.c
+++ b/core/net/rime/mesh.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: mesh.c,v 1.16 2009/03/23 16:22:02 adamdunkels Exp $
+ * $Id: mesh.c,v 1.17 2009/03/24 07:15:04 adamdunkels Exp $
  */
 
 /**
@@ -147,7 +147,7 @@ mesh_close(struct mesh_conn *c)
 }
 /*---------------------------------------------------------------------------*/
 int
-mesh_send(struct mesh_conn *c, rimeaddr_t *to)
+mesh_send(struct mesh_conn *c, const rimeaddr_t *to)
 {
   int could_send;
 
diff --git a/core/net/rime/mesh.h b/core/net/rime/mesh.h
index aac700a60d30d9c1652d4b84c5412ec184a7c0ea..26e8c7b1fef79747242e964f97afb9920a466149 100644
--- a/core/net/rime/mesh.h
+++ b/core/net/rime/mesh.h
@@ -49,7 +49,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: mesh.h,v 1.14 2009/03/23 16:22:02 adamdunkels Exp $
+ * $Id: mesh.h,v 1.15 2009/03/24 07:15:04 adamdunkels Exp $
  */
 
 /**
@@ -132,7 +132,7 @@ void mesh_close(struct mesh_conn *c);
  *             must have previously been set up with mesh_open().
  *
  */
-int mesh_send(struct mesh_conn *c, rimeaddr_t *dest);
+int mesh_send(struct mesh_conn *c, const rimeaddr_t *dest);
 
 #endif /* __MESH_H__ */
 /** @} */
diff --git a/core/net/rime/multihop.c b/core/net/rime/multihop.c
index a8eded68d8fba13f34a5aff954bf4ed29f8eea84..35b2e5f00ddac71b7b4c4873e7425820508e14ee 100644
--- a/core/net/rime/multihop.c
+++ b/core/net/rime/multihop.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: multihop.c,v 1.3 2009/03/23 16:20:37 adamdunkels Exp $
+ * $Id: multihop.c,v 1.4 2009/03/24 07:15:04 adamdunkels Exp $
  */
 
 /**
@@ -119,7 +119,7 @@ multihop_close(struct multihop_conn *c)
 }
 /*---------------------------------------------------------------------------*/
 int
-multihop_send(struct multihop_conn *c, rimeaddr_t *to)
+multihop_send(struct multihop_conn *c, const rimeaddr_t *to)
 {
   rimeaddr_t *nexthop;
 
diff --git a/core/net/rime/multihop.h b/core/net/rime/multihop.h
index 203751ca42c948f58f8a9ba1a2ce316340b3d087..23acb41fb6297c899e26c85fbd4b06989a5e0d8b 100644
--- a/core/net/rime/multihop.h
+++ b/core/net/rime/multihop.h
@@ -58,7 +58,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: multihop.h,v 1.5 2009/03/23 16:20:37 adamdunkels Exp $
+ * $Id: multihop.h,v 1.6 2009/03/24 07:15:04 adamdunkels Exp $
  */
 
 /**
@@ -103,7 +103,7 @@ struct multihop_conn {
 void multihop_open(struct multihop_conn *c, uint16_t channel,
 	     const struct multihop_callbacks *u);
 void multihop_close(struct multihop_conn *c);
-int multihop_send(struct multihop_conn *c, rimeaddr_t *to);
+int multihop_send(struct multihop_conn *c, const rimeaddr_t *to);
 
 #endif /* __MULTIHOP_H__ */
 /** @} */
diff --git a/core/net/rime/route-discovery.c b/core/net/rime/route-discovery.c
index f81885652406d6819c93500330a217d13ca13459..8ff185694cbb4cb0785b25038b4d9b97b4b20148 100644
--- a/core/net/rime/route-discovery.c
+++ b/core/net/rime/route-discovery.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: route-discovery.c,v 1.14 2009/03/12 21:58:21 adamdunkels Exp $
+ * $Id: route-discovery.c,v 1.15 2009/03/24 07:15:04 adamdunkels Exp $
  */
 
 /**
@@ -78,7 +78,7 @@ struct rrep_hdr {
 
 /*---------------------------------------------------------------------------*/
 static void
-send_rreq(struct route_discovery_conn *c, rimeaddr_t *dest)
+send_rreq(struct route_discovery_conn *c, const rimeaddr_t *dest)
 {
   struct route_msg *msg;
 
@@ -253,7 +253,7 @@ timeout_handler(void *ptr)
 }
 /*---------------------------------------------------------------------------*/
 void
-route_discovery_discover(struct route_discovery_conn *c, rimeaddr_t *addr,
+route_discovery_discover(struct route_discovery_conn *c, const rimeaddr_t *addr,
 			 clock_time_t timeout)
 {
   PRINTF("route_discovery_send: sending route request\n");
diff --git a/core/net/rime/route-discovery.h b/core/net/rime/route-discovery.h
index e34b2191762484c4f9a75e3bc2c21029a43ec582..bb790b0a8de26afc80f3c59f44a9d93a50087b82 100644
--- a/core/net/rime/route-discovery.h
+++ b/core/net/rime/route-discovery.h
@@ -45,7 +45,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: route-discovery.h,v 1.7 2008/07/03 22:02:10 adamdunkels Exp $
+ * $Id: route-discovery.h,v 1.8 2009/03/24 07:15:04 adamdunkels Exp $
  */
 
 /**
@@ -83,7 +83,7 @@ struct route_discovery_conn {
 void route_discovery_open(struct route_discovery_conn *c, clock_time_t time,
 			  uint16_t channels,
 			  const struct route_discovery_callbacks *callbacks);
-void route_discovery_discover(struct route_discovery_conn *c, rimeaddr_t *dest,
+void route_discovery_discover(struct route_discovery_conn *c, const rimeaddr_t *dest,
 			      clock_time_t timeout);
 
 void route_discovery_close(struct route_discovery_conn *c);