diff --git a/lib/nghttp2_hd.c b/lib/nghttp2_hd.c
index 6e5662be..d8a17eeb 100644
--- a/lib/nghttp2_hd.c
+++ b/lib/nghttp2_hd.c
@@ -37,8 +37,8 @@
 #define MAKE_STATIC_ENT(I, N, V, NH, VH)                                       \
   {                                                                            \
     {                                                                          \
-      { (uint8_t *) N, (uint8_t *)V, sizeof(N) - 1, sizeof(V) - 1, 0 }         \
-      , NH, VH, 1, NGHTTP2_HD_FLAG_NONE                                        \
+      { (uint8_t *)(N), (uint8_t *)(V), sizeof((N)) - 1, sizeof((V)) - 1, 0 }  \
+      , (NH), (VH), 1, NGHTTP2_HD_FLAG_NONE                                    \
     }                                                                          \
     , I                                                                        \
   }