diff --git a/platformio.ini b/platformio.ini
index c8afabf10..13efa3052 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -89,7 +89,7 @@ monitor_speed             = 115200
 targets                   =
 extra_scripts             = pre:tools/pio/pre_default_check.py
                             ${extra_scripts_esp8266.extra_scripts}
-src_filter                = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<*/Commands/> -<*/ControllerQueue/> -<*/PluginStructs/>  -<*/WebServer/>
+src_filter                = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<*/Commands/> -<*/ControllerQueue/> -<*/Helpers/> -<*/PluginStructs/>  -<*/WebServer/>
 
 
 
diff --git a/src/src/DataStructs/C013_p2p_dataStructs.cpp b/src/src/DataStructs/C013_p2p_dataStructs.cpp
index a13abd063..cea255abe 100644
--- a/src/src/DataStructs/C013_p2p_dataStructs.cpp
+++ b/src/src/DataStructs/C013_p2p_dataStructs.cpp
@@ -1,4 +1,4 @@
-#include "C013_p2p_dataStructs.h"
+#include "../DataStructs/C013_p2p_dataStructs.h"
 
 #include "../Globals/Plugins.h"
 #include "../../ESPEasy_common.h"
diff --git a/src/src/DataStructs/DeviceStruct.cpp b/src/src/DataStructs/DeviceStruct.cpp
index cab0d0845..f6a1f83c1 100644
--- a/src/src/DataStructs/DeviceStruct.cpp
+++ b/src/src/DataStructs/DeviceStruct.cpp
@@ -1,4 +1,4 @@
-#include "DeviceStruct.h"
+#include "../DataStructs/DeviceStruct.h"
 
 DeviceStruct::DeviceStruct() :
   Number(0), Type(0), VType(Sensor_VType::SENSOR_TYPE_NONE), Ports(0), ValueCount(0),
diff --git a/src/src/DataStructs/ESPEasy_EventStruct.h b/src/src/DataStructs/ESPEasy_EventStruct.h
index f21009022..21fbbcdfe 100644
--- a/src/src/DataStructs/ESPEasy_EventStruct.h
+++ b/src/src/DataStructs/ESPEasy_EventStruct.h
@@ -9,7 +9,7 @@
 //#include "../Globals/CPlugins.h"
 #include "../Globals/NPlugins.h"
 //#include "../Globals/Plugins.h"
