diff --git a/m4/evil_windows.m4 b/m4/evil_windows.m4
index 8876d6c629..fff9f8251b 100644
--- a/m4/evil_windows.m4
+++ b/m4/evil_windows.m4
@@ -31,11 +31,11 @@ AC_MSG_RESULT([${_winver}])
 
 case "${_winver}" in
   vista)
-     EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0600"
+     EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0600 -DWINVER=0x0600"
      _efl_windows_version="Windows Vista"
      ;;
   win7)
-     EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0601"
+     EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0601 -DWINVER=0x0601"
      _efl_windows_version="Windows 7"
      ;;
   *)
diff --git a/src/lib/evil/evil_util.c b/src/lib/evil/evil_util.c
index ebbe0ad093..4f74353a16 100644
--- a/src/lib/evil/evil_util.c
+++ b/src/lib/evil/evil_util.c
@@ -90,9 +90,7 @@ evil_utf16_to_utf8(const wchar_t *text16)
    if (!text16)
      return NULL;
 
-#if WINVER >= 0x0600
    flag = WC_ERR_INVALID_CHARS;
-#endif
 
    size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, NULL, 0, NULL, NULL);
    if (size8 == 0)