diff --git a/lib/Hoymiles/src/HoymilesRadio.h b/lib/Hoymiles/src/HoymilesRadio.h
index b382c048..acbf4fb1 100644
--- a/lib/Hoymiles/src/HoymilesRadio.h
+++ b/lib/Hoymiles/src/HoymilesRadio.h
@@ -9,8 +9,6 @@
 #include <nRF24L01.h>
 #include <queue>
 
-using namespace std;
-
 // number of fragments hold in buffer
 #define FRAGMENT_BUFFER_SIZE 30
 
@@ -57,7 +55,7 @@ public:
     template <typename T>
     T* enqueCommand()
     {
-        _commandQueue.push(make_shared<T>());
+        _commandQueue.push(std::make_shared<T>());
         return static_cast<T*>(_commandQueue.back().get());
     }
 
@@ -89,5 +87,5 @@ private:
 
     bool _busyFlag = false;
 
-    queue<shared_ptr<CommandAbstract>> _commandQueue;
+    std::queue<std::shared_ptr<CommandAbstract>> _commandQueue;
 };
\ No newline at end of file
diff --git a/src/MqttSettings.cpp b/src/MqttSettings.cpp
index 0c419524..e49d4293 100644
--- a/src/MqttSettings.cpp
+++ b/src/MqttSettings.cpp
@@ -68,7 +68,7 @@ void MqttSettingsClass::onMqttDisconnect(espMqttClientTypes::DisconnectReason re
 void MqttSettingsClass::performConnect()
 {
     if (NetworkSettings.isConnected() && Configuration.get().Mqtt_Enabled) {
-        using namespace std::placeholders;
+        using std::placeholders::_1;
         Serial.println(F("Connecting to MQTT..."));
         const CONFIG_T& config = Configuration.get();
         willTopic = getPrefix() + config.Mqtt_LwtTopic;
@@ -136,7 +136,7 @@ void MqttSettingsClass::publishHass(String subtopic, String payload)
 
 void MqttSettingsClass::init()
 {
-    using namespace std::placeholders;
+    using std::placeholders::_1;
     NetworkSettings.onEvent(std::bind(&MqttSettingsClass::NetworkEvent, this, _1));
 
     createMqttClientObject();
diff --git a/src/NetworkSettings.cpp b/src/NetworkSettings.cpp
index cde067f5..98e3a6a6 100644
--- a/src/NetworkSettings.cpp
+++ b/src/NetworkSettings.cpp
@@ -19,7 +19,7 @@ NetworkSettingsClass::NetworkSettingsClass()
 
 void NetworkSettingsClass::init()
 {
-    using namespace std::placeholders;
+    using std::placeholders::_1;
 
     WiFi.onEvent(std::bind(&NetworkSettingsClass::NetworkEvent, this, _1));
     setupMode();
diff --git a/src/WebApi.cpp b/src/WebApi.cpp
index 7426f66e..9206c1fa 100644
--- a/src/WebApi.cpp
+++ b/src/WebApi.cpp
@@ -15,8 +15,6 @@ WebApiClass::WebApiClass()
 
 void WebApiClass::init()
 {
-    using namespace std::placeholders;
-
     _server.addHandler(&_events);
 
     _webApiDevInfo.init(&_server);
diff --git a/src/WebApi_devinfo.cpp b/src/WebApi_devinfo.cpp
index 69afc564..e4a75a2e 100644
--- a/src/WebApi_devinfo.cpp
+++ b/src/WebApi_devinfo.cpp
@@ -10,7 +10,7 @@
 
 void WebApiDevInfoClass::init(AsyncWebServer* server)
 {
-    using namespace std::placeholders;
+    using std::placeholders::_1;
 
     _server = server;
 
diff --git a/src/WebApi_dtu.cpp b/src/WebApi_dtu.cpp
index 0da6cfd7..f9383f87 100644
--- a/src/WebApi_dtu.cpp
+++ b/src/WebApi_dtu.cpp
@@ -10,7 +10,7 @@
 
 void WebApiDtuClass::init(AsyncWebServer* server)
 {
-    using namespace std::placeholders;
+    using std::placeholders::_1;
 
     _server = server;
 
diff --git a/src/WebApi_eventlog.cpp b/src/WebApi_eventlog.cpp
index cdfc52c6..0b007ac8 100644
--- a/src/WebApi_eventlog.cpp
+++ b/src/WebApi_eventlog.cpp
@@ -9,7 +9,7 @@
 
 void WebApiEventlogClass::init(AsyncWebServer* server)
 {
-    using namespace std::placeholders;
+    using std::placeholders::_1;
 
     _server = server;
 
diff --git a/src/WebApi_firmware.cpp b/src/WebApi_firmware.cpp
index 2f07341b..9b33dc77 100644
--- a/src/WebApi_firmware.cpp
+++ b/src/WebApi_firmware.cpp
@@ -11,7 +11,12 @@
 
 void WebApiFirmwareClass::init(AsyncWebServer* server)
 {
-    using namespace std::placeholders;
+    using std::placeholders::_1;
+    using std::placeholders::_2;
+    using std::placeholders::_3;
+    using std::placeholders::_4;
+    using std::placeholders::_5;
+    using std::placeholders::_6;
 
     _server = server;
 
diff --git a/src/WebApi_inverter.cpp b/src/WebApi_inverter.cpp
index 9f746431..647064b2 100644
--- a/src/WebApi_inverter.cpp
+++ b/src/WebApi_inverter.cpp
@@ -12,7 +12,7 @@
 
 void WebApiInverterClass::init(AsyncWebServer* server)
 {
-    using namespace std::placeholders;
+    using std::placeholders::_1;
 
     _server = server;
 
diff --git a/src/WebApi_limit.cpp b/src/WebApi_limit.cpp
index ee1f958c..8d4de0ed 100644
--- a/src/WebApi_limit.cpp
+++ b/src/WebApi_limit.cpp
@@ -9,7 +9,7 @@
 
 void WebApiLimitClass::init(AsyncWebServer* server)
 {
-    using namespace std::placeholders;
+    using std::placeholders::_1;
 
     _server = server;
 
diff --git a/src/WebApi_mqtt.cpp b/src/WebApi_mqtt.cpp
index 9b09c699..33db93c3 100644
--- a/src/WebApi_mqtt.cpp
+++ b/src/WebApi_mqtt.cpp
@@ -12,7 +12,7 @@
 
 void WebApiMqttClass::init(AsyncWebServer* server)
 {
-    using namespace std::placeholders;
+    using std::placeholders::_1;
 
     _server = server;
 
diff --git a/src/WebApi_network.cpp b/src/WebApi_network.cpp
index 416d39ba..7c950604 100644
--- a/src/WebApi_network.cpp
+++ b/src/WebApi_network.cpp
@@ -11,7 +11,7 @@
 
 void WebApiNetworkClass::init(AsyncWebServer* server)
 {
-    using namespace std::placeholders;
+    using std::placeholders::_1;
 
     _server = server;
 
diff --git a/src/WebApi_ntp.cpp b/src/WebApi_ntp.cpp
index 8b06fdb7..49451489 100644
--- a/src/WebApi_ntp.cpp
+++ b/src/WebApi_ntp.cpp
@@ -11,7 +11,7 @@
 
 void WebApiNtpClass::init(AsyncWebServer* server)
 {
-    using namespace std::placeholders;
+    using std::placeholders::_1;
 
     _server = server;
 
diff --git a/src/WebApi_sysstatus.cpp b/src/WebApi_sysstatus.cpp
index dfb1e2ad..13864348 100644
--- a/src/WebApi_sysstatus.cpp
+++ b/src/WebApi_sysstatus.cpp
@@ -16,7 +16,7 @@
 
 void WebApiSysstatusClass::init(AsyncWebServer* server)
 {
-    using namespace std::placeholders;
+    using std::placeholders::_1;
 
     _server = server;
 
diff --git a/src/WebApi_webapp.cpp b/src/WebApi_webapp.cpp
index 9580f833..4976f78e 100644
--- a/src/WebApi_webapp.cpp
+++ b/src/WebApi_webapp.cpp
@@ -16,8 +16,6 @@ extern const uint8_t file_app_js_end[] asm("_binary_webapp_dist_js_app_js_gz_end
 
 void WebApiWebappClass::init(AsyncWebServer* server)
 {
-    using namespace std::placeholders;
-
     _server = server;
 
     _server->on("/", HTTP_GET, [](AsyncWebServerRequest* request) {
diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp
index 30e3f4bb..3ba58fb8 100644
--- a/src/WebApi_ws_live.cpp
+++ b/src/WebApi_ws_live.cpp
@@ -13,7 +13,12 @@ WebApiWsLiveClass::WebApiWsLiveClass()
 
 void WebApiWsLiveClass::init(AsyncWebServer* server)
 {
-    using namespace std::placeholders;
+    using std::placeholders::_1;
+    using std::placeholders::_2;
+    using std::placeholders::_3;
+    using std::placeholders::_4;
+    using std::placeholders::_5;
+    using std::placeholders::_6;
 
     _server = server;
     _server->on("/api/livedata/status", HTTP_GET, std::bind(&WebApiWsLiveClass::onLivedataStatus, this, _1));