Index: src/OFApplication.m
==================================================================
--- src/OFApplication.m
+++ src/OFApplication.m
@@ -34,11 +34,11 @@
 #import "OFThread+Private.h"
 
 #import "OFOutOfMemoryException.h"
 #import "OFOutOfRangeException.h"
 
-#if defined(OF_MAC_OS_X)
+#if defined(OF_MACOS)
 # include <crt_externs.h>
 #elif defined(OF_WINDOWS)
 # include <windows.h>
 
 extern int _CRT_glob;
@@ -191,11 +191,11 @@
 	self = [super init];
 
 	@try {
 		void *pool;
 		OFMutableDictionary *environment;
-#if defined(OF_MAC_OS_X)
+#if defined(OF_MACOS)
 		char **env = *_NSGetEnviron();
 #elif defined(OF_WINDOWS)
 		of_char16_t *env, *env0;
 #elif !defined(OF_IOS)
 		char **env = environ;

Index: src/OFSystemInfo.m
==================================================================
--- src/OFSystemInfo.m
+++ src/OFSystemInfo.m
@@ -26,11 +26,11 @@
 
 #include <unistd.h>
 
 #include "platform.h"
 
-#ifdef OF_MAC_OS_X
+#ifdef OF_MACOS
 # include <sys/sysctl.h>
 #endif
 
 #import "OFSystemInfo.h"
 #import "OFString.h"
@@ -38,11 +38,11 @@
 #import "OFDictionary.h"
 #import "OFApplication.h"
 
 #import "OFNotImplementedException.h"
 
-#if defined(OF_MAC_OS_X) || defined(OF_IOS)
+#if defined(OF_MACOS) || defined(OF_IOS)
 # ifdef HAVE_SYSDIR_H
 #  include <sysdir.h>
 # else
 #  include <NSSystemDirectories.h>
 # endif
@@ -143,11 +143,11 @@
 	return numberOfCPUs;
 }
 
 + (OFString*)userDataPath
 {
-#if defined(OF_MAC_OS_X) || defined(OF_IOS)
+#if defined(OF_MACOS) || defined(OF_IOS)
 	void *pool = objc_autoreleasePoolPush();
 	char pathC[PATH_MAX];
 	OFMutableString *path;
 	OFString *home;
 
@@ -233,11 +233,11 @@
 #endif
 }
 
 + (OFString*)userConfigPath
 {
-#if defined(OF_MAC_OS_X) || defined(OF_IOS)
+#if defined(OF_MACOS) || defined(OF_IOS)
 	void *pool = objc_autoreleasePoolPush();
 	char pathC[PATH_MAX];
 	OFMutableString *path;
 	OFString *home;
 
@@ -393,11 +393,11 @@
 #endif
 
 #if defined(OF_POWERPC) || defined(OF_POWERPC64)
 + (bool)supportsAltiVec
 {
-# ifdef OF_MAC_OS_X
+# ifdef OF_MACOS
 	int name[2] = { CTL_HW, HW_VECTORUNIT }, value = 0;
 	size_t length = sizeof(value);
 
 	if (sysctl(name, 2, &value, &length, NULL, 0) == 0)
 		return value;

Index: src/platform.h
==================================================================
--- src/platform.h
+++ src/platform.h
@@ -76,11 +76,11 @@
 /*
  * iOS has the functions, so configure will find them, but they cannot be used.
  */
 #  undef OF_HAVE_PROCESSES
 # else
-#  define OF_MAC_OS_X
+#  define OF_MACOS
 # endif
 #elif defined(__linux__)
 # define OF_LINUX
 #elif defined(_WIN32)
 # define OF_WINDOWS

Index: src/threading_pthread.m
==================================================================
--- src/threading_pthread.m
+++ src/threading_pthread.m
@@ -181,11 +181,11 @@
 #if defined(OF_HAIKU)
 	rename_thread(get_pthread_thread_id(thread), name);
 #elif defined(HAVE_PTHREAD_SET_NAME_NP)
 	pthread_set_name_np(pthread_self(), name);
 #elif defined(HAVE_PTHREAD_SETNAME_NP)
-# if defined(OF_MAC_OS_X) || defined(OF_IOS)
+# if defined(OF_MACOS) || defined(OF_IOS)
 	pthread_setname_np(name);
 # elif defined(__GLIBC__)
 	char buffer[16];
 
 	strncpy(buffer, name, 15);