@@ -30,22 +30,22 @@
 #import "OFRunLoop.h"
 #import "OFRunLoop+Private.h"
 #import "OFThread.h"
 #import "OFThread+Private.h"
 
-#if defined(__MACH__) && !defined(OF_IOS)
+#if defined(OF_MAC_OS_X)
 # include <crt_externs.h>
-#elif defined(_WIN32)
+#elif defined(OF_WINDOWS)
 # include <windows.h>
 
 extern int _CRT_glob;
 extern void __wgetmainargs(int*, wchar_t***, wchar_t***, int, int*);
 #elif !defined(OF_IOS)
 extern char **environ;
 #endif
 
-#ifdef _PSP
+#ifdef OF_PSP
 # include <pspkerneltypes.h>
 # include <psploadexec.h>
 #endif
 
 #ifdef OF_NINTENDO_DS
@@ -55,11 +55,11 @@
 #endif
 
 @interface OFApplication (OF_PRIVATE_CATEGORY)
 - (void)OF_setArgumentCount: (int*)argc
 	  andArgumentValues: (char**[])argv;
-#ifdef _WIN32
+#ifdef OF_WINDOWS
 - (void)OF_setArgumentCount: (int)argc
       andWideArgumentValues: (wchar_t*[])argv;
 #endif
 - (void)OF_run;
 @end
@@ -83,11 +83,11 @@
 	{							\
 		app->_##sig##Handler(app->_delegate,		\
 		    @selector(applicationDidReceive##sig));	\
 	}
 SIGNAL_HANDLER(SIGINT)
-#ifndef _WIN32
+#ifndef OF_WINDOWS
 SIGNAL_HANDLER(SIGHUP)
 SIGNAL_HANDLER(SIGUSR1)
 SIGNAL_HANDLER(SIGUSR2)
 #endif
 #undef SIGNAL_HANDLER
@@ -94,11 +94,11 @@
 
 int
 of_application_main(int *argc, char **argv[], Class cls)
 {
 	id <OFApplicationDelegate> delegate;
-#ifdef _WIN32
+#ifdef OF_WINDOWS
 	wchar_t **wargv, **wenvp;
 	int wargc, si = 0;
 #endif
 
 	if ([cls isSubclassOfClass: [OFApplication class]]) {
@@ -114,11 +114,11 @@
 	app = [[OFApplication alloc] init];
 
 	[app OF_setArgumentCount: argc
 	       andArgumentValues: argv];
 
-#ifdef _WIN32
+#ifdef OF_WINDOWS
 	__wgetmainargs(&wargc, &wargv, &wenvp, _CRT_glob, &si);
 	[app OF_setArgumentCount: wargc
 	   andWideArgumentValues: wargv];
 #endif
 
@@ -158,11 +158,11 @@
 	exit(0);
 }
 
 + (void)terminateWithStatus: (int)status
 {
-#ifdef _PSP
+#ifdef OF_PSP
 	sceKernelExitGame();
 	abort();	/* sceKernelExitGame() is not marked noreturn */
 #else
 	exit(status);
 #endif
@@ -173,13 +173,13 @@
 	self = [super init];
 
 	@try {
 		void *pool;
 		OFMutableDictionary *environment;
-#if defined(__MACH__) && !defined(OF_IOS)
+#if defined(OF_MAC_OS_X)
 		char **env = *_NSGetEnviron();
-#elif defined(_WIN32)
+#elif defined(OF_WINDOWS)
 		of_char16_t *env, *env0;
 #elif !defined(OF_IOS)
 		char **env = environ;
 #else
 		char *env;
@@ -186,11 +186,11 @@
 #endif
 
 		environment = [[OFMutableDictionary alloc] init];
 
 		atexit(atexitHandler);
-#if defined(_WIN32)
+#if defined(OF_WINDOWS)
 		env = env0 = GetEnvironmentStringsW();
 
 		while (*env != 0) {
 			OFString *tmp, *key, *value;
 			size_t length, pos;
@@ -327,11 +327,11 @@
 }
 
 - (void)OF_setArgumentCount: (int*)argc
 	  andArgumentValues: (char***)argv
 {
-#ifndef _WIN32
+#ifndef OF_WINDOWS
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableArray *arguments;
 	int i;
 	of_string_encoding_t encoding;
 
@@ -364,11 +364,11 @@
 	_argc = argc;
 	_argv = argv;
 #endif
 }
 
-#ifdef _WIN32
+#ifdef OF_WINDOWS
 - (void)OF_setArgumentCount: (int)argc
       andWideArgumentValues: (wchar_t**)argv
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableArray *arguments;
@@ -429,11 +429,11 @@
 		    @selector(applicationDidReceive##sig)];		\
 		signal(sig, handle##sig);				\
 	} else								\
 		signal(sig, SIG_DFL);
 	REGISTER_SIGNAL(SIGINT)
-#ifndef _WIN32
+#ifndef OF_WINDOWS
 	REGISTER_SIGNAL(SIGHUP)
 	REGISTER_SIGNAL(SIGUSR1)
 	REGISTER_SIGNAL(SIGUSR2)
 #endif
 #undef REGISTER_SIGNAL