tighten up compat include paths, fix glibc compatibility

include/compat/stdlib.h

@@ -3,18 +3,16 @@
  * Public domain
  */
 
-#ifndef LIBCRYPTOCOMPAT_STDLIB_H
-#define LIBCRYPTOCOMPAT_STDLIB_H
-
 #ifdef _MSC_VER
 #include <../include/stdlib.h>
 #else
 #include_next <stdlib.h>
 #endif
 
+#ifndef LIBCRYPTOCOMPAT_STDLIB_H
+#define LIBCRYPTOCOMPAT_STDLIB_H
+
 #include <sys/types.h>
-#include <sys/stat.h>
-//#include <sys/time.h>
 #include <stdint.h>
 
 #ifndef HAVE_ARC4RANDOM_BUF

include/compat/sys/stat.h

@@ -6,7 +6,10 @@
 #ifndef LIBCRYPTOCOMPAT_SYS_STAT_H
 #define LIBCRYPTOCOMPAT_SYS_STAT_H
 
-#ifdef _MSC_VER
+#ifndef _MSC_VER
+#include_next <sys/stat.h>
+#else
+
 #include <windows.h>
 #include <../include/sys/stat.h>
 
@@ -88,8 +91,6 @@
 #define	S_ISCHR(mode)  (((mode) & S_IFMT) == S_IFCHR)
 #define	S_ISBLK(mode)  (((mode) & S_IFMT) == S_IFBLK)
 
-#else
-#include_next <sys/stat.h>
 #endif
 
 #endif

include/compat/sys/types.h

@@ -3,15 +3,15 @@
  * sys/types.h compatibility shim
  */
 
-#ifndef LIBCRYPTOCOMPAT_SYS_TYPES_H
-#define LIBCRYPTOCOMPAT_SYS_TYPES_H
-
 #ifdef _MSC_VER
 #include <../include/sys/types.h>
 #else
 #include_next <sys/types.h>
 #endif
 
+#ifndef LIBCRYPTOCOMPAT_SYS_TYPES_H
+#define LIBCRYPTOCOMPAT_SYS_TYPES_H
+
 #include <stdint.h>
 
 #ifdef __MINGW32__

include/compat/time.h

@@ -3,14 +3,9 @@
  * sys/time.h compatibility shim
  */
 
-#ifndef LIBCRYPTOCOMPAT_TIME_H
-#define LIBCRYPTOCOMPAT_TIME_H
-
 #ifdef _MSC_VER
 #include <../include/time.h>
 #define gmtime_r(tp, tm) ((gmtime_s((tm), (tp)) == 0) ? (tm) : NULL)
 #else
 #include_next <time.h>
 #endif
-
-#endif