diff --git a/src/libopensc/Makefile.mak b/src/libopensc/Makefile.mak
index ac1564d3..26760ae2 100644
--- a/src/libopensc/Makefile.mak
+++ b/src/libopensc/Makefile.mak
@@ -58,5 +58,5 @@ opensc.dll: $(OBJECTS) $(LIBS)
 	link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:opensc.dll $(OBJECTS) $(LIBS) $(OPENPACE_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) gdi32.lib Comctl32.lib Shell32.lib user32.lib advapi32.lib ws2_32.lib
 	if EXIST opensc.dll.manifest mt -manifest opensc.dll.manifest -outputresource:opensc.dll;2
 
-opensc_a.lib: $(OBJECTS) $(LIBS)
-	lib $(LIBFLAGS) /out:opensc_a.lib $(OBJECTS) $(LIBS) $(OPENPACE_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) gdi32.lib Comctl32.lib Shell32.lib user32.lib advapi32.lib ws2_32.lib
+opensc_a.lib: $(OBJECTS)
+	lib $(LIBFLAGS) /out:opensc_a.lib $(OBJECTS)
diff --git a/src/minidriver/Makefile.mak b/src/minidriver/Makefile.mak
index da4c66f1..c63232bc 100644
--- a/src/minidriver/Makefile.mak
+++ b/src/minidriver/Makefile.mak
@@ -3,8 +3,14 @@ TOPDIR = ..\..
 TARGET = opensc-minidriver.dll
 OBJECTS = minidriver.obj versioninfo-minidriver.res
 LIBS = $(TOPDIR)\src\libopensc\opensc_a.lib \
-	   $(TOPDIR)\src\pkcs15init\pkcs15init.lib \
-	   $(TOPDIR)\src\common\libscdl.lib
+	   $(TOPDIR)\src\scconf\scconf.lib \
+	   $(TOPDIR)\src\common\common.lib \
+	   $(TOPDIR)\src\common\libscdl.lib \
+	   $(TOPDIR)\src\ui\strings.lib \
+	   $(TOPDIR)\src\ui\notify.lib \
+	   $(TOPDIR)\src\sm\libsmiso.lib \
+	   $(TOPDIR)\src\sm\libsmeac.lib \
+	   $(TOPDIR)\src\pkcs15init\pkcs15init.lib
 
 all: $(TARGET)
 
@@ -14,5 +20,5 @@ $(TARGET): $(OBJECTS) $(LIBS)
 	echo LIBRARY $* > $*.def
 	echo EXPORTS >> $*.def
 	type minidriver.exports >> $*.def
-	link /dll $(LINKFLAGS) /def:$*.def /out:$(TARGET) $(OBJECTS) $(LIBS) $(ZLIB_LIB) $(OPENPACE_LIB) $(OPENSSL_LIB) ws2_32.lib gdi32.lib Comctl32.lib advapi32.lib Crypt32.lib User32.lib bcrypt.lib DelayImp.lib Rpcrt4.lib /DELAYLOAD:bcrypt.dll
+	link /dll $(LINKFLAGS) /def:$*.def /out:$(TARGET) $(OBJECTS) $(LIBS) $(ZLIB_LIB) $(OPENPACE_LIB) $(OPENSSL_LIB) ws2_32.lib gdi32.lib Comctl32.lib advapi32.lib Crypt32.lib User32.lib bcrypt.lib DelayImp.lib Rpcrt4.lib Shell32.lib Comctl32.lib /DELAYLOAD:bcrypt.dll
 	if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2
diff --git a/src/pkcs11/Makefile.mak b/src/pkcs11/Makefile.mak
index dab37914..a420fa2a 100644
--- a/src/pkcs11/Makefile.mak
+++ b/src/pkcs11/Makefile.mak
@@ -9,7 +9,16 @@ OBJECTS			= pkcs11-global.obj pkcs11-session.obj pkcs11-object.obj misc.obj slot
 				  debug.obj pkcs11-display.obj versioninfo-pkcs11.res
 OBJECTS3		= pkcs11-spy.obj pkcs11-display.obj versioninfo-pkcs11-spy.res
 
-LIBS = $(TOPDIR)\src\libopensc\opensc_a.lib $(TOPDIR)\src\pkcs15init\pkcs15init.lib
+LIBS = $(TOPDIR)\src\libopensc\opensc_a.lib \
+	   $(TOPDIR)\src\pkcs15init\pkcs15init.lib \
+	   $(TOPDIR)\src\scconf\scconf.lib \
+	   $(TOPDIR)\src\common\common.lib \
+	   $(TOPDIR)\src\common\libscdl.lib \
+	   $(TOPDIR)\src\ui\strings.lib \
+	   $(TOPDIR)\src\ui\notify.lib \
+	   $(TOPDIR)\src\sm\libsmiso.lib \
+	   $(TOPDIR)\src\sm\libsmeac.lib \
+	   $(TOPDIR)\src\pkcs15init\pkcs15init.lib
 LIBS3 = $(TOPDIR)\src\common\libpkcs11.lib $(TOPDIR)\src\common\libscdl.lib $(TOPDIR)\src\common\common.lib
 
 all: $(TARGET1) $(TARGET2) $(TARGET3)
