diff --git a/core/net/rime/neighbor.c b/core/net/rime/neighbor.c
index 9c545378f..65b4e8b9c 100644
--- a/core/net/rime/neighbor.c
+++ b/core/net/rime/neighbor.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: neighbor.c,v 1.1 2007/02/28 16:38:51 adamdunkels Exp $
+ * $Id: neighbor.c,v 1.2 2007/03/15 09:56:15 adamdunkels Exp $
  */
 
 /**
@@ -113,6 +113,7 @@ neighbor_add(node_id_t nodeid, u8_t nhopcount, u16_t nsignal)
   hopcount = 0;
   signal = USHRT_MAX;
 
+  n = 0;
   for(i = 0; i < MAX_NEIGHBORS; ++i) {
     if(neighbors[i].nodeid == 0 ||
        neighbors[i].nodeid == nodeid) {
diff --git a/core/net/rime/queuebuf.c b/core/net/rime/queuebuf.c
index 703154401..3315b5f80 100644
--- a/core/net/rime/queuebuf.c
+++ b/core/net/rime/queuebuf.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: queuebuf.c,v 1.2 2007/03/13 10:28:52 adamdunkels Exp $
+ * $Id: queuebuf.c,v 1.3 2007/03/15 09:56:39 adamdunkels Exp $
  */
 
 /**
@@ -40,6 +40,8 @@
 
 #include "net/rime/queuebuf.h"
 
+#include <string.h> /* for memcpy() */
+
 #define QUEUEBUF_NUM 2
 #define QUEUEBUF_REF_NUM 2