diff --git a/common/aes.c b/common/aes.c
index bb58ada7..0c4fefb8 100644
--- a/common/aes.c
+++ b/common/aes.c
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "ctaes.h"
+#include "aes.h"
 
 static inline uint32_t br_dec32le(const unsigned char *src) {
     return (uint32_t)src[0]
@@ -249,8 +249,8 @@ static void br_aes_ct64_ortho(uint64_t *q) {
         uint64_t a, b; \
         a = (x); \
         b = (y); \
-        (x) = (a & (uint64_t)cl) | ((b & (uint64_t)cl) << (s)); \
-        (y) = ((a & (uint64_t)ch) >> (s)) | (b & (uint64_t)ch); \
+        (x) = (a & (uint64_t)(cl)) | ((b & (uint64_t)(cl)) << (s)); \
+        (y) = ((a & (uint64_t)(ch)) >> (s)) | (b & (uint64_t)(ch)); \
     } while (0)
 
 #define SWAP2(x, y)    SWAPN(0x5555555555555555, 0xAAAAAAAAAAAAAAAA,  1, x, y)