diff --git a/configure.ac b/configure.ac
index b17ac68b..0d31667a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -598,7 +598,7 @@ dnl Checks for header files.
 dnl
 
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(signal.h syslog.h uio.h errno.h sys/time.h sys/socket.h sys/un.h sys/poll.h)
+AC_CHECK_HEADERS(signal.h syslog.h uio.h errno.h sys/time.h sys/socket.h sys/un.h poll.h)
 AC_CHECK_HEADERS(features.h stdarg.h sys/unistd.h ctype.h)
 AC_CHECK_HEADERS_ONCE([sys/time.h])
 
diff --git a/plugins/common.h b/plugins/common.h
index 577f70fe..a6c24d48 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -115,8 +115,8 @@
 
 #include <locale.h>
 
-#ifdef HAVE_SYS_POLL_H
-#	include "sys/poll.h"
+#ifdef HAVE_POLL_H
+#	include <poll.h>
 #endif
 
 /*