diff --git a/cmd/cmd.c b/cmd/cmd.c
index f1a7da9..e8fd745 100644
--- a/cmd/cmd.c
+++ b/cmd/cmd.c
@@ -8,7 +8,7 @@
 #include "uart.h"
 
 #ifdef CMD_DBG
-#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__) } while(0)
+#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0)
 #else
 #define DBG(format, ...) do { } while(0)
 #endif
diff --git a/cmd/handlers.c b/cmd/handlers.c
index 35d19ee..4d20e4d 100644
--- a/cmd/handlers.c
+++ b/cmd/handlers.c
@@ -13,7 +13,7 @@
 #endif
 
 #ifdef CMD_DBG
-#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__) } while(0)
+#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0)
 #else
 #define DBG(format, ...) do { } while(0)
 #endif
diff --git a/esp-link/cgioptiboot.c b/esp-link/cgioptiboot.c
index c266014..6d8b71c 100644
--- a/esp-link/cgioptiboot.c
+++ b/esp-link/cgioptiboot.c
@@ -17,7 +17,7 @@
 #define PGM_INTERVAL   200   // send sync at this interval in ms when in programming mode
 
 #ifdef OPTIBOOT_DBG
-#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__) } while(0)
+#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0)
 #else
 #define DBG(format, ...) do { } while(0)
 #endif
diff --git a/esp-link/cgiwifi.c b/esp-link/cgiwifi.c
index 1b7f71c..a3f3a42 100644
--- a/esp-link/cgiwifi.c
+++ b/esp-link/cgiwifi.c
@@ -23,7 +23,7 @@ Cgi/template routines for the /wifi url.
 #include "mdns.h"
 
 #ifdef CGIWIFI_DBG
-#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__) } while(0)
+#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0)
 #else
 #define DBG(format, ...) do { } while(0)
 #endif
diff --git a/esp-link/log.c b/esp-link/log.c
index d6c245b..821641f 100644
--- a/esp-link/log.c
+++ b/esp-link/log.c
@@ -7,7 +7,7 @@
 #include "log.h"
 
 #ifdef LOG_DBG
-#define DBG(format, ...) os_printf(format, ## __VA_ARGS__)
+#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0)
 #else
 #define DBG(format, ...) do { } while(0)
 #endif
diff --git a/esp-link/mdns.c b/esp-link/mdns.c
index a6039bb..89ae337 100644
--- a/esp-link/mdns.c
+++ b/esp-link/mdns.c
@@ -13,7 +13,7 @@
 #include "mdns.h"
 
 #ifdef MDNS_DBG
-#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__) } while(0)
+#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0)
 #else
 #define DBG(format, ...) do { } while(0)
 #endif
diff --git a/esp-link/mqtt_client.c b/esp-link/mqtt_client.c
index 431e5f0..12b9a8d 100644
--- a/esp-link/mqtt_client.c
+++ b/esp-link/mqtt_client.c
@@ -5,9 +5,9 @@
 #include "mqtt.h"
 
 #ifdef MQTTCLIENT_DBG
-#define DBG_MQTTCLIENT(format, ...) os_printf(format, ## __VA_ARGS__)
+#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__) } while(0)
 #else
-#define DBG_MQTTCLIENT(format, ...) do { } while(0)
+#define DBG(format, ...) do { } while(0)
 #endif
 
 MQTT_Client mqttClient; // main mqtt client used by esp-link
@@ -19,7 +19,7 @@ static MqttDataCallback data_cb;
 
 void ICACHE_FLASH_ATTR
 mqttConnectedCb(uint32_t *args) {
-  DBG_MQTTCLIENT("MQTT Client: Connected\n");
+  DBG("MQTT Client: Connected\n");
   //MQTT_Client* client = (MQTT_Client*)args;
   //MQTT_Subscribe(client, "system/time", 0); // handy for testing
   if (connected_cb)
@@ -29,7 +29,7 @@ mqttConnectedCb(uint32_t *args) {
 void ICACHE_FLASH_ATTR
 mqttDisconnectedCb(uint32_t *args) {
 //  MQTT_Client* client = (MQTT_Client*)args;
-  DBG_MQTTCLIENT("MQTT Client: Disconnected\n");
+  DBG("MQTT Client: Disconnected\n");
   if (disconnected_cb)
     disconnected_cb(args);
 }
@@ -37,7 +37,7 @@ mqttDisconnectedCb(uint32_t *args) {
 void ICACHE_FLASH_ATTR
 mqttPublishedCb(uint32_t *args) {
 //  MQTT_Client* client = (MQTT_Client*)args;
-  DBG_MQTTCLIENT("MQTT Client: Published\n");
+  DBG("MQTT Client: Published\n");
   if (published_cb)
     published_cb(args);
 }
diff --git a/httpd/httpd.c b/httpd/httpd.c
index e9fa6c5..5590809 100644
--- a/httpd/httpd.c
+++ b/httpd/httpd.c
@@ -18,7 +18,7 @@ Esp8266 http server - core routines
 #include "httpd.h"
 
 #ifdef HTTPD_DBG
-#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__) } while(0)
+#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0)
 #else
 #define DBG(format, ...) do { } while(0)
 #endif
diff --git a/mqtt/mqtt_cmd.c b/mqtt/mqtt_cmd.c
index 0d7e65a..85cdfa1 100644
--- a/mqtt/mqtt_cmd.c
+++ b/mqtt/mqtt_cmd.c
@@ -8,7 +8,7 @@
 #include "mqtt_cmd.h"
 
 #ifdef MQTTCMD_DBG
-#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__) } while(0)
+#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0)
 #else
 #define DBG(format, ...) do { } while(0)
 #endif
diff --git a/serial/slip.c b/serial/slip.c
index 866c811..b78369b 100644
--- a/serial/slip.c
+++ b/serial/slip.c
@@ -8,7 +8,7 @@
 #include "cmd.h"
 
 #ifdef SLIP_DBG
-#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__) } while(0)
+#define DBG(format, ...) do { os_printf(format, ## __VA_ARGS__); } while(0)
 #else
 #define DBG(format, ...) do { } while(0)
 #endif