more include cleanups it starts to look almost decent now

[deb_libnfs.git] / lib / libnfs.c

diff --git a/lib/libnfs.c b/lib/libnfs.c
index c3df1df813dd8fa13e42c41cec90b2c14d8e3535..c07a8e84b60eb7085ec655d789d4eea8badd54ef 100644 (file)
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -21,31 +21,35 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#ifdef AROS
+#include "aros_compat.h"
 #endif
 
 #ifdef WIN32
 #include "win32_compat.h"
 #else
-
 #include <strings.h>
 #include <utime.h>
+#endif /*WIN32*/
 
-#ifdef AROS
-#include "aros_compat.h"
-#else
 #ifdef ANDROID
-#include <sys/vfs.h>
 #define statvfs statfs
-#else
-#include <sys/statvfs.h>
-#endif /*ANDROID*/
-#endif /*AROS*/
-#endif /*WIN32*/
+#endif
 
 #define _GNU_SOURCE
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>