Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -926,13 +926,18 @@
 	AC_MSG_CHECKING(for getaddrinfo)
 	AC_TRY_COMPILE([
 		#include <stddef.h>
 		#ifndef _WIN32
 		# include <sys/types.h>
+		#endif
+		#ifdef HAVE_SYS_SOCKET_H
 		# include <sys/socket.h>
+		#endif
+		#ifdef HAVE_NETDB_H
 		# include <netdb.h>
-		#else
+		#endif
+		#ifdef _WIN32
 		typedef unsigned char BOOL;
 		# include <ws2tcpip.h>
 		#endif
 	], [
 		struct addrinfo ai;
@@ -974,13 +979,18 @@
 			AS_IF([test x"$have_threadsafe_getaddrinfo" = \
 					x"unknown"], [
 				AC_EGREP_CPP(yes, [
 					#ifndef _WIN32
 					# include <sys/types.h>
+					#endif
+					#ifdef HAVE_SYS_SOCKET_H
 					# include <sys/socket.h>
+					#endif
+					#ifdef HAVE_NETDB_H
 					# include <netdb.h>
-					#else
+					#endif
+					#ifdef _WIN32
 					# define _WIN32_WINNT 0x0501
 					# include <windows.h>
 					# include <ws2tcpip.h>
 					#endif