diff --git a/drivers/AnalogIn.h b/drivers/AnalogIn.h
index 711109823e..8f247e5975 100644
--- a/drivers/AnalogIn.h
+++ b/drivers/AnalogIn.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#if defined (DEVICE_ANALOGIN) || defined(DOXYGEN_ONLY)
+#if DEVICE_ANALOGIN || defined(DOXYGEN_ONLY)
 
 #include "hal/analogin_api.h"
 #include "platform/SingletonPtr.h"
diff --git a/drivers/AnalogOut.h b/drivers/AnalogOut.h
index 285567f064..d12cbafcc4 100644
--- a/drivers/AnalogOut.h
+++ b/drivers/AnalogOut.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#if defined (DEVICE_ANALOGOUT) || defined(DOXYGEN_ONLY)
+#if DEVICE_ANALOGOUT || defined(DOXYGEN_ONLY)
 
 #include "hal/analogout_api.h"
 #include "platform/PlatformMutex.h"
diff --git a/drivers/CAN.h b/drivers/CAN.h
index 228eb611f0..c34b1f0265 100644
--- a/drivers/CAN.h
+++ b/drivers/CAN.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#if defined (DEVICE_CAN) || defined(DOXYGEN_ONLY)
+#if DEVICE_CAN || defined(DOXYGEN_ONLY)
 
 #include "hal/can_api.h"
 #include "platform/Callback.h"
diff --git a/drivers/Ethernet.h b/drivers/Ethernet.h
index 675851dacd..30618806e5 100644
--- a/drivers/Ethernet.h
+++ b/drivers/Ethernet.h
@@ -20,7 +20,7 @@
 #include "platform/platform.h"
 #include "platform/NonCopyable.h"
 
