diff --git a/src/include/winconfig.h b/src/include/winconfig.h
index 8935a496..1cd1c5df 100644
--- a/src/include/winconfig.h
+++ b/src/include/winconfig.h
@@ -39,6 +39,7 @@
 #define HAVE_GETOPT_H
 #define HAVE_IO_H
 #define HAVE_GETPASS
+#define HAVE_PCSCLITE
 
 /* %windir% is replaced by the path of the Windows directory,
  * this is C:\WINNT or C:\WINDOWS on most systems.
diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am
index a1b4fc91..60bbd7ac 100644
--- a/src/libopensc/Makefile.am
+++ b/src/libopensc/Makefile.am
@@ -4,19 +4,7 @@ includedir = @includedir@/opensc
 
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST = Makefile.mak libopensc.pc.in \
-	reader-pcsc.c reader-openct.c reader-usbtoken.c emv.c
-
-if HAVE_PCSCLITE
-PCSC_SRC = reader-pcsc.c
-endif
-if HAVE_OPENCT
-OPENCT_SRC = reader-openct.c
-endif
-if HAVE_USBTOKEN
-USBTOKEN_SRC = reader-usbtoken.c
-endif
-READER_SRC = $(PCSC_SRC) $(OPENCT_SRC) $(USBTOKEN_SRC)
+EXTRA_DIST = Makefile.mak libopensc.pc.in
 
 INCLUDES = @CPPFLAGS@ @OPENCT_CFLAGS@ @CFLAGS_PCSC@
 LDFLAGS = @LDFLAGS@ @OPENCT_LDFLAGS@
@@ -27,10 +15,16 @@ lib_LTLIBRARIES = libopensc.la
 libopensc_la_SOURCES = \
 	sc.c ctx.c log.c errors.c portability.c module.c \
 	asn1.c base64.c sec.c card.c iso7816.c dir.c padding.c \
+	\
 	pkcs15.c pkcs15-cert.c pkcs15-data.c pkcs15-pin.c \
 	pkcs15-prkey.c pkcs15-pubkey.c pkcs15-sec.c \
 	pkcs15-wrap.c pkcs15-algo.c pkcs15-cache.c \
-	ctbcs.c reader-ctapi.c $(READER_SRC) \
+	\
+	emv.c \
+	\
+	ctbcs.c reader-ctapi.c reader-pcsc.c \
+	reader-openct.c reader-usbtoken.c \
+	\
 	card-setcos.c card-miocos.c card-flex.c card-gpk.c \
 	card-etoken.c card-tcos.c card-emv.c card-default.c \
 	card-mcrd.c card-starcos.c
diff --git a/src/libopensc/Makefile.mak b/src/libopensc/Makefile.mak
index 5c280a51..21e68906 100644
--- a/src/libopensc/Makefile.mak
+++ b/src/libopensc/Makefile.mak
@@ -9,17 +9,21 @@ HEADERS			= opensc.h pkcs15.h emv.h \
 
 HEADERSDIR		= $(TOPDIR)\src\include\opensc
 
-OBJECTS			= sc.obj ctx.obj module.obj asn1.obj log.obj base64.obj padding.obj \
-			  errors.obj sec.obj card.obj iso7816.obj dir.obj \
-			  portability.obj \
-			  pkcs15.obj pkcs15-cert.obj pkcs15-data.obj pkcs15-pin.obj \
-			  pkcs15-prkey.obj pkcs15-pubkey.obj pkcs15-sec.obj \
-			  pkcs15-wrap.obj pkcs15-algo.obj \
-			  pkcs15-cache.obj reader-pcsc.obj \
-                          card-setcos.obj card-miocos.obj card-flex.obj \
-                          card-gpk.obj card-etoken.obj card-tcos.obj \
-                          card-mcrd.obj card-emv.obj card-default.obj ctbcs.obj \
-                          card-starcos.obj
+OBJECTS			= \
+	sc.obj ctx.obj log.obj errors.obj portability.obj module.obj \
+	asn1.obj base64.obj sec.obj card.obj iso7816.obj dir.obj padding.obj \
+	\
+	pkcs15.obj pkcs15-cert.obj pkcs15-data.obj pkcs15-pin.obj \
+	pkcs15-prkey.obj pkcs15-pubkey.obj pkcs15-sec.obj \
+	pkcs15-wrap.obj pkcs15-algo.obj pkcs15-cache.obj \
+	\
+	emv.obj \
+	\
+	ctbcs.obj reader-ctapi.obj reader-pcsc.obj \
+	\
+	card-setcos.obj card-miocos.obj card-flex.obj card-gpk.obj \
+	card-etoken.obj card-tcos.obj card-emv.obj card-default.obj \
+	card-mcrd.obj card-starcos.obj
 
 all: install-headers $(TARGET)
 
diff --git a/src/libopensc/asn1.c b/src/libopensc/asn1.c
index 982426a8..17c5f453 100644
--- a/src/libopensc/asn1.c
+++ b/src/libopensc/asn1.c
@@ -20,7 +20,6 @@
 
 #include "internal.h"
 #include "asn1.h"
-#include "log.h"
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/src/libopensc/card-default.c b/src/libopensc/card-default.c
index c542fcb8..c191fe36 100644
--- a/src/libopensc/card-default.c
+++ b/src/libopensc/card-default.c
@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 
 static struct sc_card_operations default_ops;
 static struct sc_card_driver default_drv = {
diff --git a/src/libopensc/card-emv.c b/src/libopensc/card-emv.c
index 2799712d..9868b008 100644
--- a/src/libopensc/card-emv.c
+++ b/src/libopensc/card-emv.c
@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #include <string.h>
 
 static struct sc_card_operations emv_ops;
diff --git a/src/libopensc/card-etoken.c b/src/libopensc/card-etoken.c
index 46fb145b..5d9a515e 100644
--- a/src/libopensc/card-etoken.c
+++ b/src/libopensc/card-etoken.c
@@ -21,10 +21,7 @@
  */
 
 #include "internal.h"
