diff --git a/src/bin/ecore_con/efl_net_proxy_helper.c b/src/bin/ecore_con/efl_net_proxy_helper.c
index 1a0255bb86..6b2e3678ce 100644
--- a/src/bin/ecore_con/efl_net_proxy_helper.c
+++ b/src/bin/ecore_con/efl_net_proxy_helper.c
@@ -10,10 +10,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "Eina.h"
 
 #ifdef ERR
diff --git a/src/bin/eet/eet_main.c b/src/bin/eet/eet_main.c
index 7967cc791c..7da5cfd4d3 100644
--- a/src/bin/eet/eet_main.c
+++ b/src/bin/eet/eet_main.c
@@ -7,10 +7,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif /* ifdef _WIN32 */
-
 #include <Eet.h>
 
 static int _eet_main_log_dom = -1;
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index a781025d7b..75f083ac9f 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -40,7 +40,7 @@
 
 #ifdef _WIN32
 # include <ws2tcpip.h>
-# include <Evil.h>
+# include <evil_private.h> /* evil_init|shutdown */
 #endif
 
 #include "Ecore.h"
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index 1956176604..d1c402e045 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -10,10 +10,6 @@
 # include <sys/socket.h>
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #define EFL_NET_SOCKET_SSL_PROTECTED
 
 #include "Ecore.h"
diff --git a/src/lib/ecore_con/ecore_con_local_win32.c b/src/lib/ecore_con/ecore_con_local_win32.c
index 86593a2ffa..6b68bf07fe 100644
--- a/src/lib/ecore_con/ecore_con_local_win32.c
+++ b/src/lib/ecore_con/ecore_con_local_win32.c
@@ -4,7 +4,6 @@
 
 #include <process.h>
 
-#include <Evil.h>
 #include <Ecore.h>
 
 #include "Ecore_Con.h"
diff --git a/src/lib/ecore_con/ecore_con_proxy_helper.c b/src/lib/ecore_con/ecore_con_proxy_helper.c
index 1b58ab1952..01b90652d8 100644
--- a/src/lib/ecore_con/ecore_con_proxy_helper.c
+++ b/src/lib/ecore_con/ecore_con_proxy_helper.c
@@ -10,10 +10,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "Ecore.h"
 #include "ecore_private.h"
 #include "Ecore_Con.h"
diff --git a/src/lib/ecore_con/ecore_con_socks.c b/src/lib/ecore_con/ecore_con_socks.c
index 08f5585381..0068b33076 100644
--- a/src/lib/ecore_con/ecore_con_socks.c
+++ b/src/lib/ecore_con/ecore_con_socks.c
@@ -36,7 +36,6 @@
 
 #ifdef _WIN32
 # include <ws2tcpip.h>
-# include <Evil.h>
 #endif
 
 #include "Ecore.h"
diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.c b/src/lib/ecore_con/efl_net_dialer_ssl.c
index ffc36a6f58..efc9d8e34c 100644
--- a/src/lib/ecore_con/efl_net_dialer_ssl.c
+++ b/src/lib/ecore_con/efl_net_dialer_ssl.c
@@ -24,9 +24,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif
 
 #define MY_CLASS EFL_NET_DIALER_SSL_CLASS
 
diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c
index ba93fc4c74..50a354126c 100644
--- a/src/lib/ecore_con/efl_net_dialer_tcp.c
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.c
@@ -24,9 +24,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif
 
 #define MY_CLASS EFL_NET_DIALER_TCP_CLASS
 
diff --git a/src/lib/ecore_con/efl_net_dialer_udp.c b/src/lib/ecore_con/efl_net_dialer_udp.c
index e75ed24fed..e353121f26 100644
--- a/src/lib/ecore_con/efl_net_dialer_udp.c
+++ b/src/lib/ecore_con/efl_net_dialer_udp.c
@@ -25,9 +25,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif
 
 #define MY_CLASS EFL_NET_DIALER_UDP_CLASS
 
diff --git a/src/lib/ecore_con/efl_net_ip_address.c b/src/lib/ecore_con/efl_net_ip_address.c
index cc29aba680..4ee875e306 100644
--- a/src/lib/ecore_con/efl_net_ip_address.c
+++ b/src/lib/ecore_con/efl_net_ip_address.c
@@ -8,10 +8,6 @@
 # include <arpa/inet.h>
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include "Ecore.h"
 #include "Ecore_Con.h"
 #include "ecore_con_private.h"
