Fix warnings when more pedantic "debuge-steve32" target is used.

crypto/des/set_key.c

@@ -63,11 +63,11 @@
  * 1.1 added norm_expand_bits
  * 1.0 First working version
  */
+#include "des_locl.h"
 #ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
 #endif
 
-#include "des_locl.h"
 
 OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key);	/* defaults to false */
 

crypto/engine/eng_padlock.c

@@ -234,8 +234,8 @@ padlock_bind_fn(ENGINE *e, const char *id)
 	return 1;
 }
 
-IMPLEMENT_DYNAMIC_CHECK_FN ();
-IMPLEMENT_DYNAMIC_BIND_FN (padlock_bind_fn);
+IMPLEMENT_DYNAMIC_CHECK_FN ()
+IMPLEMENT_DYNAMIC_BIND_FN (padlock_bind_fn)
 #endif /* DYNAMIC_ENGINE */
 
 /* ===== Here comes the "real" engine ===== */

fips/aes/fips_aesavs.c

@@ -65,6 +65,7 @@
 #include <ctype.h>
 #include <openssl/aes.h>
 #include <openssl/evp.h>
+#include <openssl/bn.h>
 
 #include <openssl/err.h>
 #include "e_os.h"

fips/des/fips_desmovs.c

@@ -66,6 +66,7 @@
 #include <ctype.h>
 #include <openssl/des.h>
 #include <openssl/evp.h>
+#include <openssl/bn.h>
 
 #include <openssl/err.h>
 #include "e_os.h"

fips/dh/fips_dh_lib.c

@@ -57,7 +57,8 @@
  */
 
 #include <string.h>
-#include <openssl/dsa.h>
+#include <openssl/bn.h>
+#include <openssl/dh.h>
 
 /* Minimal FIPS versions of FIPS_dh_new() and FIPS_dh_free(): to
  * reduce external dependencies. 

fips/dsa/fips_dsa_lib.c

@@ -58,6 +58,7 @@
 
 #include <string.h>
 #include <openssl/dsa.h>
+#include <openssl/bn.h>
 
 /* Minimal FIPS versions of FIPS_dsa_new() and FIPS_dsa_free: to
  * reduce external dependencies. 

fips/dsa/fips_dsa_ossl.c

@@ -63,6 +63,7 @@
 #include <openssl/dsa.h>
 #include <openssl/rand.h>
 #include <openssl/asn1.h>
+#include <openssl/err.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif

fips/dsa/fips_dsa_selftest.c

@@ -62,6 +62,7 @@
 #include <openssl/fips.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
+#include <openssl/bn.h>
 
 #ifdef OPENSSL_FIPS
 

fips/dsa/fips_dsa_sign.c

@@ -61,6 +61,7 @@
 #include <openssl/dsa.h>
 #include <openssl/err.h>
 #include <openssl/sha.h>
+#include <openssl/bn.h>
 
 #ifdef OPENSSL_FIPS
 

fips/dsa/fips_dsatest.c

@@ -69,6 +69,8 @@
 #include <openssl/rand.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
+#include <openssl/dsa.h>
+#include <openssl/bn.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif

fips/fips_test_suite.c

@@ -20,6 +20,7 @@
 #include <openssl/des.h>
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
+#include <openssl/dh.h>
 #include <openssl/hmac.h>
 #include <openssl/err.h>
 

fips/hmac/fips_hmactest.c

@@ -63,6 +63,7 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/err.h>
+#include <openssl/bn.h>
 
 #include <openssl/x509v3.h>
 

fips/rsa/fips_rsa_lib.c

@@ -59,6 +59,7 @@
 #include <string.h>
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
+#include <openssl/bn.h>
 #include <openssl/err.h>
 
 /* Minimal FIPS versions of FIPS_rsa_new() and FIPS_rsa_free: to

fips/rsa/fips_rsa_selftest.c

@@ -52,6 +52,7 @@
 #include <openssl/fips.h>
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
+#include <openssl/bn.h>
 #include <openssl/opensslconf.h>
 
 #ifdef OPENSSL_FIPS

fips/rsa/fips_rsagtest.c

@@ -63,6 +63,8 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/err.h>
+#include <openssl/rsa.h>
+#include <openssl/bn.h>
 #include <openssl/x509v3.h>
 
 #ifndef OPENSSL_FIPS

fips/rsa/fips_rsastest.c

@@ -63,6 +63,8 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/err.h>
+#include <openssl/rsa.h>
+#include <openssl/bn.h>
 #include <openssl/x509v3.h>
 
 #ifndef OPENSSL_FIPS

fips/rsa/fips_rsavtest.c

@@ -64,6 +64,8 @@
 #include <openssl/hmac.h>
 #include <openssl/err.h>
 #include <openssl/x509v3.h>
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
 
 #ifndef OPENSSL_FIPS
 

fips/sha/fips_shatest.c

@@ -62,6 +62,7 @@
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>
+#include <openssl/bn.h>
 #include <openssl/x509v3.h>
 
 #ifndef OPENSSL_FIPS