diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 8c5d6d2018..c8b046c1e2 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -222,37 +222,37 @@ message DeviceInfoResponse {
   // The model of the board. For example NodeMCU
   string model = 6;
 
-  bool has_deep_sleep = 7;
+  bool has_deep_sleep = 7 [(field_ifdef) = "USE_DEEP_SLEEP"];
 
   // The esphome project details if set
-  string project_name = 8;
-  string project_version = 9;
+  string project_name = 8 [(field_ifdef) = "ESPHOME_PROJECT_NAME"];
+  string project_version = 9 [(field_ifdef) = "ESPHOME_PROJECT_NAME"];
 
-  uint32 webserver_port = 10;
+  uint32 webserver_port = 10 [(field_ifdef) = "USE_WEBSERVER"];
 
-  uint32 legacy_bluetooth_proxy_version = 11;
-  uint32 bluetooth_proxy_feature_flags = 15;
+  uint32 legacy_bluetooth_proxy_version = 11 [(field_ifdef) = "USE_BLUETOOTH_PROXY"];
+  uint32 bluetooth_proxy_feature_flags = 15 [(field_ifdef) = "USE_BLUETOOTH_PROXY"];
 
   string manufacturer = 12;
 
   string friendly_name = 13;
 
-  uint32 legacy_voice_assistant_version = 14;
-  uint32 voice_assistant_feature_flags = 17;
+  uint32 legacy_voice_assistant_version = 14 [(field_ifdef) = "USE_VOICE_ASSISTANT"];
+  uint32 voice_assistant_feature_flags = 17 [(field_ifdef) = "USE_VOICE_ASSISTANT"];
 
-  string suggested_area = 16;
+  string suggested_area = 16 [(field_ifdef) = "USE_AREAS"];
 
   // The Bluetooth mac address of the device. For example "AC:BC:32:89:0E:AA"
-  string bluetooth_mac_address = 18;
+  string bluetooth_mac_address = 18 [(field_ifdef) = "USE_BLUETOOTH_PROXY"];
 
   // Supports receiving and saving api encryption key
-  bool api_encryption_supported = 19;
+  bool api_encryption_supported = 19 [(field_ifdef) = "USE_API_NOISE"];
 
-  repeated DeviceInfo devices = 20;
-  repeated AreaInfo areas = 21;
+  repeated DeviceInfo devices = 20 [(field_ifdef) = "USE_DEVICES"];
+  repeated AreaInfo areas = 21 [(field_ifdef) = "USE_AREAS"];
 
   // Top-level area info to phase out suggested_area
-  AreaInfo area = 22;
+  AreaInfo area = 22 [(field_ifdef) = "USE_AREAS"];
 }
 
 message ListEntitiesRequest {
@@ -295,9 +295,9 @@ message ListEntitiesBinarySensorResponse {
   string device_class = 5;
   bool is_status_binary_sensor = 6;
   bool disabled_by_default = 7;
-  string icon = 8;
+  string icon = 8 [(field_ifdef) = "USE_ENTITY_ICON"];
   EntityCategory entity_category = 9;
-  uint32 device_id = 10;
+  uint32 device_id = 10 [(field_ifdef) = "USE_DEVICES"];
 }
 message BinarySensorStateResponse {
   option (id) = 21;
@@ -311,7 +311,7 @@ message BinarySensorStateResponse {
   // If the binary sensor does not have a valid state yet.
   // Equivalent to `!obj->has_state()` - inverse logic to make state packets smaller
   bool missing_state = 3;
-  uint32 device_id = 4;
+  uint32 device_id = 4 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== COVER ====================
@@ -331,10 +331,10 @@ message ListEntitiesCoverResponse {
   bool supports_tilt = 7;
   string device_class = 8;
   bool disabled_by_default = 9;
-  string icon = 10;
+  string icon = 10 [(field_ifdef) = "USE_ENTITY_ICON"];
   EntityCategory entity_category = 11;
   bool supports_stop = 12;
-  uint32 device_id = 13;
+  uint32 device_id = 13 [(field_ifdef) = "USE_DEVICES"];
 }
 
 enum LegacyCoverState {
@@ -361,7 +361,7 @@ message CoverStateResponse {
   float position = 3;
   float tilt = 4;
   CoverOperation current_operation = 5;
-  uint32 device_id = 6;
+  uint32 device_id = 6 [(field_ifdef) = "USE_DEVICES"];
 }
 
 enum LegacyCoverCommand {
@@ -388,7 +388,7 @@ message CoverCommandRequest {
   bool has_tilt = 6;
   float tilt = 7;
   bool stop = 8;
-  uint32 device_id = 9;
+  uint32 device_id = 9 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== FAN ====================
@@ -408,10 +408,10 @@ message ListEntitiesFanResponse {
   bool supports_direction = 7;
   int32 supported_speed_count = 8;
   bool disabled_by_default = 9;
-  string icon = 10;
+  string icon = 10 [(field_ifdef) = "USE_ENTITY_ICON"];
   EntityCategory entity_category = 11;
   repeated string supported_preset_modes = 12;
-  uint32 device_id = 13;
+  uint32 device_id = 13 [(field_ifdef) = "USE_DEVICES"];
 }
 enum FanSpeed {
   FAN_SPEED_LOW = 0;
@@ -436,7 +436,7 @@ message FanStateResponse {
   FanDirection direction = 5;
   int32 speed_level = 6;
   string preset_mode = 7;
-  uint32 device_id = 8;
+  uint32 device_id = 8 [(field_ifdef) = "USE_DEVICES"];
 }
 message FanCommandRequest {
   option (id) = 31;
@@ -458,7 +458,7 @@ message FanCommandRequest {
   int32 speed_level = 11;
   bool has_preset_mode = 12;
   string preset_mode = 13;
-  uint32 device_id = 14;
+  uint32 device_id = 14 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== LIGHT ====================
@@ -496,9 +496,9 @@ message ListEntitiesLightResponse {
   float max_mireds = 10;
   repeated string effects = 11;
   bool disabled_by_default = 13;
-  string icon = 14;
+  string icon = 14 [(field_ifdef) = "USE_ENTITY_ICON"];
   EntityCategory entity_category = 15;
-  uint32 device_id = 16;
+  uint32 device_id = 16 [(field_ifdef) = "USE_DEVICES"];
 }
 message LightStateResponse {
   option (id) = 24;
@@ -520,7 +520,7 @@ message LightStateResponse {
   float cold_white = 12;
   float warm_white = 13;
   string effect = 9;
-  uint32 device_id = 14;
+  uint32 device_id = 14 [(field_ifdef) = "USE_DEVICES"];
 }
 message LightCommandRequest {
   option (id) = 32;
@@ -556,7 +556,7 @@ message LightCommandRequest {
   uint32 flash_length = 17;
   bool has_effect = 18;
   string effect = 19;
-  uint32 device_id = 28;
+  uint32 device_id = 28 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== SENSOR ====================
@@ -584,7 +584,7 @@ message ListEntitiesSensorResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   string unit_of_measurement = 6;
   int32 accuracy_decimals = 7;
   bool force_update = 8;
@@ -594,7 +594,7 @@ message ListEntitiesSensorResponse {
   SensorLastResetType legacy_last_reset_type = 11;
   bool disabled_by_default = 12;
   EntityCategory entity_category = 13;
-  uint32 device_id = 14;
+  uint32 device_id = 14 [(field_ifdef) = "USE_DEVICES"];
 }
 message SensorStateResponse {
   option (id) = 25;
@@ -608,7 +608,7 @@ message SensorStateResponse {
   // If the sensor does not have a valid state yet.
   // Equivalent to `!obj->has_state()` - inverse logic to make state packets smaller
   bool missing_state = 3;
-  uint32 device_id = 4;
+  uint32 device_id = 4 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== SWITCH ====================
@@ -623,12 +623,12 @@ message ListEntitiesSwitchResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   bool assumed_state = 6;
   bool disabled_by_default = 7;
   EntityCategory entity_category = 8;
   string device_class = 9;
-  uint32 device_id = 10;
+  uint32 device_id = 10 [(field_ifdef) = "USE_DEVICES"];
 }
 message SwitchStateResponse {
   option (id) = 26;
@@ -639,7 +639,7 @@ message SwitchStateResponse {
 
   fixed32 key = 1;
   bool state = 2;
-  uint32 device_id = 3;
+  uint32 device_id = 3 [(field_ifdef) = "USE_DEVICES"];
 }
 message SwitchCommandRequest {
   option (id) = 33;
@@ -650,7 +650,7 @@ message SwitchCommandRequest {
 
   fixed32 key = 1;
   bool state = 2;
-  uint32 device_id = 3;
+  uint32 device_id = 3 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== TEXT SENSOR ====================
@@ -665,11 +665,11 @@ message ListEntitiesTextSensorResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   bool disabled_by_default = 6;
   EntityCategory entity_category = 7;
   string device_class = 8;
-  uint32 device_id = 9;
+  uint32 device_id = 9 [(field_ifdef) = "USE_DEVICES"];
 }
 message TextSensorStateResponse {
   option (id) = 27;
@@ -683,7 +683,7 @@ message TextSensorStateResponse {
   // If the text sensor does not have a valid state yet.
   // Equivalent to `!obj->has_state()` - inverse logic to make state packets smaller
   bool missing_state = 3;
-  uint32 device_id = 4;
+  uint32 device_id = 4 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== SUBSCRIBE LOGS ====================
@@ -855,9 +855,9 @@ message ListEntitiesCameraResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
   bool disabled_by_default = 5;
-  string icon = 6;
+  string icon = 6 [(field_ifdef) = "USE_ENTITY_ICON"];
   EntityCategory entity_category = 7;
-  uint32 device_id = 8;
+  uint32 device_id = 8 [(field_ifdef) = "USE_DEVICES"];
 }
 
 message CameraImageResponse {
@@ -869,7 +869,7 @@ message CameraImageResponse {
   fixed32 key = 1;
   bytes data = 2;
   bool done = 3;
-  uint32 device_id = 4;
+  uint32 device_id = 4 [(field_ifdef) = "USE_DEVICES"];
 }
 message CameraImageRequest {
   option (id) = 45;
@@ -955,14 +955,14 @@ message ListEntitiesClimateResponse {
   repeated ClimatePreset supported_presets = 16;
   repeated string supported_custom_presets = 17;
   bool disabled_by_default = 18;
-  string icon = 19;
+  string icon = 19 [(field_ifdef) = "USE_ENTITY_ICON"];
   EntityCategory entity_category = 20;
   float visual_current_temperature_step = 21;
   bool supports_current_humidity = 22;
   bool supports_target_humidity = 23;
   float visual_min_humidity = 24;
   float visual_max_humidity = 25;
-  uint32 device_id = 26;
+  uint32 device_id = 26 [(field_ifdef) = "USE_DEVICES"];
 }
 message ClimateStateResponse {
   option (id) = 47;
@@ -987,7 +987,7 @@ message ClimateStateResponse {
   string custom_preset = 13;
   float current_humidity = 14;
   float target_humidity = 15;
-  uint32 device_id = 16;
+  uint32 device_id = 16 [(field_ifdef) = "USE_DEVICES"];
 }
 message ClimateCommandRequest {
   option (id) = 48;
@@ -1020,7 +1020,7 @@ message ClimateCommandRequest {
   string custom_preset = 21;
   bool has_target_humidity = 22;
   float target_humidity = 23;
-  uint32 device_id = 24;
+  uint32 device_id = 24 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== NUMBER ====================
@@ -1040,7 +1040,7 @@ message ListEntitiesNumberResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   float min_value = 6;
   float max_value = 7;
   float step = 8;
@@ -1049,7 +1049,7 @@ message ListEntitiesNumberResponse {
   string unit_of_measurement = 11;
   NumberMode mode = 12;
   string device_class = 13;
-  uint32 device_id = 14;
+  uint32 device_id = 14 [(field_ifdef) = "USE_DEVICES"];
 }
 message NumberStateResponse {
   option (id) = 50;
@@ -1063,7 +1063,7 @@ message NumberStateResponse {
   // If the number does not have a valid state yet.
   // Equivalent to `!obj->has_state()` - inverse logic to make state packets smaller
   bool missing_state = 3;
-  uint32 device_id = 4;
+  uint32 device_id = 4 [(field_ifdef) = "USE_DEVICES"];
 }
 message NumberCommandRequest {
   option (id) = 51;
@@ -1074,7 +1074,7 @@ message NumberCommandRequest {
 
   fixed32 key = 1;
   float state = 2;
-  uint32 device_id = 3;
+  uint32 device_id = 3 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== SELECT ====================
@@ -1089,11 +1089,11 @@ message ListEntitiesSelectResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   repeated string options = 6;
   bool disabled_by_default = 7;
   EntityCategory entity_category = 8;
-  uint32 device_id = 9;
+  uint32 device_id = 9 [(field_ifdef) = "USE_DEVICES"];
 }
 message SelectStateResponse {
   option (id) = 53;
@@ -1107,7 +1107,7 @@ message SelectStateResponse {
   // If the select does not have a valid state yet.
   // Equivalent to `!obj->has_state()` - inverse logic to make state packets smaller
   bool missing_state = 3;
-  uint32 device_id = 4;
+  uint32 device_id = 4 [(field_ifdef) = "USE_DEVICES"];
 }
 message SelectCommandRequest {
   option (id) = 54;
@@ -1118,7 +1118,7 @@ message SelectCommandRequest {
 
   fixed32 key = 1;
   string state = 2;
-  uint32 device_id = 3;
+  uint32 device_id = 3 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== SIREN ====================
@@ -1133,13 +1133,13 @@ message ListEntitiesSirenResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   bool disabled_by_default = 6;
   repeated string tones = 7;
   bool supports_duration = 8;
   bool supports_volume = 9;
   EntityCategory entity_category = 10;
-  uint32 device_id = 11;
+  uint32 device_id = 11 [(field_ifdef) = "USE_DEVICES"];
 }
 message SirenStateResponse {
   option (id) = 56;
@@ -1150,7 +1150,7 @@ message SirenStateResponse {
 
   fixed32 key = 1;
   bool state = 2;
-  uint32 device_id = 3;
+  uint32 device_id = 3 [(field_ifdef) = "USE_DEVICES"];
 }
 message SirenCommandRequest {
   option (id) = 57;
@@ -1168,7 +1168,7 @@ message SirenCommandRequest {
   uint32 duration = 7;
   bool has_volume = 8;
   float volume = 9;
-  uint32 device_id = 10;
+  uint32 device_id = 10 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== LOCK ====================
@@ -1196,7 +1196,7 @@ message ListEntitiesLockResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   bool disabled_by_default = 6;
   EntityCategory entity_category = 7;
   bool assumed_state = 8;
@@ -1206,7 +1206,7 @@ message ListEntitiesLockResponse {
 
   // Not yet implemented:
   string code_format = 11;
-  uint32 device_id = 12;
+  uint32 device_id = 12 [(field_ifdef) = "USE_DEVICES"];
 }
 message LockStateResponse {
   option (id) = 59;
@@ -1216,7 +1216,7 @@ message LockStateResponse {
   option (no_delay) = true;
   fixed32 key = 1;
   LockState state = 2;
-  uint32 device_id = 3;
+  uint32 device_id = 3 [(field_ifdef) = "USE_DEVICES"];
 }
 message LockCommandRequest {
   option (id) = 60;
@@ -1230,7 +1230,7 @@ message LockCommandRequest {
   // Not yet implemented:
   bool has_code = 3;
   string code = 4;
-  uint32 device_id = 5;
+  uint32 device_id = 5 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== BUTTON ====================
@@ -1245,11 +1245,11 @@ message ListEntitiesButtonResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   bool disabled_by_default = 6;
   EntityCategory entity_category = 7;
   string device_class = 8;
-  uint32 device_id = 9;
+  uint32 device_id = 9 [(field_ifdef) = "USE_DEVICES"];
 }
 message ButtonCommandRequest {
   option (id) = 62;
@@ -1259,7 +1259,7 @@ message ButtonCommandRequest {
   option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
-  uint32 device_id = 2;
+  uint32 device_id = 2 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== MEDIA PLAYER ====================
@@ -1300,7 +1300,7 @@ message ListEntitiesMediaPlayerResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   bool disabled_by_default = 6;
   EntityCategory entity_category = 7;
 
@@ -1308,7 +1308,7 @@ message ListEntitiesMediaPlayerResponse {
 
   repeated MediaPlayerSupportedFormat supported_formats = 9;
 
-  uint32 device_id = 10;
+  uint32 device_id = 10 [(field_ifdef) = "USE_DEVICES"];
 }
 message MediaPlayerStateResponse {
   option (id) = 64;
@@ -1320,7 +1320,7 @@ message MediaPlayerStateResponse {
   MediaPlayerState state = 2;
   float volume = 3;
   bool muted = 4;
-  uint32 device_id = 5;
+  uint32 device_id = 5 [(field_ifdef) = "USE_DEVICES"];
 }
 message MediaPlayerCommandRequest {
   option (id) = 65;
@@ -1342,7 +1342,7 @@ message MediaPlayerCommandRequest {
 
   bool has_announcement = 8;
   bool announcement = 9;
-  uint32 device_id = 10;
+  uint32 device_id = 10 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== BLUETOOTH ====================
@@ -1846,13 +1846,13 @@ message ListEntitiesAlarmControlPanelResponse {
   fixed32 key = 2;
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   bool disabled_by_default = 6;
   EntityCategory entity_category = 7;
   uint32 supported_features = 8;
   bool requires_code = 9;
   bool requires_code_to_arm = 10;
-  uint32 device_id = 11;
+  uint32 device_id = 11 [(field_ifdef) = "USE_DEVICES"];
 }
 
 message AlarmControlPanelStateResponse {
@@ -1863,7 +1863,7 @@ message AlarmControlPanelStateResponse {
   option (no_delay) = true;
   fixed32 key = 1;
   AlarmControlPanelState state = 2;
-  uint32 device_id = 3;
+  uint32 device_id = 3 [(field_ifdef) = "USE_DEVICES"];
 }
 
 message AlarmControlPanelCommandRequest {
@@ -1875,7 +1875,7 @@ message AlarmControlPanelCommandRequest {
   fixed32 key = 1;
   AlarmControlPanelStateCommand command = 2;
   string code = 3;
-  uint32 device_id = 4;
+  uint32 device_id = 4 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ===================== TEXT =====================
@@ -1893,7 +1893,7 @@ message ListEntitiesTextResponse {
   fixed32 key = 2;
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   bool disabled_by_default = 6;
   EntityCategory entity_category = 7;
 
@@ -1901,7 +1901,7 @@ message ListEntitiesTextResponse {
   uint32 max_length = 9;
   string pattern = 10;
   TextMode mode = 11;
-  uint32 device_id = 12;
+  uint32 device_id = 12 [(field_ifdef) = "USE_DEVICES"];
 }
 message TextStateResponse {
   option (id) = 98;
@@ -1915,7 +1915,7 @@ message TextStateResponse {
   // If the Text does not have a valid state yet.
   // Equivalent to `!obj->has_state()` - inverse logic to make state packets smaller
   bool missing_state = 3;
-  uint32 device_id = 4;
+  uint32 device_id = 4 [(field_ifdef) = "USE_DEVICES"];
 }
 message TextCommandRequest {
   option (id) = 99;
@@ -1926,7 +1926,7 @@ message TextCommandRequest {
 
   fixed32 key = 1;
   string state = 2;
-  uint32 device_id = 3;
+  uint32 device_id = 3 [(field_ifdef) = "USE_DEVICES"];
 }
 
 
@@ -1942,10 +1942,10 @@ message ListEntitiesDateResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   bool disabled_by_default = 6;
   EntityCategory entity_category = 7;
-  uint32 device_id = 8;
+  uint32 device_id = 8 [(field_ifdef) = "USE_DEVICES"];
 }
 message DateStateResponse {
   option (id) = 101;
@@ -1961,7 +1961,7 @@ message DateStateResponse {
   uint32 year = 3;
   uint32 month = 4;
   uint32 day = 5;
-  uint32 device_id = 6;
+  uint32 device_id = 6 [(field_ifdef) = "USE_DEVICES"];
 }
 message DateCommandRequest {
   option (id) = 102;
@@ -1974,7 +1974,7 @@ message DateCommandRequest {
   uint32 year = 2;
   uint32 month = 3;
   uint32 day = 4;
-  uint32 device_id = 5;
+  uint32 device_id = 5 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== DATETIME TIME ====================
@@ -1989,10 +1989,10 @@ message ListEntitiesTimeResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   bool disabled_by_default = 6;
   EntityCategory entity_category = 7;
-  uint32 device_id = 8;
+  uint32 device_id = 8 [(field_ifdef) = "USE_DEVICES"];
 }
 message TimeStateResponse {
   option (id) = 104;
@@ -2008,7 +2008,7 @@ message TimeStateResponse {
   uint32 hour = 3;
   uint32 minute = 4;
   uint32 second = 5;
-  uint32 device_id = 6;
+  uint32 device_id = 6 [(field_ifdef) = "USE_DEVICES"];
 }
 message TimeCommandRequest {
   option (id) = 105;
@@ -2021,7 +2021,7 @@ message TimeCommandRequest {
   uint32 hour = 2;
   uint32 minute = 3;
   uint32 second = 4;
-  uint32 device_id = 5;
+  uint32 device_id = 5 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== EVENT ====================
@@ -2036,13 +2036,13 @@ message ListEntitiesEventResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   bool disabled_by_default = 6;
   EntityCategory entity_category = 7;
   string device_class = 8;
 
   repeated string event_types = 9;
-  uint32 device_id = 10;
+  uint32 device_id = 10 [(field_ifdef) = "USE_DEVICES"];
 }
 message EventResponse {
   option (id) = 108;
@@ -2052,7 +2052,7 @@ message EventResponse {
 
   fixed32 key = 1;
   string event_type = 2;
-  uint32 device_id = 3;
+  uint32 device_id = 3 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== VALVE ====================
@@ -2067,7 +2067,7 @@ message ListEntitiesValveResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   bool disabled_by_default = 6;
   EntityCategory entity_category = 7;
   string device_class = 8;
@@ -2075,7 +2075,7 @@ message ListEntitiesValveResponse {
   bool assumed_state = 9;
   bool supports_position = 10;
   bool supports_stop = 11;
-  uint32 device_id = 12;
+  uint32 device_id = 12 [(field_ifdef) = "USE_DEVICES"];
 }
 
 enum ValveOperation {
@@ -2093,7 +2093,7 @@ message ValveStateResponse {
   fixed32 key = 1;
   float position = 2;
   ValveOperation current_operation = 3;
-  uint32 device_id = 4;
+  uint32 device_id = 4 [(field_ifdef) = "USE_DEVICES"];
 }
 
 message ValveCommandRequest {
@@ -2107,7 +2107,7 @@ message ValveCommandRequest {
   bool has_position = 2;
   float position = 3;
   bool stop = 4;
-  uint32 device_id = 5;
+  uint32 device_id = 5 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== DATETIME DATETIME ====================
@@ -2122,10 +2122,10 @@ message ListEntitiesDateTimeResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   bool disabled_by_default = 6;
   EntityCategory entity_category = 7;
-  uint32 device_id = 8;
+  uint32 device_id = 8 [(field_ifdef) = "USE_DEVICES"];
 }
 message DateTimeStateResponse {
   option (id) = 113;
@@ -2139,7 +2139,7 @@ message DateTimeStateResponse {
   // Equivalent to `!obj->has_state()` - inverse logic to make state packets smaller
   bool missing_state = 2;
   fixed32 epoch_seconds = 3;
-  uint32 device_id = 4;
+  uint32 device_id = 4 [(field_ifdef) = "USE_DEVICES"];
 }
 message DateTimeCommandRequest {
   option (id) = 114;
@@ -2150,7 +2150,7 @@ message DateTimeCommandRequest {
 
   fixed32 key = 1;
   fixed32 epoch_seconds = 2;
-  uint32 device_id = 3;
+  uint32 device_id = 3 [(field_ifdef) = "USE_DEVICES"];
 }
 
 // ==================== UPDATE ====================
@@ -2165,11 +2165,11 @@ message ListEntitiesUpdateResponse {
   string name = 3;
   reserved 4; // Deprecated: was string unique_id
 
-  string icon = 5;
+  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
   bool disabled_by_default = 6;
   EntityCategory entity_category = 7;
   string device_class = 8;
-  uint32 device_id = 9;
+  uint32 device_id = 9 [(field_ifdef) = "USE_DEVICES"];
 }
 message UpdateStateResponse {
   option (id) = 117;
@@ -2188,7 +2188,7 @@ message UpdateStateResponse {
   string title = 8;
   string release_summary = 9;
   string release_url = 10;
-  uint32 device_id = 11;
+  uint32 device_id = 11 [(field_ifdef) = "USE_DEVICES"];
 }
 enum UpdateCommand {
   UPDATE_COMMAND_NONE = 0;
@@ -2204,5 +2204,5 @@ message UpdateCommandRequest {
 
   fixed32 key = 1;
   UpdateCommand command = 2;
-  uint32 device_id = 3;
+  uint32 device_id = 3 [(field_ifdef) = "USE_DEVICES"];
 }
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index a079c1fff1..a9de19cb05 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -1463,7 +1463,9 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
 #endif
   resp.name = App.get_name();
   resp.friendly_name = App.get_friendly_name();
+#ifdef USE_AREAS
   resp.suggested_area = App.get_area();
+#endif
   resp.mac_address = get_mac_address_pretty();
   resp.esphome_version = ESPHOME_VERSION;
   resp.compilation_time = App.get_compilation_time();
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index d7bf9a3858..e2d0eccfd1 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -286,8 +286,10 @@ class APIConnection : public APIServerConnection {
     if (entity->has_own_name())
       response.name = entity->get_name();
 
-    // Set common EntityBase properties
+      // Set common EntityBase properties
+#ifdef USE_ENTITY_ICON
     response.icon = entity->get_icon();
+#endif
     response.disabled_by_default = entity->is_disabled_by_default();
     response.entity_category = static_cast<enums::EntityCategory>(entity->get_entity_category());
 #ifdef USE_DEVICES
diff --git a/esphome/components/api/api_options.proto b/esphome/components/api/api_options.proto
index 3a547b8688..022cd8b3d2 100644
--- a/esphome/components/api/api_options.proto
+++ b/esphome/components/api/api_options.proto
@@ -23,3 +23,7 @@ extend google.protobuf.MessageOptions {
     optional bool no_delay = 1040 [default=false];
     optional string base_class = 1041;
 }
+
+extend google.protobuf.FieldOptions {
+    optional string field_ifdef = 1042;
+}
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 5e0f0a4fb6..010e483534 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -124,26 +124,54 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(4, this->esphome_version);
   buffer.encode_string(5, this->compilation_time);
   buffer.encode_string(6, this->model);
+#ifdef USE_DEEP_SLEEP
   buffer.encode_bool(7, this->has_deep_sleep);
+#endif
+#ifdef ESPHOME_PROJECT_NAME
   buffer.encode_string(8, this->project_name);
+#endif
+#ifdef ESPHOME_PROJECT_NAME
   buffer.encode_string(9, this->project_version);
+#endif
+#ifdef USE_WEBSERVER
   buffer.encode_uint32(10, this->webserver_port);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
   buffer.encode_uint32(11, this->legacy_bluetooth_proxy_version);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
   buffer.encode_uint32(15, this->bluetooth_proxy_feature_flags);
+#endif
   buffer.encode_string(12, this->manufacturer);
   buffer.encode_string(13, this->friendly_name);
+#ifdef USE_VOICE_ASSISTANT
   buffer.encode_uint32(14, this->legacy_voice_assistant_version);
+#endif
+#ifdef USE_VOICE_ASSISTANT
   buffer.encode_uint32(17, this->voice_assistant_feature_flags);
+#endif
+#ifdef USE_AREAS
   buffer.encode_string(16, this->suggested_area);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
   buffer.encode_string(18, this->bluetooth_mac_address);
+#endif
+#ifdef USE_API_NOISE
   buffer.encode_bool(19, this->api_encryption_supported);
+#endif
+#ifdef USE_DEVICES
   for (auto &it : this->devices) {
     buffer.encode_message(20, it, true);
   }
+#endif
+#ifdef USE_AREAS
   for (auto &it : this->areas) {
     buffer.encode_message(21, it, true);
   }
+#endif
+#ifdef USE_AREAS
   buffer.encode_message(22, this->area);
+#endif
 }
 void DeviceInfoResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_bool_field(total_size, 1, this->uses_password);
@@ -152,22 +180,50 @@ void DeviceInfoResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->esphome_version);
   ProtoSize::add_string_field(total_size, 1, this->compilation_time);
   ProtoSize::add_string_field(total_size, 1, this->model);
+#ifdef USE_DEEP_SLEEP
   ProtoSize::add_bool_field(total_size, 1, this->has_deep_sleep);
+#endif
+#ifdef ESPHOME_PROJECT_NAME
   ProtoSize::add_string_field(total_size, 1, this->project_name);
+#endif
+#ifdef ESPHOME_PROJECT_NAME
   ProtoSize::add_string_field(total_size, 1, this->project_version);
+#endif
+#ifdef USE_WEBSERVER
   ProtoSize::add_uint32_field(total_size, 1, this->webserver_port);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
   ProtoSize::add_uint32_field(total_size, 1, this->legacy_bluetooth_proxy_version);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
   ProtoSize::add_uint32_field(total_size, 1, this->bluetooth_proxy_feature_flags);
+#endif
   ProtoSize::add_string_field(total_size, 1, this->manufacturer);
   ProtoSize::add_string_field(total_size, 1, this->friendly_name);
+#ifdef USE_VOICE_ASSISTANT
   ProtoSize::add_uint32_field(total_size, 1, this->legacy_voice_assistant_version);
+#endif
+#ifdef USE_VOICE_ASSISTANT
   ProtoSize::add_uint32_field(total_size, 2, this->voice_assistant_feature_flags);
+#endif
+#ifdef USE_AREAS
   ProtoSize::add_string_field(total_size, 2, this->suggested_area);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
   ProtoSize::add_string_field(total_size, 2, this->bluetooth_mac_address);
+#endif
+#ifdef USE_API_NOISE
   ProtoSize::add_bool_field(total_size, 2, this->api_encryption_supported);
+#endif
+#ifdef USE_DEVICES
   ProtoSize::add_repeated_message(total_size, 2, this->devices);
+#endif
+#ifdef USE_AREAS
   ProtoSize::add_repeated_message(total_size, 2, this->areas);
+#endif
+#ifdef USE_AREAS
   ProtoSize::add_message_object(total_size, 2, this->area);
+#endif
 }
 #ifdef USE_BINARY_SENSOR
 void ListEntitiesBinarySensorResponse::encode(ProtoWriteBuffer buffer) const {
@@ -177,9 +233,13 @@ void ListEntitiesBinarySensorResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(5, this->device_class);
   buffer.encode_bool(6, this->is_status_binary_sensor);
   buffer.encode_bool(7, this->disabled_by_default);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(8, this->icon);
+#endif
   buffer.encode_uint32(9, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   buffer.encode_uint32(10, this->device_id);
+#endif
 }
 void ListEntitiesBinarySensorResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
@@ -188,21 +248,29 @@ void ListEntitiesBinarySensorResponse::calculate_size(uint32_t &total_size) cons
   ProtoSize::add_string_field(total_size, 1, this->device_class);
   ProtoSize::add_bool_field(total_size, 1, this->is_status_binary_sensor);
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void BinarySensorStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_bool(2, this->state);
   buffer.encode_bool(3, this->missing_state);
+#ifdef USE_DEVICES
   buffer.encode_uint32(4, this->device_id);
+#endif
 }
 void BinarySensorStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_bool_field(total_size, 1, this->state);
   ProtoSize::add_bool_field(total_size, 1, this->missing_state);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 #endif
 #ifdef USE_COVER
@@ -215,10 +283,14 @@ void ListEntitiesCoverResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(7, this->supports_tilt);
   buffer.encode_string(8, this->device_class);
   buffer.encode_bool(9, this->disabled_by_default);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(10, this->icon);
+#endif
   buffer.encode_uint32(11, static_cast<uint32_t>(this->entity_category));
   buffer.encode_bool(12, this->supports_stop);
+#ifdef USE_DEVICES
   buffer.encode_uint32(13, this->device_id);
+#endif
 }
 void ListEntitiesCoverResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
@@ -229,10 +301,14 @@ void ListEntitiesCoverResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_bool_field(total_size, 1, this->supports_tilt);
   ProtoSize::add_string_field(total_size, 1, this->device_class);
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
   ProtoSize::add_bool_field(total_size, 1, this->supports_stop);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void CoverStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
@@ -240,7 +316,9 @@ void CoverStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_float(3, this->position);
   buffer.encode_float(4, this->tilt);
   buffer.encode_uint32(5, static_cast<uint32_t>(this->current_operation));
+#ifdef USE_DEVICES
   buffer.encode_uint32(6, this->device_id);
+#endif
 }
 void CoverStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
@@ -248,7 +326,9 @@ void CoverStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_float_field(total_size, 1, this->position);
   ProtoSize::add_float_field(total_size, 1, this->tilt);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->current_operation));
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool CoverCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
@@ -267,9 +347,11 @@ bool CoverCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
     case 8:
       this->stop = value.as_bool();
       break;
+#ifdef USE_DEVICES
     case 9:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -302,12 +384,16 @@ void ListEntitiesFanResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(7, this->supports_direction);
   buffer.encode_int32(8, this->supported_speed_count);
   buffer.encode_bool(9, this->disabled_by_default);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(10, this->icon);
+#endif
   buffer.encode_uint32(11, static_cast<uint32_t>(this->entity_category));
   for (auto &it : this->supported_preset_modes) {
     buffer.encode_string(12, it, true);
   }
+#ifdef USE_DEVICES
   buffer.encode_uint32(13, this->device_id);
+#endif
 }
 void ListEntitiesFanResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
@@ -318,14 +404,18 @@ void ListEntitiesFanResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_bool_field(total_size, 1, this->supports_direction);
   ProtoSize::add_int32_field(total_size, 1, this->supported_speed_count);
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
   if (!this->supported_preset_modes.empty()) {
     for (const auto &it : this->supported_preset_modes) {
       ProtoSize::add_string_field_repeated(total_size, 1, it);
     }
   }
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void FanStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
@@ -335,7 +425,9 @@ void FanStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(5, static_cast<uint32_t>(this->direction));
   buffer.encode_int32(6, this->speed_level);
   buffer.encode_string(7, this->preset_mode);
+#ifdef USE_DEVICES
   buffer.encode_uint32(8, this->device_id);
+#endif
 }
 void FanStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
@@ -345,7 +437,9 @@ void FanStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->direction));
   ProtoSize::add_int32_field(total_size, 1, this->speed_level);
   ProtoSize::add_string_field(total_size, 1, this->preset_mode);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool FanCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
@@ -382,9 +476,11 @@ bool FanCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
     case 12:
       this->has_preset_mode = value.as_bool();
       break;
+#ifdef USE_DEVICES
     case 14:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -429,9 +525,13 @@ void ListEntitiesLightResponse::encode(ProtoWriteBuffer buffer) const {
     buffer.encode_string(11, it, true);
   }
   buffer.encode_bool(13, this->disabled_by_default);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(14, this->icon);
+#endif
   buffer.encode_uint32(15, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   buffer.encode_uint32(16, this->device_id);
+#endif
 }
 void ListEntitiesLightResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
@@ -454,9 +554,13 @@ void ListEntitiesLightResponse::calculate_size(uint32_t &total_size) const {
     }
   }
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 2, this->device_id);
+#endif
 }
 void LightStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
@@ -472,7 +576,9 @@ void LightStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_float(12, this->cold_white);
   buffer.encode_float(13, this->warm_white);
   buffer.encode_string(9, this->effect);
+#ifdef USE_DEVICES
   buffer.encode_uint32(14, this->device_id);
+#endif
 }
 void LightStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
@@ -488,7 +594,9 @@ void LightStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_float_field(total_size, 1, this->cold_white);
   ProtoSize::add_float_field(total_size, 1, this->warm_white);
   ProtoSize::add_string_field(total_size, 1, this->effect);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool LightCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
@@ -540,9 +648,11 @@ bool LightCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
     case 18:
       this->has_effect = value.as_bool();
       break;
+#ifdef USE_DEVICES
     case 28:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -601,7 +711,9 @@ void ListEntitiesSensorResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_string(6, this->unit_of_measurement);
   buffer.encode_int32(7, this->accuracy_decimals);
   buffer.encode_bool(8, this->force_update);
@@ -610,13 +722,17 @@ void ListEntitiesSensorResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(11, static_cast<uint32_t>(this->legacy_last_reset_type));
   buffer.encode_bool(12, this->disabled_by_default);
   buffer.encode_uint32(13, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   buffer.encode_uint32(14, this->device_id);
+#endif
 }
 void ListEntitiesSensorResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_string_field(total_size, 1, this->unit_of_measurement);
   ProtoSize::add_int32_field(total_size, 1, this->accuracy_decimals);
   ProtoSize::add_bool_field(total_size, 1, this->force_update);
@@ -625,19 +741,25 @@ void ListEntitiesSensorResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->legacy_last_reset_type));
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void SensorStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_float(2, this->state);
   buffer.encode_bool(3, this->missing_state);
+#ifdef USE_DEVICES
   buffer.encode_uint32(4, this->device_id);
+#endif
 }
 void SensorStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_float_field(total_size, 1, this->state);
   ProtoSize::add_bool_field(total_size, 1, this->missing_state);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 #endif
 #ifdef USE_SWITCH
@@ -645,42 +767,56 @@ void ListEntitiesSwitchResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_bool(6, this->assumed_state);
   buffer.encode_bool(7, this->disabled_by_default);
   buffer.encode_uint32(8, static_cast<uint32_t>(this->entity_category));
   buffer.encode_string(9, this->device_class);
+#ifdef USE_DEVICES
   buffer.encode_uint32(10, this->device_id);
+#endif
 }
 void ListEntitiesSwitchResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_bool_field(total_size, 1, this->assumed_state);
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
   ProtoSize::add_string_field(total_size, 1, this->device_class);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void SwitchStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_bool(2, this->state);
+#ifdef USE_DEVICES
   buffer.encode_uint32(3, this->device_id);
+#endif
 }
 void SwitchStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_bool_field(total_size, 1, this->state);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool SwitchCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 2:
       this->state = value.as_bool();
       break;
+#ifdef USE_DEVICES
     case 3:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -702,33 +838,45 @@ void ListEntitiesTextSensorResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_bool(6, this->disabled_by_default);
   buffer.encode_uint32(7, static_cast<uint32_t>(this->entity_category));
   buffer.encode_string(8, this->device_class);
+#ifdef USE_DEVICES
   buffer.encode_uint32(9, this->device_id);
+#endif
 }
 void ListEntitiesTextSensorResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
   ProtoSize::add_string_field(total_size, 1, this->device_class);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void TextSensorStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_string(2, this->state);
   buffer.encode_bool(3, this->missing_state);
+#ifdef USE_DEVICES
   buffer.encode_uint32(4, this->device_id);
+#endif
 }
 void TextSensorStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->state);
   ProtoSize::add_bool_field(total_size, 1, this->missing_state);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 #endif
 bool SubscribeLogsRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
@@ -1012,30 +1160,42 @@ void ListEntitiesCameraResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
   buffer.encode_bool(5, this->disabled_by_default);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(6, this->icon);
+#endif
   buffer.encode_uint32(7, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   buffer.encode_uint32(8, this->device_id);
+#endif
 }
 void ListEntitiesCameraResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void CameraImageResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_bytes(2, reinterpret_cast<const uint8_t *>(this->data.data()), this->data.size());
   buffer.encode_bool(3, this->done);
+#ifdef USE_DEVICES
   buffer.encode_uint32(4, this->device_id);
+#endif
 }
 void CameraImageResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->data);
   ProtoSize::add_bool_field(total_size, 1, this->done);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool CameraImageRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
@@ -1082,14 +1242,18 @@ void ListEntitiesClimateResponse::encode(ProtoWriteBuffer buffer) const {
     buffer.encode_string(17, it, true);
   }
   buffer.encode_bool(18, this->disabled_by_default);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(19, this->icon);
+#endif
   buffer.encode_uint32(20, static_cast<uint32_t>(this->entity_category));
   buffer.encode_float(21, this->visual_current_temperature_step);
   buffer.encode_bool(22, this->supports_current_humidity);
   buffer.encode_bool(23, this->supports_target_humidity);
   buffer.encode_float(24, this->visual_min_humidity);
   buffer.encode_float(25, this->visual_max_humidity);
+#ifdef USE_DEVICES
   buffer.encode_uint32(26, this->device_id);
+#endif
 }
 void ListEntitiesClimateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
@@ -1133,14 +1297,18 @@ void ListEntitiesClimateResponse::calculate_size(uint32_t &total_size) const {
     }
   }
   ProtoSize::add_bool_field(total_size, 2, this->disabled_by_default);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 2, this->icon);
+#endif
   ProtoSize::add_enum_field(total_size, 2, static_cast<uint32_t>(this->entity_category));
   ProtoSize::add_float_field(total_size, 2, this->visual_current_temperature_step);
   ProtoSize::add_bool_field(total_size, 2, this->supports_current_humidity);
   ProtoSize::add_bool_field(total_size, 2, this->supports_target_humidity);
   ProtoSize::add_float_field(total_size, 2, this->visual_min_humidity);
   ProtoSize::add_float_field(total_size, 2, this->visual_max_humidity);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 2, this->device_id);
+#endif
 }
 void ClimateStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
@@ -1158,7 +1326,9 @@ void ClimateStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(13, this->custom_preset);
   buffer.encode_float(14, this->current_humidity);
   buffer.encode_float(15, this->target_humidity);
+#ifdef USE_DEVICES
   buffer.encode_uint32(16, this->device_id);
+#endif
 }
 void ClimateStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
@@ -1176,7 +1346,9 @@ void ClimateStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->custom_preset);
   ProtoSize::add_float_field(total_size, 1, this->current_humidity);
   ProtoSize::add_float_field(total_size, 1, this->target_humidity);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 2, this->device_id);
+#endif
 }
 bool ClimateCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
@@ -1228,9 +1400,11 @@ bool ClimateCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value)
     case 22:
       this->has_target_humidity = value.as_bool();
       break;
+#ifdef USE_DEVICES
     case 24:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -1277,7 +1451,9 @@ void ListEntitiesNumberResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_float(6, this->min_value);
   buffer.encode_float(7, this->max_value);
   buffer.encode_float(8, this->step);
@@ -1286,13 +1462,17 @@ void ListEntitiesNumberResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(11, this->unit_of_measurement);
   buffer.encode_uint32(12, static_cast<uint32_t>(this->mode));
   buffer.encode_string(13, this->device_class);
+#ifdef USE_DEVICES
   buffer.encode_uint32(14, this->device_id);
+#endif
 }
 void ListEntitiesNumberResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_float_field(total_size, 1, this->min_value);
   ProtoSize::add_float_field(total_size, 1, this->max_value);
   ProtoSize::add_float_field(total_size, 1, this->step);
@@ -1301,25 +1481,33 @@ void ListEntitiesNumberResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->unit_of_measurement);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->mode));
   ProtoSize::add_string_field(total_size, 1, this->device_class);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void NumberStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_float(2, this->state);
   buffer.encode_bool(3, this->missing_state);
+#ifdef USE_DEVICES
   buffer.encode_uint32(4, this->device_id);
+#endif
 }
 void NumberStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_float_field(total_size, 1, this->state);
   ProtoSize::add_bool_field(total_size, 1, this->missing_state);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool NumberCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
+#ifdef USE_DEVICES
     case 3:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -1344,19 +1532,25 @@ void ListEntitiesSelectResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   for (auto &it : this->options) {
     buffer.encode_string(6, it, true);
   }
   buffer.encode_bool(7, this->disabled_by_default);
   buffer.encode_uint32(8, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   buffer.encode_uint32(9, this->device_id);
+#endif
 }
 void ListEntitiesSelectResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   if (!this->options.empty()) {
     for (const auto &it : this->options) {
       ProtoSize::add_string_field_repeated(total_size, 1, it);
@@ -1364,25 +1558,33 @@ void ListEntitiesSelectResponse::calculate_size(uint32_t &total_size) const {
   }
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void SelectStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_string(2, this->state);
   buffer.encode_bool(3, this->missing_state);
+#ifdef USE_DEVICES
   buffer.encode_uint32(4, this->device_id);
+#endif
 }
 void SelectStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->state);
   ProtoSize::add_bool_field(total_size, 1, this->missing_state);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool SelectCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
+#ifdef USE_DEVICES
     case 3:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -1414,7 +1616,9 @@ void ListEntitiesSirenResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_bool(6, this->disabled_by_default);
   for (auto &it : this->tones) {
     buffer.encode_string(7, it, true);
@@ -1422,13 +1626,17 @@ void ListEntitiesSirenResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(8, this->supports_duration);
   buffer.encode_bool(9, this->supports_volume);
   buffer.encode_uint32(10, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   buffer.encode_uint32(11, this->device_id);
+#endif
 }
 void ListEntitiesSirenResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   if (!this->tones.empty()) {
     for (const auto &it : this->tones) {
@@ -1438,17 +1646,23 @@ void ListEntitiesSirenResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_bool_field(total_size, 1, this->supports_duration);
   ProtoSize::add_bool_field(total_size, 1, this->supports_volume);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void SirenStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_bool(2, this->state);
+#ifdef USE_DEVICES
   buffer.encode_uint32(3, this->device_id);
+#endif
 }
 void SirenStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_bool_field(total_size, 1, this->state);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool SirenCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
@@ -1470,9 +1684,11 @@ bool SirenCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
     case 8:
       this->has_volume = value.as_bool();
       break;
+#ifdef USE_DEVICES
     case 10:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -1507,37 +1723,49 @@ void ListEntitiesLockResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_bool(6, this->disabled_by_default);
   buffer.encode_uint32(7, static_cast<uint32_t>(this->entity_category));
   buffer.encode_bool(8, this->assumed_state);
   buffer.encode_bool(9, this->supports_open);
   buffer.encode_bool(10, this->requires_code);
   buffer.encode_string(11, this->code_format);
+#ifdef USE_DEVICES
   buffer.encode_uint32(12, this->device_id);
+#endif
 }
 void ListEntitiesLockResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
   ProtoSize::add_bool_field(total_size, 1, this->assumed_state);
   ProtoSize::add_bool_field(total_size, 1, this->supports_open);
   ProtoSize::add_bool_field(total_size, 1, this->requires_code);
   ProtoSize::add_string_field(total_size, 1, this->code_format);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void LockStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_uint32(2, static_cast<uint32_t>(this->state));
+#ifdef USE_DEVICES
   buffer.encode_uint32(3, this->device_id);
+#endif
 }
 void LockStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->state));
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool LockCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
@@ -1547,9 +1775,11 @@ bool LockCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
     case 3:
       this->has_code = value.as_bool();
       break;
+#ifdef USE_DEVICES
     case 5:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -1581,27 +1811,37 @@ void ListEntitiesButtonResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_bool(6, this->disabled_by_default);
   buffer.encode_uint32(7, static_cast<uint32_t>(this->entity_category));
   buffer.encode_string(8, this->device_class);
+#ifdef USE_DEVICES
   buffer.encode_uint32(9, this->device_id);
+#endif
 }
 void ListEntitiesButtonResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
   ProtoSize::add_string_field(total_size, 1, this->device_class);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool ButtonCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
+#ifdef USE_DEVICES
     case 2:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -1666,39 +1906,51 @@ void ListEntitiesMediaPlayerResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_bool(6, this->disabled_by_default);
   buffer.encode_uint32(7, static_cast<uint32_t>(this->entity_category));
   buffer.encode_bool(8, this->supports_pause);
   for (auto &it : this->supported_formats) {
     buffer.encode_message(9, it, true);
   }
+#ifdef USE_DEVICES
   buffer.encode_uint32(10, this->device_id);
+#endif
 }
 void ListEntitiesMediaPlayerResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
   ProtoSize::add_bool_field(total_size, 1, this->supports_pause);
   ProtoSize::add_repeated_message(total_size, 1, this->supported_formats);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void MediaPlayerStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_uint32(2, static_cast<uint32_t>(this->state));
   buffer.encode_float(3, this->volume);
   buffer.encode_bool(4, this->muted);
+#ifdef USE_DEVICES
   buffer.encode_uint32(5, this->device_id);
+#endif
 }
 void MediaPlayerStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->state));
   ProtoSize::add_float_field(total_size, 1, this->volume);
   ProtoSize::add_bool_field(total_size, 1, this->muted);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool MediaPlayerCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
@@ -1720,9 +1972,11 @@ bool MediaPlayerCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt val
     case 9:
       this->announcement = value.as_bool();
       break;
+#ifdef USE_DEVICES
     case 10:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -2523,44 +2777,58 @@ void ListEntitiesAlarmControlPanelResponse::encode(ProtoWriteBuffer buffer) cons
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_bool(6, this->disabled_by_default);
   buffer.encode_uint32(7, static_cast<uint32_t>(this->entity_category));
   buffer.encode_uint32(8, this->supported_features);
   buffer.encode_bool(9, this->requires_code);
   buffer.encode_bool(10, this->requires_code_to_arm);
+#ifdef USE_DEVICES
   buffer.encode_uint32(11, this->device_id);
+#endif
 }
 void ListEntitiesAlarmControlPanelResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
   ProtoSize::add_uint32_field(total_size, 1, this->supported_features);
   ProtoSize::add_bool_field(total_size, 1, this->requires_code);
   ProtoSize::add_bool_field(total_size, 1, this->requires_code_to_arm);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void AlarmControlPanelStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_uint32(2, static_cast<uint32_t>(this->state));
+#ifdef USE_DEVICES
   buffer.encode_uint32(3, this->device_id);
+#endif
 }
 void AlarmControlPanelStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->state));
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool AlarmControlPanelCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 2:
       this->command = static_cast<enums::AlarmControlPanelStateCommand>(value.as_uint32());
       break;
+#ifdef USE_DEVICES
     case 4:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -2592,45 +2860,59 @@ void ListEntitiesTextResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_bool(6, this->disabled_by_default);
   buffer.encode_uint32(7, static_cast<uint32_t>(this->entity_category));
   buffer.encode_uint32(8, this->min_length);
   buffer.encode_uint32(9, this->max_length);
   buffer.encode_string(10, this->pattern);
   buffer.encode_uint32(11, static_cast<uint32_t>(this->mode));
+#ifdef USE_DEVICES
   buffer.encode_uint32(12, this->device_id);
+#endif
 }
 void ListEntitiesTextResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
   ProtoSize::add_uint32_field(total_size, 1, this->min_length);
   ProtoSize::add_uint32_field(total_size, 1, this->max_length);
   ProtoSize::add_string_field(total_size, 1, this->pattern);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->mode));
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void TextStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_string(2, this->state);
   buffer.encode_bool(3, this->missing_state);
