diff --git a/crypto/bn/asm/x86_64-gcc.c b/crypto/bn/asm/x86_64-gcc.c
index a0c49ee97834c60aa9853e4f1b6de3840368215a..9296851ec5c8537c0a0baa3c6bcaf23794e822ab 100644
--- a/crypto/bn/asm/x86_64-gcc.c
+++ b/crypto/bn/asm/x86_64-gcc.c
@@ -98,7 +98,7 @@
 		: "cc");		\
 	(r)=carry, carry=high;		\
 	} while (0)
-
+#undef sqr
 #define sqr(r0,r1,a)			\
 	asm ("mulq %2"			\
 		: "=a"(r0),"=d"(r1)	\
diff --git a/fips/aes/fips_gcmtest.c b/fips/aes/fips_gcmtest.c
index bd79404e01d5c2c9f2beb70a1a7fba79eec0f64e..856a0ddea1554fbdf6176005878bc51940e65854 100644
--- a/fips/aes/fips_gcmtest.c
+++ b/fips/aes/fips_gcmtest.c
@@ -86,7 +86,7 @@ static void gcmtest(int encrypt)
 	unsigned char *key = NULL, *iv = NULL, *aad = NULL, *tag = NULL;
 	unsigned char *ct = NULL, *pt = NULL;
 	EVP_CIPHER_CTX ctx;
-	const EVP_CIPHER *gcm;
+	const EVP_CIPHER *gcm = NULL;
 	FIPS_cipher_ctx_init(&ctx);
 
 	while(fgets(buf,sizeof buf,stdin) != NULL)
diff --git a/fips/dsa/fips_dssvs.c b/fips/dsa/fips_dssvs.c
index ff7f8139b3e2022114f00c388484dd2004dc993c..96f43cd62660db98db7fedfec000a536d1ebe179 100644
--- a/fips/dsa/fips_dssvs.c
+++ b/fips/dsa/fips_dssvs.c
@@ -209,12 +209,12 @@ static void pqgver()
     char lbuf[1024];
     char *keyword, *value;
     BIGNUM *p = NULL, *q = NULL, *g = NULL;
-    int counter, counter2;
-    unsigned long h, h2;
+    int counter=-1, counter2;
+    unsigned long h=-1, h2;
     DSA *dsa=NULL;
     int dsa2, L, N, part_test = 0;
     const EVP_MD *md = NULL;
-    int seedlen;
+    int seedlen=-1;
     unsigned char seed[1024];
 
     while(fgets(buf,sizeof buf,stdin) != NULL)
diff --git a/fips/ecdsa/fips_ecdsavs.c b/fips/ecdsa/fips_ecdsavs.c
index a162f4289c97f40ee19fdfed2d5ca8abf08d4bd0..9087b0678f6f07c5a9f2e7f9e0b54818cb2bed94 100644
--- a/fips/ecdsa/fips_ecdsavs.c
+++ b/fips/ecdsa/fips_ecdsavs.c
@@ -312,7 +312,7 @@ static int SigVer(void)
 	{
 	char buf[2048], lbuf[2048];
 	char *keyword, *value;
-	unsigned char *msg;
+	unsigned char *msg = NULL;
 	int curve_nid = NID_undef;
 	long mlen;
 	BIGNUM *Qx = NULL, *Qy = NULL;