diff --git a/Makefile.include b/Makefile.include
index 526fdf2b3..4f436cc4c 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -53,7 +53,7 @@ THREADS = mt.c
 LIBS    = memb.c mmem.c timer.c list.c etimer.c ctimer.c energest.c rtimer.c stimer.c \
           print-stats.c ifft.c crc16.c random.c checkpoint.c ringbuf.c
 DEV     = nullradio.c
-NET     = netstack.c uip-debug.c
+NET     = netstack.c uip-debug.c packetbuf.c queuebuf.c packetqueue.c
 
 ifdef UIP_CONF_IPV6
   CFLAGS += -DUIP_CONF_IPV6=1
diff --git a/core/dev/cc2420.c b/core/dev/cc2420.c
index 5275312dc..6a16d4d93 100644
--- a/core/dev/cc2420.c
+++ b/core/dev/cc2420.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: cc2420.c,v 1.52 2010/04/20 11:41:16 nifi Exp $
+ * @(#)$Id: cc2420.c,v 1.53 2010/06/14 19:19:16 adamdunkels Exp $
  */
 /*
  * This code is almost device independent and should be easy to port.
@@ -50,7 +50,7 @@
 #include "dev/cc2420.h"
 #include "dev/cc2420_const.h"
 
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/rime/rimestats.h"
 #include "net/netstack.h"
 
diff --git a/core/net/mac/csma.c b/core/net/mac/csma.c
index 7e537b128..a8a3f5726 100644
--- a/core/net/mac/csma.c
+++ b/core/net/mac/csma.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: csma.c,v 1.17 2010/06/14 07:34:36 adamdunkels Exp $
+ * $Id: csma.c,v 1.18 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
@@ -39,8 +39,8 @@
  */
 
 #include "net/mac/csma.h"
-#include "net/rime/packetbuf.h"
-#include "net/rime/queuebuf.h"
+#include "net/packetbuf.h"
+#include "net/queuebuf.h"
 
 #include "sys/ctimer.h"
 
diff --git a/core/net/mac/ctdma_mac.c b/core/net/mac/ctdma_mac.c
index ee21e5055..ad81a4e97 100644
--- a/core/net/mac/ctdma_mac.c
+++ b/core/net/mac/ctdma_mac.c
@@ -28,12 +28,12 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ctdma_mac.c,v 1.5 2010/06/14 18:58:45 adamdunkels Exp $
+ * $Id: ctdma_mac.c,v 1.6 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 #include "contiki.h"
 #include "net/mac/ctdma_mac.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/uip-fw.h"
 #include "sys/ctimer.h"
 #include "net/rime.h"
diff --git a/core/net/mac/framer-802154.c b/core/net/mac/framer-802154.c
index 7f3cf946e..02ea4bfe1 100644
--- a/core/net/mac/framer-802154.c
+++ b/core/net/mac/framer-802154.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: framer-802154.c,v 1.11 2010/04/30 07:25:51 adamdunkels Exp $
+ * $Id: framer-802154.c,v 1.12 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
@@ -39,7 +39,7 @@
 
 #include "net/mac/framer-802154.h"
 #include "net/mac/frame802154.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "lib/random.h"
 #include <string.h>
 
diff --git a/core/net/mac/framer-nullmac.c b/core/net/mac/framer-nullmac.c
index fe8c77aab..9671f204d 100644
--- a/core/net/mac/framer-nullmac.c
+++ b/core/net/mac/framer-nullmac.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: framer-nullmac.c,v 1.1 2009/10/19 18:30:03 adamdunkels Exp $
+ * $Id: framer-nullmac.c,v 1.2 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
@@ -38,7 +38,7 @@
  */
 
 #include "net/mac/framer-nullmac.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 
 #define DEBUG 0
 
diff --git a/core/net/mac/lpp.c b/core/net/mac/lpp.c
index e85a80fc8..537c5860c 100644
--- a/core/net/mac/lpp.c
+++ b/core/net/mac/lpp.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: lpp.c,v 1.34 2010/04/30 22:18:12 nvt-se Exp $
+ * $Id: lpp.c,v 1.35 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -58,7 +58,7 @@
 #include "net/netstack.h"
 #include "net/mac/mac.h"
 #include "net/mac/lpp.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/rime/announcement.h"
 #include "sys/compower.h"
 
diff --git a/core/net/mac/nullmac.c b/core/net/mac/nullmac.c
index e191daaa7..b9d4c0509 100644
--- a/core/net/mac/nullmac.c
+++ b/core/net/mac/nullmac.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: nullmac.c,v 1.14 2010/02/18 21:48:39 adamdunkels Exp $
+ * $Id: nullmac.c,v 1.15 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -39,7 +39,7 @@
  */
 
 #include "net/mac/nullmac.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/netstack.h"
 
 /*---------------------------------------------------------------------------*/
diff --git a/core/net/mac/nullrdc-framer.c b/core/net/mac/nullrdc-framer.c
index 156d50c69..e91bcdc9b 100644
--- a/core/net/mac/nullrdc-framer.c
+++ b/core/net/mac/nullrdc-framer.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: nullrdc-framer.c,v 1.2 2010/05/26 14:12:33 nifi Exp $
+ * $Id: nullrdc-framer.c,v 1.3 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -40,7 +40,7 @@
  */
 
 #include "net/mac/nullrdc-framer.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/netstack.h"
 #include "sys/rtimer.h"
 #include "dev/watchdog.h"
diff --git a/core/net/mac/nullrdc.c b/core/net/mac/nullrdc.c
index 6b581bb9f..0fc1ab902 100644
--- a/core/net/mac/nullrdc.c
+++ b/core/net/mac/nullrdc.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: nullrdc.c,v 1.2 2010/02/23 20:09:11 nifi Exp $
+ * $Id: nullrdc.c,v 1.3 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -39,7 +39,7 @@
  */
 
 #include "net/mac/nullrdc.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/netstack.h"
 
 /*---------------------------------------------------------------------------*/
diff --git a/core/net/mac/phase.c b/core/net/mac/phase.c
index d5b384c66..cbe062613 100644
--- a/core/net/mac/phase.c
+++ b/core/net/mac/phase.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: phase.c,v 1.12 2010/06/14 07:34:37 adamdunkels Exp $
+ * $Id: phase.c,v 1.13 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -39,11 +39,11 @@
  */
 
 #include "net/mac/phase.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "sys/clock.h"
 #include "lib/memb.h"
 #include "sys/ctimer.h"
-#include "net/rime/queuebuf.h"
+#include "net/queuebuf.h"
 #include "dev/watchdog.h"
 #include "dev/leds.h"
 
diff --git a/core/net/mac/sicslowmac.c b/core/net/mac/sicslowmac.c
index 6b1a6bc55..987401190 100644
--- a/core/net/mac/sicslowmac.c
+++ b/core/net/mac/sicslowmac.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sicslowmac.c,v 1.7 2010/02/23 22:45:11 nifi Exp $
+ * $Id: sicslowmac.c,v 1.8 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 
@@ -47,7 +47,7 @@
 #include <string.h>
 #include "net/mac/sicslowmac.h"
 #include "net/mac/frame802154.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/netstack.h"
 #include "lib/random.h"
 
diff --git a/core/net/mac/tdma_mac.c b/core/net/mac/tdma_mac.c
index 14e1ea739..40ed8a796 100644
--- a/core/net/mac/tdma_mac.c
+++ b/core/net/mac/tdma_mac.c
@@ -28,12 +28,12 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: tdma_mac.c,v 1.7 2009/06/22 11:14:11 nifi Exp $
+ * $Id: tdma_mac.c,v 1.8 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 #include "contiki.h"
 #include "net/mac/tdma_mac.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/uip-fw.h"
 #include "sys/rtimer.h"
 #include "net/rime.h"
diff --git a/core/net/rime/packetbuf.c b/core/net/packetbuf.c
similarity index 99%
rename from core/net/rime/packetbuf.c
rename to core/net/packetbuf.c
index 860b43729..26f7c4d7e 100644
--- a/core/net/rime/packetbuf.c
+++ b/core/net/packetbuf.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: packetbuf.c,v 1.9 2010/05/02 14:59:11 nifi Exp $
+ * $Id: packetbuf.c,v 1.1 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
@@ -46,7 +46,7 @@
 #include <string.h>
 
 #include "contiki-net.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/rime.h"
 
 struct packetbuf_attr packetbuf_attrs[PACKETBUF_NUM_ATTRS];
diff --git a/core/net/rime/packetbuf.h b/core/net/packetbuf.h
similarity index 99%
rename from core/net/rime/packetbuf.h
rename to core/net/packetbuf.h
index d5c6a4ee8..f3bd542ac 100644
--- a/core/net/rime/packetbuf.h
+++ b/core/net/packetbuf.h
@@ -40,7 +40,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: packetbuf.h,v 1.12 2010/05/27 20:28:29 nifi Exp $
+ * $Id: packetbuf.h,v 1.1 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/packetqueue.c b/core/net/packetqueue.c
similarity index 97%
rename from core/net/rime/packetqueue.c
rename to core/net/packetqueue.c
index eacdd8b61..9169974da 100644
--- a/core/net/rime/packetqueue.c
+++ b/core/net/packetqueue.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: packetqueue.c,v 1.3 2010/06/14 07:34:37 adamdunkels Exp $
+ * $Id: packetqueue.c,v 1.1 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
@@ -43,7 +43,7 @@
  */
 
 #include "sys/ctimer.h"
-#include "net/rime/packetqueue.h"
+#include "net/packetqueue.h"
 
 /*---------------------------------------------------------------------------*/
 void
diff --git a/core/net/rime/packetqueue.h b/core/net/packetqueue.h
similarity index 98%
rename from core/net/rime/packetqueue.h
rename to core/net/packetqueue.h
index fcef63a0e..abbcc531c 100644
--- a/core/net/rime/packetqueue.h
+++ b/core/net/packetqueue.h
@@ -41,7 +41,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: packetqueue.h,v 1.5 2010/06/14 07:34:37 adamdunkels Exp $
+ * $Id: packetqueue.h,v 1.1 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
@@ -59,8 +59,8 @@
 
 #include "sys/ctimer.h"
 
-#include "net/rime/packetbuf.h"
-#include "net/rime/queuebuf.h"
+#include "net/packetbuf.h"
+#include "net/queuebuf.h"
 
 /**
  * \brief      Representation of a packet queue.
diff --git a/core/net/rime/queuebuf.c b/core/net/queuebuf.c
similarity index 99%
rename from core/net/rime/queuebuf.c
rename to core/net/queuebuf.c
index 72dc64868..5d24997aa 100644
--- a/core/net/rime/queuebuf.c
+++ b/core/net/queuebuf.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: queuebuf.c,v 1.19 2010/06/14 06:55:26 adamdunkels Exp $
+ * $Id: queuebuf.c,v 1.1 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
diff --git a/core/net/rime/queuebuf.h b/core/net/queuebuf.h
similarity index 96%
rename from core/net/rime/queuebuf.h
rename to core/net/queuebuf.h
index f09391e79..24b3d6d79 100644
--- a/core/net/rime/queuebuf.h
+++ b/core/net/queuebuf.h
@@ -41,7 +41,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: queuebuf.h,v 1.8 2010/06/14 06:55:26 adamdunkels Exp $
+ * $Id: queuebuf.h,v 1.1 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
@@ -54,7 +54,7 @@
 #ifndef __QUEUEBUF_H__
 #define __QUEUEBUF_H__
 
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 
 struct queuebuf;
 
diff --git a/core/net/rime.h b/core/net/rime.h
index bc7d68c1a..5cd296205 100644
--- a/core/net/rime.h
+++ b/core/net/rime.h
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rime.h,v 1.29 2010/06/14 07:34:36 adamdunkels Exp $
+ * $Id: rime.h,v 1.30 2010/06/14 19:19:16 adamdunkels Exp $
  */
 
 /**
@@ -55,9 +55,9 @@
 #include "net/rime/netflood.h"
 #include "net/rime/polite-announcement.h"
 #include "net/rime/polite.h"
-#include "net/rime/queuebuf.h"
+#include "net/queuebuf.h"
 #include "net/rime/rimeaddr.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/rime/rimestats.h"
 #include "net/rime/rmh.h"
 #include "net/rime/route-discovery.h"
diff --git a/core/net/rime/Makefile.rime b/core/net/rime/Makefile.rime
index 2ce3a622f..7c59f119a 100644
--- a/core/net/rime/Makefile.rime
+++ b/core/net/rime/Makefile.rime
@@ -1,6 +1,6 @@
 RIME_CHAMELEON = chameleon.c channel.c chameleon-raw.c chameleon-bitopt.c
-RIME_BASE      = packetbuf.c queuebuf.c rimeaddr.c rime.c timesynch.c \
-                 rimestats.c announcement.c polite-announcement.c packetqueue.c \
+RIME_BASE      = rimeaddr.c rime.c timesynch.c \
+                 rimestats.c announcement.c polite-announcement.c \
                  broadcast-announcement.c
 RIME_SINGLEHOP = broadcast.c stbroadcast.c unicast.c stunicast.c \
                  runicast.c abc.c \
diff --git a/core/net/rime/abc.h b/core/net/rime/abc.h
index e0460cce7..5c982f4b1 100644
--- a/core/net/rime/abc.h
+++ b/core/net/rime/abc.h
@@ -46,7 +46,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: abc.h,v 1.16 2010/02/23 18:38:05 adamdunkels Exp $
+ * $Id: abc.h,v 1.17 2010/06/14 19:19:17 adamdunkels Exp $
  */
 /**
  * \file
@@ -58,7 +58,7 @@
 #ifndef __ABC_H__
 #define __ABC_H__
 
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/rime/channel.h"
 
 struct abc_conn;
diff --git a/core/net/rime/channel.h b/core/net/rime/channel.h
index bf7427b87..46b683793 100644
--- a/core/net/rime/channel.h
+++ b/core/net/rime/channel.h
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: channel.h,v 1.2 2009/03/12 21:58:21 adamdunkels Exp $
+ * $Id: channel.h,v 1.3 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -44,7 +44,7 @@
 struct channel;
 
 #include "contiki-conf.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/rime/chameleon.h"
 
 struct channel {
diff --git a/core/net/rime/collect.c b/core/net/rime/collect.c
index 9d78b9153..c98b78af3 100644
--- a/core/net/rime/collect.c
+++ b/core/net/rime/collect.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: collect.c,v 1.48 2010/06/14 06:54:47 adamdunkels Exp $
+ * $Id: collect.c,v 1.49 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -49,7 +49,7 @@
 #include "net/rime/collect-neighbor.h"
 #include "net/rime/collect.h"
 
-#include "net/rime/packetqueue.h"
+#include "net/packetqueue.h"
 
 #include "dev/radio-sensor.h"
 
diff --git a/core/net/rime/ipolite.h b/core/net/rime/ipolite.h
index 3cb4c2635..65beb3d6d 100644
--- a/core/net/rime/ipolite.h
+++ b/core/net/rime/ipolite.h
@@ -81,7 +81,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ipolite.h,v 1.11 2010/06/14 07:34:37 adamdunkels Exp $
+ * $Id: ipolite.h,v 1.12 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -97,7 +97,7 @@
 #include "sys/ctimer.h"
 
 #include "net/rime/broadcast.h"
-#include "net/rime/queuebuf.h"
+#include "net/queuebuf.h"
 
 struct ipolite_conn;
 
diff --git a/core/net/rime/mesh.h b/core/net/rime/mesh.h
index 26e8c7b1f..7787a328e 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.15 2009/03/24 07:15:04 adamdunkels Exp $
+ * $Id: mesh.h,v 1.16 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -62,7 +62,7 @@
 #ifndef __MESH_H__
 #define __MESH_H__
 
-#include "net/rime/queuebuf.h"
+#include "net/queuebuf.h"
 #include "net/rime/multihop.h"
 #include "net/rime/route-discovery.h"
 
diff --git a/core/net/rime/netflood.h b/core/net/rime/netflood.h
index de9c722ca..43f579d98 100644
--- a/core/net/rime/netflood.h
+++ b/core/net/rime/netflood.h
@@ -62,7 +62,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: netflood.h,v 1.6 2010/06/14 07:34:37 adamdunkels Exp $
+ * $Id: netflood.h,v 1.7 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -75,7 +75,7 @@
 #ifndef __NETFLOOD_H__
 #define __NETFLOOD_H__
 
-#include "net/rime/queuebuf.h"
+#include "net/queuebuf.h"
 #include "net/rime/ipolite.h"
 
 struct netflood_conn;
diff --git a/core/net/rime/polite.h b/core/net/rime/polite.h
index d0f7ec49d..f7d35051a 100644
--- a/core/net/rime/polite.h
+++ b/core/net/rime/polite.h
@@ -81,7 +81,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: polite.h,v 1.8 2010/06/14 07:34:37 adamdunkels Exp $
+ * $Id: polite.h,v 1.9 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -95,7 +95,7 @@
 #define __POLITE_H__
 
 #include "net/rime/abc.h"
-#include "net/rime/queuebuf.h"
+#include "net/queuebuf.h"
 
 struct polite_conn;
 
diff --git a/core/net/rime/rime-udp.c b/core/net/rime/rime-udp.c
index 88fc99879..b9c28d559 100644
--- a/core/net/rime/rime-udp.c
+++ b/core/net/rime/rime-udp.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rime-udp.c,v 1.5 2010/02/18 21:48:39 adamdunkels Exp $
+ * $Id: rime-udp.c,v 1.6 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -44,7 +44,7 @@
 #include "net/uip-udp-packet.h"
 #include "net/uip-netif.h"
 #include "net/rime/rime-udp.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 
 #define DEBUG 0
 #if DEBUG
diff --git a/core/net/rime/stbroadcast.h b/core/net/rime/stbroadcast.h
index eed7d7795..daaf487b6 100644
--- a/core/net/rime/stbroadcast.h
+++ b/core/net/rime/stbroadcast.h
@@ -48,7 +48,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: stbroadcast.h,v 1.3 2010/06/14 07:34:37 adamdunkels Exp $
+ * $Id: stbroadcast.h,v 1.4 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -64,7 +64,7 @@
 #include "sys/ctimer.h"
 
 #include "net/rime/broadcast.h"
-#include "net/rime/queuebuf.h"
+#include "net/queuebuf.h"
 
 struct stbroadcast_conn;
 
diff --git a/core/net/rime/stunicast.h b/core/net/rime/stunicast.h
index f85fb6c31..cdd8f7b95 100644
--- a/core/net/rime/stunicast.h
+++ b/core/net/rime/stunicast.h
@@ -60,7 +60,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: stunicast.h,v 1.6 2010/06/14 07:34:37 adamdunkels Exp $
+ * $Id: stunicast.h,v 1.7 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -75,7 +75,7 @@
 
 #include "sys/ctimer.h"
 #include "net/rime/unicast.h"
-#include "net/rime/queuebuf.h"
+#include "net/queuebuf.h"
 
 struct stunicast_conn;
 
diff --git a/core/net/rime/timesynch.c b/core/net/rime/timesynch.c
index 49150f4b1..f85acea61 100644
--- a/core/net/rime/timesynch.c
+++ b/core/net/rime/timesynch.c
@@ -34,7 +34,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: timesynch.c,v 1.9 2009/12/09 18:08:26 adamdunkels Exp $
+ * $Id: timesynch.c,v 1.10 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -45,7 +45,7 @@
  */
 
 #include "net/rime/timesynch.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/rime.h"
 #include "dev/cc2420.h"
 
diff --git a/core/net/rime/trickle.h b/core/net/rime/trickle.h
index 73b748b3a..f2428b7ce 100644
--- a/core/net/rime/trickle.h
+++ b/core/net/rime/trickle.h
@@ -45,7 +45,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: trickle.h,v 1.12 2010/06/14 07:34:37 adamdunkels Exp $
+ * $Id: trickle.h,v 1.13 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -61,7 +61,7 @@
 #include "sys/ctimer.h"
 
 #include "net/rime/broadcast.h"
-#include "net/rime/queuebuf.h"
+#include "net/queuebuf.h"
 
 #define TRICKLE_ATTRIBUTES  { PACKETBUF_ATTR_EPACKET_ID, PACKETBUF_ATTR_BIT * 8 },\
                             BROADCAST_ATTRIBUTES
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 53c3a261c..b523948f0 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rpl-icmp6.c,v 1.21 2010/06/14 12:44:37 nvt-se Exp $
+ * $Id: rpl-icmp6.c,v 1.22 2010/06/14 19:19:17 adamdunkels Exp $
  */
 /**
  * \file
@@ -50,7 +50,7 @@
 #include "net/uip-nd6.h"
 #include "net/uip-icmp6.h"
 #include "net/rpl/rpl.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 
 #include <limits.h>
 #include <string.h>
diff --git a/core/sys/compower.c b/core/sys/compower.c
index c1f8cdc90..dc465b80e 100644
--- a/core/sys/compower.c
+++ b/core/sys/compower.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: compower.c,v 1.4 2010/02/23 18:39:00 adamdunkels Exp $
+ * $Id: compower.c,v 1.5 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -46,7 +46,7 @@
 #include "contiki-conf.h"
 #include "sys/energest.h"
 #include "sys/compower.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 
 struct compower_activity compower_idle_activity;
 
diff --git a/cpu/avr/radio/mac/sicslowmac.c b/cpu/avr/radio/mac/sicslowmac.c
index 398183fac..e1029f2ae 100644
--- a/cpu/avr/radio/mac/sicslowmac.c
+++ b/cpu/avr/radio/mac/sicslowmac.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: sicslowmac.c,v 1.8 2009/07/17 13:47:10 dak664 Exp $
+ * $Id: sicslowmac.c,v 1.9 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 
@@ -51,7 +51,7 @@
 #include <stdio.h>
 #include <avr/eeprom.h>
 #include <util/delay.h>
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "zmac.h"
 #include "mac.h"
 #include "frame.h"
diff --git a/cpu/avr/radio/rf230bb/rf230bb.c b/cpu/avr/radio/rf230bb/rf230bb.c
index 98a770b7f..a3bcbcccc 100644
--- a/cpu/avr/radio/rf230bb/rf230bb.c
+++ b/cpu/avr/radio/rf230bb/rf230bb.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: rf230bb.c,v 1.9 2010/03/02 16:29:59 dak664 Exp $
+ * @(#)$Id: rf230bb.c,v 1.10 2010/06/14 19:19:17 adamdunkels Exp $
  */
 /*
  * This code is almost device independent and should be easy to port.
@@ -52,7 +52,7 @@
 #include "dev/spi.h"
 #include "rf230bb.h"
 
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/rime/rimestats.h"
 #include "net/netstack.h"
 
diff --git a/cpu/cc2430/dev/cc2430_rf.c b/cpu/cc2430/dev/cc2430_rf.c
index 8afdd5f4b..ed1d92bba 100644
--- a/cpu/cc2430/dev/cc2430_rf.c
+++ b/cpu/cc2430/dev/cc2430_rf.c
@@ -16,7 +16,7 @@
 #include "cc2430_sfr.h"
 #include "sys/clock.h"
 
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/rime/rimestats.h"
 
 extern void (* receiver_callback)(const struct radio_driver *);
diff --git a/cpu/cc2430/dev/cc2430_rf_intr.c b/cpu/cc2430/dev/cc2430_rf_intr.c
index 62be60688..2c4a26fb0 100644
--- a/cpu/cc2430/dev/cc2430_rf_intr.c
+++ b/cpu/cc2430/dev/cc2430_rf_intr.c
@@ -21,7 +21,7 @@
 #endif
 #include "sys/clock.h"
 
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/rime/rimestats.h"
 #define DEBUG 0
 #if DEBUG
diff --git a/cpu/mc1322x/contiki-maca.c b/cpu/mc1322x/contiki-maca.c
index 94be1793b..daaaef374 100644
--- a/cpu/mc1322x/contiki-maca.c
+++ b/cpu/mc1322x/contiki-maca.c
@@ -30,7 +30,7 @@
  *
  * This file is part of the Contiki OS.
  *
- * $Id: contiki-maca.c,v 1.1 2010/06/09 14:43:22 maralvira Exp $
+ * $Id: contiki-maca.c,v 1.2 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 #include <stdint.h>
@@ -40,7 +40,7 @@
 /* contiki */
 #include "radio.h"
 #include "sys/process.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/netstack.h"
 
 #include "mc1322x.h"
diff --git a/platform/cooja/dev/cooja-radio.c b/platform/cooja/dev/cooja-radio.c
index 67dc6c108..05aa7d49c 100644
--- a/platform/cooja/dev/cooja-radio.c
+++ b/platform/cooja/dev/cooja-radio.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: cooja-radio.c,v 1.14 2010/03/23 15:19:55 adamdunkels Exp $
+ * $Id: cooja-radio.c,v 1.15 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 #include <stdio.h>
@@ -37,7 +37,7 @@
 #include "sys/cooja_mt.h"
 #include "lib/simEnvChange.h"
 
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/rime/rimestats.h"
 #include "net/netstack.h"
 
diff --git a/platform/cooja/net/uip-driver.c b/platform/cooja/net/uip-driver.c
index 1bbf619fc..bfca5cdbe 100644
--- a/platform/cooja/net/uip-driver.c
+++ b/platform/cooja/net/uip-driver.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uip-driver.c,v 1.1 2010/03/10 12:15:52 fros4943 Exp $
+ * $Id: uip-driver.c,v 1.2 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -41,7 +41,7 @@
 #include "net/uip.h"
 #include "net/tcpip.h"
 #include "net/hc.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/uip-driver.h"
 #include <string.h>
 
diff --git a/platform/esb/net/uip-driver.c b/platform/esb/net/uip-driver.c
index 425e45047..6b4efdf7e 100644
--- a/platform/esb/net/uip-driver.c
+++ b/platform/esb/net/uip-driver.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uip-driver.c,v 1.1 2010/03/02 22:40:39 nifi Exp $
+ * $Id: uip-driver.c,v 1.2 2010/06/14 19:19:17 adamdunkels Exp $
  */
 
 /**
@@ -41,7 +41,7 @@
 #include "net/uip.h"
 #include "net/tcpip.h"
 #include "net/hc.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 #include "net/uip-driver.h"
 #include <string.h>
 
diff --git a/platform/netsim/net/ethernode.c b/platform/netsim/net/ethernode.c
index f3d2a009e..8bb64d2f9 100644
--- a/platform/netsim/net/ethernode.c
+++ b/platform/netsim/net/ethernode.c
@@ -30,7 +30,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: ethernode.c,v 1.17 2010/02/23 18:44:08 adamdunkels Exp $
+ * $Id: ethernode.c,v 1.18 2010/06/14 19:19:17 adamdunkels Exp $
  */
 /**
  * \file
@@ -46,7 +46,7 @@
 
 #include "dev/radio.h"
 #include "net/netstack.h"
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 
 #include "node.h"
 
diff --git a/tools/sky/uip6-bridge/uip6-bridge-tap.c b/tools/sky/uip6-bridge/uip6-bridge-tap.c
index a879141b9..0ca9a6878 100644
--- a/tools/sky/uip6-bridge/uip6-bridge-tap.c
+++ b/tools/sky/uip6-bridge/uip6-bridge-tap.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uip6-bridge-tap.c,v 1.2 2009/11/02 11:46:49 adamdunkels Exp $
+ * $Id: uip6-bridge-tap.c,v 1.3 2010/06/14 19:19:17 adamdunkels Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include "dev/leds.h"
 #include "sicslow_ethernet.h"
 
-#include "net/rime/packetbuf.h"
+#include "net/packetbuf.h"
 
 #include <stdio.h>
 #include <string.h>