remove Evil.h when not necessary, include evil_private.h when necessary

Test Plan: compilation

Reviewers: zmike, raster, cedric

Reviewed By: zmike

Subscribers: #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D8925

3 files changed, 10 insertions, 5 deletions

diff --git a/src/lib/efreet/efreet_desktop.c b/src/lib/efreet/efreet_desktop.c
index 949fd567fc..e56d06c908 100644
--- a/src/lib/efreet/efreet_desktop.c
+++ b/src/lib/efreet/efreet_desktop.c
@@ -2,8 +2,9 @@
 # include <config.h>
 #endif
 
+/* TODO : have to look why sockets must be init */
 #ifdef _WIN32
-# include <Evil.h>
+# include <evil_private.h> /* evil_sockets_init|shutdown */
 #endif
 
 #include <Ecore_File.h>
diff --git a/src/lib/efreet/efreet_trash.c b/src/lib/efreet/efreet_trash.c
index 42a2acdd29..04a4a6cda4 100644
--- a/src/lib/efreet/efreet_trash.c
+++ b/src/lib/efreet/efreet_trash.c
@@ -7,6 +7,14 @@
 #include <libgen.h>
 #include <errno.h>
 
+#ifdef _WIN32
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
+# include <windows.h> /* GetCurrentProcessId */
+# undef WIN32_LEAN_AND_MEAN
+#endif
+
 #include <Ecore_File.h>
 
 /* define macros and variable for using the eina logging system  */
diff --git a/src/lib/efreet/efreet_uri.c b/src/lib/efreet/efreet_uri.c
index 36a090f60f..9f468ce5df 100644
--- a/src/lib/efreet/efreet_uri.c
+++ b/src/lib/efreet/efreet_uri.c
@@ -8,10 +8,6 @@
 #define _POSIX_HOST_NAME_MAX 255
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 /* define macros and variable for using the eina logging system  */
 #define EFREET_MODULE_LOG_DOM /* no logging in this file */