diff --git a/mozilla/security/nss/lib/softoken/pkcs11.h b/mozilla/security/nss/lib/softoken/pkcs11.h
index 28fd0cd8e18..9ada2625ea0 100644
--- a/mozilla/security/nss/lib/softoken/pkcs11.h
+++ b/mozilla/security/nss/lib/softoken/pkcs11.h
@@ -313,4 +313,12 @@ struct CK_FUNCTION_LIST {
 }
 #endif
 
+/* 
+** Functions called directly by applications to configure the FIPS token.
+*/
+extern void PK11_ConfigurePKCS11(char *man, char *libdes, char *tokdes, 
+		char *ptokdes, char *slotdes, char *pslotdes, char *fslotdes, 
+		char *fpslotdes, int minPwd, int pwdRequired);
+extern void PK11_ConfigureFIPS(char *slotdes, char *pslotdes);
+
 #endif
diff --git a/mozilla/security/nss/lib/softoken/softoken.h b/mozilla/security/nss/lib/softoken/softoken.h
index 03d1fd8cc0c..7c0d89efd9b 100644
--- a/mozilla/security/nss/lib/softoken/softoken.h
+++ b/mozilla/security/nss/lib/softoken/softoken.h
@@ -32,7 +32,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: softoken.h,v 1.1 2000-03-31 19:31:02 relyea%netscape.com Exp $
+ * $Id: softoken.h,v 1.1.4.1 2000-09-20 20:51:33 relyea%netscape.com Exp $
  */
 
 #ifndef _SOFTOKEN_H_
@@ -130,15 +130,6 @@ SECStatus RSA_DecryptRaw(SECKEYLowPrivateKey *key, unsigned char *output,
     			     unsigned int max_output_len,
 			     unsigned char *input, unsigned int input_len);
 
-
-/* 
-** Functions called directly by applications to configure the FIPS token.
-*/
-extern void PK11_ConfigurePKCS11(char *man, char *libdes, char *tokdes, 
-		char *ptokdes, char *slotdes, char *pslotdes, char *fslotdes, 
-		char *fpslotdes, int minPwd, int pwdRequired);
-extern void PK11_ConfigureFIPS(char *slotdes, char *pslotdes);
-
 /*
 ** Prepare a buffer for DES encryption, growing to the appropriate boundary,
 ** filling with the appropriate padding.