@@ -25,11 +25,11 @@
 # import <objc/runtime.h>
 #endif
 
 #import "macros.h"
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-# import "tlskey.h"
+# import "OFTLSKey.h"
 #endif
 
 #ifndef OF_OBJFW_RUNTIME
 @interface DummyObject
 - (void)release;
@@ -39,41 +39,41 @@
 #if defined(OF_HAVE_COMPILER_TLS)
 static thread_local id *objects = NULL;
 static thread_local uintptr_t count = 0;
 static thread_local uintptr_t size = 0;
 #elif defined(OF_HAVE_THREADS)
-static of_tlskey_t objectsKey, countKey, sizeKey;
+static OFTLSKey objectsKey, countKey, sizeKey;
 #else
 static id *objects = NULL;
 static uintptr_t count = 0;
 static uintptr_t size = 0;
 #endif
 
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 OF_CONSTRUCTOR()
 {
-	OF_ENSURE(of_tlskey_new(&objectsKey) == 0);
-	OF_ENSURE(of_tlskey_new(&countKey) == 0);
-	OF_ENSURE(of_tlskey_new(&sizeKey) == 0);
+	if (OFTLSKeyNew(&objectsKey) != 0 || OFTLSKeyNew(&countKey) != 0 ||
+	    OFTLSKeyNew(&sizeKey) != 0)
+		OBJC_ERROR("Failed to create TLS keys!");
 }
 #endif
 
 void *
 objc_autoreleasePoolPush()
 {
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-	uintptr_t count = (uintptr_t)of_tlskey_get(countKey);
+	uintptr_t count = (uintptr_t)OFTLSKeyGet(countKey);
 #endif
 	return (void *)count;
 }
 
 void
 objc_autoreleasePoolPop(void *pool)
 {
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-	id *objects = of_tlskey_get(objectsKey);
-	uintptr_t count = (uintptr_t)of_tlskey_get(countKey);
+	id *objects = OFTLSKeyGet(objectsKey);
+	uintptr_t count = (uintptr_t)OFTLSKeyGet(countKey);
 #endif
 	uintptr_t idx = (uintptr_t)pool;
 	bool freeMem = false;
 
 	if (idx == (uintptr_t)-1) {
@@ -83,12 +83,12 @@
 
 	for (uintptr_t i = idx; i < count; i++) {
 		[objects[i] release];
 
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-		objects = of_tlskey_get(objectsKey);
-		count = (uintptr_t)of_tlskey_get(countKey);
+		objects = OFTLSKeyGet(objectsKey);
+		count = (uintptr_t)OFTLSKeyGet(countKey);
 #endif
 	}
 
 	count = idx;
 
@@ -96,47 +96,51 @@
 		free(objects);
 		objects = NULL;
 #if defined(OF_HAVE_COMPILER_TLS) || !defined(OF_HAVE_THREADS)
 		size = 0;
 #else
-		OF_ENSURE(of_tlskey_set(objectsKey, objects) == 0);
-		OF_ENSURE(of_tlskey_set(sizeKey, (void *)0) == 0);
+		if (OFTLSKeySet(objectsKey, objects) != 0 ||
+		    OFTLSKeySet(sizeKey, (void *)0) != 0)
+			OBJC_ERROR("Failed to set TLS key!");
 #endif
 	}
 
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-	OF_ENSURE(of_tlskey_set(countKey, (void *)count) == 0);
+	if (OFTLSKeySet(countKey, (void *)count) != 0)
+		OBJC_ERROR("Failed to set TLS key!");
 #endif
 }
 
 id
 _objc_rootAutorelease(id object)
 {
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-	id *objects = of_tlskey_get(objectsKey);
-	uintptr_t count = (uintptr_t)of_tlskey_get(countKey);
-	uintptr_t size = (uintptr_t)of_tlskey_get(sizeKey);
+	id *objects = OFTLSKeyGet(objectsKey);
+	uintptr_t count = (uintptr_t)OFTLSKeyGet(countKey);
+	uintptr_t size = (uintptr_t)OFTLSKeyGet(sizeKey);
 #endif
 
 	if (count >= size) {
 		if (size == 0)
 			size = 16;
 		else
 			size *= 2;
 
-		OF_ENSURE((objects =
-		    realloc(objects, size * sizeof(id))) != NULL);
+		if ((objects = realloc(objects, size * sizeof(id))) == NULL)
+			OBJC_ERROR("Failed to resize autorelease pool!");
 
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-		OF_ENSURE(of_tlskey_set(objectsKey, objects) == 0);
-		OF_ENSURE(of_tlskey_set(sizeKey, (void *)size) == 0);
+		if (OFTLSKeySet(objectsKey, objects) != 0 ||
+		    OFTLSKeySet(sizeKey, (void *)size) != 0)
+			OBJC_ERROR("Failed to set TLS key!");
 #endif
 	}
 
 	objects[count++] = object;
 
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-	OF_ENSURE(of_tlskey_set(countKey, (void *)count) == 0);
+	if (OFTLSKeySet(countKey, (void *)count) != 0)
+		OBJC_ERROR("Failed to set TLS key!");
 #endif
 
 	return object;
 }