--- a/UnixOperatingSystem.st	Mon Jun 22 11:24:02 2015 +0200
+++ b/UnixOperatingSystem.st	Mon Jun 22 12:49:49 2015 +0200
@@ -153,7 +153,7 @@
 # define WANT_SYSTEM
 #endif
 
-#if defined __osx__
+#if defined (__osx__)
 # define NET_IF_SUPPORT
 #endif
 
@@ -284,9 +284,12 @@
 # endif /* aix */
 
 # ifdef __osx__
+#  include <string.h>
 #  include <time.h>
+#  include <sys/time.h>
 #  define HAS_TIMEGM
 
+#  define NO_LONGER_NEEDED
 #  ifdef NO_LONGER_NEEDED
 // struct tm seems to be defined now (new XCODE/CLANG compiler)
 struct tm {
@@ -4138,12 +4141,16 @@
 // macosx does not support syncfs
 // ... and we need to be compatible with GLIBC 2.12 (RedHat 6)
 // so disable it for now.
-#if 0 && defined(LINUX) && __GLIBC_PREREQ(2, 14)
+#if 0
+# if defined(LINUX)
+#  if __GLIBC_PREREQ(2, 14)
     if (__isSmallInteger(handle)) {
         if (syncfs(__intVal(handle)) == 0) {
             RETURN(self);
         }
     }
+#  endif
+# endif
 #endif
 %}.