diff --git a/sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c b/sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
index d6dafcbc96..999a54517e 100644
--- a/sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
+++ b/sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
@@ -23,7 +23,7 @@
 
 #include <inttypes.h>
 
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "interrupt_hw.h"
 #include "downlink.h"
diff --git a/sw/airborne/booz/test/booz2_test_crista.c b/sw/airborne/booz/test/booz2_test_crista.c
index aea5246116..9fcf7ed0ce 100644
--- a/sw/airborne/booz/test/booz2_test_crista.c
+++ b/sw/airborne/booz/test/booz2_test_crista.c
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 #include "mcu_periph/uart.h"
diff --git a/sw/airborne/booz/test/booz2_test_gps.c b/sw/airborne/booz/test/booz2_test_gps.c
index 1b68e5cb93..cc88a43224 100644
--- a/sw/airborne/booz/test/booz2_test_gps.c
+++ b/sw/airborne/booz/test/booz2_test_gps.c
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "downlink.h"
 #include "booz_gps.h"
diff --git a/sw/airborne/booz/test/booz2_test_led.c b/sw/airborne/booz/test/booz2_test_led.c
index 6426fa308c..43e84bc2e0 100644
--- a/sw/airborne/booz/test/booz2_test_led.c
+++ b/sw/airborne/booz/test/booz2_test_led.c
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "interrupt_hw.h"
 
diff --git a/sw/airborne/booz/test/booz2_test_max1168.c b/sw/airborne/booz/test/booz2_test_max1168.c
index 31a07ff404..8d155e4c21 100644
--- a/sw/airborne/booz/test/booz2_test_max1168.c
+++ b/sw/airborne/booz/test/booz2_test_max1168.c
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "interrupt_hw.h"
 #include "messages.h"
diff --git a/sw/airborne/booz/test/booz2_test_micromag.c b/sw/airborne/booz/test/booz2_test_micromag.c
index f60463c04b..d8d01ffc0f 100644
--- a/sw/airborne/booz/test/booz2_test_micromag.c
+++ b/sw/airborne/booz/test/booz2_test_micromag.c
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 #include "mcu_periph/uart.h"
diff --git a/sw/airborne/booz/test/booz2_test_modem.c b/sw/airborne/booz/test/booz2_test_modem.c
index 6023e7c42c..d167e673d6 100644
--- a/sw/airborne/booz/test/booz2_test_modem.c
+++ b/sw/airborne/booz/test/booz2_test_modem.c
@@ -23,7 +23,7 @@
 
 #include <inttypes.h>
 
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 #include "interrupt_hw.h"
diff --git a/sw/airborne/booz/test/booz2_test_rc.c b/sw/airborne/booz/test/booz2_test_rc.c
index f8a5a7bb50..6d697a4a8c 100644
--- a/sw/airborne/booz/test/booz2_test_rc.c
+++ b/sw/airborne/booz/test/booz2_test_rc.c
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 #include "mcu_periph/uart.h"
diff --git a/sw/airborne/booz/test/booz2_test_usb.c b/sw/airborne/booz/test/booz2_test_usb.c
index 61954681f9..79c1cce250 100644
--- a/sw/airborne/booz/test/booz2_test_usb.c
+++ b/sw/airborne/booz/test/booz2_test_usb.c
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 
diff --git a/sw/airborne/booz/test/booz2_tunnel_bb.c b/sw/airborne/booz/test/booz2_tunnel_bb.c
index ef845943a6..db0deaa5d3 100644
--- a/sw/airborne/booz/test/booz2_tunnel_bb.c
+++ b/sw/airborne/booz/test/booz2_tunnel_bb.c
@@ -25,7 +25,7 @@
 
 #include "std.h"
 
-#include "init_hw.h"
+#include "mcu.h"
 #include "led.h"
 
 #define TXD0_PIN 0
