diff --git a/include/misc.h b/include/misc.h
index c5c7eb93..bb641113 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -40,30 +40,26 @@
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 
-#if defined(_WIN32)
+#ifdef _WIN32
+#ifndef __GNUC__
+
 typedef long ssize_t;
 
 /* integral mismatch, due to misuse of sector short */
-#ifndef __GNUC__
 #pragma warning (disable : 4761 )
-#endif
 
-#include <io.h>
-
-#define random rand
-#define srandom srand
-
-#ifdef __GNUC__
-#include <string.h>
-#else
 #define strncasecmp(s1, s2, s3) _strnicmp((s1), (s2), (s3))
-#endif
-#define mkdir(dir,perm) _mkdir((dir))
 
 typedef int pid_t;
 #define vsnprintf _vsnprintf
 #define snprintf _snprintf
 
+#endif /* !__GNUC__ */
+
+#define mkdir(dir,perm) _mkdir((dir))
+#define random rand
+#define srandom srand
+
 #endif /* _WIN32 */
 
 /* This is the structure we use to keep track of the global mobility
diff --git a/src/lib/commands/add.c b/src/lib/commands/add.c
index 140a0901..bf4fa2fe 100644
--- a/src/lib/commands/add.c
+++ b/src/lib/commands/add.c
@@ -34,6 +34,10 @@
 #include <config.h>
 
 #include <fcntl.h>
+#if defined(_WIN32) && !defined(__GNUC__)
+#include <io.h>
+#endif
+
 #include "commands.h"
 #include "land.h"
 #include "optlist.h"
diff --git a/src/lib/commands/disa.c b/src/lib/commands/disa.c
index 109d477b..a9fda57e 100644
--- a/src/lib/commands/disa.c
+++ b/src/lib/commands/disa.c
@@ -33,6 +33,9 @@
 
 #include <config.h>
 
+#if defined(_WIN32) && !defined(__GNUC__)
+#include <io.h>
+#endif
 #include <fcntl.h>
 #if !defined(_WIN32)
 #include <unistd.h>
diff --git a/src/lib/commands/enab.c b/src/lib/commands/enab.c
index 9ae4972b..01867acc 100644
--- a/src/lib/commands/enab.c
+++ b/src/lib/commands/enab.c
@@ -35,6 +35,8 @@
 
 #if !defined(_WIN32)
 #include <unistd.h>
+#elif defined(__GNUC__)
+#include <io.h>
 #endif
 #include "commands.h"
 #include "optlist.h"
diff --git a/src/lib/commands/new.c b/src/lib/commands/new.c
index 76014fbb..2a8a8917 100644
--- a/src/lib/commands/new.c
+++ b/src/lib/commands/new.c
@@ -34,7 +34,10 @@
 #include <config.h>
 
 #include <fcntl.h>
-#ifndef _WIN32
+#if defined(_WIN32) && !defined(__GNUC__)
+#include <io.h>
+#endif
+#if !defined(_WIN32)
 #include <unistd.h>
 #endif
 #include "commands.h"
diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c
index c7b526ed..3cae3439 100644
--- a/src/lib/commands/powe.c
+++ b/src/lib/commands/powe.c
@@ -34,7 +34,11 @@
  *     Markus Armbruster, 2006
  */
 
-#include <config.h>
+#include <config.h>
+
+#ifdef _WIN32
+#include <io.h>
+#endif
 
 #include "commands.h"
 #include "item.h"
diff --git a/src/lib/commands/turn.c b/src/lib/commands/turn.c
index 5876cff5..a269ee64 100644
--- a/src/lib/commands/turn.c
+++ b/src/lib/commands/turn.c
@@ -36,6 +36,8 @@
 #include <errno.h>
 #if !defined(_WIN32)
 #include <unistd.h>
+#elif defined(__GNUC__)
+#include <io.h>
 #endif
 #include "tel.h"
 #include "commands.h"
