diff --git a/CMakeLists.txt b/CMakeLists.txt
index fec4cd58..9d02dceb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -552,7 +552,7 @@ if (NOT LWS_WITHOUT_TESTAPPS)
 			create_test_app(test-server
 				"test-server/test-server.c"
 				""
-				"${WIN32_HELPERS_PATH}/netdb.h;${WIN32_HELPERS_PATH}/strings.h;${WIN32_HELPERS_PATH}/unistd.h;${WIN32_HELPERS_PATH}/websock-w32.h")
+				"${WIN32_HELPERS_PATH}/websock-w32.h")
 		endif()
 
 		#
@@ -562,7 +562,7 @@ if (NOT LWS_WITHOUT_TESTAPPS)
 			create_test_app(test-server-extpoll
 				"test-server/test-server.c"
 				""
-				"${WIN32_HELPERS_PATH}/netdb.h;${WIN32_HELPERS_PATH}/strings.h;${WIN32_HELPERS_PATH}/unistd.h;${WIN32_HELPERS_PATH}/websock-w32.h")
+				"${WIN32_HELPERS_PATH}/websock-w32.h")
 			# Set defines for this executable only.
 			set_property(
 				TARGET test-server-extpoll
@@ -671,7 +671,7 @@ if (NOT LWS_WITHOUT_TESTAPPS)
 			create_test_app(test-fraggle
 				"test-server/test-fraggle.c"
 				""
-				"${WIN32_HELPERS_PATH}/unistd.h;${WIN32_HELPERS_PATH}/sys/time.h")
+				"")
 		endif()
 
 		#
@@ -681,7 +681,7 @@ if (NOT LWS_WITHOUT_TESTAPPS)
 			create_test_app(test-ping
 				"test-server/test-ping.c"
 				""
-				"${WIN32_HELPERS_PATH}/unistd.h;${WIN32_HELPERS_PATH}/sys/time.h")
+				"")
 		endif()
 		#
 		# test-echo
@@ -690,7 +690,7 @@ if (NOT LWS_WITHOUT_TESTAPPS)
 			create_test_app(test-echo
 				"test-server/test-echo.c"
 				""
-				"${WIN32_HELPERS_PATH}/unistd.h;${WIN32_HELPERS_PATH}/sys/time.h")
+				"")
 		endif()
 
 	endif(NOT LWS_WITHOUT_CLIENT)
diff --git a/test-server/test-client.c b/test-server/test-client.c
index 4c2b07a5..75fd133a 100644
--- a/test-server/test-client.c
+++ b/test-server/test-client.c
@@ -21,11 +21,14 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <getopt.h>
 #include <string.h>
 #include <signal.h>
 
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+
 #ifdef CMAKE_BUILD
 #include "lws_config.h"
 #endif
diff --git a/test-server/test-echo.c b/test-server/test-echo.c
index 09794398..3d48349c 100644
--- a/test-server/test-echo.c
+++ b/test-server/test-echo.c
@@ -24,17 +24,17 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <getopt.h>
 #include <string.h>
-#include <sys/time.h>
 #include <assert.h>
-#ifdef WIN32
-#else
-#include <syslog.h>
-#endif
 #include <signal.h>
 
+#ifndef _WIN32
+#include <syslog.h>
+#include <sys/time.h>
+#include <unistd.h>
+#endif
+
 #ifdef CMAKE_BUILD
 #include "lws_config.h"
 #endif
diff --git a/test-server/test-fraggle.c b/test-server/test-fraggle.c
index 01b0819a..578f947d 100644
--- a/test-server/test-fraggle.c
+++ b/test-server/test-fraggle.c
@@ -21,10 +21,13 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <getopt.h>
 #include <string.h>
+
+#ifndef _WIN32
 #include <sys/time.h>
+#include <unistd.h>
+#endif
 
 #ifdef CMAKE_BUILD
 #include "lws_config.h"
diff --git a/test-server/test-ping.c b/test-server/test-ping.c
index 098981cf..fb7bff5b 100644
--- a/test-server/test-ping.c
+++ b/test-server/test-ping.c
@@ -21,26 +21,24 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <getopt.h>
 #include <string.h>
 #include <signal.h>
-#include <unistd.h>
-
-#include <sys/time.h>
 #include <sys/types.h>
-#ifndef WIN32
+
+#ifndef _WIN32
+#include <netdb.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <sys/ioctl.h>
 #include <poll.h>
+#include <unistd.h>
 #endif
 
 #ifdef CMAKE_BUILD
 #include "lws_config.h"
 #endif
 
-#include <netdb.h>
-
 #include "../lib/libwebsockets.h"
 
 /*
diff --git a/test-server/test-server.c b/test-server/test-server.c
index 481dff6f..efe5f6da 100644
--- a/test-server/test-server.c
+++ b/test-server/test-server.c
@@ -24,25 +24,24 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <getopt.h>
+#include <signal.h>
 #include <string.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <assert.h>
-#ifdef WIN32
 
+#ifdef _WIN32
+#include <io.h>
 #ifdef EXTERNAL_POLL
 #define poll WSAPoll
 #endif
-
-#else // NOT WIN32
+#else
 #include <syslog.h>
+#include <sys/time.h>
+#include <unistd.h>
 #endif
 
-#include <signal.h>
-
 #include "../lib/libwebsockets.h"
 
 static int close_testing;
diff --git a/win32port/win32helpers/netdb.h b/win32port/win32helpers/netdb.h
deleted file mode 100644
index 45304b76..00000000
--- a/win32port/win32helpers/netdb.h
+++ /dev/null
@@ -1 +0,0 @@
-// Left blank for win32
\ No newline at end of file
diff --git a/win32port/win32helpers/strings.h b/win32port/win32helpers/strings.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/win32port/win32helpers/sys/time.h b/win32port/win32helpers/sys/time.h
deleted file mode 100644
index 258af63b..00000000
--- a/win32port/win32helpers/sys/time.h
+++ /dev/null
@@ -1 +0,0 @@
-// left blank
\ No newline at end of file
diff --git a/win32port/win32helpers/unistd.h b/win32port/win32helpers/unistd.h
deleted file mode 100644
index e69de29b..00000000