diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index a37d5bdc9e..51bc44b35e 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -329,6 +329,7 @@ if(ENABLE_DILITHIUM)
   set(
     DILITHIUM_SOURCES
 
+    evp_extra/p_pqdsa.c
     evp_extra/p_pqdsa_asn1.c
     ml_dsa/ml_dsa.c
     pqdsa/pqdsa.c
diff --git a/crypto/fipsmodule/evp/p_pqdsa.c b/crypto/evp_extra/p_pqdsa.c
similarity index 99%
rename from crypto/fipsmodule/evp/p_pqdsa.c
rename to crypto/evp_extra/p_pqdsa.c
index 558682a2d8..331c819337 100644
--- a/crypto/fipsmodule/evp/p_pqdsa.c
+++ b/crypto/evp_extra/p_pqdsa.c
@@ -8,7 +8,7 @@
 #include "../crypto/evp_extra/internal.h"
 #include "../crypto/ml_dsa/ml_dsa.h"
 #include "../crypto/internal.h"
-#include "../../pqdsa/internal.h"
+#include "../pqdsa/internal.h"
 
 // PQDSA PKEY functions
 
diff --git a/crypto/fipsmodule/bcm.c b/crypto/fipsmodule/bcm.c
index 4177eba77b..ce8a3462d0 100644
--- a/crypto/fipsmodule/bcm.c
+++ b/crypto/fipsmodule/bcm.c
@@ -119,9 +119,6 @@
 #include "evp/p_hkdf.c"
 #include "evp/p_hmac.c"
 #include "evp/p_kem.c"
-#ifdef ENABLE_DILITHIUM
-#include "evp/p_pqdsa.c"
-#endif
 #include "evp/p_rsa.c"
 #include "hkdf/hkdf.c"
 #include "hmac/hmac.c"