Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -642,11 +642,11 @@
 	])
 ])
 
 AC_CHECK_FUNCS(sigaction)
 
-AC_CHECK_FUNCS([arc4random random], break)
+AC_CHECK_FUNCS(arc4random random, break)
 
 AC_CHECK_LIB(dl, dlopen, LIBS="$LIBS -ldl")
 AC_CHECK_HEADERS_ONCE(dlfcn.h)
 case "$host_os" in
 	netbsd*)
@@ -1012,33 +1012,33 @@
 		# include <windows.h>
 		# include <ws2tcpip.h>
 		#endif
 	])
 
-	AC_CHECK_FUNCS([paccept accept4])
+	AC_CHECK_FUNCS(paccept accept4, break)
 
-	AC_CHECK_FUNC(kqueue, [
+	AC_CHECK_FUNCS(kqueue1 kqueue, [
 		AC_DEFINE(HAVE_KQUEUE, 1, [Whether we have kqueue])
 		AC_SUBST(OFKERNELEVENTOBSERVER_KQUEUE_M,
 			"OFKernelEventObserver_kqueue.m")
-
-		AC_CHECK_FUNCS(kqueue1)
+		break
 	])
-	AC_CHECK_FUNC(epoll_create, [
+	AC_CHECK_FUNCS(epoll_create1 epoll_create, [
 		AC_DEFINE(HAVE_EPOLL, 1, [Whether we have epoll])
 		AC_SUBST(OFKERNELEVENTOBSERVER_EPOLL_M,
 			"OFKernelEventObserver_epoll.m")
-
-		AC_CHECK_FUNCS(epoll_create1)
+		break
 	])
-	AC_CHECK_HEADER(poll.h, [
-		AC_DEFINE(HAVE_POLL_H, 1, [Whether we have poll.h])
+	AC_CHECK_HEADERS(poll.h)
+	AC_CHECK_FUNC(poll, [
+		AC_DEFINE(HAVE_POLL, 1, [Whether we have poll()])
 		AC_SUBST(OFKERNELEVENTOBSERVER_POLL_M,
 			"OFKernelEventObserver_poll.m")
 	])
-	AC_CHECK_HEADER(sys/select.h, [
-		AC_DEFINE(HAVE_SYS_SELECT_H, 1, [Whether we have sys/select.h])
+	AC_CHECK_HEADERS(sys/select.h)
+	AC_CHECK_FUNC(select, [
+		AC_DEFINE(HAVE_SELECT, 1, [Whether we have select()])
 		AC_SUBST(OFKERNELEVENTOBSERVER_SELECT_M,
 			"OFKernelEventObserver_select.m")
 	])
 
 	case "$host_os" in
@@ -1183,11 +1183,11 @@
 		have_processes="no"
 		;;
 	*)
 		AC_CHECK_FUNCS(kill)
 
-		AC_CHECK_FUNCS(posix_spawnp, [
+		AC_CHECK_FUNC(posix_spawnp, [
 			AS_IF([test x"$ac_cv_func_kill" = x"yes"], [
 				have_processes="yes"
 
 				AC_CHECK_HEADERS(spawn.h)
 			])

Index: src/OFKernelEventObserver.m
==================================================================
--- src/OFKernelEventObserver.m
+++ src/OFKernelEventObserver.m
@@ -38,14 +38,14 @@
 # import "OFKernelEventObserver_kqueue.h"
 #endif
 #ifdef HAVE_EPOLL
 # import "OFKernelEventObserver_epoll.h"
 #endif
-#if defined(HAVE_POLL_H) || defined(OF_WII)
+#if HAVE_POLL
 # import "OFKernelEventObserver_poll.h"
 #endif
-#if defined(HAVE_SYS_SELECT_H) || defined(OF_WINDOWS)
+#if HAVE_SELECT
 # import "OFKernelEventObserver_select.h"
 #endif
 
 #import "OFInitializationFailedException.h"
 #import "OFInvalidArgumentException.h"
@@ -85,13 +85,13 @@
 	if (self == [OFKernelEventObserver class])
 #if defined(HAVE_KQUEUE)
 		return [OFKernelEventObserver_kqueue alloc];
 #elif defined(HAVE_EPOLL)
 		return [OFKernelEventObserver_epoll alloc];
-#elif defined(HAVE_POLL_H) || defined(OF_WII)
+#elif defined(HAVE_POLL)
 		return [OFKernelEventObserver_poll alloc];
-#elif defined(HAVE_SYS_SELECT_H) || defined(OF_WINDOWS)
+#elif defined(HAVE_SELECT)
 		return [OFKernelEventObserver_select alloc];
 #else
 # error No kqueue / epoll / poll / select found!
 #endif