diff --git a/sw/airborne/booz/test/booz_test_imu.c b/sw/airborne/booz/test/booz_test_imu.c
index c052986a77..63f9e94f71 100644
--- a/sw/airborne/booz/test/booz_test_imu.c
+++ b/sw/airborne/booz/test/booz_test_imu.c
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 #include "mcu_periph/uart.h"
diff --git a/sw/airborne/booz/test/booz_test_telemetry.c b/sw/airborne/booz/test/booz_test_telemetry.c
index 147651487b..dc0312f066 100644
--- a/sw/airborne/booz/test/booz_test_telemetry.c
+++ b/sw/airborne/booz/test/booz_test_telemetry.c
@@ -23,7 +23,7 @@
 
 #include <inttypes.h>
 
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "interrupt_hw.h"
 
diff --git a/sw/airborne/csc/csc_ap_main.c b/sw/airborne/csc/csc_ap_main.c
index d33f5853e1..811ca4adbe 100644
--- a/sw/airborne/csc/csc_ap_main.c
+++ b/sw/airborne/csc/csc_ap_main.c
@@ -28,7 +28,7 @@
 
 #include "std.h"
 
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 #include "interrupt_hw.h"
diff --git a/sw/airborne/csc/csc_baro.c b/sw/airborne/csc/csc_baro.c
index 33e2561b05..22649b4f4a 100644
--- a/sw/airborne/csc/csc_baro.c
+++ b/sw/airborne/csc/csc_baro.c
@@ -1,5 +1,5 @@
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 #include "interrupt_hw.h"
diff --git a/sw/airborne/csc/csc_protocol.c b/sw/airborne/csc/csc_protocol.c
index f3167c7c20..f2027347eb 100644
--- a/sw/airborne/csc/csc_protocol.c
+++ b/sw/airborne/csc/csc_protocol.c
@@ -29,7 +29,7 @@
 #include "mcu_periph/can.h"
 #include "csc_msg_def.h"
 
-// #include "init_hw.h"
+// #include "mcu.h"
 // #include "sys_time.h"
 // #include "downlink.h"
 
diff --git a/sw/airborne/csc/mercury_csc_main.c b/sw/airborne/csc/mercury_csc_main.c
index 45438ee4a5..4c259524a9 100644
--- a/sw/airborne/csc/mercury_csc_main.c
+++ b/sw/airborne/csc/mercury_csc_main.c
@@ -28,7 +28,7 @@
 
 #include "std.h"
 
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 
diff --git a/sw/airborne/csc/mercury_main.c b/sw/airborne/csc/mercury_main.c
index ab5742ee9d..649cec4e7c 100644
--- a/sw/airborne/csc/mercury_main.c
+++ b/sw/airborne/csc/mercury_main.c
@@ -28,7 +28,7 @@
 
 #include "std.h"
 
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 #include "interrupt_hw.h"
diff --git a/sw/airborne/csc/ppm_bridge_main.c b/sw/airborne/csc/ppm_bridge_main.c
index 18abf2bb0e..88d0fc93d4 100644
--- a/sw/airborne/csc/ppm_bridge_main.c
+++ b/sw/airborne/csc/ppm_bridge_main.c
@@ -28,7 +28,7 @@
 
 #include "std.h"
 
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 #include "interrupt_hw.h"
diff --git a/sw/airborne/firmwares/beth/main_beth.c b/sw/airborne/firmwares/beth/main_beth.c
index f5a570ea0c..a3d5fcdb29 100644
--- a/sw/airborne/firmwares/beth/main_beth.c
+++ b/sw/airborne/firmwares/beth/main_beth.c
@@ -1,5 +1,5 @@
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "interrupt_hw.h"
 
diff --git a/sw/airborne/firmwares/beth/main_coders.c b/sw/airborne/firmwares/beth/main_coders.c
index ab6e456a9c..68c8bf9523 100644
--- a/sw/airborne/firmwares/beth/main_coders.c
+++ b/sw/airborne/firmwares/beth/main_coders.c
@@ -1,5 +1,5 @@
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "mcu_periph/can.h"
 #include "sys_time.h"
 #include "downlink.h"
diff --git a/sw/airborne/firmwares/motor_bench/main_turntable.c b/sw/airborne/firmwares/motor_bench/main_turntable.c
index ac6e62d895..1690192f3d 100644
--- a/sw/airborne/firmwares/motor_bench/main_turntable.c
+++ b/sw/airborne/firmwares/motor_bench/main_turntable.c
@@ -1,5 +1,5 @@
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 #include "interrupt_hw.h"
diff --git a/sw/airborne/firmwares/tutorial/main_demo2.c b/sw/airborne/firmwares/tutorial/main_demo2.c
index d4a475eb3c..0ced604473 100644
--- a/sw/airborne/firmwares/tutorial/main_demo2.c
+++ b/sw/airborne/firmwares/tutorial/main_demo2.c
@@ -1,6 +1,6 @@
 
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 
diff --git a/sw/airborne/firmwares/tutorial/main_demo6.c b/sw/airborne/firmwares/tutorial/main_demo6.c
index 126a3fc1fa..62de44936c 100644
--- a/sw/airborne/firmwares/tutorial/main_demo6.c
+++ b/sw/airborne/firmwares/tutorial/main_demo6.c
@@ -1,5 +1,5 @@
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 #include "interrupt_hw.h"
diff --git a/sw/airborne/firmwares/vor/lpc_vor_main.c b/sw/airborne/firmwares/vor/lpc_vor_main.c
index 462a06a045..887ac63210 100644
--- a/sw/airborne/firmwares/vor/lpc_vor_main.c
+++ b/sw/airborne/firmwares/vor/lpc_vor_main.c
@@ -1,5 +1,5 @@
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 #include "interrupt_hw.h"
diff --git a/sw/airborne/firmwares/wind_tunnel/main.c b/sw/airborne/firmwares/wind_tunnel/main.c
index 0288cbac8b..95c67e502a 100644
--- a/sw/airborne/firmwares/wind_tunnel/main.c
+++ b/sw/airborne/firmwares/wind_tunnel/main.c
@@ -1,5 +1,5 @@
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 #include "interrupt_hw.h"
diff --git a/sw/airborne/firmwares/wind_tunnel/main_mb.c b/sw/airborne/firmwares/wind_tunnel/main_mb.c
index f91a366af4..a358ffde77 100644
--- a/sw/airborne/firmwares/wind_tunnel/main_mb.c
+++ b/sw/airborne/firmwares/wind_tunnel/main_mb.c
@@ -1,5 +1,5 @@
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 #include "interrupt_hw.h"
diff --git a/sw/airborne/fms/lpc_test_spi.c b/sw/airborne/fms/lpc_test_spi.c
index 328d836bbc..9cb7a6532c 100644
--- a/sw/airborne/fms/lpc_test_spi.c
+++ b/sw/airborne/fms/lpc_test_spi.c
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "interrupt_hw.h"
 #include "armVIC.h"
diff --git a/sw/airborne/lisa/lisa_stm_gps_passthrough_main.c b/sw/airborne/lisa/lisa_stm_gps_passthrough_main.c
index f6c28b1652..a718ad9a7c 100644
--- a/sw/airborne/lisa/lisa_stm_gps_passthrough_main.c
+++ b/sw/airborne/lisa/lisa_stm_gps_passthrough_main.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "lisa/lisa_overo_link.h"
 #include "lisa/lisa_spistream.h"
diff --git a/sw/airborne/lisa/stm_test_spi_link.c b/sw/airborne/lisa/stm_test_spi_link.c
index 143197ddd3..6aed277afc 100644
--- a/sw/airborne/lisa/stm_test_spi_link.c
+++ b/sw/airborne/lisa/stm_test_spi_link.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "lisa/lisa_overo_link.h"
 
diff --git a/sw/airborne/lisa/test/lisa_test_actuators_mkk.c b/sw/airborne/lisa/test/lisa_test_actuators_mkk.c
index ae6563fdef..bc3e4c8f64 100644
--- a/sw/airborne/lisa/test/lisa_test_actuators_mkk.c
+++ b/sw/airborne/lisa/test/lisa_test_actuators_mkk.c
@@ -22,7 +22,7 @@
  */
 
 
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "booz2_commands.h"
 #include "actuators.h"
