diff --git a/src/common/Makefile.mak b/src/common/Makefile.mak
index 1a5937b0..4a532028 100644
--- a/src/common/Makefile.mak
+++ b/src/common/Makefile.mak
@@ -1,9 +1,9 @@
 TOPDIR = ..\..
 
-HEADERS = getopt.h my_getopt.h
+HEADERS = my_getopt.h strlcpy.h
 HEADERSDIR = $(TOPDIR)\src\include
 TARGET = common.lib
-OBJECTS = getpass.obj my_getopt.obj
+OBJECTS = getpass.obj my_getopt.obj strlcpy.obj
 
 all: install-headers $(TARGET)
 
diff --git a/src/include/winconfig.h b/src/include/winconfig.h
index 67101341..222fc012 100644
--- a/src/include/winconfig.h
+++ b/src/include/winconfig.h
@@ -64,7 +64,6 @@
 #define F_OK  0		/* test whether exist.  */
 #endif
 
-#define HAVE_GETOPT_H
 #define HAVE_IO_H
 #define HAVE_GETPASS
 #define HAVE_PCSC
@@ -72,7 +71,7 @@
 #define PATH_MAX _MAX_PATH
 
 #ifndef VERSION
-#define VERSION "0.11.1"
+#define VERSION "0.11.2"
 #endif
 
 /* src/common/getpass.c */
diff --git a/src/libopensc/pkcs15-piv.c b/src/libopensc/pkcs15-piv.c
index 6c7d5d6b..735da44b 100644
--- a/src/libopensc/pkcs15-piv.c
+++ b/src/libopensc/pkcs15-piv.c
@@ -19,6 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "internal.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/pkcs11/Makefile.mak b/src/pkcs11/Makefile.mak
index 9c28b953..9572bb7b 100644
--- a/src/pkcs11/Makefile.mak
+++ b/src/pkcs11/Makefile.mak
@@ -20,8 +20,8 @@ all: install-headers install-headers-dir $(TARGET) $(TARGET2) $(TARGET3)
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak
 
-$(TARGET): $(OBJECTS) ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib
-	link $(LINKFLAGS) /dll /out:$(TARGET) $(OBJECTS) ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib winscard.lib $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
+$(TARGET): $(OBJECTS) ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib
+	link $(LINKFLAGS) /dll /out:$(TARGET) $(OBJECTS) ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib winscard.lib $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
 
 $(TARGET2): $(OBJECTS2)
 	lib /nologo /machine:ix86 /out:$(TARGET2) $(OBJECTS2) $(LIBLTDL_LIB)
diff --git a/src/tools/eidenv.c b/src/tools/eidenv.c
index 3946944e..7642cbeb 100644
--- a/src/tools/eidenv.c
+++ b/src/tools/eidenv.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #endif
 #include <stdlib.h>
-#include <getopt.h>
+#include <my_getopt.h>
 #include <string.h>
 #include <opensc/opensc.h>
 #include <opensc/asn1.h>
diff --git a/src/tools/netkey-tool.c b/src/tools/netkey-tool.c
index f512c1ee..685a962c 100644
--- a/src/tools/netkey-tool.c
+++ b/src/tools/netkey-tool.c
@@ -33,9 +33,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_GETOPT_H
-# include <getopt.h>
-#endif
+#include <my_getopt.h>
 #include <string.h>
 #include <errno.h>
 #include <opensc/opensc.h>
diff --git a/src/tools/util.h b/src/tools/util.h
index 342f6ead..97709a7b 100644
--- a/src/tools/util.h
+++ b/src/tools/util.h
@@ -16,9 +16,7 @@
 #include <unistd.h>
 #endif
 #include <sys/stat.h>
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
+#include <my_getopt.h>
 #include <opensc/opensc.h>
 
 #ifdef __cplusplus
diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak
index 28737f66..8374fbcd 100644
--- a/win32/Make.rules.mak
+++ b/win32/Make.rules.mak
@@ -21,7 +21,7 @@ OPENSSL_LIB = C:\openssl\out32dll\libeay32.lib
 PROGRAMS_OPENSSL = pkcs15-init.exe cryptoflex-tool.exe netkey-tool.exe
 !ENDIF
 
-COPTS = /D_CRT_SECURE_NO_DEPRECATE /Zi /MD /nologo /DHAVE_CONFIG_H /I$(TOPDIR)\src\include /I$(TOPDIR)\src\include\opensc $(OPENSSL_INCL_DIR) $(LIBLTDL_INCL) /D_WIN32_WINNT=0x0400 $(OPENSSL_DEF)
+COPTS = /D_CRT_SECURE_NO_DEPRECATE /Zi /MD /nologo /DHAVE_CONFIG_H /I$(TOPDIR)\src\include /I$(TOPDIR)\src\include\opensc /I$(TOPDIR)\src\common $(OPENSSL_INCL_DIR) $(LIBLTDL_INCL) /D_WIN32_WINNT=0x0400 $(OPENSSL_DEF)
 LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86