diff --git a/arch/dev/cc1200/cc1200.c b/arch/dev/cc1200/cc1200.c
index 78f379161..3d9b1befc 100644
--- a/arch/dev/cc1200/cc1200.c
+++ b/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"
 
diff --git a/arch/dev/cc2420/cc2420.c b/arch/dev/cc2420/cc2420.c
index a9f56d8a9..00ec64675 100644
--- a/arch/dev/cc2420/cc2420.c
+++ b/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"
diff --git a/arch/platform/jn516x/dev/micromac-radio.c b/arch/platform/jn516x/dev/micromac-radio.c
index 6e221c72f..c3117c6f8 100644
--- a/arch/platform/jn516x/dev/micromac-radio.c
+++ b/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"
diff --git a/arch/platform/jn516x/platform.c b/arch/platform/jn516x/platform.c
index f1f4ad431..20dabfb61 100644
--- a/arch/platform/jn516x/platform.c
+++ b/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"
diff --git a/arch/platform/sky/platform.c b/arch/platform/sky/platform.c
index 24296653f..b14858d9a 100644
--- a/arch/platform/sky/platform.c
+++ b/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"
diff --git a/os/contiki-main.c b/os/contiki-main.c
index b78138472..a995d5ee5 100644
--- a/os/contiki-main.c
+++ b/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
diff --git a/os/contiki.h b/os/contiki.h
index a929afeba..a964758f4 100644
--- a/os/contiki.h
+++ b/os/contiki.h
@@ -49,6 +49,4 @@
 
 #include "sys/clock.h"
 
-#include "sys/energest.h"
-
 #endif /* CONTIKI_H_ */
diff --git a/os/sys/energest.c b/os/sys/energest.c
index 3fbb8f46f..beaf411bc 100644
--- a/os/sys/energest.c
+++ b/os/sys/energest.c
@@ -37,8 +37,8 @@
  *         Adam Dunkels <adam@sics.se>
  */
 
-#include "sys/energest.h"
 #include "contiki.h"
+#include "sys/energest.h"
 
 #if ENERGEST_CONF_ON