energest: removed include of energest from contiki.h to avoid circula…

…r dependency

arch/dev/cc1200/cc1200.c

@@ -40,6 +40,7 @@
 #include "net/netstack.h"
 #include "net/packetbuf.h"
 #include "dev/watchdog.h"
+#include "sys/energest.h"
 
 #include "dev/leds.h"
 

arch/dev/cc2420/cc2420.c

@@ -36,6 +36,7 @@
 #include <string.h>
 
 #include "contiki.h"
+#include "sys/energest.h"
 
 #include "dev/leds.h"
 #include "dev/spi.h"

arch/platform/jn516x/dev/micromac-radio.c

@@ -44,6 +44,7 @@
 #include "contiki.h"
 #include "dev/leds.h"
 #include "sys/rtimer.h"
+#include "sys/energest.h"
 #include "net/packetbuf.h"
 #include "net/netstack.h"
 #include "net/mac/framer/frame802154.h"

arch/platform/jn516x/platform.c

@@ -52,6 +52,7 @@
 #include "dev/uart-driver.h"
 
 #include "contiki.h"
+#include "sys/energest.h"
 #include "net/netstack.h"
 
 #include "dev/serial-line.h"

arch/platform/sky/platform.c

@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "contiki.h"
+#include "sys/energest.h"
 #include "cc2420.h"
 #include "dev/ds2411/ds2411.h"
 #include "dev/leds.h"

os/contiki-main.c

@@ -43,6 +43,7 @@
 #include "contiki.h"
 #include "contiki-net.h"
 #include "sys/platform.h"
+#include "sys/energest.h"
 #include "dev/watchdog.h"
 
 #if BUILD_WITH_ORCHESTRA

os/contiki.h

@@ -49,6 +49,4 @@
 
 #include "sys/clock.h"
 
-#include "sys/energest.h"
-
 #endif /* CONTIKI_H_ */

os/sys/energest.c

@@ -37,8 +37,8 @@
  *         Adam Dunkels <[email protected]>
  */
 
-#include "sys/energest.h"
 #include "contiki.h"
+#include "sys/energest.h"
 
 #if ENERGEST_CONF_ON