diff --git a/lib/hx509/NTMakefile b/lib/hx509/NTMakefile
index bed0dacc8..0a36acc50 100644
--- a/lib/hx509/NTMakefile
+++ b/lib/hx509/NTMakefile
@@ -191,7 +191,10 @@ INCFILES=			    \
 	$(INCDIR)\hx509_err.h	    \
 	$(INCDIR)\ocsp_asn1.h	    \
 	$(INCDIR)\pkcs10_asn1.h	    \
-	$(INCDIR)\crmf_asn1.h
+	$(INCDIR)\crmf_asn1.h	    \
+	$(OBJ)\ocsp_asn1-priv.h	    \
+	$(OBJ)\pkcs10_asn1-priv.h   \
+	$(OBJ)\crmf_asn1-priv.h
 
 hxtool.c: $(OBJ)\hxtool-commands.h
 
@@ -203,7 +206,7 @@ $(OBJ)\hxtool-commands.c $(OBJ)\hxtool-commands.h: hxtool-commands.in $(SLC)
 	$(SLC) hxtool-commands.in
 	cd $(SRCDIR)
 
-$(BINDIR)\hxtool.exe: $(OBJ)\hxtool.obj $(OBJ)\hxtool-commands.obj $(LIBHX509) 
+$(BINDIR)\hxtool.exe: $(OBJ)\hxtool.obj $(OBJ)\hxtool-commands.obj $(LIBHX509)
 	$(EXECONLINK) $(LIBASN1) $(LIBHCRYPTO) $(LIBROKEN) $(LIBSL) $(LIBVERS) $(LIBWIND) $(LIBCOMERR)
 	$(_VC_MANIFEST_EMBED_EXE)
 	$(_VC_MANIFEST_CLEAN)
@@ -240,4 +243,3 @@ all:: $(INCFILES) $(LIBHX509) $(BINDIR)\hxtool.exe
 
 clean::
 	-$(RM) $(BINDIR)\hxtool.exe
-
diff --git a/lib/hx509/libhx509-exports.def b/lib/hx509/libhx509-exports.def
index 6f32e492c..868bac724 100644
--- a/lib/hx509/libhx509-exports.def
+++ b/lib/hx509/libhx509-exports.def
@@ -81,12 +81,14 @@ EXPORTS
 	hx509_certs_add
 	hx509_certs_append
 	hx509_certs_end_seq
+	hx509_certs_ref
 	hx509_certs_filter
 	hx509_certs_find
 	hx509_certs_free
 	hx509_certs_info
 	hx509_certs_init
-	hx509_certs_iter
+;	hx509_certs_iter
+	hx509_certs_iter_f
 	hx509_certs_merge
 	hx509_certs_next_cert
 	hx509_certs_start_seq
@@ -176,6 +178,7 @@ EXPORTS
 	hx509_pem_read
 	hx509_pem_write
 	hx509_print_stdout
+	hx509_print_cert
 	hx509_prompt_hidden
 	hx509_query_alloc
 	hx509_query_free