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

18 files changed, 32 insertions, 45 deletions

diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 86020876ef..3d4698f599 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -18,10 +18,6 @@
 # include <sys/mman.h>
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include <Ecore.h>
 #include "ecore_private.h"
 #include <Ecore_Input.h>
diff --git a/src/lib/ecore_file/ecore_file.c b/src/lib/ecore_file/ecore_file.c
index 4780350de0..ab8b07f1ce 100644
--- a/src/lib/ecore_file/ecore_file.c
+++ b/src/lib/ecore_file/ecore_file.c
@@ -10,6 +10,7 @@
 
 #ifdef _WIN32
 # include <direct.h>
+# include <evil_private.h> /* mkdir realpath */
 #endif
 
 #ifdef HAVE_FEATURES_H
diff --git a/src/lib/ecore_file/ecore_file_monitor_win32.c b/src/lib/ecore_file/ecore_file_monitor_win32.c
index 8a0f92dca7..59f5f88470 100644
--- a/src/lib/ecore_file/ecore_file_monitor_win32.c
+++ b/src/lib/ecore_file/ecore_file_monitor_win32.c
@@ -6,12 +6,14 @@
 # include <config.h>
 #endif
 
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-# undef WIN32_LEAN_AND_MEAN
-# include <process.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#include <process.h>
 
-# include "ecore_file_private.h"
+#include <evil_private.h> /* evil_wchar_to_char */
+
+#include "ecore_file_private.h"
 
 
 typedef struct _Ecore_File_Monitor_Win32      Ecore_File_Monitor_Win32;
@@ -191,7 +193,7 @@ _ecore_file_monitor_win32_cb(void *data, Ecore_Win32_Handler *wh EINA_UNUSED)
           else
             event = ECORE_FILE_EVENT_CREATED_FILE;
           break;
-        default: 
+        default:
           fprintf(stderr, "unknown event\n");
           event = ECORE_FILE_EVENT_NONE;
           break;
diff --git a/src/lib/ecore_file/ecore_file_private.h b/src/lib/ecore_file/ecore_file_private.h
index 9a02fffd6d..01ea0a4f11 100644
--- a/src/lib/ecore_file/ecore_file_private.h
+++ b/src/lib/ecore_file/ecore_file_private.h
@@ -5,10 +5,6 @@
 # include <features.h>
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #ifdef HAVE_ESCAPE
 # include <Escape.h>
 #endif
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index a92e5b1273..2455a342ab 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -1,3 +1,4 @@
+
 #ifndef _EDJE_PRIVATE_H
 #define _EDJE_PRIVATE_H
 
@@ -35,10 +36,6 @@
 #include <lauxlib.h>
 #include <setjmp.h>
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 // auto_unref
 #define EFL_CANVAS_OBJECT_PROTECTED
 #define EFL_LAYOUT_CALC_PROTECTED
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 */
 
diff --git a/src/lib/eio/eio_dir.c b/src/lib/eio/eio_dir.c
index 68412b6f8a..22544c9df7 100644
--- a/src/lib/eio/eio_dir.c
+++ b/src/lib/eio/eio_dir.c
@@ -17,6 +17,10 @@
  * if not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef _WIN32
+# include <evil_private.h> /* mkdir */
+#endif
+
 #include "eio_private.h"
 #include "Eio.h"
 
diff --git a/src/lib/eio/eio_monitor_win32.c b/src/lib/eio/eio_monitor_win32.c
index 6755e9f531..a2c45de75c 100644
--- a/src/lib/eio/eio_monitor_win32.c
+++ b/src/lib/eio/eio_monitor_win32.c
@@ -17,6 +17,8 @@
  * if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <evil_private.h> /* evil_wchar_to_char evil_last_error_get */
+
 #include "eio_private.h"
 #include "Eio.h"
 
diff --git a/src/lib/eio/eio_private.h b/src/lib/eio/eio_private.h
index a6cd4ccab5..36d784752d 100644
--- a/src/lib/eio/eio_private.h
+++ b/src/lib/eio/eio_private.h
@@ -31,10 +31,6 @@
 # include <features.h>
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include <Ecore.h>
 
 #include "Eio.h"
diff --git a/src/lib/eio/eio_single.c b/src/lib/eio/eio_single.c
index fb8e8264fc..1701f1006e 100644
--- a/src/lib/eio/eio_single.c
+++ b/src/lib/eio/eio_single.c
@@ -18,6 +18,11 @@
  * License along with this library;
  * if not, see <http://www.gnu.org/licenses/>.
  */
+
+#ifdef _WIN32
+# include <evil_private.h> /* mkdir */
+#endif
+
 #include "eio_private.h"
 #include "Eio.h"
 
diff --git a/src/lib/elementary/elm_font.c b/src/lib/elementary/elm_font.c
index cffaa5a291..f5c37c28b7 100644
--- a/src/lib/elementary/elm_font.c
+++ b/src/lib/elementary/elm_font.c
@@ -2,10 +2,6 @@
 # include "elementary_config.h"
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include <Elementary.h>
 #include "elm_priv.h"
 
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 4bb77acf45..5aff10ae95 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -12,7 +12,6 @@
 
 #ifdef _WIN32
 # include <direct.h> /* getcwd */
-# include <Evil.h>
 #endif
 
 #include <Emotion.h>
diff --git a/src/lib/elua/elua_private.h b/src/lib/elua/elua_private.h
index f4392f604b..6ecd7a80f0 100644
--- a/src/lib/elua/elua_private.h
+++ b/src/lib/elua/elua_private.h
@@ -20,10 +20,6 @@
 #include <Eina.h>
 #include <Ecore.h>
 
-#ifdef _WIN32
-#include <Evil.h>
-#endif
-
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
diff --git a/src/lib/embryo/embryo_time.c b/src/lib/embryo/embryo_time.c
index be32be7a14..ac4a71754d 100644
--- a/src/lib/embryo/embryo_time.c
+++ b/src/lib/embryo/embryo_time.c
@@ -6,7 +6,7 @@
 #include <time.h>
 
 #ifdef _WIN32
-# include <Evil.h>
+# include <evil_private.h> /* setenv unsetenv */
 #endif
 
 #ifdef HAVE_EXOTIC
diff --git a/src/lib/ephysics/ephysics_private.h b/src/lib/ephysics/ephysics_private.h
index ded1d14011..26e3a4df13 100644
--- a/src/lib/ephysics/ephysics_private.h
+++ b/src/lib/ephysics/ephysics_private.h
@@ -1,10 +1,6 @@
 #ifndef _EPHYSICS_PRIVATE_H
 #define _EPHYSICS_PRIVATE_H
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #pragma GCC diagnostic push
 #pragma GCC system_header
 
diff --git a/src/lib/ethumb/ethumb.c b/src/lib/ethumb/ethumb.c
index e3afb74bc9..bbfe3a01c5 100644
--- a/src/lib/ethumb/ethumb.c
+++ b/src/lib/ethumb/ethumb.c
@@ -51,10 +51,6 @@
 # define PATH_MAX 4096
 #endif
 
-#ifdef _WIN32
-# include <Evil.h>
-#endif
-
 #include <Eina.h>
 #include <eina_safety_checks.h>
 #include <Evas.h>