diff --git a/core/net/rime.h b/core/net/rime.h
index ab9d57951..1913b26e1 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.11 2007/12/05 13:21:58 adamdunkels Exp $
+ * $Id: rime.h,v 1.12 2007/12/17 09:14:08 adamdunkels Exp $
  */
 
 /**
@@ -55,6 +55,13 @@
 #include "net/rime/sibc.h"
 #include "net/rime/mh.h"
 #include "net/rime/rmh.h"
+#include "net/rime/polite.h"
+#include "net/rime/ipolite.h"
+#include "net/rime/nf.h"
+#include "net/rime/route-discovery.h"
+#include "net/rime/neighbor-discovery.h"
+#include "net/rime/collect.h"
+#include "net/rime/mesh.h"
 #include "net/mac/mac.h"
 /**
  * \brief      Initialize Rime
diff --git a/core/net/rime/ipolite.h b/core/net/rime/ipolite.h
index 78fcd0cbd..a1e4420fc 100644
--- a/core/net/rime/ipolite.h
+++ b/core/net/rime/ipolite.h
@@ -46,7 +46,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ipolite.h,v 1.1 2007/05/15 07:41:36 adamdunkels Exp $
+ * $Id: ipolite.h,v 1.2 2007/12/17 09:14:08 adamdunkels Exp $
  */
 
 /**
@@ -59,7 +59,9 @@
 #ifndef __IPOLITE_H__
 #define __IPOLITE_H__
 
-#include "net/rime.h"
+#include "net/rime/ibc.h"
+#include "net/rime/ctimer.h"
+#include "net/rime/queuebuf.h"
 
 struct ipolite_conn;
 
diff --git a/core/net/rime/mesh.h b/core/net/rime/mesh.h
index 03645e07b..e67116c27 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.8 2007/03/31 18:31:27 adamdunkels Exp $
+ * $Id: mesh.h,v 1.9 2007/12/17 09:14:08 adamdunkels Exp $
  */
 
 /**
@@ -62,7 +62,7 @@
 #ifndef __MESH_H__
 #define __MESH_H__
 
-#include "net/rime.h"
+#include "net/rime/queuebuf.h"
 #include "net/rime/mh.h"
 #include "net/rime/route-discovery.h"
 
diff --git a/core/net/rime/nf.c b/core/net/rime/nf.c
index f38fe5499..e58e1fee6 100644
--- a/core/net/rime/nf.c
+++ b/core/net/rime/nf.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: nf.c,v 1.13 2007/11/28 20:03:50 adamdunkels Exp $
+ * $Id: nf.c,v 1.14 2007/12/17 09:14:08 adamdunkels Exp $
  */
 
 /**
@@ -44,7 +44,6 @@
  */
 
 #include "net/rime/nf.h"
-#include "net/rime.h"
 #include "lib/rand.h"
 #include <string.h>
 
