diff --git a/sw/airborne/firmwares/fixedwing/autopilot.h b/sw/airborne/firmwares/fixedwing/autopilot.h
index b95d833957..a5f9a697ca 100644
--- a/sw/airborne/firmwares/fixedwing/autopilot.h
+++ b/sw/airborne/firmwares/fixedwing/autopilot.h
@@ -56,30 +56,27 @@ extern uint8_t pprz_mode;
 extern bool_t kill_throttle;
 
 
+// FIXME, move to control
 #define LATERAL_MODE_MANUAL    0
 #define LATERAL_MODE_ROLL_RATE 1
 #define LATERAL_MODE_ROLL      2
 #define LATERAL_MODE_COURSE    3
 #define LATERAL_MODE_NB        4
+extern uint8_t lateral_mode;
 
 #define STICK_PUSHED(pprz) (pprz < TRESHOLD1 || pprz > TRESHOLD2)
 
-
 #define FLOAT_OF_PPRZ(pprz, center, travel) ((float)pprz / (float)MAX_PPRZ * travel + center)
 
 #define THROTTLE_THRESHOLD_TAKEOFF (pprz_t)(MAX_PPRZ * 0.9)
 
-extern uint8_t lateral_mode;
 extern uint8_t vsupply;
 extern float energy;
 
 extern bool_t launch;
 
-extern uint8_t light_mode;
 extern bool_t gps_lost;
 
-extern bool_t sum_err_reset;
-
 /** Assignment, returning _old_value != _value
  * Using GCC expression statements */
 #define ModeUpdate(_mode, _value) ({ \
@@ -87,14 +84,6 @@ extern bool_t sum_err_reset;
   (_mode != new_mode ? _mode = new_mode, TRUE : FALSE); \
 })
 
-
-#ifdef RADIO_CONTROL
-#include "subsystems/radio_control.h"
-static inline void autopilot_process_radio_control ( void ) {
-  pprz_mode = PPRZ_MODE_OF_PULSE(radio_control.values[RADIO_MODE]);
-}
-#endif
-
 extern bool_t power_switch;
 
 #ifdef POWER_SWITCH_LED