diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index b5b62ed5df..5168e7980f 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -189,15 +189,11 @@ endif()
 set(
 	CRYPTO_SRC
 	${CRYPTO_SRC}
-	cpt_err.c
-	cryptlib.c
+	crypto_err.c
 	crypto_ex_data.c
 	crypto_init.c
-	cversion.c
+	crypto_legacy.c
 	malloc-wrapper.c
-	mem_clr.c
-	mem_dbg.c
-	o_fips.c
 	aes/aes.c
 	aes/aes_core.c
 	aes/aes_ige.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index b4e8bd8986..2f61f7df72 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -209,20 +209,16 @@ if HOST_I386
 libcrypto_la_SOURCES += arch/i386/crypto_cpu_caps.c
 endif
 
-libcrypto_la_SOURCES += cpt_err.c
-libcrypto_la_SOURCES += cryptlib.c
+libcrypto_la_SOURCES += crypto_err.c
 libcrypto_la_SOURCES += crypto_ex_data.c
 libcrypto_la_SOURCES += crypto_init.c
+libcrypto_la_SOURCES += crypto_legacy.c
 if !HOST_WIN
 libcrypto_la_SOURCES += crypto_lock.c
 else
 libcrypto_la_SOURCES += compat/crypto_lock_win.c
 endif
-libcrypto_la_SOURCES += cversion.c
 libcrypto_la_SOURCES += malloc-wrapper.c
-libcrypto_la_SOURCES += mem_clr.c
-libcrypto_la_SOURCES += mem_dbg.c
-libcrypto_la_SOURCES += o_fips.c
 noinst_HEADERS += arm_arch.h
 noinst_HEADERS += constant_time.h
 noinst_HEADERS += crypto_internal.h