-#include "errors.h"
-#include "opensc.h"
 #include "cardctl.h"
-#include "log.h"
 #include <ctype.h>
 #include <string.h>
 
diff --git a/src/libopensc/card-flex.c b/src/libopensc/card-flex.c
index 20c1f4cf..faca4a5c 100644
--- a/src/libopensc/card-flex.c
+++ b/src/libopensc/card-flex.c
@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #include "cardctl.h"
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/libopensc/card-gpk.c b/src/libopensc/card-gpk.c
index 9025f4f6..33b5b830 100644
--- a/src/libopensc/card-gpk.c
+++ b/src/libopensc/card-gpk.c
@@ -19,10 +19,8 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #include "cardctl.h"
 #include "pkcs15.h"
-
 #ifdef HAVE_OPENSSL
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/libopensc/card-mcrd.c b/src/libopensc/card-mcrd.c
index 7c84be71..ae41617a 100644
--- a/src/libopensc/card-mcrd.c
+++ b/src/libopensc/card-mcrd.c
@@ -19,10 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-
-
 #include "internal.h"
-#include "log.h"
 #include "asn1.h"
 #include "cardctl.h"
 #include <stdlib.h>
diff --git a/src/libopensc/card-miocos.c b/src/libopensc/card-miocos.c
index 87afba95..a7e2cc54 100644
--- a/src/libopensc/card-miocos.c
+++ b/src/libopensc/card-miocos.c
@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #include "asn1.h"
 #include "cardctl.h"
 #include <stdlib.h>
diff --git a/src/libopensc/card-setcos.c b/src/libopensc/card-setcos.c
index a39305b8..7ee138dd 100644
--- a/src/libopensc/card-setcos.c
+++ b/src/libopensc/card-setcos.c
@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/libopensc/card-starcos.c b/src/libopensc/card-starcos.c
index 67b967aa..0fc0459b 100644
--- a/src/libopensc/card-starcos.c
+++ b/src/libopensc/card-starcos.c
@@ -18,14 +18,11 @@
  * 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 <stdlib.h>
