diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index b0aeccdaa0..62bf3dc326 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-21  Vincent Torri  <doursse at users dot sf dot net>
+
+	* src/bin/evil_test_gettimeofday.c:
+	Include sys/time.h
+
+	* src/lib/evil_inet.c:
+	EMSGSIZE and EAFNOSUPPORT could not be defined on
+	some MinGW compilers.
+
 2012-02-18  Vincent Torri  <doursse at users dot sf dot net>
 
 	* src/lib/Evil.h:
diff --git a/legacy/evil/src/bin/evil_test_gettimeofday.c b/legacy/evil/src/bin/evil_test_gettimeofday.c
index 44fa79e809..49742eb5d3 100644
--- a/legacy/evil/src/bin/evil_test_gettimeofday.c
+++ b/legacy/evil/src/bin/evil_test_gettimeofday.c
@@ -4,6 +4,7 @@
 
 #include <string.h>
 #include <math.h>
+#include <sys/time.h>
 
 #include <Evil.h>
 
diff --git a/legacy/evil/src/lib/evil_inet.c b/legacy/evil/src/lib/evil_inet.c
index 1b679ea808..99ce14edc2 100644
--- a/legacy/evil/src/lib/evil_inet.c
+++ b/legacy/evil/src/lib/evil_inet.c
@@ -45,8 +45,15 @@
 #define APICHAR char
 #include "evil_print.h"
 
+#ifndef EMSGSIZE
+# define EMSGSIZE WSAEMSGSIZE
+#endif
 
-# define SPRINTF(x) ((size_t)sprintf x)
+#ifndef EAFNOSUPPORT
+# define EAFNOSUPPORT WSAEAFNOSUPPORT
+#endif
+
+#define SPRINTF(x) ((size_t)sprintf x)
 
 #define ERRNO         ((int)GetLastError())
 #define SET_ERRNO(x)  (SetLastError((DWORD)(x)))