diff --git a/src/lib/common/file.c b/src/lib/common/file.c
index 53d1e52f..03f489eb 100644
--- a/src/lib/common/file.c
+++ b/src/lib/common/file.c
@@ -36,6 +36,9 @@
 #include <config.h>
 
 #include <errno.h>
+#if defined(_WIN32) && !defined(__GNUC__)
+#include <io.h>
+#endif
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/types.h>
diff --git a/src/lib/common/log.c b/src/lib/common/log.c
index 621f204a..22184d23 100644
--- a/src/lib/common/log.c
+++ b/src/lib/common/log.c
@@ -33,7 +33,9 @@
 
 #include <config.h>
 
-#include "misc.h"
+#if defined(_WIN32) && !defined(__GNUC__)
+#include <io.h>
+#endif
 #if !defined(_WIN32)
 #include <unistd.h>
 #endif
@@ -41,6 +43,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <time.h>
+#include "misc.h"
 #include "optlist.h"
 #include "player.h"
 #include "prototypes.h"
diff --git a/src/lib/common/wantupd.c b/src/lib/common/wantupd.c
index 7ad016ed..b3628c43 100644
--- a/src/lib/common/wantupd.c
+++ b/src/lib/common/wantupd.c
@@ -35,6 +35,9 @@
 
 #include <fcntl.h>
 #include <stdio.h>
+#if defined(_WIN32) && !defined(__GNUC__)
+#include <io.h>
+#endif
 #include <time.h>
 #if !defined(_WIN32)
 #include <unistd.h>
diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index 3a8192ae..06d1fbc2 100644
--- a/src/lib/player/accept.c
+++ b/src/lib/player/accept.c
@@ -38,6 +38,9 @@
 #define WIN32
 #include <winsock2.h>
 #undef NS_ALL
+#ifndef __GNUC__
+#include <io.h>
+#endif
 #else
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c
index cf2204eb..5d05ee25 100644
--- a/src/lib/player/empdis.c
+++ b/src/lib/player/empdis.c
@@ -36,6 +36,13 @@
 #include <config.h>
 
 #include <stdio.h>
+#include <fcntl.h>
+#include <time.h>
+#if !defined(_WIN32)
+#include <unistd.h>
+#endif
+#include <signal.h>
+
 #include "com.h"
 #include "empio.h"
 #include "file.h"
@@ -48,12 +55,6 @@
 #include "prototypes.h"
 #include "tel.h"
 
-#include <fcntl.h>
-#include <time.h>
-#if !defined(_WIN32)
-#include <unistd.h>
-#endif
-#include <signal.h>
 
 #define KEEP_COMMANDS 50
 
diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index 95af6d43..67c879dd 100644
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -32,6 +32,12 @@
  */
 
 #include <config.h>
+#if !defined(_WIN32)
+#include <unistd.h>
+#endif
+#include <stdio.h>
+#include <errno.h>
+#include <fcntl.h>
 
 #include "com.h"
 #include "empio.h"
@@ -48,12 +54,6 @@
 #include "sect.h"
 #include "tel.h"
 
-#if !defined(_WIN32)
-#include <unistd.h>
-#endif
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
 
 static int command(void);
 static int status(void);
diff --git a/src/lib/subs/wu.c b/src/lib/subs/wu.c
index f495387a..38950587 100644
--- a/src/lib/subs/wu.c
+++ b/src/lib/subs/wu.c
@@ -33,6 +33,9 @@
 
 #include <config.h>
 
+#if defined(_WIN32) && !defined(__GNUC__)
+#include <io.h>
+#endif
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/src/lib/update/anno.c b/src/lib/update/anno.c
index b374a7e3..43b8c3c6 100644
--- a/src/lib/update/anno.c
+++ b/src/lib/update/anno.c
@@ -36,6 +36,9 @@
 
 #include <config.h>
 
+#if defined(_WIN32) && defined(__GNUC__)
+#include <io.h>
+#endif
 #include <stdio.h>
 #include <time.h>
 #include "tel.h"