diff --git a/cores/esp8266/debug.cpp b/cores/esp8266/debug.cpp
index 6a99510fe6..d8bf8bb11d 100644
--- a/cores/esp8266/debug.cpp
+++ b/cores/esp8266/debug.cpp
@@ -34,4 +34,3 @@ void ICACHE_RAM_ATTR hexdump(const void *mem, uint32_t len, uint8_t cols) {
     }
     os_printf("\n");
 }
-
diff --git a/cores/esp8266/debug.h b/cores/esp8266/debug.h
index 0a804e76b2..fab128253c 100644
--- a/cores/esp8266/debug.h
+++ b/cores/esp8266/debug.h
@@ -5,11 +5,11 @@
 #include <stdint.h>
 
 #ifdef DEBUG_ESP_CORE
-#define DEBUGV(...) ets_printf(__VA_ARGS__)
+#define DEBUGV(fmt, ...) ::printf((PGM_P)PSTR(fmt), ## __VA_ARGS__)
 #endif
 
 #ifndef DEBUGV
-#define DEBUGV(...)
+#define DEBUGV(...) do { (void)0; } while (0)
 #endif
 
 #ifdef __cplusplus
diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
index 5c982c303b..44335c505c 100644
--- a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
+++ b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
@@ -42,7 +42,7 @@
 #endif
 
 #ifndef DEBUG_HTTPCLIENT
-#define DEBUG_HTTPCLIENT(...)
+#define DEBUG_HTTPCLIENT(...) do { (void)0; } while (0)
 #endif
 
 #define HTTPCLIENT_DEFAULT_TCP_TIMEOUT (5000)
diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFi.h b/libraries/ESP8266WiFi/src/ESP8266WiFi.h
index 3bd1472069..d26e1db6bd 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFi.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFi.h
@@ -50,7 +50,7 @@ extern "C" {
 #endif
 
 #ifndef DEBUG_WIFI
-#define DEBUG_WIFI(...)
+#define DEBUG_WIFI(...) do { (void)0; } while (0)
 #endif
 
 
diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.h b/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.h
index af3fce3e16..60fdad5785 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.h
@@ -29,12 +29,12 @@
 
 #ifdef DEBUG_ESP_WIFI
 #ifdef DEBUG_ESP_PORT
-#define DEBUG_WIFI_GENERIC(fmt, ...) DEBUG_ESP_PORT.printf( (PGM_P)PSTR(fmt), ##__VA_ARGS__ )
+#define DEBUG_WIFI_GENERIC(fmt, ...) DEBUG_ESP_PORT.printf_P( (PGM_P)PSTR(fmt), ##__VA_ARGS__ )
 #endif
 #endif
 
 #ifndef DEBUG_WIFI_GENERIC
-#define DEBUG_WIFI_GENERIC(...)
+#define DEBUG_WIFI_GENERIC(...) do { (void)0; } while (0)
 #endif
 
 struct WiFiEventHandlerOpaque;
diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h
index 5c616da269..9417e2ba40 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h
@@ -32,12 +32,12 @@
 
 #ifdef DEBUG_ESP_WIFI
 #ifdef DEBUG_ESP_PORT
-#define DEBUG_WIFI_MULTI(fmt, ...) DEBUG_ESP_PORT.printf( (PGM_P)PSTR(fmt), ##__VA_ARGS__ )
+#define DEBUG_WIFI_MULTI(fmt, ...) DEBUG_ESP_PORT.printf_P( (PGM_P)PSTR(fmt), ##__VA_ARGS__ )
 #endif
 #endif
 
 #ifndef DEBUG_WIFI_MULTI
-#define DEBUG_WIFI_MULTI(...)
+#define DEBUG_WIFI_MULTI(...) do { (void)0; } while (0)
 #endif
 
 struct WifiAPEntry {
diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
index e84ae092e1..a61e071f70 100644
--- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
+++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
@@ -36,12 +36,12 @@
 
 #ifdef DEBUG_ESP_HTTP_UPDATE
 #ifdef DEBUG_ESP_PORT
-#define DEBUG_HTTP_UPDATE(...) DEBUG_ESP_PORT.printf( __VA_ARGS__ )
+#define DEBUG_HTTP_UPDATE(fmt, ...) DEBUG_ESP_PORT.printf_P( (PGM_P)PSTR(fmt), ## __VA_ARGS__ )
 #endif
 #endif
 
 #ifndef DEBUG_HTTP_UPDATE
-#define DEBUG_HTTP_UPDATE(...)
+#define DEBUG_HTTP_UPDATE(...) do { (void)0; } while(0)
 #endif
 
 /// note we use HTTP client errors too so we start at 100