diff -Nru orig/httpuv/src/Makevars.win patched/httpuv/src/Makevars.win
--- orig/httpuv/src/Makevars.win	2020-06-05 18:40:07.000000000 +0200
+++ patched/httpuv/src/Makevars.win	2020-07-02 18:05:24.758942500 +0200
@@ -1,12 +1,12 @@
 # Use C++11 if available
 CXX_STD=CXX11
 
-PKG_LIBS = ./libuv/libuv.a ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o \
-	-lpthread -lws2_32 -lkernel32 -lpsapi -liphlpapi -lshell32 -luserenv
+PKG_LIBS = ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o \
+	-luv -lpthread -lws2_32 -lkernel32 -lpsapi -liphlpapi -lshell32 -luserenv
 
 PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS
 PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS
-PKG_CPPFLAGS += -Ilibuv/include -D_WIN32_WINNT=0x0600 -DSTRICT_R_HEADERS
+PKG_CPPFLAGS += -D_WIN32_WINNT=0x0600 -DSTRICT_R_HEADERS
 
 # Additional flags for libuv borrowed from libuv/Makefile.mingw
 LIBUV_CFLAGS = -Iinclude -Isrc -Isrc/win -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600
@@ -16,12 +16,7 @@
 # PKG_CPPFLAGS += -DDEBUG_THREAD -UNDEBUG
 
 
-$(SHLIB): libuv/libuv.a http-parser/http_parser.o sha1/sha1.o base64/base64.o
-
-libuv/libuv.a:
-	$(MAKE) --directory=libuv -f Makefile-libuv.mingw \
-		CC="$(CC)" CFLAGS="$(CFLAGS) $(LIBUV_CFLAGS) $(CPICFLAGS) $(C_VISIBILITY)" \
-		AR="$(AR)" RANLIB="$(RANLIB)" HAVE_DTRACE=0
+$(SHLIB): http-parser/http_parser.o sha1/sha1.o base64/base64.o
 
 clean:
 	$(MAKE) --directory=libuv distclean
diff -Nru orig/httpuv/src/set_invalid_parameter.c patched/httpuv/src/set_invalid_parameter.c
--- orig/httpuv/src/set_invalid_parameter.c	2020-06-05 18:40:07.000000000 +0200
+++ patched/httpuv/src/set_invalid_parameter.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-#ifdef _WIN32
-
-#include <stdlib.h>
-
-// These definitions are to make libuv work without linking to msvcr90
-
-typedef void (*_invalid_parameter_handler)(const wchar_t * expression, const wchar_t * function, const wchar_t * file, unsigned int line, uintptr_t pReserved);
-
-_invalid_parameter_handler _set_invalid_parameter_handler(_invalid_parameter_handler pNew) {
-	return NULL;
-}
-
-#else
-
-// Need to declare something to avoid "ISO C forbids an empty translation unit"
-// warning when compiling with -pedantic
-typedef int _set_invalid_parameter_dummy;
-
-#endif