3 files changed, 32 insertions, 25 deletions
diff --git a/src/cert/cvc/cvc_gen_cert.h b/src/cert/cvc/cvc_gen_cert.h
index 4a788026c..797970e29 100644
--- a/src/cert/cvc/cvc_gen_cert.h
+++ b/src/cert/cvc/cvc_gen_cert.h
@@ -13,6 +13,7 @@
 #include <botan/eac_asn_obj.h>
 #include <botan/pubkey_enums.h>
 #include <botan/pubkey.h>
+#include <botan/ecdsa.h>
 #include <botan/ecdsa_sig.h>
 #include <string>
 #include <assert.h>
diff --git a/src/cert/cvc/info.txt b/src/cert/cvc/info.txt
index bdd496614..2033b9576 100644
--- a/src/cert/cvc/info.txt
+++ b/src/cert/cvc/info.txt
@@ -4,29 +4,32 @@ uses_tr1 yes
 
 load_on auto
 
-<add>
-asn1_eac_str.cpp
-asn1_eac_tm.cpp
-ecdsa_sig.cpp
-ecdsa_sig.h
-cvc_ado.cpp
+<header:public>
 cvc_ado.h
-cvc_ca.cpp
 cvc_ca.h
-cvc_cert.cpp
 cvc_cert.h
 cvc_gen_cert.h
 cvc_key.h
-cvc_req.cpp
 cvc_req.h
-cvc_self.cpp
 cvc_self.h
 eac_asn_obj.h
 eac_obj.h
-signed_obj.cpp
-signed_obj.h
+ecdsa_sig.h
 freestore.h
-</add>
+signed_obj.h
+</header:public>
+
+<source>
+asn1_eac_str.cpp
+asn1_eac_tm.cpp
+ecdsa_sig.cpp
+cvc_ado.cpp
+cvc_ca.cpp
+cvc_cert.cpp
+cvc_req.cpp
+cvc_self.cpp
+signed_obj.cpp
+</source>
 
 <requires>
 asn1
diff --git a/src/cert/x509/info.txt b/src/cert/x509/info.txt
index 37faea9fa..a5cd973a4 100644
--- a/src/cert/x509/info.txt
+++ b/src/cert/x509/info.txt
@@ -2,31 +2,34 @@ define X509
 
 load_on auto
 
-<add>
+<header:public>
 certstor.h
-certstor.cpp
-crl_ent.cpp
 crl_ent.h
 pkcs10.h
+x509_ca.h
+x509_crl.h
+x509_ext.h
+x509_obj.h
+x509cert.h
+x509find.h
+x509self.h
+x509stor.h
+</header:public>
+
+<source>
+certstor.cpp
+crl_ent.cpp
 pkcs10.cpp
 x509_ca.cpp
-x509_ca.h
 x509_crl.cpp
-x509_crl.h
 x509_ext.cpp
-x509_ext.h
 x509_obj.cpp
-x509_obj.h
 x509cert.cpp
-x509cert.h
 x509find.cpp
-x509find.h
 x509opt.cpp
 x509self.cpp
-x509self.h
 x509stor.cpp
-x509stor.h
-</add>
+</source>
 
 <requires>
 asn1