@@ -39,14 +39,14 @@
 # import "OFKernelEventObserver_kqueue.h"
 #endif
 #ifdef HAVE_EPOLL
 # import "OFKernelEventObserver_epoll.h"
 #endif
-#if defined(HAVE_POLL_H) || defined(__wii__)
+#if defined(HAVE_POLL_H) || defined(OF_WII)
 # import "OFKernelEventObserver_poll.h"
 #endif
-#if defined(HAVE_SYS_SELECT_H) || defined(_WIN32)
+#if defined(HAVE_SYS_SELECT_H) || defined(OF_WINDOWS)
 # import "OFKernelEventObserver_select.h"
 #endif
 
 #import "OFInitializationFailedException.h"
 #import "OFInvalidArgumentException.h"
@@ -84,13 +84,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(__wii__)
+#elif defined(HAVE_POLL_H) || defined(OF_WII)
 		return [OFKernelEventObserver_poll alloc];
-#elif defined(HAVE_SYS_SELECT_H) || defined(_WIN32)
+#elif defined(HAVE_SYS_SELECT_H) || defined(OF_WINDOWS)
 		return [OFKernelEventObserver_select alloc];
 #else
 # error No kqueue / epoll / poll / select found!
 #endif
 
@@ -100,11 +100,11 @@
 - init
 {
 	self = [super init];
 
 	@try {
-#if !defined(OF_HAVE_PIPE) && !defined(__wii__)
+#if !defined(OF_HAVE_PIPE) && !defined(OF_WII)
 		socklen_t cancelAddrLen;
 #endif
 
 		_readObjects = [[OFMutableArray alloc] init];
 		_writeObjects = [[OFMutableArray alloc] init];
@@ -125,11 +125,11 @@
 
 		_cancelAddr.sin_family = AF_INET;
 		_cancelAddr.sin_port = 0;
 		_cancelAddr.sin_addr.s_addr = inet_addr("127.0.0.1");
 
-# ifdef __wii__
+# ifdef OF_WII
 		_cancelAddr.sin_len = 8;
 		/* The Wii does not accept port 0 as "choose any free port" */
 		_cancelAddr.sin_port = of_socket_port_find(SOCK_DGRAM);
 # endif
 
@@ -136,11 +136,11 @@
 		if (bind(_cancelFD[0], (struct sockaddr*)&_cancelAddr,
 		    sizeof(_cancelAddr)))
 			@throw [OFInitializationFailedException
 			    exceptionWithClass: [self class]];
 
-# ifndef __wii__
+# ifndef OF_WII
 		cancelAddrLen = sizeof(_cancelAddr);
 		if (of_getsockname(_cancelFD[0], (struct sockaddr*)&_cancelAddr,
 		    &cancelAddrLen) != 0)
 			@throw [OFInitializationFailedException
 			    exceptionWithClass: [self class]];
@@ -162,11 +162,11 @@
 {
 	close(_cancelFD[0]);
 	if (_cancelFD[1] != _cancelFD[0])
 		close(_cancelFD[1]);
 
-#ifdef __wii__
+#ifdef OF_WII
 	of_socket_port_free(_cancelAddr.sin_port, SOCK_DGRAM);
 #endif
 
 	[_readObjects release];
 	[_writeObjects release];
@@ -358,11 +358,11 @@
 - (void)cancel
 {
 #ifdef OF_HAVE_PIPE
 	OF_ENSURE(write(_cancelFD[1], "", 1) > 0);
 #else
-# ifndef __wii__
+# ifndef OF_WII
 	OF_ENSURE(sendto(_cancelFD[1], "", 1, 0,
 	    (struct sockaddr*)&_cancelAddr, sizeof(_cancelAddr)) > 0);
 # else
 	OF_ENSURE(sendto(_cancelFD[1], "", 1, 0,
 	    (struct sockaddr*)&_cancelAddr, 8) > 0);