diff --git a/config/m4/win32.m4 b/config/m4/win32.m4
index d673041d..18296e51 100644
--- a/config/m4/win32.m4
+++ b/config/m4/win32.m4
@@ -14,7 +14,7 @@ AC_DEFUN([EL_CONFIG_OS_WIN32],
 		EL_RESTORE_FLAGS
 	fi
 
-	AC_CHECK_HEADERS(windows.h)
+	AC_CHECK_HEADERS(windows.h ws2tcpip.h)
 
 	# TODO: Check this?
 	# TODO: Check -lws2_32 for IPv6 support
diff --git a/src/network/socket.c b/src/network/socket.c
index 70a9abb8..c69096d6 100644
--- a/src/network/socket.c
+++ b/src/network/socket.c
@@ -19,6 +19,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h> /* socklen_t for MinGW */
+#endif
 
 #ifdef HAVE_GETIFADDRS
 #ifdef HAVE_NETDB_H