diff --git a/bootloader/gigabeat.c b/bootloader/gigabeat.c
index dcd013e867..c04042cead 100644
--- a/bootloader/gigabeat.c
+++ b/bootloader/gigabeat.c
@@ -20,7 +20,7 @@
 
 char version[] = APPSVERSION;
 
-void go_usb_mode() {
+void go_usb_mode(void) {
   /* Drop into USB mode.  This does not check for disconnection. */
 
     int i;
diff --git a/firmware/target/arm/gigabeat/meg-fx/lcd-meg-fx.c b/firmware/target/arm/gigabeat/meg-fx/lcd-meg-fx.c
index 7c8185d6c8..f193f9806d 100644
--- a/firmware/target/arm/gigabeat/meg-fx/lcd-meg-fx.c
+++ b/firmware/target/arm/gigabeat/meg-fx/lcd-meg-fx.c
@@ -3,6 +3,7 @@
 #include "lcd.h"
 #include "kernel.h"
 #include "system.h"
+#include "string.h"
 
 void lcd_init_device(void);
 void lcd_update_rec(int, int, int, int);
diff --git a/firmware/target/arm/gigabeat/meg-fx/sc606-meg-fx.c b/firmware/target/arm/gigabeat/meg-fx/sc606-meg-fx.c
index b4e55083e3..b0554a8260 100644
--- a/firmware/target/arm/gigabeat/meg-fx/sc606-meg-fx.c
+++ b/firmware/target/arm/gigabeat/meg-fx/sc606-meg-fx.c
@@ -55,7 +55,7 @@ void sc606_i2c_stop(void)
     DELAY;
 }
 
-void sc606_i2c_ack()
+void sc606_i2c_ack(void)
 {
 
     SDA_LO;
@@ -106,7 +106,7 @@ int sc606_i2c_outb(unsigned char byte)
     return sc606_i2c_getack();
 }
 
-unsigned char sc606_i2c_inb()
+unsigned char sc606_i2c_inb(void)
 {
    int i;
    unsigned char byte = 0;
@@ -159,7 +159,7 @@ int sc606_read(unsigned char reg, unsigned char* data)
     return x;
 }
 
-void sc606_init()
+void sc606_init(void)
 {
     /* Set GPB2 (EN) to 1 */
     GPBCON = (GPBCON & ~(3<<4)) | 1<<4;