@@ -18,17 +18,17 @@
 
 #import "threading.h"
 
 #if defined(OF_HAVE_PTHREADS)
 # include "threading_pthread.m"
-#elif defined(_WIN32)
+#elif defined(OF_WINDOWS)
 # include "threading_winapi.m"
 #else
 # error No threads available!
 #endif
 
-#ifdef __HAIKU__
+#ifdef OF_HAIKU
 # include <kernel/OS.h>
 #endif
 
 bool
 of_rmutex_new(of_rmutex_t *rmutex)
@@ -47,11 +47,11 @@
 
 	if (pthread_mutexattr_destroy(&attr) != 0)
 		return false;
 
 	return true;
-#elif defined(_WIN32)
+#elif defined(OF_WINDOWS)
 	return of_mutex_new(rmutex);
 #else
 	if (!of_mutex_new(&rmutex->mutex))
 		return false;
 
@@ -63,11 +63,11 @@
 }
 
 bool
 of_rmutex_lock(of_rmutex_t *rmutex)
 {
-#if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(_WIN32)
+#if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(OF_WINDOWS)
 	return of_mutex_lock(rmutex);
 #else
 	uintptr_t count = (uintptr_t)of_tlskey_get(rmutex->count);
 
 	if (count > 0) {
@@ -90,11 +90,11 @@
 }
 
 bool
 of_rmutex_trylock(of_rmutex_t *rmutex)
 {
-#if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(_WIN32)
+#if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(OF_WINDOWS)
 	return of_mutex_trylock(rmutex);
 #else
 	uintptr_t count = (uintptr_t)of_tlskey_get(rmutex->count);
 
 	if (count > 0) {
@@ -117,11 +117,11 @@
 }
 
 bool
 of_rmutex_unlock(of_rmutex_t *rmutex)
 {
-#if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(_WIN32)
+#if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(OF_WINDOWS)
 	return of_mutex_unlock(rmutex);
 #else
 	uintptr_t count = (uintptr_t)of_tlskey_get(rmutex->count);
 
 	if (count > 1) {
@@ -142,11 +142,11 @@
 }
 
 bool
 of_rmutex_free(of_rmutex_t *rmutex)
 {
-#if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(_WIN32)
+#if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(OF_WINDOWS)
 	return of_mutex_free(rmutex);
 #else
 	if (!of_mutex_free(&rmutex->mutex))
 		return false;