diff --git a/lib/nghttp2_map.c b/lib/nghttp2_map.c
index d12a1f47..e4e2b099 100644
--- a/lib/nghttp2_map.c
+++ b/lib/nghttp2_map.c
@@ -130,7 +130,6 @@ int nghttp2_map_each(nghttp2_map *map,
 
 void nghttp2_map_entry_init(nghttp2_map_entry *entry, key_type key) {
   entry->key = key;
-  entry->next = NULL;
 }
 
 /* FNV1a hash */
diff --git a/lib/nghttp2_map.h b/lib/nghttp2_map.h
index 2cf59f69..90bee1ec 100644
--- a/lib/nghttp2_map.h
+++ b/lib/nghttp2_map.h
@@ -40,12 +40,11 @@
 typedef int32_t key_type;
 
 typedef struct nghttp2_map_entry {
-  struct nghttp2_map_entry *next;
-  key_type key;
-#if SIZEOF_INT_P == 4
-  /* we requires 8 bytes aligment */
-  int64_t pad;
-#endif
+  union {
+    key_type key;
+    /* we requires 8 bytes aligment */
+    int64_t pad;
+  };
 } nghttp2_map_entry;
 
 typedef struct nghttp2_map_bucket {