@@ -36,11 +36,11 @@
 
 #if !defined(HAVE_STRERROR_R) && defined(OF_HAVE_THREADS)
 # import "threading.h"
 #endif
 
-#if defined(_WIN32) && defined(OF_HAVE_SOCKETS)
+#if defined(OF_WINDOWS) && defined(OF_HAVE_SOCKETS)
 # include <winerror.h>
 #endif
 
 /*
  * Define HAVE_DWARF_EXCEPTIONS if OBJC_ZEROCOST_EXCEPTIONS is defined, but
@@ -72,11 +72,11 @@
 	uint_fast8_t i;
 };
 
 extern _Unwind_Reason_Code _Unwind_Backtrace(
     _Unwind_Reason_Code(*)(struct _Unwind_Context*, void*), void*);
-# if defined(__arm__) || defined(__ARM__)
+# ifdef OF_ARM
 extern int _Unwind_VRS_Get(struct _Unwind_Context*, int, uint32_t, int, void*);
 # else
 extern uintptr_t _Unwind_GetIP(struct _Unwind_Context*);
 # endif
 #endif
@@ -98,11 +98,11 @@
 	OFString *ret;
 #ifdef HAVE_STRERROR_R
 	char buffer[256];
 #endif
 
-#ifdef _WIN32
+#ifdef OF_WINDOWS
 	/*
 	 * These were translated from WSAE* errors to errno and thus Win32's
 	 * strerror_r() does not know about them.
 	 *
 	 * FIXME: These could have better descriptions!
@@ -213,11 +213,11 @@
 backtrace_callback(struct _Unwind_Context *ctx, void *data)
 {
 	struct backtrace_ctx *bt = data;
 
 	if (bt->i < OF_BACKTRACE_SIZE) {
-# if defined(__arm__) || defined(__ARM__)
+# ifdef OF_ARM
 		uintptr_t ip;
 
 		_Unwind_VRS_Get(ctx, 0, 15, 0, &ip);
 		bt->backtrace[bt->i++] = (void*)(ip & ~1);
 # else