@@ -25,14 +25,10 @@
 # include <sched.h>
 #else
 # include <windows.h>
 #endif
 
-#if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME)
-# import <objc/thr.h>
-#endif
-
 #import "OFThread.h"
 #import "OFList.h"
 #import "OFDate.h"
 #import "OFAutoreleasePool.h"
 
@@ -59,14 +55,10 @@
 static id
 call_main(id object)
 {
 	OFThread *thread = (OFThread*)object;
 
-#if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME)
-	objc_thread_add();
-#endif
-
 	if (!of_tlskey_set(threadSelf, thread))
 		@throw [OFInitializationFailedException
 		    exceptionWithClass: [thread class]];
 
 	/*
@@ -89,14 +81,10 @@
 	[OFTLSKey callAllDestructors];
 	[OFAutoreleasePool _releaseAll];
 
 	[thread release];
 
-#if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME)
-	objc_thread_remove();
-#endif
-
 	return 0;
 }
 
 @implementation OFThread
 #if defined(OF_HAVE_PROPERTIES) && defined(OF_HAVE_BLOCKS)
@@ -225,14 +213,10 @@
 	[OFTLSKey callAllDestructors];
 	[OFAutoreleasePool _releaseAll];
 
 	[thread release];
 
-#if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME)
-	objc_thread_remove();
-#endif
-
 	of_thread_exit();
 }
 
 - initWithObject: (id)object_
 {