-#include <string.h>
-
 #include "internal.h"
 #include "asn1.h"
-#include "log.h"
 #include "cardctl.h"
-
+#include <stdlib.h>
+#include <string.h>
 
 /* TODO: - secure messaging 
  *       - Starcos ACs <-> OpenSC ACs
diff --git a/src/libopensc/card-tcos.c b/src/libopensc/card-tcos.c
index c5778d55..3e208ebf 100644
--- a/src/libopensc/card-tcos.c
+++ b/src/libopensc/card-tcos.c
@@ -20,7 +20,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #include "asn1.h"
 #include "cardctl.h"
 #include <string.h>
diff --git a/src/libopensc/card.c b/src/libopensc/card.c
index cb2e4a54..0a90377f 100644
--- a/src/libopensc/card.c
+++ b/src/libopensc/card.c
@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #include "asn1.h"
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/libopensc/ctbcs.c b/src/libopensc/ctbcs.c
index fb951d8c..37b74326 100644
--- a/src/libopensc/ctbcs.c
+++ b/src/libopensc/ctbcs.c
@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #include "ctbcs.h"
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/libopensc/ctx.c b/src/libopensc/ctx.c
index 8d64387b..72c27807 100644
--- a/src/libopensc/ctx.c
+++ b/src/libopensc/ctx.c
@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -70,11 +69,11 @@ static const struct _sc_driver_entry internal_card_drivers[] = {
 };
 
 static const struct _sc_driver_entry internal_reader_drivers[] = {
-#if defined(HAVE_PCSCLITE) || defined(_WIN32)
+#if defined(HAVE_PCSCLITE)
 	{ "pcsc", (void *) sc_get_pcsc_driver, NULL },
 #endif
 #ifndef _WIN32
-        { "ctapi", (void *) sc_get_ctapi_driver, NULL },
+	{ "ctapi", (void *) sc_get_ctapi_driver, NULL },
 #ifdef HAVE_OPENCT
 	{ "openct", (void *) sc_get_openct_driver, NULL },
 #endif
diff --git a/src/libopensc/dir.c b/src/libopensc/dir.c
index 9410afdb..2d067e10 100644
--- a/src/libopensc/dir.c
+++ b/src/libopensc/dir.c
@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #include "asn1.h"
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/libopensc/internal.h b/src/libopensc/internal.h
index f5d625d0..9eced9fe 100644
--- a/src/libopensc/internal.h
+++ b/src/libopensc/internal.h
@@ -30,6 +30,7 @@ extern "C" {
 #endif
 
 #include "opensc.h"
+#include "log.h"
 #include <assert.h>
 
 #define SC_FILE_MAGIC			0x14426950
diff --git a/src/libopensc/iso7816.c b/src/libopensc/iso7816.c
index 7ecb4f02..8a6f58b3 100644
--- a/src/libopensc/iso7816.c
+++ b/src/libopensc/iso7816.c
@@ -20,8 +20,6 @@
 
 #include "internal.h"
 #include "asn1.h"
-#include "log.h"
-
 #include <assert.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/src/libopensc/log.c b/src/libopensc/log.c
index 4816826b..0a897dd6 100644
--- a/src/libopensc/log.c
+++ b/src/libopensc/log.c
@@ -20,7 +20,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #include <stdarg.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/src/libopensc/module.c b/src/libopensc/module.c
index d5898f51..7becd787 100644
--- a/src/libopensc/module.c
+++ b/src/libopensc/module.c
@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
diff --git a/src/libopensc/padding.c b/src/libopensc/padding.c
index e3708527..2386049c 100644
--- a/src/libopensc/padding.c
+++ b/src/libopensc/padding.c
@@ -19,14 +19,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
 
-#include "errors.h"
-#include "internal.h"
-#include "log.h"
-
 /* TODO doxygen comments */
 
 /*
diff --git a/src/libopensc/pkcs15-algo.c b/src/libopensc/pkcs15-algo.c
index e98a1f66..7cffe895 100644
--- a/src/libopensc/pkcs15-algo.c
+++ b/src/libopensc/pkcs15-algo.c
@@ -20,7 +20,6 @@
 
 #include "internal.h"
 #include "asn1.h"
-#include "log.h"
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/src/libopensc/pkcs15-cache.c b/src/libopensc/pkcs15-cache.c
index 98353ed3..02d5b245 100644
--- a/src/libopensc/pkcs15-cache.c
+++ b/src/libopensc/pkcs15-cache.c
@@ -20,7 +20,6 @@
 
 #include "internal.h"
 #include "pkcs15.h"
-#include "log.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/libopensc/pkcs15-cert.c b/src/libopensc/pkcs15-cert.c
index 4b6b351a..3e984376 100644
--- a/src/libopensc/pkcs15-cert.c
+++ b/src/libopensc/pkcs15-cert.c
@@ -20,7 +20,6 @@
 
 #include "internal.h"
 #include "pkcs15.h"
-#include "log.h"
 #include "asn1.h"
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/libopensc/pkcs15-data.c b/src/libopensc/pkcs15-data.c
index a33a5518..3c52b743 100644
--- a/src/libopensc/pkcs15-data.c
+++ b/src/libopensc/pkcs15-data.c
@@ -22,7 +22,6 @@
 
 #include "internal.h"
 #include "pkcs15.h"
-#include "log.h"
 #include "asn1.h"
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/libopensc/pkcs15-pin.c b/src/libopensc/pkcs15-pin.c
index fb27ae1f..3864af9d 100644
--- a/src/libopensc/pkcs15-pin.c
+++ b/src/libopensc/pkcs15-pin.c
@@ -21,7 +21,6 @@
 #include "internal.h"
 #include "pkcs15.h"
 #include "asn1.h"
-#include "log.h"
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/libopensc/pkcs15-prkey.c b/src/libopensc/pkcs15-prkey.c
index 84379277..ce009c3a 100644
--- a/src/libopensc/pkcs15-prkey.c
+++ b/src/libopensc/pkcs15-prkey.c
@@ -21,7 +21,6 @@
 #include "internal.h"
 #include "pkcs15.h"
 #include "asn1.h"
-#include "log.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/libopensc/pkcs15-pubkey.c b/src/libopensc/pkcs15-pubkey.c
index 2dc7f27d..13a3d82a 100644
--- a/src/libopensc/pkcs15-pubkey.c
+++ b/src/libopensc/pkcs15-pubkey.c
@@ -21,7 +21,6 @@
 #include "internal.h"
 #include "pkcs15.h"
 #include "asn1.h"
-#include "log.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/libopensc/pkcs15-sec.c b/src/libopensc/pkcs15-sec.c
index 569d332c..b9e54b32 100644
--- a/src/libopensc/pkcs15-sec.c
+++ b/src/libopensc/pkcs15-sec.c
@@ -20,7 +20,6 @@
 
 #include "internal.h"
 #include "pkcs15.h"
-#include "log.h"
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/libopensc/pkcs15-wrap.c b/src/libopensc/pkcs15-wrap.c
index 8941f176..04c59e54 100644
--- a/src/libopensc/pkcs15-wrap.c
+++ b/src/libopensc/pkcs15-wrap.c
@@ -18,10 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "opensc.h"
 #include "internal.h"
 #include "pkcs15.h"
-#include "log.h"
 #ifdef HAVE_OPENSSL
 #include <openssl/evp.h>
 #include <openssl/rand.h>
diff --git a/src/libopensc/pkcs15.c b/src/libopensc/pkcs15.c
index b3d23052..3580d874 100644
--- a/src/libopensc/pkcs15.c
+++ b/src/libopensc/pkcs15.c
@@ -21,7 +21,6 @@
 #include "internal.h"
 #include "pkcs15.h"
 #include "asn1.h"
-#include "log.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/libopensc/portability.c b/src/libopensc/portability.c
index 27885274..2ddcc3a4 100644
--- a/src/libopensc/portability.c
+++ b/src/libopensc/portability.c
@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "opensc.h"
 #include <assert.h>
 #include <stdlib.h>
 #ifndef _WIN32
diff --git a/src/libopensc/reader-ctapi.c b/src/libopensc/reader-ctapi.c
index b3bf3caf..5d2a42bd 100644
--- a/src/libopensc/reader-ctapi.c
+++ b/src/libopensc/reader-ctapi.c
@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #include "ctbcs.h"
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/libopensc/reader-openct.c b/src/libopensc/reader-openct.c
index a466abcf..5aa2b892 100644
--- a/src/libopensc/reader-openct.c
+++ b/src/libopensc/reader-openct.c
@@ -4,6 +4,8 @@
  * Copyright (C) 2003  Olaf Kirch <okir@suse.de>
  */
 
