diff --git a/firmware/lib/bughal.c b/firmware/lib/bughal.c
index aeea50b..a226aa9 100644
--- a/firmware/lib/bughal.c
+++ b/firmware/lib/bughal.c
@@ -25,11 +25,11 @@ void init_leds(void){
   	return;
 };
 
-void inline led_on(int leds){
+inline void led_on(int leds){
  	PORTC |= leds;
 };
 
-void inline led_off(int leds){
+inline void led_off(int leds){
 	PORTC &= ~leds;
 };
 
@@ -55,7 +55,7 @@ void buzzr_down(){
 	PORTB &= ~(1 << PORTB2);
 };
 
-void inline buzzr_off(){
+inline void buzzr_off(){
 	PORTC &= ~(1 << PORTC5);
 	PORTB &= ~(1 << PORTB2);
 };
diff --git a/firmware/lib/bughal.h b/firmware/lib/bughal.h
index bbcfdd2..e406978 100644
--- a/firmware/lib/bughal.h
+++ b/firmware/lib/bughal.h
@@ -16,11 +16,11 @@ void init_leds(void);
 void led_on(int);
 void led_off(int);
 
-void init_buzzr();
-void buzzr_up();
-void buzzr_down();
-void buzzr_off();
-void buzzr_inv();
+void init_buzzr(void);
+void buzzr_up(void);
+void buzzr_down(void);
+void buzzr_off(void);
+void buzzr_inv(void);
 
 void init_switch(void);
 void init_motor(void);
diff --git a/firmware/lib/synth.c b/firmware/lib/synth.c
index e991e05..2105cab 100644
--- a/firmware/lib/synth.c
+++ b/firmware/lib/synth.c
@@ -17,9 +17,9 @@ enum {
 
 
 static const synth_instrument_t instruments[] = {
-	{ 1<<15, 100, 12 },
-	{ 0, 100, 12 },
-	{ 0, 200, 10 },
+	{ 1<<15, 100, 12, 0 },
+	{ 0, 100, 12, 0 },
+	{ 0, 200, 10, 0 },
 	{ 1<<13, 0, 0, 2 },
 	{ 1<<13, 0, 5, 2 },
 };
diff --git a/firmware/lib/usart.c b/firmware/lib/usart.c
index e0b44a1..4bdda8f 100644
--- a/firmware/lib/usart.c
+++ b/firmware/lib/usart.c
@@ -28,8 +28,8 @@
 
 #define UART_RXBUFSIZE 32
 
-volatile static uint8_t rxbuf0[UART_RXBUFSIZE];
-volatile static uint8_t *volatile rxhead0, *volatile rxtail0;
+static volatile uint8_t rxbuf0[UART_RXBUFSIZE];
+static volatile uint8_t *volatile rxhead0, *volatile rxtail0;
 //volatile uint8_t xon = 0;
 
 
@@ -115,7 +115,7 @@ uint8_t USART0_Getc_nb(uint8_t *c)
 	return 1;
 }
 
-void USART0_crlf(){
+void USART0_crlf(void){
 	USART0_putc(0x0A); //newline
 	USART0_putc(0x0D); //carriage return
 };
diff --git a/firmware/lib/usart.h b/firmware/lib/usart.h
index d0ddebc..51dc351 100644
--- a/firmware/lib/usart.h
+++ b/firmware/lib/usart.h
@@ -27,7 +27,7 @@ void USART0_Init (void);
 void USART0_putc (char c);
 uint8_t USART0_Getc_nb(uint8_t*);
 void USART0_put_uint8(uint8_t);
-void USART0_crlf();
+void USART0_crlf(void);
 void USART0_put_uint16(uint16_t);
 
 #endif
diff --git a/firmware/main.c b/firmware/main.c
index 770085d..a6d9e73 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -52,7 +52,7 @@ static inline void init_pwm(void)
 
 
 
-void click(){
+void click(void){
 	buzzr_up();
 	_delay_ms(1);
 	buzzr_inv();
@@ -69,7 +69,7 @@ void waitr(int min, int max){
 
 };
 
-void ledr(){
+void ledr(void){
 	int i = (rand() % 3);
 	switch(i) {
 		case 0  : led_on(LED_L); break;