-#include "DeviceStruct.h"
+#include "../DataStructs/DeviceStruct.h"
 
 
 /*********************************************************************************************\
diff --git a/src/src/DataStructs/ESPeasyControllerCache.cpp b/src/src/DataStructs/ESPeasyControllerCache.cpp
index baf279f86..017b8cfd7 100644
--- a/src/src/DataStructs/ESPeasyControllerCache.cpp
+++ b/src/src/DataStructs/ESPeasyControllerCache.cpp
@@ -1,4 +1,4 @@
-#include "ESPEasyControllerCache.h"
+#include "../DataStructs/ESPEasyControllerCache.h"
 
 
 ControllerCache_struct::ControllerCache_struct() {}
diff --git a/src/src/DataStructs/EventQueue.cpp b/src/src/DataStructs/EventQueue.cpp
index 4a308d1e3..1aa0685e8 100644
--- a/src/src/DataStructs/EventQueue.cpp
+++ b/src/src/DataStructs/EventQueue.cpp
@@ -1,4 +1,4 @@
-#include "EventQueue.h"
+#include "../DataStructs/EventQueue.h"
 
 EventQueueStruct::EventQueueStruct() {}
 
diff --git a/src/src/DataStructs/ExtendedControllerCredentialsStruct.cpp b/src/src/DataStructs/ExtendedControllerCredentialsStruct.cpp
index 8dff04f21..8322beb27 100644
--- a/src/src/DataStructs/ExtendedControllerCredentialsStruct.cpp
+++ b/src/src/DataStructs/ExtendedControllerCredentialsStruct.cpp
@@ -1,6 +1,4 @@
-#include "ExtendedControllerCredentialsStruct.h"
-
-
+#include "../DataStructs/ExtendedControllerCredentialsStruct.h"
 
 #include "../Helpers/ESPEasy_Storage.h"
 
diff --git a/src/src/DataStructs/NodeStruct.cpp b/src/src/DataStructs/NodeStruct.cpp
index ef94692e6..ba9da87c9 100644
--- a/src/src/DataStructs/NodeStruct.cpp
+++ b/src/src/DataStructs/NodeStruct.cpp
@@ -1,4 +1,4 @@
-#include "NodeStruct.h"
+#include "../DataStructs/NodeStruct.h"
 
 const __FlashStringHelper * getNodeTypeDisplayString(uint8_t nodeType) {
   switch (nodeType)
diff --git a/src/src/DataStructs/PortStatusStruct.cpp b/src/src/DataStructs/PortStatusStruct.cpp
index fb1ae35ce..9e2ce1e68 100644
--- a/src/src/DataStructs/PortStatusStruct.cpp
+++ b/src/src/DataStructs/PortStatusStruct.cpp
@@ -1,4 +1,4 @@
-#include "PortStatusStruct.h"
+#include "../DataStructs/PortStatusStruct.h"
 
 #include "../DataStructs/PinMode.h"
 
diff --git a/src/src/DataStructs/ProtocolStruct.cpp b/src/src/DataStructs/ProtocolStruct.cpp
index 6306ce42f..d0ed32f24 100644
--- a/src/src/DataStructs/ProtocolStruct.cpp
+++ b/src/src/DataStructs/ProtocolStruct.cpp
@@ -1,4 +1,4 @@
-#include "ProtocolStruct.h"
+#include "../DataStructs/ProtocolStruct.h"
 
 ProtocolStruct::ProtocolStruct() :
     defaultPort(0), Number(0), usesMQTT(false), usesAccount(false), usesPassword(false),
diff --git a/src/src/DataStructs/RTC_cache_handler_struct.cpp b/src/src/DataStructs/RTC_cache_handler_struct.cpp
index e6e920daa..76a862b73 100644
--- a/src/src/DataStructs/RTC_cache_handler_struct.cpp
+++ b/src/src/DataStructs/RTC_cache_handler_struct.cpp
@@ -1,4 +1,4 @@
-#include "RTC_cache_handler_struct.h"
+#include "../DataStructs/RTC_cache_handler_struct.h"
 
 #include "../../ESPEasy_common.h"
 #include "../DataStructs/RTCStruct.h"
diff --git a/src/src/DataStructs/SettingsStruct.cpp b/src/src/DataStructs/SettingsStruct.cpp
index 7b48f6fa5..d0aae1bfe 100644
--- a/src/src/DataStructs/SettingsStruct.cpp
+++ b/src/src/DataStructs/SettingsStruct.cpp
@@ -7,6 +7,9 @@
 #include "../DataTypes/SPI_options.h"
 #include "../../ESPEasy_common.h"
 
+#ifndef DATASTRUCTS_SETTINGSSTRUCT_CPP
+#define DATASTRUCTS_SETTINGSSTRUCT_CPP
+
 template<unsigned int N_TASKS>
 SettingsStruct_tmpl<N_TASKS>::SettingsStruct_tmpl() : ResetFactoryDefaultPreference(0) {
   clearAll();
@@ -669,3 +672,4 @@ void SettingsStruct_tmpl<N_TASKS>::setWiFi_TX_power(float dBm) {
   WiFi_TX_power = dBm * 4.0f;
 }
 
+#endif
\ No newline at end of file
diff --git a/src/src/DataStructs/SystemTimerStruct.cpp b/src/src/DataStructs/SystemTimerStruct.cpp
index 2397fe018..81b3e2f20 100644
--- a/src/src/DataStructs/SystemTimerStruct.cpp
+++ b/src/src/DataStructs/SystemTimerStruct.cpp
@@ -1,4 +1,4 @@
-#include "SystemTimerStruct.h"
+#include "../DataStructs/SystemTimerStruct.h"
 
 #include "../ESPEasyCore/ESPEasy_Log.h"
 
diff --git a/src/src/DataStructs/TimeChangeRule.cpp b/src/src/DataStructs/TimeChangeRule.cpp
index b486c90b8..5f73028f7 100644
--- a/src/src/DataStructs/TimeChangeRule.cpp
+++ b/src/src/DataStructs/TimeChangeRule.cpp
@@ -1,4 +1,4 @@
-#include "TimeChangeRule.h"
+#include "../DataStructs/TimeChangeRule.h"
 
 
 
diff --git a/src/src/DataStructs/WiFiEventData.cpp b/src/src/DataStructs/WiFiEventData.cpp
index 478ad9382..28a86d8b5 100644
--- a/src/src/DataStructs/WiFiEventData.cpp
+++ b/src/src/DataStructs/WiFiEventData.cpp
@@ -1,4 +1,4 @@
-#include "WiFiEventData.h"
+#include "../DataStructs/WiFiEventData.h"
 
 #include "../ESPEasyCore/ESPEasy_Log.h"
 
diff --git a/src/src/DataStructs/timer_id_couple.cpp b/src/src/DataStructs/timer_id_couple.cpp
index c6123e19a..eabb67962 100644
--- a/src/src/DataStructs/timer_id_couple.cpp
+++ b/src/src/DataStructs/timer_id_couple.cpp
@@ -1,4 +1,4 @@
-#include "timer_id_couple.h"
+#include "../DataStructs/timer_id_couple.h"
 
 #include "../Helpers/ESPEasy_time_calc.h"
 
diff --git a/src/src/Helpers/Audio.cpp b/src/src/Helpers/Audio.cpp
index c29fdc5fb..94d751c60 100644
--- a/src/src/Helpers/Audio.cpp
+++ b/src/src/Helpers/Audio.cpp
@@ -1,4 +1,4 @@
-#include "Audio.h"
+#include "../Helpers/Audio.h"
 
 #include "../Globals/RamTracker.h"
 #include "../Helpers/Hardware.h"
diff --git a/src/src/Helpers/CRC_functions.cpp b/src/src/Helpers/CRC_functions.cpp
index e363e2521..f62b4644c 100644
--- a/src/src/Helpers/CRC_functions.cpp
+++ b/src/src/Helpers/CRC_functions.cpp
@@ -1,4 +1,4 @@
-#include "CRC_functions.h"
+#include "../Helpers/CRC_functions.h"
 
 
 int calc_CRC16(const String& text) {
diff --git a/src/src/Helpers/CompiletimeDefines.cpp b/src/src/Helpers/CompiletimeDefines.cpp
index 0568351a7..1792deb67 100644
--- a/src/src/Helpers/CompiletimeDefines.cpp
+++ b/src/src/Helpers/CompiletimeDefines.cpp
@@ -1,4 +1,4 @@
-#include "CompiletimeDefines.h"
+#include "../Helpers/CompiletimeDefines.h"
 
 // This file will be "patched" at compiletime by 
 // tools/pio/generate-compiletime-defines.py
diff --git a/src/src/Helpers/Convert.cpp b/src/src/Helpers/Convert.cpp
index d892c73cd..8d489a32e 100644
--- a/src/src/Helpers/Convert.cpp
+++ b/src/src/Helpers/Convert.cpp
@@ -1,4 +1,4 @@
-#include "Convert.h"
+#include "../Helpers/Convert.h"
 
 /*********************************************************************************************\
    Convert bearing in degree to bearing string
diff --git a/src/src/Helpers/Dallas1WireHelper.cpp b/src/src/Helpers/Dallas1WireHelper.cpp
index 8115944ad..8d590399c 100644
--- a/src/src/Helpers/Dallas1WireHelper.cpp
+++ b/src/src/Helpers/Dallas1WireHelper.cpp
@@ -1,4 +1,4 @@
-#include "Dallas1WireHelper.h"
+#include "../Helpers/Dallas1WireHelper.h"
 
 #include "../../_Plugin_Helper.h"
 #include "../ESPEasyCore/ESPEasy_Log.h"
diff --git a/src/src/Helpers/ESPEasyStatistics.cpp b/src/src/Helpers/ESPEasyStatistics.cpp
index 2fd85f161..c8e1070d0 100644
--- a/src/src/Helpers/ESPEasyStatistics.cpp
+++ b/src/src/Helpers/ESPEasyStatistics.cpp
@@ -1,4 +1,4 @@
-#include "ESPEasyStatistics.h"
+#include "../Helpers/ESPEasyStatistics.h"
 
 
 #ifdef USES_TIMING_STATS
diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp
index 3a3bec9de..bc25b838a 100644
--- a/src/src/Helpers/ESPEasy_Storage.cpp
+++ b/src/src/Helpers/ESPEasy_Storage.cpp
@@ -27,6 +27,7 @@
 #include "../Globals/Settings.h"
 
 #include "../Helpers/ESPEasyRTC.h"
+#include "../Helpers/ESPEasy_checks.h"
 #include "../Helpers/ESPEasy_FactoryDefault.h"
 #include "../Helpers/ESPEasy_time_calc.h"
 #include "../Helpers/FS_Helper.h"
@@ -37,7 +38,6 @@
 #include "../Helpers/PeriodicalActions.h"
 #include "../Helpers/StringConverter.h"
 
-#include "ESPEasy_checks.h"
 
 #ifdef ESP32
 #include <MD5Builder.h>
diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp
index 849f0e3e3..4e42fbf7c 100644
--- a/src/src/Helpers/ESPEasy_checks.cpp
+++ b/src/src/Helpers/ESPEasy_checks.cpp
@@ -209,7 +209,7 @@ bool SettingsCheck(String& error) {
   return error.isEmpty();
 }
 
-#include "Numerical.h"
+#include "../Helpers/Numerical.h"
 
 String checkTaskSettings(taskIndex_t taskIndex) {
   String err = LoadTaskSettings(taskIndex);
diff --git a/src/src/Helpers/ESPEasy_math.cpp b/src/src/Helpers/ESPEasy_math.cpp
index 9665644f8..7e8806b7e 100644
--- a/src/src/Helpers/ESPEasy_math.cpp
+++ b/src/src/Helpers/ESPEasy_math.cpp
@@ -1,4 +1,4 @@
-#include "ESPEasy_math.h"
+#include "../Helpers/ESPEasy_math.h"
 
 #include <cmath>
 
diff --git a/src/src/Helpers/ESPEasy_time.cpp b/src/src/Helpers/ESPEasy_time.cpp
index ff4bee1a4..78970a101 100644
--- a/src/src/Helpers/ESPEasy_time.cpp
+++ b/src/src/Helpers/ESPEasy_time.cpp
@@ -1,4 +1,4 @@
-#include "ESPEasy_time.h"
+#include "../Helpers/ESPEasy_time.h"
 
 #include "../DataTypes/TimeSource.h"
 
@@ -16,7 +16,7 @@
 #include "../Helpers/Networking.h"
 #include "../Helpers/Numerical.h"
 
-#include "ESPEasy_time_calc.h"
+#include "../Helpers/ESPEasy_time_calc.h"
 
 #include <time.h>
 
diff --git a/src/src/Helpers/ESPEasy_time_calc.cpp b/src/src/Helpers/ESPEasy_time_calc.cpp
index cfd22fb28..087dc17b7 100644
--- a/src/src/Helpers/ESPEasy_time_calc.cpp
+++ b/src/src/Helpers/ESPEasy_time_calc.cpp
@@ -1,4 +1,4 @@
-#include "ESPEasy_time_calc.h"
+#include "../Helpers/ESPEasy_time_calc.h"
 
 #include <Arduino.h>
 #include <limits.h>
diff --git a/src/src/Helpers/ESPEasy_time_zone.cpp b/src/src/Helpers/ESPEasy_time_zone.cpp
index 8a89955b8..80cdc0055 100644
--- a/src/src/Helpers/ESPEasy_time_zone.cpp
+++ b/src/src/Helpers/ESPEasy_time_zone.cpp
@@ -1,11 +1,11 @@
-#include "ESPEasy_time_zone.h"
+#include "../Helpers/ESPEasy_time_zone.h"
 
 #include "../DataStructs/TimeChangeRule.h"
 #include "../ESPEasyCore/ESPEasy_Log.h"
 #include "../Globals/ESPEasy_time.h"
 #include "../Globals/Settings.h"
 
-#include "ESPEasy_time_calc.h"
+#include "../Helpers/ESPEasy_time_calc.h"
 
 #include <time.h>
 
diff --git a/src/src/Helpers/Hardware.cpp b/src/src/Helpers/Hardware.cpp
index fc540301d..4ae50ffc8 100644
--- a/src/src/Helpers/Hardware.cpp
+++ b/src/src/Helpers/Hardware.cpp
@@ -1,4 +1,4 @@
-#include "Hardware.h"
+#include "../Helpers/Hardware.h"
 
 #include "../Commands/GPIO.h"
 #include "../CustomBuild/ESPEasyLimits.h"
diff --git a/src/src/Helpers/Modbus_RTU.cpp b/src/src/Helpers/Modbus_RTU.cpp
index f35a314fe..92eaf8246 100644
--- a/src/src/Helpers/Modbus_RTU.cpp
+++ b/src/src/Helpers/Modbus_RTU.cpp
@@ -1,9 +1,9 @@
-#include "Modbus_RTU.h"
+#include "../Helpers/Modbus_RTU.h"
 
 
 #include "../ESPEasyCore/ESPEasy_Log.h"
-#include "ESPEasy_time_calc.h"
-#include "StringConverter.h"
+#include "../Helpers/ESPEasy_time_calc.h"
+#include "../Helpers/StringConverter.h"
 
 
 ModbusRTU_struct::ModbusRTU_struct() : easySerial(nullptr) {
diff --git a/src/src/Helpers/PortStatus.cpp b/src/src/Helpers/PortStatus.cpp
index 7c8d46a80..29ebe4a8c 100644
--- a/src/src/Helpers/PortStatus.cpp
+++ b/src/src/Helpers/PortStatus.cpp
@@ -1,4 +1,4 @@
-#include "PortStatus.h"
+#include "../Helpers/PortStatus.h"
 
 #include "../DataStructs/PinMode.h"
 #include "../Globals/GlobalMapPortStatus.h"
diff --git a/src/src/Helpers/Rules_calculate.cpp b/src/src/Helpers/Rules_calculate.cpp
index 1a9390abb..0dea22104 100644
--- a/src/src/Helpers/Rules_calculate.cpp
+++ b/src/src/Helpers/Rules_calculate.cpp
@@ -1,4 +1,4 @@
-#include "Rules_calculate.h"
+#include "../Helpers/Rules_calculate.h"
 
 #include <Arduino.h>
 
diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp
index cfffd09e5..6ec210780 100644
--- a/src/src/Helpers/StringConverter.cpp
+++ b/src/src/Helpers/StringConverter.cpp
@@ -1,4 +1,4 @@
-#include "StringConverter.h"
+#include "../Helpers/StringConverter.h"
 
 
 #include "../../_Plugin_Helper.h"
diff --git a/src/src/Helpers/StringConverter.h b/src/src/Helpers/StringConverter.h
index 0746d7c12..f31769aa6 100644
--- a/src/src/Helpers/StringConverter.h
+++ b/src/src/Helpers/StringConverter.h
@@ -6,7 +6,7 @@
 #include "../Globals/Plugins.h"
 #include "../Globals/CPlugins.h"
 
-#include "Convert.h"
+#include "../Helpers/Convert.h"
 
 class IPAddress;
 
diff --git a/src/src/Helpers/StringGenerator_GPIO.cpp b/src/src/Helpers/StringGenerator_GPIO.cpp
index 9648f1c88..6753d6caf 100644
--- a/src/src/Helpers/StringGenerator_GPIO.cpp
+++ b/src/src/Helpers/StringGenerator_GPIO.cpp
@@ -1,4 +1,4 @@
-#include "StringGenerator_GPIO.h"
+#include "../Helpers/StringGenerator_GPIO.h"
 
 #include "../Globals/Settings.h"
 #include "../Helpers/Hardware.h"
diff --git a/src/src/Helpers/StringParser.cpp b/src/src/Helpers/StringParser.cpp
index 7a7a8d08f..f0133d52d 100644
--- a/src/src/Helpers/StringParser.cpp
+++ b/src/src/Helpers/StringParser.cpp
@@ -1,5 +1,4 @@
-#include "StringParser.h"
-
+#include "../Helpers/StringParser.h"
 
 #include "../../_Plugin_Helper.h"
 
@@ -19,7 +18,6 @@
 #include "../Helpers/Rules_calculate.h"
 #include "../Helpers/StringConverter.h"
 #include "../Helpers/StringGenerator_GPIO.h"
-#include "../Helpers/StringParser.h"
 
 #include <Arduino.h>
 
diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp
index 59ccd4c49..54c915f2b 100644
--- a/src/src/Helpers/StringProvider.cpp
+++ b/src/src/Helpers/StringProvider.cpp
@@ -1,4 +1,4 @@
-#include "StringProvider.h"
+#include "../Helpers/StringProvider.h"
 
 #ifdef HAS_ETHERNET
 # include "ETH.h"
diff --git a/src/src/Helpers/SystemVariables.cpp b/src/src/Helpers/SystemVariables.cpp
index 2229d43e9..59a2eb226 100644
--- a/src/src/Helpers/SystemVariables.cpp
+++ b/src/src/Helpers/SystemVariables.cpp
@@ -1,4 +1,4 @@
-#include "SystemVariables.h"
+#include "../Helpers/SystemVariables.h"
 
 
 #include "../../ESPEasy_common.h"
diff --git a/src/src/Helpers/WebServer_commandHelper.cpp b/src/src/Helpers/WebServer_commandHelper.cpp
index e538c911c..1eff73867 100644
--- a/src/src/Helpers/WebServer_commandHelper.cpp
+++ b/src/src/Helpers/WebServer_commandHelper.cpp
@@ -1,4 +1,4 @@
-#include "WebServer_commandHelper.h"
+#include "../Helpers/WebServer_commandHelper.h"
 
 #include "../../ESPEasy-Globals.h"
 #include "../Commands/InternalCommands.h"
diff --git a/src/src/Helpers/_CPlugin_DomoticzHelper.cpp b/src/src/Helpers/_CPlugin_DomoticzHelper.cpp
index 638171ddc..f7bf8a128 100644
--- a/src/src/Helpers/_CPlugin_DomoticzHelper.cpp
+++ b/src/src/Helpers/_CPlugin_DomoticzHelper.cpp
@@ -1,4 +1,4 @@
-#include "_CPlugin_DomoticzHelper.h"
+#include "../Helpers/_CPlugin_DomoticzHelper.h"
 
 #ifdef USES_DOMOTICZ
 
diff --git a/src/src/Helpers/_CPlugin_Helper_webform.cpp b/src/src/Helpers/_CPlugin_Helper_webform.cpp
index 4e599bbc6..299117ac1 100644
--- a/src/src/Helpers/_CPlugin_Helper_webform.cpp
+++ b/src/src/Helpers/_CPlugin_Helper_webform.cpp
@@ -1,4 +1,4 @@
-#include "_CPlugin_Helper_webform.h"
+#include "../Helpers/_CPlugin_Helper_webform.h"
 
 #include "../DataStructs/ESPEasy_EventStruct.h"
 #include "../DataTypes/ESPEasy_plugin_functions.h"
diff --git a/src/src/Helpers/_CPlugin_LoRa_TTN_helper.cpp b/src/src/Helpers/_CPlugin_LoRa_TTN_helper.cpp
index 034955aad..23bd79e64 100644
--- a/src/src/Helpers/_CPlugin_LoRa_TTN_helper.cpp
+++ b/src/src/Helpers/_CPlugin_LoRa_TTN_helper.cpp
@@ -1,4 +1,4 @@
-#include "_CPlugin_LoRa_TTN_helper.h"
+#include "../Helpers/_CPlugin_LoRa_TTN_helper.h"
 
 #include "../DataStructs/ESPEasy_EventStruct.h"
 
diff --git a/src/src/Helpers/_Plugin_Helper_serial.cpp b/src/src/Helpers/_Plugin_Helper_serial.cpp
index c43afd4dd..d79caaf02 100644
--- a/src/src/Helpers/_Plugin_Helper_serial.cpp
+++ b/src/src/Helpers/_Plugin_Helper_serial.cpp
@@ -1,4 +1,4 @@
-#include "_Plugin_Helper_serial.h"
+#include "../Helpers/_Plugin_Helper_serial.h"
 
 
 #include "../../_Plugin_Helper.h"
diff --git a/src/src/Helpers/_Plugin_SensorTypeHelper.cpp b/src/src/Helpers/_Plugin_SensorTypeHelper.cpp
index 637101367..b421aac02 100644
--- a/src/src/Helpers/_Plugin_SensorTypeHelper.cpp
+++ b/src/src/Helpers/_Plugin_SensorTypeHelper.cpp
@@ -1,4 +1,4 @@
-#include "_Plugin_SensorTypeHelper.h"
+#include "../Helpers/_Plugin_SensorTypeHelper.h"
 
 #include "../../_Plugin_Helper.h"
 #include "../DataStructs/DeviceStruct.h"
diff --git a/src/src/Helpers/msecTimerHandlerStruct.cpp b/src/src/Helpers/msecTimerHandlerStruct.cpp
index f4cef2cb5..3335ae9dd 100644
--- a/src/src/Helpers/msecTimerHandlerStruct.cpp
+++ b/src/src/Helpers/msecTimerHandlerStruct.cpp
@@ -1,8 +1,8 @@
-#include "msecTimerHandlerStruct.h"
+#include "../Helpers/msecTimerHandlerStruct.h"
 
 #include <Arduino.h>
 
-#include "ESPEasy_time_calc.h"
+#include "../Helpers/ESPEasy_time_calc.h"
 
 
 #define MAX_SCHEDULER_WAIT_TIME 5 // Max delay used in the scheduler for passing idle time.
diff --git a/tools/pio/concat_cpp_files.py b/tools/pio/concat_cpp_files.py
index 1fa9827bc..b2a9e03a1 100644
--- a/tools/pio/concat_cpp_files.py
+++ b/tools/pio/concat_cpp_files.py
@@ -52,5 +52,6 @@ def concat_cpp_files(path_to_concat):
 
 concat_cpp_files('./src/src/Commands')
 concat_cpp_files('./src/src/ControllerQueue')
+concat_cpp_files('./src/src/Helpers')
 concat_cpp_files('./src/src/PluginStructs')
 concat_cpp_files('./src/src/WebServer')
diff --git a/tools/pio/remove_concat_cpp_files.py b/tools/pio/remove_concat_cpp_files.py
index 6ffc27cec..946e6ae8f 100644
--- a/tools/pio/remove_concat_cpp_files.py
+++ b/tools/pio/remove_concat_cpp_files.py
@@ -19,6 +19,7 @@ def clear_all_concat_cpp_files(source, target, env):
     print("\u001b[32m Remove temp concatenated files \u001b[0m")
     clear_concat_cpp_files('./src/src/Commands')
     clear_concat_cpp_files('./src/src/ControllerQueue')
+    clear_concat_cpp_files('./src/src/Helpers')
     clear_concat_cpp_files('./src/src/PluginStructs')
     clear_concat_cpp_files('./src/src/WebServer')
     print("\u001b[32m ------------------------------ \u001b[0m")