diff --git a/build.info b/build.info
index 4ebf478eac..ca53ec0659 100644
--- a/build.info
+++ b/build.info
@@ -101,12 +101,14 @@ DEPEND[]=include/openssl/asn1.h \
          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/cipher_aes_xts.c \
          providers/implementations/ciphers/ciphercommon.c \
          providers/implementations/ciphers/ciphercommon_ccm.c \
          providers/implementations/ciphers/ciphercommon_gcm.c \
          providers/implementations/ciphers/cipher_chacha20_poly1305.c \
          providers/implementations/ciphers/cipher_null.c \
          providers/implementations/ciphers/cipher_rc4_hmac_md5.c \
+         providers/implementations/ciphers/cipher_sm4_xts.c \
          providers/implementations/digests/blake2_prov.c \
          providers/implementations/digests/digestcommon.c \
          providers/implementations/digests/mdc2_prov.c \
@@ -212,12 +214,14 @@ DEPEND[providers/implementations/asymciphers/rsa_enc.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/cipher_aes_xts.c \
        providers/implementations/ciphers/ciphercommon.c \
        providers/implementations/ciphers/ciphercommon_ccm.c \
        providers/implementations/ciphers/ciphercommon_gcm.c \
        providers/implementations/ciphers/cipher_chacha20_poly1305.c \
        providers/implementations/ciphers/cipher_null.c \
        providers/implementations/ciphers/cipher_rc4_hmac_md5.c \
+       providers/implementations/ciphers/cipher_sm4_xts.c \
        providers/implementations/digests/blake2_prov.c \
        providers/implementations/digests/digestcommon.c \
        providers/implementations/digests/mdc2_prov.c \
@@ -343,6 +347,8 @@ 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/cipher_aes_xts.c]=\
+    providers/implementations/ciphers/cipher_aes_xts.c.in
 GENERATE[providers/implementations/ciphers/ciphercommon.c]=\
     providers/implementations/ciphers/ciphercommon.c.in
 GENERATE[providers/implementations/ciphers/ciphercommon_ccm.c]=\
@@ -355,6 +361,8 @@ GENERATE[providers/implementations/ciphers/cipher_null.c]=\
     providers/implementations/ciphers/cipher_null.c.in
 GENERATE[providers/implementations/ciphers/cipher_rc4_hmac_md5.c]=\
     providers/implementations/ciphers/cipher_rc4_hmac_md5.c.in
+GENERATE[providers/implementations/ciphers/cipher_sm4_xts.c]=\
+    providers/implementations/ciphers/cipher_sm4_xts.c.in
 GENERATE[providers/implementations/digests/blake2_prov.c]=\
     providers/implementations/digests/blake2_prov.c.in
 GENERATE[providers/implementations/digests/digestcommon.c]=\
diff --git a/providers/implementations/ciphers/build.info b/providers/implementations/ciphers/build.info
index 624bbb605e..f205885c65 100644
--- a/providers/implementations/ciphers/build.info
+++ b/providers/implementations/ciphers/build.info
@@ -91,7 +91,8 @@ SOURCE[$COMMON_GOAL]=\
         ciphercommon_ccm.c ciphercommon_ccm_hw.c
 
 INCLUDE[cipher_aes_cbc_hmac_sha.o cipher_aes_cbc_hmac_sha_etm.o \
-        ciphercommon.o cipher_chacha20_poly1305.o cipher_rc4_hmac_md5.o]=.
+        cipher_aes_xts.o ciphercommon.o cipher_chacha20_poly1305.o \
+        cipher_rc4_hmac_md5.o cipher_sm4_xts.o]=.
 
 IF[{- !$disabled{des} -}]
   SOURCE[$TDES_1_GOAL]=cipher_tdes.c cipher_tdes_common.c cipher_tdes_hw.c
diff --git a/providers/implementations/ciphers/cipher_aes_xts.c b/providers/implementations/ciphers/cipher_aes_xts.c.in
similarity index 100%
rename from providers/implementations/ciphers/cipher_aes_xts.c
rename to providers/implementations/ciphers/cipher_aes_xts.c.in
diff --git a/providers/implementations/ciphers/cipher_sm4_xts.c b/providers/implementations/ciphers/cipher_sm4_xts.c.in
similarity index 100%
rename from providers/implementations/ciphers/cipher_sm4_xts.c
rename to providers/implementations/ciphers/cipher_sm4_xts.c.in