diff --git a/src/credentials/CHIPOperationalCredentials.h b/src/credentials/CHIPOperationalCredentials.h
index f6717781f57ebb..ced686114ef86b 100644
--- a/src/credentials/CHIPOperationalCredentials.h
+++ b/src/credentials/CHIPOperationalCredentials.h
@@ -28,6 +28,9 @@
 #include <credentials/CHIPCert.h>
 #include <crypto/CHIPCryptoPAL.h>
 #include <support/DLLUtil.h>
+#if CHIP_CRYPTO_HSM
+#include <crypto/hsm/CHIPCryptoPALHsm.h>
+#endif
 
 #include <algorithm>
 #include <map>
@@ -66,7 +69,11 @@ struct NodeCredentialMap
 struct NodeKeypairMap
 {
     CertificateKeyId trustedRootId;
+#ifdef ENABLE_HSM_CASE_OPS_KEY
+    P256KeypairHSM keypair;
+#else
     P256Keypair keypair;
+#endif
 };
 
 /**
diff --git a/src/protocols/secure_channel/CASESession.h b/src/protocols/secure_channel/CASESession.h
index 14b9b7fb27b51b..9080bea035b75e 100644
--- a/src/protocols/secure_channel/CASESession.h
+++ b/src/protocols/secure_channel/CASESession.h
@@ -254,7 +254,7 @@ class DLL_EXPORT CASESession : public Messaging::ExchangeDelegate, public Pairin
     Crypto::Hash_SHA256_stream mCommissioningHash;
     Crypto::P256PublicKey mRemotePubKey;
 #ifdef ENABLE_HSM_CASE_EPHERMAL_KEY
-    P256KeypairHSM mEphemeralKey;
+    Crypto::P256KeypairHSM mEphemeralKey;
 #else
     Crypto::P256Keypair mEphemeralKey;
 #endif