diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index a364e86..c2a6ee0 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -370,6 +370,7 @@ set(
 	bn/bn_kron.c
 	bn/bn_lib.c
 	bn/bn_mod.c
+	bn/bn_mod_sqrt.c
 	bn/bn_mont.c
 	bn/bn_mpi.c
 	bn/bn_mul.c
@@ -381,7 +382,6 @@ set(
 	bn/bn_shift.c
 	bn/bn_small_primes.c
 	bn/bn_sqr.c
-	bn/bn_sqrt.c
 	bn/bn_word.c
 	bn/bn_x931p.c
 	buffer/buf_err.c
@@ -723,8 +723,7 @@ set(
 	rsa/rsa_saos.c
 	rsa/rsa_sign.c
 	rsa/rsa_x931.c
-	sha/sha1_one.c
-	sha/sha1dgst.c
+	sha/sha1.c
 	sha/sha256.c
 	sha/sha512.c
 	sm3/sm3.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 3939802..da37427 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -426,6 +426,7 @@ libcrypto_la_SOURCES += bn/bn_isqrt.c
 libcrypto_la_SOURCES += bn/bn_kron.c
 libcrypto_la_SOURCES += bn/bn_lib.c
 libcrypto_la_SOURCES += bn/bn_mod.c
+libcrypto_la_SOURCES += bn/bn_mod_sqrt.c
 libcrypto_la_SOURCES += bn/bn_mont.c
 libcrypto_la_SOURCES += bn/bn_mpi.c
 libcrypto_la_SOURCES += bn/bn_mul.c
@@ -437,7 +438,6 @@ libcrypto_la_SOURCES += bn/bn_recp.c
 libcrypto_la_SOURCES += bn/bn_shift.c
 libcrypto_la_SOURCES += bn/bn_small_primes.c
 libcrypto_la_SOURCES += bn/bn_sqr.c
-libcrypto_la_SOURCES += bn/bn_sqrt.c
 libcrypto_la_SOURCES += bn/bn_word.c
 libcrypto_la_SOURCES += bn/bn_x931p.c
 noinst_HEADERS += bn/bn_internal.h
@@ -969,8 +969,7 @@ libcrypto_la_SOURCES += rsa/rsa_x931.c
 noinst_HEADERS += rsa/rsa_local.h
 
 # sha
-libcrypto_la_SOURCES += sha/sha1_one.c
-libcrypto_la_SOURCES += sha/sha1dgst.c
+libcrypto_la_SOURCES += sha/sha1.c
 libcrypto_la_SOURCES += sha/sha256.c
 libcrypto_la_SOURCES += sha/sha512.c
 noinst_HEADERS += sha/sha_local.h