@@ -23,16 +23,17 @@
 
 #ifdef OF_HAIKU
 # include <kernel/OS.h>
 #endif
 
-#import "thread.h"
+#import "OFPlainThread.h"
+
 #import "macros.h"
 
 static int minPrio = 0, maxPrio = 0, normalPrio = 0;
 
-struct thread_ctx {
+struct ThreadContext {
 	void (*function)(id object);
 	id object;
 	const char *name;
 };
 
@@ -70,11 +71,11 @@
 }
 
 static void *
 functionWrapper(void *data)
 {
-	struct thread_ctx *ctx = data;
+	struct ThreadContext *ctx = data;
 
 	if (ctx->name != NULL)
 		OFSetThreadName(ctx->name);
 
 	pthread_cleanup_push(free, data);
@@ -122,11 +123,11 @@
 		else
 			return error;
 	}
 
 	@try {
-		struct thread_ctx *ctx;
+		struct ThreadContext *ctx;
 
 		if (attr != NULL && POSIXAttrAvailable) {
 #ifndef OF_HPUX
 			struct sched_param param;
 #endif