diff --git a/adv-simd.h b/adv-simd.h
index 9f480344..80f49bd3 100644
--- a/adv-simd.h
+++ b/adv-simd.h
@@ -53,7 +53,7 @@
 # include <arm_neon.h>
 #endif
 
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/aria-simd.cpp b/aria-simd.cpp
index f7748b7e..ce16ada5 100644
--- a/aria-simd.cpp
+++ b/aria-simd.cpp
@@ -20,7 +20,7 @@
 
 // Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
 // compilers don't follow ACLE conventions for the include.
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/blake2-simd.cpp b/blake2-simd.cpp
index e631e7b3..250dae1b 100644
--- a/blake2-simd.cpp
+++ b/blake2-simd.cpp
@@ -35,7 +35,7 @@
 
 // Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
 // compilers don't follow ACLE conventions for the include.
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/chacha-simd.cpp b/chacha-simd.cpp
index b865d74d..733b2beb 100644
--- a/chacha-simd.cpp
+++ b/chacha-simd.cpp
@@ -36,7 +36,7 @@
 
 // Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
 // compilers don't follow ACLE conventions for the include.
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/crc-simd.cpp b/crc-simd.cpp
index e41cf2c2..0de26514 100644
--- a/crc-simd.cpp
+++ b/crc-simd.cpp
@@ -18,7 +18,7 @@
 # include <arm_neon.h>
 #endif
 
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/gcm-simd.cpp b/gcm-simd.cpp
index f2e428f7..46afb17b 100644
--- a/gcm-simd.cpp
+++ b/gcm-simd.cpp
@@ -33,7 +33,7 @@
 # include <arm_neon.h>
 #endif
 
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/lea-simd.cpp b/lea-simd.cpp
index c05d7505..c7eaa819 100644
--- a/lea-simd.cpp
+++ b/lea-simd.cpp
@@ -37,7 +37,7 @@
 
 // Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
 // compilers don't follow ACLE conventions for the include.
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/neon-simd.cpp b/neon-simd.cpp
index 05289973..a9690980 100644
--- a/neon-simd.cpp
+++ b/neon-simd.cpp
@@ -17,7 +17,7 @@
 
 // Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
 // compilers don't follow ACLE conventions for the include.
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/rijndael-simd.cpp b/rijndael-simd.cpp
index 67e82527..26228f1d 100644
--- a/rijndael-simd.cpp
+++ b/rijndael-simd.cpp
@@ -34,7 +34,7 @@
 # include <arm_neon.h>
 #endif
 
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/sha-simd.cpp b/sha-simd.cpp
index 2b610fa1..d9dd1a2c 100644
--- a/sha-simd.cpp
+++ b/sha-simd.cpp
@@ -27,7 +27,7 @@
 # include <arm_neon.h>
 #endif
 
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/simon128-simd.cpp b/simon128-simd.cpp
index ffc7cd0a..5d5af659 100644
--- a/simon128-simd.cpp
+++ b/simon128-simd.cpp
@@ -37,7 +37,7 @@
 
 // Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
 // compilers don't follow ACLE conventions for the include.
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/simon64-simd.cpp b/simon64-simd.cpp
index 62bf25f0..a103dddb 100644
--- a/simon64-simd.cpp
+++ b/simon64-simd.cpp
@@ -41,7 +41,7 @@
 
 // Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
 // compilers don't follow ACLE conventions for the include.
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/sm4-simd.cpp b/sm4-simd.cpp
index 7819d761..bc18e766 100644
--- a/sm4-simd.cpp
+++ b/sm4-simd.cpp
@@ -37,7 +37,7 @@
 
 // Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
 // compilers don't follow ACLE conventions for the include.
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/speck128-simd.cpp b/speck128-simd.cpp
index 5a503064..da7d949e 100644
--- a/speck128-simd.cpp
+++ b/speck128-simd.cpp
@@ -37,7 +37,7 @@
 
 // Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
 // compilers don't follow ACLE conventions for the include.
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/speck64-simd.cpp b/speck64-simd.cpp
index c0e32c5d..e4ce8fa2 100644
--- a/speck64-simd.cpp
+++ b/speck64-simd.cpp
@@ -41,7 +41,7 @@
 
 // Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
 // compilers don't follow ACLE conventions for the include.
-#if defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif