diff --git a/src/lib/evil/Evil.h b/src/lib/evil/Evil.h
index c8f1f68f8b..e09e261ead 100644
--- a/src/lib/evil/Evil.h
+++ b/src/lib/evil/Evil.h
@@ -106,6 +106,17 @@ extern "C" {
 typedef unsigned long  uid_t;
 typedef unsigned long  gid_t;
 
+#ifdef _MSC_VER
+# ifdef _WIN64
+typedef __int64 pid_t;
+# else
+typedef int pid_t;
+# endif
+typedef SSIZE_T ssize_t;
+typedef unsigned short mode_t;
+# define strdup(str) _strdup(str)
+#endif
+
 
 #include "evil_macro.h"
 #include "evil_dlfcn.h"
diff --git a/src/lib/evil/evil_util.c b/src/lib/evil/evil_util.c
index 36ee38e844..e47475371a 100644
--- a/src/lib/evil/evil_util.c
+++ b/src/lib/evil/evil_util.c
@@ -172,37 +172,13 @@ _evil_last_error_display(const char *fct)
 const char *
 evil_tmpdir_get(void)
 {
-   char *tmpdir;
-
-   tmpdir = getenv("TMP");
-   if (!tmpdir) tmpdir = getenv("TEMP");
-   if (!tmpdir) tmpdir = getenv("USERPROFILE");
-   if (!tmpdir) tmpdir = getenv("WINDIR");
-   if (!tmpdir) tmpdir="C:\\";
-
-   return tmpdir;
+   return NULL;
 }
 
 const char *
 evil_homedir_get(void)
 {
-   char *homedir;
-   char *homedrive;
-   char *homepath;
-
-   homedir = getenv("HOME");
-   if (!homedir)
-     {
-       homedrive = getenv("HOMEDRIVE");
-       homepath = getenv("HOMEPATH");
-       if (homedrive && homepath)
-         asprintf(&homedir, "%s%s", homedrive, homepath);
-     }
-   if (!homedir) homedir = getenv("USERPROFILE");
-   if (!homedir) homedir = getenv("WINDIR");
-   if (!homedir) homedir="C:\\";
-
-   return homedir;
+   return NULL;
 }
 
 int
diff --git a/src/lib/evil/evil_util.h b/src/lib/evil/evil_util.h
index 6b3e50439d..e1fdf26387 100644
--- a/src/lib/evil/evil_util.h
+++ b/src/lib/evil/evil_util.h
@@ -81,10 +81,14 @@ EAPI const char *evil_last_error_get(void);
  *
  * Supported OS: Windows 95, Windows 98, Windows Me, Windows NT, Windows 2000,
  * Windows XP.
+
+ * @deprecated
+ * This function is deprecated and returns @c NULL.
+ * Use eina_environment_tmp_get() instead.
  *
  * @ingroup Evil
  */
-__attribute__ ((__deprecated__)) EAPI const char *evil_tmpdir_get(void);
+EAPI const char *evil_tmpdir_get(void);
 
 /**
  * @brief Return a dir to store personal files.
@@ -103,10 +107,14 @@ __attribute__ ((__deprecated__)) EAPI const char *evil_tmpdir_get(void);
  *
  * Supported OS: Windows 95, Windows 98, Windows Me, Windows NT, Windows 2000,
  * Windows XP.
+
+ * @deprecated
+ * This function is deprecated and returns @c NULL.
+ * Use eina_environment_home_get() instead.
  *
  * @ingroup Evil
  */
-__attribute__ ((__deprecated__)) EAPI const char *evil_homedir_get(void);
+EAPI const char *evil_homedir_get(void);
 
 /**
  * @brief check if the given path is absolute.