7 files changed, 12 insertions, 2 deletions

diff --git a/firmware/target/arm/imx31/debug-imx31.c b/firmware/target/arm/imx31/debug-imx31.c
index 2064a22f63..ff44f234df 100644
--- a/firmware/target/arm/imx31/debug-imx31.c
+++ b/firmware/target/arm/imx31/debug-imx31.c
@@ -18,8 +18,10 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+
 #include "config.h"
 #include "system.h"
+#include "kernel.h"
 #include "string.h"
 #include "button.h"
 #include "lcd.h"
diff --git a/firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c
index 95f894bbce..60fcb4729d 100644
--- a/firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/backlight-gigabeat-s.c
@@ -18,8 +18,10 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+
 #include "config.h"
 #include "system.h"
+#include "kernel.h"
 #include "backlight.h"
 #include "mc13783.h"
 #include "backlight-target.h"
diff --git a/firmware/target/arm/imx31/gigabeat-s/fmradio-i2c-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/fmradio-i2c-gigabeat-s.c
index 2ed6d80afe..108a6d0944 100644
--- a/firmware/target/arm/imx31/gigabeat-s/fmradio-i2c-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/fmradio-i2c-gigabeat-s.c
@@ -19,14 +19,16 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+
 #include "config.h"
 #include "system.h"
+#include "kernel.h"
+#include "thread.h"
 #include "mc13783.h"
 #include "iomuxc-imx31.h"
 #include "gpio-imx31.h"
 #include "i2c-imx31.h"
 #include "fmradio_i2c.h"
-#include "thread.h"
 #include "rds.h"
 #include "tuner.h"
 
diff --git a/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c
index e20307d61e..06c6eca6d4 100644
--- a/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c
@@ -18,11 +18,13 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+
 #ifdef BOOTLOADER
 #include <string.h> /* memset */
 #endif
 #include "config.h"
 #include "system.h"
+#include "kernel.h"
 #include "lcd.h"
 #include "lcd-target.h"
 #include "backlight-target.h"
diff --git a/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c
index 2809644589..d2870b47de 100644
--- a/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c
@@ -18,9 +18,11 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+
 #include <stdlib.h>
 #include "config.h"
 #include "system.h"
+#include "kernel.h"
 #include "thread.h"
 #include "mc13783.h"
 #include "adc.h"
diff --git a/firmware/target/arm/imx31/gigabeat-s/system-target.h b/firmware/target/arm/imx31/gigabeat-s/system-target.h
index c08b3acfed..b12ca13bb5 100644
--- a/firmware/target/arm/imx31/gigabeat-s/system-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/system-target.h
@@ -23,7 +23,6 @@
 
 #include "system-arm.h"
 #include "mmu-arm.h"
-#include "kernel.h"
 
 /* High enough for most tasks but low enough for reduced voltage */
 #define CPUFREQ_DEFAULT     264000000
diff --git a/firmware/target/arm/imx31/i2c-imx31.h b/firmware/target/arm/imx31/i2c-imx31.h
index f73a8e6320..b7305931d1 100644
--- a/firmware/target/arm/imx31/i2c-imx31.h
+++ b/firmware/target/arm/imx31/i2c-imx31.h
@@ -22,6 +22,7 @@
 #define I2C_IMX31_H
 
 #include <stdbool.h>
+#include "semaphore.h"
 
 /* I2C module usage masks */
 #define USE_I2C1_MODULE         (1 << 0)