+#ifdef USE_DEVICES
   buffer.encode_uint32(4, this->device_id);
+#endif
 }
 void TextStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->state);
   ProtoSize::add_bool_field(total_size, 1, this->missing_state);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool TextCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
+#ifdef USE_DEVICES
     case 3:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -2662,19 +2944,27 @@ void ListEntitiesDateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_bool(6, this->disabled_by_default);
   buffer.encode_uint32(7, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   buffer.encode_uint32(8, this->device_id);
+#endif
 }
 void ListEntitiesDateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void DateStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
@@ -2682,7 +2972,9 @@ void DateStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(3, this->year);
   buffer.encode_uint32(4, this->month);
   buffer.encode_uint32(5, this->day);
+#ifdef USE_DEVICES
   buffer.encode_uint32(6, this->device_id);
+#endif
 }
 void DateStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
@@ -2690,7 +2982,9 @@ void DateStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_uint32_field(total_size, 1, this->year);
   ProtoSize::add_uint32_field(total_size, 1, this->month);
   ProtoSize::add_uint32_field(total_size, 1, this->day);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool DateCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
@@ -2703,9 +2997,11 @@ bool DateCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
     case 4:
       this->day = value.as_uint32();
       break;
+#ifdef USE_DEVICES
     case 5:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -2727,19 +3023,27 @@ void ListEntitiesTimeResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_bool(6, this->disabled_by_default);
   buffer.encode_uint32(7, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   buffer.encode_uint32(8, this->device_id);
+#endif
 }
 void ListEntitiesTimeResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void TimeStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
