69 files changed, 92 insertions, 92 deletions

diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index ec733b20c6..35967d6a00 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -15,7 +15,7 @@
 # include <langinfo.h>
 #endif
 
-#if defined(HAVE_SYS_MMAN_H) || defined(HAVE_EVIL)
+#if defined(HAVE_SYS_MMAN_H) || defined(_WIN32)
 # include <sys/mman.h>
 #endif
 
@@ -23,7 +23,7 @@
 # include <systemd/sd-daemon.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 #include <Eina.h>
@@ -221,7 +221,7 @@ ecore_init(void)
         WRN("Not a utf8 locale!");
       }
     */
-#ifdef HAVE_EVIL
+#ifdef _WIN32
    if (!evil_init())
      return --_ecore_init_count;
 #endif
@@ -337,7 +337,7 @@ shutdown_mempool:
 shutdown_log_dom:
    eina_shutdown();
 shutdown_evil:
-#ifdef HAVE_EVIL
+#ifdef _WIN32
    evil_shutdown();
 #endif
 
@@ -453,7 +453,7 @@ ecore_shutdown(void)
 
      eina_evlog("<RUN", NULL, 0.0, NULL);
      eina_shutdown();
-#ifdef HAVE_EVIL
+#ifdef _WIN32
      evil_shutdown();
 #endif
 
diff --git a/src/lib/ecore/ecore_app.c b/src/lib/ecore/ecore_app.c
index a2e9cd1fb3..ec420c6154 100644
--- a/src/lib/ecore/ecore_app.c
+++ b/src/lib/ecore/ecore_app.c
@@ -9,7 +9,7 @@
 # include <process.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 967ee721fd..fe34371e06 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -53,7 +53,7 @@
 # endif
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c
index e1d732d9d7..d85d0bf54f 100644
--- a/src/lib/ecore/ecore_pipe.c
+++ b/src/lib/ecore/ecore_pipe.c
@@ -32,7 +32,7 @@
 # endif
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore/ecore_thread.c b/src/lib/ecore/ecore_thread.c
index 91e6aacfa7..480aa1ce80 100644
--- a/src/lib/ecore/ecore_thread.c
+++ b/src/lib/ecore/ecore_thread.c
@@ -8,7 +8,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore/ecore_time.c b/src/lib/ecore/ecore_time.c
index 2c871e29d0..1fafd62179 100644
--- a/src/lib/ecore/ecore_time.c
+++ b/src/lib/ecore/ecore_time.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
@@ -43,7 +43,7 @@ ecore_time_get(void)
      }
 
    return (double)t.tv_sec + (((double)t.tv_nsec) / 1000000000.0);
-#elif defined(HAVE_EVIL)
+#elif defined(_WIN32)
    return evil_time_get();
 #elif defined(__APPLE__) && defined(__MACH__)
    return _ecore_time_clock_conversion * (double)mach_absolute_time();
@@ -110,7 +110,7 @@ _ecore_time_init(void)
              "Fallback to unix time.");
      }
 #else
-# ifndef HAVE_EVIL
+# ifndef _WIN32
 #  if defined(__APPLE__) && defined(__MACH__)
    mach_timebase_info_data_t info;
    kern_return_t err = mach_timebase_info(&info);
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index ce881fa315..418add7aa1 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -42,7 +42,7 @@
 # include <ws2tcpip.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
@@ -84,7 +84,7 @@ ecore_con_init(void)
    if (++_ecore_con_init_count != 1)
      return _ecore_con_init_count;
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
    if (!evil_init())
      return --_ecore_con_init_count;
 #endif
@@ -129,7 +129,7 @@ ecore_con_log_error:
    ecore_shutdown();
 
 ecore_err:
-#ifdef HAVE_EVIL
+#ifdef _WIN32
    evil_shutdown();
 #endif
    return --_ecore_con_init_count;
@@ -160,7 +160,7 @@ ecore_con_shutdown(void)
     */
 
    ecore_shutdown();
-#ifdef HAVE_EVIL
+#ifdef _WIN32
    evil_shutdown();
 #endif
 
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index ade01e222f..fa71139dca 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -10,7 +10,7 @@
 # include <sys/socket.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_con/ecore_con_proxy_helper.c b/src/lib/ecore_con/ecore_con_proxy_helper.c
