diff --git a/lib/plat/windows/windows-service.c b/lib/plat/windows/windows-service.c
index 1c3266e29..ae16d9731 100644
--- a/lib/plat/windows/windows-service.c
+++ b/lib/plat/windows/windows-service.c
@@ -54,6 +54,7 @@ _lws_plat_service_forced_tsi(struct lws_context *context, int tsi)
 	return r;
 }
 
+extern void lws_client_conn_wait_timeout(lws_sorted_usec_list_t *sul);
 
 int
 _lws_plat_service_tsi(struct lws_context *context, int timeout_ms, int tsi)
diff --git a/lib/roles/http/client/client-handshake.c b/lib/roles/http/client/client-handshake.c
index 479ca6ff8..d130ad350 100644
--- a/lib/roles/http/client/client-handshake.c
+++ b/lib/roles/http/client/client-handshake.c
@@ -346,7 +346,7 @@ failed:
 	return NULL;
 }
 
-static void
+void
 lws_client_conn_wait_timeout(lws_sorted_usec_list_t *sul)
 {
 	struct lws *wsi = lws_container_of(sul, struct lws, sul_connect_timeout);
@@ -745,8 +745,10 @@ ads_known:
 		 * must do specifically a POLLOUT poll to hear
 		 * about the connect completion
 		 */
+#if !defined(WIN32)
 		if (lws_change_pollfd(wsi, 0, LWS_POLLOUT))
 			goto try_next_result_fds;
+#endif
 
 		return wsi;
 	}