Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -296,10 +296,11 @@
 	esac
 
 	AC_DEFINE(OF_THREADS, 1, [Whether we have threads])
 	AC_SUBST(OFTHREAD_M, "OFThread.m")
 	AC_SUBST(OFTHREADTESTS_M, "OFThreadTests.m")
+	AC_SUBST(OFHTTPREQUESTTESTS_M, "OFHTTPRequestTests.m")
 	AC_SUBST(THREADING_H, "threading.h")
 
 	AC_CHECK_FUNC(objc_sync_enter,, [
 		AC_SUBST(OBJC_SYNC_M, "objc_sync.m")
 		AC_DEFINE(NEED_OBJC_SYNC_INIT, 1,

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -10,10 +10,11 @@
 FOUNDATION_COMPAT_M = @FOUNDATION_COMPAT_M@
 MACH_ALIAS_LIST = @MACH_ALIAS_LIST@
 OFBLOCKTESTS_M = @OFBLOCKTESTS_M@
 OBJC_PROPERTIES_M = @OBJC_PROPERTIES_M@
 OBJC_SYNC_M = @OBJC_SYNC_M@
+OFHTTPREQUESTTESTS_M = @OFHTTPREQUESTTESTS_M@
 OFPLUGIN_M = @OFPLUGIN_M@
 OFPLUGINTESTS_M = @OFPLUGINTESTS_M@
 OFTHREAD_M = @OFTHREAD_M@
 OFTHREADTESTS_M = @OFTHREADTESTS_M@
 PROPERTIESTESTS_M = @PROPERTIESTESTS_M@

Index: src/atomic.h
==================================================================
--- src/atomic.h
+++ src/atomic.h
@@ -80,11 +80,11 @@
 
 static OF_INLINE void*
 of_atomic_add_ptr(void* volatile *p, intptr_t i)
 {
 #if !defined(OF_THREADS)
-	return (*p += i);
+	return (*(char* volatile*)p += i);
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	__asm__ (
 	    "lock\n\t"
 	    "xaddl	%0, %2\n\t"
 	    "addl	%1, %0"
@@ -162,11 +162,11 @@
 
 static OF_INLINE void*
 of_atomic_sub_ptr(void* volatile *p, intptr_t i)
 {
 #if !defined(OF_THREADS)
-	return (*p -= i);
+	return (*(char* volatile*)p -= i);
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	__asm__ (
 	    "negl	%0\n\t"
 	    "lock\n\t"
 	    "xaddl	%0, %2\n\t"

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -7,11 +7,11 @@
        ${OFBLOCKTESTS_M}		\
        OFDataArrayTests.m		\
        OFDateTests.m			\
        OFDictionaryTests.m		\
        OFFileTests.m			\
-       OFHTTPRequestTests.m		\
+       ${OFHTTPREQUESTTESTS_M}		\
        OFListTests.m			\
        OFMD5HashTests.m			\
        OFNumberTests.m			\
        OFObjectTests.m			\
        ${OFPLUGINTESTS_M}		\