diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index ac40921a4a..62468dfbfe 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -12,10 +12,9 @@
 
 // Feature flags
 #define USE_API
+#define USE_API_NOISE
+#define USE_API_PLAINTEXT
 #define USE_BINARY_SENSOR
-#ifdef USE_ARDUINO
-#define USE_CAPTIVE_PORTAL
-#endif
 #define USE_CLIMATE
 #define USE_COVER
 #define USE_DEEP_SLEEP
@@ -23,14 +22,6 @@
 #define USE_FAN
 #define USE_GRAPH
 #define USE_HOMEASSISTANT_TIME
-
-#ifdef USE_ARDUINO
-#define USE_JSON
-#define USE_NEXTION_TFT_UPLOAD
-#define USE_MQTT
-#define USE_CAPTIVE_PORTAL
-#endif  // USE_ARDUINO
-
 #define USE_LIGHT
 #define USE_LOGGER
 #define USE_MDNS
@@ -43,39 +34,36 @@
 #define USE_STATUS_LED
 #define USE_SWITCH
 #define USE_TEXT_SENSOR
-
 #define USE_TIME
 #define USE_WIFI
+
+// Arduino-specific feature flags
 #ifdef USE_ARDUINO
+#define USE_CAPTIVE_PORTAL
+#define USE_JSON
+#define USE_NEXTION_TFT_UPLOAD
+#define USE_MQTT
 #define USE_WIFI_WPA2_EAP
 #endif
 
+// ESP32-specific feature flags
 #ifdef USE_ESP32
 #define USE_ESP32_BLE_SERVER
 #define USE_ESP32_CAMERA
+#define USE_IMPROV
+#define USE_SOCKET_IMPL_BSD_SOCKETS
 
 #ifdef USE_ARDUINO
 #define USE_ETHERNET
-#endif  // USE_ARDUINO
-
-#define USE_IMPROV
-#define USE_SOCKET_IMPL_BSD_SOCKETS
-#endif  // USE_ESP32
-
-#ifdef USE_ESP8266
-#define USE_ADC_SENSOR_VCC
-#define USE_SOCKET_IMPL_LWIP_TCP
-#define USE_HTTP_REQUEST_ESP8266_HTTPS
+#endif
 #endif
 
-#define USE_API_PLAINTEXT
-#define USE_API_NOISE
+// ESP8266-specific feature flags
+#ifdef USE_ESP8266
+#define USE_ADC_SENSOR_VCC
+#define USE_HTTP_REQUEST_ESP8266_HTTPS
+#define USE_SOCKET_IMPL_LWIP_TCP
+#endif
 
 // Disabled feature flags
 //#define USE_BSEC  // Requires a library with proprietary license.
-#define USE_TIME
-#define USE_DEEP_SLEEP
-#define ESPHOME_BOARD "dummy_board"
-#define USE_MDNS
-#define USE_API_NOISE
-#define USE_API_PLAINTEXT