#if defined(HAVE_WIN32)
#if defined(HAVE_MINGW)
#include "mingwconfig.h"
-#define _STAT_H /* don't pull in MinGW stat.h */
-#define _STAT_DEFINED /* don't pull in MinGW stat.h */
#else
#include "winconfig.h"
#endif
#endif
#if defined(HAVE_WIN32) & !defined(HAVE_MINGW)
#include <winsock2.h>
-#else
-//#include <sys/stat.h>
-#endif
+#endif
+#if !defined(HAVE_WIN32) & !defined(HAVE_MINGW)
+#include <sys/stat.h>
+#endif
#include <sys/time.h>
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#if defined(HAVE_WIN32)
-#include "lib/winapi.h"
+#include "win32/winapi.h"
#endif
#ifndef HAVE_ZLIB_H