diff --git a/npa/Makefile.am b/npa/Makefile.am
index 7d8a6d2..858e3a3 100644
--- a/npa/Makefile.am
+++ b/npa/Makefile.am
@@ -16,10 +16,13 @@ do_subst = sed \
 	   -e 's,[@]top_srcdir[@],$(top_srcdir),g'
 
 win:
-	cd $(top_srcdir)/src/opensc && \
-	    ./bootstrap && \
-	    ./configure --disable-doc && \
-	    env OPENSSL_VERSION="1" OPENSSL_URL="https://www2.informatik.hu-berlin.de/~morgner/files/openssl-1.tar.gz" EXTRA_OPENSSL_CONFIG="experimental-pace" win32/installer_from_build.sh
+	make clean
+	env CHOST=i586-mingw32msvc CBUILD=i686-pc-linux-gnu ./configure \
+		--sbindir=/bin \
+		OPENSSL_CFLAGS="-I`pwd`/src/opensc/win32/build/image/opensc/include" \
+		OPENSSL_LIBS="-L`pwd`/src/opensc/win32/build/image/opensc/lib -lcrypto" \
+		OPENSC_LIBS="-L`pwd`/src/opensc/win32/build/image/opensc/lib -lopensc"
+	make install DESTDIR=`pwd`/src/opensc/win32/build/image/opensc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnpa.pc
diff --git a/npa/src/npa/scutil.h b/npa/src/npa/scutil.h
index f97eb86..c35bf83 100644
--- a/npa/src/npa/scutil.h
+++ b/npa/src/npa/scutil.h
@@ -40,18 +40,6 @@
 int initialize(int reader_id, const char *cdriver, int verbose,
         sc_context_t **ctx, sc_reader_t **reader);
 
-/** 
- * @brief Parse an APDU buffer
- * 
- * @param[in]      ctx  sc context
- * @param[in]      buf  Buffer of APDU
- * @param[in]      len  Length of \a buf
- * @param [in,out] apdu Where to write the initialized APDU
- * 
- * @return \c SC_SUCCESS or error code if an error occurred
- */
-int build_apdu(sc_context_t *ctx, const u8 *buf, size_t len, sc_apdu_t *apdu);
-
 /** 
  * @brief Print binary data to a file stream
  *