diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c
index 46760b94dd..8e0b578232 100644
--- a/tests/server/mqttd.c
+++ b/tests/server/mqttd.c
@@ -64,11 +64,6 @@
 /* include memdebug.h last */
 #include "memdebug.h"
 
-#ifdef USE_WINSOCK
-#undef  EINTR
-#define EINTR    4 /* errno.h value */
-#endif
-
 #define DEFAULT_PORT 1883 /* MQTT default port */
 
 #ifndef DEFAULT_LOGFILE
diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index 1f1739553a..2e48f7dd85 100644
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -56,13 +56,6 @@
 /* include memdebug.h last */
 #include "memdebug.h"
 
-#ifdef USE_WINSOCK
-#undef  EINTR
-#define EINTR    4 /* errno.h value */
-#undef  ERANGE
-#define ERANGE  34 /* errno.h value */
-#endif
-
 #ifdef USE_IPV6
 static bool use_ipv6 = FALSE;
 #endif
diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index 90b7b5568b..b18f4d17e0 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -114,17 +114,6 @@
 /* include memdebug.h last */
 #include "memdebug.h"
 
-#ifdef USE_WINSOCK
-#undef  EINTR
-#define EINTR    4 /* errno.h value */
-#undef  EAGAIN
-#define EAGAIN  11 /* errno.h value */
-#undef  ENOMEM
-#define ENOMEM  12 /* errno.h value */
-#undef  EINVAL
-#define EINVAL  22 /* errno.h value */
-#endif
-
 #define DEFAULT_PORT 8999
 
 #ifndef DEFAULT_LOGFILE
diff --git a/tests/server/socksd.c b/tests/server/socksd.c
index 7b3b32cd12..fda729c7f9 100644
--- a/tests/server/socksd.c
+++ b/tests/server/socksd.c
@@ -85,11 +85,6 @@
 /* include memdebug.h last */
 #include "memdebug.h"
 
-#ifdef USE_WINSOCK
-#undef  EINTR
-#define EINTR    4 /* errno.h value */
-#endif
-
 #define DEFAULT_PORT 8905
 
 #ifndef DEFAULT_LOGFILE
diff --git a/tests/server/sws.c b/tests/server/sws.c
index c095ebbf23..5b7a4397d6 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -58,15 +58,6 @@
 /* include memdebug.h last */
 #include "memdebug.h"
 
-#ifdef USE_WINSOCK
-#undef  EINTR
-#define EINTR    4 /* errno.h value */
-#undef  EAGAIN
-#define EAGAIN  11 /* errno.h value */
-#undef  ERANGE
-#define ERANGE  34 /* errno.h value */
-#endif
-
 static int socket_domain = AF_INET;
 static bool use_gopher = FALSE;
 static int serverlogslocked = 0;
diff --git a/tests/server/util.c b/tests/server/util.c
index c36f8eade3..67f583fcdf 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -56,13 +56,6 @@
 #include "timeval.h"
 #include "timediff.h"
 
-#ifdef USE_WINSOCK
-#undef  EINTR
-#define EINTR    4 /* errno.h value */
-#undef  EINVAL
-#define EINVAL  22 /* errno.h value */
-#endif
-
 const char *serverlogfile = DEFAULT_LOGFILE;
 
 static struct timeval tvnow(void);
diff --git a/tests/server/util.h b/tests/server/util.h
index 1c22e4fcf0..0b112d24b4 100644
--- a/tests/server/util.h
+++ b/tests/server/util.h
@@ -25,6 +25,20 @@
  ***************************************************************************/
 #include "server_setup.h"
 
+#ifdef USE_WINSOCK
+/* errno.h values */
+#undef  EINTR
+#define EINTR    4
+#undef  EAGAIN
+#define EAGAIN  11
+#undef  ENOMEM
+#define ENOMEM  12
+#undef  EINVAL
+#define EINVAL  22
+#undef  ERANGE
+#define ERANGE  34
+#endif
+
 enum {
   DOCNUMBER_NOTHING    = -7,
   DOCNUMBER_QUIT       = -6,