diff --git a/sw/airborne/ap_downlink.h b/sw/airborne/ap_downlink.h
index 34554c6b87..f3ae45f9e2 100644
--- a/sw/airborne/ap_downlink.h
+++ b/sw/airborne/ap_downlink.h
@@ -115,7 +115,7 @@
 #define PERIODIC_SEND_SETTINGS(_chan) {}
 #endif
 
-#if defined INFRARED || INFRARED_I2C
+#if defined USE_INFRARED || USE_INFRARED_I2C
 #define PERIODIC_SEND_IR_SENSORS(_chan) DOWNLINK_SEND_IR_SENSORS(_chan, &ir_ir1, &ir_ir2, &ir_pitch, &ir_roll, &ir_top);
 #else
 #define PERIODIC_SEND_IR_SENSORS(_chan) ;
diff --git a/sw/airborne/arch/sim/jsbsim_ir.c b/sw/airborne/arch/sim/jsbsim_ir.c
index cfa02235ab..c05b9a67d9 100644
--- a/sw/airborne/arch/sim/jsbsim_ir.c
+++ b/sw/airborne/arch/sim/jsbsim_ir.c
@@ -20,7 +20,7 @@ void set_ir(double roll, double pitch) {
   double ir_contrast = 150; //FIXME
   double roll_sensor = roll + JSBSIM_IR_ROLL_NEUTRAL; // ir_roll_neutral;
   double pitch_sensor = pitch + JSBSIM_IR_PITCH_NEUTRAL; // ir_pitch_neutral;
-#ifdef INFRARED
+#ifdef USE_INFRARED
   ir_roll = sin(roll_sensor) * ir_contrast;
   ir_pitch = sin(pitch_sensor) * ir_contrast;
   ir_top = cos(roll_sensor) * cos(pitch_sensor) * ir_contrast;
diff --git a/sw/airborne/arch/sim/sim_ir.c b/sw/airborne/arch/sim/sim_ir.c
index cbc0306b0c..ffc1cac2e5 100644
--- a/sw/airborne/arch/sim/sim_ir.c
+++ b/sw/airborne/arch/sim/sim_ir.c
@@ -21,7 +21,7 @@ value set_ir(value roll __attribute__ ((unused)),
              value top __attribute__ ((unused)),
 	     value air_speed
 	     ) {
-#if defined  INFRARED || INFRARED_I2C
+#if defined  USE_INFRARED || USE_INFRARED_I2C
   ir_roll = Int_val(roll);
   ir_pitch = Int_val(front);
   ir_top = Int_val(top);
diff --git a/sw/airborne/firmwares/fixedwing/main_ap.c b/sw/airborne/firmwares/fixedwing/main_ap.c
index 1190cdbda5..fccad92af6 100644
--- a/sw/airborne/firmwares/fixedwing/main_ap.c
+++ b/sw/airborne/firmwares/fixedwing/main_ap.c
@@ -455,10 +455,10 @@ void periodic_task_ap( void ) {
       gyro_update();
 #endif
 
-#ifdef INFRARED
+#ifdef USE_INFRARED
       ir_update();
       estimator_update_state_infrared();
-#endif /* INFRARED */
+#endif /* USE_INFRARED */
       h_ctl_attitude_loop(); /* Set  h_ctl_aileron_setpoint & h_ctl_elevator_setpoint */
       v_ctl_throttle_slew();
       ap_state->commands[COMMAND_THROTTLE] = v_ctl_throttle_slewed;
@@ -493,7 +493,7 @@ void init_ap( void ) {
 #endif /* SINGLE_MCU */
 
   /************* Sensors initialization ***************/
-#ifdef INFRARED
+#ifdef USE_INFRARED
   ir_init();
 #endif
 #ifdef GYRO
diff --git a/sw/airborne/modules/ins/ins_osam_ugear.c b/sw/airborne/modules/ins/ins_osam_ugear.c
index d31c03fdb5..969c542de7 100644
--- a/sw/airborne/modules/ins/ins_osam_ugear.c
+++ b/sw/airborne/modules/ins/ins_osam_ugear.c
@@ -265,7 +265,7 @@ void parse_ugear_msg( void ){
             ins_phi  = (float)ugear_phi/10000 - ins_roll_neutral;
             ins_psi = 0;
             ins_theta  = (float)ugear_theta/10000 - ins_pitch_neutral;
-#ifndef INFRARED
+#ifndef USE_INFRARED
             EstimatorSetAtt(ins_phi, ins_psi, ins_theta);
 #endif
             break;