diff --git a/sw/airborne/firmwares/rotorcraft/autopilot.c b/sw/airborne/firmwares/rotorcraft/autopilot.c
index 87a5afdb19..ca797e05cc 100644
--- a/sw/airborne/firmwares/rotorcraft/autopilot.c
+++ b/sw/airborne/firmwares/rotorcraft/autopilot.c
@@ -39,6 +39,7 @@
 #include "firmwares/rotorcraft/navigation.h"
 #include "firmwares/rotorcraft/guidance.h"
 #include "firmwares/rotorcraft/stabilization.h"
+#include "generated/settings.h"
 
 #ifdef POWER_SWITCH_GPIO
 #include "mcu_periph/gpio.h"
diff --git a/sw/airborne/subsystems/settings.c b/sw/airborne/subsystems/settings.c
index 5e8de775a6..43bbb958f0 100644
--- a/sw/airborne/subsystems/settings.c
+++ b/sw/airborne/subsystems/settings.c
@@ -26,7 +26,7 @@
  */
 
 #include "subsystems/settings.h"
-
+#include "generated/settings.h"
 
 struct PersistentSettings pers_settings;
 
diff --git a/sw/airborne/subsystems/settings.h b/sw/airborne/subsystems/settings.h
index 784e3a410b..70cf4f4c2d 100644
--- a/sw/airborne/subsystems/settings.h
+++ b/sw/airborne/subsystems/settings.h
@@ -37,8 +37,6 @@ extern bool_t settings_store_flag;
 
 #define settings_StoreSettings(_v) { settings_store_flag = _v; settings_store(); }
 
-#include "generated/settings.h"
-
 /* implemented in arch dependant code */
 int32_t persistent_write(uint32_t ptr, uint32_t size);
 int32_t persistent_read(uint32_t ptr, uint32_t size);