diff --git a/core/net/rime/polite.h b/core/net/rime/polite.h
index adb1d4906..d15b99ecd 100644
--- a/core/net/rime/polite.h
+++ b/core/net/rime/polite.h
@@ -46,7 +46,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: polite.h,v 1.1 2007/05/15 07:41:22 adamdunkels Exp $
+ * $Id: polite.h,v 1.2 2007/12/17 09:14:08 adamdunkels Exp $
  */
 
 /**
@@ -59,7 +59,9 @@
 #ifndef __POLITE_H__
 #define __POLITE_H__
 
-#include "net/rime.h"
+#include "net/rime/abc.h"
+#include "net/rime/queuebuf.h"
+#include "net/rime/ctimer.h"
 
 struct polite_conn;
 
diff --git a/core/net/rime/route-discovery.h b/core/net/rime/route-discovery.h
index 69abf8a0d..b80daa5ac 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.3 2007/03/31 18:31:28 adamdunkels Exp $
+ * $Id: route-discovery.h,v 1.4 2007/12/17 09:14:08 adamdunkels Exp $
  */
 
 /**
@@ -58,7 +58,7 @@
 #ifndef __ROUTE_DISCOVERY_H__
 #define __ROUTE_DISCOVERY_H__
 
-#include "net/rime.h"
+#include "net/rime/uc.h"
 #include "net/rime/nf.h"
 
 struct route_discovery_conn;
diff --git a/core/net/rime/route.c b/core/net/rime/route.c
index 041fd1b9a..27f8f2ff4 100644
--- a/core/net/rime/route.c
+++ b/core/net/rime/route.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: route.c,v 1.7 2007/11/28 20:00:57 adamdunkels Exp $
+ * $Id: route.c,v 1.8 2007/12/17 09:14:08 adamdunkels Exp $
  */
 
 /**
@@ -45,6 +45,9 @@
 
 #include <stdio.h>
 
+#include "lib/list.h"
+#include "lib/memb.h"
+#include "net/rime/ctimer.h"
 #include "net/rime/route.h"
 
 #define NUM_RT_ENTRIES 8
diff --git a/core/net/rime/route.h b/core/net/rime/route.h
index ed7eba75b..f712a3fac 100644
--- a/core/net/rime/route.h
+++ b/core/net/rime/route.h
@@ -39,7 +39,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: route.h,v 1.5 2007/03/31 18:31:28 adamdunkels Exp $
+ * $Id: route.h,v 1.6 2007/12/17 09:14:08 adamdunkels Exp $
  */
 
 /**
@@ -52,8 +52,7 @@
 #ifndef __ROUTE_H__
 #define __ROUTE_H__
 
-#include "contiki-net.h"
-#include "net/rime.h"
+#include "net/rime/rimeaddr.h"
 
 struct route_entry {
   struct route_entry *next;
diff --git a/core/net/rime/rudolph0.h b/core/net/rime/rudolph0.h
index d0cc05299..7ebf29978 100644
--- a/core/net/rime/rudolph0.h
+++ b/core/net/rime/rudolph0.h
@@ -47,7 +47,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rudolph0.h,v 1.6 2007/11/17 18:05:21 adamdunkels Exp $
+ * $Id: rudolph0.h,v 1.7 2007/12/17 09:14:08 adamdunkels Exp $
  */
 
 /**
@@ -60,10 +60,8 @@
 #ifndef __RUDOLPH0_H__
 #define __RUDOLPH0_H__
 
-#include "net/rime.h"
 #include "net/rime/sabc.h"
 #include "net/rime/polite.h"
-#include "contiki-net.h"
 
 struct rudolph0_conn;
 
diff --git a/core/net/rime/rudolph1.h b/core/net/rime/rudolph1.h
index 9065bee1d..13c352a7d 100644
--- a/core/net/rime/rudolph1.h
+++ b/core/net/rime/rudolph1.h
@@ -47,7 +47,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rudolph1.h,v 1.6 2007/11/17 18:05:21 adamdunkels Exp $
+ * $Id: rudolph1.h,v 1.7 2007/12/17 09:14:08 adamdunkels Exp $
  */
 
 /**
@@ -60,10 +60,8 @@
 #ifndef __RUDOLPH1_H__
 #define __RUDOLPH1_H__
 
-#include "net/rime.h"
 #include "net/rime/trickle.h"
-#include "net/rime/uabc.h"
-#include "contiki-net.h"
+#include "net/rime/ipolite.h"
 
 struct rudolph1_conn;
 
diff --git a/core/net/rime/rudolph2.h b/core/net/rime/rudolph2.h
index c94180584..77f9bc5c4 100644
--- a/core/net/rime/rudolph2.h
+++ b/core/net/rime/rudolph2.h
@@ -47,7 +47,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rudolph2.h,v 1.2 2007/11/17 18:05:21 adamdunkels Exp $
+ * $Id: rudolph2.h,v 1.3 2007/12/17 09:14:08 adamdunkels Exp $
  */
 
 /**
@@ -60,10 +60,7 @@
 #ifndef __RUDOLPH2_H__
 #define __RUDOLPH2_H__
 
-#include "net/rime.h"
-#include "net/rime/sabc.h"
 #include "net/rime/polite.h"
-#include "contiki-net.h"
 
 struct rudolph2_conn;
 
diff --git a/core/net/rime/trickle.h b/core/net/rime/trickle.h
index 26984ad8e..bf75d9f64 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.4 2007/05/15 08:09:21 adamdunkels Exp $
+ * $Id: trickle.h,v 1.5 2007/12/17 09:14:08 adamdunkels Exp $
  */
 
 /**
@@ -58,7 +58,6 @@
 #ifndef __TRICKLE_H__
 #define __TRICKLE_H__
 
-#include "net/rime.h"
 #include "net/rime/nf.h"
 
 struct trickle_conn;