@@ -2747,7 +3051,9 @@ void TimeStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(3, this->hour);
   buffer.encode_uint32(4, this->minute);
   buffer.encode_uint32(5, this->second);
+#ifdef USE_DEVICES
   buffer.encode_uint32(6, this->device_id);
+#endif
 }
 void TimeStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
@@ -2755,7 +3061,9 @@ void TimeStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_uint32_field(total_size, 1, this->hour);
   ProtoSize::add_uint32_field(total_size, 1, this->minute);
   ProtoSize::add_uint32_field(total_size, 1, this->second);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool TimeCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
@@ -2768,9 +3076,11 @@ bool TimeCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
     case 4:
       this->second = value.as_uint32();
       break;
+#ifdef USE_DEVICES
     case 5:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -2792,20 +3102,26 @@ void ListEntitiesEventResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_bool(6, this->disabled_by_default);
   buffer.encode_uint32(7, static_cast<uint32_t>(this->entity_category));
   buffer.encode_string(8, this->device_class);
   for (auto &it : this->event_types) {
     buffer.encode_string(9, it, true);
   }
+#ifdef USE_DEVICES
   buffer.encode_uint32(10, this->device_id);
+#endif
 }
 void ListEntitiesEventResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
   ProtoSize::add_string_field(total_size, 1, this->device_class);
