@@ -1,53 +1,67 @@
 AC_DEFUN(DC_PCSC_HEADERS, [
 	SAVE_CFLAGS="${CFLAGS}"
 	SAVE_CPPFLAGS="${CPPFLAGS}"
 	ADD_CFLAGS=""
 	ADD_CPPFLAGS=""
+
+	found_pcsclite=0
+	found_winscard=0
+	found_wintypes=0
 
 	for headerpath in /usr/include /usr/local/include /usr/cac/include; do
 		for subdir in smartcard PCSC pcsc pcsclite ""; do
 			headerdir="${headerpath}/${subdir}"
 			CFLAGS="${SAVE_CFLAGS} -I${headerdir}"
 			CPPFLAGS="${SAVE_CPPFLAGS} -I${headerdir}"
 
 			unset ac_cv_header_pcsclite_h
 			unset ac_cv_header_winscard_h
+			unset ac_cv_header_wintypes_h
+
+			just_found_pcsclite=0
+			just_found_winscard=0
+			just_found_wintypes=0
 
 			AC_CHECK_HEADER(pcsclite.h, [
 				AC_DEFINE(HAVE_PCSCLITE_H, [1], [Define if you have the PCSC-Lite header file (you should)])
 
-				ADD_CFLAGS=" -I${headerdir}"
-				ADD_CPPFLAGS=" -I${headerdir}"
-
-				break
+				found_pcsclite=1
+				just_found_pcsclite=1
 			])
 
 			AC_CHECK_HEADER(winscard.h, [
 				AC_DEFINE(HAVE_WINSCARD_H, [1], [Define if you have the PCSC-Lite header file (you should)])
 
+				found_winscard=1
+				just_found_winscard=1
+			])
+
+			AC_CHECK_HEADER(wintypes.h, [
+				AC_DEFINE(HAVE_WINTYPES_H, [1], [Define if you have the PCSC-Lite header file (you should)])
+
+				found_wintypes=1
+				just_found_wintypes=1
+			])
+
+			if test "${just_found_pcsclite}" = 1 -a "${just_found_winscard}" = 1 -a "${just_found_wintypes}" = 1; then
 				ADD_CFLAGS=" -I${headerdir}"
 				ADD_CPPFLAGS=" -I${headerdir}"
+			fi
 
+			if test "${found_pcsclite}" = 1 -a "${found_winscard}" = 1 -a "${found_wintypes}" = 1; then
 				break
-			])
+			fi
 		done
 
 		if test -n "${ADD_CFLAGS}" -o -n "${ADD_CPPFLAGS}"; then
 			break
 		fi
 	done
 
 	CFLAGS="${SAVE_CFLAGS}${ADD_CFLAGS}"
 	CPPFLAGS="${SAVE_CPPFLAGS}${ADD_CPPFLAGS}"
-
-	unset ac_cv_header_winscard_h
-	AC_CHECK_HEADER(winscard.h, [
-		AC_DEFINE(HAVE_WINSCARD_H, [1], [Define if you have the PCSC-Lite header file (you should)])
-	], [
-		AC_MSG_WARN([unable to find winscard.h from PC/SC, compilation will likely fail.])
-	])
 ])
 
 AC_DEFUN(DC_PCSC_LIBS, [
 	foundlib="0"
 	for lib in pcsclite pcsc-lite pcsc; do