@@ -28,12 +28,10 @@
 #include <string.h>
 #include <stdarg.h>
 
 #include <unistd.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
 
 #ifdef HAVE_PWD_H
 # include <pwd.h>
@@ -105,10 +103,35 @@
 #define DIR_MODE DEFAULT_MODE | S_IXUSR | S_IXGRP | S_IXOTH
 
 #if defined(OF_HAVE_CHOWN) && defined(OF_HAVE_THREADS)
 static of_mutex_t mutex;
 #endif
+
+int
+of_stat(OFString *path, of_stat_t *buffer)
+{
+#ifdef _WIN32
+	return _wstat([path UTF16String], buffer);
+#else
+	return stat([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
+	    buffer);
+#endif
+}
+
+int
+of_lstat(OFString *path, of_stat_t *buffer)
+{
+#if defined(_WIN32)
+	return _wstat([path UTF16String], buffer);
+#elif defined(HAVE_LSTAT)
+	return lstat([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
+	    buffer);
+#else
+	return stat([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
+	    buffer);
+#endif
+}
 
 static int
 parseMode(const char *mode)
 {
 	if (!strcmp(mode, "r"))
@@ -194,49 +217,33 @@
 	return ret;
 }
 
 + (bool)fileExistsAtPath: (OFString*)path
 {
+	of_stat_t s;
+
 	if (path == nil)
 		@throw [OFInvalidArgumentException exception];
 
-#ifndef _WIN32
-	struct stat s;
-
-	if (stat([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
-	    &s) == -1)
-		return false;
-#else
-	struct _stat s;
-
-	if (_wstat([path UTF16String], &s) == -1)
-		return false;
-#endif
+	if (of_stat(path, &s) == -1)
+		return false;
 
 	if (S_ISREG(s.st_mode))
 		return true;
 
 	return false;
 }
 
 + (bool)directoryExistsAtPath: (OFString*)path
 {
+	of_stat_t s;
+
 	if (path == nil)
 		@throw [OFInvalidArgumentException exception];
 
-#ifndef _WIN32
-	struct stat s;
-
-	if (stat([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
-	    &s) == -1)
-		return false;
-#else
-	struct _stat s;
-
-	if (_wstat([path UTF16String], &s) == -1)
-		return false;
-#endif
+	if (of_stat(path, &s) == -1)
+		return false;
 
 	if (S_ISDIR(s.st_mode))
 		return true;
 
 	return false;
@@ -243,17 +250,16 @@
 }
 
 #ifdef OF_HAVE_SYMLINK
 + (bool)symbolicLinkExistsAtPath: (OFString*)path
 {
-	struct stat s;
+	of_stat_t s;
 
 	if (path == nil)
 		@throw [OFInvalidArgumentException exception];
 
-	if (lstat([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
-	    &s) == -1)
+	if (of_lstat(path, &s) == -1)
 		return false;
 
 	if (S_ISLNK(s.st_mode))
 		return true;
 
@@ -408,46 +414,32 @@
 		    exceptionWithPath: path];
 }
 
 + (off_t)sizeOfFileAtPath: (OFString*)path
 {
+	of_stat_t s;
+
 	if (path == nil)
 		@throw [OFInvalidArgumentException exception];
 
-#ifndef _WIN32
-	struct stat s;
-
-	if (stat([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
-	    &s) == -1)
-#else
-	struct _stat s;
-
-	if (_wstat([path UTF16String], &s) == -1)
-#endif
+	if (of_stat(path, &s) == -1)
 		/* FIXME: Maybe use another exception? */
 		@throw [OFOpenFileFailedException exceptionWithPath: path
 							       mode: @"r"];
 
-	/* On Android, off_t is 32 bit, but st_size is long long there */
+	/* FIXME: On Android, off_t is 32 bit, but st_size is long long there */
 	return (off_t)s.st_size;
 }
 
 + (OFDate*)modificationDateOfFileAtPath: (OFString*)path
 {
+	of_stat_t s;
+
 	if (path == nil)
 		@throw [OFInvalidArgumentException exception];
 
-#ifndef _WIN32
-	struct stat s;
-
-	if (stat([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
-	    &s) == -1)
-#else
-	struct _stat s;
-
-	if (_wstat([path UTF16String], &s) == -1)
-#endif
+	if (of_stat(path, &s) == -1)
 		/* FIXME: Maybe use another exception? */
 		@throw [OFOpenFileFailedException exceptionWithPath: path
 							       mode: @"r"];
 
 	/* FIXME: We could be more precise on some OSes */
@@ -532,38 +524,25 @@
 
 + (void)copyItemAtPath: (OFString*)source
 		toPath: (OFString*)destination
 {
 	void *pool;
-#ifndef _WIN32
-	struct stat s;
-#else
-	struct _stat s;
-#endif
+	of_stat_t s;
 
 	if (source == nil || destination == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	pool = objc_autoreleasePoolPush();
 
-#ifndef _WIN32
-	if (lstat([destination
-		cStringWithEncoding: OF_STRING_ENCODING_NATIVE], &s) == 0) {
-#else
-	if (_wstat([destination UTF16String], &s) == 0) {
-#endif
+	if (of_lstat(destination, &s) == 0) {
 		errno = EEXIST;
 		@throw [OFCopyItemFailedException
 		    exceptionWithSourcePath: source
 			    destinationPath: destination];
 	}
 
-#ifndef _WIN32
-	if (lstat([source cStringWithEncoding: OF_STRING_ENCODING_NATIVE], &s))
-#else
-	if (_wstat([source UTF16String], &s))
-#endif
+	if (of_lstat(source, &s))
 		@throw [OFCopyItemFailedException
 		    exceptionWithSourcePath: source
 			    destinationPath: destination];
 
 	if (S_ISDIR(s.st_mode)) {
@@ -667,27 +646,18 @@
 
 + (void)moveItemAtPath: (OFString*)source
 		toPath: (OFString*)destination
 {
 	void *pool;
-#ifndef _WIN32
-	struct stat s;
-#else
-	struct _stat s;
-#endif
+	of_stat_t s;
 
 	if (source == nil || destination == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	pool = objc_autoreleasePoolPush();
 
-#ifndef _WIN32
-	if (lstat([destination
-		cStringWithEncoding: OF_STRING_ENCODING_NATIVE], &s) == 0) {
-#else
-	if (_wstat([destination UTF16String], &s) == 0) {
-#endif
+	if (of_lstat(destination, &s) == 0) {
 		errno = EEXIST;
 		@throw [OFCopyItemFailedException
 		    exceptionWithSourcePath: source
 			    destinationPath: destination];
 	}
@@ -726,26 +696,18 @@
 }
 
 + (void)removeItemAtPath: (OFString*)path
 {
 	void *pool;
-#ifndef _WIN32
-	struct stat s;
-#else
-	struct _stat s;
-#endif
+	of_stat_t s;
 
 	if (path == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	pool = objc_autoreleasePoolPush();
 
-#ifndef _WIN32
-	if (lstat([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE], &s))
-#else
-	if (_wstat([path UTF16String], &s))
-#endif
+	if (of_lstat(path, &s))
 		@throw [OFRemoveItemFailedException exceptionWithPath: path];
 
 	if (S_ISDIR(s.st_mode)) {
 		OFArray *contents;
 		OFEnumerator *enumerator;