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, 9 insertions, 10 deletions

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