diff --git a/Makefile.am b/Makefile.am
index 10e9278..99955a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,6 @@ EXTRA_LTLIBRARIES = \
    libcryptlib.la \
    libcpu.la \
    libinteger.la \
-   libaria_simd.la \
    libblake2s_simd.la \
    libblake2b_simd.la \
    libchacha_simd.la \
@@ -131,7 +130,6 @@ libcryptopp_la_LIBADD = \
    $(libcryptlib_la_OBJECTS) \
    $(libcpu_la_OBJECTS) \
    $(libinteger_la_OBJECTS) \
-   $(libaria_simd_la_OBJECTS) \
    $(libblake2s_simd_la_OBJECTS) \
    $(libblake2b_simd_la_OBJECTS) \
    $(libchacha_simd_la_OBJECTS) \
@@ -195,7 +193,6 @@ libcryptopp_la_DEPENDENCIES = \
    $(libcryptlib_la_OBJECTS) \
    $(libcpu_la_OBJECTS) \
    $(libinteger_la_OBJECTS) \
-   $(libaria_simd_la_OBJECTS) \
    $(libblake2s_simd_la_OBJECTS) \
    $(libblake2b_simd_la_OBJECTS) \
    $(libchacha_simd_la_OBJECTS) \
@@ -267,9 +264,6 @@ libcpu_la_CXXFLAGS = $(AM_CPPFLAGS) $(AM_CXXFLAGS)
 libinteger_la_SOURCES = integer.cpp
 libinteger_la_CXXFLAGS = $(AM_CPPFLAGS) $(AM_CXXFLAGS)
 
-libaria_simd_la_SOURCES = aria_simd.cpp
-libaria_simd_la_CXXFLAGS = $(AM_CPPFLAGS) $(AM_CXXFLAGS) $(CRYPTOPP_ARIA_FLAG)
-
 libblake2s_simd_la_SOURCES = blake2s_simd.cpp
 libblake2s_simd_la_CXXFLAGS = $(AM_CPPFLAGS) $(AM_CXXFLAGS) $(CRYPTOPP_BLAKE2S_FLAG)
 
@@ -390,23 +384,23 @@ libothers_la_SOURCES = \
 	keccak.cpp keccak_core.cpp lea.cpp lsh256.cpp lsh512.cpp luc.cpp \
 	mars.cpp marss.cpp md2.cpp md4.cpp md5.cpp misc.cpp modes.cpp \
 	mqueue.cpp mqv.cpp nbtheory.cpp oaep.cpp osrng.cpp padlkrng.cpp \
-	panama.cpp pkcspad.cpp poly1305.cpp polynomi.cpp pssr.cpp pubkey.cpp \
-	queue.cpp rabbit.cpp rabin.cpp randpool.cpp rc2.cpp rc5.cpp rc6.cpp \
-	rdrand.cpp rdtables.cpp rijndael.cpp ripemd.cpp rng.cpp rsa.cpp rw.cpp \
-	safer.cpp salsa.cpp scrypt.cpp seal.cpp seed.cpp serpent.cpp sha.cpp \
-	sha3.cpp shacal2.cpp shake.cpp shark.cpp sharkbox.cpp simeck.cpp \
-	simon.cpp skipjack.cpp sm3.cpp sm4.cpp sosemanuk.cpp speck.cpp \
-	square.cpp squaretb.cpp strciphr.cpp tea.cpp tftables.cpp threefish.cpp \
-	tiger.cpp tigertab.cpp ttmac.cpp tweetnacl.cpp twofish.cpp vmac.cpp \
-	wake.cpp whrlpool.cpp xed25519.cpp xtr.cpp xtrcrypt.cpp xts.cpp \
-	zdeflate.cpp zinflate.cpp zlib.cpp
+	panama.cpp pkcspad.cpp poly1305.cpp polynomi.cpp primetab.cpp pssr.cpp \
+	pubkey.cpp queue.cpp rabbit.cpp rabin.cpp randpool.cpp rc2.cpp rc5.cpp \
+	rc6.cpp rdrand.cpp rdtables.cpp rijndael.cpp ripemd.cpp rng.cpp rsa.cpp \
+	rw.cpp safer.cpp salsa.cpp scrypt.cpp seal.cpp seed.cpp serpent.cpp \
+	sha.cpp sha3.cpp shacal2.cpp shake.cpp shark.cpp sharkbox.cpp \
+	simeck.cpp simon.cpp skipjack.cpp sm3.cpp sm4.cpp sosemanuk.cpp \
+	speck.cpp square.cpp squaretb.cpp strciphr.cpp tea.cpp tftables.cpp \
+	threefish.cpp tiger.cpp tigertab.cpp ttmac.cpp tweetnacl.cpp \
+	twofish.cpp vmac.cpp wake.cpp whrlpool.cpp xed25519.cpp xtr.cpp \
+	xtrcrypt.cpp xts.cpp zdeflate.cpp zinflate.cpp zlib.cpp
 
 # To build this list, see the head notes.
 pkginclude_HEADERS = \
