diff --git a/include/MqttHandleDtu.h b/include/MqttHandleDtu.h
index 71c47b70..7a658924 100644
--- a/include/MqttHandleDtu.h
+++ b/include/MqttHandleDtu.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include <Arduino.h>
+#include <cstdint>
 
 class MqttHandleDtuClass {
 public:
diff --git a/include/MqttHandleHass.h b/include/MqttHandleHass.h
index ee8b5515..33d9df82 100644
--- a/include/MqttHandleHass.h
+++ b/include/MqttHandleHass.h
@@ -1,11 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "Configuration.h"
-#include <Arduino.h>
 #include <ArduinoJson.h>
 #include <Hoymiles.h>
-#include <memory>
 
 // mqtt discovery device classes
 enum {
diff --git a/include/MqttHandleInverter.h b/include/MqttHandleInverter.h
index 56c1ef87..a4e49ce4 100644
--- a/include/MqttHandleInverter.h
+++ b/include/MqttHandleInverter.h
@@ -2,10 +2,8 @@
 #pragma once
 
 #include "Configuration.h"
-#include <Arduino.h>
 #include <Hoymiles.h>
 #include <espMqttClient.h>
-#include <memory>
 
 class MqttHandleInverterClass {
 public:
diff --git a/include/MqttSettings.h b/include/MqttSettings.h
index d3279f6d..e68c230f 100644
--- a/include/MqttSettings.h
+++ b/include/MqttSettings.h
@@ -2,11 +2,9 @@
 #pragma once
 
 #include "NetworkSettings.h"
-#include <Arduino.h>
 #include <MqttSubscribeParser.h>
 #include <Ticker.h>
 #include <espMqttClient.h>
-#include <memory>
 
 class MqttSettingsClass {
 public:
diff --git a/include/NetworkSettings.h b/include/NetworkSettings.h
index 1ad3c6a4..507167b0 100644
--- a/include/NetworkSettings.h
+++ b/include/NetworkSettings.h
@@ -3,7 +3,6 @@
 
 #include <DNSServer.h>
 #include <WiFi.h>
-#include <memory>
 #include <vector>
 
 enum class network_mode {
diff --git a/include/NtpSettings.h b/include/NtpSettings.h
index 08dc06e4..188876e8 100644
--- a/include/NtpSettings.h
+++ b/include/NtpSettings.h
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include <Arduino.h>
-
 class NtpSettingsClass {
 public:
     NtpSettingsClass();
diff --git a/include/WebApi_prometheus.h b/include/WebApi_prometheus.h
index 87a406e3..42d52422 100644
--- a/include/WebApi_prometheus.h
+++ b/include/WebApi_prometheus.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Hoymiles.h"
 #include <ESPAsyncWebServer.h>
+#include <Hoymiles.h>
 
 class WebApiPrometheusClass {
 public:
diff --git a/include/WebApi_ws_live.h b/include/WebApi_ws_live.h
index 7f21f803..5da18640 100644
--- a/include/WebApi_ws_live.h
+++ b/include/WebApi_ws_live.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "ArduinoJson.h"
+#include <ArduinoJson.h>
 #include <ESPAsyncWebServer.h>
 #include <Hoymiles.h>
 
diff --git a/src/MqttSettings.cpp b/src/MqttSettings.cpp
index 02bde756..bcb59282 100644
--- a/src/MqttSettings.cpp
+++ b/src/MqttSettings.cpp
@@ -4,10 +4,6 @@
  */
 #include "MqttSettings.h"
 #include "Configuration.h"
-#include "NetworkSettings.h"
-#include <MqttClientSetup.h>
-#include <Ticker.h>
-#include <espMqttClient.h>
 
 MqttSettingsClass::MqttSettingsClass()
 {
diff --git a/src/NetworkSettings.cpp b/src/NetworkSettings.cpp
index b975043c..88b93fbb 100644
--- a/src/NetworkSettings.cpp
+++ b/src/NetworkSettings.cpp
@@ -6,7 +6,6 @@
 #include "Configuration.h"
 #include "Utils.h"
 #include "defaults.h"
-#include <WiFi.h>
 #ifdef OPENDTU_ETHERNET
 #include <ETH.h>
 #endif
diff --git a/src/WebApi.cpp b/src/WebApi.cpp
index 5076ce43..9cd9715d 100644
--- a/src/WebApi.cpp
+++ b/src/WebApi.cpp
@@ -3,10 +3,9 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "defaults.h"
+#include <AsyncJson.h>
 
 WebApiClass::WebApiClass()
     : _server(HTTP_PORT)
diff --git a/src/WebApi_config.cpp b/src/WebApi_config.cpp
index 84e6af95..c848b36b 100644
--- a/src/WebApi_config.cpp
+++ b/src/WebApi_config.cpp
@@ -3,10 +3,9 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_config.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
 #include <LittleFS.h>
 
 void WebApiConfigClass::init(AsyncWebServer* server)
diff --git a/src/WebApi_devinfo.cpp b/src/WebApi_devinfo.cpp
index 1a29081c..d55235db 100644
--- a/src/WebApi_devinfo.cpp
+++ b/src/WebApi_devinfo.cpp
@@ -3,10 +3,9 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_devinfo.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
-#include "Hoymiles.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
+#include <Hoymiles.h>
 #include <ctime>
 
 void WebApiDevInfoClass::init(AsyncWebServer* server)
diff --git a/src/WebApi_dtu.cpp b/src/WebApi_dtu.cpp
index bb61b059..0ca26628 100644
--- a/src/WebApi_dtu.cpp
+++ b/src/WebApi_dtu.cpp
@@ -3,11 +3,10 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_dtu.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
-#include "Hoymiles.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
+#include <Hoymiles.h>
 
 void WebApiDtuClass::init(AsyncWebServer* server)
 {
diff --git a/src/WebApi_eventlog.cpp b/src/WebApi_eventlog.cpp
index 6c03fb46..c312739f 100644
--- a/src/WebApi_eventlog.cpp
+++ b/src/WebApi_eventlog.cpp
@@ -3,10 +3,9 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_eventlog.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
-#include "Hoymiles.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
+#include <Hoymiles.h>
 
 void WebApiEventlogClass::init(AsyncWebServer* server)
 {
diff --git a/src/WebApi_firmware.cpp b/src/WebApi_firmware.cpp
index 48984f42..798264a0 100644
--- a/src/WebApi_firmware.cpp
+++ b/src/WebApi_firmware.cpp
@@ -3,12 +3,11 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_firmware.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "Update.h"
 #include "WebApi.h"
 #include "helper.h"
+#include <AsyncJson.h>
 
 void WebApiFirmwareClass::init(AsyncWebServer* server)
 {
diff --git a/src/WebApi_inverter.cpp b/src/WebApi_inverter.cpp
index 39ac2e58..edb023f5 100644
--- a/src/WebApi_inverter.cpp
+++ b/src/WebApi_inverter.cpp
@@ -3,13 +3,12 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_inverter.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
-#include "Hoymiles.h"
 #include "MqttHandleHass.h"
 #include "WebApi.h"
 #include "helper.h"
+#include <AsyncJson.h>
+#include <Hoymiles.h>
 
 void WebApiInverterClass::init(AsyncWebServer* server)
 {
diff --git a/src/WebApi_limit.cpp b/src/WebApi_limit.cpp
index 3195d40e..f05d04d0 100644
--- a/src/WebApi_limit.cpp
+++ b/src/WebApi_limit.cpp
@@ -3,10 +3,9 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_limit.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
-#include "Hoymiles.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
+#include <Hoymiles.h>
 
 void WebApiLimitClass::init(AsyncWebServer* server)
 {
@@ -43,11 +42,9 @@ void WebApiLimitClass::onLimitStatus(AsyncWebServerRequest* request)
         String limitStatus = "Unknown";
         if (status == LastCommandSuccess::CMD_OK) {
             limitStatus = "Ok";
-        }
-        else if (status == LastCommandSuccess::CMD_NOK) {
+        } else if (status == LastCommandSuccess::CMD_NOK) {
             limitStatus = "Failure";
-        }
-        else if (status == LastCommandSuccess::CMD_PENDING) {
+        } else if (status == LastCommandSuccess::CMD_PENDING) {
             limitStatus = "Pending";
         }
         root[serial]["limit_set_status"] = limitStatus;
diff --git a/src/WebApi_maintenance.cpp b/src/WebApi_maintenance.cpp
index 9a176822..effedd6b 100644
--- a/src/WebApi_maintenance.cpp
+++ b/src/WebApi_maintenance.cpp
@@ -4,8 +4,8 @@
  */
 
 #include "WebApi_maintenance.h"
-#include "AsyncJson.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
 
 void WebApiMaintenanceClass::init(AsyncWebServer* server)
 {
diff --git a/src/WebApi_mqtt.cpp b/src/WebApi_mqtt.cpp
index db4c2420..71ab6774 100644
--- a/src/WebApi_mqtt.cpp
+++ b/src/WebApi_mqtt.cpp
@@ -3,13 +3,12 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_mqtt.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "MqttHandleHass.h"
 #include "MqttSettings.h"
 #include "WebApi.h"
 #include "helper.h"
+#include <AsyncJson.h>
 
 void WebApiMqttClass::init(AsyncWebServer* server)
 {
diff --git a/src/WebApi_network.cpp b/src/WebApi_network.cpp
index c5a34846..b24ce1bb 100644
--- a/src/WebApi_network.cpp
+++ b/src/WebApi_network.cpp
@@ -3,12 +3,11 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_network.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "NetworkSettings.h"
 #include "WebApi.h"
 #include "helper.h"
+#include <AsyncJson.h>
 
 void WebApiNetworkClass::init(AsyncWebServer* server)
 {
diff --git a/src/WebApi_ntp.cpp b/src/WebApi_ntp.cpp
index 4c371547..14eab9c6 100644
--- a/src/WebApi_ntp.cpp
+++ b/src/WebApi_ntp.cpp
@@ -3,12 +3,11 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_ntp.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "NtpSettings.h"
 #include "WebApi.h"
 #include "helper.h"
+#include <AsyncJson.h>
 
 void WebApiNtpClass::init(AsyncWebServer* server)
 {
diff --git a/src/WebApi_power.cpp b/src/WebApi_power.cpp
index 22591c05..6426f171 100644
--- a/src/WebApi_power.cpp
+++ b/src/WebApi_power.cpp
@@ -3,10 +3,9 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_power.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
-#include "Hoymiles.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
+#include <Hoymiles.h>
 
 void WebApiPowerClass::init(AsyncWebServer* server)
 {
diff --git a/src/WebApi_prometheus.cpp b/src/WebApi_prometheus.cpp
index 2896fa1a..5e9a579b 100644
--- a/src/WebApi_prometheus.cpp
+++ b/src/WebApi_prometheus.cpp
@@ -1,8 +1,7 @@
 #include "WebApi_prometheus.h"
-
 #include "Configuration.h"
-#include "Hoymiles.h"
 #include "NetworkSettings.h"
+#include <Hoymiles.h>
 
 void WebApiPrometheusClass::init(AsyncWebServer* server)
 {
diff --git a/src/WebApi_security.cpp b/src/WebApi_security.cpp
index c345d385..e4efdf4e 100644
--- a/src/WebApi_security.cpp
+++ b/src/WebApi_security.cpp
@@ -3,11 +3,10 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_security.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "WebApi.h"
 #include "helper.h"
+#include <AsyncJson.h>
 
 void WebApiSecurityClass::init(AsyncWebServer* server)
 {
diff --git a/src/WebApi_sysstatus.cpp b/src/WebApi_sysstatus.cpp
index ce7c21a2..ca4cebe3 100644
--- a/src/WebApi_sysstatus.cpp
+++ b/src/WebApi_sysstatus.cpp
@@ -3,11 +3,10 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_sysstatus.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "NetworkSettings.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
 #include <Hoymiles.h>
 #include <LittleFS.h>
 #include <ResetReason.h>
diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp
index 0027c8f2..e396fec3 100644
--- a/src/WebApi_ws_live.cpp
+++ b/src/WebApi_ws_live.cpp
@@ -3,10 +3,10 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_ws_live.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "WebApi.h"
 #include "defaults.h"
+#include <AsyncJson.h>
 
 WebApiWsLiveClass::WebApiWsLiveClass()
     : _ws("/livedata")
diff --git a/src/main.cpp b/src/main.cpp
index 5fc75eb6..9db9c720 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,7 +3,6 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "Configuration.h"
-#include "Hoymiles.h"
 #include "MqttHandleDtu.h"
 #include "MqttHandleHass.h"
 #include "MqttHandleInverter.h"
@@ -14,6 +13,7 @@
 #include "WebApi.h"
 #include "defaults.h"
 #include <Arduino.h>
+#include <Hoymiles.h>
 #include <LittleFS.h>
 
 void setup()