diff --git a/fips/dsa/fips_dssvs.c b/fips/dsa/fips_dssvs.c
index c5a580507..09001615d 100644
--- a/fips/dsa/fips_dssvs.c
+++ b/fips/dsa/fips_dssvs.c
@@ -187,7 +187,7 @@ static void pqgver(FILE *in, FILE *out)
     char *keyword, *value;
     BIGNUM *p = NULL, *q = NULL, *g = NULL;
     int counter=-1, counter2;
-    unsigned long h=-1, h2;
+    unsigned long h=0, h2;
     DSA *dsa=NULL;
     int dsa2, L, N, part_test = 0;
     const EVP_MD *md = NULL;
diff --git a/fips/fips.c b/fips/fips.c
index ef9c0bdda..823a042f5 100644
--- a/fips/fips.c
+++ b/fips/fips.c
@@ -239,8 +239,6 @@ int FIPS_check_incore_fingerprint(void)
 
 int FIPS_module_mode_set(int onoff)
     {
-    int fips_set_owning_thread();
-    int fips_clear_owning_thread();
     int ret = 0;
 
     fips_w_lock();
diff --git a/fips/rand/fips_drbgvs.c b/fips/rand/fips_drbgvs.c
index 70a116822..ff552dfe6 100644
--- a/fips/rand/fips_drbgvs.c
+++ b/fips/rand/fips_drbgvs.c
@@ -123,8 +123,6 @@ static int parse_aes(char *str, int *pdf)
 		return NID_undef;
 
 		}
-
-	return NID_undef;
 	}
 
 typedef struct