Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -29,14 +29,14 @@
        OFXMLElement.m		\
        OFXMLParser.m		\
        unicode.m
 
 INCLUDES := ${SRCS:.m=.h}	\
-	    OFMacros.h		\
 	    ObjFW.h		\
 	    asprintf.h		\
 	    ${ATOMIC_H}		\
+	    macros.h		\
 	    objfw-defs.h	\
 	    ${THREADING_H}
 
 SRCS += ${ASPRINTF_M} 		\
 	iso_8859_15.m		\

Index: src/OFArray.m
==================================================================
--- src/OFArray.m
+++ src/OFArray.m
@@ -15,11 +15,11 @@
 
 #import "OFArray.h"
 #import "OFDataArray.h"
 #import "OFString.h"
 #import "OFExceptions.h"
-#import "OFMacros.h"
+#import "macros.h"
 
 @implementation OFArray
 + array
 {
 	return [[[self alloc] init] autorelease];

Index: src/OFDataArray.m
==================================================================
--- src/OFDataArray.m
+++ src/OFDataArray.m
@@ -16,11 +16,11 @@
 #include <unistd.h>
 #include <limits.h>
 
 #import "OFDataArray.h"
 #import "OFExceptions.h"
-#import "OFMacros.h"
+#import "macros.h"
 
 #ifdef _WIN32
 #include <windows.h>
 #endif
 

Index: src/OFDictionary.m
==================================================================
--- src/OFDictionary.m
+++ src/OFDictionary.m
@@ -16,11 +16,11 @@
 #import "OFDictionary.h"
 #import "OFEnumerator.h"
 #import "OFArray.h"
 #import "OFAutoreleasePool.h"
 #import "OFExceptions.h"
-#import "OFMacros.h"
+#import "macros.h"
 
 #define BUCKET_SIZE sizeof(struct of_dictionary_bucket)
 
 @implementation OFDictionary
 + dictionary;

Index: src/OFHashes.m
==================================================================
--- src/OFHashes.m
+++ src/OFHashes.m
@@ -14,11 +14,11 @@
 #include <string.h>
 
 #import "OFHashes.h"
 #import "OFAutoreleasePool.h"
 #import "OFExceptions.h"
-#import "OFMacros.h"
+#import "macros.h"
 
 int _OFHashing_reference;
 
 /*
  * MD5

Index: src/OFList.m
==================================================================
--- src/OFList.m
+++ src/OFList.m
@@ -13,11 +13,11 @@
 
 #include "assert.h"
 
 #import "OFList.h"
 #import "OFExceptions.h"
-#import "OFMacros.h"
+#import "macros.h"
 
 @implementation OFList
 + list
 {
 	return [[[self alloc] init] autorelease];

DELETED src/OFMacros.h
Index: src/OFMacros.h
==================================================================
--- src/OFMacros.h
+++ src/OFMacros.h
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 2008 - 2009
- *   Jonathan Schleifer <js@webkeks.org>
- *
- * All rights reserved.
- *
- * This file is part of ObjFW. It may be distributed under the terms of the
- * Q Public License 1.0, which can be found in the file LICENSE included in
- * the packaging of this file.
- */
-
-#import "objfw-defs.h"
-
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __GNUC__
-# define OF_INLINE inline __attribute__((always_inline))
-# define OF_LIKELY(cond) __builtin_expect(!!(cond), 1)
-# define OF_UNLIKELY(cond) __builtin_expect(!!(cond), 0)
-#else
-# define OF_INLINE inline
-# define OF_LIKELY(cond) cond
-# define OF_UNLIKELY(cond) cond
-#endif
-
-/* Required to build universal binaries on OS X */
-#if __BIG_ENDIAN__ || __LITTLE_ENDIAN__
-# if __BIG_ENDIAN__ && __LITTLE_ENDIAN__
-#  error __BIG_ENDIAN__ and __LITTLE_ENDIAN__ defined!
-# endif
-# undef OF_BIG_ENDIAN
-# if __BIG_ENDIAN__
-#  define OF_BIG_ENDIAN
-# endif
-#endif
-
-#ifdef __GNUC__
-# if defined(__amd64__) || defined(__x86_64__)
-#  define OF_AMD64_ASM
-# elif defined(__i386__)
-#  define OF_X86_ASM
-# elif defined(__ppc__) || defined(__PPC__)
-#  define OF_PPC_ASM
-# elif defined(__arm__) || defined(__ARM__)
-#  define OF_ARM_ASM
-# endif
-#endif
-
-#define OF_BSWAP16_CONST(i)					\
-	(((uint16_t)i & UINT16_C(0xFF00)) >> 8 |		\
-	 ((uint16_t)i & UINT16_C(0x00FF)) << 8)
-#define OF_BSWAP32_CONST(i)					\
-	(((uint32_t)i & UINT32_C(0xFF000000)) >> 24 |		\
-	 ((uint32_t)i & UINT32_C(0x00FF0000)) >>  8 |		\
-	 ((uint32_t)i & UINT32_C(0x0000FF00)) <<  8 |		\
-	 ((uint32_t)i & UINT32_C(0x000000FF)) << 24)
-#define OF_BSWAP64_CONST(i)					\
-	(((uint64_t)i & UINT64_C(0xFF00000000000000)) >> 56 |	\
-	 ((uint64_t)i & UINT64_C(0x00FF000000000000)) >> 40 |	\
-	 ((uint64_t)i & UINT64_C(0x0000FF0000000000)) >> 24 |	\
-	 ((uint64_t)i & UINT64_C(0x000000FF00000000)) >>  8 |	\
-	 ((uint64_t)i & UINT64_C(0x00000000FF000000)) <<  8 |	\
-	 ((uint64_t)i & UINT64_C(0x0000000000FF0000)) << 24 |	\
-	 ((uint64_t)i & UINT64_C(0x000000000000FF00)) << 40 |	\
-	 ((uint64_t)i & UINT64_C(0x00000000000000FF)) << 56)
-
-static OF_INLINE uint16_t
-OF_BSWAP16_NONCONST(uint16_t i)
-{
-#if defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
-	asm("xchgb	%h0, %b0" : "=Q"(i) : "0"(i));
-#elif defined(OF_PPC_ASM)
-	asm("lhbrx	%0, 0, %1" : "=r"(i) : "r"(&i), "m"(i));
-#elif defined(OF_ARM_ASM)
-	asm("rev16	%0, %0" : "=r"(i) : "0"(i));
-#else
-	i = (i & UINT16_C(0xFF00)) >> 8 |
-	    (i & UINT16_C(0x00FF)) << 8;
-#endif
-	return i;
-}
-
-static OF_INLINE uint32_t
-OF_BSWAP32_NONCONST(uint32_t i)
-{
-#if defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
-	asm("bswap	%0" : "=q"(i) : "0"(i));
-#elif defined(OF_PPC_ASM)
-	asm("lwbrx	%0, 0, %1" : "=r"(i) : "r"(&i), "m"(i));
-#elif defined(OF_ARM_ASM)
-	asm("rev	%0, %0" : "=r"(i) : "0"(i));
-#else
-	i = (i & UINT32_C(0xFF000000)) >> 24 |
-	    (i & UINT32_C(0x00FF0000)) >>  8 |
-	    (i & UINT32_C(0x0000FF00)) <<  8 |
-	    (i & UINT32_C(0x000000FF)) << 24;
-#endif
-	return i;
-}
-
-static OF_INLINE uint64_t
-OF_BSWAP64_NONCONST(uint64_t i)
-{
-#if defined(OF_AMD64_ASM)
-	asm("bswap	%0" : "=r"(i) : "0"(i));
-#elif defined(OF_X86_ASM)
-	asm("bswap	%%eax\n\t"
-	    "bswap	%%edx\n\t"
-	    "xchgl	%%eax, %%edx" : "=A"(i): "0"(i));
-#else
-	i = (uint64_t)OF_BSWAP32_NONCONST(i & 0xFFFFFFFF) << 32 |
-	    OF_BSWAP32_NONCONST(i >> 32);
-#endif
-	return i;
-}
-
-#ifdef __GNUC__
-# define OF_BSWAP16(i) \
-	(__builtin_constant_p(i) ? OF_BSWAP16_CONST(i) : OF_BSWAP16_NONCONST(i))
-# define OF_BSWAP32(i) \
-	(__builtin_constant_p(i) ? OF_BSWAP32_CONST(i) : OF_BSWAP32_NONCONST(i))
-# define OF_BSWAP64(i) \
-	(__builtin_constant_p(i) ? OF_BSWAP64_CONST(i) : OF_BSWAP64_NONCONST(i))
-#else
-# define OF_BSWAP16(i) OF_BSWAP16_CONST(i)
-# define OF_BSWAP32(i) OF_BSWAP32_CONST(i)
-# define OF_BSWAP64(i) OF_BSWAP64_CONST(i)
-#endif
-
-static OF_INLINE void
-OF_BSWAP32_V(uint32_t *buf, size_t len)
-{
-	while (len--) {
-		*buf = OF_BSWAP32(*buf);
-		buf++;
-	}
-}
-
-#ifdef OF_BIG_ENDIAN
-# define OF_BSWAP16_IF_BE(i) OF_BSWAP16(i)
-# define OF_BSWAP32_IF_BE(i) OF_BSWAP32(i)
-# define OF_BSWAP64_IF_BE(i) OF_BSWAP64(i)
-# define OF_BSWAP16_IF_LE(i) i
-# define OF_BSWAP32_IF_LE(i) i
-# define OF_BSWAP64_IF_LE(i) i
-# define OF_BSWAP32_V_IF_BE(buf, len) OF_BSWAP32_V(buf, len)
-#else
-# define OF_BSWAP16_IF_BE(i) i
-# define OF_BSWAP32_IF_BE(i) i
-# define OF_BSWAP64_IF_BE(i) i
-# define OF_BSWAP16_IF_LE(i) OF_BSWAP16(i)
-# define OF_BSWAP32_IF_LE(i) OF_BSWAP32(i)
-# define OF_BSWAP64_IF_LE(i) OF_BSWAP64(i)
-# define OF_BSWAP32_V_IF_BE(buf, len)
-#endif
-
-#define OF_ROL(val, bits) \
-	(((val) << (bits)) | ((val) >> (32 - (bits))))
-
-#define OF_HASH_INIT(hash) hash = 0
-#define OF_HASH_ADD(hash, byte)		\
-	{				\
-		hash += byte;		\
-		hash += (hash << 10);	\
-		hash ^= (hash >> 6);	\
-	}
-#define OF_HASH_FINALIZE(hash)		\
-	{				\
-		hash += (hash << 3);	\
-		hash ^= (hash >> 11);	\
-		hash += (hash << 15);	\
-	}

Index: src/OFMutableDictionary.m
==================================================================
--- src/OFMutableDictionary.m
+++ src/OFMutableDictionary.m
@@ -13,11 +13,11 @@
 
 #include <string.h>
 
 #import "OFMutableDictionary.h"
 #import "OFExceptions.h"
-#import "OFMacros.h"
+#import "macros.h"
 
 #define BUCKET_SIZE sizeof(struct of_dictionary_bucket)
 
 static OF_INLINE void
 resize(id self, Class isa, size_t count, struct of_dictionary_bucket **data,

Index: src/OFMutableString.m
==================================================================
--- src/OFMutableString.m
+++ src/OFMutableString.m
@@ -24,11 +24,11 @@
 #define madvise(addr, len, advise)
 #endif
 
 #import "OFString.h"
 #import "OFExceptions.h"
-#import "OFMacros.h"
+#import "macros.h"
 
 #import "asprintf.h"
 #import "unicode.h"
 
 static void

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -18,11 +18,11 @@
 #include <assert.h>
 
 #import "OFObject.h"
 #import "OFAutoreleasePool.h"
 #import "OFExceptions.h"
-#import "OFMacros.h"
+#import "macros.h"
 
 #import <objc/objc-api.h>
 #ifdef OF_APPLE_RUNTIME
 # import <objc/runtime.h>
 #endif

Index: src/OFStream.m
==================================================================
--- src/OFStream.m
+++ src/OFStream.m
@@ -16,11 +16,11 @@
 #include <assert.h>
 
 #import "OFStream.h"
 #import "OFString.h"
 #import "OFExceptions.h"
-#import "OFMacros.h"
+#import "macros.h"
 
 #ifdef _WIN32
 #include <windows.h>
 #endif
 

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -24,11 +24,11 @@
 
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFAutoreleasePool.h"
 #import "OFExceptions.h"
-#import "OFMacros.h"
+#import "macros.h"
 
 #import "asprintf.h"
 #import "unicode.h"
 
 extern const uint16_t of_iso_8859_15[256];

Index: src/OFTCPSocket.m
==================================================================
--- src/OFTCPSocket.m
+++ src/OFTCPSocket.m
@@ -21,11 +21,11 @@
 #endif
 
 #import "OFTCPSocket.h"
 #import "OFString.h"
 #import "OFExceptions.h"
-#import "OFMacros.h"
+#import "macros.h"
 
 #ifndef INVALID_SOCKET
 # define INVALID_SOCKET -1
 #endif
 

Index: src/OFXMLParser.m
==================================================================
--- src/OFXMLParser.m
+++ src/OFXMLParser.m
@@ -16,11 +16,11 @@
 #import "OFXMLParser.h"
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFAutoreleasePool.h"
 #import "OFExceptions.h"
-#import "OFMacros.h"
+#import "macros.h"
 
 int _OFXMLParser_reference;
 
 static OF_INLINE OFString*
 transform_string(OFMutableString *cache,

Index: src/ObjFW.h
==================================================================
--- src/ObjFW.h
+++ src/ObjFW.h
@@ -7,10 +7,12 @@
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE included in
  * the packaging of this file.
  */
 
+#import "objfw-defs.h"
+
 #import "OFObject.h"
 #import "OFExceptions.h"
 
 #import "OFAutoreleasePool.h"
 #import "OFString.h"
@@ -41,7 +43,9 @@
 
 #ifdef OF_THREADS
 #import "OFThread.h"
 #endif
 
-#import "OFMacros.h"
 #import "asprintf.h"
+#import "atomic.h"
+#import "macros.h"
+#import "threading.h"

Index: src/atomic.h
==================================================================
--- src/atomic.h
+++ src/atomic.h
@@ -7,11 +7,11 @@
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE included in
  * the packaging of this file.
  */
 
-#import "OFMacros.h"
+#import "macros.h"
 
 #if defined(OF_THREADS) && !defined(OF_HAVE_GCC_ATOMIC_OPS) && \
     !defined(OF_HAVE_LIBKERN_OSATOMIC_H)
 # error No atomic operations available!
 #endif

ADDED   src/macros.h
Index: src/macros.h
==================================================================
--- src/macros.h
+++ src/macros.h
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2008 - 2009
+ *   Jonathan Schleifer <js@webkeks.org>
+ *
+ * All rights reserved.
+ *
+ * This file is part of ObjFW. It may be distributed under the terms of the
+ * Q Public License 1.0, which can be found in the file LICENSE included in
+ * the packaging of this file.
+ */
+
+#import "objfw-defs.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
+#ifdef __GNUC__
+# define OF_INLINE inline __attribute__((always_inline))
+# define OF_LIKELY(cond) __builtin_expect(!!(cond), 1)
+# define OF_UNLIKELY(cond) __builtin_expect(!!(cond), 0)
+#else
+# define OF_INLINE inline
+# define OF_LIKELY(cond) cond
+# define OF_UNLIKELY(cond) cond
+#endif
+
+/* Required to build universal binaries on OS X */
+#if __BIG_ENDIAN__ || __LITTLE_ENDIAN__
+# if __BIG_ENDIAN__ && __LITTLE_ENDIAN__
+#  error __BIG_ENDIAN__ and __LITTLE_ENDIAN__ defined!
+# endif
+# undef OF_BIG_ENDIAN
+# if __BIG_ENDIAN__
+#  define OF_BIG_ENDIAN
+# endif
+#endif
+
+#ifdef __GNUC__
+# if defined(__amd64__) || defined(__x86_64__)
+#  define OF_AMD64_ASM
+# elif defined(__i386__)
+#  define OF_X86_ASM
+# elif defined(__ppc__) || defined(__PPC__)
+#  define OF_PPC_ASM
+# elif defined(__arm__) || defined(__ARM__)
+#  define OF_ARM_ASM
+# endif
+#endif
+
+#define OF_BSWAP16_CONST(i)					\
+	(((uint16_t)i & UINT16_C(0xFF00)) >> 8 |		\
+	 ((uint16_t)i & UINT16_C(0x00FF)) << 8)
+#define OF_BSWAP32_CONST(i)					\
+	(((uint32_t)i & UINT32_C(0xFF000000)) >> 24 |		\
+	 ((uint32_t)i & UINT32_C(0x00FF0000)) >>  8 |		\
+	 ((uint32_t)i & UINT32_C(0x0000FF00)) <<  8 |		\
+	 ((uint32_t)i & UINT32_C(0x000000FF)) << 24)
+#define OF_BSWAP64_CONST(i)					\
+	(((uint64_t)i & UINT64_C(0xFF00000000000000)) >> 56 |	\
+	 ((uint64_t)i & UINT64_C(0x00FF000000000000)) >> 40 |	\
+	 ((uint64_t)i & UINT64_C(0x0000FF0000000000)) >> 24 |	\
+	 ((uint64_t)i & UINT64_C(0x000000FF00000000)) >>  8 |	\
+	 ((uint64_t)i & UINT64_C(0x00000000FF000000)) <<  8 |	\
+	 ((uint64_t)i & UINT64_C(0x0000000000FF0000)) << 24 |	\
+	 ((uint64_t)i & UINT64_C(0x000000000000FF00)) << 40 |	\
+	 ((uint64_t)i & UINT64_C(0x00000000000000FF)) << 56)
+
+static OF_INLINE uint16_t
+OF_BSWAP16_NONCONST(uint16_t i)
+{
+#if defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
+	asm("xchgb	%h0, %b0" : "=Q"(i) : "0"(i));
+#elif defined(OF_PPC_ASM)
+	asm("lhbrx	%0, 0, %1" : "=r"(i) : "r"(&i), "m"(i));
+#elif defined(OF_ARM_ASM)
+	asm("rev16	%0, %0" : "=r"(i) : "0"(i));
+#else
+	i = (i & UINT16_C(0xFF00)) >> 8 |
+	    (i & UINT16_C(0x00FF)) << 8;
+#endif
+	return i;
+}
+
+static OF_INLINE uint32_t
+OF_BSWAP32_NONCONST(uint32_t i)
+{
+#if defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
+	asm("bswap	%0" : "=q"(i) : "0"(i));
+#elif defined(OF_PPC_ASM)
+	asm("lwbrx	%0, 0, %1" : "=r"(i) : "r"(&i), "m"(i));
+#elif defined(OF_ARM_ASM)
+	asm("rev	%0, %0" : "=r"(i) : "0"(i));
+#else
+	i = (i & UINT32_C(0xFF000000)) >> 24 |
+	    (i & UINT32_C(0x00FF0000)) >>  8 |
+	    (i & UINT32_C(0x0000FF00)) <<  8 |
+	    (i & UINT32_C(0x000000FF)) << 24;
+#endif
+	return i;
+}
+
+static OF_INLINE uint64_t
+OF_BSWAP64_NONCONST(uint64_t i)
+{
+#if defined(OF_AMD64_ASM)
+	asm("bswap	%0" : "=r"(i) : "0"(i));
+#elif defined(OF_X86_ASM)
+	asm("bswap	%%eax\n\t"
+	    "bswap	%%edx\n\t"
+	    "xchgl	%%eax, %%edx" : "=A"(i): "0"(i));
+#else
+	i = (uint64_t)OF_BSWAP32_NONCONST(i & 0xFFFFFFFF) << 32 |
+	    OF_BSWAP32_NONCONST(i >> 32);
+#endif
+	return i;
+}
+
+#ifdef __GNUC__
+# define OF_BSWAP16(i) \
+	(__builtin_constant_p(i) ? OF_BSWAP16_CONST(i) : OF_BSWAP16_NONCONST(i))
+# define OF_BSWAP32(i) \
+	(__builtin_constant_p(i) ? OF_BSWAP32_CONST(i) : OF_BSWAP32_NONCONST(i))
+# define OF_BSWAP64(i) \
+	(__builtin_constant_p(i) ? OF_BSWAP64_CONST(i) : OF_BSWAP64_NONCONST(i))
+#else
+# define OF_BSWAP16(i) OF_BSWAP16_CONST(i)
+# define OF_BSWAP32(i) OF_BSWAP32_CONST(i)
+# define OF_BSWAP64(i) OF_BSWAP64_CONST(i)
+#endif
+
+static OF_INLINE void
+OF_BSWAP32_V(uint32_t *buf, size_t len)
+{
+	while (len--) {
+		*buf = OF_BSWAP32(*buf);
+		buf++;
+	}
+}
+
+#ifdef OF_BIG_ENDIAN
+# define OF_BSWAP16_IF_BE(i) OF_BSWAP16(i)
+# define OF_BSWAP32_IF_BE(i) OF_BSWAP32(i)
+# define OF_BSWAP64_IF_BE(i) OF_BSWAP64(i)
+# define OF_BSWAP16_IF_LE(i) i
+# define OF_BSWAP32_IF_LE(i) i
+# define OF_BSWAP64_IF_LE(i) i
+# define OF_BSWAP32_V_IF_BE(buf, len) OF_BSWAP32_V(buf, len)
+#else
+# define OF_BSWAP16_IF_BE(i) i
+# define OF_BSWAP32_IF_BE(i) i
+# define OF_BSWAP64_IF_BE(i) i
+# define OF_BSWAP16_IF_LE(i) OF_BSWAP16(i)
+# define OF_BSWAP32_IF_LE(i) OF_BSWAP32(i)
+# define OF_BSWAP64_IF_LE(i) OF_BSWAP64(i)
+# define OF_BSWAP32_V_IF_BE(buf, len)
+#endif
+
+#define OF_ROL(val, bits) \
+	(((val) << (bits)) | ((val) >> (32 - (bits))))
+
+#define OF_HASH_INIT(hash) hash = 0
+#define OF_HASH_ADD(hash, byte)		\
+	{				\
+		hash += byte;		\
+		hash += (hash << 10);	\
+		hash ^= (hash >> 6);	\
+	}
+#define OF_HASH_FINALIZE(hash)		\
+	{				\
+		hash += (hash << 3);	\
+		hash ^= (hash >> 11);	\
+		hash += (hash << 15);	\
+	}

Index: src/threading.h
==================================================================
--- src/threading.h
+++ src/threading.h
@@ -7,11 +7,11 @@
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE included in
  * the packaging of this file.
  */
 
-#import "OFMacros.h"
+#import "atomic.h"
 
 #if !defined(OF_THREADS) || (!defined(OF_HAVE_PTHREADS) && !defined(_WIN32))
 # error No threads available!
 #endif
 

Index: tests/OFTCPSocket.m
==================================================================
--- tests/OFTCPSocket.m
+++ tests/OFTCPSocket.m
@@ -17,11 +17,11 @@
 
 #import "OFTCPSocket.h"
 #import "OFAutoreleasePool.h"
 #import "OFString.h"
 #import "OFExceptions.h"
-#import "OFMacros.h"
+#import "macros.h"
 
 #import "main.h"
 
 static OFString *module = @"OFTCPSocket";