  #include "bsp.h"
 -#include "random.h"
 +#include "emb6_random.h"
-
+ 
  /*------------------------------------------------------------------*/
  #define DEBUG DEBUG_NONE
 diff --git a/emb6/src/net/rpl/rpl-dag.c b/emb6/src/net/rpl/rpl-dag.c

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

 #include "tcpip.h"

@@ -84,7 +84,7 @@ coap_new_transaction(uint16_t mid, uip_ipaddr_t *addr, uint16_t port)
     t->addr = *addr;
     t->port = port;

-    list_add(transactions_list, t); /* list itself makes sure same element is not added twice */
+    emb6_list_add(transactions_list, t); /* list itself makes sure same element is not added twice */
   }

   return t;
diff --git a/emb6/src/apl/er-coap/er-coap.c b/emb6/src/apl/er-coap/er-coap.c
index 40f6874..a8125a2 100644
--- a/emb6/src/apl/er-coap/er-coap.c

 #include "ctimer.h"
-#include "random.h"
+#include "emb6_random.h"
 
 #if NETSTACK_CONF_WITH_IPV6
 #include "uip-ds6.h"
diff --git a/emb6/inc/apl/rest-engine/rest-engine.h b/emb6/inc/apl/rest-engine/rest-engine.h
