diff --git a/apps/genrsa.c b/apps/genrsa.c
index 96df5703c482e4d1b5b4f7f282286d957cb58973..00a556599c3505798fe9bebddb18d8f087c33980 100644
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -216,4 +216,10 @@ static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)
 	p=n;
 #endif
 	}
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
diff --git a/apps/req.c b/apps/req.c
index 00ce23103366d9cf8899a1301f06bfea053fafa5..78e3edcaea5925da45dee7448d8122f5c5986138 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -120,7 +120,9 @@ static int add_attribute_object(STACK_OF(X509_ATTRIBUTE) *n, char *text,
 				int max);
 static int add_DN_object(X509_NAME *n, char *text, char *def, char *value,
 	int nid,int min,int max);
+#ifndef NO_RSA
 static void MS_CALLBACK req_cb(int p,int n,void *arg);
+#endif
 static int req_fix_data(int nid,int *type,int len,int min,int max);
 static int check_end(char *str, char *end);
 static int add_oid_section(LHASH *conf);
@@ -1403,6 +1405,7 @@ err:
 	return(0);
 	}
 
+#ifndef NO_RSA
 static void MS_CALLBACK req_cb(int p, int n, void *arg)
 	{
 	char c='*';
@@ -1417,6 +1420,7 @@ static void MS_CALLBACK req_cb(int p, int n, void *arg)
 	p=n;
 #endif
 	}
+#endif
 
 static int req_fix_data(int nid, int *type, int len, int min, int max)
 	{
diff --git a/apps/rsa.c b/apps/rsa.c
index 7d58b1715b3cde84d3e14afb37653dd51e9bec37..e5726938a9a023936ba72cf26fdc18eabbb9df03 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -395,4 +395,10 @@ end:
 	if (rsa != NULL) RSA_free(rsa);
 	EXIT(ret);
 	}
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
diff --git a/crypto/asn1/d2i_r_pr.c b/crypto/asn1/d2i_r_pr.c
index b6b2fc81a4f516d11508ecbff2ac6dd8b7c367a5..6c8a45f821faf2f2c2622a59f904515318e07c41 100644
--- a/crypto/asn1/d2i_r_pr.c
+++ b/crypto/asn1/d2i_r_pr.c
@@ -119,4 +119,10 @@ err:
 
 	return(NULL);
 	}
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
diff --git a/crypto/asn1/d2i_r_pu.c b/crypto/asn1/d2i_r_pu.c
index e8ca78219068b539f592ab5f3775f354caa1c7a3..d1289f160eef9daf8b6ebb5c12f699bb07c7d9e4 100644
--- a/crypto/asn1/d2i_r_pu.c
+++ b/crypto/asn1/d2i_r_pu.c
@@ -94,4 +94,10 @@ err:
 	if (bs != NULL) M_ASN1_INTEGER_free(bs);
 	return(NULL);
 	}
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
diff --git a/crypto/asn1/i2d_r_pr.c b/crypto/asn1/i2d_r_pr.c
index 27e6844a7f6005d9a879866517d13c0b4d8277b4..cf5fd9e94e6dd1a4df0713a680832625a302a0bd 100644
--- a/crypto/asn1/i2d_r_pr.c
+++ b/crypto/asn1/i2d_r_pr.c
@@ -123,5 +123,11 @@ int i2d_RSAPrivateKey(RSA *a, unsigned char **pp)
 	*pp=p;
 	return(t);
 	}
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
 
diff --git a/crypto/asn1/i2d_r_pu.c b/crypto/asn1/i2d_r_pu.c
index 6d01bfa8b5ec2ede9cffddb1d0f7ac0dd251a695..142392f1ae4057afa6096c8d82440b7621b04def 100644
--- a/crypto/asn1/i2d_r_pu.c
+++ b/crypto/asn1/i2d_r_pu.c
@@ -109,4 +109,10 @@ int i2d_RSAPublicKey(RSA *a, unsigned char **pp)
 	*pp=p;
 	return(t);
 	}
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c
index b2fdadcc15ec1030effb33c228750a73c61a810e..7e3d666f6e574daceb36fbdc0076a9b38c942012 100644
--- a/crypto/asn1/n_pkey.c
+++ b/crypto/asn1/n_pkey.c
@@ -338,4 +338,11 @@ static void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a)
 	}
 
 #endif /* NO_RC4 */