+#include "internal.h"
+#ifdef HAVE_OPENCT
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
@@ -12,16 +14,13 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-
+#endif
 #include <openct/openct.h>
 #include <openct/logging.h>
 #include <openct/error.h>
 
-#include "opensc.h"
-#include "internal.h"
-#include "log.h"
-
 /* If you set PREALLOCATE to a non-zero value, this backend
  * will allocate that many reader slots. This will allow hot-
  * plugging devices (such as USB tokens) while OpenSC is running.
@@ -445,3 +444,5 @@ openct_error(struct sc_reader *reader, int code)
 	}
 	return SC_ERROR_READER;
 }
+
+#endif	/* HAVE_OPENCT */
diff --git a/src/libopensc/reader-pcsc.c b/src/libopensc/reader-pcsc.c
index 4d0a4ec7..10f55009 100644
--- a/src/libopensc/reader-pcsc.c
+++ b/src/libopensc/reader-pcsc.c
@@ -19,8 +19,7 @@
  */
 
 #include "internal.h"
-#include "log.h"
-#include "opensc.h"
+#ifdef HAVE_PCSCLITE
 #include "ctbcs.h"
 #include <assert.h>
 #include <stdlib.h>
@@ -608,3 +607,5 @@ const struct sc_reader_driver * sc_get_pcsc_driver()
 	
 	return &pcsc_drv;
 }
