diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index c3f5437dff..0b1b6f697f 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-12  Vincent Torri  <doursse at users dot sf dot net>
+
+	* src/lib/Makefile.am:
+	* src/lib/evil_time.c (deleted):
+	remove evil_time.c as tzset is defined with mingw
+	and as _tzset is defined with vc++
+
+	* src/lib/Evil.h:
+	* src/lib/dlfcn/dlfcn.c:
+	* src/lib/dlfcn/dlfcn.h:
+	remove __CEGCC__ occurences
+
 2010-03-11  Vincent Torri  <doursse at users dot sf dot net>
 
 	* win32/vs8/libdlfcn.vcproj:
diff --git a/legacy/evil/src/lib/Evil.h b/legacy/evil/src/lib/Evil.h
index b31a950b74..5e44293678 100644
--- a/legacy/evil/src/lib/Evil.h
+++ b/legacy/evil/src/lib/Evil.h
@@ -106,14 +106,9 @@ typedef SSIZE_T ssize_t;
 
 #endif /* _MSC_VER */
 
-
-#ifndef __CEGCC__
-
 typedef unsigned long  uid_t;
 typedef unsigned long  gid_t;
 
-#endif /* ! __CEGCC__ */
-
 
 #include "evil_fcntl.h"
 #include "evil_langinfo.h"
diff --git a/legacy/evil/src/lib/Makefile.am b/legacy/evil/src/lib/Makefile.am
index bdf289be73..fc06c265dc 100644
--- a/legacy/evil/src/lib/Makefile.am
+++ b/legacy/evil/src/lib/Makefile.am
@@ -39,7 +39,6 @@ evil_pwd.c \
 evil_stdlib.c \
 evil_stdio.c \
 evil_string.c \
-evil_time.c \
 evil_unistd.c \
 evil_util.c \
 evil_uuid.c
diff --git a/legacy/evil/src/lib/dlfcn/dlfcn.c b/legacy/evil/src/lib/dlfcn/dlfcn.c
index fd55a917e3..8f4d387be3 100644
--- a/legacy/evil/src/lib/dlfcn/dlfcn.c
+++ b/legacy/evil/src/lib/dlfcn/dlfcn.c
@@ -1,15 +1,15 @@
-#include <stdlib.h>
-
-#if defined(__CEGCC__) || defined(__MINGW32CE__) || defined(_MSC_VER)
-# include <limits.h>
-#endif /* __CEGCC__ || __MINGW32CE__ || _MSC_VER */
-
-#include "../Evil.h"
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include <stdlib.h>
+
+#if defined(__MINGW32CE__) || defined(_MSC_VER)
+# include <limits.h>
+#endif /* __MINGW32CE__ || _MSC_VER */
+
+#include "../Evil.h"
+
 #include "dlfcn.h"
 
 
diff --git a/legacy/evil/src/lib/dlfcn/dlfcn.h b/legacy/evil/src/lib/dlfcn/dlfcn.h
index b7b4c9eb89..ae31cbae1d 100644
--- a/legacy/evil/src/lib/dlfcn/dlfcn.h
+++ b/legacy/evil/src/lib/dlfcn/dlfcn.h
@@ -2,11 +2,7 @@
 #define __EVIL_DLFCN_H__
 
 
-#if defined(__CEGCC__)
-# include <sys/syslimits.h>
-#else
-# include <limits.h>
-#endif /* ! __CEGCC__ || ! __MINGW32CE__ */
+#include <limits.h>
 
 
 #ifdef EAPI
diff --git a/legacy/evil/src/lib/evil_time.c b/legacy/evil/src/lib/evil_time.c
deleted file mode 100644
index ce49fe550b..0000000000
--- a/legacy/evil/src/lib/evil_time.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "Evil.h"
-
-EAPI void tzset(void)
-{
-   /* does nothing... */
-}