diff --git a/sys/auto_init/auto_init.c b/sys/auto_init/auto_init.c
index db4f0f4fbea7a9938b4c4ea7fcd9e50aff7f3cea..0e8dce72b72406d2a0220d6452308591678aca49 100644
--- a/sys/auto_init/auto_init.c
+++ b/sys/auto_init/auto_init.c
@@ -19,6 +19,26 @@
 
 #include "auto_init.h"
 
+#ifdef MODULE_HWTIMER
+#include "hwtimer.h"
+#endif
+
+#ifdef MODULE_SHT11
+#include "sht11.h"
+#endif
+
+#ifdef MODULE_GPIOINT
+#include "gpioint.h"
+#endif
+
+#ifdef MODULE_CC110X
+#include "cc1100-interface.h"
+#endif
+
+#ifdef MODULE_LTC4150
+#include "ltc4150.h"
+#endif
+
 #ifdef MODULE_UART0
 #include "board_uart0.h"
 #endif
diff --git a/sys/include/auto_init.h b/sys/include/auto_init.h
index 66d7b60a310afa85418da4b72a9a11261b68d93e..3b13d5ec87aa9fbfb8db0046e9934724562c1c1f 100644
--- a/sys/include/auto_init.h
+++ b/sys/include/auto_init.h
@@ -22,26 +22,6 @@
 #ifndef AUTO_INIT_H
 #define AUTO_INIT_H
 
-#ifdef MODULE_HWTIMER
-#include "hwtimer.h"
-#endif
-
-#ifdef MODULE_SHT11
-#include "sht11.h"
-#endif
-
-#ifdef MODULE_GPIOINT
-#include "gpioint.h"
-#endif
-
-#ifdef MODULE_CC110X
-#include "cc1100-interface.h"
-#endif
-
-#ifdef MODULE_LTC4150
-#include "ltc4150.h"
-#endif
-
 void auto_init(void);
 
 /** @} */