@@ -2814,17 +3130,23 @@ void ListEntitiesEventResponse::calculate_size(uint32_t &total_size) const {
       ProtoSize::add_string_field_repeated(total_size, 1, it);
     }
   }
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void EventResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_string(2, this->event_type);
+#ifdef USE_DEVICES
   buffer.encode_uint32(3, this->device_id);
+#endif
 }
 void EventResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->event_type);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 #endif
 #ifdef USE_VALVE
@@ -2832,39 +3154,51 @@ void ListEntitiesValveResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_bool(6, this->disabled_by_default);
   buffer.encode_uint32(7, static_cast<uint32_t>(this->entity_category));
   buffer.encode_string(8, this->device_class);
   buffer.encode_bool(9, this->assumed_state);
   buffer.encode_bool(10, this->supports_position);
   buffer.encode_bool(11, this->supports_stop);
+#ifdef USE_DEVICES
   buffer.encode_uint32(12, this->device_id);
+#endif
 }
 void ListEntitiesValveResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
   ProtoSize::add_string_field(total_size, 1, this->device_class);
   ProtoSize::add_bool_field(total_size, 1, this->assumed_state);
   ProtoSize::add_bool_field(total_size, 1, this->supports_position);
   ProtoSize::add_bool_field(total_size, 1, this->supports_stop);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void ValveStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_float(2, this->position);
   buffer.encode_uint32(3, static_cast<uint32_t>(this->current_operation));