-	3way.h adler32.h adv_simd.h aes.h algebra.h algparam.h allocate.h \
-	arc4.h argnames.h aria.h arm_simd.h asn.h authenc.h base32.h base64.h \
-	basecode.h blake2.h blowfish.h blumshub.h camellia.h cast.h cbcmac.h \
-	ccm.h chacha.h chachapoly.h cham.h channels.h cmac.h config.h \
+	3way.h adler32.h adv_simd.h aes.h aes_armv4.h algebra.h algparam.h \
+	allocate.h arc4.h argnames.h aria.h arm_simd.h asn.h authenc.h base32.h \
+	base64.h basecode.h blake2.h blowfish.h blumshub.h camellia.h cast.h \
+	cbcmac.h ccm.h chacha.h chachapoly.h cham.h channels.h cmac.h config.h \
 	config_align.h config_asm.h config_cpu.h config_cxx.h config_dll.h \
 	config_int.h config_misc.h config_ns.h config_os.h config_ver.h cpu.h \
 	crc.h cryptlib.h darn.h default.h des.h dh.h dh2.h dll.h dmac.h donna.h \
@@ -422,11 +416,12 @@ pkginclude_HEADERS = \
 	queue.h rabbit.h rabin.h randpool.h rc2.h rc5.h rc6.h rdrand.h \
 	rijndael.h ripemd.h rng.h rsa.h rw.h safer.h salsa.h scrypt.h seal.h \
 	secblock.h secblockfwd.h seckey.h seed.h serpent.h serpentp.h sha.h \
-	sha3.h shacal2.h shake.h shark.h simeck.h simon.h simple.h siphash.h \
-	skipjack.h sm3.h sm4.h smartptr.h sosemanuk.h speck.h square.h stdcpp.h \
-	strciphr.h tea.h threefish.h tiger.h trap.h trunhash.h ttmac.h \
-	tweetnacl.h twofish.h vmac.h wake.h whrlpool.h words.h xed25519.h xtr.h \
-	xtrcrypt.h xts.h zdeflate.h zinflate.h zlib.h
+	sha1_armv4.h sha256_armv4.h sha3.h sha512_armv4.h shacal2.h shake.h \
+	shark.h simeck.h simon.h simple.h siphash.h skipjack.h sm3.h sm4.h \
+	smartptr.h sosemanuk.h speck.h square.h stdcpp.h strciphr.h tea.h \
+	threefish.h tiger.h trap.h trunhash.h ttmac.h tweetnacl.h twofish.h \
+	vmac.h wake.h whrlpool.h words.h xed25519.h xtr.h xtrcrypt.h xts.h \
+	zdeflate.h zinflate.h zlib.h
 
 noinst_HEADERS = \
     local.h \