diff --git a/fips/dsa/fips_dsa_gen.c b/fips/dsa/fips_dsa_gen.c
index 0cbfd9c0c..34f389790 100644
--- a/fips/dsa/fips_dsa_gen.c
+++ b/fips/dsa/fips_dsa_gen.c
@@ -69,20 +69,23 @@
 #define HASH    EVP_sha1()
 #endif 
 
-#ifndef OPENSSL_NO_SHA
-
-#ifdef FIPS
-
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 /*#include "cryptlib.h"*/
 #include <openssl/evp.h>
 #include <openssl/bn.h>
+#ifndef OPENSSL_NO_SHA
 #include <openssl/dsa.h>
+#endif
+#ifndef OPENSSL_NO_RAND
 #include <openssl/rand.h>
+#endif
+#ifndef OPENSSL_NO_SHA
 #include <openssl/sha.h>
 
+#ifdef FIPS
+
 DSA *DSA_generate_parameters(int bits,
 		unsigned char *seed_in, int seed_len,
 		int *counter_ret, unsigned long *h_ret,