diff --git a/configure.ac b/configure.ac
index 891799ea..37880d29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -436,7 +436,7 @@ AC_CHECK_HEADERS([ \
 	unistd.h signal.h libgen.h stropts.h \
 	syslog.h pwd.h grp.h \
 	sys/sockio.h sys/uio.h linux/sockios.h \
-	linux/types.h sys/poll.h sys/epoll.h err.h \
+	linux/types.h poll.h sys/epoll.h err.h \
 ])
 
 SOCKET_INCLUDES="
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index d2a50341..2b4c49ff 100644
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -179,8 +179,8 @@
 #include <resolv.h>
 #endif
 
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
+#ifdef HAVE_POLL_H
+#include <poll.h>
 #endif
 
 #ifdef HAVE_SYS_EPOLL_H