diff --git a/sw/airborne/lisa/test/lisa_test_adxl345.c b/sw/airborne/lisa/test/lisa_test_adxl345.c
index 83a2b495fc..6b8c65ca58 100644
--- a/sw/airborne/lisa/test/lisa_test_adxl345.c
+++ b/sw/airborne/lisa/test/lisa_test_adxl345.c
@@ -35,7 +35,7 @@
 #include <stm32/spi.h>
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "downlink.h"
 
diff --git a/sw/airborne/lisa/test/lisa_test_adxl345_dma.c b/sw/airborne/lisa/test/lisa_test_adxl345_dma.c
index 6128313cde..fa74e5018a 100644
--- a/sw/airborne/lisa/test/lisa_test_adxl345_dma.c
+++ b/sw/airborne/lisa/test/lisa_test_adxl345_dma.c
@@ -29,7 +29,7 @@
 #include <stm32/dma.h>
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "downlink.h"
 
diff --git a/sw/airborne/lisa/test/lisa_test_aspirin.c b/sw/airborne/lisa/test/lisa_test_aspirin.c
index 258383fb36..2641273fe2 100644
--- a/sw/airborne/lisa/test/lisa_test_aspirin.c
+++ b/sw/airborne/lisa/test/lisa_test_aspirin.c
@@ -28,7 +28,7 @@
 #include <stm32/spi.h>
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "downlink.h"
 
diff --git a/sw/airborne/lisa/test/lisa_test_max1168.c b/sw/airborne/lisa/test/lisa_test_max1168.c
index c5b04a23cd..38a6cc67bc 100644
--- a/sw/airborne/lisa/test/lisa_test_max1168.c
+++ b/sw/airborne/lisa/test/lisa_test_max1168.c
@@ -29,7 +29,7 @@
 #include <stm32/exti.h>
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "downlink.h"
 #include "peripherals/max1168.h"
diff --git a/sw/airborne/lisa/test/lisa_test_ms2001.c b/sw/airborne/lisa/test/lisa_test_ms2001.c
index ff810e10aa..7fe419587c 100644
--- a/sw/airborne/lisa/test/lisa_test_ms2001.c
+++ b/sw/airborne/lisa/test/lisa_test_ms2001.c
@@ -29,7 +29,7 @@
 #include <stm32/exti.h>
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "downlink.h"
 #include "peripherals/ms2001.h"
diff --git a/sw/airborne/lisa/test/lisa_test_ms2100.c b/sw/airborne/lisa/test/lisa_test_ms2100.c
index 319d18e898..aabd4aa9ed 100644
--- a/sw/airborne/lisa/test/lisa_test_ms2100.c
+++ b/sw/airborne/lisa/test/lisa_test_ms2100.c
@@ -29,7 +29,7 @@
 #include <stm32/exti.h>
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "downlink.h"
 #include "peripherals/ms2100.h"
diff --git a/sw/airborne/lisa/test/lisa_test_sc18is600.c b/sw/airborne/lisa/test/lisa_test_sc18is600.c
index 58aec41367..846e4cab96 100644
--- a/sw/airborne/lisa/test/lisa_test_sc18is600.c
+++ b/sw/airborne/lisa/test/lisa_test_sc18is600.c
@@ -26,7 +26,7 @@
 #include <stm32/misc.h>
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "downlink.h"
 #include "peripherals/sc18is600.h"
diff --git a/sw/airborne/lisa/test/test_bswap.c b/sw/airborne/lisa/test/test_bswap.c
index b1a9cc5bc3..ccf1a9ad33 100644
--- a/sw/airborne/lisa/test/test_bswap.c
+++ b/sw/airborne/lisa/test/test_bswap.c
@@ -1,6 +1,6 @@
 
 #include <inttypes.h>
-#include "init_hw.h"
+#include "mcu.h"
 
 
 #define MyByteSwap16(n)				     \
