Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -1040,10 +1040,11 @@
 			"OFKernelEventObserver_epoll.m")
 		break
 	])
 
 	AS_IF([test x"$with_wii" = x"yes"], [
+		AC_DEFINE(HAVE_POLL, 1, [Whether we have poll()])
 		AC_SUBST(OFKERNELEVENTOBSERVER_POLL_M,
 			"OFKernelEventObserver_poll.m")
 	], [
 		AC_CHECK_HEADERS(poll.h)
 		AC_CHECK_FUNC(poll, [
@@ -1069,16 +1070,10 @@
 					"OFKernelEventObserver_select.m")
 			])
 			;;
 	esac
 
-	AS_IF([test x"$with_wii" = x"yes"], [
-		AC_DEFINE(HAVE_SELECT, 1, [Whether we have select() or similar])
-		AC_SUBST(OFKERNELEVENTOBSERVER_SELECT_M,
-			"OFKernelEventObserver_select.m")
-	])
-
 	AC_MSG_CHECKING(for getaddrinfo)
 	AC_TRY_COMPILE([
 		#include <stddef.h>
 		#ifdef OF_HAVE_SYS_TYPES_H
 		# include <sys/types.h>

Index: tests/OFKernelEventObserverTests.m
==================================================================
--- tests/OFKernelEventObserverTests.m
+++ tests/OFKernelEventObserverTests.m
@@ -20,21 +20,21 @@
 #import "OFString.h"
 #import "OFDate.h"
 #import "OFTCPSocket.h"
 #import "OFAutoreleasePool.h"
 
-#if defined(HAVE_SYS_SELECT_H) || defined(OF_WINDOWS)
-# import "OFKernelEventObserver_select.h"
-#endif
-#if defined(HAVE_POLL_H) || defined(OF_WII)
-# import "OFKernelEventObserver_poll.h"
+#ifdef HAVE_KQUEUE
+# import "OFKernelEventObserver_kqueue.h"
 #endif
 #ifdef HAVE_EPOLL
 # import "OFKernelEventObserver_epoll.h"
 #endif
-#ifdef HAVE_KQUEUE
-# import "OFKernelEventObserver_kqueue.h"
+#ifdef HAVE_POLL
+# import "OFKernelEventObserver_poll.h"
+#endif
+#ifdef HAVE_SELECT
+# import "OFKernelEventObserver_select.h"
 #endif
 
 #import "TestsAppDelegate.h"
 
 #define EXPECTED_EVENTS 3
@@ -222,16 +222,16 @@
 
 - (void)kernelEventObserverTests
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 
-#if defined(HAVE_SYS_SELECT_H) || defined(OF_WINDOWS)
+#ifdef HAVE_SELECT
 	[self kernelEventObserverTestsWithClass:
 	    [OFKernelEventObserver_select class]];
 #endif
 
-#if defined(HAVE_POLL_H) || defined(OF_WII)
+#ifdef HAVE_POLL
 	[self kernelEventObserverTestsWithClass:
 	    [OFKernelEventObserver_poll class]];
 #endif
 
 #ifdef HAVE_EPOLL