Fix various reds. Some includes needed fixup.

Change-Id: I4327740bae17054131feb917abdd58846c451988

15 files changed, 20 insertions, 4 deletions

diff --git a/firmware/drivers/audio/wm8731.c b/firmware/drivers/audio/wm8731.c
index 5c1e623a35..18e04618bf 100644
--- a/firmware/drivers/audio/wm8731.c
+++ b/firmware/drivers/audio/wm8731.c
@@ -25,9 +25,11 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+
 #include "config.h"
 #include "logf.h"
 #include "system.h"
+#include "kernel.h"
 #include "string.h"
 
 #include "pcm_sampr.h"
diff --git a/firmware/drivers/audio/wm8751.c b/firmware/drivers/audio/wm8751.c
index 992c932179..7b6a2712e5 100644
--- a/firmware/drivers/audio/wm8751.c
+++ b/firmware/drivers/audio/wm8751.c
@@ -25,6 +25,8 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+
+#include "config.h"
 #include "kernel.h"
 #include "wmcodec.h"
 #include "audio.h"
diff --git a/firmware/drivers/audio/wm8985.c b/firmware/drivers/audio/wm8985.c
index fab7354685..21b2463272 100644
--- a/firmware/drivers/audio/wm8985.c
+++ b/firmware/drivers/audio/wm8985.c
@@ -16,8 +16,10 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+
 #include "logf.h"
 #include "system.h"
+#include "kernel.h"
 #include "string.h"
 #include "audio.h"
 
diff --git a/firmware/load_code.c b/firmware/load_code.c
index d22d6bb3b2..6670a30c96 100644
--- a/firmware/load_code.c
+++ b/firmware/load_code.c
@@ -21,6 +21,7 @@
 
 #include "config.h"
 #include "system.h"
+#include "kernel.h"
 #include "file.h"
 #include "debug.h"
 #include "load_code.h"
diff --git a/firmware/target/arm/i2c-telechips.c b/firmware/target/arm/i2c-telechips.c
index 511bbe8865..84381ddbf0 100644
--- a/firmware/target/arm/i2c-telechips.c
+++ b/firmware/target/arm/i2c-telechips.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "system.h"
+#include "kernel.h"
 #include "i2c.h"
 #include "i2c-target.h"
 
diff --git a/firmware/target/arm/philips/hdd6330/button-hdd6330.c b/firmware/target/arm/philips/hdd6330/button-hdd6330.c
index 75e14e375f..3f662cca4f 100644
--- a/firmware/target/arm/philips/hdd6330/button-hdd6330.c
+++ b/firmware/target/arm/philips/hdd6330/button-hdd6330.c
@@ -19,7 +19,9 @@
  *
  ****************************************************************************/
 
+#include "config.h"
 #include "system.h"
+#include "kernel.h"
 #include "button.h"
 #include "backlight.h"
 #include "powermgmt.h"
diff --git a/firmware/target/arm/pp/ata-pp5020.c b/firmware/target/arm/pp/ata-pp5020.c
index 1fc302a60d..9b3158ecc7 100644
--- a/firmware/target/arm/pp/ata-pp5020.c
+++ b/firmware/target/arm/pp/ata-pp5020.c
@@ -23,6 +23,7 @@
 
 #include <stdbool.h>
 #include "system.h"
+#include "kernel.h"
 #include "ata-driver.h"
 
 void ata_reset() 
diff --git a/firmware/target/arm/pp/system-target.h b/firmware/target/arm/pp/system-target.h
index 742044b7be..d372b65502 100644
--- a/firmware/target/arm/pp/system-target.h
+++ b/firmware/target/arm/pp/system-target.h
@@ -25,7 +25,6 @@
 #include <stdbool.h>
 #include "config.h"
 #include "system-arm.h"
-#include "kernel.h"
 
 /* TODO: This header could be split in 2 */
 
diff --git a/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c b/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c
index 4e6d9718a5..5f1cfc6455 100644
--- a/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/touchscreen-cowond2.c
@@ -20,6 +20,8 @@
  ****************************************************************************/
 
 #include "config.h"
