Index: src/OFFileManager.m
==================================================================
--- src/OFFileManager.m
+++ src/OFFileManager.m
@@ -17,12 +17,13 @@
 
 #include "config.h"
 
 #include <errno.h>
 #include <limits.h>
-
 #include "unistd_wrapper.h"
+
+#import "platform.h"
 
 #ifdef OF_PSP
 # include <sys/syslimits.h>
 #endif
 

Index: src/unistd_wrapper.h
==================================================================
--- src/unistd_wrapper.h
+++ src/unistd_wrapper.h
@@ -16,14 +16,14 @@
 
 #include "config.h"
 
 #include <stdlib.h>	/* Make sure we have any libc include */
 
-#if defined(HAVE_UNISTD_H)
+#ifdef HAVE_UNISTD_H
 # ifdef __GLIBC__
 #  undef __USE_XOPEN	/* Needed to avoid old glibc using __block */
 # endif
 # include <unistd.h>
 # ifdef __GLIBC__
 #  define __USE_XOPEN 1
 # endif
 #endif