diff --git a/include/ldap_queue.h b/include/ldap_queue.h
index 9244f6cd79..2135702a65 100644
--- a/include/ldap_queue.h
+++ b/include/ldap_queue.h
@@ -129,14 +129,15 @@ struct name {								\
 
 #define LDAP_SLIST_HEAD_INITIALIZER(head)				\
 	{ NULL }
-#define LDAP_SLIST_NEXT_INITIALIZER(next)				\
-	{ NULL }
 
 #define LDAP_SLIST_ENTRY(type)						\
 struct {								\
 	struct type *sle_next;	/* next element */			\
 }
 
+#define LDAP_SLIST_ENTRY_INITIALIZER(entry)				\
+	{ NULL }
+
 /*
  * Singly-linked List functions.
  */
@@ -197,6 +198,9 @@ struct {								\
 	struct type *stqe_next;	/* next element */			\
 }
 
+#define LDAP_STAILQ_ENTRY_INITIALIZER(entry)				\
+	{ NULL }
+
 /*
  * Singly-linked Tail queue functions.
  */
@@ -273,8 +277,6 @@ struct name {								\
 
 #define LDAP_LIST_HEAD_INITIALIZER(head)				\
 	{ NULL }
-#define LDAP_LIST_NEXT_PREV_INITIALIZER(next, prev)			\
-	{ NULL, NULL }
 
 #define LDAP_LIST_ENTRY(type)						\
 struct {								\
@@ -282,6 +284,9 @@ struct {								\
 	struct type **le_prev;	/* address of previous next element */	\
 }
 
+#define LDAP_LIST_ENTRY_INITIALIZER(entry)			\
+	{ NULL, NULL }
+
 /*
  * List functions.
  */
@@ -346,6 +351,9 @@ struct {								\
 	struct type **tqe_prev;	/* address of previous next element */	\
 }
 
+#define LDAP_TAILQ_ENTRY_INITIALIZER(entry)				\
+	{ NULL, NULL }
+
 /*
  * Tail queue functions.
  */