11 files changed, 22 insertions, 13 deletions
diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c
index 93ea7c2..9ae7819 100644
--- a/firmware/drivers/audio/wm8758.c
+++ b/firmware/drivers/audio/wm8758.c
@@ -25,7 +25,9 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+
 #include "system.h"
+#include "kernel.h"
 #include "string.h"
 #include "audio.h"
 
diff --git a/firmware/drivers/audio/wm8975.c b/firmware/drivers/audio/wm8975.c
index 931dae9..88be2cf 100644
--- a/firmware/drivers/audio/wm8975.c
+++ b/firmware/drivers/audio/wm8975.c
@@ -25,8 +25,10 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+
 #include "logf.h"
 #include "system.h"
+#include "kernel.h"
 #include "string.h"
 #include "audio.h"
 #include "sound.h"
diff --git a/firmware/target/arm/imx31/debug-imx31.c b/firmware/target/arm/imx31/debug-imx31.c
index 2064a22..ff44f23 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 95f894b..60fcb47 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 2ed6d80..108a6d0 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 e20307d..06c6eca 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 2809644..d2870b4 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 c08b3ac..b12ca13 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 f73a8e6..b730593 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)
diff --git a/firmware/target/arm/pbell/vibe500/button-vibe500.c b/firmware/target/arm/pbell/vibe500/button-vibe500.c
index 54b4d2d..9afc9ee 100644
--- a/firmware/target/arm/pbell/vibe500/button-vibe500.c
+++ b/firmware/target/arm/pbell/vibe500/button-vibe500.c
@@ -21,6 +21,7 @@
  ****************************************************************************/
 
 #include "system.h"
+#include "kernel.h"
 #include "button.h"
 #include "backlight.h"
 #include "powermgmt.h"
diff --git a/lib/rbcodec/test/warble.c b/lib/rbcodec/test/warble.c
index cbecc30..6c8442a 100644
--- a/lib/rbcodec/test/warble.c
+++ b/lib/rbcodec/test/warble.c
@@ -625,13 +625,7 @@ static void ci_logf(const char *fmt, ...)
 }
 #endif
 
-static void ci_yield(void)
-{
-}
-
-static void commit_dcache(void) {}
-static void commit_discard_dcache(void) {}
-static void commit_discard_idcache(void) {}
+static void stub_void_void(void) { }
 
 static struct codec_api ci = {
 
@@ -654,7 +648,7 @@ static struct codec_api ci = {
     ci_should_loop,
 
     ci_sleep,
-    ci_yield,
+    stub_void_void, /* yield */
 
 #if NUM_CORES > 1
     ci_create_thread,
@@ -665,9 +659,9 @@ static struct codec_api ci = {
     ci_semaphore_release,
 #endif
 
-    commit_dcache,
-    commit_discard_dcache,
-    commit_discard_idcache,
+    stub_void_void, /* commit_dcache */
+    stub_void_void, /* commit_discard_dcache */
+    stub_void_void, /* commit_discard_idcache */
 
     /* strings and memory */
     strcpy,