diff --git a/ChangeLog b/ChangeLog
index a9d48429..7f5cf497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
     the context's LOCALNAMES namespace.
   * get which version of OpenSSL was used at build time and at run time
     when available with getdns_context_get_api_information()
+  * GETDNS_RETURN_IO_ERROR return error code
   * Bugfix #359: edns_client_subnet_private should set family
     Thanks Daniel Areiza
 
diff --git a/configure.ac b/configure.ac
index ed14463f..dd499b90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -265,7 +265,7 @@ esac
 
 
 DEFAULT_EVENTLOOP=select_eventloop
-AC_CHECK_HEADERS([signal.h sys/poll.h poll.h sys/resource.h sys/types.h],,, [AC_INCLUDES_DEFAULT])
+AC_CHECK_HEADERS([signal.h sys/poll.h poll.h sys/resource.h sys/types.h sys/stat.h],,, [AC_INCLUDES_DEFAULT])
 AC_ARG_ENABLE(poll-eventloop, AC_HELP_STRING([--disable-poll-eventloop], [Disable default eventloop based on poll (default=enabled if available)]))
 case "$enable_poll_eventloop" in
 	no)
@@ -1516,6 +1516,10 @@ static inline int _gldns_custom_vsnprintf(char *str, size_t size, const char *fo
 #include <sys/types.h>
 #endif
 
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif