amend 555c272, again

esp8266 · d-a-v · Oct 6, 2020 · Jun 14, 2020 · Jun 14, 2020 · Jun 14, 2020
commit 685c25f5233c0fed3d2611843f8db280fa82e146
diff --git a/cores/esp8266/umm_malloc/umm_malloc_cfg.h b/cores/esp8266/umm_malloc/umm_malloc_cfg.h
@@ -17,9 +17,10 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
-#include <debug.h>
+
 #include <pgmspace.h>
-#include <esp8266_undocumented.h>
+#include "../debug.h"
+#include "../esp8266_undocumented.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/libraries/ESP8266WiFi/src/include/ClientContext.h b/libraries/ESP8266WiFi/src/include/ClientContext.h
@@ -29,8 +29,6 @@ typedef void (*discard_cb_t)(void*, ClientContext*);
 extern "C" void esp_yield();
 extern "C" void esp_schedule();
 
-#include <debug.h>
-
 #include "DataSource.h"
 
 bool getDefaultPrivateGlobalSyncValue ();

diff --git a/libraries/ESP8266WiFi/src/include/UdpContext.h b/libraries/ESP8266WiFi/src/include/UdpContext.h
@@ -30,7 +30,6 @@ void esp_schedule();
 }
 
 #include <AddrList.h>
-#include <debug.h>
 
 #define PBUF_ALIGNER_ADJUST 4
 #define PBUF_ALIGNER(x) ((void*)((((intptr_t)(x))+3)&~3))

diff --git a/tests/host/common/include/ClientContext.h b/tests/host/common/include/ClientContext.h
@@ -28,7 +28,6 @@ extern "C" void esp_yield();
 extern "C" void esp_schedule();
 
 #include <include/DataSource.h>
-#include <debug.h>
 
 bool getDefaultPrivateGlobalSyncValue ();