diff --git a/crc-simd.cpp b/crc-simd.cpp
index 8fa1dcbd..85c05a2c 100644
--- a/crc-simd.cpp
+++ b/crc-simd.cpp
@@ -81,7 +81,7 @@ bool CPU_TryCRC32_ARMV8()
     }
     return result;
 #else
-#   if defined(__android__)
+#   if defined(__ANDROID__)
     if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_CRC32)
 		return true;
     // https://sourceware.org/ml/libc-help/2017-08/msg00012.html
diff --git a/gcm-simd.cpp b/gcm-simd.cpp
index 01858dc2..6438705d 100644
--- a/gcm-simd.cpp
+++ b/gcm-simd.cpp
@@ -214,7 +214,7 @@ bool CPU_TryPMULL_ARMV8()
     }
     return result;
 # else
-#   if defined(__android__)
+#   if defined(__ANDROID__)
     if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_PMULL)
 		return true;
     // https://sourceware.org/ml/libc-help/2017-08/msg00012.html
diff --git a/neon.cpp b/neon.cpp
index 15b81a6b..8c901724 100644
--- a/neon.cpp
+++ b/neon.cpp
@@ -73,10 +73,10 @@ bool CPU_TryNEON_ARM()
 	}
 	return result;
 # else
-#   if defined(__android__) && (CRYPTOPP_BOOL_ARM64)
+#   if defined(__ANDROID__) && (CRYPTOPP_BOOL_ARM64)
 	if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_ASIMD)
 		return true;
-#   elif defined(__android__) && (CRYPTOPP_BOOL_ARM32)
+#   elif defined(__ANDROID__) && (CRYPTOPP_BOOL_ARM32)
 	if (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON)
 		return true;
 #   elif defined(__linux__) && defined(__aarch64__)
diff --git a/rijndael-simd.cpp b/rijndael-simd.cpp
index e97becad..269a8047 100644
--- a/rijndael-simd.cpp
+++ b/rijndael-simd.cpp
@@ -104,7 +104,7 @@ bool CPU_TryAES_ARMV8()
 	}
 	return result;
 # else
-#   if defined(__android__)
+#   if defined(__ANDROID__)
     if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_AES)
 		return true;
     // https://sourceware.org/ml/libc-help/2017-08/msg00012.html
diff --git a/sha-simd.cpp b/sha-simd.cpp
index 18bf3c88..2f96d49e 100644
--- a/sha-simd.cpp
+++ b/sha-simd.cpp
@@ -91,7 +91,7 @@ bool CPU_TrySHA1_ARMV8()
 	}
 	return result;
 # else
-#   if defined(__android__)
+#   if defined(__ANDROID__)
     if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_SHA1)
 		return true;
     // https://sourceware.org/ml/libc-help/2017-08/msg00012.html
@@ -161,7 +161,7 @@ bool CPU_TrySHA2_ARMV8()
 	}
 	return result;
 #else
-#   if defined(__android__)
+#   if defined(__ANDROID__)
     if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_SHA2)
 		return true;
     // https://sourceware.org/ml/libc-help/2017-08/msg00012.html