diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake
index bf67769b52..c33407373c 100644
--- a/src/or/Makefile.nmake
+++ b/src/or/Makefile.nmake
@@ -7,7 +7,8 @@ LIBS = ..\..\..\build-alpha\lib\libevent.lib \
  ..\..\..\build-alpha\lib\libcrypto.lib \
  ..\..\..\build-alpha\lib\libssl.lib \
  ..\..\..\build-alpha\lib\libz.lib \
- ws2_32.lib advapi32.lib shell32.lib
+ ws2_32.lib advapi32.lib shell32.lib \
+ crypt32.lib gdi32.lib user32.lib
 
 LIBTOR_OBJECTS = \
   addressmap.obj \
diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake
index 6d6af96af9..562c8df8b5 100644
--- a/src/test/Makefile.nmake
+++ b/src/test/Makefile.nmake
@@ -8,7 +8,8 @@ LIBS = ..\..\..\build-alpha\lib\libevent.lib \
  ..\..\..\build-alpha\lib\libssl.lib \
  ..\..\..\build-alpha\lib\libz.lib \
  ..\or\libtor.lib \
- ws2_32.lib advapi32.lib shell32.lib
+ ws2_32.lib advapi32.lib shell32.lib \
+ crypt32.lib gdi32.lib user32.lib
 
 TEST_OBJECTS = test.obj test_addr.obj test_containers.obj \
 	test_crypto.obj test_data.obj test_dir.obj test_microdesc.obj \
diff --git a/src/tools/Makefile.nmake b/src/tools/Makefile.nmake
index a30a28b2e1..fda1990e0b 100644
--- a/src/tools/Makefile.nmake
+++ b/src/tools/Makefile.nmake
@@ -6,8 +6,8 @@ LIBS = ..\..\..\build-alpha\lib\libevent.lib \
  ..\..\..\build-alpha\lib\libcrypto.lib \
  ..\..\..\build-alpha\lib\libssl.lib \
  ..\..\..\build-alpha\lib\libz.lib \
- ws2_32.lib advapi32.lib shell32.lib
-
+ ws2_32.lib advapi32.lib shell32.lib \
+ crypt32.lib gdi32.lib user32.lib
 
 tor-gencert.exe: tor-gencert.obj
 	$(CC) $(CFLAGS) $(LIBS) ..\common\*.lib tor-gencert.obj