6 files changed, 12 insertions, 6 deletions

diff --git a/firmware/target/arm/as3525/debug-as3525.c b/firmware/target/arm/as3525/debug-as3525.c
index 514eebd390..ab70f73165 100644
--- a/firmware/target/arm/as3525/debug-as3525.c
+++ b/firmware/target/arm/as3525/debug-as3525.c
@@ -20,10 +20,11 @@
  ****************************************************************************/
 
 #include <stdbool.h>
+#include "system.h"
+#include "kernel.h"
 #include "button.h"
 #include "lcd.h"
 #include "font.h"
-#include "system.h"
 #include "cpu.h"
 #include "pl180.h"
 #include "ascodec.h"
diff --git a/firmware/target/arm/as3525/lcd-fuze.c b/firmware/target/arm/as3525/lcd-fuze.c
index b2033738b6..df4d668ab0 100644
--- a/firmware/target/arm/as3525/lcd-fuze.c
+++ b/firmware/target/arm/as3525/lcd-fuze.c
@@ -19,11 +19,12 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#include "config.h"
 
+#include "config.h"
 #include "cpu.h"
-#include "lcd.h"
 #include "system.h"
+#include "kernel.h"
+#include "lcd.h"
 #include "file.h"
 #include "clock-target.h"
 #include "dbop-as3525.h"
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
index 8244c475fa..1b30e112fd 100644
--- a/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
+++ b/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
@@ -21,6 +21,7 @@
 
 #include "config.h"
 #include "system.h"
+#include "kernel.h"
 #include "button.h"
 #include "backlight.h"
 
diff --git a/firmware/target/arm/pp/system-target.h b/firmware/target/arm/pp/system-target.h
index 84419edd77..742044b7be 100644
--- a/firmware/target/arm/pp/system-target.h
+++ b/firmware/target/arm/pp/system-target.h
@@ -22,9 +22,10 @@
 #ifndef SYSTEM_TARGET_H
 #define SYSTEM_TARGET_H
 
+#include <stdbool.h>
 #include "config.h"
 #include "system-arm.h"
-#include <stdbool.h>
+#include "kernel.h"
 
 /* TODO: This header could be split in 2 */
 
diff --git a/firmware/target/hosted/android/pcm-android.c b/firmware/target/hosted/android/pcm-android.c
index 0608e971a7..23a003ff73 100644
--- a/firmware/target/hosted/android/pcm-android.c
+++ b/firmware/target/hosted/android/pcm-android.c
@@ -22,8 +22,9 @@
 #include <jni.h>
 #include <stdbool.h>
 #define _SYSTEM_WITH_JNI /* for getJavaEnvironment */
-#include <system.h>
 #include <pthread.h>
+#include "system.h"
+#include "kernel.h"
 #include "debug.h"
 #include "pcm.h"
 #include "pcm-internal.h"
diff --git a/firmware/target/hosted/kernel-unix.c b/firmware/target/hosted/kernel-unix.c
index a0167d46c5..e3c492a8cc 100644
--- a/firmware/target/hosted/kernel-unix.c
+++ b/firmware/target/hosted/kernel-unix.c
@@ -26,8 +26,10 @@
 #include <errno.h>
 #include <unistd.h>
 #include <pthread.h>
+
 #include "config.h"
 #include "system.h"
+#include "kernel.h"
 #include "button.h"
 #include "audio.h"
 #include "panic.h"
@@ -165,4 +167,3 @@ void timer_unregister(void)
     timer_delete(timer_tid);
     timer_prio = -1;
 }
-