diff --git a/config.h b/config.h
index ba779641..0b48e8a6 100644
--- a/config.h
+++ b/config.h
@@ -458,7 +458,7 @@ NAMESPACE_END
 
 // Requires ARMv7 and ACLE 1.0. Testing shows ARMv7 is really ARMv7a under most toolchains.
 #if !defined(CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
-# if defined(__ARM_NEON__) || defined(__ARM_NEON) || defined(_M_ARM)
+# if defined(__ARM_NEON__) || defined(__ARM_NEON) || defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM)
 #  define CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE 1
 # endif
 #endif
diff --git a/cpu.cpp b/cpu.cpp
index 366c35e8..dcd94dd4 100644
--- a/cpu.cpp
+++ b/cpu.cpp
@@ -11,7 +11,11 @@
 
 #include "cpu.h"
 #include "misc.h"
-#include <algorithm>
+#include "stdcpp.h"
+
+#if CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
+# include <arm_neon.h>
+#endif
 
 #ifndef CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY
 #include <signal.h>
diff --git a/cpu.h b/cpu.h
index d833f95c..d1ccf6f1 100644
--- a/cpu.h
+++ b/cpu.h
@@ -22,7 +22,7 @@
 # if defined(__GNUC__)
 #  include <stdint.h>
 # endif
-# if defined(__ARM_NEON) || defined(_MSC_VER)
+# if defined(__ARM_NEON) || defined(__aarch32__) || defined(__aarch64__) || defined(_MSC_VER)
 #  include <arm_neon.h>
 # endif
 # if defined(__GNUC__) && !defined(__apple_build_version__)