diff --git a/mozilla/security/nss/lib/certdb/certt.h b/mozilla/security/nss/lib/certdb/certt.h
index 3d93365ff77..02a9eec4762 100644
--- a/mozilla/security/nss/lib/certdb/certt.h
+++ b/mozilla/security/nss/lib/certdb/certt.h
@@ -33,7 +33,7 @@
 /*
  * certt.h - public data structures for the certificate library
  *
- * $Id: certt.h,v 1.3 2001-01-07 08:12:48 nelsonb%netscape.com Exp $
+ * $Id: certt.h,v 1.4 2001-01-07 09:21:23 nelsonb%netscape.com Exp $
  */
 #ifndef _CERTT_H_
 #define _CERTT_H_
@@ -804,11 +804,11 @@ extern const SEC_ASN1Template CERT_SetOfAttributeTemplate[];
 /* These functions simply return the address of the above-declared templates.
 ** This is necessary for Windows DLLs.  Sigh.
 */
-SEC_ASN1_CHOOSER_DECLARE(CERT_CertificateRequestTemplate);
-SEC_ASN1_CHOOSER_DECLARE(CERT_CertificateTemplate);
-SEC_ASN1_CHOOSER_DECLARE(CERT_CrlTemplate);
-SEC_ASN1_CHOOSER_DECLARE(CERT_IssuerAndSNTemplate);
-SEC_ASN1_CHOOSER_DECLARE(CERT_SetOfSignedCrlTemplate);
-SEC_ASN1_CHOOSER_DECLARE(CERT_SignedDataTemplate);
+SEC_ASN1_CHOOSER_DECLARE(CERT_CertificateRequestTemplate)
+SEC_ASN1_CHOOSER_DECLARE(CERT_CertificateTemplate)
+SEC_ASN1_CHOOSER_DECLARE(CERT_CrlTemplate)
+SEC_ASN1_CHOOSER_DECLARE(CERT_IssuerAndSNTemplate)
+SEC_ASN1_CHOOSER_DECLARE(CERT_SetOfSignedCrlTemplate)
+SEC_ASN1_CHOOSER_DECLARE(CERT_SignedDataTemplate)
 
 #endif /* _CERTT_H_ */
diff --git a/mozilla/security/nss/lib/util/secasn1t.h b/mozilla/security/nss/lib/util/secasn1t.h
index 60a7522774d..ae02ae8de2d 100644
--- a/mozilla/security/nss/lib/util/secasn1t.h
+++ b/mozilla/security/nss/lib/util/secasn1t.h
@@ -35,7 +35,7 @@
  * Types for encoding/decoding of ASN.1 using BER/DER (Basic/Distinguished
  * Encoding Rules).
  *
- * $Id: secasn1t.h,v 1.2 2001-01-07 08:13:12 nelsonb%netscape.com Exp $
+ * $Id: secasn1t.h,v 1.3 2001-01-07 09:21:25 nelsonb%netscape.com Exp $
  */
 
 #ifndef _SECASN1T_H_
@@ -207,7 +207,7 @@ static const SEC_ASN1TemplateChooserPtr p_NSS_Get_##x = &NSS_Get_##x;
 #endif
 
 #define SEC_ASN1_CHOOSER_DECLARE(x) \
-extern SEC_ASN1TemplateChooser NSS_Get_##x;
+extern const SEC_ASN1Template * NSS_Get_##x (void *arg, PRBool enc);
 
 #define SEC_ASN1_CHOOSER_IMPLEMENT(x) \
 const SEC_ASN1Template * NSS_Get_##x(void * arg, PRBool enc) \