-#if defined (DEVICE_ETHERNET) || defined(DOXYGEN_ONLY)
+#if DEVICE_ETHERNET || defined(DOXYGEN_ONLY)
 
 namespace mbed {
 /** \addtogroup drivers */
diff --git a/drivers/FlashIAP.h b/drivers/FlashIAP.h
index ada6ddfe28..0c3c8e1049 100644
--- a/drivers/FlashIAP.h
+++ b/drivers/FlashIAP.h
@@ -22,7 +22,7 @@
 #ifndef MBED_FLASHIAP_H
 #define MBED_FLASHIAP_H
 
-#if defined (DEVICE_FLASH) || defined(DOXYGEN_ONLY)
+#if DEVICE_FLASH || defined(DOXYGEN_ONLY)
 
 #include "flash_api.h"
 #include "platform/SingletonPtr.h"
diff --git a/drivers/I2C.h b/drivers/I2C.h
index d1857b6557..9a19bd1247 100644
--- a/drivers/I2C.h
+++ b/drivers/I2C.h
@@ -20,7 +20,7 @@
 #include "platform/platform.h"
 #include "hal/gpio_api.h"
 
-#if defined (DEVICE_I2C) || defined(DOXYGEN_ONLY)
+#if DEVICE_I2C || defined(DOXYGEN_ONLY)
 
 #include "hal/i2c_api.h"
 #include "platform/SingletonPtr.h"
diff --git a/drivers/I2CSlave.h b/drivers/I2CSlave.h
index c07cef138a..78715ba934 100644
--- a/drivers/I2CSlave.h
+++ b/drivers/I2CSlave.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#if defined (DEVICE_I2CSLAVE) || defined(DOXYGEN_ONLY)
+#if DEVICE_I2CSLAVE || defined(DOXYGEN_ONLY)
 
 #include "hal/i2c_api.h"
 
diff --git a/drivers/InterruptIn.h b/drivers/InterruptIn.h
index 39f68ce1c0..32cc6619ee 100644
--- a/drivers/InterruptIn.h
+++ b/drivers/InterruptIn.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#if defined (DEVICE_INTERRUPTIN) || defined(DOXYGEN_ONLY)
+#if DEVICE_INTERRUPTIN || defined(DOXYGEN_ONLY)
 
 #include "hal/gpio_api.h"
 #include "hal/gpio_irq_api.h"
diff --git a/drivers/LowPowerTimeout.h b/drivers/LowPowerTimeout.h
index 0b68e8ea75..7198d7dc64 100644
--- a/drivers/LowPowerTimeout.h
+++ b/drivers/LowPowerTimeout.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#if defined (DEVICE_LPTICKER) || defined(DOXYGEN_ONLY)
+#if DEVICE_LPTICKER || defined(DOXYGEN_ONLY)
 
 #include "hal/lp_ticker_api.h"
 #include "drivers/LowPowerTicker.h"
diff --git a/drivers/LowPowerTimer.h b/drivers/LowPowerTimer.h
index 0b0c1ebaf8..abd03dd48e 100644
--- a/drivers/LowPowerTimer.h
+++ b/drivers/LowPowerTimer.h
@@ -21,7 +21,7 @@
 #include "drivers/Timer.h"
 #include "platform/NonCopyable.h"
 
-#if defined (DEVICE_LPTICKER) || defined(DOXYGEN_ONLY)
+#if DEVICE_LPTICKER || defined(DOXYGEN_ONLY)
 
 #include "hal/lp_ticker_api.h"
 
diff --git a/drivers/PortIn.h b/drivers/PortIn.h
index 8545f88efa..f3ae250e98 100644
--- a/drivers/PortIn.h
+++ b/drivers/PortIn.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#if defined (DEVICE_PORTIN) || defined(DOXYGEN_ONLY)
+#if DEVICE_PORTIN || defined(DOXYGEN_ONLY)
 
 #include "hal/port_api.h"
 #include "platform/mbed_critical.h"
diff --git a/drivers/PortInOut.h b/drivers/PortInOut.h
index 24eede48c7..2036eba252 100644
--- a/drivers/PortInOut.h
+++ b/drivers/PortInOut.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#if defined (DEVICE_PORTINOUT) || defined(DOXYGEN_ONLY)
+#if DEVICE_PORTINOUT || defined(DOXYGEN_ONLY)
 
 #include "hal/port_api.h"
 #include "platform/mbed_critical.h"
diff --git a/drivers/PortOut.h b/drivers/PortOut.h
index 814900cab4..18a0bcd3c5 100644
--- a/drivers/PortOut.h
+++ b/drivers/PortOut.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#if defined (DEVICE_PORTOUT) || defined(DOXYGEN_ONLY)
+#if DEVICE_PORTOUT || defined(DOXYGEN_ONLY)
 
 #include "hal/port_api.h"
 #include "platform/mbed_critical.h"
diff --git a/drivers/PwmOut.h b/drivers/PwmOut.h
index 087a1a7f64..acdd4a2e66 100644
--- a/drivers/PwmOut.h
+++ b/drivers/PwmOut.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#if defined (DEVICE_PWMOUT) || defined(DOXYGEN_ONLY)
+#if DEVICE_PWMOUT || defined(DOXYGEN_ONLY)
 #include "hal/pwmout_api.h"
 #include "platform/mbed_critical.h"
 #include "platform/mbed_power_mgmt.h"
diff --git a/drivers/RawSerial.h b/drivers/RawSerial.h
index 909e3eaea7..4841eb9038 100644
--- a/drivers/RawSerial.h
+++ b/drivers/RawSerial.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#if defined (DEVICE_SERIAL) || defined(DOXYGEN_ONLY)
+#if DEVICE_SERIAL || defined(DOXYGEN_ONLY)
 
 #include "mbed_toolchain.h"
 #include "drivers/SerialBase.h"
diff --git a/drivers/SPI.h b/drivers/SPI.h
index 9ba1360bfc..65db21bbb3 100644
--- a/drivers/SPI.h
+++ b/drivers/SPI.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#if defined (DEVICE_SPI) || defined(DOXYGEN_ONLY)
+#if DEVICE_SPI || defined(DOXYGEN_ONLY)
 
 #include "platform/PlatformMutex.h"
 #include "hal/spi_api.h"
diff --git a/drivers/SPISlave.h b/drivers/SPISlave.h
index 8d98d36ce2..878bc8d672 100644
--- a/drivers/SPISlave.h
+++ b/drivers/SPISlave.h
@@ -20,7 +20,7 @@
 #include "platform/platform.h"
 #include "platform/NonCopyable.h"
 
-#if defined (DEVICE_SPISLAVE) || defined(DOXYGEN_ONLY)
+#if DEVICE_SPISLAVE || defined(DOXYGEN_ONLY)
 
 #include "hal/spi_api.h"
 
diff --git a/drivers/Serial.h b/drivers/Serial.h
index 54bdf9cbd3..d19010808d 100644
--- a/drivers/Serial.h
+++ b/drivers/Serial.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#if defined (DEVICE_SERIAL) || defined(DOXYGEN_ONLY)
+#if DEVICE_SERIAL || defined(DOXYGEN_ONLY)
 
 #include "platform/Stream.h"
 #include "SerialBase.h"
diff --git a/drivers/SerialBase.h b/drivers/SerialBase.h
index c945202b4c..b00abe5bae 100644
--- a/drivers/SerialBase.h
+++ b/drivers/SerialBase.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#if defined (DEVICE_SERIAL) || defined(DOXYGEN_ONLY)
+#if DEVICE_SERIAL || defined(DOXYGEN_ONLY)
 
 #include "platform/Callback.h"
 #include "hal/serial_api.h"