diff --git a/cr_deviceCert.c b/cr_deviceCert.c
index af8c97c..fe80b1c 100644
--- a/cr_deviceCert.c
+++ b/cr_deviceCert.c
@@ -118,13 +118,7 @@
 #include <string.h>
 
 #ifdef USE_HSM
-// nShield
-#include "nfastapp.h"
-#include "nfkm.h"
-#include "rqcard-applic.h"
-#include "rqcard-fips.h"
-// nShield optional
-#include "simplebignum.h"
+#include "cr_hsm_code.h"
 #endif // USE_HSM
 
 // openssl
diff --git a/cr_enc_id.c b/cr_enc_id.c
index e81ef52..dc138b2 100644
--- a/cr_enc_id.c
+++ b/cr_enc_id.c
@@ -135,6 +135,8 @@ extern RSA *d2i_RSA_PUBKEY(RSA **a, const unsigned char **pp, long length);
 static unsigned char local_buf_1[CR_ID_BUF_SIZE];
 static unsigned char local_buf_2[CR_ID_BUF_SIZE];
 
+static int crypto_aes_enc_dec( dst_buf, org_buf );
+static int crypto_rsa_enc_dec( dst_buf, org_buf );
 
 // ビルドスイッチに応じて、IDバッファをAES/RSAで暗号化
 int EncryptID( unsigned char *dst_buf, unsigned char *org_buf )