diff --git a/esphome/components/api/list_entities.cpp b/esphome/components/api/list_entities.cpp
index d88d552691..3f84ef306e 100644
--- a/esphome/components/api/list_entities.cpp
+++ b/esphome/components/api/list_entities.cpp
@@ -2,7 +2,6 @@
 #ifdef USE_API
 #include "api_connection.h"
 #include "api_pb2.h"
-#include "entity_iterator_macros.h"
 #include "esphome/core/application.h"
 #include "esphome/core/log.h"
 #include "esphome/core/util.h"
diff --git a/esphome/components/api/list_entities.h b/esphome/components/api/list_entities.h
index e77f21c7a1..5b3a445699 100644
--- a/esphome/components/api/list_entities.h
+++ b/esphome/components/api/list_entities.h
@@ -9,6 +9,14 @@ namespace api {
 
 class APIConnection;
 
+// Macro for generating ListEntitiesIterator handlers
+// Calls schedule_message_ with try_send_*_info
+#define LIST_ENTITIES_HANDLER(entity_type, EntityClass, ResponseType) \
+  bool ListEntitiesIterator::on_##entity_type(EntityClass *entity) { \
+    return this->client_->schedule_message_(entity, &APIConnection::try_send_##entity_type##_info, \
+                                            ResponseType::MESSAGE_TYPE); \
+  }
+
 class ListEntitiesIterator : public ComponentIterator {
  public:
   ListEntitiesIterator(APIConnection *client);
diff --git a/esphome/components/api/subscribe_state.cpp b/esphome/components/api/subscribe_state.cpp
index 4516b551a1..12accf4613 100644
--- a/esphome/components/api/subscribe_state.cpp
+++ b/esphome/components/api/subscribe_state.cpp
@@ -1,7 +1,6 @@
 #include "subscribe_state.h"
 #ifdef USE_API
 #include "api_connection.h"
-#include "entity_iterator_macros.h"
 #include "esphome/core/log.h"
 
 namespace esphome {
diff --git a/esphome/components/api/subscribe_state.h b/esphome/components/api/subscribe_state.h
index 3966c97af5..588a0464eb 100644
--- a/esphome/components/api/subscribe_state.h
+++ b/esphome/components/api/subscribe_state.h
@@ -10,6 +10,13 @@ namespace api {
 
 class APIConnection;
 
+// Macro for generating InitialStateIterator handlers
+// Calls send_*_state
+#define INITIAL_STATE_HANDLER(entity_type, EntityClass) \
+  bool InitialStateIterator::on_##entity_type(EntityClass *entity) { \
+    return this->client_->send_##entity_type##_state(entity); \
+  }
+
 class InitialStateIterator : public ComponentIterator {
  public:
   InitialStateIterator(APIConnection *client);