diff --git a/sw/airborne/arch/lpc21/mcu_periph/adc_arch.c b/sw/airborne/arch/lpc21/mcu_periph/adc_arch.c
index 8faed22706..e669448e6c 100644
--- a/sw/airborne/arch/lpc21/mcu_periph/adc_arch.c
+++ b/sw/airborne/arch/lpc21/mcu_periph/adc_arch.c
@@ -34,13 +34,13 @@
 #include BOARD_CONFIG
 
 
-#ifdef USE_AD0
+#if USE_AD0
 #ifndef AD0_VIC_SLOT
 #define AD0_VIC_SLOT 2
 #endif
 #endif
 
-#ifdef USE_AD1
+#if USE_AD1
 #ifndef AD1_VIC_SLOT
 #define AD1_VIC_SLOT 4
 #endif
@@ -197,7 +197,7 @@ void adc_init( void ) {
   PINSEL0 |= ADC_PINSEL0_ONES;
   PINSEL1 |= ADC_PINSEL1_ONES;
 
-#ifdef USE_AD0
+#if USE_AD0
   /* FIXME: this needs to be investigated, we should run just below 4.5MHz,
 			but we are a lot slower (e.g. 58.6kHz with PCLK = 15MHz), see
 			lpc_vor_convertions.c for right timing code */
@@ -212,7 +212,7 @@ void adc_init( void ) {
   _VIC_ADDR(AD0_VIC_SLOT) = (uint32_t)adcISR0;
 #endif
 
-#ifdef USE_AD1
+#if USE_AD1
   /* FIXME: this needs to be investigated, we should run just below 4.5MHz,
 			but we are a lot slower (e.g. 58.6kHz with PCLK = 15MHz), see
 			lpc_vor_convertions.c for right timing code */
diff --git a/sw/airborne/arch/stm32/mcu_periph/adc_arch.c b/sw/airborne/arch/stm32/mcu_periph/adc_arch.c
index fa3a2b81bc..5f5160bc65 100644
--- a/sw/airborne/arch/stm32/mcu_periph/adc_arch.c
+++ b/sw/airborne/arch/stm32/mcu_periph/adc_arch.c
@@ -102,27 +102,24 @@
 
 // Macros to automatically enable the correct ADC
 
-#if  defined(AD1_1_CHANNEL) || defined(AD1_2_CHANNEL) || defined(AD1_3_CHANNEL) || defined(AD1_4_CHANNEL)
+#if defined(AD1_1_CHANNEL) || defined(AD1_2_CHANNEL) || defined(AD1_3_CHANNEL) || defined(AD1_4_CHANNEL)
 #ifndef USE_AD1
 #define USE_AD1 1
 #endif
-PRINT_CONFIG_MSG("Analog to Digital Coverter 1 active")
 #endif
 
 #if defined(STM32F4)
 
-#if  defined(AD2_1_CHANNEL) || defined(AD2_2_CHANNEL) || defined(AD2_3_CHANNEL) || defined(AD2_4_CHANNEL)
+#if defined(AD2_1_CHANNEL) || defined(AD2_2_CHANNEL) || defined(AD2_3_CHANNEL) || defined(AD2_4_CHANNEL)
 #ifndef USE_AD2
 #define USE_AD2 1
 #endif
-PRINT_CONFIG_MSG("Analog to Digital Coverter 2 active")
 #endif
 
-#if  defined(AD3_1_CHANNEL) || defined(AD3_2_CHANNEL) || defined(AD3_3_CHANNEL) || defined(AD3_4_CHANNEL)
+#if defined(AD3_1_CHANNEL) || defined(AD3_2_CHANNEL) || defined(AD3_3_CHANNEL) || defined(AD3_4_CHANNEL)
 #ifndef USE_AD3
 #define USE_AD3 1
 #endif
-PRINT_CONFIG_MSG("Analog to Digital Coverter 3 active")
 #endif
 
 #else // !STM32F4
@@ -133,7 +130,16 @@ PRINT_CONFIG_MSG("Analog to Digital Coverter 3 active")
 #define USE_AD3 0
 #endif
 
-#if !defined(USE_AD1) && !defined(USE_AD2) && !defined(USE_AD3)
+#if USE_AD1
+PRINT_CONFIG_MSG("Analog to Digital Coverter 1 active")
+#endif
+#if USE_AD2
+PRINT_CONFIG_MSG("Analog to Digital Coverter 2 active")
+#endif
+#if USE_AD3
+PRINT_CONFIG_MSG("Analog to Digital Coverter 3 active")
+#endif
+#if !USE_AD1 && !USE_AD2 && !USE_AD3
 #warning ALL ADC CONVERTERS INACTIVE
 #endif
 
diff --git a/sw/airborne/boards/apogee_0.99.h b/sw/airborne/boards/apogee_0.99.h
index d58f45590a..114ea5096e 100644
--- a/sw/airborne/boards/apogee_0.99.h
+++ b/sw/airborne/boards/apogee_0.99.h
@@ -80,21 +80,21 @@
  * these directly map to the index number of the 4 adc channels defined above
  * 4th (index 3) is used for bat monitoring by default
  */
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #define AD1_1_CHANNEL 8
 #define ADC_1 AD1_1
 #define ADC_1_GPIO_PORT GPIOB
 #define ADC_1_GPIO_PIN GPIO0
 #endif
 
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #define AD1_2_CHANNEL 9
 #define ADC_2 AD1_2
 #define ADC_2_GPIO_PORT GPIOB
 #define ADC_2_GPIO_PIN GPIO1
 #endif
 
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #define AD1_3_CHANNEL 14
 #define ADC_3 AD1_3
 #define ADC_3_GPIO_PORT GPIOC
@@ -105,7 +105,7 @@
 #ifndef USE_ADC_4
 #define USE_ADC_4 1
 #endif
-#ifdef USE_ADC_4
+#if USE_ADC_4
 #define AD1_4_CHANNEL 4
 #define ADC_4 AD1_4
 #define ADC_4_GPIO_PORT GPIOA
diff --git a/sw/airborne/boards/apogee_1.0.h b/sw/airborne/boards/apogee_1.0.h
index d4ccae4bea..a7fb30e381 100644
--- a/sw/airborne/boards/apogee_1.0.h
+++ b/sw/airborne/boards/apogee_1.0.h
@@ -171,7 +171,7 @@
  * 4th (index 3) is used for bat monitoring by default
  */
 // AUX 1
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #define AD1_1_CHANNEL 9
 #define ADC_1 AD1_1
 #define ADC_1_GPIO_PORT GPIOB
@@ -179,7 +179,7 @@
 #endif
 
 // AUX 2
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #define AD1_2_CHANNEL 15
 #define ADC_2 AD1_2
 #define ADC_2_GPIO_PORT GPIOC
@@ -187,7 +187,7 @@
 #endif
 
 // AUX 3
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #define AD1_3_CHANNEL 14
 #define ADC_3 AD1_3
 #define ADC_3_GPIO_PORT GPIOC
@@ -198,7 +198,7 @@
 #ifndef USE_ADC_4
 #define USE_ADC_4 1
 #endif
-#ifdef USE_ADC_4
+#if USE_ADC_4
 #define AD1_4_CHANNEL 4
 #define ADC_4 AD1_4
 #define ADC_4_GPIO_PORT GPIOA
diff --git a/sw/airborne/boards/booz_1.0.h b/sw/airborne/boards/booz_1.0.h
index 70fc889bc3..7877386dae 100644
--- a/sw/airborne/boards/booz_1.0.h
+++ b/sw/airborne/boards/booz_1.0.h
@@ -74,7 +74,7 @@
 
 /* select P0.13 (ADC_SPARE) as AD1.4 for ADC_0 */
 #define ADC_0 AdcBank1(4)
-#ifdef USE_ADC_0
+#if USE_ADC_0
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -83,7 +83,7 @@
 
 /* select P0.4 (SCK_0) as AD0.6 for ADC_1 */
 #define ADC_1 AdcBank0(6)
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -92,7 +92,7 @@
 
 /* select P0.5 (MISO_0) as AD0.7 for ADC_2 */
 #define ADC_2 AdcBank0(7)
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -101,7 +101,7 @@
 
 /* select P0.6 (MOSI_0) as AD1.0 for ADC_3 */
 #define ADC_3 AdcBank1(0)
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #ifndef USE_AD1
 #define USE_AD1
 #endif
diff --git a/sw/airborne/boards/hb_1.1.h b/sw/airborne/boards/hb_1.1.h
index 6c8988cd41..02f00187e0 100644
--- a/sw/airborne/boards/hb_1.1.h
+++ b/sw/airborne/boards/hb_1.1.h
@@ -74,7 +74,7 @@
 
 /* IR3 */
 #define ADC_0 AdcBank0(3)
-#ifdef USE_ADC_0
+#if USE_ADC_0
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -83,7 +83,7 @@
 
 /* IR2 */
 #define ADC_1 AdcBank0(2)
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -92,7 +92,7 @@
 
 /* IR1 */
 #define ADC_2 AdcBank0(1)
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -102,7 +102,7 @@
 
 /* ADC2 on ANALOG connector */
 #define ADC_3 AdcBank1(2)
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -111,7 +111,7 @@
 
 /* ADC3 on ANALOG connector */
 #define ADC_4 AdcBank1(3)
-#ifdef USE_ADC_4
+#if USE_ADC_4
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -120,7 +120,7 @@
 
 /* ADC4 on ANALOG connector */
 #define ADC_5 AdcBank1(4)
-#ifdef USE_ADC_5
+#if USE_ADC_5
 #ifndef USE_AD1
 #define USE_AD1
 #endif
diff --git a/sw/airborne/boards/krooz_sd.h b/sw/airborne/boards/krooz_sd.h
index c8cef4783a..6c75389bd3 100644
--- a/sw/airborne/boards/krooz_sd.h
+++ b/sw/airborne/boards/krooz_sd.h
@@ -155,21 +155,21 @@
  * these directly map to the index number of the 4 adc channels defined above
  * 4th (index 3) is used for bat monitoring by default
  */
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #define AD1_1_CHANNEL 12
 #define ADC_1 AD1_1
 #define ADC_1_GPIO_PORT GPIOC
 #define ADC_1_GPIO_PIN GPIO2
 #endif
 
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #define AD1_2_CHANNEL 10
 #define ADC_2 AD1_2
 #define ADC_2_GPIO_PORT GPIOC
 #define ADC_2_GPIO_PIN GPIO0
 #endif
 
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #define AD1_3_CHANNEL 11
 #define ADC_3 AD1_3
 #define ADC_3_GPIO_PORT GPIOC
@@ -180,7 +180,7 @@
 #ifndef USE_ADC_4
 #define USE_ADC_4 1
 #endif
-#ifdef USE_ADC_4
+#if USE_ADC_4
 #define AD1_4_CHANNEL 13
 #define ADC_4 AD1_4
 #define ADC_4_GPIO_PORT GPIOC
diff --git a/sw/airborne/boards/lisa_l_1.0.h b/sw/airborne/boards/lisa_l_1.0.h
index fd2c059ba8..7d6c10f13d 100644
--- a/sw/airborne/boards/lisa_l_1.0.h
+++ b/sw/airborne/boards/lisa_l_1.0.h
@@ -137,14 +137,14 @@
  */
 #define USE_AD_TIM1 1
 
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #define AD1_1_CHANNEL 8
 #define ADC_1 AD1_1
 #define ADC_1_GPIO_PORT GPIOB
 #define ADC_1_GPIO_PIN GPIO0
 #endif
 
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #define AD1_2_CHANNEL 9
 #define ADC_2 AD1_2
 #define ADC_2_GPIO_PORT GPIOB
@@ -155,14 +155,14 @@
 #ifndef USE_ADC_3
 #define USE_ADC_3 1
 #endif
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #define AD1_3_CHANNEL 0
 #define ADC_3 AD1_3
 #define ADC_3_GPIO_PORT GPIOA
 #define ADC_3_GPIO_PIN GPIO0
 #endif
 
-#ifdef USE_ADC_4
+#if USE_ADC_4
 #define AD1_4_CHANNEL 15
 #define ADC_4 AD1_4
 #define ADC_4_GPIO_PORT GPIOC
diff --git a/sw/airborne/boards/lisa_m_common.h b/sw/airborne/boards/lisa_m_common.h
index b281666b81..49d2fb9e7e 100644
--- a/sw/airborne/boards/lisa_m_common.h
+++ b/sw/airborne/boards/lisa_m_common.h
@@ -152,21 +152,21 @@
  * these directly map to the index number of the 4 adc channels defined above
  * 4th (index 3) is used for bat monitoring by default
  */
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #define AD1_1_CHANNEL 13
 #define ADC_1 AD1_1
 #define ADC_1_GPIO_PORT GPIOC
 #define ADC_1_GPIO_PIN GPIO3
 #endif
 
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #define AD1_2_CHANNEL 10
 #define ADC_2 AD1_2
 #define ADC_2_GPIO_PORT GPIOC
 #define ADC_2_GPIO_PIN GPIO0
 #endif
 
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #define AD1_3_CHANNEL 11
 #define ADC_3 AD1_3
 #define ADC_3_GPIO_PORT GPIOC
@@ -177,7 +177,7 @@
 #ifndef USE_ADC_5
 #define USE_ADC_5 1
 #endif
-#ifdef USE_ADC_5
+#if USE_ADC_5
 #define AD1_4_CHANNEL 14
 #define ADC_5 AD1_4
 #define ADC_5_GPIO_PORT GPIOC
diff --git a/sw/airborne/boards/lisa_s_0.1.h b/sw/airborne/boards/lisa_s_0.1.h
index 249026b16e..8bc6951e94 100644
--- a/sw/airborne/boards/lisa_s_0.1.h
+++ b/sw/airborne/boards/lisa_s_0.1.h
@@ -80,7 +80,7 @@
 #ifndef USE_ADC_1
 #define USE_ADC_1 1
 #endif
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #define AD1_1_CHANNEL 2
 #define ADC_1 AD1_1
 #define ADC_1_GPIO_PORT GPIOA
diff --git a/sw/airborne/boards/logom_2.6.h b/sw/airborne/boards/logom_2.6.h
index e7e4c8568a..1b6f716667 100644
--- a/sw/airborne/boards/logom_2.6.h
+++ b/sw/airborne/boards/logom_2.6.h
@@ -102,7 +102,7 @@
 /* ADC */
 
 #define ADC_0 AdcBank0(3)
-#ifdef USE_ADC_0
+#if USE_ADC_0
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -110,7 +110,7 @@
 #endif
 
 #define ADC_1 AdcBank0(2)
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -119,7 +119,7 @@
 
 
 #define ADC_2 AdcBank0(1)
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -127,7 +127,7 @@
 #endif
 
 #define ADC_3 AdcBank0(4)
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -135,7 +135,7 @@
 #endif
 
 #define ADC_4 AdcBank1(7)
-#ifdef USE_ADC_4
+#if USE_ADC_4
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -143,7 +143,7 @@
 #endif
 
 #define ADC_5 AdcBank1(6)
-#ifdef USE_ADC_5
+#if USE_ADC_5
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -151,7 +151,7 @@
 #endif
 
 #define ADC_6 AdcBank1(2)
-#ifdef USE_ADC_6
+#if USE_ADC_6
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -159,7 +159,7 @@
 #endif
 
 #define ADC_7 AdcBank1(2)
-#ifdef USE_ADC_7
+#if USE_ADC_7
 #ifndef USE_AD1
 #define USE_AD1
 #endif
diff --git a/sw/airborne/boards/navgo_1.0.h b/sw/airborne/boards/navgo_1.0.h
index 8cdfd75591..d696717afb 100644
--- a/sw/airborne/boards/navgo_1.0.h
+++ b/sw/airborne/boards/navgo_1.0.h
@@ -56,7 +56,7 @@
 
 /* not compatible with PWM1 */
 #define ADC_0 AdcBank1(6)
-#ifdef USE_ADC_0
+#if USE_ADC_0
 #ifndef USE_AD1
 #define USE_AD1
 #endif
diff --git a/sw/airborne/boards/px4fmu_1.7.h b/sw/airborne/boards/px4fmu_1.7.h
index 2f8acb5112..59b5dee27b 100644
--- a/sw/airborne/boards/px4fmu_1.7.h
+++ b/sw/airborne/boards/px4fmu_1.7.h
@@ -110,21 +110,21 @@
  * these directly map to the index number of the 4 adc channels defined above
  * 4th (index 3) is used for bat monitoring by default
  */
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #define AD1_1_CHANNEL 11
 #define ADC_1 AD1_1
 #define ADC_1_GPIO_PORT GPIOC
 #define ADC_1_GPIO_PIN GPIO1
 #endif
 
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #define AD1_2_CHANNEL 12
 #define ADC_2 AD1_2
 #define ADC_2_GPIO_PORT GPIOC
 #define ADC_2_GPIO_PIN GPIO2
 #endif
 
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #define AD1_3_CHANNEL 13
 #define ADC_3 AD1_3
 #define ADC_3_GPIO_PORT GPIOC
@@ -135,7 +135,7 @@
 #ifndef USE_ADC_4
 #define USE_ADC_4 1
 #endif
-#ifdef USE_ADC_4
+#if USE_ADC_4
 #define AD1_4_CHANNEL 10
 #define ADC_4 AD1_4
 #define ADC_4_GPIO_PORT GPIOC
diff --git a/sw/airborne/boards/sdlog_1.0.h b/sw/airborne/boards/sdlog_1.0.h
index d99a2b7dbd..74fd1cb368 100644
--- a/sw/airborne/boards/sdlog_1.0.h
+++ b/sw/airborne/boards/sdlog_1.0.h
@@ -106,7 +106,7 @@
 /* ADC */
 
 #define ADC_0 AdcBank1(6)
-#ifdef USE_ADC_0
+#if USE_ADC_0
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -114,7 +114,7 @@
 #endif
 
 #define ADC_1 AdcBank1(7)
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -123,7 +123,7 @@
 
 
 #define ADC_2 AdcBank0(4)
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -131,7 +131,7 @@
 #endif
 
 #define ADC_3 AdcBank0(6)
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -139,7 +139,7 @@
 #endif
 
 #define ADC_4 AdcBank0(3)
-#ifdef USE_ADC_4
+#if USE_ADC_4
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -147,7 +147,7 @@
 #endif
 
 #define ADC_5 AdcBank0(2)
-#ifdef USE_ADC_5
+#if USE_ADC_5
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -155,7 +155,7 @@
 #endif
 
 #define ADC_6 AdcBank0(1)
-#ifdef USE_ADC_6
+#if USE_ADC_6
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -163,7 +163,7 @@
 #endif
 
 #define ADC_7 AdcBank1(3)
-#ifdef USE_ADC_7
+#if USE_ADC_7
 #ifndef USE_AD1
 #define USE_AD1
 #endif
diff --git a/sw/airborne/boards/stm32f4_discovery.h b/sw/airborne/boards/stm32f4_discovery.h
index f24f87ef53..e41d1e0322 100644
--- a/sw/airborne/boards/stm32f4_discovery.h
+++ b/sw/airborne/boards/stm32f4_discovery.h
@@ -307,7 +307,7 @@
  */
 
 // AUX 1
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #define AD1_1_CHANNEL 9
 #define ADC_1 AD1_1 // THIS CHANNEL USES THE ADC 1 CONVERTER
 #define ADC_1_GPIO_PORT GPIOB
@@ -315,7 +315,7 @@
 #endif
 
 // AUX 2
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #define AD1_2_CHANNEL 15
 #define ADC_2 AD1_2 // THIS CHANNEL USES THE ADC 1 CONVERTER
 #define ADC_2_GPIO_PORT GPIOC
@@ -323,7 +323,7 @@
 #endif
 
 // AUX 3
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #define AD2_1_CHANNEL 14
 #define ADC_3 ADC2_C1 // THIS CHANNEL USES THE ADC 2 CONVERTER
 #define ADC_3_GPIO_PORT GPIOC
@@ -331,21 +331,21 @@
 #endif
 
 // BAT
-#ifdef USE_ADC_4
+#if USE_ADC_4
 #define AD2_2_CHANNEL 4
 #define ADC_4 AD2_2 // THIS CHANNEL USES THE ADC 2 CONVERTER
 #define ADC_4_GPIO_PORT GPIOA
 #define ADC_4_GPIO_PIN GPIO4
 #endif
 
-#ifdef USE_ADC_5
+#if USE_ADC_5
 #define AD3_1_CHANNEL 11
 #define ADC_5 AD3_1 // THIS CHANNEL USES THE ADC 3 CONVERTER
 #define ADC_5_GPIO_PORT GPIOC
 #define ADC_5_GPIO_PIN GPIO1
 #endif
 
-#ifdef USE_ADC_6
+#if USE_ADC_6
 #define AD3_2_CHANNEL 12
 #define ADC_6 AD3_2 // THIS CHANNEL USES THE ADC 3 CONVERTER
 #define ADC_6_GPIO_PORT GPIOC
diff --git a/sw/airborne/boards/tiny_0.99.h b/sw/airborne/boards/tiny_0.99.h
index 7a30d21cea..fae8c3c87b 100644
--- a/sw/airborne/boards/tiny_0.99.h
+++ b/sw/airborne/boards/tiny_0.99.h
@@ -64,7 +64,7 @@
 /* ADC */
 
 #define ADC_0 AdcBank0(3)
-#ifdef USE_ADC_0
+#if USE_ADC_0
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -72,7 +72,7 @@
 #endif
 
 #define ADC_1 AdcBank0(2)
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -81,7 +81,7 @@
 
 
 #define ADC_2 AdcBank0(1)
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -89,7 +89,7 @@
 #endif
 
 #define ADC_3 AdcBank1(7)
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -97,7 +97,7 @@
 #endif
 
 #define ADC_4 AdcBank1(3)
-#ifdef USE_ADC_4
+#if USE_ADC_4
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -105,7 +105,7 @@
 #endif
 
 #define ADC_5 AdcBank1(4)
-#ifdef USE_ADC_5
+#if USE_ADC_5
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -113,7 +113,7 @@
 #endif
 
 #define ADC_6 AdcBank1(5)
-#ifdef USE_ADC_6
+#if USE_ADC_6
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -121,7 +121,7 @@
 #endif
 
 #define ADC_7 AdcBank1(2)
-#ifdef USE_ADC_7
+#if USE_ADC_7
 #ifndef USE_AD1
 #define USE_AD1
 #endif
diff --git a/sw/airborne/boards/tiny_1.1.h b/sw/airborne/boards/tiny_1.1.h
index cb59bf81ba..5a79318107 100644
--- a/sw/airborne/boards/tiny_1.1.h
+++ b/sw/airborne/boards/tiny_1.1.h
@@ -75,7 +75,7 @@
 /* ADC */
 
 #define ADC_0 AdcBank0(3)
-#ifdef USE_ADC_0
+#if USE_ADC_0
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -83,7 +83,7 @@
 #endif
 
 #define ADC_1 AdcBank0(2)
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -92,7 +92,7 @@
 
 
 #define ADC_2 AdcBank0(1)
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -100,7 +100,7 @@
 #endif
 
 #define ADC_3 AdcBank0(4)
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -108,7 +108,7 @@
 #endif
 
 #define ADC_4 AdcBank1(7)
-#ifdef USE_ADC_4
+#if USE_ADC_4
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -116,7 +116,7 @@
 #endif
 
 #define ADC_5 AdcBank1(3)
-#ifdef USE_ADC_5
+#if USE_ADC_5
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -124,7 +124,7 @@
 #endif
 
 #define ADC_6 AdcBank1(4)
-#ifdef USE_ADC_6
+#if USE_ADC_6
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -132,7 +132,7 @@
 #endif
 
 #define ADC_7 AdcBank1(5)
-#ifdef USE_ADC_7
+#if USE_ADC_7
 #ifndef USE_AD1
 #define USE_AD1
 #endif
diff --git a/sw/airborne/boards/tiny_2.0.h b/sw/airborne/boards/tiny_2.0.h
index 5f9e7f4609..4f91c445b0 100644
--- a/sw/airborne/boards/tiny_2.0.h
+++ b/sw/airborne/boards/tiny_2.0.h
@@ -76,7 +76,7 @@
 /* ADC */
 
 #define ADC_0 AdcBank1(6)
-#ifdef USE_ADC_0
+#if USE_ADC_0
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -84,7 +84,7 @@
 #endif
 
 #define ADC_1 AdcBank1(7)
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -93,7 +93,7 @@
 
 
 #define ADC_2 AdcBank0(4)
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -101,7 +101,7 @@
 #endif
 
 #define ADC_3 AdcBank0(6)
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -109,7 +109,7 @@
 #endif
 
 #define ADC_4 AdcBank0(3)
-#ifdef USE_ADC_4
+#if USE_ADC_4
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -117,7 +117,7 @@
 #endif
 
 #define ADC_5 AdcBank0(2)
-#ifdef USE_ADC_5
+#if USE_ADC_5
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -125,7 +125,7 @@
 #endif
 
 #define ADC_6 AdcBank0(1)
-#ifdef USE_ADC_6
+#if USE_ADC_6
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -133,7 +133,7 @@
 #endif
 
 #define ADC_7 AdcBank1(3)
-#ifdef USE_ADC_7
+#if USE_ADC_7
 #ifndef USE_AD1
 #define USE_AD1
 #endif
diff --git a/sw/airborne/boards/tiny_2.1.h b/sw/airborne/boards/tiny_2.1.h
index c33bc98c35..79badf4e9d 100644
--- a/sw/airborne/boards/tiny_2.1.h
+++ b/sw/airborne/boards/tiny_2.1.h
@@ -113,7 +113,7 @@
 /* ADC */
 
 #define ADC_0 AdcBank1(6)
-#ifdef USE_ADC_0
+#if USE_ADC_0
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -121,7 +121,7 @@
 #endif
 
 #define ADC_1 AdcBank1(7)
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -130,7 +130,7 @@
 
 
 #define ADC_2 AdcBank0(4)
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -138,7 +138,7 @@
 #endif
 
 #define ADC_3 AdcBank0(6)
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -146,7 +146,7 @@
 #endif
 
 #define ADC_4 AdcBank0(3)
-#ifdef USE_ADC_4
+#if USE_ADC_4
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -154,7 +154,7 @@
 #endif
 
 #define ADC_5 AdcBank0(2)
-#ifdef USE_ADC_5
+#if USE_ADC_5
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -162,7 +162,7 @@
 #endif
 
 #define ADC_6 AdcBank0(1)
-#ifdef USE_ADC_6
+#if USE_ADC_6
 #ifndef USE_AD0
 #define USE_AD0
 #endif
@@ -170,7 +170,7 @@
 #endif
 
 #define ADC_7 AdcBank1(3)
-#ifdef USE_ADC_7
+#if USE_ADC_7
 #ifndef USE_AD1
 #define USE_AD1
 #endif
diff --git a/sw/airborne/boards/umarim_1.0.h b/sw/airborne/boards/umarim_1.0.h
index b3859e2897..42608c8e7b 100644
--- a/sw/airborne/boards/umarim_1.0.h
+++ b/sw/airborne/boards/umarim_1.0.h
@@ -57,7 +57,7 @@
 /* ADC */
 
 #define ADC_0 AdcBank1(5)
-#ifdef USE_ADC_0
+#if USE_ADC_0
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -65,7 +65,7 @@
 #endif
 
 #define ADC_1 AdcBank1(4)
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -73,7 +73,7 @@
 #endif
 
 #define ADC_2 AdcBank1(3)
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -81,7 +81,7 @@
 #endif
 
 #define ADC_3 AdcBank1(2)
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #ifndef USE_AD1
 #define USE_AD1
 #endif
diff --git a/sw/airborne/boards/umarim_lite_2.0.h b/sw/airborne/boards/umarim_lite_2.0.h
index 2fae62e3ba..e5a610c03a 100644
--- a/sw/airborne/boards/umarim_lite_2.0.h
+++ b/sw/airborne/boards/umarim_lite_2.0.h
@@ -57,7 +57,7 @@
 /* ADC */
 
 #define ADC_0 AdcBank1(5)
-#ifdef USE_ADC_0
+#if USE_ADC_0
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -65,7 +65,7 @@
 #endif
 
 #define ADC_1 AdcBank1(4)
-#ifdef USE_ADC_1
+#if USE_ADC_1
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -73,7 +73,7 @@
 #endif
 
 #define ADC_2 AdcBank1(3)
-#ifdef USE_ADC_2
+#if USE_ADC_2
 #ifndef USE_AD1
 #define USE_AD1
 #endif
@@ -81,7 +81,7 @@
 #endif
 
 #define ADC_3 AdcBank1(2)
-#ifdef USE_ADC_3
+#if USE_ADC_3
 #ifndef USE_AD1
 #define USE_AD1
 #endif
diff --git a/sw/airborne/mcu.c b/sw/airborne/mcu.c
index 53c99dc2e1..e10967fc34 100644
--- a/sw/airborne/mcu.c
+++ b/sw/airborne/mcu.c
@@ -44,7 +44,7 @@
 #if defined USE_I2C0  || defined USE_I2C1  || defined USE_I2C2
 #include "mcu_periph/i2c.h"
 #endif
-#if defined USE_ADC
+#if USE_ADC
 #include "mcu_periph/adc.h"
 #endif
 #ifdef USE_USB_SERIAL
@@ -104,7 +104,7 @@ void mcu_init(void) {
 #ifdef USE_I2C3
   i2c3_init();
 #endif
-#ifdef USE_ADC
+#if USE_ADC
   adc_init();
 #endif
 #ifdef USE_USB_SERIAL