@@ -20,14 +20,14 @@
 #import "OFString.h"
 #import "OFDate.h"
 #import "OFTCPSocket.h"
 #import "OFAutoreleasePool.h"
 
-#if defined(HAVE_SYS_SELECT_H) || defined(_WIN32)
+#if defined(HAVE_SYS_SELECT_H) || defined(OF_WINDOWS)
 # import "OFKernelEventObserver_select.h"
 #endif
-#if defined(HAVE_POLL_H) || defined(__wii__)
+#if defined(HAVE_POLL_H) || defined(OF_WII)
 # import "OFKernelEventObserver_poll.h"
 #endif
 #ifdef HAVE_EPOLL
 # import "OFKernelEventObserver_epoll.h"
 #endif
@@ -210,16 +210,16 @@
 
 - (void)kernelEventObserverTests
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 
-#if defined(HAVE_SYS_SELECT_H) || defined(_WIN32)
+#if defined(HAVE_SYS_SELECT_H) || defined(OF_WINDOWS)
 	[self kernelEventObserverTestsWithClass:
 	    [OFKernelEventObserver_select class]];
 #endif
 
-#if defined(HAVE_POLL_H) || defined(__wii__)
+#if defined(HAVE_POLL_H) || defined(OF_WII)
 	[self kernelEventObserverTestsWithClass:
 	    [OFKernelEventObserver_poll class]];
 #endif
 
 #ifdef HAVE_EPOLL