diff --git a/src/c/file.d b/src/c/file.d
index 0bb8d5b78..f9ac5ba7d 100755
--- a/src/c/file.d
+++ b/src/c/file.d
@@ -22,19 +22,19 @@
 	by accessing the FILE structure of C.
 */
 
-#include <ecl/ecl.h>
 #include <errno.h>
 #include <sys/types.h>
 #ifndef _MSC_VER
 # include <unistd.h>
 #endif
 #include <fcntl.h>
-#if !defined(ECL_MS_WINDOWS_HOST)
-#include <sys/stat.h>
+#if !defined(_MSC_VER) && !defined(__MINGW32__)
+# include <sys/stat.h>
 /* it isn't pulled in by fcntl.h */
 #endif
 #include <string.h>
 #include <stdio.h>
+#include <ecl/ecl.h>
 #include <ecl/ecl-inl.h>
 #include <ecl/internal.h>
 
diff --git a/src/c/print.d b/src/c/print.d
index de647dc69..e4a4c64eb 100644
--- a/src/c/print.d
+++ b/src/c/print.d
@@ -15,15 +15,15 @@
     See file '../Copyright' for full details.
 */
 
-#define ECL_INCLUDE_MATH_H
-#include <ecl/ecl.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <float.h>
 #ifndef _MSC_VER
-#include <unistd.h>
+# include <unistd.h>
 #endif
+#define ECL_INCLUDE_MATH_H
+#include <ecl/ecl.h>
 #if defined(HAVE_FENV_H)
 # include <fenv.h>
 #endif
diff --git a/src/c/time.d b/src/c/time.d
index 947edf673..c0b48529c 100644
--- a/src/c/time.d
+++ b/src/c/time.d
@@ -15,9 +15,18 @@
     See file '../Copyright' for full details.
 */
 
+#include <time.h>
+#ifndef _MSC_VER
+# include <unistd.h>
+#endif
+#if defined(_MSC_VER) || defined(__MINGW32__)
+# include <windows.h>
+# include <winsock.h>
+#endif
+
 #define ECL_INCLUDE_MATH_H
 #include <ecl/ecl.h>
-#include <time.h>
+#include <ecl/internal.h>
 #ifdef HAVE_TIMES
 # include <sys/times.h>
 #endif
@@ -28,14 +37,6 @@
 #ifdef HAVE_GETTIMEOFDAY
 # include <sys/time.h>
 #endif
-#ifndef _MSC_VER
-# include <unistd.h>
-#endif
-#include <ecl/internal.h>
-#if defined(ECL_MS_WINDOWS_HOST)
-# include <windows.h>
-# include <winsock.h>
-#endif
 
 #if !defined(HAVE_GETTIMEOFDAY) && !defined(HAVE_GETRUSAGE) && !defined(ECL_MS_WINDOWS_HOST)
 struct timeval {
@@ -49,7 +50,7 @@ static struct timeval beginning;
 static void
 get_real_time(struct timeval *tv)
 {
-#ifdef HAVE_GETTIMEOFDAY
+#if defined(HAVE_GETTIMEOFDAY) && !defined(ECL_MS_WINDOWS_HOST)
 	struct timezone tz;
 	gettimeofday(tv, &tz);
 #else
diff --git a/src/c/unixfsys.d b/src/c/unixfsys.d
index 2bf6995fc..a1a2b348a 100644
--- a/src/c/unixfsys.d
+++ b/src/c/unixfsys.d
@@ -15,7 +15,6 @@
     See file '../Copyright' for full details.
 */
 
-#include <ecl/ecl.h>
 #include <string.h>
 #include <stdio.h>
 #include <limits.h>
@@ -27,6 +26,7 @@
 # define F_OK 0
 #endif
 #include <sys/types.h>
+#include <ecl/ecl.h>
 #ifdef HAVE_PWD_H
 # include <pwd.h>
 #endif
diff --git a/src/c/unixint.d b/src/c/unixint.d
index 2b750eebd..1af965802 100644
--- a/src/c/unixint.d
+++ b/src/c/unixint.d
@@ -74,26 +74,30 @@
 #include <stdio.h>
 /* To get APCProc calls */
 #define _WIN32_WINNT 0x400
+#include <signal.h>
+
+#if defined(_MSC_VER) || defined(__MINGW32__)
+# include <windows.h>
+#endif
+#if !defined(_MSC_VER)
+# include <unistd.h>
+#endif
+
 #include <ecl/ecl.h>
+
 #if defined(HAVE_FENV_H) && !defined(ECL_AVOID_FENV_H)
 # ifndef _GNU_SOURCE
 #  define _GNU_SOURCE
 # endif
 # include <fenv.h>
 #endif
-#include <signal.h>
+
 #ifdef ECL_USE_MPROTECT
 # ifndef SA_SIGINFO
 #  error "We cannot use the mmap code without siginfo"
 # endif
 # include <sys/mman.h>
 #endif
-#if defined(ECL_MS_WINDOWS_HOST)
-# include <windows.h>
-#endif
-#if !defined(_MSC_VER)
-# include <unistd.h>
-#endif
 #define ECL_DEFINE_FENV_CONSTANTS
 #include <ecl/internal.h>
 #include <ecl/ecl-inl.h>
diff --git a/src/c/unixsys.d b/src/c/unixsys.d
index 9697e0290..de1035fa1 100755
--- a/src/c/unixsys.d
+++ b/src/c/unixsys.d
@@ -15,18 +15,18 @@
     See file '../Copyright' for full details.
 */
 
-#include <ecl/ecl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <fcntl.h>
+#if !defined(_MSC_VER)
+# include <unistd.h>
+#endif
+#include <ecl/ecl.h>
 #include <ecl/internal.h>
 #if defined(ECL_MS_WINDOWS_HOST)
 # include <windows.h>
 #endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
 #endif