@@ -490,10 +490,13 @@
 	AC_MSG_RESULT(no)
 	AC_DEFINE(SSIZE_MAX, [((ssize_t)(SIZE_MAX / 2))],
 		[Maximum value for ssize_t])
 ])
 
+AC_CHECK_HEADER(sys/types.h,
+	[AC_DEFINE(OF_HAVE_SYS_TYPES_H, 1, [Whether we have <sys/types.h>])])
+
 AC_CHECK_TYPE(max_align_t,
 	[AC_DEFINE(OF_HAVE_MAX_ALIGN_T, 1, [Whether we have max_align_t])])
 
 AC_CHECK_HEADER(stdnoreturn.h,
 	[AC_DEFINE(OF_HAVE_STDNORETURN_H, 1, [Whether we have stdnoreturn.h])])
@@ -1060,11 +1063,11 @@
 	esac
 
 	AC_MSG_CHECKING(for getaddrinfo)
 	AC_TRY_COMPILE([
 		#include <stddef.h>
-		#ifndef _WIN32
+		#ifdef OF_HAVE_SYS_TYPES_H
 		# include <sys/types.h>
 		#endif
 		#ifdef HAVE_SYS_SOCKET_H
 		# include <sys/socket.h>
 		#endif
@@ -1113,11 +1116,11 @@
 			esac
 
 			AS_IF([test x"$have_threadsafe_getaddrinfo" = \
 					x"unknown"], [
 				AC_EGREP_CPP(yes, [
-					#ifndef _WIN32
+					#ifdef OF_HAVE_SYS_TYPES_H
 					# include <sys/types.h>
 					#endif
 					#ifdef HAVE_SYS_SOCKET_H
 					# include <sys/socket.h>
 					#endif