Index: src/OFPlainThread.h
==================================================================
--- src/OFPlainThread.h
+++ src/OFPlainThread.h
@@ -20,11 +20,11 @@
 #if !defined(OF_HAVE_THREADS) || \
     (!defined(OF_HAVE_PTHREADS) && !defined(OF_WINDOWS) && !defined(OF_AMIGAOS))
 # error No threads available!
 #endif
 
-#import "macros.h"
+#import "OFObject.h"
 
 #if defined(OF_HAVE_PTHREADS)
 # include <pthread.h>
 typedef pthread_t OFPlainThread;
 #elif defined(OF_WINDOWS)

Index: src/platform/Windows/OFPlainCondition.m
==================================================================
--- src/platform/Windows/OFPlainCondition.m
+++ src/platform/Windows/OFPlainCondition.m
@@ -16,10 +16,11 @@
 #include "config.h"
 
 #include <errno.h>
 
 #import "OFPlainCondition.h"
+#import "OFConstantString.h"
 
 #include <windows.h>
 
 int
 OFPlainConditionNew(OFPlainCondition *condition)

Index: src/platform/Windows/OFPlainThread.m
==================================================================
--- src/platform/Windows/OFPlainThread.m
+++ src/platform/Windows/OFPlainThread.m
@@ -16,12 +16,11 @@
 #include "config.h"
 
 #include <errno.h>
 
 #import "OFPlainThread.h"
-
-#import "macros.h"
+#import "OFConstantString.h"
 
 #include <windows.h>
 
 struct ThreadContext {
 	void (*function)(id);