Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -796,11 +796,11 @@
 ])
 
 AC_MSG_CHECKING(for atomic operations)
 AS_IF([test x"$atomic_ops" != x"none"], [
 	AC_DEFINE(OF_HAVE_ATOMIC_OPS, 1, [Whether we have atomic operations])
-	AC_SUBST(ATOMIC_H, "atomic.h")
+	AC_SUBST(USE_INCLUDES_ATOMIC, '${INCLUDES_ATOMIC}')
 ])
 AC_MSG_RESULT($atomic_ops)
 
 AC_ARG_ENABLE(files,
 	AS_HELP_STRING([--disable-files], [disable file support]))

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -6,11 +6,10 @@
 OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR}
 
 OBJFW_BRIDGE_SHARED_LIB = @OBJFW_BRIDGE_SHARED_LIB@
 OBJFW_BRIDGE_STATIC_LIB = @OBJFW_BRIDGE_STATIC_LIB@
 
-ATOMIC_H = @ATOMIC_H@
 AUTORELEASE_M = @AUTORELEASE_M@
 BIN_PREFIX = @BIN_PREFIX@
 BRIDGE = @BRIDGE@
 EXCEPTIONS_A = @EXCEPTIONS_A@
 EXCEPTIONS_EXCEPTIONS_A = @EXCEPTIONS_EXCEPTIONS_A@
@@ -31,26 +30,27 @@
 MAP_LDFLAGS = @MAP_LDFLAGS@
 OFBLOCKTESTS_M = @OFBLOCKTESTS_M@
 OFHASH = @OFHASH@
 OFHTTP = @OFHTTP@
 OFHTTPCLIENTTESTS_M = @OFHTTPCLIENTTESTS_M@
-OFPROCESS_M = @OFPROCESS_M@
 OFKERNELEVENTOBSERVER_EPOLL_M = @OFKERNELEVENTOBSERVER_EPOLL_M@
 OFKERNELEVENTOBSERVER_KQUEUE_M = @OFKERNELEVENTOBSERVER_KQUEUE_M@
 OFKERNELEVENTOBSERVER_POLL_M = @OFKERNELEVENTOBSERVER_POLL_M@
 OFKERNELEVENTOBSERVER_SELECT_M = @OFKERNELEVENTOBSERVER_SELECT_M@
+OFPROCESS_M = @OFPROCESS_M@
 OFSTDIOSTREAM_WIN32CONSOLE_M = @OFSTDIOSTREAM_WIN32CONSOLE_M@
 OFZIP = @OFZIP@
 REEXPORT_LIBOBJC = @REEXPORT_LIBOBJC@
 RUNTIME = @RUNTIME@
 RUNTIME_A = @RUNTIME_A@
+RUNTIME_LIB_A = @RUNTIME_LIB_A@
 RUNTIME_RUNTIME_A = @RUNTIME_RUNTIME_A@
 RUNTIME_RUNTIME_LIB_A = @RUNTIME_RUNTIME_LIB_A@
-RUNTIME_LIB_A = @RUNTIME_LIB_A@
 RUN_TESTS = @RUN_TESTS@
 TESTPLUGIN = @TESTPLUGIN@
 TESTS_LIBS = @TESTS_LIBS@
 TEST_LAUNCHER = @TEST_LAUNCHER@
+USE_INCLUDES_ATOMIC = @USE_INCLUDES_ATOMIC@
 USE_SRCS_FILES = @USE_SRCS_FILES@
 USE_SRCS_PLUGINS = @USE_SRCS_PLUGINS@
 USE_SRCS_SOCKETS = @USE_SRCS_SOCKETS@
 USE_SRCS_THREADS = @USE_SRCS_THREADS@

Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -113,10 +113,17 @@
 	       OFMutex.m		\
 	       OFRecursiveMutex.m	\
 	       OFThreadPool.m		\
 	       threading.m
 
+INCLUDES_ATOMIC = atomic.h			\
+		  atomic_builtins.h		\
+		  atomic_no_threads.h		\
+		  atomic_osatomic.h		\
+		  atomic_powerpc.h		\
+		  atomic_sync_builtins.h	\
+		  atomic_x86.h
 INCLUDES := ${SRCS:.m=.h}			\
 	    OFCollection.h			\
 	    OFCryptoHash.h			\
 	    OFJSONRepresentation.h		\
 	    OFKeyValueCoding.h			\
@@ -124,16 +131,16 @@
 	    OFMessagePackRepresentation.h	\
 	    OFSerialization.h			\
 	    OFTLSSocket.h			\
 	    ObjFW.h				\
 	    autorelease.h			\
-	    ${ATOMIC_H}				\
 	    block.h				\
 	    instance.h				\
 	    macros.h				\
 	    objfw-defs.h			\
-	    platform.h
+	    platform.h				\
+	    ${USE_INCLUDES_ATOMIC}
 
 SRCS += OFArray_adjacent.m		\
 	OFArray_adjacentSubarray.m	\
 	OFCountedSet_hashtable.m	\
 	OFDictionary_hashtable.m	\