ota: simplify the include chain

code/espurna/ota.cpp

@@ -4,10 +4,11 @@ OTA MODULE COMMON FUNCTIONS
 
 */
 
+#include "espurna.h"
 #include "ota.h"
+#include "rtcmem.h"
 #include "system.h"
 #include "terminal.h"
-#include "rtcmem.h"
 #include "utils.h"
 #include "ws.h"
 

code/espurna/ota.h

@@ -6,7 +6,7 @@ OTA MODULE
 
 #pragma once
 
-#include "espurna.h"
+#include "system.h"
 
 // Main entrypoint for basic OTA methods
 // (like clients, arduinoota and basic web)

code/espurna/ota_arduinoota.cpp

@@ -6,10 +6,11 @@ Copyright (C) 2016-2019 by Xose Pérez <xose dot perez at gmail dot com>
 
 */
 
-#include "ota.h"
+#include "espurna.h"
 
 #if OTA_ARDUINOOTA_SUPPORT
 
+#include "ota.h"
 #include "system.h"
 #include "ws.h"
 

code/espurna/ota_asynctcp.cpp

@@ -6,7 +6,7 @@ Copyright (C) 2016-2019 by Xose Pérez <xose dot perez at gmail dot com>
 
 */
 
-#include "ota.h"
+#include "espurna.h"
 
 #if OTA_CLIENT == OTA_CLIENT_ASYNCTCP
 
@@ -14,8 +14,7 @@ Copyright (C) 2016-2019 by Xose Pérez <xose dot perez at gmail dot com>
 // Terminal and MQTT OTA command handlers
 // -----------------------------------------------------------------------------
 
-#include <Arduino.h>
-#include "espurna.h"
+#include "ota.h"
 
 #if TERMINAL_SUPPORT || OTA_MQTT_SUPPORT
 

code/espurna/ota_httpupdate.cpp

@@ -10,13 +10,12 @@ Copyright (C) 2019 by Maxim Prokhorov <prokhorov dot max at outlook dot com>
 // OTA by using Core's HTTP(s) updater
 // -----------------------------------------------------------------------------
 
-#include "ota.h"
+#include "espurna.h"
 
 #if OTA_CLIENT == OTA_CLIENT_HTTPUPDATE
 
-#include <memory>
-
 #include "mqtt.h"
+#include "ota.h"
 #include "system.h"
 #include "terminal.h"
 

code/espurna/ota_web.cpp

@@ -7,10 +7,11 @@ Copyright (C) 2020 by Maxim Prokhorov <prokhorov dot max at outlook dot com>
 
 */
 
-#include "ota.h"
+#include "espurna.h"
 
 #if WEB_SUPPORT && OTA_WEB_SUPPORT
 
+#include "ota.h"
 #include "web.h"
 #include "ws.h"