diff --git a/tools/windows_build_extra.py b/tools/windows_build_extra.py
index 9d7c5810..934831c4 100644
--- a/tools/windows_build_extra.py
+++ b/tools/windows_build_extra.py
@@ -4,7 +4,8 @@ env.Append(
   LINKFLAGS=[
       "-static",
       "-static-libgcc",
-      "-static-libstdc++"
+      "-static-libstdc++",
+      "-std=c++11"
   ]
 )
 
diff --git a/user_setups/win32/windows_gdi.ini b/user_setups/win32/windows_gdi.ini
index d9e091d1..04e0bb72 100644
--- a/user_setups/win32/windows_gdi.ini
+++ b/user_setups/win32/windows_gdi.ini
@@ -29,6 +29,7 @@ build_flags =
   -D HASP_USE_JPGDECODE=0
   -D HASP_USE_QRCODE=0
   -D HASP_USE_MQTT=1
+  -D HASP_USE_MDNS=0
   -D HASP_USE_SYSLOG=0
   -D HASP_USE_LVGL_TASK=1
   -D MQTT_MAX_PACKET_SIZE=2048
diff --git a/user_setups/win32/windows_sdl.ini b/user_setups/win32/windows_sdl.ini
index fff0a176..469e399a 100644
--- a/user_setups/win32/windows_sdl.ini
+++ b/user_setups/win32/windows_sdl.ini
@@ -34,6 +34,7 @@ build_flags =
   -D HASP_USE_JPGDECODE=0
   -D HASP_USE_QRCODE=0
   -D HASP_USE_MQTT=1
+  -D HASP_USE_MDNS=0
   -D HASP_USE_SYSLOG=0
   -D MQTT_MAX_PACKET_SIZE=2048
   -D HASP_ATTRIBUTE_FAST_MEM=
diff --git a/user_setups/win32/windows_sdl_64bits.ini b/user_setups/win32/windows_sdl_64bits.ini
index 046af256..17585b6c 100644
--- a/user_setups/win32/windows_sdl_64bits.ini
+++ b/user_setups/win32/windows_sdl_64bits.ini
@@ -6,6 +6,11 @@ extra_scripts =
 build_flags =
   ${env.build_flags}
   -D HASP_MODEL="Windows App"
+  -D HASP_TARGET_PC=1
+
+  ; https://github.com/eclipse/paho.mqtt.c/pull/1453
+  -D WINVER=0x0600 
+  -D _WIN32_WINNT=0x0600
 
   ; ----- Monitor
   -D TFT_WIDTH=240
@@ -33,6 +38,7 @@ build_flags =
   -D HASP_USE_JPGDECODE=0
   -D HASP_USE_QRCODE=0
   -D HASP_USE_MQTT=1
+  -D HASP_USE_MDNS=0
   -D HASP_USE_SYSLOG=0
   -D MQTT_MAX_PACKET_SIZE=2048
   -D HASP_ATTRIBUTE_FAST_MEM=