hx509: explicitly include ref/pkcs11.h

review comment from Nico Williams: explicitly include ref/pkcs11.h to
avoid any conflict with system PKCS#11 header

lib/hx509/Makefile.am

@@ -107,7 +107,7 @@ libhx509_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map
 endif
 $(libhx509_la_OBJECTS): $(srcdir)/version-script.map $(nodist_include_HEADERS) $(priv_headers)
 
-libhx509_la_CPPFLAGS = -I$(srcdir)/ref $(INCLUDE_hcrypto)
+libhx509_la_CPPFLAGS = $(INCLUDE_hcrypto)
 nodist_libhx509_la_SOURCES = $(BUILT_SOURCES)
 
 $(gen_files_ocsp) ocsp_asn1.hx ocsp_asn1-priv.hx: ocsp_asn1_files
@@ -207,7 +207,7 @@ check_PROGRAMS = $(PROGRAM_TESTS) test_soft_pkcs11
 LDADD = libhx509.la
 
 test_soft_pkcs11_LDADD = libhx509.la
-test_soft_pkcs11_CPPFLAGS = $(INCLUDE_hcrypto) -I$(srcdir)/ref
+test_soft_pkcs11_CPPFLAGS = $(INCLUDE_hcrypto)
 
 test_name_CPPFLAGS = $(INCLUDE_hcrypto)
 test_name_LDADD = libhx509.la $(LIB_roken)

lib/hx509/NTMakefile

@@ -30,7 +30,7 @@
 # 
 
 RELDIR=lib\hx509
-intcflags=-I$(SRCDIR)\ref -I$(OBJ)
+intcflags=-I$(OBJ)
 localcflags=-DASN1_LIB
 
 !include ../../windows/NTMakefile.w32

lib/hx509/ks_p11.c

@@ -38,7 +38,7 @@
 
 #ifdef HAVE_DLOPEN
 
-#include "pkcs11.h"
+#include "ref/pkcs11.h"
 
 struct p11_slot {
     int flags;

lib/hx509/softp11.c

@@ -34,7 +34,7 @@
 #define CRYPTOKI_EXPORTS 1
 
 #include "hx_locl.h"
-#include "pkcs11.h"
+#include "ref/pkcs11.h"
 
 #define OBJECT_ID_MASK		0xfff
 #define HANDLE_OBJECT_ID(h)	((h) & OBJECT_ID_MASK)

lib/hx509/test_soft_pkcs11.c

@@ -32,7 +32,7 @@
  */
 
 #include "hx_locl.h"
-#include "pkcs11.h"
+#include "ref/pkcs11.h"
 #include <err.h>
 
 static CK_FUNCTION_LIST_PTR func;