+
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
diff --git a/crypto/evp/p_open.c b/crypto/evp/p_open.c
index ddb9fd6942d4ae15a8ce42ec56d181c809af0373..b9ca7892c2e92f6e0bda0912c4c43b503413314c 100644
--- a/crypto/evp/p_open.c
+++ b/crypto/evp/p_open.c
@@ -110,4 +110,10 @@ int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
 	EVP_DecryptInit(ctx,NULL,NULL,NULL);
 	return(i);
 	}
+#else /* !NO_RSA */
+
+# ifdef PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
diff --git a/crypto/pem/pem_seal.c b/crypto/pem/pem_seal.c
index 23f95beb1e22e5f334a4b23824ab7cdeda0d10ac..126e29d375d0afe529769ae858c8381a7f37ce76 100644
--- a/crypto/pem/pem_seal.c
+++ b/crypto/pem/pem_seal.c
@@ -175,4 +175,10 @@ err:
 	if (s != NULL) Free(s);
 	return(ret);
 	}
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
diff --git a/rsaref/rsaref.c b/rsaref/rsaref.c
index 7677eb9fce9fa10c9f7c2abf4e082f32d6a5fbde..55cebc8fcb3c984c474d752b4cfde01db5aea62a 100644
--- a/rsaref/rsaref.c
+++ b/rsaref/rsaref.c
@@ -298,4 +298,10 @@ err:
 	memset(&rnd,0,sizeof(rnd));
 	return(outlen);
 	}
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c
index d047e89ed6e5dc5b06fa4b6ba12a957101b96814..b0a656740ce79c8661b4417a2f5df0ba3f020fb4 100644
--- a/ssl/s2_clnt.c
+++ b/ssl/s2_clnt.c
@@ -974,4 +974,10 @@ end:
 	EVP_PKEY_free(pkey);
 	return(i);
 	}
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index ff804d8e0d1b0b66b578feead844914f74dc19d4..f473b459f2124414ae6e6195102dec94a06b136a 100644
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -421,4 +421,10 @@ int ssl2_shutdown(SSL *s)
 	s->shutdown=(SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
 	return(1);
 	}
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c
index e2add164ddbee56fcded632f368dc1cc41edc850..54ff252d9ad372ef8a7dbb302769daecfd9c7ab0 100644
--- a/ssl/s2_meth.c
+++ b/ssl/s2_meth.c
@@ -86,4 +86,10 @@ SSL_METHOD *SSLv2_method(void)
 		}
 	return(&SSLv2_data);
 	}
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c
index f8f1ba76d0d77220715f2adb4591b4e4f99667a8..e219ae5e325f843bc5ff3094eda91f571f9ebbcb 100644
--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -966,4 +966,10 @@ static int ssl_rsa_private_decrypt(CERT *c, int len, unsigned char *from,
 		SSLerr(SSL_F_SSL_RSA_PRIVATE_DECRYPT,ERR_R_RSA_LIB);
 	return(i);
 	}
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 9e08b75ee313cebeef7d3c323589ba138c69ec21..85b0f5e9ef5fb54592abc5feea367a20bc27f12a 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -900,6 +900,7 @@ static int ssl3_send_server_key_exchange(SSL *s)
 	int j,num;
 	RSA *rsa;
 	unsigned char md_buf[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
+	unsigned int u;
 #endif
 #ifndef NO_DH
 	DH *dh,*dhp;
@@ -907,7 +908,6 @@ static int ssl3_send_server_key_exchange(SSL *s)
 	EVP_PKEY *pkey;
 	unsigned char *p,*d;
 	int al,i;
-	unsigned int u;
 	unsigned long type;
 	int n;
 	CERT *cert;