index 43feead87e..ff0253f055 100644
--- a/src/lib/ecore_con/ecore_con_proxy_helper.c
+++ b/src/lib/ecore_con/ecore_con_proxy_helper.c
@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_con/ecore_con_socks.c b/src/lib/ecore_con/ecore_con_socks.c
index a81d37505f..8138b26525 100644
--- a/src/lib/ecore_con/ecore_con_socks.c
+++ b/src/lib/ecore_con/ecore_con_socks.c
@@ -38,7 +38,7 @@
 # include <ws2tcpip.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.c b/src/lib/ecore_con/efl_net_dialer_ssl.c
index 6bdae468c8..eb68859325 100644
--- a/src/lib/ecore_con/efl_net_dialer_ssl.c
+++ b/src/lib/ecore_con/efl_net_dialer_ssl.c
@@ -24,7 +24,7 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c
index a9d87cfa6d..3b450441b1 100644
--- a/src/lib/ecore_con/efl_net_dialer_tcp.c
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.c
@@ -24,7 +24,7 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_con/efl_net_dialer_udp.c b/src/lib/ecore_con/efl_net_dialer_udp.c
index bd2bf7e617..c7541dee5f 100644
--- a/src/lib/ecore_con/efl_net_dialer_udp.c
+++ b/src/lib/ecore_con/efl_net_dialer_udp.c
@@ -25,7 +25,7 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_con/efl_net_ip_address.c b/src/lib/ecore_con/efl_net_ip_address.c
index f5500e3dcd..252b6e6a22 100644
--- a/src/lib/ecore_con/efl_net_ip_address.c
+++ b/src/lib/ecore_con/efl_net_ip_address.c
@@ -8,7 +8,7 @@
 # include <arpa/inet.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_con/efl_net_server_fd.c b/src/lib/ecore_con/efl_net_server_fd.c
index f1ff38bd77..c04b6c2186 100644
--- a/src/lib/ecore_con/efl_net_server_fd.c
+++ b/src/lib/ecore_con/efl_net_server_fd.c
@@ -13,7 +13,7 @@
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_con/efl_net_server_tcp.c b/src/lib/ecore_con/efl_net_server_tcp.c
index f82d57babe..de4da818a8 100644
--- a/src/lib/ecore_con/efl_net_server_tcp.c
+++ b/src/lib/ecore_con/efl_net_server_tcp.c
@@ -23,7 +23,7 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_con/efl_net_server_udp.c b/src/lib/ecore_con/efl_net_server_udp.c
index f45fd615ee..9159929818 100644
--- a/src/lib/ecore_con/efl_net_server_udp.c
+++ b/src/lib/ecore_con/efl_net_server_udp.c
@@ -25,7 +25,7 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_con/efl_net_server_udp_client.c b/src/lib/ecore_con/efl_net_server_udp_client.c
index e9ce54ca29..134a05cb65 100644
--- a/src/lib/ecore_con/efl_net_server_udp_client.c
+++ b/src/lib/ecore_con/efl_net_server_udp_client.c
@@ -15,7 +15,7 @@
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_con/efl_net_socket_fd.c b/src/lib/ecore_con/efl_net_socket_fd.c
index e0e05d6328..d02e58663c 100644
--- a/src/lib/ecore_con/efl_net_socket_fd.c
+++ b/src/lib/ecore_con/efl_net_socket_fd.c
@@ -20,7 +20,7 @@
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_con/efl_net_socket_tcp.c b/src/lib/ecore_con/efl_net_socket_tcp.c
index 90096185c5..a6179bea8c 100644
--- a/src/lib/ecore_con/efl_net_socket_tcp.c
+++ b/src/lib/ecore_con/efl_net_socket_tcp.c
@@ -29,7 +29,7 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_con/efl_net_socket_udp.c b/src/lib/ecore_con/efl_net_socket_udp.c
index f30a57a591..c887a964a5 100644
--- a/src/lib/ecore_con/efl_net_socket_udp.c
+++ b/src/lib/ecore_con/efl_net_socket_udp.c
@@ -29,7 +29,7 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
index 88bb3bc204..37457e96b3 100644
--- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
+++ b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
@@ -17,7 +17,7 @@
 # include <dlfcn.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 8874c34069..d510950cbf 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -16,11 +16,11 @@
 # include <unistd.h>
 #endif
 