diff --git a/src/lib/ecore_con/efl_net_server_fd.c b/src/lib/ecore_con/efl_net_server_fd.c
index e4e6461576..d3d61ca46f 100644
--- a/src/lib/ecore_con/efl_net_server_fd.c
+++ b/src/lib/ecore_con/efl_net_server_fd.c
@@ -13,9 +13,6 @@
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif
 
 #ifdef HAVE_SYSTEMD
 # include <systemd/sd-daemon.h>
diff --git a/src/lib/ecore_con/efl_net_server_ip.c b/src/lib/ecore_con/efl_net_server_ip.c
index ea7770a695..e7e5e0d53b 100644
--- a/src/lib/ecore_con/efl_net_server_ip.c
+++ b/src/lib/ecore_con/efl_net_server_ip.c
@@ -22,9 +22,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif
 
 #define MY_CLASS EFL_NET_SERVER_IP_CLASS
 
diff --git a/src/lib/ecore_con/efl_net_server_tcp.c b/src/lib/ecore_con/efl_net_server_tcp.c
index b4bda04192..576b5a9867 100644
--- a/src/lib/ecore_con/efl_net_server_tcp.c
+++ b/src/lib/ecore_con/efl_net_server_tcp.c
@@ -23,9 +23,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif
 
 #define MY_CLASS EFL_NET_SERVER_TCP_CLASS
 
diff --git a/src/lib/ecore_con/efl_net_server_udp.c b/src/lib/ecore_con/efl_net_server_udp.c
index 0f0b2287e9..3ae452eb33 100644
--- a/src/lib/ecore_con/efl_net_server_udp.c
+++ b/src/lib/ecore_con/efl_net_server_udp.c
@@ -25,9 +25,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif
 
 #define MY_CLASS EFL_NET_SERVER_UDP_CLASS
 
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 9a4a7990a4..5c4e8c0515 100644
--- a/src/lib/ecore_con/efl_net_server_udp_client.c
+++ b/src/lib/ecore_con/efl_net_server_udp_client.c
@@ -15,9 +15,6 @@
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif
 
 #define MY_CLASS EFL_NET_SERVER_UDP_CLIENT_CLASS
 
diff --git a/src/lib/ecore_con/efl_net_socket_fd.c b/src/lib/ecore_con/efl_net_socket_fd.c
index 3ade365fc2..8d07ed9da2 100644
--- a/src/lib/ecore_con/efl_net_socket_fd.c
+++ b/src/lib/ecore_con/efl_net_socket_fd.c
@@ -20,9 +20,6 @@
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif
 
 #define MY_CLASS EFL_NET_SOCKET_FD_CLASS
 
diff --git a/src/lib/ecore_con/efl_net_socket_tcp.c b/src/lib/ecore_con/efl_net_socket_tcp.c
index cec971237a..8a7f0a7935 100644
--- a/src/lib/ecore_con/efl_net_socket_tcp.c
+++ b/src/lib/ecore_con/efl_net_socket_tcp.c
@@ -29,9 +29,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif
 
 #define MY_CLASS EFL_NET_SOCKET_TCP_CLASS
 
diff --git a/src/lib/ecore_con/efl_net_socket_udp.c b/src/lib/ecore_con/efl_net_socket_udp.c
index 67e3f6a795..85a44b86b3 100644
--- a/src/lib/ecore_con/efl_net_socket_udp.c
+++ b/src/lib/ecore_con/efl_net_socket_udp.c
@@ -29,9 +29,6 @@
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
-#ifdef _WIN32
-# include <Evil.h>
-#endif
 
 #define MY_CLASS EFL_NET_SOCKET_UDP_CLASS
 
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 c2a7dc8331..3f88c20237 100644
--- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
+++ b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
@@ -18,7 +18,7 @@
 #endif
 
 #ifdef _WIN32
-# include <Evil.h>
+# include <evil_private.h> /* dlsym */
 #endif
 
 #ifdef HAVE_ESCAPE