diff --git a/crypto/fipsmodule/bcm.c b/crypto/fipsmodule/bcm.c
index 61479ed79..3a1ad15d0 100644
--- a/crypto/fipsmodule/bcm.c
+++ b/crypto/fipsmodule/bcm.c
@@ -79,7 +79,6 @@
 #include "ec/simple_mul.c"
 #include "ec/util.c"
 #include "ec/wnaf.c"
-#include "fips.c"
 #include "hmac/hmac.c"
 #include "md4/md4.c"
 #include "md5/md5.c"
@@ -98,6 +97,7 @@
 #include "rsa/padding.c"
 #include "rsa/rsa.c"
 #include "rsa/rsa_impl.c"
+#include "self_check/fips.c"
 #include "self_check/self_check.c"
 #include "sha/sha1-altivec.c"
 #include "sha/sha1.c"
diff --git a/crypto/fipsmodule/fips.c b/crypto/fipsmodule/self_check/fips.c
similarity index 97%
rename from crypto/fipsmodule/fips.c
rename to crypto/fipsmodule/self_check/fips.c
index 07554e40c..09fffddc0 100644
--- a/crypto/fipsmodule/fips.c
+++ b/crypto/fipsmodule/self_check/fips.c
@@ -14,8 +14,8 @@
 
 #include <openssl/crypto.h>
 
-#include "../internal.h"
-#include "delocate.h"
+#include "../../internal.h"
+#include "../delocate.h"
 
 
 int FIPS_mode(void) {