diff --git a/doc/examples/makefile.am b/doc/examples/makefile.am
index bb2eb4f..8e668fc 100644
--- a/doc/examples/makefile.am
+++ b/doc/examples/makefile.am
@@ -20,26 +20,36 @@ if !MAC
 LDFLAGS += -lpcsclite
 endif
 endif
-if MINGW32
-LDFLAGS += /opt/local/i586-mingw32msvc/lib/winscard.a /opt/local/i586-mingw32msvc/lib/ssleay32.a -leay32
-else
+if !MINGW32
 LDFLAGS += -ldl -lpthread -lssl
 endif
 
 pcsc_demo_SOURCES = pcsc-demo.cxx
 pcsc_demo_LDFLAGS = -L${top_builddir}/src
 pcsc_demo_LDADD = -lcryptoki++
+if MINGW32
+pcsc_demo_LDADD += /opt/local/i586-mingw32msvc/lib/winscard.a
+endif
 
 cryptoki_demo_SOURCES = cryptoki-demo.cxx
 cryptoki_demo_LDADD = -lcryptoki++
 cryptoki_demo_LDFLAGS = -L${top_builddir}/src
+if MINGW32
+cryptoki_demo_LDADD += -leay32
+endif
 
 openssl_tcp_demo_SOURCES = openssl-tcp-demo.cxx
 openssl_tcp_demo_LDFLAGS = -L${top_builddir}/src
 openssl_tcp_demo_LDADD = -lcryptoki++
+if MINGW32
+openssl_tcp_demo_LDADD += /opt/local/i586-mingw32msvc/lib/ssleay32.a /opt/local/i586-mingw32msvc/lib/libeay32.a
+endif
 
 openssl_ssl_demo_SOURCES = openssl-ssl-demo.cxx
 openssl_ssl_demo_LDFLAGS = -L${top_builddir}/src
 openssl_ssl_demo_LDADD = -lcryptoki++
+if MINGW32
+openssl_ssl_demo_LDADD += /opt/local/i586-mingw32msvc/lib/ssleay32.a /opt/local/i586-mingw32msvc/lib/libeay32.a
+endif
 
 MAINTAINERCLEANFILES = makefile.in
diff --git a/src/pkcs11/pkcs11.h b/src/pkcs11/pkcs11.h
index bf1fe59..6274868 100644
--- a/src/pkcs11/pkcs11.h
+++ b/src/pkcs11/pkcs11.h
@@ -291,7 +291,7 @@
 #ifndef OPENCRYPTOKI_PKCS11_H
 #define OPENCRYPTOKI_PKCS11_H
 
-#include <opencryptoki/pkcs11types.h>
-#include <opencryptoki/apiclient.h>
+#include <pkcs11/pkcs11types.h>
+#include <pkcs11/apiclient.h>
 
 #endif