-#if defined(HAVE_SYS_MMAN_H) || defined(HAVE_EVIL)
+#if defined(HAVE_SYS_MMAN_H) || defined(_WIN32)
 # include <sys/mman.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ecore_file/ecore_file_private.h b/src/lib/ecore_file/ecore_file_private.h
index 7c33ec8f34..9a02fffd6d 100644
--- a/src/lib/ecore_file/ecore_file_private.h
+++ b/src/lib/ecore_file/ecore_file_private.h
@@ -5,7 +5,7 @@
 # include <features.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 090a79f25e..19421c03ed 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -35,7 +35,7 @@
 #include <lauxlib.h>
 #include <setjmp.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eet/eet_lib.c b/src/lib/eet/eet_lib.c
index e74e5e9a2e..99cd033097 100644
--- a/src/lib/eet/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
@@ -20,9 +20,9 @@
 # include <netinet/in.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
-#endif /* ifdef HAVE_EVIL */
+#endif /* ifdef _WIN32 */
 
 #include <Eina.h>
 #include <Emile.h>
diff --git a/src/lib/eet/eet_node.c b/src/lib/eet/eet_node.c
index 3f1bde44ac..76c705a299 100644
--- a/src/lib/eet/eet_node.c
+++ b/src/lib/eet/eet_node.c
@@ -5,9 +5,9 @@
 #include <string.h>
 #include <stdio.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
-#endif /* ifdef HAVE_EVIL */
+#endif /* ifdef _WIN32 */
 
 #include <Eina.h>
 
diff --git a/src/lib/efreet/efreet_desktop.c b/src/lib/efreet/efreet_desktop.c
index 4a4f4d1564..949fd567fc 100644
--- a/src/lib/efreet/efreet_desktop.c
+++ b/src/lib/efreet/efreet_desktop.c
@@ -2,7 +2,7 @@
 # include <config.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
@@ -91,7 +91,7 @@ efreet_desktop_init(void)
         return 0;
     }
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
     if (!evil_sockets_init())
     {
         ERR("Could not initialize Winsock system");
@@ -138,7 +138,7 @@ efreet_desktop_shutdown(void)
     EINA_LIST_FREE(efreet_desktop_types, info)
         efreet_desktop_type_info_free(info);
     eina_lock_free(&_lock);
-#ifdef HAVE_EVIL
+#ifdef _WIN32
     evil_sockets_shutdown();
 #endif
     eina_log_domain_unregister(_efreet_desktop_log_dom);
diff --git a/src/lib/efreet/efreet_uri.c b/src/lib/efreet/efreet_uri.c
index de224a6e86..36a090f60f 100644
--- a/src/lib/efreet/efreet_uri.c
+++ b/src/lib/efreet/efreet_uri.c
@@ -8,7 +8,7 @@
 #define _POSIX_HOST_NAME_MAX 255
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_benchmark.c b/src/lib/eina/eina_benchmark.c
index 6583e753e2..faf5e027e1 100644
--- a/src/lib/eina/eina_benchmark.c
+++ b/src/lib/eina/eina_benchmark.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_binbuf.c b/src/lib/eina/eina_binbuf.c
index ebc65885c2..c8623a3e99 100644
--- a/src/lib/eina/eina_binbuf.c
+++ b/src/lib/eina/eina_binbuf.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_convert.c b/src/lib/eina/eina_convert.c
index 800a167e7d..2943b37343 100644
--- a/src/lib/eina/eina_convert.c
+++ b/src/lib/eina/eina_convert.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_error.c b/src/lib/eina/eina_error.c
index 779739d4ea..a7faadeb3b 100644
--- a/src/lib/eina/eina_error.c
+++ b/src/lib/eina/eina_error.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_evlog.c b/src/lib/eina/eina_evlog.c
index 90af6104a7..9c9cbccdaf 100644
--- a/src/lib/eina/eina_evlog.c
+++ b/src/lib/eina/eina_evlog.c
@@ -24,7 +24,7 @@
 #include "eina_evlog.h"
 #include "eina_debug.h"
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
@@ -80,7 +80,7 @@ get_time(void)
         return (double)timev.tv_sec + (((double)timev.tv_usec) / 1000000.0);
      }
    return (double)t.tv_sec + (((double)t.tv_nsec) / 1000000000.0);
