@@ -16,14 +16,13 @@
 #include "config.h"
 
 #include <assert.h>
 #include <errno.h>
 
+#import "OFPlainThread.h"
 #import "OFData.h"
-
-#import "thread.h"
-#import "tlskey.h"
+#import "OFTLSKey.h"
 
 #include <dos/dostags.h>
 #include <proto/dos.h>
 #include <proto/exec.h>