diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h
index 760d64565..b8b282fa7 100644
--- a/sonoff/sonoff_post.h
+++ b/sonoff/sonoff_post.h
@@ -24,12 +24,11 @@
  * Function declarations
 \*********************************************************************************************/
 
+// Needed for core 2.3.0 compilation (#6721)
 #ifdef __cplusplus
 extern "C" {
 #endif
-
 #include "user_interface.h"
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/sonoff/support_wifi.ino b/sonoff/support_wifi.ino
index 23727fcbe..a0f4bd3e5 100644
--- a/sonoff/support_wifi.ino
+++ b/sonoff/support_wifi.ino
@@ -74,10 +74,6 @@ bool WifiConfigCounter(void)
   return (Wifi.config_counter);
 }
 
-//extern "C" {
-//#include "user_interface.h"
-//}
-
 void WifiConfig(uint8_t type)
 {
   if (!Wifi.config_type) {