-#elif defined(HAVE_EVIL)
+#elif defined(_WIN32)
    return evil_time_get();
 #elif defined(__APPLE__) && defined(__MACH__)
    return _eina_evlog_time_clock_conversion * (double)mach_absolute_time();
diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c
index 91036398cc..c5a367d079 100644
--- a/src/lib/eina/eina_file_common.c
+++ b/src/lib/eina/eina_file_common.c
@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_list.c b/src/lib/eina/eina_list.c
index 72dc8134bf..9192b4c332 100644
--- a/src/lib/eina/eina_list.c
+++ b/src/lib/eina/eina_list.c
@@ -62,7 +62,7 @@
 #include <string.h>
 #include <time.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c
index 2b2a240d54..68cb948232 100644
--- a/src/lib/eina/eina_log.c
+++ b/src/lib/eina/eina_log.c
@@ -33,7 +33,7 @@
 # include <systemd/sd-journal.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_magic.c b/src/lib/eina/eina_magic.c
index 6b26da68e4..390ed62254 100644
--- a/src/lib/eina/eina_magic.c
+++ b/src/lib/eina/eina_magic.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_matrixsparse.c b/src/lib/eina/eina_matrixsparse.c
index 47a10ae838..eb85ddec42 100644
--- a/src/lib/eina/eina_matrixsparse.c
+++ b/src/lib/eina/eina_matrixsparse.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <assert.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_module.c b/src/lib/eina/eina_module.c
index 15b82108bf..d670371479 100644
--- a/src/lib/eina/eina_module.c
+++ b/src/lib/eina/eina_module.c
@@ -31,7 +31,7 @@
 # include <dlfcn.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_prefix.c b/src/lib/eina/eina_prefix.c
index 2165d050c8..26f07f8caf 100644
--- a/src/lib/eina/eina_prefix.c
+++ b/src/lib/eina/eina_prefix.c
@@ -41,7 +41,7 @@
 # include <dlfcn.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_quadtree.c b/src/lib/eina/eina_quadtree.c
index 246def7ba9..1f50fd5d02 100644
--- a/src/lib/eina/eina_quadtree.c
+++ b/src/lib/eina/eina_quadtree.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_rectangle.c b/src/lib/eina/eina_rectangle.c
index a3e8bff8d5..b6eadeb2f4 100644
--- a/src/lib/eina/eina_rectangle.c
+++ b/src/lib/eina/eina_rectangle.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_share_common.c b/src/lib/eina/eina_share_common.c
index 7fb8f90a96..6ad55b7053 100644
--- a/src/lib/eina/eina_share_common.c
+++ b/src/lib/eina/eina_share_common.c
@@ -63,7 +63,7 @@
 #include <string.h>
 #include <stddef.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_simple_xml_parser.c b/src/lib/eina/eina_simple_xml_parser.c
index 93e1416221..3b218da215 100644
--- a/src/lib/eina/eina_simple_xml_parser.c
+++ b/src/lib/eina/eina_simple_xml_parser.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_strbuf.c b/src/lib/eina/eina_strbuf.c
index 81ab30a45f..586bffb21c 100644
--- a/src/lib/eina/eina_strbuf.c
+++ b/src/lib/eina/eina_strbuf.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_stringshare.c b/src/lib/eina/eina_stringshare.c
index 588865d50e..f8510de725 100644
--- a/src/lib/eina/eina_stringshare.c
+++ b/src/lib/eina/eina_stringshare.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_tmpstr.c b/src/lib/eina/eina_tmpstr.c
index c7d26ee2d6..9dbbe7d17c 100644
--- a/src/lib/eina/eina_tmpstr.c
+++ b/src/lib/eina/eina_tmpstr.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c
index f22718b147..63c26ce5d8 100644
--- a/src/lib/eina/eina_value.c
+++ b/src/lib/eina/eina_value.c
@@ -24,7 +24,7 @@
 #include <inttypes.h> /* PRId64 and PRIu64 */
 #include <sys/time.h> /* struct timeval */
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eina/eina_value_util.c b/src/lib/eina/eina_value_util.c
index 73923d8663..3d35a47838 100644
--- a/src/lib/eina/eina_value_util.c
+++ b/src/lib/eina/eina_value_util.c
@@ -22,7 +22,7 @@
 
 #include <time.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/eio/eio_private.h b/src/lib/eio/eio_private.h
