diff --git a/src/graphics/ctexturefontloader.cpp b/src/graphics/ctexturefontloader.cpp
index 970345c29..5666211a1 100644
--- a/src/graphics/ctexturefontloader.cpp
+++ b/src/graphics/ctexturefontloader.cpp
@@ -67,7 +67,7 @@ cTextureFontLoader::~cTextureFontLoader() {
 void cTextureFontLoader::Start() {
 	cObjectLoader::Start();
 
-	mTexLoader->Threaded( true );
+	mTexLoader->Threaded( mThreaded );
 	mTexLoader->Load();
 
 	if ( !mThreaded )
diff --git a/src/helper/haikuttf/hkbase.hpp b/src/helper/haikuttf/hkbase.hpp
index 74bc86ca7..6197ddf14 100644
--- a/src/helper/haikuttf/hkbase.hpp
+++ b/src/helper/haikuttf/hkbase.hpp
@@ -17,17 +17,26 @@ typedef SOPHIST_uint32		u32;
 #define HK_PLATFORM_WIN 	(1)
 #define HK_PLATFORM_LINUX 	(2)
 #define HK_PLATFORM_MACOSX 	(3)
+#define HK_PLATFORM_BSD		(4)
+#define HK_PLATFORM_SOLARIS	(5)
+#define HK_PLATFORM_HAIKU	(6)
 
 #if defined( __WIN32__ ) || defined( _WIN32 ) || defined( _WIN64 )
-#   define HK_PLATFORM HK_PLATFORM_WIN
-#elif defined( __APPLE_CC__) || defined ( __APPLE__ )
-#   define HK_PLATFORM HK_PLATFORM_MACOSX
-#elif defined( LINUX ) || defined( __linux__ )
-#   define HK_PLATFORM HK_PLATFORM_LINUX
+	#define HK_PLATFORM HK_PLATFORM_WIN
+#elif defined( __APPLE_CC__ ) || defined ( __APPLE__ )
+	#define HK_PLATFORM HK_PLATFORM_MACOSX
+#elif defined ( linux ) || defined( __linux__ )
+	#define HK_PLATFORM HK_PLATFORM_LINUX
+#elif defined( __FreeBSD__ ) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined( __DragonFly__ )
+	#define HK_PLATFORM HK_PLATFORM_BSD
+#elif defined( __SVR4 )
+	#define HK_PLATFORM HK_PLATFORM_SOLARIS
+#elif defined( __HAIKU__ ) || defined( __BEOS__ )
+	#define HK_PLATFORM HK_PLATFORM_HAIKU
 #endif
 
-#if HK_PLATFORM == HK_PLATFORM_LINUX || HK_PLATFORM == HK_PLATFORM_MACOSX
-#define HK_PLATFORM_UNIX
+#if defined ( linux ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined( __DragonFly__ ) || defined( __SVR4 ) || defined( __APPLE_CC__ ) || defined ( __APPLE__ ) || defined( __HAIKU__ ) || defined( __BEOS__ )
+	#define HK_PLATFORM_POSIX
 #endif
 
 #if HK_PLATFORM == HK_PLATFORM_WIN
@@ -35,7 +44,7 @@ typedef SOPHIST_uint32		u32;
 	#define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
-#elif defined( HK_PLATFORM_UNIX )
+#elif defined( HK_PLATFORM_POSIX )
 #include <pthread.h>
 #endif
 
diff --git a/src/helper/haikuttf/hkmutex.cpp b/src/helper/haikuttf/hkmutex.cpp
index b7ac77203..88706c4e2 100644
--- a/src/helper/haikuttf/hkmutex.cpp
+++ b/src/helper/haikuttf/hkmutex.cpp
@@ -5,7 +5,7 @@ namespace HaikuTTF {
 hkMutex::hkMutex() {
 	#if HK_PLATFORM == HK_PLATFORM_WIN
 	InitializeCriticalSection(&mMutex);
-	#elif defined( HK_PLATFORM_UNIX )
+	#elif defined( HK_PLATFORM_POSIX )
 	pthread_mutex_init(&mMutex, NULL);
 	#endif
 }
@@ -13,7 +13,7 @@ hkMutex::hkMutex() {
 hkMutex::~hkMutex() {
 	#if HK_PLATFORM == HK_PLATFORM_WIN
 	DeleteCriticalSection(&mMutex);
-	#elif defined( HK_PLATFORM_UNIX )
+	#elif defined( HK_PLATFORM_POSIX )
 	pthread_mutex_destroy(&mMutex);
 	#endif
 }
@@ -21,7 +21,7 @@ hkMutex::~hkMutex() {
 void hkMutex::Lock() {
 	#if HK_PLATFORM == HK_PLATFORM_WIN
 	EnterCriticalSection(&mMutex);
-	#elif defined( HK_PLATFORM_UNIX )
+	#elif defined( HK_PLATFORM_POSIX )
 	pthread_mutex_lock(&mMutex);
 	#endif
 }
@@ -29,7 +29,7 @@ void hkMutex::Lock() {
 void hkMutex::Unlock() {
 	#if HK_PLATFORM == HK_PLATFORM_WIN
 	LeaveCriticalSection(&mMutex);
-	#elif defined( HK_PLATFORM_UNIX )
+	#elif defined( HK_PLATFORM_POSIX )
 	pthread_mutex_unlock(&mMutex);
 	#endif
 }
diff --git a/src/helper/haikuttf/hkmutex.hpp b/src/helper/haikuttf/hkmutex.hpp
index a6e89adae..97e440eaa 100644
--- a/src/helper/haikuttf/hkmutex.hpp
+++ b/src/helper/haikuttf/hkmutex.hpp
@@ -17,7 +17,7 @@ class hkMutex {
 	protected:
 		#if HK_PLATFORM == HK_PLATFORM_WIN
 		CRITICAL_SECTION mMutex;
-		#elif defined( HK_PLATFORM_UNIX )
+		#elif defined( HK_PLATFORM_POSIX )
 		pthread_mutex_t mMutex;
 		#endif
 };