diff --git a/sw/airborne/lisa/test/test_mc_asctec_v1_simple.c b/sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
index be041919ae..b83160e704 100644
--- a/sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
+++ b/sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
@@ -28,7 +28,7 @@
  */
 
 
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "downlink.h"
 
diff --git a/sw/airborne/lisa/test_csc_servo.c b/sw/airborne/lisa/test_csc_servo.c
index d0fe135f49..7249d89ec4 100644
--- a/sw/airborne/lisa/test_csc_servo.c
+++ b/sw/airborne/lisa/test_csc_servo.c
@@ -22,7 +22,7 @@
  */
 
 
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "csc_msg_def.h"
 #include "csc_protocol.h"
diff --git a/sw/airborne/lisa/test_datalink.c b/sw/airborne/lisa/test_datalink.c
index 3ef1db76a4..ce5a02f314 100644
--- a/sw/airborne/lisa/test_datalink.c
+++ b/sw/airborne/lisa/test_datalink.c
@@ -24,7 +24,7 @@
 #define DATALINK_C
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "downlink.h"
 
diff --git a/sw/airborne/lisa/test_float.c b/sw/airborne/lisa/test_float.c
index 546eacabcb..0339888cac 100644
--- a/sw/airborne/lisa/test_float.c
+++ b/sw/airborne/lisa/test_float.c
@@ -24,7 +24,7 @@
 #include <math.h>
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "downlink.h"
 static inline void main_init( void );
diff --git a/sw/airborne/lisa/test_mc.c b/sw/airborne/lisa/test_mc.c
index 144294f7e2..978c2857d1 100644
--- a/sw/airborne/lisa/test_mc.c
+++ b/sw/airborne/lisa/test_mc.c
@@ -30,7 +30,7 @@
 #include <stm32/i2c.h>
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 
 static inline void main_init( void );
diff --git a/sw/airborne/lisa/test_periodic.c b/sw/airborne/lisa/test_periodic.c
index e88929ce8c..6104c4ad3e 100644
--- a/sw/airborne/lisa/test_periodic.c
+++ b/sw/airborne/lisa/test_periodic.c
@@ -25,7 +25,7 @@
 #include <stm32/misc.h>
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 
 static inline void main_init( void );
diff --git a/sw/airborne/lisa/test_spi_slave.c b/sw/airborne/lisa/test_spi_slave.c
index 9ffd6445ea..d78e32ccdd 100644
--- a/sw/airborne/lisa/test_spi_slave.c
+++ b/sw/airborne/lisa/test_spi_slave.c
@@ -26,7 +26,7 @@
 #include <stm32/spi.h>
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "downlink.h"
 
diff --git a/sw/airborne/lisa/test_spi_slave2.c b/sw/airborne/lisa/test_spi_slave2.c
index f2469b2aae..09bdee54e5 100644
--- a/sw/airborne/lisa/test_spi_slave2.c
+++ b/sw/airborne/lisa/test_spi_slave2.c
@@ -27,7 +27,7 @@
 #include <stm32/dma.h>
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "downlink.h"
 #include "fms/fms_autopilot_msg.h"
diff --git a/sw/airborne/lisa/tunnel_hw.c b/sw/airborne/lisa/tunnel_hw.c
index 02ba9179e5..10741ff5ae 100644
--- a/sw/airborne/lisa/tunnel_hw.c
+++ b/sw/airborne/lisa/tunnel_hw.c
@@ -27,7 +27,7 @@
 #include <stm32/rcc.h>
 
 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
 
diff --git a/sw/airborne/test/nova_test_imu.c b/sw/airborne/test/nova_test_imu.c
index 137613407e..461b51fca4 100644
--- a/sw/airborne/test/nova_test_imu.c
+++ b/sw/airborne/test/nova_test_imu.c
@@ -1,5 +1,5 @@
 #include "std.h"
-#include "init_hw.h"
+#include "mcu.h"
 #include "interrupt_hw.h"
 #include "sys_time.h"
 #include "led.h"