+#ifdef USE_DEVICES
   buffer.encode_uint32(4, this->device_id);
+#endif
 }
 void ValveStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_float_field(total_size, 1, this->position);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->current_operation));
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool ValveCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
@@ -2874,9 +3208,11 @@ bool ValveCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
     case 4:
       this->stop = value.as_bool();
       break;
+#ifdef USE_DEVICES
     case 5:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -2901,37 +3237,51 @@ void ListEntitiesDateTimeResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_bool(6, this->disabled_by_default);
   buffer.encode_uint32(7, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   buffer.encode_uint32(8, this->device_id);
+#endif
 }
 void ListEntitiesDateTimeResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void DateTimeStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_bool(2, this->missing_state);
   buffer.encode_fixed32(3, this->epoch_seconds);
+#ifdef USE_DEVICES
   buffer.encode_uint32(4, this->device_id);
+#endif
 }
 void DateTimeStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_bool_field(total_size, 1, this->missing_state);
   ProtoSize::add_fixed32_field(total_size, 1, this->epoch_seconds);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool DateTimeCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
+#ifdef USE_DEVICES
     case 3:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
@@ -2956,21 +3306,29 @@ void ListEntitiesUpdateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->object_id);
   buffer.encode_fixed32(2, this->key);
   buffer.encode_string(3, this->name);
