@@ -32,20 +32,20 @@
 #import "OFDictionary.h"
 #import "OFApplication.h"
 
 #import "OFNotImplementedException.h"
 
-#if defined(__APPLE__) && !defined(OF_IOS)
+#if defined(OF_MAC_OS_X)
 # include <NSSystemDirectories.h>
 #endif
-#ifdef _WIN32
+#ifdef OF_WINDOWS
 # include <windows.h>
 #endif
-#ifdef __HAIKU__
+#ifdef OF_HAIKU
 # include <FindDirectory.h>
 #endif
-#ifdef __QNX__
+#ifdef OF_QNX
 # include <sys/syspage.h>
 #endif
 
 #if defined(OF_X86_64_ASM) || defined(OF_X86_ASM)
 struct x86_regs {
@@ -99,16 +99,16 @@
 + (void)initialize
 {
 	if (self != [OFSystemInfo class])
 		return;
 
-#if defined(_WIN32)
+#if defined(OF_WINDOWS)
 	SYSTEM_INFO si;
 	GetSystemInfo(&si);
 	pageSize = si.dwPageSize;
 	numberOfCPUs = si.dwNumberOfProcessors;
-#elif defined(__QNX__)
+#elif defined(OF_QNX)
 	if ((pageSize = sysconf(_SC_PAGESIZE)) < 1)
 		pageSize = 4096;
 	numberOfCPUs = _syspage_ptr->num_cpu;
 #else
 # if defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE)
@@ -144,11 +144,11 @@
 }
 
 + (OFString*)userDataPath
 {
 	/* TODO: Return something more sensible for iOS */
-#if defined(__APPLE__) && !defined(OF_IOS)
+#if defined(OF_MAC_OS_X)
 	void *pool = objc_autoreleasePoolPush();
 	char pathC[PATH_MAX];
 	NSSearchPathEnumerationState state;
 	OFMutableString *path;
 	OFString *home;
@@ -175,11 +175,11 @@
 	[path makeImmutable];
 
 	[path retain];
 	objc_autoreleasePoolPop(pool);
 	return [path autorelease];
-#elif defined(_WIN32)
+#elif defined(OF_WINDOWS)
 	void *pool = objc_autoreleasePoolPush();
 	OFDictionary *env = [OFApplication environment];
 	OFString *appData;
 
 	if ((appData = [env objectForKey: @"APPDATA"]) == nil)
@@ -187,11 +187,11 @@
 								 object: self];
 
 	[appData retain];
 	objc_autoreleasePoolPop(pool);
 	return [appData autorelease];
-#elif defined(__HAIKU__)
+#elif defined(OF_HAIKU)
 	char pathC[PATH_MAX];
 
 	if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false,
 	    pathC, PATH_MAX) != B_OK)
 		@throw [OFNotImplementedException exceptionWithSelector: _cmd
@@ -224,11 +224,11 @@
 }
 
 + (OFString*)userConfigPath
 {
 	/* TODO: Return something more sensible for iOS */
-#if defined(__APPLE__) && !defined(OF_IOS)
+#if defined(OF_MAC_OS_X)
 	void *pool = objc_autoreleasePoolPush();
 	char pathC[PATH_MAX];
 	NSSearchPathEnumerationState state;
 	OFMutableString *path;
 	OFString *home;
@@ -257,11 +257,11 @@
 	[path makeImmutable];
 
 	[path retain];
 	objc_autoreleasePoolPop(pool);
 	return [path autorelease];
-#elif defined(_WIN32)
+#elif defined(OF_WINDOWS)
 	void *pool = objc_autoreleasePoolPush();
 	OFDictionary *env = [OFApplication environment];
 	OFString *appData;
 
 	if ((appData = [env objectForKey: @"APPDATA"]) == nil)
@@ -269,11 +269,11 @@
 								 object: self];
 
 	[appData retain];
 	objc_autoreleasePoolPop(pool);
 	return [appData autorelease];
-#elif defined(__HAIKU__)
+#elif defined(OF_HAIKU)
 	char pathC[PATH_MAX];
 
 	if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false,
 	    pathC, PATH_MAX) != B_OK)
 		@throw [OFNotImplementedException exceptionWithSelector: _cmd