diff --git a/code/espurna/debug.ino b/code/espurna/debug.ino
index cdd667dc..0610096e 100644
--- a/code/espurna/debug.ino
+++ b/code/espurna/debug.ino
@@ -6,6 +6,8 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 
 */
 
+#if DEBUG_SERIAL_SUPPORT || DEBUG_UDP_SUPPORT
+
 #include <stdio.h>
 #include <stdarg.h>
 
@@ -72,3 +74,5 @@ void debugSend_P(PGM_P format, ...) {
     #endif
 
 }
+
+#endif // DEBUG_SERIAL_SUPPORT || DEBUG_UDP_SUPPORT
diff --git a/code/espurna/wifi.ino b/code/espurna/wifi.ino
index ddc08684..68968113 100644
--- a/code/espurna/wifi.ino
+++ b/code/espurna/wifi.ino
@@ -223,7 +223,7 @@ void wifiSetup() {
 		        DEBUG_MSG_P(PSTR("[WIFI] Could not create access point\n"));
 		    }
 
-		#endif
+		#endif // DEBUG_SERIAL_SUPPORT || DEBUG_UDP_SUPPORT
 
         // Configure mDNS
         #if MDNS_SUPPORT