Index: src/OFMutableString.m
==================================================================
--- src/OFMutableString.m
+++ src/OFMutableString.m
@@ -43,14 +43,15 @@
 
 	if (!is_utf8) {
 		assert(table_size >= 1);
 
 		uint8_t *p = (uint8_t*)*string + *length;
+		uint8_t t;
 
 		while (--p >= (uint8_t*)*string)
-			if (table[0][*p])
-				*p = table[0][*p];
+			if ((t = table[0][*p]) != 0)
+				*p = t;
 
 		return;
 	}
 
 	ulen = [self length];

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -29,13 +29,13 @@
 #ifdef OF_GNU_RUNTIME
 # import <objc/sarray.h>
 #endif
 
 #ifdef OF_ATOMIC_OPS
-#import "atomic.h"
+# import "atomic.h"
 #else
-#import "threading.h"
+# import "threading.h"
 #endif
 
 struct pre_ivar {
 	void	      **memchunks;
 	size_t	      memchunks_size;

Index: src/threading.h
==================================================================
--- src/threading.h
+++ src/threading.h
@@ -14,23 +14,23 @@
 #if !defined(OF_THREADS) || (!defined(OF_HAVE_PTHREADS) && !defined(_WIN32))
 # error No threads available!
 #endif
 
 #if defined(OF_HAVE_PTHREADS)
-#include <pthread.h>
+# include <pthread.h>
 typedef pthread_t of_thread_t;
 typedef pthread_mutex_t of_mutex_t;
 typedef pthread_key_t of_tlskey_t;
 #elif defined(_WIN32)
-#include <windows.h>
+# include <windows.h>
 typedef HANDLE of_thread_t;
 typedef CRITICAL_SECTION of_mutex_t;
 typedef DWORD of_tlskey_t;
 #endif
 
 #if defined(OF_ATOMIC_OPS)
-#import "atomic.h"
+# import "atomic.h"
 typedef int32_t of_spinlock_t;
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
 typedef pthread_spinlock_t of_spinlock_t;
 #else
 typedef pthread_mutex_t of_spinlock_t;