12 files changed, 14 insertions, 1 deletions
diff --git a/firmware/drivers/audio/tsc2100.c b/firmware/drivers/audio/tsc2100.c
index 88327767df..6479f84b34 100644
--- a/firmware/drivers/audio/tsc2100.c
+++ b/firmware/drivers/audio/tsc2100.c
@@ -26,6 +26,7 @@
 #include "audio.h"
 
 #include "audiohw.h"
+#include "sound.h"
 #include "tsc2100.h"
 
 const struct sound_settings_info audiohw_settings[] = {
diff --git a/firmware/drivers/audio/wm8751.c b/firmware/drivers/audio/wm8751.c
index ca62f69d95..ba94cf4b54 100644
--- a/firmware/drivers/audio/wm8751.c
+++ b/firmware/drivers/audio/wm8751.c
@@ -30,6 +30,7 @@
 #include "audio.h"
 #include "audiohw.h"
 #include "system.h"
+#include "sound.h"
 
 const struct sound_settings_info audiohw_settings[] = {
     [SOUND_VOLUME]        = {"dB", 0,  1, -74,   6, -25},
diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c
index 9db71dea0e..aa78a7710d 100644
--- a/firmware/drivers/audio/wm8758.c
+++ b/firmware/drivers/audio/wm8758.c
@@ -31,6 +31,7 @@
 
 #include "wmcodec.h"
 #include "audiohw.h"
+#include "sound.h"
 
 const struct sound_settings_info audiohw_settings[] = {
     [SOUND_VOLUME]        = {"dB", 0,  1, -90,   6, -25},
diff --git a/firmware/drivers/audio/wm8978.c b/firmware/drivers/audio/wm8978.c
index 5bba19b996..3602bf9cb3 100644
--- a/firmware/drivers/audio/wm8978.c
+++ b/firmware/drivers/audio/wm8978.c
@@ -27,6 +27,7 @@
 #include "audio.h"
 /*#define LOGF_ENABLE*/
 #include "logf.h"
+#include "sound.h"
 
 /* TODO: Define/refine an API for special hardware steps outside the
  * main codec driver such as special GPIO handling. */
diff --git a/firmware/target/arm/as3525/usb-as3525.c b/firmware/target/arm/as3525/usb-as3525.c
index 6c39150c28..ba4cbc4dda 100644
--- a/firmware/target/arm/as3525/usb-as3525.c
+++ b/firmware/target/arm/as3525/usb-as3525.c
@@ -27,6 +27,7 @@
 #include "usb-target.h"
 #include "power.h"
 #include "as3525.h"
+#include "usb_drv.h"
 
 static int usb_status = USB_EXTRACTED;
 
diff --git a/firmware/target/arm/at91sam/lyre_proto1/adc-lyre_proto1.c b/firmware/target/arm/at91sam/lyre_proto1/adc-lyre_proto1.c
index 3734d6d1b1..d3674055ab 100644
--- a/firmware/target/arm/at91sam/lyre_proto1/adc-lyre_proto1.c
+++ b/firmware/target/arm/at91sam/lyre_proto1/adc-lyre_proto1.c
@@ -19,6 +19,8 @@
  *
  ****************************************************************************/
 
+#include "adc.h"
+
 void adc_init(void)
 {
 }
diff --git a/firmware/target/arm/at91sam/lyre_proto1/lcd-lyre_proto1.c b/firmware/target/arm/at91sam/lyre_proto1/lcd-lyre_proto1.c
index 3ace8e791d..258b2052a6 100644
--- a/firmware/target/arm/at91sam/lyre_proto1/lcd-lyre_proto1.c
+++ b/firmware/target/arm/at91sam/lyre_proto1/lcd-lyre_proto1.c
@@ -19,6 +19,8 @@
  *
  ****************************************************************************/
 
+#include "lcd.h"
+
 /* Update the display.
    This must be called after all other LCD functions that change the display */
 void lcd_update(void)
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
index eea4c58e4b..f04a82f643 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
@@ -34,6 +34,7 @@
 #include "wmcodec.h"
 
 #ifdef HAVE_HARDWARE_BEEP
+#include "misc.h"
 static void beep_stop(void);
 #endif
 
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c
index b7b239e3b9..55c742b8b0 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 #include "jz4740.h"
-#include "ata.h"
+#include "nand.h"
 //#include "ata-nand-target.h" /* TODO */
 #include "nand_id.h"
 #include "system.h"
diff --git a/firmware/target/mips/ingenic_jz47xx/i2c-jz4740.c b/firmware/target/mips/ingenic_jz47xx/i2c-jz4740.c
index ec08dd61bb..1cdcb639bc 100644
--- a/firmware/target/mips/ingenic_jz47xx/i2c-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/i2c-jz4740.c
@@ -24,6 +24,7 @@
 #include "system.h"
 #include "jz4740.h"
 #include "logf.h"
+#include "i2c.h"
 
 /*
  * Jz4740 I2C routines.
diff --git a/firmware/target/mips/ingenic_jz47xx/system-jz4740.c b/firmware/target/mips/ingenic_jz47xx/system-jz4740.c
index 588cc16aea..f7df690dd5 100644
--- a/firmware/target/mips/ingenic_jz47xx/system-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/system-jz4740.c
@@ -26,6 +26,7 @@
 #include "panic.h"
 #include "system.h"
 #include "kernel.h"
+#include "power.h"
 
 #define EXTENDED_EXCEPTION_DESC 0
 #if EXTENDED_EXCEPTION_DESC
diff --git a/firmware/target/sh/archos/fm_v2/usb-fm_v2.c b/firmware/target/sh/archos/fm_v2/usb-fm_v2.c
index 5b11d778b6..a272c8b0bd 100644
--- a/firmware/target/sh/archos/fm_v2/usb-fm_v2.c
+++ b/firmware/target/sh/archos/fm_v2/usb-fm_v2.c
@@ -25,6 +25,7 @@
 #include "hwcompat.h"
 #include "system.h"
 #include "usb.h"
+#include "usb-target.h"
 
 int usb_detect(void)
 {