 +++ b/emb6/inc/apl/rest-engine/rest-engine.h
 @@ -41,7 +41,7 @@
  #define REST_ENGINE_H_
-
-
+ 
+ 
 -#include "clist.h"
 +#include "emb6_clist.h"
  #include "etimer.h"
-
-
+ 
+ 
 diff --git a/emb6/inc/net/ipv6/uip-ds6-route.h b/emb6/inc/net/ipv6/uip-ds6-route.h
 index 000b327..31ed0e9 100644
 --- a/emb6/inc/net/ipv6/uip-ds6-route.h
 +++ b/emb6/inc/net/ipv6/uip-ds6-route.h
 @@ -42,7 +42,7 @@
  #define UIP_DS6_ROUTE_H
-
+ 
  #include "stimer.h"
 -#include "clist.h"
 +#include "emb6_clist.h"
-
+ 
  void uip_ds6_route_init(void);
-
+ 
 diff --git a/emb6/inc/net/rpl/rpl-private.h b/emb6/inc/net/rpl/rpl-private.h
 index 9da5744..5ded041 100644
 --- a/emb6/inc/net/rpl/rpl-private.h
 +++ b/emb6/inc/net/rpl/rpl-private.h
 @@ -39,7 +39,7 @@
-
+ 
  #include "rpl.h"
-
+ 
 -#include "clist.h"
 +#include "emb6_clist.h"
  #include "uip.h"

       buf->file = file;
       buf->line = line;
       buf->time = clock_time();
diff --git a/utils/src/random.c b/utils/src/random.c
index 72f5d12..00aed18 100644
--- a/utils/src/random.c
+++ b/utils/src/random.c
@@ -36,7 +36,7 @@
  */


-#include "random.h"
+#include "emb6_random.h"

 #include <stdlib.h>

diff --git a/utils/src/ringbuffer.c b/utils/src/ringbuffer.c
index 5736f8f..52216c5 100644
--- a/utils/src/ringbuffer.c

@@ -24,7 +24,7 @@
  */
 /*============================================================================*/
 
-#include "ringbuffer.h"
+#include "emb6_ringbuffer.h"
 /**
