@@ -15,22 +15,23 @@
 
 #include "config.h"
 
 #include <errno.h>
 
-#import "thread.h"
+#import "OFPlainThread.h"
+
 #import "macros.h"
 
 #include <windows.h>
 
-struct thread_context {
+struct ThreadContext {
 	void (*function)(id);
 	id object;
 };
 
 static WINAPI void
-functionWrapper(struct thread_context *context)
+functionWrapper(struct ThreadContext *context)
 {
 	context->function(context->object);
 
 	free(context);
 }
@@ -47,11 +48,11 @@
 int
 OFPlainThreadNew(OFPlainThread *thread, const char *name, void (*function)(id),
     id object, const OFPlainThreadAttributes *attr)
 {
 	DWORD priority = THREAD_PRIORITY_NORMAL;
-	struct thread_context *context;
+	struct ThreadContext *context;
 	DWORD threadID;
 
 	if (attr != NULL && attr->priority != 0) {
 		if (attr->priority < -1 || attr->priority > 1)
 			return EINVAL;