diff --git a/src/ESP32React/APSettingsService.cpp b/src/ESP32React/APSettingsService.cpp
index 2097304d2..e26d3647d 100644
--- a/src/ESP32React/APSettingsService.cpp
+++ b/src/ESP32React/APSettingsService.cpp
@@ -1,6 +1,6 @@
 #include "APSettingsService.h"
 
-#include <emsesp_stub.hpp>
+#include <emsesp.h>
 
 APSettingsService::APSettingsService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager)
     : _httpEndpoint(APSettings::read, APSettings::update, this, server, AP_SETTINGS_SERVICE_PATH, securityManager)
diff --git a/src/ESP32React/MqttSettingsService.cpp b/src/ESP32React/MqttSettingsService.cpp
index 232a0027c..f2140e071 100644
--- a/src/ESP32React/MqttSettingsService.cpp
+++ b/src/ESP32React/MqttSettingsService.cpp
@@ -1,6 +1,6 @@
 #include "MqttSettingsService.h"
 
-#include <emsesp_stub.hpp>
+#include <emsesp.h>
 
 MqttSettingsService::MqttSettingsService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager)
     : _httpEndpoint(MqttSettings::read, MqttSettings::update, this, server, MQTT_SETTINGS_SERVICE_PATH, securityManager)
diff --git a/src/ESP32React/MqttStatus.cpp b/src/ESP32React/MqttStatus.cpp
index 03e999ee5..6923eeff8 100644
--- a/src/ESP32React/MqttStatus.cpp
+++ b/src/ESP32React/MqttStatus.cpp
@@ -1,6 +1,6 @@
 #include "MqttStatus.h"
 
-#include <emsesp_stub.hpp>
+#include <emsesp.h>
 
 MqttStatus::MqttStatus(AsyncWebServer * server, MqttSettingsService * mqttSettingsService, SecurityManager * securityManager)
     : _mqttSettingsService(mqttSettingsService) {
diff --git a/src/ESP32React/NTPSettingsService.cpp b/src/ESP32React/NTPSettingsService.cpp
index c2b3d5ab0..337e1649e 100644
--- a/src/ESP32React/NTPSettingsService.cpp
+++ b/src/ESP32React/NTPSettingsService.cpp
@@ -1,6 +1,6 @@
 #include "NTPSettingsService.h"
 
-#include <emsesp_stub.hpp>
+#include <emsesp.h>
 
 NTPSettingsService::NTPSettingsService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager)
     : _httpEndpoint(NTPSettings::read, NTPSettings::update, this, server, NTP_SETTINGS_SERVICE_PATH, securityManager)
diff --git a/src/ESP32React/NTPStatus.cpp b/src/ESP32React/NTPStatus.cpp
index 308176fa1..9abe0f9ba 100644
--- a/src/ESP32React/NTPStatus.cpp
+++ b/src/ESP32React/NTPStatus.cpp
@@ -1,6 +1,6 @@
 #include "NTPStatus.h"
 
-#include <emsesp_stub.hpp>
+#include <emsesp.h>
 
 #include <array>
 
diff --git a/src/ESP32React/NetworkSettingsService.cpp b/src/ESP32React/NetworkSettingsService.cpp
index f9a5c5956..4a7950662 100644
--- a/src/ESP32React/NetworkSettingsService.cpp
+++ b/src/ESP32React/NetworkSettingsService.cpp
@@ -1,6 +1,6 @@
 #include "NetworkSettingsService.h"
 
-#include <emsesp_stub.hpp>
+#include <emsesp.h>
 
 NetworkSettingsService::NetworkSettingsService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager)
     : _httpEndpoint(NetworkSettings::read, NetworkSettings::update, this, server, NETWORK_SETTINGS_SERVICE_PATH, securityManager)
diff --git a/src/ESP32React/NetworkStatus.cpp b/src/ESP32React/NetworkStatus.cpp
index 5b1070e9b..3d82cb57b 100644
--- a/src/ESP32React/NetworkStatus.cpp
+++ b/src/ESP32React/NetworkStatus.cpp
@@ -1,6 +1,6 @@
 #include "NetworkStatus.h"
 
-#include <emsesp_stub.hpp>
+#include <emsesp.h>
 
 #ifdef TASMOTA_SDK
 #include "lwip/dns.h"
diff --git a/src/ESP32React/UploadFileService.cpp b/src/ESP32React/UploadFileService.cpp
index 3d82b458c..126d3e237 100644
--- a/src/ESP32React/UploadFileService.cpp
+++ b/src/ESP32React/UploadFileService.cpp
@@ -1,6 +1,6 @@
 #include "UploadFileService.h"
 
-#include <emsesp_stub.hpp>
+#include <emsesp.h>
 
 #include <esp_app_format.h>
 
diff --git a/src/core/emsesp_stub.hpp b/src/core/emsesp_stub.hpp
deleted file mode 100644
index 19b23ed12..000000000
--- a/src/core/emsesp_stub.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2024  emsesp.org - proddy, MichaelDvP
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef EMSESP_EMSESP_STUB_H
-#define EMSESP_EMSESP_STUB_H
-
-#include "system.h"
-#include "mqtt.h"
-#include "temperaturesensor.h"
-// #include "../version.h"
-#include "ESP32React/ESP32React.h"
-
-#include <uuid/log.h>
-
-using uuid::log::Logger;
-
-// forward declarator
-// used to bind EMS-ESP functions to external frameworks
-namespace emsesp {
-class EMSESP {
-  public:
-    static Mqtt              mqtt_;
-    static System            system_;
-    static TemperatureSensor temperaturesensor_;
-    static Logger            logger();
-    static ESP32React        esp32React;
-};
-
-} // namespace emsesp
-
-#endif