+
+#endif	/* HAVE_PCSCLITE */
diff --git a/src/libopensc/reader-usbtoken.c b/src/libopensc/reader-usbtoken.c
index 9c7b6ca4..cbb5a402 100644
--- a/src/libopensc/reader-usbtoken.c
+++ b/src/libopensc/reader-usbtoken.c
@@ -4,6 +4,8 @@
  * Copyright (C) 2002  Andreas Jellinghaus <aj@dungeon.inka.de>
  */
 
+#include "internal.h"
+#ifdef HAVE_USBTOKEN
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
@@ -13,11 +15,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-
-#include "opensc.h"
-#include "internal.h"
-#include "log.h"
+#endif
 
 /* we will create that many usbtoken readers */
 #define READERS 5
@@ -350,3 +350,5 @@ int usbtoken_reader_unlock(struct sc_reader *reader,
 	SC_FUNC_CALLED(reader->ctx, 4);
 	return usbtoken_reader_unix_cmd(reader, slot, 5);
 }
+
+#endif	/* HAVE_USBTOKEN */
diff --git a/src/libopensc/sc.c b/src/libopensc/sc.c
index b948369b..433da9da 100644
--- a/src/libopensc/sc.c
+++ b/src/libopensc/sc.c
@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #include "asn1.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/libopensc/sec.c b/src/libopensc/sec.c
index c541626c..fa7bd6f8 100644
--- a/src/libopensc/sec.c
+++ b/src/libopensc/sec.c
@@ -19,7 +19,6 @@
  */
 
 #include "internal.h"
-#include "log.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif