diff -up openssl-1.0.0-beta4/crypto/dsa/dsa_key.c.mingw-nofips openssl-1.0.0-beta4/crypto/dsa/dsa_key.c
--- openssl-1.0.0-beta4/crypto/dsa/dsa_key.c.mingw-nofips	2009-11-22 19:07:58.000000000 +0200
+++ openssl-1.0.0-beta4/crypto/dsa/dsa_key.c	2009-11-22 19:07:58.000000000 +0200
@@ -65,7 +65,9 @@
 #include <openssl/rand.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
+#ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
+#endif
 #include "fips_locl.h"
 
 static int dsa_builtin_keygen(DSA *dsa);
diff -up openssl-1.0.0-beta4/crypto/fips/fips_aes_selftest.c.mingw-nofips openssl-1.0.0-beta4/crypto/fips/fips_aes_selftest.c
--- openssl-1.0.0-beta4/crypto/fips/fips_aes_selftest.c.mingw-nofips	2009-11-22 19:07:58.000000000 +0200
+++ openssl-1.0.0-beta4/crypto/fips/fips_aes_selftest.c	2009-11-22 19:07:58.000000000 +0200
@@ -49,7 +49,9 @@
 
 #include <string.h>
 #include <openssl/err.h>
+#ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
+#endif
 #include <openssl/evp.h>
 
 #ifdef OPENSSL_FIPS
diff -up openssl-1.0.0-beta4/crypto/fips/fips_des_selftest.c.mingw-nofips openssl-1.0.0-beta4/crypto/fips/fips_des_selftest.c
--- openssl-1.0.0-beta4/crypto/fips/fips_des_selftest.c.mingw-nofips	2009-11-22 19:07:58.000000000 +0200
+++ openssl-1.0.0-beta4/crypto/fips/fips_des_selftest.c	2009-11-22 19:07:58.000000000 +0200
@@ -49,7 +49,9 @@
 
 #include <string.h>
 #include <openssl/err.h>
+#ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
+#endif
 #include <openssl/evp.h>
 #include <openssl/opensslconf.h>
 
diff -up openssl-1.0.0-beta4/crypto/fips/fips_dsa_selftest.c.mingw-nofips openssl-1.0.0-beta4/crypto/fips/fips_dsa_selftest.c
--- openssl-1.0.0-beta4/crypto/fips/fips_dsa_selftest.c.mingw-nofips	2009-11-22 19:07:58.000000000 +0200
+++ openssl-1.0.0-beta4/crypto/fips/fips_dsa_selftest.c	2009-11-22 19:07:58.000000000 +0200
@@ -59,7 +59,9 @@
 #include <string.h>
 #include <openssl/crypto.h>
 #include <openssl/dsa.h>
+#ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
+#endif
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/bn.h>
diff -up openssl-1.0.0-beta4/crypto/fips/fips_hmac_selftest.c.mingw-nofips openssl-1.0.0-beta4/crypto/fips/fips_hmac_selftest.c
--- openssl-1.0.0-beta4/crypto/fips/fips_hmac_selftest.c.mingw-nofips	2009-11-22 19:07:58.000000000 +0200
+++ openssl-1.0.0-beta4/crypto/fips/fips_hmac_selftest.c	2009-11-22 19:07:58.000000000 +0200
@@ -49,7 +49,9 @@
 
 #include <string.h>
 #include <openssl/err.h>
+#ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
+#endif
 #include <openssl/hmac.h>
 
 #ifdef OPENSSL_FIPS
diff -up openssl-1.0.0-beta4/crypto/fips/fips_rand.c.mingw-nofips openssl-1.0.0-beta4/crypto/fips/fips_rand.c
--- openssl-1.0.0-beta4/crypto/fips/fips_rand.c.mingw-nofips	2009-11-22 19:07:58.000000000 +0200
+++ openssl-1.0.0-beta4/crypto/fips/fips_rand.c	2009-11-22 19:07:58.000000000 +0200
@@ -76,7 +76,9 @@
 # endif
 #endif
 #include <string.h>
+#ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
+#endif
 #include "fips_locl.h"
 
 #ifdef OPENSSL_FIPS
diff -up openssl-1.0.0-beta4/crypto/fips/fips_rand_selftest.c.mingw-nofips openssl-1.0.0-beta4/crypto/fips/fips_rand_selftest.c
--- openssl-1.0.0-beta4/crypto/fips/fips_rand_selftest.c.mingw-nofips	2009-11-22 19:07:58.000000000 +0200
+++ openssl-1.0.0-beta4/crypto/fips/fips_rand_selftest.c	2009-11-22 19:07:58.000000000 +0200
@@ -49,7 +49,9 @@
 
 #include <string.h>
 #include <openssl/err.h>
+#ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
+#endif
 #include <openssl/rand.h>
 #include <openssl/fips_rand.h>
 
diff -up openssl-1.0.0-beta4/crypto/fips/fips_rsa_selftest.c.mingw-nofips openssl-1.0.0-beta4/crypto/fips/fips_rsa_selftest.c
--- openssl-1.0.0-beta4/crypto/fips/fips_rsa_selftest.c.mingw-nofips	2009-11-22 19:07:58.000000000 +0200
+++ openssl-1.0.0-beta4/crypto/fips/fips_rsa_selftest.c	2009-11-22 19:07:58.000000000 +0200
@@ -49,7 +49,9 @@
 
 #include <string.h>
 #include <openssl/err.h>
+#ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
+#endif
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
 #include <openssl/bn.h>
diff -up openssl-1.0.0-beta4/crypto/fips/fips_sha1_selftest.c.mingw-nofips openssl-1.0.0-beta4/crypto/fips/fips_sha1_selftest.c
--- openssl-1.0.0-beta4/crypto/fips/fips_sha1_selftest.c.mingw-nofips	2009-11-22 19:07:58.000000000 +0200
+++ openssl-1.0.0-beta4/crypto/fips/fips_sha1_selftest.c	2009-11-22 19:07:58.000000000 +0200
@@ -49,7 +49,9 @@
 
 #include <string.h>
 #include <openssl/err.h>
+#ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
+#endif
 #include <openssl/evp.h>
 #include <openssl/sha.h>
 
diff -up openssl-1.0.0-beta4/crypto/rsa/rsa_eay.c.mingw-nofips openssl-1.0.0-beta4/crypto/rsa/rsa_eay.c
--- openssl-1.0.0-beta4/crypto/rsa/rsa_eay.c.mingw-nofips	2009-11-22 19:07:58.000000000 +0200
+++ openssl-1.0.0-beta4/crypto/rsa/rsa_eay.c	2009-11-22 19:07:58.000000000 +0200
@@ -115,7 +115,9 @@
 #include <openssl/rsa.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>
+#ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
+#endif
 
 #ifndef RSA_NULL