diff --git a/Makefile.ac b/Makefile.ac
index 4acd281c5b..93e3c50fc1 100644
--- a/Makefile.ac
+++ b/Makefile.ac
@@ -31,27 +31,28 @@ AIRBORNE=sw/airborne
 MESSAGES_XML = $(CONF)/messages.xml
 ACINCLUDE = $(PAPARAZZI_HOME)/var/$(AIRCRAFT)
 AIRCRAFT_CONF_DIR = $(ACINCLUDE)/conf
-AIRFRAME_H=$(ACINCLUDE)/airframe.h
+AC_GENERATED = $(ACINCLUDE)/generated
 
 ifndef PERIODIC_FREQ
 PERIODIC_FREQ = 60
 endif
 
-PERIODIC_H=$(ACINCLUDE)/periodic.h
-RADIO_H=$(ACINCLUDE)/radio.h
-FLIGHT_PLAN_H=$(ACINCLUDE)/flight_plan.h
+AIRFRAME_H=$(AC_GENERATED)/airframe.h
+PERIODIC_H=$(AC_GENERATED)/periodic.h
+RADIO_H=$(AC_GENERATED)/radio.h
+FLIGHT_PLAN_H=$(AC_GENERATED)/flight_plan.h
 FLIGHT_PLAN_XML=$(ACINCLUDE)/flight_plan.xml
-SETTINGS_H=$(ACINCLUDE)/settings.h
+SETTINGS_H=$(AC_GENERATED)/settings.h
 SETTINGS_XMLS=$(patsubst %,$(CONF)/%,$(SETTINGS))
 SETTINGS_XML=$(ACINCLUDE)/settings.xml
 SETTINGS_MODULES=$(ACINCLUDE)/settings_modules.xml
 MAKEFILE_AC=$(ACINCLUDE)/Makefile.ac
 SETTINGS_FILE=$(SETTINGS:settings%=%)
 #TUNING_FILE=$(subst   ,_,$(SETTINGS:settings/%.xml=%)).h
-TUNING_H=$(ACINCLUDE)/tuning.h
+TUNING_H=$(AC_GENERATED)/tuning.h
 SUPERVISION=./paparazzi
 MAKE=make PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME)
-MODULES_H=$(ACINCLUDE)/modules.h
+MODULES_H=$(AC_GENERATED)/modules.h
 MODULES_DIR=$(PAPARAZZI_HOME)/conf/modules/
 AIRCRAFT_MD5=$(AIRCRAFT_CONF_DIR)/aircraft.md5
 
@@ -82,18 +83,21 @@ flight_plan_ac_h : $(FLIGHT_PLAN_H) $(FLIGHT_PLAN_XML)
 makefile_ac: $(MAKEFILE_AC)
 
 $(AIRFRAME_H) : $(CONF)/$(AIRFRAME_XML) $(CONF_XML) $(AIRCRAFT_MD5)
+	$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
 	@echo BUILD $@
 	$(Q)$(TOOLS)/gen_airframe.out $(AC_ID) $(AIRCRAFT) $(MD5SUM) $< > /tmp/airframe.h
 	$(Q)mv /tmp/airframe.h $@
 	$(Q)cp $(CONF)/airframes/airframe.dtd $(AIRCRAFT_CONF_DIR)/airframes
 
 $(RADIO_H) : $(CONF)/$(RADIO) $(CONF_XML) $(TOOLS)/gen_radio.out
+	$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
 	@echo BUILD $@
 	$(Q)$(TOOLS)/gen_radio.out $< > /tmp/radio.h
 	$(Q)mv /tmp/radio.h $@
 	$(Q)cp $< $(AIRCRAFT_CONF_DIR)/radios
 
 $(PERIODIC_H) : $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF_XML) $(CONF)/$(TELEMETRY) $(MAKEFILE_AC)
+	$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
 	@echo BUILD $@
 	$(Q)$(TOOLS)/gen_periodic.out $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF)/$(TELEMETRY) $(PERIODIC_FREQ) > $@
 	$(Q)chmod a+r $@