index a81d94f3fa..62c3fc8550 100644
--- a/src/lib/eio/eio_private.h
+++ b/src/lib/eio/eio_private.h
@@ -47,7 +47,7 @@
 # include <features.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index 6f579549dc..b8927bfaf6 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -144,7 +144,7 @@ _expanded_fmt_str_get(char ch)
    switch (ch)
      {
       case 'c':
-#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL)
+#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
         exp_fmt = nl_langinfo(D_T_FMT);
 #else
         exp_fmt = "";
@@ -152,7 +152,7 @@ _expanded_fmt_str_get(char ch)
         break;
 
       case 'x':
-#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL)
+#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
         exp_fmt = nl_langinfo(D_FMT);
 #else
         exp_fmt = "";
@@ -160,7 +160,7 @@ _expanded_fmt_str_get(char ch)
         break;
 
       case 'X':
-#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL)
+#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
         exp_fmt = nl_langinfo(T_FMT);
 #else
         exp_fmt = "";
@@ -168,7 +168,7 @@ _expanded_fmt_str_get(char ch)
         break;
 
       case 'r':
-#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL)
+#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
         exp_fmt = nl_langinfo(T_FMT_AMPM);
 #else
         exp_fmt = "";
@@ -347,7 +347,7 @@ _reload_format(Evas_Object *obj)
    // FIXME: provide nl_langinfo on Windows if possible
    // fetch the default format from Libc.
    if (!sd->user_format)
-#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL)
+#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
      strncpy(sd->format, nl_langinfo(D_T_FMT), EFL_UI_CLOCK_MAX_FORMAT_LEN);
 #else
      strncpy(sd->format, "", EFL_UI_CLOCK_MAX_FORMAT_LEN);
diff --git a/src/lib/elementary/elm_font.c b/src/lib/elementary/elm_font.c
index 797ecad02f..cffaa5a291 100644
--- a/src/lib/elementary/elm_font.c
+++ b/src/lib/elementary/elm_font.c
@@ -2,7 +2,7 @@
 # include "elementary_config.h"
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 40903ef9c0..c82050e944 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -10,7 +10,7 @@
 # include <crt_externs.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/elua/elua_private.h b/src/lib/elua/elua_private.h
index 9f62c5ff4b..f4392f604b 100644
--- a/src/lib/elua/elua_private.h
+++ b/src/lib/elua/elua_private.h
@@ -20,7 +20,7 @@
 #include <Eina.h>
 #include <Ecore.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 #include <Evil.h>
 #endif
 
diff --git a/src/lib/embryo/embryo_time.c b/src/lib/embryo/embryo_time.c
index ce167cb4ff..1e74816458 100644
--- a/src/lib/embryo/embryo_time.c
+++ b/src/lib/embryo/embryo_time.c
@@ -9,7 +9,7 @@
 # include <winsock2.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/emile/emile_image.c b/src/lib/emile/emile_image.c
index bb94f2cf3d..858e79058a 100644
--- a/src/lib/emile/emile_image.c
+++ b/src/lib/emile/emile_image.c
@@ -25,7 +25,7 @@
 #include <jpeglib.h>
 #include <jerror.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 #include <Evil.h>
 #endif
 
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index b1e56481ea..b4bd760b44 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -8,7 +8,7 @@
 
 #include <Eina.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
@@ -2560,7 +2560,7 @@ efl_callbacks_cmp(const Efl_Callback_Array_Item *a, const Efl_Callback_Array_Ite
 static inline double
 _eo_log_time_now(void)
 {
-#ifdef HAVE_EVIL
+#ifdef _WIN32
    return evil_time_get();
 #elif defined(__APPLE__) && defined(__MACH__)
    static double clk_conv = -1.0;
@@ -2693,7 +2693,7 @@ _eo_log_obj_entry_show(const Eo_Log_Obj_Entry *entry, int log_level, const char
                {
                   const char *fname;
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
                   fname = strrchr(info.dli_fname, '\\');
 #else
                   fname = strrchr(info.dli_fname, '/');
diff --git a/src/lib/ephysics/ephysics_private.h b/src/lib/ephysics/ephysics_private.h
index e8aeb20d06..ded1d14011 100644
--- a/src/lib/ephysics/ephysics_private.h
+++ b/src/lib/ephysics/ephysics_private.h
@@ -1,7 +1,7 @@
 #ifndef _EPHYSICS_PRIVATE_H
 #define _EPHYSICS_PRIVATE_H
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/ethumb/ethumb.c b/src/lib/ethumb/ethumb.c
index 7737b01fb9..13ee30c264 100644
--- a/src/lib/ethumb/ethumb.c
+++ b/src/lib/ethumb/ethumb.c
@@ -52,7 +52,7 @@
 # define PATH_MAX 4096
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/evas/cache/evas_cache_image.c b/src/lib/evas/cache/evas_cache_image.c
index 138aff82a3..859d132e64 100644
--- a/src/lib/evas/cache/evas_cache_image.c
+++ b/src/lib/evas/cache/evas_cache_image.c
@@ -8,7 +8,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/evas/cache/evas_preload.c b/src/lib/evas/cache/evas_preload.c
index 649309d173..c71e5ed7d5 100644
--- a/src/lib/evas/cache/evas_preload.c
+++ b/src/lib/evas/cache/evas_preload.c
@@ -1,7 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 #ifdef __linux__
diff --git a/src/lib/evas/cache2/evas_cache2.c b/src/lib/evas/cache2/evas_cache2.c
index 996a2a4c5c..c791e9999d 100644
--- a/src/lib/evas/cache2/evas_cache2.c
+++ b/src/lib/evas/cache2/evas_cache2.c
@@ -8,7 +8,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c
index 361e0fdb79..80e37fad08 100644
--- a/src/lib/evas/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -2,7 +2,7 @@
 # include <config.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 246205b537..fb73145010 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -40,7 +40,7 @@ evas_init(void)
       }
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
    if (!evil_init())
      return --_evas_init_count;
 #endif
@@ -118,7 +118,7 @@ evas_init(void)
  shutdown_eina:
    eina_shutdown();
  shutdown_evil:
-#ifdef HAVE_EVIL
+#ifdef _WIN32
    evil_shutdown();
 #endif
 
@@ -185,7 +185,7 @@ evas_shutdown(void)
    eet_shutdown();
 
    eina_shutdown();
-#ifdef HAVE_EVIL
+#ifdef _WIN32
    evil_shutdown();
 #endif
 
diff --git a/src/lib/evas/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c
index 978a4cb752..16f8d1fa75 100644
--- a/src/lib/evas/common/evas_image_scalecache.c
+++ b/src/lib/evas/common/evas_image_scalecache.c
@@ -2,7 +2,7 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/evas/common/language/evas_language_utils.c b/src/lib/evas/common/language/evas_language_utils.c
index 74dcec72ca..5a8e173e5f 100644
--- a/src/lib/evas/common/language/evas_language_utils.c
+++ b/src/lib/evas/common/language/evas_language_utils.c
@@ -29,7 +29,7 @@
 # define dgettext(domain, x) (x)
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/evas/file/evas_path.c b/src/lib/evas/file/evas_path.c
index 429519eeae..6144759616 100644
--- a/src/lib/evas/file/evas_path.c
+++ b/src/lib/evas/file/evas_path.c
@@ -18,7 +18,7 @@
 # include <sys/param.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif
 
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index 17be9c8acd..a4b3ae3623 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_EVIL
+#ifdef _WIN32
 # include <Evil.h>
 #endif