7 files changed, 13 insertions, 8 deletions

diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/adc-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/adc-meg-fx.c
index 806ebc0190..d821de4a30 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/adc-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/adc-meg-fx.c
@@ -20,6 +20,7 @@
  ****************************************************************************/
 #include "cpu.h"
 #include "system.h"
+#include "adc.h"
 #include "adc-target.h"
 #include "kernel.h"
 
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
index 98363f04d4..2f7d57fa57 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
@@ -26,6 +26,7 @@
 #include "power.h"
 #include "panic.h"
 #include "pcf50606.h"
+#include "ata.h"
 #include "ata-target.h"
 #include "backlight-target.h"
 
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
index 69bf922571..9fb2a90c42 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
@@ -47,23 +47,23 @@ bool lcd_enabled(void)
     return lcd_on;
 }
 
-unsigned int LCDBANK(unsigned int address)
+static unsigned int LCDBANK(unsigned int address)
 {
     return ((address >> 22) & 0xff);
 }
 
-unsigned int LCDBASEU(unsigned int address)
+static unsigned int LCDBASEU(unsigned int address)
 {
     return (address & ((1 << 22)-1)) >> 1;
 }
 
-unsigned int LCDBASEL(unsigned int address)
+static unsigned int LCDBASEL(unsigned int address)
 {
     address += 320*240*2;
     return (address & ((1 << 22)-1)) >> 1;
 }
 
-inline void delay_cycles(volatile int delay)
+static inline void delay_cycles(volatile int delay)
 {
     while(delay>0) delay--;
 }
@@ -138,7 +138,7 @@ static void LCD_SPI_send(const unsigned char *array, int count)
     }
 }
 
-void LCD_SPI_setreg(unsigned char reg, unsigned char value)
+static void LCD_SPI_setreg(unsigned char reg, unsigned char value)
 {
     unsigned char regval[] = 
     {
@@ -160,7 +160,7 @@ static void LCD_SPI_SS(bool select)
         GPBDAT&=~0x100;
 }
 
-void LCD_SPI_start(void)
+static void LCD_SPI_start(void)
 {
     s3c_regset(&CLKCON, 0x40000);   /* enable SPI clock */
     LCD_SPI_SS(false);
@@ -171,7 +171,7 @@ void LCD_SPI_start(void)
     LCD_SPI_SS(true);
 }
 
-void LCD_SPI_stop(void)
+static void LCD_SPI_stop(void)
 {
     LCD_SPI_SS(false);
 
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c
index 59d5e56fc2..07e679b9f5 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c
@@ -26,6 +26,7 @@
 #include "logf.h"
 #include "debug.h"
 #include "string.h"
+#include "sc606-meg-fx.h"
 
 #define SLAVE_ADDRESS 0xCC
 
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c
index fd75529c92..2cd545272d 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c
@@ -24,6 +24,7 @@
 #include "kernel.h"
 #include "ata.h"
 #include "usb.h"
+#include "usb-target.h"
 
 #define USB_RST_ASSERT   GPBDAT &= ~(1 << 4)
 #define USB_RST_DEASSERT GPBDAT |=  (1 << 4)
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h
index abac5cf8ce..637d63b955 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h
@@ -21,7 +21,7 @@
 #ifndef USB_TARGET_H
 #define USB_TARGET_H
 
-bool usb_init_device(void);
+void usb_init_device(void);
 void usb_enable(bool on);
 
 #endif
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 ea65e17261..957d58b344 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
@@ -29,6 +29,7 @@
 #include "kernel.h"
 #include "sound.h"
 #include "i2c-meg-fx.h"
+#include "wmcodec.h"
 
 void audiohw_init(void)
 {