+#ifdef USE_ENTITY_ICON
   buffer.encode_string(5, this->icon);
+#endif
   buffer.encode_bool(6, this->disabled_by_default);
   buffer.encode_uint32(7, static_cast<uint32_t>(this->entity_category));
   buffer.encode_string(8, this->device_class);
+#ifdef USE_DEVICES
   buffer.encode_uint32(9, this->device_id);
+#endif
 }
 void ListEntitiesUpdateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->object_id);
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
   ProtoSize::add_string_field(total_size, 1, this->name);
+#ifdef USE_ENTITY_ICON
   ProtoSize::add_string_field(total_size, 1, this->icon);
+#endif
   ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default);
   ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category));
   ProtoSize::add_string_field(total_size, 1, this->device_class);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 void UpdateStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
@@ -2983,7 +3341,9 @@ void UpdateStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(8, this->title);
   buffer.encode_string(9, this->release_summary);
   buffer.encode_string(10, this->release_url);
+#ifdef USE_DEVICES
   buffer.encode_uint32(11, this->device_id);
+#endif
 }
 void UpdateStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_fixed32_field(total_size, 1, this->key);
@@ -2996,16 +3356,20 @@ void UpdateStateResponse::calculate_size(uint32_t &total_size) const {
   ProtoSize::add_string_field(total_size, 1, this->title);
   ProtoSize::add_string_field(total_size, 1, this->release_summary);
   ProtoSize::add_string_field(total_size, 1, this->release_url);
+#ifdef USE_DEVICES
   ProtoSize::add_uint32_field(total_size, 1, this->device_id);
+#endif
 }
 bool UpdateCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 2:
       this->command = static_cast<enums::UpdateCommand>(value.as_uint32());
       break;
+#ifdef USE_DEVICES
     case 3:
       this->device_id = value.as_uint32();
       break;
