diff --git a/esphome/components/api/list_entities.h b/esphome/components/api/list_entities.h
index cef4bdd6cc..2889cd73b4 100644
--- a/esphome/components/api/list_entities.h
+++ b/esphome/components/api/list_entities.h
@@ -7,11 +7,9 @@
 namespace esphome {
 namespace api {
 
-using namespace component_iterator;
-
 class APIConnection;
 
-class ListEntitiesIterator : public ComponentIterator {
+class ListEntitiesIterator : public component_iterator::ComponentIterator {
  public:
   ListEntitiesIterator(APIConnection *client);
 #ifdef USE_BINARY_SENSOR
diff --git a/esphome/components/api/subscribe_state.h b/esphome/components/api/subscribe_state.h
index 44eb952e28..40e090aac1 100644
--- a/esphome/components/api/subscribe_state.h
+++ b/esphome/components/api/subscribe_state.h
@@ -8,11 +8,9 @@
 namespace esphome {
 namespace api {
 
-using namespace component_iterator;
-
 class APIConnection;
 
-class InitialStateIterator : public ComponentIterator {
+class InitialStateIterator : public component_iterator::ComponentIterator {
  public:
   InitialStateIterator(APIConnection *client);
 #ifdef USE_BINARY_SENSOR
diff --git a/esphome/components/web_server/list_entities.h b/esphome/components/web_server/list_entities.h
index c97111894a..dc6160be88 100644
--- a/esphome/components/web_server/list_entities.h
+++ b/esphome/components/web_server/list_entities.h
@@ -7,10 +7,9 @@
 namespace esphome {
 namespace web_server {
 
-using namespace component_iterator;
 class WebServer;
 
-class ListEntitiesIterator : public ComponentIterator {
+class ListEntitiesIterator : public component_iterator::ComponentIterator {
  public:
   ListEntitiesIterator(WebServer *web_server);
 #ifdef USE_BINARY_SENSOR