diff --git a/.gitignore b/.gitignore
index 20172f8300..ca897251af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -140,6 +140,8 @@ providers/implementations/skeymgmt/generic.c
 providers/implementations/storemgmt/file_store_any2obj.c
 providers/implementations/storemgmt/file_store.c
 providers/implementations/storemgmt/winstore_store.c
+providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
+providers/implementations/ciphers/cipher_aes_cbc_hmac_sha_etm.c
 providers/implementations/ciphers/ciphercommon.c
 providers/implementations/ciphers/ciphercommon_ccm.c
 providers/implementations/ciphers/ciphercommon_gcm.c
diff --git a/build.info b/build.info
index d08a996ee4..e082484ff5 100644
--- a/build.info
+++ b/build.info
@@ -99,6 +99,8 @@ DEPEND[]=include/openssl/asn1.h \
          providers/implementations/storemgmt/file_store_any2obj.c \
          providers/implementations/storemgmt/file_store.c \
          providers/implementations/storemgmt/winstore_store.c \
+         providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c \
+         providers/implementations/ciphers/cipher_aes_cbc_hmac_sha_etm.c \
          providers/implementations/ciphers/ciphercommon.c \
          providers/implementations/ciphers/ciphercommon_ccm.c \
          providers/implementations/ciphers/ciphercommon_gcm.c \
@@ -206,6 +208,8 @@ DEPEND[providers/implementations/asymciphers/rsa_enc.c \
        providers/implementations/storemgmt/file_store_any2obj.c \
        providers/implementations/storemgmt/file_store.c \
        providers/implementations/storemgmt/winstore_store.c \
+       providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c \
+       providers/implementations/ciphers/cipher_aes_cbc_hmac_sha_etm.c \
        providers/implementations/ciphers/ciphercommon.c \
        providers/implementations/ciphers/ciphercommon_ccm.c \
        providers/implementations/ciphers/ciphercommon_gcm.c \
@@ -331,6 +335,10 @@ GENERATE[providers/implementations/storemgmt/file_store.c]=\
     providers/implementations/storemgmt/file_store.c.in
 GENERATE[providers/implementations/storemgmt/winstore_store.c]=\
     providers/implementations/storemgmt/winstore_store.c.in
+GENERATE[providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c]=\
+    providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c.in
+GENERATE[providers/implementations/ciphers/cipher_aes_cbc_hmac_sha_etm.c]=\
+    providers/implementations/ciphers/cipher_aes_cbc_hmac_sha_etm.c.in
 GENERATE[providers/implementations/ciphers/ciphercommon.c]=\
     providers/implementations/ciphers/ciphercommon.c.in
 GENERATE[providers/implementations/ciphers/ciphercommon_ccm.c]=\
diff --git a/providers/implementations/ciphers/build.info b/providers/implementations/ciphers/build.info
index 5df3d25f92..b456ec6f98 100644
--- a/providers/implementations/ciphers/build.info
+++ b/providers/implementations/ciphers/build.info
@@ -90,6 +90,8 @@ SOURCE[$COMMON_GOAL]=\
         ciphercommon_gcm.c ciphercommon_gcm_hw.c \
         ciphercommon_ccm.c ciphercommon_ccm_hw.c
 
+INCLUDE[cipher_aes_cbc_hmac_sha.o]=.
+INCLUDE[cipher_aes_cbc_hmac_sha_etm.o]=.
 INCLUDE[ciphercommon.o]=.
 INCLUDE[cipher_chacha20_poly1305.o]=.
 
diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c.in
similarity index 100%
rename from providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
rename to providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c.in
diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha_etm.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha_etm.c.in
similarity index 100%
rename from providers/implementations/ciphers/cipher_aes_cbc_hmac_sha_etm.c
rename to providers/implementations/ciphers/cipher_aes_cbc_hmac_sha_etm.c.in