+#endif
     default:
       return false;
   }
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index e84e814f44..2ca7131a6c 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -491,22 +491,50 @@ class DeviceInfoResponse : public ProtoMessage {
   std::string esphome_version{};
   std::string compilation_time{};
   std::string model{};
+#ifdef USE_DEEP_SLEEP
   bool has_deep_sleep{false};
+#endif
+#ifdef ESPHOME_PROJECT_NAME
   std::string project_name{};
+#endif
+#ifdef ESPHOME_PROJECT_NAME
   std::string project_version{};
+#endif
+#ifdef USE_WEBSERVER
   uint32_t webserver_port{0};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
   uint32_t legacy_bluetooth_proxy_version{0};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
   uint32_t bluetooth_proxy_feature_flags{0};
+#endif
   std::string manufacturer{};
   std::string friendly_name{};
+#ifdef USE_VOICE_ASSISTANT
   uint32_t legacy_voice_assistant_version{0};
+#endif
+#ifdef USE_VOICE_ASSISTANT
   uint32_t voice_assistant_feature_flags{0};
+#endif
+#ifdef USE_AREAS
   std::string suggested_area{};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
   std::string bluetooth_mac_address{};
+#endif
+#ifdef USE_API_NOISE
   bool api_encryption_supported{false};
+#endif
+#ifdef USE_DEVICES
   std::vector<DeviceInfo> devices{};
+#endif
+#ifdef USE_AREAS
   std::vector<AreaInfo> areas{};
+#endif
+#ifdef USE_AREAS
   AreaInfo area{};
+#endif
   void encode(ProtoWriteBuffer buffer) const override;
   void calculate_size(uint32_t &total_size) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
diff --git a/esphome/components/api/api_pb2_dump.cpp b/esphome/components/api/api_pb2_dump.cpp
index 647ef3881a..7d4150a857 100644
--- a/esphome/components/api/api_pb2_dump.cpp
+++ b/esphome/components/api/api_pb2_dump.cpp
@@ -713,33 +713,45 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   out.append("'").append(this->model).append("'");
   out.append("\n");
 
+#ifdef USE_DEEP_SLEEP
   out.append("  has_deep_sleep: ");
   out.append(YESNO(this->has_deep_sleep));
   out.append("\n");
 
+#endif
+#ifdef ESPHOME_PROJECT_NAME
   out.append("  project_name: ");
   out.append("'").append(this->project_name).append("'");
   out.append("\n");
 
+#endif
+#ifdef ESPHOME_PROJECT_NAME
   out.append("  project_version: ");
   out.append("'").append(this->project_version).append("'");
   out.append("\n");
 
+#endif
+#ifdef USE_WEBSERVER
   out.append("  webserver_port: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->webserver_port);
   out.append(buffer);
   out.append("\n");
 
+#endif
+#ifdef USE_BLUETOOTH_PROXY
   out.append("  legacy_bluetooth_proxy_version: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->legacy_bluetooth_proxy_version);
   out.append(buffer);
   out.append("\n");
 
+#endif
+#ifdef USE_BLUETOOTH_PROXY
   out.append("  bluetooth_proxy_feature_flags: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->bluetooth_proxy_feature_flags);
   out.append(buffer);
   out.append("\n");
 
+#endif
   out.append("  manufacturer: ");
   out.append("'").append(this->manufacturer).append("'");
   out.append("\n");
@@ -748,43 +760,60 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   out.append("'").append(this->friendly_name).append("'");
   out.append("\n");
 
+#ifdef USE_VOICE_ASSISTANT
   out.append("  legacy_voice_assistant_version: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->legacy_voice_assistant_version);
   out.append(buffer);
   out.append("\n");
 
+#endif
+#ifdef USE_VOICE_ASSISTANT
   out.append("  voice_assistant_feature_flags: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->voice_assistant_feature_flags);
   out.append(buffer);
   out.append("\n");
 
+#endif
+#ifdef USE_AREAS
   out.append("  suggested_area: ");
   out.append("'").append(this->suggested_area).append("'");
   out.append("\n");
 
+#endif
+#ifdef USE_BLUETOOTH_PROXY
   out.append("  bluetooth_mac_address: ");
   out.append("'").append(this->bluetooth_mac_address).append("'");
   out.append("\n");
 
+#endif
+#ifdef USE_API_NOISE
   out.append("  api_encryption_supported: ");
   out.append(YESNO(this->api_encryption_supported));
   out.append("\n");
 
+#endif
+#ifdef USE_DEVICES
   for (const auto &it : this->devices) {
     out.append("  devices: ");
     it.dump_to(out);
     out.append("\n");
   }
 
+#endif
+#ifdef USE_AREAS
   for (const auto &it : this->areas) {
     out.append("  areas: ");
     it.dump_to(out);
     out.append("\n");
   }
 
+#endif
+#ifdef USE_AREAS
   out.append("  area: ");
   this->area.dump_to(out);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void ListEntitiesRequest::dump_to(std::string &out) const { out.append("ListEntitiesRequest {}"); }
@@ -819,18 +848,23 @@ void ListEntitiesBinarySensorResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  entity_category: ");
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void BinarySensorStateResponse::dump_to(std::string &out) const {
@@ -849,10 +883,13 @@ void BinarySensorStateResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->missing_state));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -893,10 +930,12 @@ void ListEntitiesCoverResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  entity_category: ");
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
@@ -905,10 +944,13 @@ void ListEntitiesCoverResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->supports_stop));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void CoverStateResponse::dump_to(std::string &out) const {
@@ -937,10 +979,13 @@ void CoverStateResponse::dump_to(std::string &out) const {
   out.append(proto_enum_to_string<enums::CoverOperation>(this->current_operation));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void CoverCommandRequest::dump_to(std::string &out) const {
@@ -981,10 +1026,13 @@ void CoverCommandRequest::dump_to(std::string &out) const {
   out.append(YESNO(this->stop));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -1026,10 +1074,12 @@ void ListEntitiesFanResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  entity_category: ");
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
@@ -1040,10 +1090,13 @@ void ListEntitiesFanResponse::dump_to(std::string &out) const {
     out.append("\n");
   }
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void FanStateResponse::dump_to(std::string &out) const {
@@ -1079,10 +1132,13 @@ void FanStateResponse::dump_to(std::string &out) const {
   out.append("'").append(this->preset_mode).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void FanCommandRequest::dump_to(std::string &out) const {
@@ -1142,10 +1198,13 @@ void FanCommandRequest::dump_to(std::string &out) const {
   out.append("'").append(this->preset_mode).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -1208,18 +1267,23 @@ void ListEntitiesLightResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  entity_category: ");
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void LightStateResponse::dump_to(std::string &out) const {
@@ -1287,10 +1351,13 @@ void LightStateResponse::dump_to(std::string &out) const {
   out.append("'").append(this->effect).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void LightCommandRequest::dump_to(std::string &out) const {
@@ -1416,10 +1483,13 @@ void LightCommandRequest::dump_to(std::string &out) const {
   out.append("'").append(this->effect).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -1440,10 +1510,12 @@ void ListEntitiesSensorResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  unit_of_measurement: ");
   out.append("'").append(this->unit_of_measurement).append("'");
   out.append("\n");
@@ -1477,10 +1549,13 @@ void ListEntitiesSensorResponse::dump_to(std::string &out) const {
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void SensorStateResponse::dump_to(std::string &out) const {
@@ -1500,10 +1575,13 @@ void SensorStateResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->missing_state));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -1524,10 +1602,12 @@ void ListEntitiesSwitchResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  assumed_state: ");
   out.append(YESNO(this->assumed_state));
   out.append("\n");
@@ -1544,10 +1624,13 @@ void ListEntitiesSwitchResponse::dump_to(std::string &out) const {
   out.append("'").append(this->device_class).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void SwitchStateResponse::dump_to(std::string &out) const {
@@ -1562,10 +1645,13 @@ void SwitchStateResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->state));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void SwitchCommandRequest::dump_to(std::string &out) const {
@@ -1580,10 +1666,13 @@ void SwitchCommandRequest::dump_to(std::string &out) const {
   out.append(YESNO(this->state));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -1604,10 +1693,12 @@ void ListEntitiesTextSensorResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
@@ -1620,10 +1711,13 @@ void ListEntitiesTextSensorResponse::dump_to(std::string &out) const {
   out.append("'").append(this->device_class).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void TextSensorStateResponse::dump_to(std::string &out) const {
@@ -1642,10 +1736,13 @@ void TextSensorStateResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->missing_state));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -1907,18 +2004,23 @@ void ListEntitiesCameraResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  entity_category: ");
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void CameraImageResponse::dump_to(std::string &out) const {
@@ -1937,10 +2039,13 @@ void CameraImageResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->done));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void CameraImageRequest::dump_to(std::string &out) const {
@@ -2044,10 +2149,12 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  entity_category: ");
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
@@ -2075,10 +2182,13 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void ClimateStateResponse::dump_to(std::string &out) const {
@@ -2151,10 +2261,13 @@ void ClimateStateResponse::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void ClimateCommandRequest::dump_to(std::string &out) const {
@@ -2257,10 +2370,13 @@ void ClimateCommandRequest::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -2281,10 +2397,12 @@ void ListEntitiesNumberResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  min_value: ");
   snprintf(buffer, sizeof(buffer), "%g", this->min_value);
   out.append(buffer);
@@ -2320,10 +2438,13 @@ void ListEntitiesNumberResponse::dump_to(std::string &out) const {
   out.append("'").append(this->device_class).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void NumberStateResponse::dump_to(std::string &out) const {
@@ -2343,10 +2464,13 @@ void NumberStateResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->missing_state));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void NumberCommandRequest::dump_to(std::string &out) const {
@@ -2362,10 +2486,13 @@ void NumberCommandRequest::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -2386,10 +2513,12 @@ void ListEntitiesSelectResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   for (const auto &it : this->options) {
     out.append("  options: ");
     out.append("'").append(it).append("'");
@@ -2404,10 +2533,13 @@ void ListEntitiesSelectResponse::dump_to(std::string &out) const {
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void SelectStateResponse::dump_to(std::string &out) const {
@@ -2426,10 +2558,13 @@ void SelectStateResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->missing_state));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void SelectCommandRequest::dump_to(std::string &out) const {
@@ -2444,10 +2579,13 @@ void SelectCommandRequest::dump_to(std::string &out) const {
   out.append("'").append(this->state).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -2468,10 +2606,12 @@ void ListEntitiesSirenResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
@@ -2494,10 +2634,13 @@ void ListEntitiesSirenResponse::dump_to(std::string &out) const {
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void SirenStateResponse::dump_to(std::string &out) const {
@@ -2512,10 +2655,13 @@ void SirenStateResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->state));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void SirenCommandRequest::dump_to(std::string &out) const {
@@ -2560,10 +2706,13 @@ void SirenCommandRequest::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -2584,10 +2733,12 @@ void ListEntitiesLockResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
@@ -2612,10 +2763,13 @@ void ListEntitiesLockResponse::dump_to(std::string &out) const {
   out.append("'").append(this->code_format).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void LockStateResponse::dump_to(std::string &out) const {
@@ -2630,10 +2784,13 @@ void LockStateResponse::dump_to(std::string &out) const {
   out.append(proto_enum_to_string<enums::LockState>(this->state));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void LockCommandRequest::dump_to(std::string &out) const {
@@ -2656,10 +2813,13 @@ void LockCommandRequest::dump_to(std::string &out) const {
   out.append("'").append(this->code).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -2680,10 +2840,12 @@ void ListEntitiesButtonResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
@@ -2696,10 +2858,13 @@ void ListEntitiesButtonResponse::dump_to(std::string &out) const {
   out.append("'").append(this->device_class).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void ButtonCommandRequest::dump_to(std::string &out) const {
@@ -2710,10 +2875,13 @@ void ButtonCommandRequest::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -2761,10 +2929,12 @@ void ListEntitiesMediaPlayerResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
@@ -2783,10 +2953,13 @@ void ListEntitiesMediaPlayerResponse::dump_to(std::string &out) const {
     out.append("\n");
   }
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void MediaPlayerStateResponse::dump_to(std::string &out) const {
@@ -2810,10 +2983,13 @@ void MediaPlayerStateResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->muted));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void MediaPlayerCommandRequest::dump_to(std::string &out) const {
@@ -2857,10 +3033,13 @@ void MediaPlayerCommandRequest::dump_to(std::string &out) const {
   out.append(YESNO(this->announcement));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -3618,10 +3797,12 @@ void ListEntitiesAlarmControlPanelResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
@@ -3643,10 +3824,13 @@ void ListEntitiesAlarmControlPanelResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->requires_code_to_arm));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void AlarmControlPanelStateResponse::dump_to(std::string &out) const {
@@ -3661,10 +3845,13 @@ void AlarmControlPanelStateResponse::dump_to(std::string &out) const {
   out.append(proto_enum_to_string<enums::AlarmControlPanelState>(this->state));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void AlarmControlPanelCommandRequest::dump_to(std::string &out) const {
@@ -3683,10 +3870,13 @@ void AlarmControlPanelCommandRequest::dump_to(std::string &out) const {
   out.append("'").append(this->code).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -3707,10 +3897,12 @@ void ListEntitiesTextResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
@@ -3737,10 +3929,13 @@ void ListEntitiesTextResponse::dump_to(std::string &out) const {
   out.append(proto_enum_to_string<enums::TextMode>(this->mode));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void TextStateResponse::dump_to(std::string &out) const {
@@ -3759,10 +3954,13 @@ void TextStateResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->missing_state));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void TextCommandRequest::dump_to(std::string &out) const {
@@ -3777,10 +3975,13 @@ void TextCommandRequest::dump_to(std::string &out) const {
   out.append("'").append(this->state).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -3801,10 +4002,12 @@ void ListEntitiesDateResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
@@ -3813,10 +4016,13 @@ void ListEntitiesDateResponse::dump_to(std::string &out) const {
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void DateStateResponse::dump_to(std::string &out) const {
@@ -3846,10 +4052,13 @@ void DateStateResponse::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void DateCommandRequest::dump_to(std::string &out) const {
@@ -3875,10 +4084,13 @@ void DateCommandRequest::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -3899,10 +4111,12 @@ void ListEntitiesTimeResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
@@ -3911,10 +4125,13 @@ void ListEntitiesTimeResponse::dump_to(std::string &out) const {
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void TimeStateResponse::dump_to(std::string &out) const {
@@ -3944,10 +4161,13 @@ void TimeStateResponse::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void TimeCommandRequest::dump_to(std::string &out) const {
@@ -3973,10 +4193,13 @@ void TimeCommandRequest::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -3997,10 +4220,12 @@ void ListEntitiesEventResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
@@ -4019,10 +4244,13 @@ void ListEntitiesEventResponse::dump_to(std::string &out) const {
     out.append("\n");
   }
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void EventResponse::dump_to(std::string &out) const {
@@ -4037,10 +4265,13 @@ void EventResponse::dump_to(std::string &out) const {
   out.append("'").append(this->event_type).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -4061,10 +4292,12 @@ void ListEntitiesValveResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
@@ -4089,10 +4322,13 @@ void ListEntitiesValveResponse::dump_to(std::string &out) const {
   out.append(YESNO(this->supports_stop));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void ValveStateResponse::dump_to(std::string &out) const {
@@ -4112,10 +4348,13 @@ void ValveStateResponse::dump_to(std::string &out) const {
   out.append(proto_enum_to_string<enums::ValveOperation>(this->current_operation));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void ValveCommandRequest::dump_to(std::string &out) const {
@@ -4139,10 +4378,13 @@ void ValveCommandRequest::dump_to(std::string &out) const {
   out.append(YESNO(this->stop));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -4163,10 +4405,12 @@ void ListEntitiesDateTimeResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
@@ -4175,10 +4419,13 @@ void ListEntitiesDateTimeResponse::dump_to(std::string &out) const {
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void DateTimeStateResponse::dump_to(std::string &out) const {
@@ -4198,10 +4445,13 @@ void DateTimeStateResponse::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void DateTimeCommandRequest::dump_to(std::string &out) const {
@@ -4217,10 +4467,13 @@ void DateTimeCommandRequest::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
@@ -4241,10 +4494,12 @@ void ListEntitiesUpdateResponse::dump_to(std::string &out) const {
   out.append("'").append(this->name).append("'");
   out.append("\n");
 
+#ifdef USE_ENTITY_ICON
   out.append("  icon: ");
   out.append("'").append(this->icon).append("'");
   out.append("\n");
 
+#endif
   out.append("  disabled_by_default: ");
   out.append(YESNO(this->disabled_by_default));
   out.append("\n");
@@ -4257,10 +4512,13 @@ void ListEntitiesUpdateResponse::dump_to(std::string &out) const {
   out.append("'").append(this->device_class).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void UpdateStateResponse::dump_to(std::string &out) const {
@@ -4308,10 +4566,13 @@ void UpdateStateResponse::dump_to(std::string &out) const {
   out.append("'").append(this->release_url).append("'");
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 void UpdateCommandRequest::dump_to(std::string &out) const {
@@ -4326,10 +4587,13 @@ void UpdateCommandRequest::dump_to(std::string &out) const {
   out.append(proto_enum_to_string<enums::UpdateCommand>(this->command));
   out.append("\n");
 
+#ifdef USE_DEVICES
   out.append("  device_id: ");
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
+
+#endif
   out.append("}");
 }
 #endif
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index fddddc7399..a9f21c65b8 100755
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -75,6 +75,30 @@ def indent(text: str, padding: str = "  ") -> str:
     return "\n".join(indent_list(text, padding))
 
 
+def wrap_with_ifdef(content: str | list[str], ifdef: str | None) -> list[str]:
+    """Wrap content with #ifdef directives if ifdef is provided.
+
+    Args:
+        content: Single string or list of strings to wrap
+        ifdef: The ifdef condition, or None to skip wrapping
+
+    Returns:
+        List of strings with ifdef wrapping if needed
+    """
+    if not ifdef:
+        if isinstance(content, str):
+            return [content]
+        return content
+
+    result = [f"#ifdef {ifdef}"]
+    if isinstance(content, str):
+        result.append(content)
+    else:
+        result.extend(content)
+    result.append("#endif")
+    return result
+
+
 def camel_to_snake(name: str) -> str:
     # https://stackoverflow.com/a/1176023
     s1 = re.sub("(.)([A-Z][a-z]+)", r"\1_\2", name)
@@ -1064,26 +1088,62 @@ def build_message_type(
         # Skip field declarations for fields that are in the base class
         # but include their encode/decode logic
         if field.name not in common_field_names:
-            protected_content.extend(ti.protected_content)
-            public_content.extend(ti.public_content)
+            # Check for field_ifdef option
+            field_ifdef = None
+            if field.options.HasExtension(pb.field_ifdef):
+                field_ifdef = field.options.Extensions[pb.field_ifdef]
+
+            if ti.protected_content:
+                protected_content.extend(
+                    wrap_with_ifdef(ti.protected_content, field_ifdef)
+                )
+            if ti.public_content:
+                public_content.extend(wrap_with_ifdef(ti.public_content, field_ifdef))
 
         # Only collect encode logic if this message needs it
         if needs_encode:
-            encode.append(ti.encode_content)
-            size_calc.append(ti.get_size_calculation(f"this->{ti.field_name}"))
+            # Check for field_ifdef option
+            field_ifdef = None
+            if field.options.HasExtension(pb.field_ifdef):
+                field_ifdef = field.options.Extensions[pb.field_ifdef]
+
+            encode.extend(wrap_with_ifdef(ti.encode_content, field_ifdef))
+            size_calc.extend(
+                wrap_with_ifdef(
+                    ti.get_size_calculation(f"this->{ti.field_name}"), field_ifdef
+                )
+            )
 
         # Only collect decode methods if this message needs them
         if needs_decode:
+            # Check for field_ifdef option for decode as well
+            field_ifdef = None
+            if field.options.HasExtension(pb.field_ifdef):
+                field_ifdef = field.options.Extensions[pb.field_ifdef]
+
             if ti.decode_varint_content:
-                decode_varint.append(ti.decode_varint_content)
+                decode_varint.extend(
+                    wrap_with_ifdef(ti.decode_varint_content, field_ifdef)
+                )
             if ti.decode_length_content:
-                decode_length.append(ti.decode_length_content)
+                decode_length.extend(
+                    wrap_with_ifdef(ti.decode_length_content, field_ifdef)
+                )
             if ti.decode_32bit_content:
-                decode_32bit.append(ti.decode_32bit_content)
+                decode_32bit.extend(
+                    wrap_with_ifdef(ti.decode_32bit_content, field_ifdef)
+                )
             if ti.decode_64bit_content:
-                decode_64bit.append(ti.decode_64bit_content)
+                decode_64bit.extend(
+                    wrap_with_ifdef(ti.decode_64bit_content, field_ifdef)
+                )
         if ti.dump_content:
-            dump.append(ti.dump_content)
+            # Check for field_ifdef option for dump as well
+            field_ifdef = None
+            if field.options.HasExtension(pb.field_ifdef):
+                field_ifdef = field.options.Extensions[pb.field_ifdef]
+
+            dump.extend(wrap_with_ifdef(ti.dump_content, field_ifdef))
 
     cpp = ""
     if decode_varint: