diff --git a/mozilla/security/nss/cmd/rsaperf/defkey.c b/mozilla/security/nss/cmd/rsaperf/defkey.c
index 24e1ce4e36f..bcab2b683d9 100644
--- a/mozilla/security/nss/cmd/rsaperf/defkey.c
+++ b/mozilla/security/nss/cmd/rsaperf/defkey.c
@@ -36,7 +36,7 @@
 */
 #include "seccomon.h"
 #include "secoidt.h"
-#include "keyt.h"
+#include "keytlow.h"
 
 #define CONST
 
@@ -105,11 +105,11 @@ static struct SECKEYLowPrivateKeyStr rsaPriv;
 SECKEYLowPrivateKey *
 getDefaultRSAPrivateKey(void)
 {
-    if (rsaPriv.keyType != rsaKey) {
+    if (rsaPriv.keyType != lowRSAKey) {
 
 	/* leaving arena uninitialized. It isn't used in this test. */
 
-	rsaPriv.keyType                     = rsaKey;
+	rsaPriv.keyType                     = lowRSAKey;
 
 	/* leaving arena   uninitialized. It isn't used. */
 	/* leaving version uninitialized. It isn't used. */
@@ -139,9 +139,9 @@ static struct SECKEYLowPublicKeyStr rsaPub;
 SECKEYLowPublicKey *
 getDefaultRSAPublicKey(void)
 {
-    if (rsaPub.keyType != rsaKey) {
+    if (rsaPub.keyType != lowRSAKey) {
 
-	rsaPub.keyType			   = rsaKey;
+	rsaPub.keyType			   = lowRSAKey;
 
 	rsaPub.u.rsa.modulus.data          =        default_n;
 	rsaPub.u.rsa.modulus.len           = sizeof default_n;
diff --git a/mozilla/security/nss/cmd/rsaperf/manifest.mn b/mozilla/security/nss/cmd/rsaperf/manifest.mn
index 2f240780814..b208672b712 100644
--- a/mozilla/security/nss/cmd/rsaperf/manifest.mn
+++ b/mozilla/security/nss/cmd/rsaperf/manifest.mn
@@ -37,6 +37,8 @@ CORE_DEPTH = ../../..
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = security
 
+INCLUDES += -I$(CORE_DEPTH)/nss/lib/softoken
+
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 REQUIRES = dbm seccmd 
diff --git a/mozilla/security/nss/cmd/rsaperf/rsaperf.c b/mozilla/security/nss/cmd/rsaperf/rsaperf.c
index be501669376..dbfc21d0163 100644
--- a/mozilla/security/nss/cmd/rsaperf/rsaperf.c
+++ b/mozilla/security/nss/cmd/rsaperf/rsaperf.c
@@ -38,6 +38,7 @@
 #include "nss.h"
 #include "blapi.h"
 #include "plgetopt.h"
+#include "keylow.h"
 
 
 #define MAX_RSA_MODULUS_BYTES (1024/8)