@@ -101,6 +105,7 @@ $(PERIODIC_H) : $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF_XML) $(CONF)/$(TE
 	$(Q)cp $(CONF)/$(TELEMETRY) $(AIRCRAFT_CONF_DIR)/telemetry
 
 $(FLIGHT_PLAN_H) : $(CONF)/$(FLIGHT_PLAN) $(CONF_XML) $(TOOLS)/gen_flight_plan.out
+	$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
 	@echo BUILD $@
 	$(Q)$(TOOLS)/gen_flight_plan.out $< > /tmp/$(AC_ID)_fp.h
 	$(Q)mv /tmp/$(AC_ID)_fp.h $@
@@ -113,16 +118,19 @@ $(FLIGHT_PLAN_XML) : $(CONF)/$(FLIGHT_PLAN) $(CONF_XML) $(TOOLS)/gen_flight_plan
 	$(Q)chmod a+r $@
 
 $(SETTINGS_H) : $(SETTINGS_XMLS) $(CONF_XML) $(SETTINGS_MODULES) $(TOOLS)/gen_settings.out
+	$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
 	@echo BUILD $@
 	$(Q)$(TOOLS)/gen_settings.out $(SETTINGS_XML) $(SETTINGS_XMLS) $(SETTINGS_MODULES) > $@
 	$(Q)chmod a+r $@
 	$(Q)cp $(SETTINGS_XMLS) $(AIRCRAFT_CONF_DIR)/settings
 
 $(TUNING_H) : $(SETTINGS_XMLS) $(CONF_XML) $(TOOLS)/gen_tuning.out
+	$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
 	@echo BUILD $@
 	$(Q)$(TOOLS)/gen_tuning.out $(SETTINGS_XMLS) > $@
 
 $(MODULES_H) : $(CONF)/$(AIRFRAME_XML) $(TOOLS)/gen_modules.out $(CONF)/modules/*.xml
+	$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
 	@echo BUILD $@
 	$(Q)$(TOOLS)/gen_modules.out $(MODULES_DIR) $(SETTINGS_MODULES) $< > $@
 	$(Q)chmod a+r $@
diff --git a/conf/flight_plans/demo_module.xml b/conf/flight_plans/demo_module.xml
index 107abf5d45..66e7c7c131 100644
--- a/conf/flight_plans/demo_module.xml
+++ b/conf/flight_plans/demo_module.xml
@@ -2,7 +2,7 @@
 
 <flight_plan alt="75" ground_alt="0" lat0="43.46223" lon0="1.27289" max_dist_from_home="1500" name="Demo module" security_height="25">
   <header>
-#include "modules.h"
+#include "generated/modules.h"
 </header>
   <waypoints>
     <waypoint name="HOME" x="0" y="0"/>
diff --git a/conf/simulator/nps/nps_sensors_params_booz2_a1.h b/conf/simulator/nps/nps_sensors_params_booz2_a1.h
index db7b561ba6..89e9f07124 100644
--- a/conf/simulator/nps/nps_sensors_params_booz2_a1.h
+++ b/conf/simulator/nps/nps_sensors_params_booz2_a1.h
@@ -25,7 +25,7 @@
 #ifndef NPS_SENSORS_PARAMS_H
 #define NPS_SENSORS_PARAMS_H
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #if 1
 #define NPS_BODY_TO_IMU_PHI    IMU_BODY_TO_IMU_PHI
diff --git a/conf/simulator/nps/nps_sensors_params_booz2_a1p.h b/conf/simulator/nps/nps_sensors_params_booz2_a1p.h
index d78c10f695..6d5ca25dd1 100644
--- a/conf/simulator/nps/nps_sensors_params_booz2_a1p.h
+++ b/conf/simulator/nps/nps_sensors_params_booz2_a1p.h
@@ -25,7 +25,7 @@
 #ifndef NPS_SENSORS_PARAMS_H
 #define NPS_SENSORS_PARAMS_H
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #if 1
 #define NPS_BODY_TO_IMU_PHI    IMU_BODY_TO_IMU_PHI
diff --git a/sw/airborne/3dmg.c b/sw/airborne/3dmg.c
index 6715e86cf6..eaaa3c6917 100644
--- a/sw/airborne/3dmg.c
+++ b/sw/airborne/3dmg.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #include "std.h"
 #include "3dmg.h"
diff --git a/sw/airborne/Makefile b/sw/airborne/Makefile
index 89d7df0b73..adb2189087 100644
--- a/sw/airborne/Makefile
+++ b/sw/airborne/Makefile
@@ -28,8 +28,6 @@ ACINCLUDE = $(PAPARAZZI_HOME)/var/$(AIRCRAFT)
 
 INCLUDES = -I $(PAPARAZZI_SRC)/sw/include -I $(PAPARAZZI_SRC)/sw/airborne -I $(PAPARAZZI_SRC)/conf/autopilot -I $(PAPARAZZI_SRC)/sw/airborne/arch/$($(TARGET).ARCHDIR) -I $(VARINCLUDE) -I $(ACINCLUDE)
 
-# doesn't seem to be used/needed
-#SRC_ARCH = $(PAPARAZZI_SRC)/sw/airborne/$(ARCHDIR)
 
 ifneq ($(MAKECMDGOALS),clean)
   include $(PAPARAZZI_HOME)/var/$(AIRCRAFT)/Makefile.ac
@@ -49,9 +47,9 @@ $(TARGET).install : warn_conf
 warn_conf :
 	@echo
 	@echo '###########################################################'
-	@grep AIRFRAME_NAME $(ACINCLUDE)/airframe.h
-	@grep RADIO_NAME $(ACINCLUDE)/radio.h
-	@grep FLIGHT_PLAN_NAME $(ACINCLUDE)/flight_plan.h
+	@grep AIRFRAME_NAME $(ACINCLUDE)/generated/airframe.h
+	@grep RADIO_NAME $(ACINCLUDE)/generated/radio.h
+	@grep FLIGHT_PLAN_NAME $(ACINCLUDE)/generated/flight_plan.h
 	@echo '###########################################################'
 	@echo
 
diff --git a/sw/airborne/OSAMNav.h b/sw/airborne/OSAMNav.h
index ee2c61efdb..86528dc341 100644
--- a/sw/airborne/OSAMNav.h
+++ b/sw/airborne/OSAMNav.h
@@ -5,7 +5,7 @@
 #include "nav.h"
 #include "estimator.h"
 #include "autopilot.h"
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 
 struct Point2D {float x; float y;};
 struct Line {float m;float b;float x;};
diff --git a/sw/airborne/agl_vfilter.c b/sw/airborne/agl_vfilter.c
index e0573771e3..1d95b91e84 100644
--- a/sw/airborne/agl_vfilter.c
+++ b/sw/airborne/agl_vfilter.c
@@ -1,7 +1,7 @@
 #include "agl_vfilter.h"
 
 #include BOARD_CONFIG
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "std.h"
 
 /*
diff --git a/sw/airborne/anemotaxis.c b/sw/airborne/anemotaxis.c
index 33576a6cab..3bfc75b610 100644
--- a/sw/airborne/anemotaxis.c
+++ b/sw/airborne/anemotaxis.c
@@ -1,9 +1,9 @@
 #include "anemotaxis.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "estimator.h"
 #include "std.h"
 #include "nav.h"
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 #include "ap_downlink.h"
 #include "chemo_detect.h"
 
diff --git a/sw/airborne/ap_downlink.h b/sw/airborne/ap_downlink.h
index b18ebc4eab..34554c6b87 100644
--- a/sw/airborne/ap_downlink.h
+++ b/sw/airborne/ap_downlink.h
@@ -37,15 +37,15 @@
 
 #include <inttypes.h>
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
 #include "downlink.h"
 
 #include "messages.h"
-#include "periodic.h"
+#include "generated/periodic.h"
 
-//#include "modules.h"
+//#include "generated/modules.h"
 
 #if defined DOWNLINK
 #define Downlink(x) x
diff --git a/sw/airborne/arch/avr/servos_direct_hw.c b/sw/airborne/arch/avr/servos_direct_hw.c
index 4e308d2eea..b29844f12d 100644
--- a/sw/airborne/arch/avr/servos_direct_hw.c
+++ b/sw/airborne/arch/avr/servos_direct_hw.c
@@ -7,7 +7,7 @@
 #include "servos_direct_hw.h"
 #include "std.h"
 #include "actuators.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 void actuators_init ( void ) {
  /* OC3A, OC3B, OC3C outputs    */
diff --git a/sw/airborne/arch/lpc21/micromag_hw.h b/sw/airborne/arch/lpc21/micromag_hw.h
index edbb7fdb36..ab43af16a8 100644
--- a/sw/airborne/arch/lpc21/micromag_hw.h
+++ b/sw/airborne/arch/lpc21/micromag_hw.h
@@ -10,7 +10,7 @@
 #include "ssp_hw.h"
 #include BOARD_CONFIG
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #define MM_DIVISOR_128  2
 #define MM_DIVISOR_256  3
diff --git a/sw/airborne/arch/lpc21/modules/adcs/max11040_hw.h b/sw/airborne/arch/lpc21/modules/adcs/max11040_hw.h
index 1fc96b72d3..76466f3946 100644
--- a/sw/airborne/arch/lpc21/modules/adcs/max11040_hw.h
+++ b/sw/airborne/arch/lpc21/modules/adcs/max11040_hw.h
@@ -6,7 +6,7 @@
 #include "LPC21xx.h"
 #include "interrupt_hw.h"
 #include "ssp_hw.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include BOARD_CONFIG
 
 
diff --git a/sw/airborne/arch/lpc21/modules/sensors/mag_micromag_fw_hw.h b/sw/airborne/arch/lpc21/modules/sensors/mag_micromag_fw_hw.h
index 5ab746fb06..9f9b38e6ae 100644
--- a/sw/airborne/arch/lpc21/modules/sensors/mag_micromag_fw_hw.h
+++ b/sw/airborne/arch/lpc21/modules/sensors/mag_micromag_fw_hw.h
@@ -10,7 +10,7 @@
 #include "spi_hw.h"
 #include BOARD_CONFIG
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #define MM_DIVISOR_128  2
 #define MM_DIVISOR_256  3
diff --git a/sw/airborne/arch/lpc21/peripherals/ms2001_arch.h b/sw/airborne/arch/lpc21/peripherals/ms2001_arch.h
index b6fd335e45..5e04b88317 100644
--- a/sw/airborne/arch/lpc21/peripherals/ms2001_arch.h
+++ b/sw/airborne/arch/lpc21/peripherals/ms2001_arch.h
@@ -10,7 +10,7 @@
 #include "ssp_hw.h"
 #include BOARD_CONFIG
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 
 
diff --git a/sw/airborne/arch/lpc21/servos_4015_MAT_hw.c b/sw/airborne/arch/lpc21/servos_4015_MAT_hw.c
index a528f014c1..cf254ffc59 100644
--- a/sw/airborne/arch/lpc21/servos_4015_MAT_hw.c
+++ b/sw/airborne/arch/lpc21/servos_4015_MAT_hw.c
@@ -29,7 +29,7 @@
 
 #include "actuators.h"
 #include "paparazzi.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 uint8_t servos_4015_idx;
 uint32_t servos_delay = SERVO_REFRESH_TICS;
diff --git a/sw/airborne/arch/lpc21/servos_4015_hw.c b/sw/airborne/arch/lpc21/servos_4015_hw.c
index b52704f162..f36b5e358f 100644
--- a/sw/airborne/arch/lpc21/servos_4015_hw.c
+++ b/sw/airborne/arch/lpc21/servos_4015_hw.c
@@ -1,7 +1,7 @@
 #include "actuators.h"
 #include "armVIC.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "sys_time.h"
 
 
diff --git a/sw/airborne/arch/lpc21/servos_4015_hw_new.c b/sw/airborne/arch/lpc21/servos_4015_hw_new.c
index 4dbd241838..7c25687e9a 100644
--- a/sw/airborne/arch/lpc21/servos_4015_hw_new.c
+++ b/sw/airborne/arch/lpc21/servos_4015_hw_new.c
@@ -1,7 +1,7 @@
 #include "actuators.h"
 #include "armVIC.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "sys_time.h"
 
 
diff --git a/sw/airborne/arch/lpc21/servos_4017_hw.c b/sw/airborne/arch/lpc21/servos_4017_hw.c
index 01574e3437..72022c414e 100644
--- a/sw/airborne/arch/lpc21/servos_4017_hw.c
+++ b/sw/airborne/arch/lpc21/servos_4017_hw.c
@@ -1,7 +1,7 @@
 #include "actuators.h"
 
 #include "paparazzi.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 uint8_t servos_4017_idx;
 
diff --git a/sw/airborne/arch/lpc21/servos_csc.h b/sw/airborne/arch/lpc21/servos_csc.h
index 166ee9333b..f0842a2f2c 100644
--- a/sw/airborne/arch/lpc21/servos_csc.h
+++ b/sw/airborne/arch/lpc21/servos_csc.h
@@ -2,7 +2,7 @@
 #define SERVOS_CSC_H
 
 #include "LPC21xx.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "actuators.h"
 #include "sys_time.h"
 
diff --git a/sw/airborne/arch/lpc21/servos_ppm_hw.c b/sw/airborne/arch/lpc21/servos_ppm_hw.c
index 5ed58e3460..6162f48f9f 100644
--- a/sw/airborne/arch/lpc21/servos_ppm_hw.c
+++ b/sw/airborne/arch/lpc21/servos_ppm_hw.c
@@ -28,7 +28,7 @@
  */
 #include "actuators.h"
 #include "paparazzi.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 uint8_t servos_PPM_idx;
 uint8_t ppm_pulse;
diff --git a/sw/airborne/arch/sim/jsbsim_gps.c b/sw/airborne/arch/sim/jsbsim_gps.c
index 9c857588db..767eda28b6 100644
--- a/sw/airborne/arch/sim/jsbsim_gps.c
+++ b/sw/airborne/arch/sim/jsbsim_gps.c
@@ -5,8 +5,8 @@
 #include <inttypes.h>
 
 /** From airborne/autopilot/ */
-#include "airframe.h"
-#include "flight_plan.h"
+#include "generated/airframe.h"
+#include "generated/flight_plan.h"
 #include "autopilot.h"
 #include "gps.h"
 #include "estimator.h"
diff --git a/sw/airborne/arch/sim/jsbsim_hw.h b/sw/airborne/arch/sim/jsbsim_hw.h
index e3da9ce560..be7a43b4ad 100644
--- a/sw/airborne/arch/sim/jsbsim_hw.h
+++ b/sw/airborne/arch/sim/jsbsim_hw.h
@@ -34,9 +34,9 @@
 #include "estimator.h"
 #include "gps.h"
 #include "traffic_info.h"
-#include "flight_plan.h"
-#include "airframe.h"
-#include "settings.h"
+#include "generated/flight_plan.h"
+#include "generated/airframe.h"
+#include "generated/settings.h"
 #include "nav.h"
 #include "firmwares/fixedwing/stabilization/stabilization_attitude.h"
 #include "firmwares/fixedwing/guidance/guidance_v.h"
diff --git a/sw/airborne/arch/sim/sim_ap.c b/sw/airborne/arch/sim/sim_ap.c
index 40321954f7..c87337eebd 100644
--- a/sw/airborne/arch/sim/sim_ap.c
+++ b/sw/airborne/arch/sim/sim_ap.c
@@ -13,8 +13,8 @@
 #include "estimator.h"
 #include "gps.h"
 #include "traffic_info.h"
-#include "flight_plan.h"
-#include "settings.h"
+#include "generated/flight_plan.h"
+#include "generated/settings.h"
 #include "nav.h"
 #include "firmwares/fixedwing/stabilization/stabilization_attitude.h"
 #include "firmwares/fixedwing/guidance/guidance_v.h"
diff --git a/sw/airborne/arch/sim/sim_gps.c b/sw/airborne/arch/sim/sim_gps.c
index ed1fd2ed5e..6a157d808b 100644
--- a/sw/airborne/arch/sim/sim_gps.c
+++ b/sw/airborne/arch/sim/sim_gps.c
@@ -5,8 +5,8 @@
 #include <inttypes.h>
 
 /** From airborne/autopilot/ */
-#include "airframe.h"
-#include "flight_plan.h"
+#include "generated/airframe.h"
+#include "generated/flight_plan.h"
 #include "autopilot.h"
 #include "gps.h"
 #include "estimator.h"
diff --git a/sw/airborne/arch/sim/sim_ir.c b/sw/airborne/arch/sim/sim_ir.c
index 5005294a94..cbc0306b0c 100644
--- a/sw/airborne/arch/sim/sim_ir.c
+++ b/sw/airborne/arch/sim/sim_ir.c
@@ -7,7 +7,7 @@
 
 #include <inttypes.h>
 #include "infrared.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #include <caml/mlvalues.h>
 
diff --git a/sw/airborne/arch/sim/sim_jsbsim.c b/sw/airborne/arch/sim/sim_jsbsim.c
index ddde9cc059..b830460e5a 100644
--- a/sw/airborne/arch/sim/sim_jsbsim.c
+++ b/sw/airborne/arch/sim/sim_jsbsim.c
@@ -13,8 +13,8 @@
 #include "estimator.h"
 #include "gps.h"
 #include "traffic_info.h"
-#include "flight_plan.h"
-#include "settings.h"
+#include "generated/flight_plan.h"
+#include "generated/settings.h"
 #include "nav.h"
 #include "firmwares/fixedwing/stabilization/stabilization_attitude.h"
 #include "ffirmwares/fixedwing/guidance/guidance_v.h"
diff --git a/sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c b/sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
index 2da7089a8a..f583072488 100644
--- a/sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
+++ b/sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
@@ -23,7 +23,7 @@
 
 #include "subsystems/imu.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 void imu_b2_arch_init(void) {
 
diff --git a/sw/airborne/arch/sim/subsystems/imu/imu_crista_arch.c b/sw/airborne/arch/sim/subsystems/imu/imu_crista_arch.c
index 6adb6271f2..ee07d78462 100644
--- a/sw/airborne/arch/sim/subsystems/imu/imu_crista_arch.c
+++ b/sw/airborne/arch/sim/subsystems/imu/imu_crista_arch.c
@@ -4,7 +4,7 @@
 
 #include "subsystems/imu.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 void imu_crista_arch_init(void) {
 
diff --git a/sw/airborne/boards/booz/baro_board.c b/sw/airborne/boards/booz/baro_board.c
index 84bb346c0f..cc92db4224 100644
--- a/sw/airborne/boards/booz/baro_board.c
+++ b/sw/airborne/boards/booz/baro_board.c
@@ -23,7 +23,7 @@
 
 #include "firmwares/rotorcraft/baro.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "led.h"
 
 /* threshold >0 && <1023 */
diff --git a/sw/airborne/bomb.c b/sw/airborne/bomb.c
index edfc2dae2b..c39b7f11a5 100644
--- a/sw/airborne/bomb.c
+++ b/sw/airborne/bomb.c
@@ -25,8 +25,8 @@
 #include "estimator.h"
 #include "nav.h"
 #include "bomb.h"
-#include "flight_plan.h"
-#include "airframe.h"
+#include "generated/flight_plan.h"
+#include "generated/airframe.h"
 #include "inter_mcu.h"
 
 
diff --git a/sw/airborne/booz/booz2_commands.h b/sw/airborne/booz/booz2_commands.h
index fdc574a3aa..1681eb298b 100644
--- a/sw/airborne/booz/booz2_commands.h
+++ b/sw/airborne/booz/booz2_commands.h
@@ -25,7 +25,7 @@
 #define BOOZ2_COMMANDS_H
 
 #include "paparazzi.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 extern int32_t booz2_commands[COMMANDS_NB];
 extern const int32_t booz2_commands_failsafe[COMMANDS_NB];
diff --git a/sw/airborne/booz/booz2_datalink.c b/sw/airborne/booz/booz2_datalink.c
index c567bcff52..2fae20a594 100644
--- a/sw/airborne/booz/booz2_datalink.c
+++ b/sw/airborne/booz/booz2_datalink.c
@@ -26,9 +26,9 @@
 
 #include "datalink.h"
 
-#include "modules.h"
+#include "generated/modules.h"
 
-#include "settings.h"
+#include "generated/settings.h"
 #include "downlink.h"
 #include "messages.h"
 #include "dl_protocol.h"
diff --git a/sw/airborne/booz/booz_gps.h b/sw/airborne/booz/booz_gps.h
index 4839ecaf3a..addeb62043 100644
--- a/sw/airborne/booz/booz_gps.h
+++ b/sw/airborne/booz/booz_gps.h
@@ -74,7 +74,7 @@ extern bool_t booz_gps_available;
 #define GPS_LINKChAvailable() (FALSE)
 #define GPS_LINKGetch() (TRUE)
 #include "nps_sensors.h"
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 
 static inline void  booz_gps_feed_value() {
   booz_gps_state.ecef_pos.x = sensors.gps.ecef_pos.x * 100.;
diff --git a/sw/airborne/chemotaxis.c b/sw/airborne/chemotaxis.c
index e2865ab1b9..2de26a4afa 100644
--- a/sw/airborne/chemotaxis.c
+++ b/sw/airborne/chemotaxis.c
@@ -1,9 +1,9 @@
 #include "chemotaxis.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "estimator.h"
 #include "std.h"
 #include "nav.h"
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 #include "ap_downlink.h"
 #include "chemo_detect.h"
 
diff --git a/sw/airborne/commands.h b/sw/airborne/commands.h
index 7618ac6caa..a824de01c9 100644
--- a/sw/airborne/commands.h
+++ b/sw/airborne/commands.h
@@ -30,7 +30,7 @@
 #define COMMANDS_H
 
 #include "paparazzi.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 
 extern pprz_t commands[COMMANDS_NB];
diff --git a/sw/airborne/common_nav.c b/sw/airborne/common_nav.c
index 39849409d1..c553a6f0d5 100644
--- a/sw/airborne/common_nav.c
+++ b/sw/airborne/common_nav.c
@@ -24,7 +24,7 @@
 
 #include "common_nav.h"
 #include "estimator.h"
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 #include "gps.h"
 
 float dist2_to_home;
diff --git a/sw/airborne/csc/arm7/buss_twi_blmc_hw.h b/sw/airborne/csc/arm7/buss_twi_blmc_hw.h
index f92766294a..1b7c3d8282 100644
--- a/sw/airborne/csc/arm7/buss_twi_blmc_hw.h
+++ b/sw/airborne/csc/arm7/buss_twi_blmc_hw.h
@@ -5,7 +5,7 @@
 #include "std.h"
 #include "i2c.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #define BUSS_TWI_BLMC_STATUS_IDLE 0
 #define BUSS_TWI_BLMC_STATUS_BUSY 1
diff --git a/sw/airborne/csc/arm7/props_csc.c b/sw/airborne/csc/arm7/props_csc.c
index 6666ec7adc..38263555c7 100644
--- a/sw/airborne/csc/arm7/props_csc.c
+++ b/sw/airborne/csc/arm7/props_csc.c
@@ -1,5 +1,5 @@
 #include "props_csc.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "csc_ap_link.h"
 #include "csc_msg_def.h"
 
diff --git a/sw/airborne/csc/arm7/props_csc.h b/sw/airborne/csc/arm7/props_csc.h
index 6e32079f10..3fafdef242 100644
--- a/sw/airborne/csc/arm7/props_csc.h
+++ b/sw/airborne/csc/arm7/props_csc.h
@@ -1,7 +1,7 @@
 #ifndef PROPS_CSC_H
 #define PROPS_CSC_H
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "firmwares/rotorcraft/actuators.h"
 #include "sys_time.h"
 #include "csc_ap_link.h"
diff --git a/sw/airborne/csc/csc_ap_main.c b/sw/airborne/csc/csc_ap_main.c
index 6ad125ded3..55273d6d65 100644
--- a/sw/airborne/csc/csc_ap_main.c
+++ b/sw/airborne/csc/csc_ap_main.c
@@ -34,8 +34,8 @@
 #include "interrupt_hw.h"
 #include "uart.h"
 #include "downlink.h"
-#include "periodic.h"
-#include "airframe.h"
+#include "generated/periodic.h"
+#include "generated/airframe.h"
 #include "commands.h"
 #include "subsystems/radio_control.h"
 #include "booz/booz2_gps.h"
diff --git a/sw/airborne/csc/csc_datalink.c b/sw/airborne/csc/csc_datalink.c
index d4fd108bcd..04362db411 100644
--- a/sw/airborne/csc/csc_datalink.c
+++ b/sw/airborne/csc/csc_datalink.c
@@ -1,7 +1,7 @@
 #define DATALINK_C
 #include "datalink.h"
 
-#include "settings.h"
+#include "generated/settings.h"
 #include "downlink.h"
 #include "messages.h"
 #include "dl_protocol.h"
diff --git a/sw/airborne/csc/csc_main.c b/sw/airborne/csc/csc_main.c
index 3036b32c27..1bae760ee7 100644
--- a/sw/airborne/csc/csc_main.c
+++ b/sw/airborne/csc/csc_main.c
@@ -34,7 +34,7 @@
 #include "interrupt_hw.h"
 #include "uart.h"
 #include "csc_telemetry.h"
-#include "periodic.h"
+#include "generated/periodic.h"
 #include "downlink.h"
 #include "i2c.h"
 
diff --git a/sw/airborne/csc/csc_servos.c b/sw/airborne/csc/csc_servos.c
index bbe4c3cd2a..1c26a5c95d 100644
--- a/sw/airborne/csc/csc_servos.c
+++ b/sw/airborne/csc/csc_servos.c
@@ -4,7 +4,7 @@
 #include "std.h"
 #include "sys_time.h"
 #include "firmwares/rotorcraft/actuators.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include ACTUATORS
 
 #define CSC_SERVOS_NB 4
diff --git a/sw/airborne/csc/csc_telemetry.h b/sw/airborne/csc/csc_telemetry.h
index c0b6f987cf..592c0754fd 100644
--- a/sw/airborne/csc/csc_telemetry.h
+++ b/sw/airborne/csc/csc_telemetry.h
@@ -31,7 +31,7 @@
 extern uint8_t telemetry_mode_Ap_DefaultChannel;
 
 #include "downlink.h"
-#include "settings.h"
+#include "generated/settings.h"
 
 
 #define PERIODIC_SEND_DL_VALUE(_chan) PeriodicSendDlValue(_chan)
diff --git a/sw/airborne/csc/mercury_ap.h b/sw/airborne/csc/mercury_ap.h
index 324fbb5025..de0ef82d3d 100644
--- a/sw/airborne/csc/mercury_ap.h
+++ b/sw/airborne/csc/mercury_ap.h
@@ -25,7 +25,7 @@
 #ifndef __MERCURY_AP_H__
 #define __MERCURY_AP_H__
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 extern pprz_t mixed_commands[PROPS_NB];
 extern uint8_t props_enable[PROPS_NB];
diff --git a/sw/airborne/csc/mercury_csc_main.c b/sw/airborne/csc/mercury_csc_main.c
index ea1fcd70bb..18f81b3197 100644
--- a/sw/airborne/csc/mercury_csc_main.c
+++ b/sw/airborne/csc/mercury_csc_main.c
@@ -50,7 +50,7 @@
 #include "uart.h"
 #include "csc_telemetry.h"
 
-#include "periodic.h"
+#include "generated/periodic.h"
 #include "downlink.h"
 
 #include "pwm_input.h"
diff --git a/sw/airborne/csc/mercury_main.c b/sw/airborne/csc/mercury_main.c
index 8325a4c81f..637b5bf7c7 100644
--- a/sw/airborne/csc/mercury_main.c
+++ b/sw/airborne/csc/mercury_main.c
@@ -34,8 +34,8 @@
 #include "interrupt_hw.h"
 #include "uart.h"
 #include "downlink.h"
-#include "periodic.h"
-#include "airframe.h"
+#include "generated/periodic.h"
+#include "generated/airframe.h"
 #include "commands.h"
 
 #include "csc_msg_def.h"
diff --git a/sw/airborne/csc/mercury_supervision.h b/sw/airborne/csc/mercury_supervision.h
index e4f86babd9..abb4691514 100644
--- a/sw/airborne/csc/mercury_supervision.h
+++ b/sw/airborne/csc/mercury_supervision.h
@@ -1,7 +1,7 @@
 #ifndef BOOZ2_SUPERVISION_H
 #define BOOZ2_SUPERVISION_H
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 extern pprz_t mercury_supervision_yaw_servo_gain;
 extern pprz_t mercury_supervision_pitch_servo_gain;
diff --git a/sw/airborne/csc/ppm_bridge_main.c b/sw/airborne/csc/ppm_bridge_main.c
index 01e829a75b..b2e1bcff8a 100644
--- a/sw/airborne/csc/ppm_bridge_main.c
+++ b/sw/airborne/csc/ppm_bridge_main.c
@@ -34,8 +34,8 @@
 #include "interrupt_hw.h"
 #include "uart.h"
 #include "downlink.h"
-#include "periodic.h"
-#include "airframe.h"
+#include "generated/periodic.h"
+#include "generated/airframe.h"
 #include "commands.h"
 #include "subsystems/radio_control.h"
 
diff --git a/sw/airborne/datalink.c b/sw/airborne/datalink.c
index 610d94bb4d..29e565e2f5 100644
--- a/sw/airborne/datalink.c
+++ b/sw/airborne/datalink.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include "datalink.h"
 
-#include "modules.h"
+#include "generated/modules.h"
 
 #ifdef TRAFFIC_INFO
 #include "traffic_info.h"
@@ -53,7 +53,7 @@
 
 
 #include "common_nav.h"
-#include "settings.h"
+#include "generated/settings.h"
 #include "latlong.h"
 
 
diff --git a/sw/airborne/discsurvey.c b/sw/airborne/discsurvey.c
index e092566421..9dd9f25135 100644
--- a/sw/airborne/discsurvey.c
+++ b/sw/airborne/discsurvey.c
@@ -1,10 +1,10 @@
 #include "discsurvey.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "estimator.h"
 #include "std.h"
 #include "nav.h"
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 #include "ap_downlink.h"
 
 enum status { UTURN, SEGMENT, DOWNWIND };
diff --git a/sw/airborne/downlink.h b/sw/airborne/downlink.h
index 553bc84691..17052669ed 100644
--- a/sw/airborne/downlink.h
+++ b/sw/airborne/downlink.h
@@ -32,9 +32,9 @@
 
 #include <inttypes.h>
 
-#include "modules.h"
+#include "generated/modules.h"
 #include "messages.h"
-#include "airframe.h" // AC_ID is required
+#include "generated/airframe.h" // AC_ID is required
 
 #if defined SITL
 
diff --git a/sw/airborne/fbw_downlink.h b/sw/airborne/fbw_downlink.h
index 1de2e23513..d4280f8e4d 100644
--- a/sw/airborne/fbw_downlink.h
+++ b/sw/airborne/fbw_downlink.h
@@ -37,8 +37,8 @@
 
 #include <inttypes.h>
 #include "messages.h"
-#include "periodic.h"
-#include "airframe.h"
+#include "generated/periodic.h"
+#include "generated/airframe.h"
 #include "commands.h"
 #include "actuators.h"
 
diff --git a/sw/airborne/firmwares/beth/gps_c.patch b/sw/airborne/firmwares/beth/gps_c.patch
index fafa1a52d5..8fcbf9d486 100644
--- a/sw/airborne/firmwares/beth/gps_c.patch
+++ b/sw/airborne/firmwares/beth/gps_c.patch
@@ -7,8 +7,8 @@
 +#ifndef FMS_PERIODIC_FREQ
  #include "sys_time.h"
 +#endif
- #include "airframe.h"
- #include "periodic.h"
+ #include "generated/airframe.h"
+ #include "generated/periodic.h"
  
 @@ -46,8 +48,15 @@
  #endif
diff --git a/sw/airborne/firmwares/beth/main_overo.c b/sw/airborne/firmwares/beth/main_overo.c
index 82758ef092..6a52bc090a 100644
--- a/sw/airborne/firmwares/beth/main_overo.c
+++ b/sw/airborne/firmwares/beth/main_overo.c
@@ -31,7 +31,7 @@
 #include <event.h>
 
 #include "messages2.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #include "fms_periodic.h"
 #include "fms_debug.h"
diff --git a/sw/airborne/firmwares/beth/overo_gcs_com.c b/sw/airborne/firmwares/beth/overo_gcs_com.c
index 854a778db5..edd87f0fca 100644
--- a/sw/airborne/firmwares/beth/overo_gcs_com.c
+++ b/sw/airborne/firmwares/beth/overo_gcs_com.c
@@ -7,7 +7,7 @@
 #include "messages2.h"
 #include "udp_transport2.h"
 #include "dl_protocol.h"
-#include "settings.h"
+#include "generated/settings.h"
 
 //bill laptop
 //#define GCS_HOST "10.31.4.5"
diff --git a/sw/airborne/firmwares/beth/overo_test_uart.c b/sw/airborne/firmwares/beth/overo_test_uart.c
index b3c78bbdc2..4b9b584a2a 100644
--- a/sw/airborne/firmwares/beth/overo_test_uart.c
+++ b/sw/airborne/firmwares/beth/overo_test_uart.c
@@ -35,7 +35,7 @@
 
 #include "messages2.h"
 //#include "dl_protocol2.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #include "fms_periodic.h"
 #include "fms_debug.h"
diff --git a/sw/airborne/firmwares/beth/rcv_telemetry.c b/sw/airborne/firmwares/beth/rcv_telemetry.c
index 8184a61e51..22d14f6015 100755
--- a/sw/airborne/firmwares/beth/rcv_telemetry.c
+++ b/sw/airborne/firmwares/beth/rcv_telemetry.c
@@ -33,11 +33,11 @@
 #include <string.h>
 #include "datalink.h"
 
-#include "modules.h"
+#include "generated/modules.h"
 
 #include <stdio.h>
 #include "common_nav.h"
-#include "settings.h"
+#include "generated/settings.h"
 #include "latlong.h"
 
 
diff --git a/sw/airborne/firmwares/fixedwing/actuators.h b/sw/airborne/firmwares/fixedwing/actuators.h
index 9485d8191a..50b8069d58 100644
--- a/sw/airborne/firmwares/fixedwing/actuators.h
+++ b/sw/airborne/firmwares/fixedwing/actuators.h
@@ -33,7 +33,7 @@
 #include "paparazzi.h"
 
 /** Defines SetActuatorsFromCommands() macro */
-#include "airframe.h"
+#include "generated/airframe.h"
 
 /** Must be defined by specific hardware implementation */
 extern void actuators_init( void );
diff --git a/sw/airborne/firmwares/fixedwing/autopilot.h b/sw/airborne/firmwares/fixedwing/autopilot.h
index 204146f373..a506f6a29e 100644
--- a/sw/airborne/firmwares/fixedwing/autopilot.h
+++ b/sw/airborne/firmwares/fixedwing/autopilot.h
@@ -116,7 +116,7 @@ extern bool_t power_switch;
 
 
 /* For backward compatibility with old airframe files */
-#include "airframe.h"
+#include "generated/airframe.h"
 #ifndef CONTROL_RATE
 #define CONTROL_RATE 20
 #endif
diff --git a/sw/airborne/firmwares/fixedwing/guidance/guidance_v.c b/sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
index 518e267070..962089d78e 100644
--- a/sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
+++ b/sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
@@ -31,7 +31,7 @@
 #include "firmwares/fixedwing/guidance/guidance_v.h"
 #include "estimator.h"
 #include "nav.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "firmwares/fixedwing/autopilot.h"
 
 /* mode */
diff --git a/sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c b/sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
index 3473a4c83d..4e15561d24 100644
--- a/sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
+++ b/sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
@@ -32,7 +32,7 @@
 #include "firmwares/fixedwing/guidance/guidance_v_n.h"
 #include "estimator.h"
 #include "nav.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "autopilot.h"
 
 /* mode */
diff --git a/sw/airborne/firmwares/fixedwing/main_ap.c b/sw/airborne/firmwares/fixedwing/main_ap.c
index c3fc5019e4..1190cdbda5 100644
--- a/sw/airborne/firmwares/fixedwing/main_ap.c
+++ b/sw/airborne/firmwares/fixedwing/main_ap.c
@@ -47,10 +47,10 @@
 #include "nav.h"
 #include "autopilot.h"
 #include "estimator.h"
-#include "settings.h"
+#include "generated/settings.h"
 #include "link_mcu.h"
 #include "sys_time.h"
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 #include "datalink.h"
 #include "xbee.h"
 
@@ -87,7 +87,7 @@
 
 #define LOW_BATTERY_DECIVOLT (CATASTROPHIC_BAT_LEVEL*10)
 
-#include "modules.h"
+#include "generated/modules.h"
 
 /** FIXME: should be in rc_settings but required by telemetry (ap_downlink.h)*/
 uint8_t rc_settings_mode = 0;
diff --git a/sw/airborne/firmwares/fixedwing/main_fbw.c b/sw/airborne/firmwares/fixedwing/main_fbw.c
index 4528638f9c..d3954ce44d 100644
--- a/sw/airborne/firmwares/fixedwing/main_fbw.c
+++ b/sw/airborne/firmwares/fixedwing/main_fbw.c
@@ -32,7 +32,7 @@
  */
 
 #include "firmwares/fixedwing/main_fbw.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #include "init_hw.h"
 #include "interrupt_hw.h"
diff --git a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
index 41353eb09a..bc8d33725a 100644
--- a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
+++ b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
@@ -34,7 +34,7 @@
 #include "firmwares/fixedwing/stabilization/stabilization_adaptive.h"
 #include "estimator.h"
 #include "nav.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "firmwares/fixedwing/guidance/guidance_v.h"
 #include "autopilot.h"
 
diff --git a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.h b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.h
index c4915364cd..eb084c9811 100644
--- a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.h
+++ b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.h
@@ -34,7 +34,7 @@
 #include <inttypes.h>
 #include "std.h"
 #include "paparazzi.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 extern float h_ctl_roll_sum_err;
 extern float h_ctl_pitch_sum_err;
diff --git a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
index 4469c6c31e..de18d02c61 100644
--- a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
+++ b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
@@ -33,7 +33,7 @@
 #include "led.h"
 #include "estimator.h"
 #include "nav.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "firmwares/fixedwing/guidance/guidance_v.h"
 #include "firmwares/fixedwing/autopilot.h"
 
diff --git a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h
index 59850f5a06..0c68e7bd64 100644
--- a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h
+++ b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h
@@ -34,7 +34,7 @@
 #include <inttypes.h>
 #include "std.h"
 #include "paparazzi.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 /* outer loop parameters */
 extern float h_ctl_course_setpoint; /* rad, CW/north */
diff --git a/sw/airborne/firmwares/motor_bench/main_motor_bench.c b/sw/airborne/firmwares/motor_bench/main_motor_bench.c
index 2e274a1a9d..152fc6f1d3 100644
--- a/sw/airborne/firmwares/motor_bench/main_motor_bench.c
+++ b/sw/airborne/firmwares/motor_bench/main_motor_bench.c
@@ -17,7 +17,7 @@
 #include "messages.h"
 #include "downlink.h"
 
-#include "settings.h"
+#include "generated/settings.h"
 
 #include "adc.h"
 
diff --git a/sw/airborne/firmwares/rotorcraft/actuators/actuators_heli.c b/sw/airborne/firmwares/rotorcraft/actuators/actuators_heli.c
index f3b6ccc1a7..59b3f9538e 100644
--- a/sw/airborne/firmwares/rotorcraft/actuators/actuators_heli.c
+++ b/sw/airborne/firmwares/rotorcraft/actuators/actuators_heli.c
@@ -29,7 +29,7 @@
 #include "firmwares/rotorcraft/actuators/actuators_pwm.h"
 
 /* get SetActuatorsFromCommands() macro */
-#include "airframe.h"
+#include "generated/airframe.h"
 
 /* define the glue between control and SetActuatorsFromCommands */
 #define actuators actuators_pwm_values
diff --git a/sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.h b/sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.h
index 409cd83c44..8b6d821098 100644
--- a/sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.h
+++ b/sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.h
@@ -27,7 +27,7 @@
 #include "std.h"
 #include "i2c.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 
 struct ActuatorsMkk {
diff --git a/sw/airborne/firmwares/rotorcraft/actuators/supervision.h b/sw/airborne/firmwares/rotorcraft/actuators/supervision.h
index 7c48609d3f..e8aa343c0b 100644
--- a/sw/airborne/firmwares/rotorcraft/actuators/supervision.h
+++ b/sw/airborne/firmwares/rotorcraft/actuators/supervision.h
@@ -2,7 +2,7 @@
 #define SUPERVISION_H
 
 #include "std.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 struct Supervision {
   int32_t commands[SUPERVISION_NB_MOTOR];
diff --git a/sw/airborne/firmwares/rotorcraft/autopilot.h b/sw/airborne/firmwares/rotorcraft/autopilot.h
index cb8698ff30..10defb26d0 100644
--- a/sw/airborne/firmwares/rotorcraft/autopilot.h
+++ b/sw/airborne/firmwares/rotorcraft/autopilot.h
@@ -29,7 +29,7 @@
 
 #include "led.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "subsystems/ins.h"
 
 #define AP_MODE_FAILSAFE          0
diff --git a/sw/airborne/firmwares/rotorcraft/battery.h b/sw/airborne/firmwares/rotorcraft/battery.h
index b53a4796d3..41aa171692 100644
--- a/sw/airborne/firmwares/rotorcraft/battery.h
+++ b/sw/airborne/firmwares/rotorcraft/battery.h
@@ -26,7 +26,7 @@
 
 #include "std.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 /* decivolts */
 extern uint8_t battery_voltage;
diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
index d2ff49ef0b..2471d0f3a9 100644
--- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
+++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
@@ -31,7 +31,7 @@
 #include "subsystems/ins.h"
 #include "firmwares/rotorcraft/navigation.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 uint8_t guidance_h_mode;
 
diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h
index 6861767740..1536d9c76b 100644
--- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h
+++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h
@@ -24,7 +24,7 @@
 #ifndef GUIDANCE_H_REF_H
 #define GUIDANCE_H_REF_H
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "inttypes.h"
 #include "math/pprz_algebra.h"
 #include "math/pprz_algebra_int.h"
diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
index dc4a659cf5..dff5047344 100644
--- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
+++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
@@ -35,7 +35,7 @@
 #include "subsystems/ins.h"
 #include "math/pprz_algebra_int.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 uint8_t guidance_v_mode;
 int32_t guidance_v_ff_cmd;
diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
index bcdd473413..1b676645c1 100644
--- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
+++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
@@ -24,7 +24,7 @@
 #ifndef GUIDANCE_V_REF_H
 #define GUIDANCE_V_REF_H
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "inttypes.h"
 #include "math/pprz_algebra.h"
 #include "math/pprz_algebra_int.h"
diff --git a/sw/airborne/firmwares/rotorcraft/main.c b/sw/airborne/firmwares/rotorcraft/main.c
index a9cdf00dde..5f6cd5485d 100644
--- a/sw/airborne/firmwares/rotorcraft/main.c
+++ b/sw/airborne/firmwares/rotorcraft/main.c
@@ -65,7 +65,7 @@
 #include "nps_autopilot_booz.h"
 #endif
 
-#include "modules.h"
+#include "generated/modules.h"
 
 static inline void on_gyro_accel_event( void );
 static inline void on_baro_abs_event( void );
diff --git a/sw/airborne/firmwares/rotorcraft/navigation.c b/sw/airborne/firmwares/rotorcraft/navigation.c
index 84f634ffd5..b742b5da7a 100644
--- a/sw/airborne/firmwares/rotorcraft/navigation.c
+++ b/sw/airborne/firmwares/rotorcraft/navigation.c
@@ -30,8 +30,8 @@
 #include "subsystems/ins.h"
 
 #include "firmwares/rotorcraft/autopilot.h"
-#include "modules.h"
-#include "flight_plan.h"
+#include "generated/modules.h"
+#include "generated/flight_plan.h"
 
 #include "math/pprz_algebra_int.h"
 
diff --git a/sw/airborne/firmwares/rotorcraft/stabilization.h b/sw/airborne/firmwares/rotorcraft/stabilization.h
index 5510e02227..b3c2d2d268 100644
--- a/sw/airborne/firmwares/rotorcraft/stabilization.h
+++ b/sw/airborne/firmwares/rotorcraft/stabilization.h
@@ -26,7 +26,7 @@
 
 #include "std.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #include "firmwares/rotorcraft/stabilization/stabilization_rate.h"
 #include "firmwares/rotorcraft/stabilization/stabilization_attitude.h"
diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
index f9b4de4465..daf738ed93 100644
--- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
+++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
@@ -27,7 +27,7 @@
 #include "subsystems/ahrs.h"
 #include "subsystems/radio_control.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 
 struct FloatAttitudeGains stabilization_gains;
diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
index 8a853551d8..6131aebae6 100644
--- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
+++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
@@ -27,7 +27,7 @@
 
 
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 struct Int32AttitudeGains  stabilization_gains;
 
diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_float.h b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_float.h
index fe8cb92a89..0c78592ae3 100644
--- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_float.h
+++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_float.h
@@ -26,7 +26,7 @@
 
 #include "math/pprz_algebra_float.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 struct FloatAttitudeGains {
     struct FloatVect3  p;
diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_int.h b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_int.h
index cd6d1db2a3..3b86387356 100644
--- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_int.h
+++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_int.h
@@ -26,7 +26,7 @@
 
 #include "math/pprz_algebra_int.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 struct Int32AttitudeGains {
     struct Int32Vect3  p;
diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
index 8502f26e2d..2680feef43 100644
--- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
+++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
@@ -31,7 +31,7 @@
 #include "math/pprz_algebra_float.h"
 #include "math/pprz_algebra_int.h"
 #include "subsystems/ahrs.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 struct FloatAttitudeGains stabilization_gains[STABILIZATION_ATTITUDE_FLOAT_GAIN_NB];
 
diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_float.h b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_float.h
index 305a8e8d0d..36f31cdd97 100644
--- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_float.h
+++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_float.h
@@ -23,7 +23,7 @@
 #ifndef BOOZ_STABILISATION_ATTITUDE_REF_FLOAT_H
 #define BOOZ_STABILISATION_ATTITUDE_REF_FLOAT_H
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 extern struct FloatEulers stab_att_sp_euler;
 extern struct FloatQuat   stab_att_sp_quat;
diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c
index 9c6f91d894..7799d9995b 100644
--- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c
+++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c
@@ -26,7 +26,7 @@
  *
  */
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "firmwares/rotorcraft/stabilization.h"
 #include "subsystems/ahrs.h"
 
diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
index 9c46cbb03b..951eea11bf 100644
--- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
+++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
@@ -28,7 +28,7 @@
 
 #include "subsystems/imu.h"
 #include "subsystems/radio_control.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #define F_UPDATE_RES 9
 #define REF_DOT_FRAC 11
diff --git a/sw/airborne/firmwares/rotorcraft/telemetry.h b/sw/airborne/firmwares/rotorcraft/telemetry.h
index 2349a56655..adca6d09b3 100644
--- a/sw/airborne/firmwares/rotorcraft/telemetry.h
+++ b/sw/airborne/firmwares/rotorcraft/telemetry.h
@@ -759,10 +759,10 @@ extern uint8_t telemetry_mode_Main_DefaultChannel;
 #define PERIODIC_SEND_CAM_TRACK(_chan) {}
 #endif
 
-#include "settings.h"
+#include "generated/settings.h"
 #define PERIODIC_SEND_DL_VALUE(_chan) PeriodicSendDlValue(_chan)
 
-#include "periodic.h"
+#include "generated/periodic.h"
 #define Booz2TelemetryPeriodic() {			\
     PeriodicSendMain(DefaultChannel);			\
   }
diff --git a/sw/airborne/firmwares/tutorial/main_demo5.c b/sw/airborne/firmwares/tutorial/main_demo5.c
index bb9b16fdb6..138fe63b0d 100644
--- a/sw/airborne/firmwares/tutorial/main_demo5.c
+++ b/sw/airborne/firmwares/tutorial/main_demo5.c
@@ -59,7 +59,7 @@ bool_t dl_msg_available;
 #define MSG_SIZE 128
 uint8_t dl_buffer[MSG_SIZE]  __attribute__ ((aligned));
 
-#include "settings.h"
+#include "generated/settings.h"
 
 #define IdOfMsg(x) (x[1])
 
diff --git a/sw/airborne/firmwares/wind_tunnel/main.c b/sw/airborne/firmwares/wind_tunnel/main.c
index 319621e99c..a8f779296a 100644
--- a/sw/airborne/firmwares/wind_tunnel/main.c
+++ b/sw/airborne/firmwares/wind_tunnel/main.c
@@ -9,7 +9,7 @@
 #include "downlink.h"
 
 #include "datalink.h"
-#include "settings.h"
+#include "generated/settings.h"
 #include "dl_protocol.h"
 
 #include "wt_servo.h"
diff --git a/sw/airborne/firmwares/wind_tunnel/main_mb.c b/sw/airborne/firmwares/wind_tunnel/main_mb.c
index 2be7af41e2..48e0403f44 100644
--- a/sw/airborne/firmwares/wind_tunnel/main_mb.c
+++ b/sw/airborne/firmwares/wind_tunnel/main_mb.c
@@ -9,7 +9,7 @@
 #include "downlink.h"
 
 #include "datalink.h"
-#include "settings.h"
+#include "generated/settings.h"
 #include "dl_protocol.h"
 
 #include "i2c.h"
diff --git a/sw/airborne/fms/fms_autopilot_msg.h b/sw/airborne/fms/fms_autopilot_msg.h
index b075926e43..03943029ca 100644
--- a/sw/airborne/fms/fms_autopilot_msg.h
+++ b/sw/airborne/fms/fms_autopilot_msg.h
@@ -5,7 +5,7 @@
 #include "math/pprz_algebra_int.h"
 #include "math/pprz_geodetic_int.h"
 // FIXME: why is including airframe.h needed ?
-//#include "airframe.h"
+//#include "generated/airframe.h"
 //#include "adc.h"
 #define NB_ADC 8
 
diff --git a/sw/airborne/fms/fms_gs_com.c b/sw/airborne/fms/fms_gs_com.c
index d3fca2ae57..10579bcb2b 100644
--- a/sw/airborne/fms/fms_gs_com.c
+++ b/sw/airborne/fms/fms_gs_com.c
@@ -5,7 +5,7 @@
 #include "udp_transport2.h"
 
 /* generated : holds PeriodicSendMain */
-#include "periodic.h"
+#include "generated/periodic.h"
 /* holds the definitions of PERIODIC_SEND_XXX */
 #include "overo_test_passthrough_telemetry.h"
 /* holds the definitions of DOWNLINK_SEND_XXX */
@@ -13,7 +13,7 @@
 
 #include "dl_protocol.h"
 /* generated : holds DlSetting() and PeriodicSendDlValue() */
-#include "settings.h"
+#include "generated/settings.h"
 
 struct FmsGsCom fms_gs_com;
 uint8_t telemetry_mode_Main_DefaultChannel;
diff --git a/sw/airborne/fms/fms_spi_autopilot_msg.c b/sw/airborne/fms/fms_spi_autopilot_msg.c
index e75900ec54..33c0a53ee1 100644
--- a/sw/airborne/fms/fms_spi_autopilot_msg.c
+++ b/sw/airborne/fms/fms_spi_autopilot_msg.c
@@ -40,7 +40,7 @@
 #include "fms/fms_network.h"
 #include "ready_main.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 /* sort of a hack, we're not really fixed wing here but we need their declarations */
 #include "firmwares/fixedwing/actuators.h"
 #include "rdyb_booz_imu.h"
diff --git a/sw/airborne/fms/onboard_transport.h b/sw/airborne/fms/onboard_transport.h
index 6c38c861ee..dab9ee2d56 100644
--- a/sw/airborne/fms/onboard_transport.h
+++ b/sw/airborne/fms/onboard_transport.h
@@ -2,7 +2,7 @@
 #define ONBOARD_TRANSPORT_H
 
 #include "std.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #ifndef MSG_TIMESTAMP
 #define MSG_TIMESTAMP 0
diff --git a/sw/airborne/fms/overo_test_periodic.c b/sw/airborne/fms/overo_test_periodic.c
index 7f71f00ed4..3ce6637739 100644
--- a/sw/airborne/fms/overo_test_periodic.c
+++ b/sw/airborne/fms/overo_test_periodic.c
@@ -12,7 +12,7 @@
 #define DATALINK_PORT         4243
 #define FMS_NETWORK_BROADCAST TRUE
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #include "fms_periodic.h"
 #include "downlink.h"
diff --git a/sw/airborne/fms/udp_transport2.h b/sw/airborne/fms/udp_transport2.h
index 9500b6023a..d3501e2aa4 100644
--- a/sw/airborne/fms/udp_transport2.h
+++ b/sw/airborne/fms/udp_transport2.h
@@ -4,7 +4,7 @@
 #include "fms_network.h"
 #include "fms_debug.h"
 #include "std.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #define STX_UDP_TX  0x98
 #define STX_UDP_RX  0x99
diff --git a/sw/airborne/gps.c b/sw/airborne/gps.c
index ba189dff39..1f196f9a66 100644
--- a/sw/airborne/gps.c
+++ b/sw/airborne/gps.c
@@ -34,8 +34,8 @@
 #ifndef FMS_PERIODIC_FREQ
 #include "sys_time.h"
 #endif
-#include "airframe.h"
-#include "periodic.h"
+#include "generated/airframe.h"
+#include "generated/periodic.h"
 
 #ifdef USE_USB_SERIAL
 #include "usb_serial.h"
diff --git a/sw/airborne/gps_nmea.c b/sw/airborne/gps_nmea.c
index 141d97a918..a8b787551b 100644
--- a/sw/airborne/gps_nmea.c
+++ b/sw/airborne/gps_nmea.c
@@ -42,7 +42,7 @@
 #endif
 
 
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 #include "uart.h"
 #include "gps.h"
 //include "gps_ubx.h"
diff --git a/sw/airborne/gps_ubx.c b/sw/airborne/gps_ubx.c
index 0e8efc5ac9..5a3a5e4192 100644
--- a/sw/airborne/gps_ubx.c
+++ b/sw/airborne/gps_ubx.c
@@ -37,7 +37,7 @@
 #include "fms_serial_port.h"
 #endif
 
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 #include "uart.h"
 #include "gps.h"
 #include "gps_ubx.h"
diff --git a/sw/airborne/gps_xsens.c b/sw/airborne/gps_xsens.c
index b08f114268..3aae822ad6 100644
--- a/sw/airborne/gps_xsens.c
+++ b/sw/airborne/gps_xsens.c
@@ -31,7 +31,7 @@
 
 #include "gps.h"
 #include "sys_time.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #include "uart.h"
 #include "messages.h"
diff --git a/sw/airborne/gyro.c b/sw/airborne/gyro.c
index 3eff353cd1..4982ef69cc 100644
--- a/sw/airborne/gyro.c
+++ b/sw/airborne/gyro.c
@@ -31,7 +31,7 @@
 #include "gyro.h"
 #include "std.h"
 #include "adc.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "estimator.h"
 
 int16_t roll_rate_adc;
diff --git a/sw/airborne/infrared.c b/sw/airborne/infrared.c
index bbd8f733a2..584ae04aad 100644
--- a/sw/airborne/infrared.c
+++ b/sw/airborne/infrared.c
@@ -37,7 +37,7 @@
 #include "estimator.h"
 #include "ap_downlink.h"
 #include "sys_time.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #if defined IR_ESTIMATED_PHI_PI_4 || defined IR_ESTIMATED_PHI_MINUS_PI_4 || defined IR_ESTIMATED_THETA_PI_4
 #error "IR_ESTIMATED_PHI_PI_4 correction has been deprecated. Please remove the definition from your airframe config file"
diff --git a/sw/airborne/infrared.h b/sw/airborne/infrared.h
index 80c4bb4d00..298a70b0cf 100644
--- a/sw/airborne/infrared.h
+++ b/sw/airborne/infrared.h
@@ -26,7 +26,7 @@
 #define INFRARED_H
 
 #include "std.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 extern float ir_roll_neutral; /* Rad */
 extern float ir_pitch_neutral; /* Rad */
diff --git a/sw/airborne/inter_mcu.h b/sw/airborne/inter_mcu.h
index 666f67a3d9..2ed669266d 100644
--- a/sw/airborne/inter_mcu.h
+++ b/sw/airborne/inter_mcu.h
@@ -40,12 +40,12 @@
 #include "std.h"
 
 #include "paparazzi.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "subsystems/radio_control.h"
 #include "firmwares/fixedwing/main_fbw.h"
 
 #ifndef SINGLE_MCU
-#include "radio.h"
+#include "generated/radio.h"
 #define RADIO_CONTROL_NB_CHANNEL RADIO_CTL_NB
 #endif
 
diff --git a/sw/airborne/lisa/lisa_stm_gps_passthrough_main.c b/sw/airborne/lisa/lisa_stm_gps_passthrough_main.c
index c4398f7163..a8fc59c643 100644
--- a/sw/airborne/lisa/lisa_stm_gps_passthrough_main.c
+++ b/sw/airborne/lisa/lisa_stm_gps_passthrough_main.c
@@ -26,7 +26,7 @@
 #include "sys_time.h"
 #include "lisa/lisa_overo_link.h"
 #include "lisa/lisa_spistream.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "uart.h"
 
 static inline void main_init(void);
diff --git a/sw/airborne/lisa/lisa_stm_passthrough_main.c b/sw/airborne/lisa/lisa_stm_passthrough_main.c
index e92f1ba5e3..bc468456df 100644
--- a/sw/airborne/lisa/lisa_stm_passthrough_main.c
+++ b/sw/airborne/lisa/lisa_stm_passthrough_main.c
@@ -35,7 +35,7 @@
 #include "guidance.h"
 #include "navigation.h"
 #include "lisa/lisa_overo_link.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "ahrs.h"
 #ifdef PASSTHROUGH_CYGNUS
 #include "stabilization.h"
diff --git a/sw/airborne/lisa/test/test_board.c b/sw/airborne/lisa/test/test_board.c
index dca59b6f99..efb4088ff1 100644
--- a/sw/airborne/lisa/test/test_board.c
+++ b/sw/airborne/lisa/test/test_board.c
@@ -36,7 +36,7 @@
 #include "uart.h"
 
 #include "datalink.h"
-#include "settings.h"
+#include "generated/settings.h"
 
 #include "lisa/lisa_baro.h"
 #include "actuators/actuators_pwm.h"
diff --git a/sw/airborne/modem.h b/sw/airborne/modem.h
index e0401c51fc..ff76baf053 100644
--- a/sw/airborne/modem.h
+++ b/sw/airborne/modem.h
@@ -33,7 +33,7 @@ extern uint8_t modem_nb_ovrn;
 
 #ifdef MODEM
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "modem_hw.h"
 
 
diff --git a/sw/airborne/modules/cam_control/booz_cam.c b/sw/airborne/modules/cam_control/booz_cam.c
index 34461ccb3f..80f509db57 100644
--- a/sw/airborne/modules/cam_control/booz_cam.c
+++ b/sw/airborne/modules/cam_control/booz_cam.c
@@ -27,7 +27,7 @@
 #include "subsystems/ahrs.h"
 #include "firmwares/rotorcraft/navigation.h"
 #include "subsystems/ins.h"
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 
 uint8_t booz_cam_mode;
 
diff --git a/sw/airborne/modules/cam_control/booz_cam.h b/sw/airborne/modules/cam_control/booz_cam.h
index 8e656d24b6..4e97b33bf8 100644
--- a/sw/airborne/modules/cam_control/booz_cam.h
+++ b/sw/airborne/modules/cam_control/booz_cam.h
@@ -25,7 +25,7 @@
 #ifndef BOOZ_CAM_H
 #define BOOZ_CAM_H
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "std.h"
 #include "led.h"
 
diff --git a/sw/airborne/modules/cam_control/cam.c b/sw/airborne/modules/cam_control/cam.c
index 56cd07a5b7..6da22201ff 100644
--- a/sw/airborne/modules/cam_control/cam.c
+++ b/sw/airborne/modules/cam_control/cam.c
@@ -30,7 +30,7 @@
 #include "cam.h"
 #include "common_nav.h"
 #include "autopilot.h"
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 #include "estimator.h"
 #include "traffic_info.h"
 #ifdef POINT_CAM
diff --git a/sw/airborne/modules/cam_control/cam_roll.c b/sw/airborne/modules/cam_control/cam_roll.c
index feab0bf050..b93d1bbccc 100644
--- a/sw/airborne/modules/cam_control/cam_roll.c
+++ b/sw/airborne/modules/cam_control/cam_roll.c
@@ -30,7 +30,7 @@
 #include "cam.h"
 #include "nav.h"
 #include "autopilot.h"
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 #include "estimator.h"
 #include "inter_mcu.h"
 #include "nav.h"
diff --git a/sw/airborne/modules/deploy_sonar_buoy/deploy_sonar_buoy.c b/sw/airborne/modules/deploy_sonar_buoy/deploy_sonar_buoy.c
index 4e0b788c64..df41a426b7 100644
--- a/sw/airborne/modules/deploy_sonar_buoy/deploy_sonar_buoy.c
+++ b/sw/airborne/modules/deploy_sonar_buoy/deploy_sonar_buoy.c
@@ -23,7 +23,7 @@
 #include <stm32/gpio.h>
 #include <stm32/rcc.h>
 #include "deploy_sonar_buoy.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 /* simple module to toggle two gpio pins on Lisa.
  * The application in this was written for drops
diff --git a/sw/airborne/modules/digital_cam/dc.h b/sw/airborne/modules/digital_cam/dc.h
index 95e50be693..9d5bb6e063 100644
--- a/sw/airborne/modules/digital_cam/dc.h
+++ b/sw/airborne/modules/digital_cam/dc.h
@@ -52,7 +52,7 @@
 
 #include "std.h"
 #include "led.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "estimator.h"
 #include "gps.h"
 
diff --git a/sw/airborne/modules/drop/booz_drop.c b/sw/airborne/modules/drop/booz_drop.c
index 005601b627..2e2ba6c4d8 100644
--- a/sw/airborne/modules/drop/booz_drop.c
+++ b/sw/airborne/modules/drop/booz_drop.c
@@ -23,7 +23,7 @@
 
 #include "booz_drop.h"
 #include "booz2_pwm_hw.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 bool_t booz_drop_ball;
 int16_t booz_drop_servo;
diff --git a/sw/airborne/modules/gsm/gsm.c b/sw/airborne/modules/gsm/gsm.c
index 451b5d1d46..7d4d4e26d5 100644
--- a/sw/airborne/modules/gsm/gsm.c
+++ b/sw/airborne/modules/gsm/gsm.c
@@ -73,7 +73,7 @@ Receiving:
 #include "autopilot.h"
 #include "estimator.h"
 #include "common_nav.h"
-#include "settings.h"
+#include "generated/settings.h"
 
 #ifndef GSM_LINK
 #define GSM_LINK Uart3100
diff --git a/sw/airborne/modules/ins/ins_osam_ugear.c b/sw/airborne/modules/ins/ins_osam_ugear.c
index e56df47d51..d31c03fdb5 100644
--- a/sw/airborne/modules/ins/ins_osam_ugear.c
+++ b/sw/airborne/modules/ins/ins_osam_ugear.c
@@ -35,7 +35,7 @@
 #include "gps_ubx.h"
 #include "latlong.h"
 #include "sys_time.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "nav.h"
 #include "estimator.h"
 #include "xsens_protocol.h"
diff --git a/sw/airborne/modules/ins/ins_vn100.c b/sw/airborne/modules/ins/ins_vn100.c
index ba7963db1f..ba36debbdd 100644
--- a/sw/airborne/modules/ins/ins_vn100.c
+++ b/sw/airborne/modules/ins/ins_vn100.c
@@ -28,7 +28,7 @@
 
 #include "ins_vn100.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "led.h"
 
 #include "downlink.h"
diff --git a/sw/airborne/modules/ins/ins_xsens.c b/sw/airborne/modules/ins/ins_xsens.c
index 9c87e2eaf5..49a053b314 100644
--- a/sw/airborne/modules/ins/ins_xsens.c
+++ b/sw/airborne/modules/ins/ins_xsens.c
@@ -30,7 +30,7 @@
 
 #include <inttypes.h>
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #include "downlink.h"
 #include "messages.h"
diff --git a/sw/airborne/modules/multi/formation.c b/sw/airborne/modules/multi/formation.c
index 1f74b59de7..1bce893c59 100644
--- a/sw/airborne/modules/multi/formation.c
+++ b/sw/airborne/modules/multi/formation.c
@@ -17,8 +17,8 @@
 #include "firmwares/fixedwing/guidance/guidance_v.h"
 #include "autopilot.h"
 #include "gps.h"
-#include "flight_plan.h"
-#include "airframe.h"
+#include "generated/flight_plan.h"
+#include "generated/airframe.h"
 #include "dl_protocol.h"
 
 #include <stdio.h>
diff --git a/sw/airborne/modules/multi/potential.c b/sw/airborne/modules/multi/potential.c
index c7a3f1eea8..cd6ae6a8b6 100644
--- a/sw/airborne/modules/multi/potential.c
+++ b/sw/airborne/modules/multi/potential.c
@@ -17,7 +17,7 @@
 #include "firmwares/fixedwing/guidance/guidance_v.h"
 #include "autopilot.h"
 #include "gps.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 //#include <stdio.h>
 
diff --git a/sw/airborne/modules/multi/tcas.c b/sw/airborne/modules/multi/tcas.c
index 7b2e239ce2..5a92c8885f 100644
--- a/sw/airborne/modules/multi/tcas.c
+++ b/sw/airborne/modules/multi/tcas.c
@@ -28,11 +28,11 @@
  */
 
 #include "multi/tcas.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "estimator.h"
 #include "nav.h"
 #include "gps.h"
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 
 #include "messages.h"
 #include "downlink.h"
diff --git a/sw/airborne/modules/sensors/airspeed_adc.c b/sw/airborne/modules/sensors/airspeed_adc.c
index 276274ca3a..d554246d24 100644
--- a/sw/airborne/modules/sensors/airspeed_adc.c
+++ b/sw/airborne/modules/sensors/airspeed_adc.c
@@ -23,7 +23,7 @@
 #include "sensors/airspeed_adc.h"
 #include "adc.h"
 #include BOARD_CONFIG
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "estimator.h"
 
 uint16_t adc_airspeed_val;
diff --git a/sw/airborne/modules/sensors/infrared_i2c.h b/sw/airborne/modules/sensors/infrared_i2c.h
index 034ac5752a..2b91acfb22 100644
--- a/sw/airborne/modules/sensors/infrared_i2c.h
+++ b/sw/airborne/modules/sensors/infrared_i2c.h
@@ -28,7 +28,7 @@
 #define INFRARED_I2C_H
 
 #include "std.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "infrared.h"
 #include "i2c.h"
 
diff --git a/sw/airborne/modules/servo_switch/servo_switch.c b/sw/airborne/modules/servo_switch/servo_switch.c
index cb63232846..2d90ae53e6 100644
--- a/sw/airborne/modules/servo_switch/servo_switch.c
+++ b/sw/airborne/modules/servo_switch/servo_switch.c
@@ -22,7 +22,7 @@
  */
 
 #include "servo_switch/servo_switch.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "actuators.h"
 
 bool_t servo_switch_on;
diff --git a/sw/airborne/modules/vehicle_interface/vi.c b/sw/airborne/modules/vehicle_interface/vi.c
index 8a0e6ccf34..94c53cf09a 100644
--- a/sw/airborne/modules/vehicle_interface/vi.c
+++ b/sw/airborne/modules/vehicle_interface/vi.c
@@ -27,7 +27,7 @@
 #include "subsystems/ahrs.h"
 #include "booz/booz_gps.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 struct VehicleInterface vi;
 
diff --git a/sw/airborne/nav.c b/sw/airborne/nav.c
index 8bf5714827..f1ae2f0387 100644
--- a/sw/airborne/nav.c
+++ b/sw/airborne/nav.c
@@ -257,7 +257,7 @@ static inline bool_t compute_TOD(uint8_t _af, uint8_t _td, uint8_t _tod, float g
 }
 
 
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 
 
 #ifndef LINE_START_FUNCTION
diff --git a/sw/airborne/nav_cube.c b/sw/airborne/nav_cube.c
index 004d944d2b..2db1f53a37 100644
--- a/sw/airborne/nav_cube.c
+++ b/sw/airborne/nav_cube.c
@@ -27,10 +27,10 @@
  *
  */
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "nav_cube.h"
 #include "nav.h"
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 
 int32_t cube_alpha;
 int32_t cube_size_x, cube_size_y, cube_size_z;
diff --git a/sw/airborne/nav_line.c b/sw/airborne/nav_line.c
index 14b7284cb4..dc18c7730d 100644
--- a/sw/airborne/nav_line.c
+++ b/sw/airborne/nav_line.c
@@ -27,7 +27,7 @@
  *
  */
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "nav_line.h"
 #include "nav.h"
 
diff --git a/sw/airborne/nav_survey_rectangle.c b/sw/airborne/nav_survey_rectangle.c
index 1b50b5d773..e202530733 100644
--- a/sw/airborne/nav_survey_rectangle.c
+++ b/sw/airborne/nav_survey_rectangle.c
@@ -11,7 +11,7 @@ static survey_orientation_t survey_orientation = NS;
 #define SurveyGoingEast() ((survey_orientation == WE) && (survey_to.x > survey_from.x))
 #define SurveyGoingWest() ((survey_orientation == WE) && (survey_to.x < survey_from.x))
 
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 
 #ifndef LINE_START_FUNCTION
 #define LINE_START_FUNCTION {}
diff --git a/sw/airborne/rc_settings.c b/sw/airborne/rc_settings.c
index e452b94fe1..02095a24eb 100644
--- a/sw/airborne/rc_settings.c
+++ b/sw/airborne/rc_settings.c
@@ -26,7 +26,7 @@
 
 #include <inttypes.h>
 #include "rc_settings.h"
-#include "radio.h"
+#include "generated/radio.h"
 #include "autopilot.h"
 #include "infrared.h"
 #include "nav.h"
@@ -44,7 +44,7 @@
 #define RcChannel(x) (fbw_state->channels[x])
 
 /** Includes generated code from tuning_rc.xml */
-#include "settings.h"
+#include "generated/settings.h"
 
 
 void rc_settings(bool_t mode_changed __attribute__ ((unused))) {
diff --git a/sw/airborne/rc_settings.h b/sw/airborne/rc_settings.h
index b8680e6665..0cbd78de78 100644
--- a/sw/airborne/rc_settings.h
+++ b/sw/airborne/rc_settings.h
@@ -40,7 +40,7 @@
 #if defined RADIO_CALIB && defined RADIO_CONTROL_SETTINGS
 
 #include "std.h"
-#include "radio.h"
+#include "generated/radio.h"
 
 #define RC_SETTINGS_MODE_NONE      0
 #define RC_SETTINGS_MODE_DOWN      1
diff --git a/sw/airborne/sd_card/main.c b/sw/airborne/sd_card/main.c
index 7335abe956..5be480f5f7 100644
--- a/sw/airborne/sd_card/main.c
+++ b/sw/airborne/sd_card/main.c
@@ -9,7 +9,7 @@
 #include "downlink.h"
 
 #include "datalink.h"
-#include "settings.h"
+#include "generated/settings.h"
 #include "dl_protocol.h"
 
 #include "spi.h"
diff --git a/sw/airborne/setup_actuators.c b/sw/airborne/setup_actuators.c
index c4c091b1ce..9c8afa4f32 100644
--- a/sw/airborne/setup_actuators.c
+++ b/sw/airborne/setup_actuators.c
@@ -5,14 +5,14 @@
 #include "led.h"
 #include "firmwares/fixedwing/actuators.h"
 //#include "actuators.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #define DATALINK_C
 #include "datalink.h"
 #include "uart.h"
 #include "pprz_transport.h"
 #include "firmwares/fixedwing/main_fbw.h"
 #include "downlink.h"
-#include "settings.h"
+#include "generated/settings.h"
 
 
 #define IdOfMsg(x) (x[1])
diff --git a/sw/airborne/snav.c b/sw/airborne/snav.c
index c30df19b73..a344b38fd9 100644
--- a/sw/airborne/snav.c
+++ b/sw/airborne/snav.c
@@ -2,7 +2,7 @@
    segment (from wp_rd to wp_ta) and a second arc (around wp_ca) */
 
 #include <math.h>
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "snav.h"
 #include "estimator.h"
 #include "nav.h"
diff --git a/sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c b/sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
index 90e8823e4a..1b03e931f9 100644
--- a/sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
+++ b/sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
@@ -29,7 +29,7 @@
 #include "math/pprz_algebra_float.h"
 #include "math/pprz_algebra_int.h"
 #include "math/pprz_simple_matrix.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #include <string.h>
 
diff --git a/sw/airborne/subsystems/ahrs/ahrs_float_lkf.c b/sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
index d0bb10a281..50e2c6f6df 100644
--- a/sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
+++ b/sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
@@ -27,7 +27,7 @@
 #include "subsystems/imu.h"
 #include "subsystems/ahrs/ahrs_aligner.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "math/pprz_algebra_float.h"
 
 #include <stdio.h>
diff --git a/sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c b/sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
index 546159d568..222673709e 100644
--- a/sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
+++ b/sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
@@ -28,7 +28,7 @@
 #include "math/pprz_trig_int.h"
 #include "math/pprz_algebra_int.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 struct AhrsIntCmplEuler ahrs_impl;
 
diff --git a/sw/airborne/subsystems/imu.c b/sw/airborne/subsystems/imu.c
index bca91ac37a..b41aeaa53f 100644
--- a/sw/airborne/subsystems/imu.c
+++ b/sw/airborne/subsystems/imu.c
@@ -23,7 +23,7 @@
 
 #include "subsystems/imu.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 struct Imu imu;
 
diff --git a/sw/airborne/subsystems/imu/imu_aspirin.h b/sw/airborne/subsystems/imu/imu_aspirin.h
index d5046c1a3e..ea13d0a6d8 100644
--- a/sw/airborne/subsystems/imu/imu_aspirin.h
+++ b/sw/airborne/subsystems/imu/imu_aspirin.h
@@ -24,7 +24,7 @@
 #ifndef IMU_ASPIRIN_H
 #define IMU_ASPIRIN_H
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "subsystems/imu.h"
 
 #include "i2c.h"
diff --git a/sw/airborne/subsystems/imu/imu_b2.h b/sw/airborne/subsystems/imu/imu_b2.h
index 4406c2b25c..fc9aa8660f 100644
--- a/sw/airborne/subsystems/imu/imu_b2.h
+++ b/sw/airborne/subsystems/imu/imu_b2.h
@@ -25,7 +25,7 @@
 #define IMU_B2_H
 
 #include "subsystems/imu.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #include "peripherals/max1168.h"
 
diff --git a/sw/airborne/subsystems/imu/imu_crista.h b/sw/airborne/subsystems/imu/imu_crista.h
index a91cbe7d5f..7f19861efa 100644
--- a/sw/airborne/subsystems/imu/imu_crista.h
+++ b/sw/airborne/subsystems/imu/imu_crista.h
@@ -25,7 +25,7 @@
 #define IMU_CRISTA_H
 
 #include "subsystems/imu.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #define ADS8344_NB_CHANNELS 8
 extern uint16_t ADS8344_values[ADS8344_NB_CHANNELS];
diff --git a/sw/airborne/subsystems/ins.c b/sw/airborne/subsystems/ins.c
index 7d7708527d..779fec6f0c 100644
--- a/sw/airborne/subsystems/ins.c
+++ b/sw/airborne/subsystems/ins.c
@@ -28,7 +28,7 @@
 #include "firmwares/rotorcraft/baro.h"
 #include "booz_gps.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "math/pprz_algebra_int.h"
 #include "math/pprz_algebra_float.h"
 
@@ -43,7 +43,7 @@
 #endif
 
 #ifdef BOOZ2_SONAR
-#include "modules.h"
+#include "generated/modules.h"
 #endif
 
 #ifdef SITL
@@ -54,7 +54,7 @@
 
 #include "math/pprz_geodetic_int.h"
 
-#include "flight_plan.h"
+#include "generated/flight_plan.h"
 
 /* gps transformed to LTP-NED  */
 struct LtpDef_i  ins_ltp_def;
diff --git a/sw/airborne/subsystems/ins/hf_float.c b/sw/airborne/subsystems/ins/hf_float.c
index 9cf76b9cf7..e990dc896d 100644
--- a/sw/airborne/subsystems/ins/hf_float.c
+++ b/sw/airborne/subsystems/ins/hf_float.c
@@ -29,7 +29,7 @@
 #include "booz_gps.h"
 #include <stdlib.h>
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #ifdef SITL
 #include <stdio.h>
diff --git a/sw/airborne/subsystems/radio_control.h b/sw/airborne/subsystems/radio_control.h
index e647bb4fb1..9651422f20 100644
--- a/sw/airborne/subsystems/radio_control.h
+++ b/sw/airborne/subsystems/radio_control.h
@@ -28,7 +28,7 @@
 #if defined RADIO_CONTROL
 
 #include "led.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "paparazzi.h"
 
 /* underlying hardware */
diff --git a/sw/airborne/subsystems/radio_control/dummy.h b/sw/airborne/subsystems/radio_control/dummy.h
index b976b09684..d5f563ab18 100644
--- a/sw/airborne/subsystems/radio_control/dummy.h
+++ b/sw/airborne/subsystems/radio_control/dummy.h
@@ -25,7 +25,7 @@
 #ifndef RADIO_CONTROL_NULL_H
 #define RADIO_CONTROL_NULL_H
 
-#include "radio.h"
+#include "generated/radio.h"
 
 #define RadioControlEvent(_received_frame_handler) { }
 
diff --git a/sw/airborne/subsystems/radio_control/ppm.h b/sw/airborne/subsystems/radio_control/ppm.h
index 80b246c47a..54c82bc81d 100644
--- a/sw/airborne/subsystems/radio_control/ppm.h
+++ b/sw/airborne/subsystems/radio_control/ppm.h
@@ -37,7 +37,7 @@ extern void ppm_arch_init(void);
  * Generated code holding the description of a given
  * transmitter
  */
-#include "radio.h"
+#include "generated/radio.h"
 
 /**
  * Define number of channels
diff --git a/sw/airborne/traffic_info.c b/sw/airborne/traffic_info.c
index e377bf8205..830e37bb8d 100644
--- a/sw/airborne/traffic_info.c
+++ b/sw/airborne/traffic_info.c
@@ -28,7 +28,7 @@
 
 #include <inttypes.h>
 #include "traffic_info.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 uint8_t acs_idx;
 uint8_t the_acs_id[NB_ACS_ID];
diff --git a/sw/airborne/xbee.h b/sw/airborne/xbee.h
index 6e3d1288d0..fa6f3e8870 100644
--- a/sw/airborne/xbee.h
+++ b/sw/airborne/xbee.h
@@ -28,7 +28,7 @@
 #define XBEE_H
 
 #include "datalink.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #ifdef XBEE868
 #include "xbee868.h"
diff --git a/sw/simulator/nps/nps_autopilot.h b/sw/simulator/nps/nps_autopilot.h
index 4d0bb29b2d..a6c7101153 100644
--- a/sw/simulator/nps/nps_autopilot.h
+++ b/sw/simulator/nps/nps_autopilot.h
@@ -1,7 +1,7 @@
 #ifndef NPS_AUTOPILOT_H
 #define NPS_AUTOPILOT_H
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #include "nps_radio_control.h"
 
diff --git a/sw/simulator/nps/nps_fdm_jsbsim.c b/sw/simulator/nps/nps_fdm_jsbsim.c
index 6fecb8e085..5d5a726c9a 100644
--- a/sw/simulator/nps/nps_fdm_jsbsim.c
+++ b/sw/simulator/nps/nps_fdm_jsbsim.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include "nps_fdm.h"
 #include "6dof.h"
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "math/pprz_geodetic.h"
 #include "math/pprz_geodetic_double.h"
 #include "math/pprz_geodetic_float.h"
diff --git a/sw/simulator/nps/nps_ivy.c b/sw/simulator/nps/nps_ivy.c
index 699a651096..43a3a5251d 100644
--- a/sw/simulator/nps/nps_ivy.c
+++ b/sw/simulator/nps/nps_ivy.c
@@ -4,7 +4,7 @@
 #include <Ivy/ivy.h>
 #include <Ivy/ivyglibloop.h>
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "math/pprz_algebra_double.h"
 #include "nps_autopilot.h"
 #include "nps_fdm.h"
@@ -49,7 +49,7 @@ void nps_ivy_init(void) {
 //FIXME currently parsed correctly for booz only
 
 
-#include "settings.h"
+#include "generated/settings.h"
 #include "dl_protocol.h"
 #include "downlink.h"
 static void on_DL_SETTING(IvyClientPtr app __attribute__ ((unused)),
diff --git a/sw/simulator/nps/nps_sensor_accel.c b/sw/simulator/nps/nps_sensor_accel.c
index 90857ed03a..248adfaafc 100644
--- a/sw/simulator/nps/nps_sensor_accel.c
+++ b/sw/simulator/nps/nps_sensor_accel.c
@@ -1,6 +1,6 @@
 #include "nps_sensor_accel.h"
 
-#include "airframe.h" /* to get NPS_SENSORS_PARAMS */
+#include "generated/airframe.h" /* to get NPS_SENSORS_PARAMS */
 
 #include "nps_fdm.h"
 #include "nps_random.h"
diff --git a/sw/simulator/nps/nps_sensor_baro.c b/sw/simulator/nps/nps_sensor_baro.c
index c55160c3e6..f0fdce2686 100644
--- a/sw/simulator/nps/nps_sensor_baro.c
+++ b/sw/simulator/nps/nps_sensor_baro.c
@@ -1,6 +1,6 @@
 #include "nps_sensor_baro.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 #include "std.h"
 #include "nps_fdm.h"
diff --git a/sw/simulator/nps/nps_sensor_gps.c b/sw/simulator/nps/nps_sensor_gps.c
index a5667e122f..1ef6abe838 100644
--- a/sw/simulator/nps/nps_sensor_gps.c
+++ b/sw/simulator/nps/nps_sensor_gps.c
@@ -1,7 +1,7 @@
 #include "nps_sensor_gps.h"
 
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "nps_fdm.h"
 #include "nps_random.h"
 #include "nps_sensors_utils.h"
diff --git a/sw/simulator/nps/nps_sensor_gyro.c b/sw/simulator/nps/nps_sensor_gyro.c
index 9cffe9341b..b0c38399f2 100644
--- a/sw/simulator/nps/nps_sensor_gyro.c
+++ b/sw/simulator/nps/nps_sensor_gyro.c
@@ -1,6 +1,6 @@
 #include "nps_sensor_gyro.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "nps_fdm.h"
 #include NPS_SENSORS_PARAMS
 #include "math/pprz_algebra_int.h"
diff --git a/sw/simulator/nps/nps_sensor_mag.c b/sw/simulator/nps/nps_sensor_mag.c
index 8839f38433..341c84f1de 100644
--- a/sw/simulator/nps/nps_sensor_mag.c
+++ b/sw/simulator/nps/nps_sensor_mag.c
@@ -1,6 +1,6 @@
 #include "nps_sensor_mag.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include "nps_fdm.h"
 #include NPS_SENSORS_PARAMS
 #include "math/pprz_algebra_int.h"
diff --git a/sw/simulator/nps/nps_sensors.c b/sw/simulator/nps/nps_sensors.c
index be26cc83ad..959d5423cd 100644
--- a/sw/simulator/nps/nps_sensors.c
+++ b/sw/simulator/nps/nps_sensors.c
@@ -1,6 +1,6 @@
 #include "nps_sensors.h"
 
-#include "airframe.h"
+#include "generated/airframe.h"
 #include NPS_SENSORS_PARAMS
 
 struct NpsSensors sensors;
diff --git a/sw/simulator/old_booz/booz2_sim_main.c b/sw/simulator/old_booz/booz2_sim_main.c
index aa5526c937..bc9a721013 100644
--- a/sw/simulator/old_booz/booz2_sim_main.c
+++ b/sw/simulator/old_booz/booz2_sim_main.c
@@ -323,7 +323,7 @@ static void ivy_transport_init(void) {
 }
 
 #include "std.h"
-#include "settings.h"
+#include "generated/settings.h"
 #include "dl_protocol.h"
 #include "downlink.h"
 static void on_DL_SETTING(IvyClientPtr app __attribute__ ((unused)), 
diff --git a/sw/simulator/old_booz/booz_flight_model.h b/sw/simulator/old_booz/booz_flight_model.h
index 6fdbc3cd67..037f887bc3 100644
--- a/sw/simulator/old_booz/booz_flight_model.h
+++ b/sw/simulator/old_booz/booz_flight_model.h
@@ -2,7 +2,7 @@
 #define BOOZ_FLIGHT_MODEL_H
 
 #include <matrix.h>
-#include "airframe.h"
+#include "generated/airframe.h"
 
 
 
diff --git a/sw/simulator/old_booz/booz_sensors_model_params_booz2_a1.h b/sw/simulator/old_booz/booz_sensors_model_params_booz2_a1.h
index 149f0801f8..6a4068b6cd 100644
--- a/sw/simulator/old_booz/booz_sensors_model_params_booz2_a1.h
+++ b/sw/simulator/old_booz/booz_sensors_model_params_booz2_a1.h
@@ -25,7 +25,7 @@
 #ifndef BOOZ_SENSORS_MODEL_PARAMS_H
 #define BOOZ_SENSORS_MODEL_PARAMS_H
 
-#include "airframe.h"
+#include "generated/airframe.h"
 
 
 #define BSM_BODY_TO_IMU_PHI    RadOfDeg(4.)
diff --git a/sw/simulator/sim_ac_jsbsim.h b/sw/simulator/sim_ac_jsbsim.h
index f1dcd300c9..4cc551c69b 100644
--- a/sw/simulator/sim_ac_jsbsim.h
+++ b/sw/simulator/sim_ac_jsbsim.h
@@ -30,8 +30,8 @@
 #include <models/FGPropulsion.h>
 
 #include "std.h"
-#include "airframe.h"
-#include "flight_plan.h"
+#include "generated/airframe.h"
+#include "generated/flight_plan.h"
 
 #include <Ivy/ivy.h>