@@ -17,13 +26,13 @@ all: $(TARGET1) $(TARGET2) $(TARGET3)
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak
 
 $(TARGET1): $(OBJECTS) $(LIBS)
-	link $(LINKFLAGS) /dll /implib:$*.lib /out:$(TARGET1) $(OBJECTS) $(LIBS) $(OPENPACE_LIB) $(OPENSSL_LIB) gdi32.lib
+	link $(LINKFLAGS) /dll /implib:$*.lib /out:$(TARGET1) $(OBJECTS) $(LIBS) $(OPENPACE_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) gdi32.lib Comctl32.lib Shell32.lib user32.lib advapi32.lib ws2_32.lib Shell32.lib Comctl32.lib
 	if EXIST $(TARGET1).manifest mt -manifest $(TARGET1).manifest -outputresource:$(TARGET1);2
 
 $(TARGET2): $(OBJECTS) $(LIBS)
 	del pkcs11-global.obj
 	cl $(CODE_OPTIMIZATION) $(COPTS) /DMODULE_APP_NAME=\"onepin-opensc-pkcs11\" /c pkcs11-global.c
-	link $(LINKFLAGS) /dll /implib:$*.lib /out:$(TARGET2) $(OBJECTS) $(LIBS) $(OPENPACE_LIB) $(OPENSSL_LIB) gdi32.lib
+	link $(LINKFLAGS) /dll /implib:$*.lib /out:$(TARGET2) $(OBJECTS) $(LIBS) $(OPENPACE_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) gdi32.lib Comctl32.lib Shell32.lib user32.lib advapi32.lib ws2_32.lib Shell32.lib Comctl32.lib
 	if EXIST $(TARGET2).manifest mt -manifest $(TARGET2).manifest -outputresource:$(TARGET2);2
 
 $(TARGET3): $(OBJECTS3) $(LIBS3)
diff --git a/src/smm/Makefile.mak b/src/smm/Makefile.mak
index a50ccbc3..a0dbbdc6 100644
--- a/src/smm/Makefile.mak
+++ b/src/smm/Makefile.mak
@@ -3,7 +3,17 @@ TOPDIR = ..\..
 TARGET = smm-local.dll
 
 OBJECTS = smm-local.obj sm-global-platform.obj sm-cwa14890.obj sm-card-iasecc.obj sm-card-authentic.obj
-LIBS = $(TOPDIR)\src\sm\libsm.lib $(TOPDIR)\src\libopensc\opensc_a.lib $(TOPDIR)\src\common\libscdl.lib
+LIBS = $(TOPDIR)\src\sm\libsm.lib \
+	   $(TOPDIR)\src\libopensc\opensc_a.lib \
+	   $(TOPDIR)\src\pkcs15init\pkcs15init.lib \
+	   $(TOPDIR)\src\scconf\scconf.lib \
+	   $(TOPDIR)\src\common\common.lib \
+	   $(TOPDIR)\src\common\libscdl.lib \
+	   $(TOPDIR)\src\ui\strings.lib \
+	   $(TOPDIR)\src\ui\notify.lib \
+	   $(TOPDIR)\src\sm\libsmiso.lib \
+	   $(TOPDIR)\src\sm\libsmeac.lib \
+	   $(TOPDIR)\src\pkcs15init\pkcs15init.lib
 
 all: $(TARGET)
 
@@ -14,7 +24,7 @@ $(TARGET): $(OBJECTS) $(LIBS)
 	echo LIBRARY $* > $*.def
 	echo EXPORTS >> $*.def
 	type $*.exports >> $*.def
-	link /dll $(LINKFLAGS) /def:$*.def /out:$(TARGET) $(OBJECTS) $(LIBS) $(ZLIB_LIB) $(OPENPACE_LIB) $(OPENSSL_LIB) ws2_32.lib gdi32.lib advapi32.lib Crypt32.lib User32.lib
+	link /dll $(LINKFLAGS) /def:$*.def /out:$(TARGET) $(OBJECTS) $(LIBS) $(ZLIB_LIB) $(OPENPACE_LIB) $(OPENSSL_LIB) ws2_32.lib gdi32.lib advapi32.lib Crypt32.lib User32.lib Shell32.lib Comctl32.lib
 	if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2
 
 !ELSE