diff --git a/security/nss/lib/pki/asymmkey.c b/security/nss/lib/pki/asymmkey.c
index 734aeca5824e..455165a32c76 100644
--- a/security/nss/lib/pki/asymmkey.c
+++ b/security/nss/lib/pki/asymmkey.c
@@ -32,13 +32,19 @@
  */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: asymmkey.c,v $ $Revision: 1.2 $ $Date: 2001/09/13 22:16:20 $ $Name:  $";
+static const char CVS_ID[] = "@(#) $RCSfile: asymmkey.c,v $ $Revision: 1.3 $ $Date: 2001/10/11 18:41:50 $ $Name:  $";
 #endif /* DEBUG */
 
 #ifndef NSSPKI_H
 #include "nsspki.h"
 #endif /* NSSPKI_H */
 
+#ifndef BASE_H
+#include "base.h"
+#endif /* BASE_H */
+
+extern const NSSError NSS_ERROR_NOT_FOUND;
+
 NSS_IMPLEMENT PRStatus
 NSSPrivateKey_Destroy
 (
diff --git a/security/nss/lib/pki/certificate.c b/security/nss/lib/pki/certificate.c
index 0d610e1bc77f..5b82cc7359e5 100644
--- a/security/nss/lib/pki/certificate.c
+++ b/security/nss/lib/pki/certificate.c
@@ -32,7 +32,7 @@
  */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: certificate.c,v $ $Revision: 1.6 $ $Date: 2001/10/11 18:40:33 $ $Name:  $";
+static const char CVS_ID[] = "@(#) $RCSfile: certificate.c,v $ $Revision: 1.7 $ $Date: 2001/10/11 18:41:50 $ $Name:  $";
 #endif /* DEBUG */
 
 #ifndef NSSPKI_H
@@ -66,6 +66,8 @@ static const char CVS_ID[] = "@(#) $RCSfile: certificate.c,v $ $Revision: 1.6 $
 #include "base.h"
 #endif /* BASE_H */
 
+extern const NSSError NSS_ERROR_NOT_FOUND;
+
 /* Hm, sadly, I'm using PK11_HashBuf...  Need to get crypto context going to
  * get rid of that
  */
diff --git a/security/nss/lib/pki/cryptocontext.c b/security/nss/lib/pki/cryptocontext.c
index 5a01a7f440a2..7f3ebac48739 100644
--- a/security/nss/lib/pki/cryptocontext.c
+++ b/security/nss/lib/pki/cryptocontext.c
@@ -32,13 +32,15 @@
  */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: cryptocontext.c,v $ $Revision: 1.3 $ $Date: 2001/10/11 16:34:44 $ $Name:  $";
+static const char CVS_ID[] = "@(#) $RCSfile: cryptocontext.c,v $ $Revision: 1.4 $ $Date: 2001/10/11 18:41:50 $ $Name:  $";
 #endif /* DEBUG */
 
 #ifndef NSSPKI_H
 #include "nsspki.h"
 #endif /* NSSPKI_H */
 
+extern const NSSError NSS_ERROR_NOT_FOUND;
+
 NSS_IMPLEMENT PRStatus
 NSSCryptoContext_Destroy
 (
diff --git a/security/nss/lib/pki/symmkey.c b/security/nss/lib/pki/symmkey.c
index cd24e450da09..79cd531e48ab 100644
--- a/security/nss/lib/pki/symmkey.c
+++ b/security/nss/lib/pki/symmkey.c
@@ -32,13 +32,15 @@
  */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: symmkey.c,v $ $Revision: 1.2 $ $Date: 2001/09/13 22:16:22 $ $Name:  $";
+static const char CVS_ID[] = "@(#) $RCSfile: symmkey.c,v $ $Revision: 1.3 $ $Date: 2001/10/11 18:41:50 $ $Name:  $";
 #endif /* DEBUG */
 
 #ifndef NSSPKI_H
 #include "nsspki.h"
 #endif /* NSSPKI_H */
 
+extern const NSSError NSS_ERROR_NOT_FOUND;
+
 NSS_IMPLEMENT PRStatus
 NSSSymmetricKey_Destroy
 (
diff --git a/security/nss/lib/pki/trustdomain.c b/security/nss/lib/pki/trustdomain.c
index 155fd4cdc320..85af81bff802 100644
--- a/security/nss/lib/pki/trustdomain.c
+++ b/security/nss/lib/pki/trustdomain.c
@@ -32,7 +32,7 @@
  */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: trustdomain.c,v $ $Revision: 1.7 $ $Date: 2001/10/11 18:40:34 $ $Name:  $";
+static const char CVS_ID[] = "@(#) $RCSfile: trustdomain.c,v $ $Revision: 1.8 $ $Date: 2001/10/11 18:41:51 $ $Name:  $";
 #endif /* DEBUG */
 
 #ifndef NSSPKI_H
@@ -55,6 +55,8 @@ static const char CVS_ID[] = "@(#) $RCSfile: trustdomain.c,v $ $Revision: 1.7 $
 #include "ckhelper.h"
 #endif /* CKHELPER_H */
 
+extern const NSSError NSS_ERROR_NOT_FOUND;
+
 #define NSSTRUSTDOMAIN_DEFAULT_CACHE_SIZE 32
 
 NSS_EXTERN PRStatus