diff --git a/include/valkey/valkey.h b/include/valkey/valkey.h
index 3a05b32..7f3ca5a 100644
--- a/include/valkey/valkey.h
+++ b/include/valkey/valkey.h
@@ -162,14 +162,15 @@ struct valkeySsl;
 
 #define VALKEY_OPT_NONBLOCK 0x01
 #define VALKEY_OPT_REUSEADDR 0x02
-#define VALKEY_OPT_NOAUTOFREE                                                  \
-    0x04 /* Don't automatically free the async object on a connection failure,
-          * or other implicit conditions. Only free on an explicit call to
-          * disconnect() or free() */
-#define VALKEY_OPT_NO_PUSH_AUTOFREE                                            \
-    0x08 /* Don't automatically intercept and free RESP3 PUSH replies. */
-#define VALKEY_OPT_NOAUTOFREEREPLIES                                           \
-    0x10                            /* Don't automatically free replies. */
+/* Don't automatically free the async object on a connection failure,
+ * or other implicit conditions. Only free on an explicit call to
+ * disconnect() or free() */
+#define VALKEY_OPT_NOAUTOFREE 0x04
+
+/* Don't automatically intercept and free RESP3 PUSH replies. */
+#define VALKEY_OPT_NO_PUSH_AUTOFREE 0x08
+/* Don't automatically free replies. */
+#define VALKEY_OPT_NOAUTOFREEREPLIES 0x10
 #define VALKEY_OPT_PREFER_IPV4 0x20 /* Prefer IPv4 in DNS lookups. */
 #define VALKEY_OPT_PREFER_IPV6 0x40 /* Prefer IPv6 in DNS lookups. */
 #define VALKEY_OPT_PREFER_IP_UNSPEC                                            \
diff --git a/include/valkey/valkeycluster_ssl.h b/include/valkey/valkeycluster_ssl.h
index 3d924fc..9ddb4b2 100644
--- a/include/valkey/valkeycluster_ssl.h
+++ b/include/valkey/valkeycluster_ssl.h
@@ -29,6 +29,7 @@
 #ifndef VALKEYCLUSTER_SSL_H
 #define VALKEYCLUSTER_SSL_H
 
+#include "valkey.h"
 #include "valkey_ssl.h"
 #include "valkeycluster.h"
 
diff --git a/src/async.c b/src/async.c
index 755b989..dd68ebf 100644
--- a/src/async.c
+++ b/src/async.c
@@ -99,9 +99,12 @@ static void callbackValDestructor(void *privdata, void *val) {
 }
 
 static dictType callbackDict = {
-    callbackHash,          NULL,
-    callbackValDup,        callbackKeyCompare,
-    callbackKeyDestructor, callbackValDestructor,
+    .hashFunction = callbackHash,
+    .keyDup = NULL,
+    .valDup = callbackValDup,
+    .keyCompare = callbackKeyCompare,
+    .keyDestructor = callbackKeyDestructor,
+    .valDestructor = callbackValDestructor,
 };
 
 static valkeyAsyncContext *valkeyAsyncInitialize(valkeyContext *c) {