+#include "system.h"
+#include "kernel.h"
 #include "button.h"
 #include "pcf50606.h"
 #include "touchscreen.h"
diff --git a/firmware/target/arm/tcc780x/debug-tcc780x.c b/firmware/target/arm/tcc780x/debug-tcc780x.c
index 658995a2de..fc03871c9c 100644
--- a/firmware/target/arm/tcc780x/debug-tcc780x.c
+++ b/firmware/target/arm/tcc780x/debug-tcc780x.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "cpu.h"
 #include "system.h"
+#include "kernel.h"
 #include "string.h"
 #include "button.h"
 #include "lcd.h"
diff --git a/firmware/target/arm/tcc780x/system-target.h b/firmware/target/arm/tcc780x/system-target.h
index a369c2fb9a..fe66a6eb68 100644
--- a/firmware/target/arm/tcc780x/system-target.h
+++ b/firmware/target/arm/tcc780x/system-target.h
@@ -23,7 +23,6 @@
 
 #include "system-arm.h"
 #include "mmu-arm.h"
-#include "kernel.h" /* TIME_BEFORE */
 
 #define CPUFREQ_DEFAULT 32000000
 #define CPUFREQ_NORMAL  48000000
diff --git a/lib/rbcodec/test/warble.c b/lib/rbcodec/test/warble.c
index 336438374c..cbecc305bf 100644
--- a/lib/rbcodec/test/warble.c
+++ b/lib/rbcodec/test/warble.c
@@ -32,13 +32,13 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "buffering.h" /* TYPE_PACKET_AUDIO */
+#include "kernel.h"
 #include "codecs.h"
 #include "dsp_core.h"
 #include "metadata.h"
 #include "settings.h"
 #include "sound.h"
 #include "tdspeed.h"
-#include "kernel.h"
 #include "platform.h"
 
 /***************** EXPORTED *****************/
diff --git a/lib/rbcodec/test/warble.make b/lib/rbcodec/test/warble.make
index b238a2ed63..108b539931 100644
--- a/lib/rbcodec/test/warble.make
+++ b/lib/rbcodec/test/warble.make
@@ -18,7 +18,9 @@ SRC= $(call preprocess, $(ROOTDIR)/lib/rbcodec/test/SOURCES)
 
 INCLUDES += -I$(ROOTDIR)/lib/rbcodec/test \
         -I$(ROOTDIR)/apps -I$(ROOTDIR)/apps/gui \
-        -I$(ROOTDIR)/firmware/export -I$(ROOTDIR)/firmware/include \
+        -I$(FIRMDIR)/kernel/include \
+    -I$(ROOTDIR)/firmware/export \
+    -I$(ROOTDIR)/firmware/include \
         -I$(ROOTDIR)/firmware/target/hosted \
         -I$(ROOTDIR)/firmware/target/hosted/sdl
 
diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make
index fd8f1e81ff..2ae15903a7 100644
--- a/tools/checkwps/checkwps.make
+++ b/tools/checkwps/checkwps.make
@@ -16,6 +16,7 @@ OTHER_SRC += $(CHECKWPS_SRC)
 
 INCLUDES = -I$(ROOTDIR)/apps/gui \
            -I$(ROOTDIR)/apps/gui/skin_engine \
+           -I$(FIRMDIR)/kernel/include \
            -I$(ROOTDIR)/firmware/export \
            -I$(ROOTDIR)/firmware/include \
            -I$(ROOTDIR)/firmware/target/hosted \
diff --git a/tools/database/database.make b/tools/database/database.make
index 8eae4925d5..970aeb5581 100644
--- a/tools/database/database.make
+++ b/tools/database/database.make
@@ -26,6 +26,7 @@ DATABASE_OBJ = $(call c2obj,$(DATABASE_SRC))
 OTHER_SRC += $(DATABASE_SRC)
 
 INCLUDES += -I$(ROOTDIR)/apps/gui \
+            -I$(FIRMDIR)/kernel/include \
             -I$(ROOTDIR)/firmware/export \
             -I$(ROOTDIR)/firmware/include \
             -I$(ROOTDIR)/apps \