diff --git a/Android.mk b/Android.mk
index 7a1c8b7..7998bac 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,32 +48,31 @@ endif
 # Library source files
 
 CRYPTOPP_SRC_FILES := \
-    cryptlib.cpp cpu.cpp integer.cpp 3way.cpp adler32.cpp algebra.cpp \
-    algparam.cpp arc4.cpp aria_simd.cpp aria.cpp ariatab.cpp asn.cpp \
-    authenc.cpp base32.cpp base64.cpp basecode.cpp bfinit.cpp blake2-simd.cpp \
-    blake2.cpp blowfish.cpp blumshub.cpp camellia.cpp cast.cpp casts.cpp \
-    cbcmac.cpp ccm.cpp chacha_simd.cpp chacha.cpp cham_simd.cpp cham.cpp \
-    channels.cpp cmac.cpp crc_simd.cpp crc.cpp default.cpp des.cpp dessp.cpp \
-    dh.cpp dh2.cpp dll.cpp dsa.cpp eax.cpp ec2n.cpp eccrypto.cpp ecp.cpp \
-    elgamal.cpp emsa2.cpp eprecomp.cpp esign.cpp files.cpp filters.cpp \
-    fips140.cpp fipstest.cpp gcm_simd.cpp gcm.cpp gf256.cpp gf2_32.cpp \
-    gf2n.cpp gfpcrypt.cpp gost.cpp gzip.cpp hc128.cpp hc256.cpp hex.cpp \
-    hight.cpp hmac.cpp hrtimer.cpp ida.cpp idea.cpp iterhash.cpp kalyna.cpp \
-    kalynatab.cpp keccak.cpp keccakc.cpp lea_simd.cpp lea.cpp luc.cpp mars.cpp \
-    marss.cpp md2.cpp md4.cpp md5.cpp misc.cpp modes.cpp mqueue.cpp mqv.cpp \
-    nbtheory.cpp neon_simd.cpp oaep.cpp osrng.cpp padlkrng.cpp panama.cpp \
-    pkcspad.cpp poly1305.cpp polynomi.cpp ppc_simd.cpp pssr.cpp pubkey.cpp \
-    queue.cpp rabbit.cpp rabin.cpp randpool.cpp rc2.cpp rc5.cpp rc6.cpp \
-    rdrand.cpp rdtables.cpp rijndael_simd.cpp rijndael.cpp ripemd.cpp rng.cpp \
-    rsa.cpp rw.cpp safer.cpp salsa.cpp scrypt.cpp seal.cpp seed.cpp \
-    serpent.cpp sha_simd.cpp sha.cpp sha3.cpp shacal2_simd.cpp shacal2.cpp \
-    shark.cpp sharkbox.cpp simeck_simd.cpp simeck.cpp simon.cpp \
-    simon128_simd.cpp simon64_simd.cpp skipjack.cpp sm3.cpp sm4_simd.cpp \
-    sm4.cpp sosemanuk.cpp speck.cpp speck128_simd.cpp speck64_simd.cpp \
-    square.cpp squaretb.cpp sse_simd.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 xtr.cpp xtrcrypt.cpp zdeflate.cpp \
-    zinflate.cpp zlib.cpp
+    cryptlib.cpp cpu.cpp integer.cpp \
+    3way.cpp adler32.cpp algebra.cpp algparam.cpp arc4.cpp \
+    aria-simd.cpp aria.cpp ariatab.cpp asn.cpp authenc.cpp base32.cpp \
+    base64.cpp basecode.cpp bfinit.cpp blake2-simd.cpp blake2.cpp \
+    blowfish.cpp blumshub.cpp camellia.cpp cast.cpp casts.cpp cbcmac.cpp \
+    ccm.cpp chacha.cpp channels.cpp cmac.cpp crc-simd.cpp crc.cpp \
+    default.cpp des.cpp dessp.cpp dh.cpp dh2.cpp dll.cpp dsa.cpp eax.cpp \
+    ec2n.cpp eccrypto.cpp ecp.cpp elgamal.cpp emsa2.cpp eprecomp.cpp \
+    esign.cpp files.cpp filters.cpp fips140.cpp fipstest.cpp gcm-simd.cpp \
+    gcm.cpp gf256.cpp gf2_32.cpp gf2n.cpp gfpcrypt.cpp gost.cpp gzip.cpp \
+    hex.cpp hmac.cpp hrtimer.cpp ida.cpp idea.cpp iterhash.cpp kalyna.cpp \
+    kalynatab.cpp keccak.cpp luc.cpp mars.cpp marss.cpp md2.cpp md4.cpp \
+    md5.cpp misc.cpp modes.cpp mqueue.cpp mqv.cpp nbtheory.cpp neon-simd.cpp \
+    network.cpp oaep.cpp osrng.cpp padlkrng.cpp panama.cpp pkcspad.cpp \
+    poly1305.cpp polynomi.cpp ppc-simd.cpp pssr.cpp pubkey.cpp queue.cpp \
+    rabin.cpp randpool.cpp rc2.cpp rc5.cpp rc6.cpp rdrand.cpp rdtables.cpp \
+    rijndael-simd.cpp rijndael.cpp ripemd.cpp rng.cpp rsa.cpp rw.cpp \
+    safer.cpp salsa.cpp scrypt.cpp seal.cpp seed.cpp serpent.cpp \
+    sha-simd.cpp sha.cpp sha3.cpp shacal2-simd.cpp shacal2.cpp shark.cpp \
+    sharkbox.cpp simon-simd.cpp simon.cpp skipjack.cpp sm3.cpp sm4.cpp \
+    socketft.cpp sosemanuk.cpp speck-simd.cpp speck.cpp square.cpp \
+    squaretb.cpp sse-simd.cpp strciphr.cpp tea.cpp tftables.cpp \
+    threefish.cpp tiger.cpp tigertab.cpp trdlocal.cpp ttmac.cpp \
+    tweetnacl.cpp twofish.cpp vmac.cpp wait.cpp wake.cpp whrlpool.cpp \
+    xtr.cpp xtrcrypt.cpp zdeflate.cpp zinflate.cpp zlib.cpp
 
 #####################################################################
 # Test source files
@@ -81,11 +80,11 @@ CRYPTOPP_SRC_FILES := \
 # Remove adhoc.cpp from this list
 
 CRYPTOPP_TEST_FILES := \
-    test.cpp bench1.cpp bench2.cpp bench3.cpp datatest.cpp \
-    dlltest.cpp fipsalgt.cpp validat0.cpp validat1.cpp validat2.cpp \
-    validat3.cpp validat4.cpp validat5.cpp validat6.cpp validat7.cpp \
-    validat8.cpp validat9.cpp validat10.cpp regtest1.cpp regtest2.cpp \
-    regtest3.cpp regtest4.cpp
+    test.cpp bench1.cpp bench2.cpp \
+    datatest.cpp dlltest.cpp fipsalgt.cpp \
+    validat0.cpp validat1.cpp validat2.cpp \
+    validat3.cpp validat4.cpp regtest1.cpp \
+    regtest2.cpp regtest3.cpp
 
 #####################################################################
 # ARM A-32 source file
diff --git a/Application.mk b/Application.mk
index 347a5bb..6a5b24e 100644
--- a/Application.mk
+++ b/Application.mk
@@ -38,3 +38,4 @@ ifeq ($(NDK_LOG),1)
     $(info Crypto++: NDK_PROJECT_PATH is $(NDK_PROJECT_PATH))
     $(info Crypto++: APP_BUILD_SCRIPT is $(APP_BUILD_SCRIPT))
 endif
+