diff --git a/test-server/test-client.c b/test-server/test-client.c
index 75fd133a..a3c3d4b9 100644
--- a/test-server/test-client.c
+++ b/test-server/test-client.c
@@ -25,7 +25,9 @@
 #include <string.h>
 #include <signal.h>
 
-#ifndef _WIN32
+#ifdef _WIN32
+#define random rand
+#else
 #include <unistd.h>
 #endif
 
diff --git a/test-server/test-fraggle.c b/test-server/test-fraggle.c
index 578f947d..c2529df4 100644
--- a/test-server/test-fraggle.c
+++ b/test-server/test-fraggle.c
@@ -24,7 +24,9 @@
 #include <getopt.h>
 #include <string.h>
 
-#ifndef _WIN32
+#ifdef _WIN32
+#define random rand
+#else
 #include <sys/time.h>
 #include <unistd.h>
 #endif
diff --git a/win32port/win32helpers/websock-w32.h b/win32port/win32helpers/websock-w32.h
index 6c74c0c1..9e304563 100644
--- a/win32port/win32helpers/websock-w32.h
+++ b/win32port/win32helpers/websock-w32.h
@@ -14,8 +14,6 @@
 
 #define SOL_TCP IPPROTO_TCP
 
-#define random rand
-
 #ifdef  __MINGW64__                                                             
 #define DEF_POLL_STUFF
 #endif