diff --git a/sw/airborne/avr/adc_hw.c b/sw/airborne/avr/adc_hw.c
index 688d20a026..6da48cf60f 100644
--- a/sw/airborne/avr/adc_hw.c
+++ b/sw/airborne/avr/adc_hw.c
@@ -26,6 +26,7 @@
 //// ADC6 MVSERVO
 
 
+#include <avr/signal.h>
 #include <avr/interrupt.h>
 #include <avr/io.h>
 #include "adc.h"
diff --git a/sw/airborne/avr/link_mcu_ap.c b/sw/airborne/avr/link_mcu_ap.c
index 9872a0111a..40c76d00b6 100644
--- a/sw/airborne/avr/link_mcu_ap.c
+++ b/sw/airborne/avr/link_mcu_ap.c
@@ -24,7 +24,8 @@
 
 #include <avr/io.h>
 #include <avr/interrupt.h>
-#include <util/crc16.h>
+//#include <util/crc16.h>
+#include <avr/crc16.h>
 
 #include "inter_mcu.h"
 #include "link_mcu_ap.h"
diff --git a/sw/airborne/avr/ppm_hw.c b/sw/airborne/avr/ppm_hw.c
index b429821038..90ff2d82d8 100644
--- a/sw/airborne/avr/ppm_hw.c
+++ b/sw/airborne/avr/ppm_hw.c
@@ -23,6 +23,7 @@
  *
  */
 
+#include <avr/signal.h>
 #include <avr/interrupt.h>
 #include "ppm.h"
 #include "sys_time.h"
diff --git a/sw/airborne/avr/servos_4017.c b/sw/airborne/avr/servos_4017.c
index 5d96b1340d..7d2bddb132 100644
--- a/sw/airborne/avr/servos_4017.c
+++ b/sw/airborne/avr/servos_4017.c
@@ -25,6 +25,7 @@
 /** Implementation of actuators.h */
 
 #include <avr/io.h>
+#include <avr/signal.h>
 #include <avr/interrupt.h>
 #include "servos_4017.h"
 #include "actuators.h"
diff --git a/sw/airborne/avr/spi_fbw.c b/sw/airborne/avr/spi_fbw.c
index f14fa46c03..f9b1d0a2d6 100644
--- a/sw/airborne/avr/spi_fbw.c
+++ b/sw/airborne/avr/spi_fbw.c
@@ -26,8 +26,10 @@
 
 #include <inttypes.h>
 #include <avr/io.h>
+#include <avr/signal.h>
 #include <avr/interrupt.h>
-#include <util/crc16.h>
+//#include <util/crc16.h>
+#include <avr/crc16.h>
 
 #include "inter_mcu.h"
 #include "spi_fbw.h"
diff --git a/sw/airborne/avr/uart_hw.c b/sw/airborne/avr/uart_hw.c
index a1ad9dba21..3db319fd1d 100644
--- a/sw/airborne/avr/uart_hw.c
+++ b/sw/airborne/avr/uart_hw.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <avr/signal.h>
 #include <avr/interrupt.h>
 #include <avr/io.h>