diff --git a/runsuite.c b/runsuite.c
index 4e406a35..47ade804 100644
--- a/runsuite.c
+++ b/runsuite.c
@@ -9,12 +9,8 @@
 #include "libxml.h"
 #include <stdio.h>
 
-#if !defined(_WIN32)
-#include <unistd.h>
-#endif
 #include <string.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
diff --git a/runtest.c b/runtest.c
index eedd26e5..52c83acd 100644
--- a/runtest.c
+++ b/runtest.c
@@ -14,8 +14,10 @@
 #include "libxml.h"
 #include <stdio.h>
 
-#if !defined(_WIN32)
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#elif defined (_WIN32)
+#include <io.h>
 #endif
 #include <string.h>
 #include <sys/stat.h>
@@ -110,7 +112,6 @@ static int checkTestFile(const char *filename);
 #if defined(_WIN32)
 
 #include <windows.h>
-#include <io.h>
 
 typedef struct
 {
diff --git a/runxmlconf.c b/runxmlconf.c
index 69ce39fc..8df9df13 100644
--- a/runxmlconf.c
+++ b/runxmlconf.c
@@ -11,12 +11,8 @@
 
 #ifdef LIBXML_XPATH_ENABLED
 
-#if !defined(_WIN32)
-#include <unistd.h>
-#endif
 #include <string.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
diff --git a/testThreads.c b/testThreads.c
index 0714deba..709ae769 100644
--- a/testThreads.c
+++ b/testThreads.c
@@ -14,9 +14,6 @@
 #include <windows.h>
 #endif
 #include <string.h>
-#if !defined(_MSC_VER)
-#include <unistd.h>
-#endif
 #include <assert.h>
 
 #define	MAX_ARGC	20
diff --git a/testlimits.c b/testlimits.c
index 6322f8ba..2ee832b5 100644
--- a/testlimits.c
+++ b/testlimits.c
@@ -13,12 +13,8 @@
 #include "libxml.h"
 #include <stdio.h>
 
-#if !defined(_WIN32)
-#include <unistd.h>
-#endif
 #include <string.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 #include <time.h>
 
 #include <libxml/parser.h>
diff --git a/testrecurse.c b/testrecurse.c
index d213ebc6..0cf7342e 100644
--- a/testrecurse.c
+++ b/testrecurse.c
@@ -13,12 +13,8 @@
 #include "libxml.h"
 #include <stdio.h>
 
-#if !defined(_WIN32)
-#include <unistd.h>
-#endif
 #include <string.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 
 #include <libxml/parser.h>
 #include <libxml/tree.h>
@@ -58,7 +54,6 @@ static int checkTestFile(const char *filename);
 #if defined(_WIN32)
 
 #include <windows.h>
-#include <io.h>
 
 typedef struct
 {