From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 6 Mar 2023 10:44:47 +0000 (+0000)
Subject: Use proper types for fr_value_box_t dlist structures
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d6cb0f294650db19b6fead6be177abc9d16ead4;p=thirdparty%2Ffreeradius-server.git

Use proper types for fr_value_box_t dlist structures
---

diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c
index 7a4503be40a..e7949f813e4 100644
--- a/src/bin/unit_test_attribute.c
+++ b/src/bin/unit_test_attribute.c
@@ -256,7 +256,7 @@ typedef struct {
 
 static xlat_action_t xlat_test(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 			       UNUSED xlat_ctx_t const *xctx, UNUSED request_t *request,
-			       UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+			       UNUSED fr_value_box_list_t *in)
 {
 	return XLAT_ACTION_DONE;
 }
diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index f8e5e00e1e8..4e426fdeeaa 100644
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -514,7 +514,7 @@ static int map_proc_verify(CONF_SECTION *cs, UNUSED void *mod_inst, UNUSED void
 }
 
 static rlm_rcode_t mod_map_proc(UNUSED void *mod_inst, UNUSED void *proc_inst, UNUSED request_t *request,
-			      	UNUSED FR_DLIST_HEAD(fr_value_box_list) *src, UNUSED map_list_t const *maps)
+			      	UNUSED fr_value_box_list_t *src, UNUSED map_list_t const *maps)
 {
 	return RLM_MODULE_FAIL;
 }
diff --git a/src/lib/eap_aka_sim/xlat.c b/src/lib/eap_aka_sim/xlat.c
index 2ccc2f9f74c..c3d55f3097d 100644
--- a/src/lib/eap_aka_sim/xlat.c
+++ b/src/lib/eap_aka_sim/xlat.c
@@ -47,7 +47,7 @@ static xlat_arg_parser_t const aka_sim_xlat_id_method_xlat_args[] = {
 static xlat_action_t aka_sim_xlat_id_method_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 						 UNUSED xlat_ctx_t const *xctx,
 						 request_t *request,
-						 FR_DLIST_HEAD(fr_value_box_list) *in)
+						 fr_value_box_list_t *in)
 {
 	char const			*method;
 	fr_aka_sim_id_type_t		type_hint;
@@ -103,7 +103,7 @@ static xlat_arg_parser_t const aka_sim_xlat_id_type_xlat_args[] = {
  */
 static xlat_action_t aka_sim_xlat_id_type_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					       UNUSED xlat_ctx_t const *xctx,
-					       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					       request_t *request, fr_value_box_list_t *in)
 {
 	char const			*type;
 	fr_aka_sim_id_type_t		type_hint;
@@ -159,7 +159,7 @@ static xlat_arg_parser_t const aka_sim_id_3gpp_temporary_id_key_index_xlat_args[
  */
 static xlat_action_t aka_sim_id_3gpp_temporary_id_key_index_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 						 		 UNUSED xlat_ctx_t const *xctx,
-								 request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+								 request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t	*id = fr_value_box_list_head(in);
 	fr_value_box_t	*vb;
@@ -224,7 +224,7 @@ xlat_arg_parser_t aka_sim_3gpp_temporary_id_decrypt_xlat_args[] = {
  */
 static xlat_action_t aka_sim_3gpp_temporary_id_decrypt_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 						 	    UNUSED xlat_ctx_t const *xctx,
-							    request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+							    request_t *request, fr_value_box_list_t *in)
 {
 	uint8_t		tag;
 	char		out_tag = '\0', *buff;
@@ -342,7 +342,7 @@ xlat_arg_parser_t aka_sim_3gpp_temporary_id_encrypt_xlat_args[] = {
  */
 static xlat_action_t aka_sim_3gpp_temporary_id_encrypt_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 							    UNUSED xlat_ctx_t const *xctx,
-							    request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+							    request_t *request, fr_value_box_list_t *in)
 {
 	char				encrypted[AKA_SIM_3GPP_PSEUDONYM_LEN + 1];
 	uint8_t				tag = 0;
diff --git a/src/lib/json/base.h b/src/lib/json/base.h
index 517fc748b39..05b36516bd7 100644
--- a/src/lib/json/base.h
+++ b/src/lib/json/base.h
@@ -239,7 +239,7 @@ typedef struct fr_jpath_node fr_jpath_node_t;
 size_t		fr_jpath_escape_func(UNUSED request_t *request, char *out, size_t outlen,
 				     char const *in, UNUSED void *arg);
 
-int		fr_jpath_evaluate_leaf(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out,
+int		fr_jpath_evaluate_leaf(TALLOC_CTX *ctx, fr_value_box_list_t *out,
 				       fr_type_t dst_type, fr_dict_attr_t const *dst_enumv,
 				       json_object *root, fr_jpath_node_t const *jpath);
 
diff --git a/src/lib/json/jpath.c b/src/lib/json/jpath.c
index 0e4dff9dd1b..c9f951f0919 100644
--- a/src/lib/json/jpath.c
+++ b/src/lib/json/jpath.c
@@ -138,7 +138,7 @@ size_t fr_jpath_escape_func(UNUSED request_t *request, char *out, size_t outlen,
  *	- 0 on no match.
  *	- -1 on error.
  */
-static int jpath_evaluate(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *tail,
+static int jpath_evaluate(TALLOC_CTX *ctx, fr_value_box_list_t *tail,
 			  fr_type_t dst_type, fr_dict_attr_t const *dst_enumv,
 			  json_object *object, fr_jpath_node_t const *jpath)
 {
@@ -380,7 +380,7 @@ static int jpath_evaluate(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *tai
  *	- 0 on no match.
  *	- -1 on error.
  */
-int fr_jpath_evaluate_leaf(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out,
+int fr_jpath_evaluate_leaf(TALLOC_CTX *ctx, fr_value_box_list_t *out,
 			   fr_type_t dst_type, fr_dict_attr_t const *dst_enumv,
 			   json_object *root, fr_jpath_node_t const *jpath)
 {
diff --git a/src/lib/server/exec.c b/src/lib/server/exec.c
index 128928a7e36..c9432d96466 100644
--- a/src/lib/server/exec.c
+++ b/src/lib/server/exec.c
@@ -45,7 +45,7 @@ static _Thread_local fr_sbuff_marker_t env_m[NUM_ELEMENTS(env_arr)];
  *	- >= 0 number of array elements in argv
  *	- <0 on error
  */
-static int exec_value_box_list_to_argv(TALLOC_CTX *ctx, char ***argv_p, FR_DLIST_HEAD(fr_value_box_list) const *in)
+static int exec_value_box_list_to_argv(TALLOC_CTX *ctx, char ***argv_p, fr_value_box_list_t const *in)
 {
 	char		**argv;
 	unsigned int	i = 0;
@@ -324,7 +324,7 @@ static NEVER_RETURNS void exec_child(request_t *request, char **argv, char **env
  *  would allow finer-grained control over the attributes to put into
  *  the environment.
  */
-int fr_exec_fork_nowait(request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args,
+int fr_exec_fork_nowait(request_t *request, fr_value_box_list_t *args,
 			fr_pair_list_t *env_pairs, bool env_escape, bool env_inherit)
 {
 
@@ -446,7 +446,7 @@ int fr_exec_fork_nowait(request_t *request, FR_DLIST_HEAD(fr_value_box_list) *ar
  */
 int fr_exec_fork_wait(pid_t *pid_p,
 		      int *stdin_fd, int *stdout_fd, int *stderr_fd,
-		      request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args,
+		      request_t *request, fr_value_box_list_t *args,
 		      fr_pair_list_t *env_pairs, bool env_escape, bool env_inherit)
 {
 	int		argc;
@@ -903,7 +903,7 @@ static void exec_stdout_read(UNUSED fr_event_list_t *el, int fd, int flags, void
  *	- -1 on failure
  */
 int fr_exec_start(TALLOC_CTX *ctx, fr_exec_state_t *exec, request_t *request,
-		  FR_DLIST_HEAD(fr_value_box_list) *args,
+		  fr_value_box_list_t *args,
 		  fr_pair_list_t *env_pairs, bool env_escape, bool env_inherit,
 		  bool need_stdin,
 		  bool store_stdout, TALLOC_CTX *stdout_ctx,
diff --git a/src/lib/server/exec.h b/src/lib/server/exec.h
index 754c4d4fb49..f7b4469a71e 100644
--- a/src/lib/server/exec.h
+++ b/src/lib/server/exec.h
@@ -79,16 +79,16 @@ typedef struct {
 
 void	fr_exec_cleanup(fr_exec_state_t *exec, int signal);
 
-int	fr_exec_fork_nowait(request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args,
+int	fr_exec_fork_nowait(request_t *request, fr_value_box_list_t *args,
 			    fr_pair_list_t *env_pairs, bool env_escape, bool env_inherit);
 
-int 	fr_exec_fork_wait(pid_t *pid_p, 
+int 	fr_exec_fork_wait(pid_t *pid_p,
 			   int *stdin_fd, int *stdout_fd, int *stderr_fd,
-			   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args,
+			   request_t *request, fr_value_box_list_t *args,
 			   fr_pair_list_t *env_pairs, bool env_escape, bool env_inherit);
 
 int	fr_exec_start(TALLOC_CTX *ctx, fr_exec_state_t *exec, request_t *request,
-		      FR_DLIST_HEAD(fr_value_box_list) *args,
+		      fr_value_box_list_t *args,
 		      fr_pair_list_t *env_pairs, bool env_escape, bool env_inherit,
 		      bool need_stdin,
 		      bool store_stdout, TALLOC_CTX *stdout_ctx,
diff --git a/src/lib/server/main_config.c b/src/lib/server/main_config.c
index d807aa4aabf..537b8e14a98 100644
--- a/src/lib/server/main_config.c
+++ b/src/lib/server/main_config.c
@@ -540,7 +540,7 @@ static xlat_arg_parser_t const xlat_config_args[] = {
  */
 static xlat_action_t xlat_config(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 UNUSED xlat_ctx_t const *xctx,
-				 request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				 request_t *request, fr_value_box_list_t *in)
 {
 	char const	*value;
 	CONF_PAIR	*cp;
diff --git a/src/lib/server/map.h b/src/lib/server/map.h
index ca9f8ce39db..8936c94f427 100644
--- a/src/lib/server/map.h
+++ b/src/lib/server/map.h
@@ -156,7 +156,7 @@ int		map_list_mod_apply(request_t *request, vp_list_mod_t const *vlm);
 
 int		map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out,
 				request_t *request, map_t const *map,
-				FR_DLIST_HEAD(fr_value_box_list) *lhs_result, FR_DLIST_HEAD(fr_value_box_list) *rhs_result);
+				fr_value_box_list_t *lhs_result, fr_value_box_list_t *rhs_result);
 
 int		map_to_request(request_t *request, map_t const *map,
 			       radius_map_getvalue_t func, void *ctx);
diff --git a/src/lib/server/map_async.c b/src/lib/server/map_async.c
index 1dad56bf1e0..2901ab796dc 100644
--- a/src/lib/server/map_async.c
+++ b/src/lib/server/map_async.c
@@ -250,14 +250,14 @@ static inline fr_pair_list_t *map_check_src_or_dst(request_t *request, map_t con
  */
 int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out,
 		    request_t *request, map_t const *original,
-		    FR_DLIST_HEAD(fr_value_box_list) *lhs_result, FR_DLIST_HEAD(fr_value_box_list) *rhs_result)
+		    fr_value_box_list_t *lhs_result, fr_value_box_list_t *rhs_result)
 {
 	vp_list_mod_t	*n = NULL;
 	map_t		map_tmp;
 	map_t const	*mutated = original;
 
 	fr_dcursor_t	values;
-	FR_DLIST_HEAD(fr_value_box_list)	head;
+	fr_value_box_list_t	head;
 	TALLOC_CTX	*tmp_ctx = NULL;
 
 	MAP_VERIFY(original);
diff --git a/src/lib/server/map_proc.c b/src/lib/server/map_proc.c
index 2a73859624a..fed7e7f91db 100644
--- a/src/lib/server/map_proc.c
+++ b/src/lib/server/map_proc.c
@@ -197,7 +197,7 @@ map_proc_inst_t *map_proc_instantiate(TALLOC_CTX *ctx, map_proc_t const *proc,
  * @param[in,out] result	Result of expanding the map input.  May be consumed
  *				by the map processor.
  */
-rlm_rcode_t map_proc(request_t *request, map_proc_inst_t const *inst, FR_DLIST_HEAD(fr_value_box_list) *result)
+rlm_rcode_t map_proc(request_t *request, map_proc_inst_t const *inst, fr_value_box_list_t *result)
 {
 	return inst->proc->evaluate(inst->proc->mod_inst, inst->data, request, result, inst->maps);
 }
diff --git a/src/lib/server/map_proc.h b/src/lib/server/map_proc.h
index dc7160fcc46..bce2804745e 100644
--- a/src/lib/server/map_proc.h
+++ b/src/lib/server/map_proc.h
@@ -59,7 +59,7 @@ extern "C" {
  *	- #RLM_MODULE_FAIL - If an error occurred performing the mapping.
  */
 typedef rlm_rcode_t (*map_proc_func_t)(void *mod_inst, void *proc_inst, request_t *request,
-				       FR_DLIST_HEAD(fr_value_box_list) *result, map_list_t const *maps);
+				       fr_value_box_list_t *result, map_list_t const *maps);
 
 /** Allocate new instance data for a map processor
  *
@@ -85,7 +85,7 @@ int		map_proc_register(void *mod_inst, char const *name,
 map_proc_inst_t *map_proc_instantiate(TALLOC_CTX *ctx, map_proc_t const *proc,
 				      CONF_SECTION *cs, tmpl_t const *src, map_list_t const *maps);
 
-rlm_rcode_t	map_proc(request_t *request, map_proc_inst_t const *inst, FR_DLIST_HEAD(fr_value_box_list) *src);
+rlm_rcode_t	map_proc(request_t *request, map_proc_inst_t const *inst, fr_value_box_list_t *src);
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/server/tmpl.h b/src/lib/server/tmpl.h
index 9567e86515c..0ce8f1dfbeb 100644
--- a/src/lib/server/tmpl.h
+++ b/src/lib/server/tmpl.h
@@ -1315,11 +1315,11 @@ int			tmpl_extents_build_to_leaf_parent(fr_dlist_head_t *leaf, fr_dlist_head_t *
 
 void			tmpl_extents_debug(fr_dlist_head_t *head) CC_HINT(nonnull);
 
-int			tmpl_eval_pair(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out, request_t *request, tmpl_t const *vpt);
+int			tmpl_eval_pair(TALLOC_CTX *ctx, fr_value_box_list_t *out, request_t *request, tmpl_t const *vpt);
 
-int			tmpl_eval(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out, request_t *request, tmpl_t const *vpt);
+int			tmpl_eval(TALLOC_CTX *ctx, fr_value_box_list_t *out, request_t *request, tmpl_t const *vpt);
 
-int			tmpl_eval_cast(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out, tmpl_t const *vpt);
+int			tmpl_eval_cast(TALLOC_CTX *ctx, fr_value_box_list_t *out, tmpl_t const *vpt);
 /** @} */
 
 ssize_t			tmpl_preparse(char const **out, size_t *outlen, char const *in, size_t inlen,
@@ -1329,7 +1329,7 @@ ssize_t			tmpl_preparse(char const **out, size_t *outlen, char const *in, size_t
 
 bool			tmpl_async_required(tmpl_t const *vpt) CC_HINT(nonnull);
 
-int			tmpl_value_list_insert_tail(FR_DLIST_HEAD(fr_value_box_list) *list, fr_value_box_t *vb, tmpl_t const *vpt) CC_HINT(nonnull);
+int			tmpl_value_list_insert_tail(fr_value_box_list_t *list, fr_value_box_t *vb, tmpl_t const *vpt) CC_HINT(nonnull);
 
 void			tmpl_rules_child_init(TALLOC_CTX *ctx, tmpl_rules_t *out, tmpl_rules_t const *parent, tmpl_t *vpt) CC_HINT(nonnull);
 
diff --git a/src/lib/server/tmpl_eval.c b/src/lib/server/tmpl_eval.c
index aa655de16c9..8d7f25b75f1 100644
--- a/src/lib/server/tmpl_eval.c
+++ b/src/lib/server/tmpl_eval.c
@@ -1057,7 +1057,7 @@ int pair_append_by_tmpl_parent(TALLOC_CTX *ctx, fr_pair_t **out, fr_pair_list_t
  *	- <0 for "cast failed"
  *	- 0 for success
  */
-int tmpl_value_list_insert_tail(FR_DLIST_HEAD(fr_value_box_list) *list, fr_value_box_t *box, tmpl_t const *vpt)
+int tmpl_value_list_insert_tail(fr_value_box_list_t *list, fr_value_box_t *box, tmpl_t const *vpt)
 {
 	if (fr_type_is_null(tmpl_rules_cast(vpt)) ||
 	    (box->type == tmpl_rules_cast(vpt))) {
@@ -1085,12 +1085,12 @@ int tmpl_value_list_insert_tail(FR_DLIST_HEAD(fr_value_box_list) *list, fr_value
  *	- <0	on memory allocation errors.
  *	- 0	success.
  */
-static int tmpl_eval_pair_virtual(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out,
+static int tmpl_eval_pair_virtual(TALLOC_CTX *ctx, fr_value_box_list_t *out,
 				  request_t *request, tmpl_t const *vpt)
 {
 	fr_radius_packet_t *packet = NULL;
 	fr_value_box_t	*value;
-	FR_DLIST_HEAD(fr_value_box_list) list;
+	fr_value_box_list_t list;
 
 	/*
 	 *	Virtual attributes always have a count of 1
@@ -1244,7 +1244,7 @@ done:
  *	- <0		we failed getting a value for the attribute.
  *	- 0		we successfully evaluated the tmpl
  */
-int tmpl_eval_pair(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out, request_t *request, tmpl_t const *vpt)
+int tmpl_eval_pair(TALLOC_CTX *ctx, fr_value_box_list_t *out, request_t *request, tmpl_t const *vpt)
 {
 	fr_pair_t		*vp = NULL;
 	fr_value_box_t		*value;
@@ -1253,7 +1253,7 @@ int tmpl_eval_pair(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out, reque
 	tmpl_dcursor_ctx_t	cc;
 
 	int			ret = 0;
-	FR_DLIST_HEAD(fr_value_box_list)	list;
+	fr_value_box_list_t	list;
 
 	fr_assert(tmpl_is_attr(vpt));
 
@@ -1389,11 +1389,11 @@ fail:
  *	- <0		we failed getting a value for the tmpl
  *	- 0		we successfully evaluated the tmpl
  */
-int tmpl_eval(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out, request_t *request, tmpl_t const *vpt)
+int tmpl_eval(TALLOC_CTX *ctx, fr_value_box_list_t *out, request_t *request, tmpl_t const *vpt)
 {
 	char *p;
 	fr_value_box_t		*value;
-	FR_DLIST_HEAD(fr_value_box_list)	list;
+	fr_value_box_list_t	list;
 
 	if (tmpl_needs_resolving(vpt)) {
 		fr_strerror_const("Cannot evaluate unresolved tmpl");
@@ -1465,7 +1465,7 @@ done:
  *	- <0		the cast failed
  *	- 0		we successfully evaluated the tmpl
  */
-int tmpl_eval_cast(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *list, tmpl_t const *vpt)
+int tmpl_eval_cast(TALLOC_CTX *ctx, fr_value_box_list_t *list, tmpl_t const *vpt)
 {
 	fr_type_t cast = tmpl_rules_cast(vpt);
 	fr_value_box_t *vb;
diff --git a/src/lib/server/trigger.c b/src/lib/server/trigger.c
index b5cbdbbcc43..8a71b2c9d7a 100644
--- a/src/lib/server/trigger.c
+++ b/src/lib/server/trigger.c
@@ -63,7 +63,7 @@ xlat_arg_parser_t const trigger_xlat_args[] = {
  */
 xlat_action_t trigger_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 			   UNUSED xlat_ctx_t const *xctx,
-			   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+			   request_t *request, fr_value_box_list_t *in)
 {
 	fr_pair_list_t		*head = NULL;
 	fr_dict_attr_t const	*da;
@@ -187,7 +187,7 @@ bool trigger_enabled(void)
 typedef struct {
 	char			*command;	//!< Name of the trigger.
 	xlat_exp_head_t		*xlat;		//!< xlat representation of the trigger args.
-	FR_DLIST_HEAD(fr_value_box_list)	args;		//!< Arguments to pass to the trigger exec.
+	fr_value_box_list_t	args;		//!< Arguments to pass to the trigger exec.
 
 	fr_exec_state_t		exec;		//!< Used for asynchronous execution.
 	fr_time_delta_t		timeout;	//!< How long the trigger has to run.
diff --git a/src/lib/server/trigger.h b/src/lib/server/trigger.h
index 8798db29949..d8b65a15ae0 100644
--- a/src/lib/server/trigger.h
+++ b/src/lib/server/trigger.h
@@ -40,7 +40,7 @@ extern xlat_arg_parser_t const trigger_xlat_args[];
 
 xlat_action_t	trigger_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 			     UNUSED xlat_ctx_t const *xctx,
-			     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in);
+			     request_t *request, fr_value_box_list_t *in);
 
 int		trigger_exec_init(CONF_SECTION const *cs);
 
diff --git a/src/lib/unlang/condition.c b/src/lib/unlang/condition.c
index 0b4a4218aa5..90bb27d82d3 100644
--- a/src/lib/unlang/condition.c
+++ b/src/lib/unlang/condition.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 #include "group_priv.h"
 
 typedef struct {
-	FR_DLIST_HEAD(fr_value_box_list)	out;				//!< Head of the result of a nested
+	fr_value_box_list_t	out;				//!< Head of the result of a nested
 								///< expansion.
 	bool			success;			//!< If set, where to record the result
 								///< of the execution.
diff --git a/src/lib/unlang/edit.c b/src/lib/unlang/edit.c
index c73f8e5d67a..7a05b0c5264 100644
--- a/src/lib/unlang/edit.c
+++ b/src/lib/unlang/edit.c
@@ -35,7 +35,7 @@ RCSID("$Id$")
 #include "edit_priv.h"
 
 typedef struct {
-	FR_DLIST_HEAD(fr_value_box_list)	result;			//!< result of expansion
+	fr_value_box_list_t	result;			//!< result of expansion
 	tmpl_t const		*vpt;			//!< expanded tmpl
 	tmpl_t			*to_free;		//!< tmpl to free.
 	bool			create;			//!< whether we need to create the VP
diff --git a/src/lib/unlang/foreach.c b/src/lib/unlang/foreach.c
index a4034ee510a..8eaddbbc584 100644
--- a/src/lib/unlang/foreach.c
+++ b/src/lib/unlang/foreach.c
@@ -60,7 +60,7 @@ typedef struct {
 
 static xlat_action_t unlang_foreach_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					 xlat_ctx_t const *xctx,
-					 request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in);
+					 request_t *request, UNUSED fr_value_box_list_t *in);
 
 #define FOREACH_REQUEST_DATA (void *)unlang_foreach_xlat
 
@@ -248,7 +248,7 @@ static unlang_action_t unlang_break(rlm_rcode_t *p_result, request_t *request, u
  */
 static xlat_action_t unlang_foreach_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					 xlat_ctx_t const *xctx,
-					 request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+					 request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	fr_pair_t			*vp;
 	int const			*inst = xctx->inst;
diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c
index 89b76fd40df..8bb5d5c7c04 100644
--- a/src/lib/unlang/interpret.c
+++ b/src/lib/unlang/interpret.c
@@ -1292,7 +1292,7 @@ static xlat_arg_parser_t const unlang_cancel_xlat_args[] = {
 
 static xlat_action_t unlang_cancel_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					UNUSED xlat_ctx_t const *xctx,
-					request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args);
+					request_t *request, fr_value_box_list_t *args);
 
 /** Signal the request to stop executing
  *
@@ -1315,7 +1315,7 @@ static void unlang_cancel_event(UNUSED fr_event_list_t *el, UNUSED fr_time_t now
  */
 static xlat_action_t unlang_cancel_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					UNUSED xlat_ctx_t const *xctx,
-					request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+					request_t *request, fr_value_box_list_t *args)
 {
 	fr_value_box_t		*timeout;
 	fr_event_list_t		*el = unlang_interpret_event_list(request);
@@ -1383,7 +1383,7 @@ static xlat_arg_parser_t const unlang_interpret_xlat_args[] = {
  */
 static xlat_action_t unlang_interpret_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					   UNUSED xlat_ctx_t const *xctx,
-					   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					   request_t *request, fr_value_box_list_t *in)
 {
 	unlang_stack_t		*stack = request->stack;
 	int			depth = stack->depth;
diff --git a/src/lib/unlang/limit.c b/src/lib/unlang/limit.c
index b2da33151af..058fb7f2666 100644
--- a/src/lib/unlang/limit.c
+++ b/src/lib/unlang/limit.c
@@ -36,7 +36,7 @@ typedef struct {
 	uint32_t				limit;
 	request_t				*request;
 
-	FR_DLIST_HEAD(fr_value_box_list)	result;
+	fr_value_box_list_t			result;
 } unlang_frame_state_limit_t;
 
 /** Send a signal (usually stop) to a request
diff --git a/src/lib/unlang/map.c b/src/lib/unlang/map.c
index 3d841aaa115..1602c3da38e 100644
--- a/src/lib/unlang/map.c
+++ b/src/lib/unlang/map.c
@@ -48,8 +48,8 @@ typedef struct {
 
 	fr_dlist_head_t		vlm_head;			//!< Head of list of VP List Mod.
 
-	FR_DLIST_HEAD(fr_value_box_list)	lhs_result;			//!< Result of expanding the LHS
-	FR_DLIST_HEAD(fr_value_box_list)	rhs_result;			//!< Result of expanding the RHS.
+	fr_value_box_list_t	lhs_result;			//!< Result of expanding the LHS
+	fr_value_box_list_t	rhs_result;			//!< Result of expanding the RHS.
 
 	unlang_update_state_t	state;				//!< What we're currently doing.
 } unlang_frame_state_update_t;
@@ -58,7 +58,7 @@ typedef struct {
  *
  */
 typedef struct {
-	FR_DLIST_HEAD(fr_value_box_list)	src_result;			//!< Result of expanding the map source.
+	fr_value_box_list_t	src_result;			//!< Result of expanding the map source.
 } unlang_frame_state_map_proc_t;
 
 /** Apply a list of modifications on one or more fr_pair_t lists.
diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c
index 3913165e0a3..a4d61f507b5 100644
--- a/src/lib/unlang/module.c
+++ b/src/lib/unlang/module.c
@@ -441,7 +441,7 @@ int unlang_module_set_resume(request_t *request, unlang_module_resume_t resume)
  * @return
  *	- UNLANG_ACTION_PUSHED_CHILD
  */
-unlang_action_t unlang_module_yield_to_xlat(TALLOC_CTX *ctx, bool *p_success, FR_DLIST_HEAD(fr_value_box_list) *out,
+unlang_action_t unlang_module_yield_to_xlat(TALLOC_CTX *ctx, bool *p_success, fr_value_box_list_t *out,
 					    request_t *request, xlat_exp_head_t const *exp,
 					    unlang_module_resume_t resume,
 					    unlang_module_signal_t signal, void *rctx)
@@ -487,7 +487,7 @@ unlang_action_t unlang_module_yield_to_xlat(TALLOC_CTX *ctx, bool *p_success, FR
  * @return
  *	- UNLANG_ACTION_PUSHED_CHILD
  */
-unlang_action_t unlang_module_yield_to_tmpl(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out,
+unlang_action_t unlang_module_yield_to_tmpl(TALLOC_CTX *ctx, fr_value_box_list_t *out,
 					    request_t *request, tmpl_t const *vpt,
 					    unlang_tmpl_args_t *args,
 					    unlang_module_resume_t resume,
diff --git a/src/lib/unlang/module.h b/src/lib/unlang/module.h
index caa94c5c80d..6f0d52498b9 100644
--- a/src/lib/unlang/module.h
+++ b/src/lib/unlang/module.h
@@ -121,12 +121,12 @@ unlang_action_t	unlang_module_yield_to_section(rlm_rcode_t *p_result,
 					       unlang_module_resume_t resume,
 					       unlang_module_signal_t signal, void *rctx);
 
-unlang_action_t	unlang_module_yield_to_xlat(TALLOC_CTX *ctx, bool *p_success, FR_DLIST_HEAD(fr_value_box_list) *out,
+unlang_action_t	unlang_module_yield_to_xlat(TALLOC_CTX *ctx, bool *p_success, fr_value_box_list_t *out,
 					    request_t *request, xlat_exp_head_t const *xlat,
 					    unlang_module_resume_t resume,
 					    unlang_module_signal_t signal, void *rctx);
 
-unlang_action_t	unlang_module_yield_to_tmpl(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out,
+unlang_action_t	unlang_module_yield_to_tmpl(TALLOC_CTX *ctx, fr_value_box_list_t *out,
 					    request_t *request, tmpl_t const *vpt,
 					    unlang_tmpl_args_t *args,
 					    unlang_module_resume_t resume,
diff --git a/src/lib/unlang/timeout.c b/src/lib/unlang/timeout.c
index 11922f2054d..c5b565dd87e 100644
--- a/src/lib/unlang/timeout.c
+++ b/src/lib/unlang/timeout.c
@@ -35,7 +35,7 @@ typedef struct {
 	rindent_t				indent;
 	fr_event_timer_t const			*ev;
 
-	FR_DLIST_HEAD(fr_value_box_list)	result;
+	fr_value_box_list_t			result;
 } unlang_frame_state_timeout_t;
 
 static void unlang_timeout_handler(UNUSED fr_event_list_t *el, UNUSED fr_time_t now, void *ctx)
diff --git a/src/lib/unlang/tmpl.c b/src/lib/unlang/tmpl.c
index c850f9a3964..7a3f9f2a9c2 100644
--- a/src/lib/unlang/tmpl.c
+++ b/src/lib/unlang/tmpl.c
@@ -255,7 +255,7 @@ push:
  * @param[in] args		where the status of exited programs will be stored.
  *				Used only for #TMPL_TYPE_EXEC.
  */
-unlang_action_t unlang_tmpl_push(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out, request_t *request,
+unlang_action_t unlang_tmpl_push(TALLOC_CTX *ctx, fr_value_box_list_t *out, request_t *request,
 				 tmpl_t const *tmpl, unlang_tmpl_args_t *args)
 {
 	unlang_stack_t			*stack = request->stack;
diff --git a/src/lib/unlang/tmpl.h b/src/lib/unlang/tmpl.h
index e5f76abfff1..230f8ce52cf 100644
--- a/src/lib/unlang/tmpl.h
+++ b/src/lib/unlang/tmpl.h
@@ -107,7 +107,7 @@ typedef void (*fr_unlang_tmpl_signal_t)(request_t *request, void *rctx, fr_state
  */
 typedef unlang_action_t (*fr_unlang_tmpl_resume_t)(rlm_rcode_t *p_result, request_t *request, void *rctx);
 
-int		unlang_tmpl_push(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out,
+int		unlang_tmpl_push(TALLOC_CTX *ctx, fr_value_box_list_t *out,
 				 request_t *request, tmpl_t const *tmpl, unlang_tmpl_args_t *args)
 		CC_HINT(warn_unused_result);
 
diff --git a/src/lib/unlang/tmpl_priv.h b/src/lib/unlang/tmpl_priv.h
index a85f4ca242a..f710250cd13 100644
--- a/src/lib/unlang/tmpl_priv.h
+++ b/src/lib/unlang/tmpl_priv.h
@@ -36,8 +36,8 @@ extern "C" {
  */
 typedef struct {
 	TALLOC_CTX			*ctx;		//!< for allocating value boxes
-	FR_DLIST_HEAD(fr_value_box_list)		*out;		//!< output list if the exec succeeds
-	FR_DLIST_HEAD(fr_value_box_list)		list;		//!< our intermediate working list
+	fr_value_box_list_t		*out;		//!< output list if the exec succeeds
+	fr_value_box_list_t		list;		//!< our intermediate working list
 
 	void				*rctx;		//!< for resume
 	fr_unlang_tmpl_resume_t		resume;	       	//!< resumption handler
diff --git a/src/lib/unlang/xlat.c b/src/lib/unlang/xlat.c
index 42bc86e5894..cfe9ee120d1 100644
--- a/src/lib/unlang/xlat.c
+++ b/src/lib/unlang/xlat.c
@@ -48,7 +48,7 @@ typedef struct {
 	/*
 	 *	For func and alternate
 	 */
-	FR_DLIST_HEAD(fr_value_box_list)	out;				//!< Head of the result of a nested
+	fr_value_box_list_t	out;				//!< Head of the result of a nested
 								///< expansion.
 	bool			alternate;			//!< record which alternate branch we
 								///< previously took.
@@ -188,7 +188,7 @@ int unlang_xlat_timeout_add(request_t *request,
  *	- 0 on success.
  *	- -1 on failure.
  */
-static int unlang_xlat_push_internal(TALLOC_CTX *ctx, bool *p_success, FR_DLIST_HEAD(fr_value_box_list) *out,
+static int unlang_xlat_push_internal(TALLOC_CTX *ctx, bool *p_success, fr_value_box_list_t *out,
 				     request_t *request, xlat_exp_head_t const *xlat, xlat_exp_t *node, bool top_frame)
 {
 	/** Static instruction for performing xlat evaluations
@@ -271,7 +271,7 @@ static int unlang_xlat_push_internal(TALLOC_CTX *ctx, bool *p_success, FR_DLIST_
  *	- 0 on success.
  *	- -1 on failure.
  */
-int unlang_xlat_push(TALLOC_CTX *ctx, bool *p_success, FR_DLIST_HEAD(fr_value_box_list) *out,
+int unlang_xlat_push(TALLOC_CTX *ctx, bool *p_success, fr_value_box_list_t *out,
 		     request_t *request, xlat_exp_head_t const *xlat, bool top_frame)
 {
 	(void) talloc_get_type_abort_const(xlat, xlat_exp_head_t);
@@ -291,7 +291,7 @@ int unlang_xlat_push(TALLOC_CTX *ctx, bool *p_success, FR_DLIST_HEAD(fr_value_bo
  *	- 0 on success.
  *	- -1 on failure.
  */
-int unlang_xlat_push_node(TALLOC_CTX *ctx, bool *p_success, FR_DLIST_HEAD(fr_value_box_list) *out,
+int unlang_xlat_push_node(TALLOC_CTX *ctx, bool *p_success, fr_value_box_list_t *out,
 			  request_t *request, xlat_exp_t *node)
 {
 	return unlang_xlat_push_internal(ctx, p_success, out, request, NULL, node, UNLANG_TOP_FRAME);
diff --git a/src/lib/unlang/xlat.h b/src/lib/unlang/xlat.h
index 90405ba9366..5f38ba7ba4a 100644
--- a/src/lib/unlang/xlat.h
+++ b/src/lib/unlang/xlat.h
@@ -206,7 +206,7 @@ typedef void (*fr_unlang_xlat_fd_event_t)(xlat_ctx_t const *xctx, request_t *req
  *	- XLAT_ACTION_FAIL	the xlat function failed.
  */
 typedef xlat_action_t (*xlat_func_t)(TALLOC_CTX *ctx, fr_dcursor_t *out,
-				     xlat_ctx_t const *xctx, request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in);
+				     xlat_ctx_t const *xctx, request_t *request, fr_value_box_list_t *in);
 
 /** A callback when the request gets a fr_state_signal_t.
  *
@@ -531,7 +531,7 @@ int		xlat_purify_op(TALLOC_CTX *ctx, xlat_exp_t **out, xlat_exp_t *lhs, fr_token
 int		unlang_xlat_timeout_add(request_t *request, fr_unlang_xlat_timeout_t callback,
 					void const *rctx, fr_time_t when);
 
-int		unlang_xlat_push(TALLOC_CTX *ctx, bool *p_success, FR_DLIST_HEAD(fr_value_box_list) *out,
+int		unlang_xlat_push(TALLOC_CTX *ctx, bool *p_success, fr_value_box_list_t *out,
 				 request_t *request, xlat_exp_head_t const *head, bool top_frame)
 				 CC_HINT(warn_unused_result);
 
diff --git a/src/lib/unlang/xlat_builtin.c b/src/lib/unlang/xlat_builtin.c
index eb951ddbb6c..6e0e8a91be5 100644
--- a/src/lib/unlang/xlat_builtin.c
+++ b/src/lib/unlang/xlat_builtin.c
@@ -566,7 +566,7 @@ typedef struct {
  */
 static xlat_action_t xlat_redundant_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					   xlat_ctx_t const *xctx,
-					   request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+					   request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	xlat_redundant_inst_t const	*xri = talloc_get_type_abort_const(xctx->inst, xlat_redundant_inst_t);
 	xlat_redundant_rctx_t		*rctx = talloc_get_type_abort(xctx->rctx, xlat_redundant_rctx_t);
@@ -597,7 +597,7 @@ static xlat_action_t xlat_redundant_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 	/*
 	 *	Push the next child...
 	 */
-	if (unlang_xlat_push(ctx, &rctx->last_success, (FR_DLIST_HEAD(fr_value_box_list) *)out->dlist,
+	if (unlang_xlat_push(ctx, &rctx->last_success, (fr_value_box_list_t *)out->dlist,
 			     request, *rctx->current, UNLANG_SUB_FRAME) < 0) goto error;
 
 	return XLAT_ACTION_PUSH_UNLANG;
@@ -608,7 +608,7 @@ static xlat_action_t xlat_redundant_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
  */
 static xlat_action_t xlat_load_balance_resume(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 					      xlat_ctx_t const *xctx,
-					      UNUSED request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+					      UNUSED request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	xlat_redundant_rctx_t	*rctx = talloc_get_type_abort(xctx->rctx, xlat_redundant_rctx_t);
 	xlat_action_t 		xa = rctx->last_success ? XLAT_ACTION_DONE : XLAT_ACTION_FAIL;
@@ -624,7 +624,7 @@ static xlat_action_t xlat_load_balance_resume(UNUSED TALLOC_CTX *ctx, UNUSED fr_
  */
 static xlat_action_t xlat_redundant(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				    xlat_ctx_t const *xctx,
-				    request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+				    request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	xlat_redundant_inst_t const	*xri = talloc_get_type_abort_const(xctx->inst, xlat_redundant_inst_t);
 	xlat_redundant_rctx_t		*rctx;
@@ -666,7 +666,7 @@ static xlat_action_t xlat_redundant(TALLOC_CTX *ctx, fr_dcursor_t *out,
 		fr_assert(0);
 	}
 
-	if (unlang_xlat_push(ctx, &rctx->last_success, (FR_DLIST_HEAD(fr_value_box_list) *)out->dlist,
+	if (unlang_xlat_push(ctx, &rctx->last_success, (fr_value_box_list_t *)out->dlist,
 			     request, *rctx->current, UNLANG_SUB_FRAME) < 0) return XLAT_ACTION_FAIL;
 
 	return XLAT_ACTION_PUSH_UNLANG;
@@ -968,7 +968,7 @@ static xlat_arg_parser_t const xlat_func_debug_args[] = {
  */
 static xlat_action_t xlat_func_debug(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				     UNUSED xlat_ctx_t const *xctx,
-				     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				     request_t *request, fr_value_box_list_t *args)
 {
 	int level = 0;
 	fr_value_box_t	*vb, *lvl_vb;
@@ -1136,7 +1136,7 @@ void xlat_debug_attr_list(request_t *request, fr_pair_list_t const *list)
  */
 static xlat_action_t xlat_func_debug_attr(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 					  UNUSED xlat_ctx_t const *xctx,
-					  request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+					  request_t *request, fr_value_box_list_t *args)
 {
 	fr_pair_t		*vp;
 	fr_dcursor_t		cursor;
@@ -1193,7 +1193,7 @@ static xlat_action_t xlat_func_debug_attr(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcur
  */
 static xlat_action_t xlat_func_flatten(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 					  UNUSED xlat_ctx_t const *xctx,
-					  request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+					  request_t *request, fr_value_box_list_t *args)
 {
 	fr_pair_t		*vp;
 	tmpl_t			*vpt;
@@ -1242,7 +1242,7 @@ static xlat_action_t xlat_func_flatten(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor
  */
 static xlat_action_t xlat_func_unflatten(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 					  UNUSED xlat_ctx_t const *xctx,
-					  request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+					  request_t *request, fr_value_box_list_t *args)
 {
 	fr_pair_t		*vp;
 	tmpl_t			*vpt;
@@ -1280,7 +1280,7 @@ static xlat_action_t xlat_func_unflatten(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcurs
 
 static xlat_action_t xlat_func_untaint(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       UNUSED xlat_ctx_t const *xctx,
-				       UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				       UNUSED request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t *vb;
 
@@ -1294,7 +1294,7 @@ static xlat_action_t xlat_func_untaint(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out
 
 static xlat_action_t xlat_func_taint(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
 				     UNUSED xlat_ctx_t const *xctx,
-				     UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				     UNUSED request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t *vb;
 
@@ -1330,10 +1330,10 @@ update request {
  */
 static xlat_action_t xlat_func_explode(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       UNUSED xlat_ctx_t const *xctx,
-				       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				       request_t *request, fr_value_box_list_t *args)
 {
 	fr_value_box_t				*strings;
-	FR_DLIST_HEAD(fr_value_box_list)	*list;
+	fr_value_box_list_t	*list;
 	fr_value_box_t				*delim_vb;
 	ssize_t					delim_len;
 	char const				*delim;
@@ -1415,7 +1415,7 @@ update request {
  */
 static xlat_action_t xlat_func_integer(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       UNUSED xlat_ctx_t const *xctx,
-				       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				       request_t *request, fr_value_box_list_t *args)
 {
 	fr_value_box_t	*in_vb;
 	char const *p;
@@ -1545,7 +1545,7 @@ static xlat_arg_parser_t const xlat_func_map_arg[] = {
  */
 static xlat_action_t xlat_func_map(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				   UNUSED xlat_ctx_t const *xctx,
-				   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				   request_t *request, fr_value_box_list_t *args)
 {
 	map_t		*map = NULL;
 	int		ret;
@@ -1626,7 +1626,7 @@ static xlat_arg_parser_t const xlat_func_next_time_args[] = {
  */
 static xlat_action_t xlat_func_next_time(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					 UNUSED xlat_ctx_t const *xctx,
-					 request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+					 request_t *request, fr_value_box_list_t *args)
 {
 	long		num;
 
@@ -1711,7 +1711,7 @@ typedef struct {
  */
 static xlat_action_t xlat_eval_resume(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 				      xlat_ctx_t const *xctx,
-				      UNUSED request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+				      UNUSED request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	xlat_eval_rctx_t	*rctx = talloc_get_type_abort(xctx->rctx, xlat_eval_rctx_t);
 	xlat_action_t		xa = rctx->last_success ? XLAT_ACTION_DONE : XLAT_ACTION_FAIL;
@@ -1732,7 +1732,7 @@ static xlat_arg_parser_t const xlat_func_eval_arg[] = {
  */
 static xlat_action_t xlat_func_eval(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				    UNUSED xlat_ctx_t const *xctx,
-				    request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				    request_t *request, fr_value_box_list_t *args)
 {
 	/*
 	 *	These are escaping rules applied to the
@@ -1799,7 +1799,7 @@ static xlat_action_t xlat_func_eval(TALLOC_CTX *ctx, fr_dcursor_t *out,
 
 	if (unlang_xlat_yield(request, xlat_eval_resume, NULL, rctx) != XLAT_ACTION_YIELD) goto error;
 
-	if (unlang_xlat_push(ctx, &rctx->last_success, (FR_DLIST_HEAD(fr_value_box_list) *)out->dlist,
+	if (unlang_xlat_push(ctx, &rctx->last_success, (fr_value_box_list_t *)out->dlist,
 			     request, rctx->ex, UNLANG_SUB_FRAME) < 0) goto error;
 
 	return XLAT_ACTION_PUSH_UNLANG;
@@ -1811,7 +1811,7 @@ static xlat_action_t xlat_func_eval(TALLOC_CTX *ctx, fr_dcursor_t *out,
  */
 static xlat_action_t xlat_func_expr(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				    UNUSED xlat_ctx_t const *xctx,
-				    request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				    request_t *request, fr_value_box_list_t *args)
 {
 	/*
 	 *	These are escaping rules applied to the
@@ -1878,7 +1878,7 @@ static xlat_action_t xlat_func_expr(TALLOC_CTX *ctx, fr_dcursor_t *out,
 
 	if (unlang_xlat_yield(request, xlat_eval_resume, NULL, rctx) != XLAT_ACTION_YIELD) goto error;
 
-	if (unlang_xlat_push(ctx, &rctx->last_success, (FR_DLIST_HEAD(fr_value_box_list) *)out->dlist,
+	if (unlang_xlat_push(ctx, &rctx->last_success, (fr_value_box_list_t *)out->dlist,
 			     request, rctx->ex, UNLANG_SUB_FRAME) < 0) goto error;
 
 	return XLAT_ACTION_PUSH_UNLANG;
@@ -1906,13 +1906,13 @@ static xlat_arg_parser_t const xlat_func_pad_args[] = {
  */
 static xlat_action_t xlat_func_lpad(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
 				    UNUSED xlat_ctx_t const *xctx,
-				    request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				    request_t *request, fr_value_box_list_t *args)
 {
 	fr_value_box_t				*values;
 	fr_value_box_t				*pad;
 	fr_value_box_t				*fill;
 
-	FR_DLIST_HEAD(fr_value_box_list)	*list;
+	fr_value_box_list_t	*list;
 
 	size_t					pad_len;
 
@@ -2004,10 +2004,10 @@ static xlat_action_t xlat_func_lpad(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
  */
 static xlat_action_t xlat_func_rpad(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
 				    UNUSED xlat_ctx_t const *xctx,
-				    request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				    request_t *request, fr_value_box_list_t *args)
 {
 	fr_value_box_t		*values;
-	FR_DLIST_HEAD(fr_value_box_list)	*list;
+	fr_value_box_list_t	*list;
 	fr_value_box_t		*pad;
 	/* coverity[dereference] */
 	size_t			pad_len;
@@ -2088,7 +2088,7 @@ static xlat_arg_parser_t const xlat_func_base64_encode_arg[] = {
  */
 static xlat_action_t xlat_func_base64_encode(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					     UNUSED xlat_ctx_t const *xctx,
-					     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+					     request_t *request, fr_value_box_list_t *args)
 {
 	size_t		alen;
 	ssize_t		elen;
@@ -2136,7 +2136,7 @@ static xlat_arg_parser_t const xlat_func_base64_decode_arg[] = {
  */
 static xlat_action_t xlat_func_base64_decode(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					     UNUSED xlat_ctx_t const *xctx,
-					     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+					     request_t *request, fr_value_box_list_t *args)
 {
 	size_t		alen;
 	ssize_t		declen = 0;
@@ -2185,7 +2185,7 @@ static xlat_arg_parser_t const xlat_func_bin_arg[] = {
  */
 static xlat_action_t xlat_func_bin(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				   UNUSED xlat_ctx_t const *xctx,
-				   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				   request_t *request, fr_value_box_list_t *args)
 {
 	fr_value_box_t		*result;
 	char const		*p, *end;
@@ -2254,7 +2254,7 @@ static xlat_arg_parser_t const xlat_func_cast_args[] = {
  */
 static xlat_action_t xlat_func_cast(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				    UNUSED xlat_ctx_t const *xctx,
-				    request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				    request_t *request, fr_value_box_list_t *args)
 {
 	fr_value_box_t	*name;
 	fr_value_box_t	*arg;
@@ -2359,12 +2359,12 @@ static xlat_arg_parser_t const xlat_func_concat_args[] = {
  */
 static xlat_action_t xlat_func_concat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      UNUSED xlat_ctx_t const *xctx,
-				      request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				      request_t *request, fr_value_box_list_t *args)
 {
 	fr_value_box_t	*result;
 	fr_value_box_t	*list;
 	fr_value_box_t	*separator;
-	FR_DLIST_HEAD(fr_value_box_list) *to_concat;
+	fr_value_box_list_t *to_concat;
 	char		*buff;
 	char const	*sep;
 
@@ -2408,7 +2408,7 @@ static xlat_arg_parser_t const xlat_func_hex_arg[] = {
  */
 static xlat_action_t xlat_func_hex(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
 				   UNUSED xlat_ctx_t const *xctx,
-				   UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				   UNUSED request_t *request, fr_value_box_list_t *args)
 {
 	char		*new_buff;
 	fr_value_box_t	*bin;
@@ -2444,7 +2444,7 @@ typedef enum {
 } hmac_type;
 
 static xlat_action_t xlat_hmac(TALLOC_CTX *ctx, fr_dcursor_t *out,
-				FR_DLIST_HEAD(fr_value_box_list) *args, uint8_t *digest, int digest_len, hmac_type type)
+				fr_value_box_list_t *args, uint8_t *digest, int digest_len, hmac_type type)
 {
 	fr_value_box_t	*vb, *data, *key;
 
@@ -2483,7 +2483,7 @@ static xlat_arg_parser_t const xlat_hmac_args[] = {
  */
 static xlat_action_t xlat_func_hmac_md5(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					UNUSED xlat_ctx_t const *xctx,
-					UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					UNUSED request_t *request, fr_value_box_list_t *in)
 {
 	uint8_t		digest[MD5_DIGEST_LENGTH];
 	return xlat_hmac(ctx, out, in, digest, MD5_DIGEST_LENGTH, HMAC_MD5);
@@ -2501,7 +2501,7 @@ static xlat_action_t xlat_func_hmac_md5(TALLOC_CTX *ctx, fr_dcursor_t *out,
  */
 static xlat_action_t xlat_func_hmac_sha1(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					 UNUSED xlat_ctx_t const *xctx,
-					 UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					 UNUSED request_t *request, fr_value_box_list_t *in)
 {
 	uint8_t		digest[SHA1_DIGEST_LENGTH];
 	return xlat_hmac(ctx, out, in, digest, SHA1_DIGEST_LENGTH, HMAC_SHA1);
@@ -2517,7 +2517,7 @@ static xlat_arg_parser_t const xlat_func_join_args[] = {
  */
 static xlat_action_t xlat_func_join(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
 				    UNUSED xlat_ctx_t const *xctx,
-				    UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				    UNUSED request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t	*arg = NULL, *vb, *p;
 
@@ -2533,7 +2533,7 @@ static xlat_action_t xlat_func_join(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
 	return XLAT_ACTION_DONE;
 }
 
-static void ungroup(fr_dcursor_t *out, FR_DLIST_HEAD(fr_value_box_list) *in)
+static void ungroup(fr_dcursor_t *out, fr_value_box_list_t *in)
 {
 	fr_value_box_t *vb;
 
@@ -2551,7 +2551,7 @@ static void ungroup(fr_dcursor_t *out, FR_DLIST_HEAD(fr_value_box_list) *in)
  */
 static xlat_action_t xlat_func_ungroup(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       UNUSED xlat_ctx_t const *xctx,
-				       UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				       UNUSED request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t	*arg = NULL;
 
@@ -2582,7 +2582,7 @@ static xlat_arg_parser_t const xlat_func_length_args[] = {
  */
 static xlat_action_t xlat_func_length(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      UNUSED xlat_ctx_t const *xctx,
-				      UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				      UNUSED request_t *request, fr_value_box_list_t *in)
 
 {
 	fr_value_box_t	*vb = NULL;
@@ -2615,7 +2615,7 @@ static xlat_arg_parser_t const xlat_func_md4_arg[] = {
  */
 static xlat_action_t xlat_func_md4(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				   UNUSED xlat_ctx_t const *xctx,
-				   UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				   UNUSED request_t *request, fr_value_box_list_t *args)
 {
 	uint8_t		digest[MD5_DIGEST_LENGTH];
 	fr_value_box_t	*vb;
@@ -2654,7 +2654,7 @@ static xlat_arg_parser_t const xlat_func_md5_arg[] = {
  */
 static xlat_action_t xlat_func_md5(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				   UNUSED xlat_ctx_t const *xctx,
-				   UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				   UNUSED request_t *request, fr_value_box_list_t *args)
 {
 	uint8_t		digest[MD5_DIGEST_LENGTH];
 	fr_value_box_t	*vb;
@@ -2699,7 +2699,7 @@ exec echo {
  */
 static xlat_action_t xlat_func_module(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      UNUSED xlat_ctx_t const *xctx,
-				      request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+				      request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	fr_value_box_t	*vb = NULL;
 
@@ -2735,7 +2735,7 @@ static xlat_arg_parser_t const xlat_func_pack_arg[] = {
  */
 static xlat_action_t xlat_func_pack(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
 				    UNUSED xlat_ctx_t const *xctx,
-				    UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				    UNUSED request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t	*vb;
 
@@ -2772,7 +2772,7 @@ static xlat_arg_parser_t const xlat_func_pairs_args[] = {
  */
 static xlat_action_t xlat_func_pairs(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				     UNUSED xlat_ctx_t const *xctx,
-				     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				     request_t *request, fr_value_box_list_t *args)
 {
 	tmpl_t			*vpt = NULL;
 	fr_dcursor_t		cursor;
@@ -2837,7 +2837,7 @@ static xlat_arg_parser_t const xlat_func_rand_arg[] = {
  */
 static xlat_action_t xlat_func_rand(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				    UNUSED xlat_ctx_t const *xctx,
-				    UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				    UNUSED request_t *request, fr_value_box_list_t *in)
 {
 	int64_t		result;
 	fr_value_box_t	*vb;
@@ -2892,7 +2892,7 @@ static xlat_arg_parser_t const xlat_func_randstr_arg[] = {
  */
 static xlat_action_t xlat_func_randstr(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       UNUSED xlat_ctx_t const *xctx,
-				       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				       request_t *request, fr_value_box_list_t *args)
 {
 	/*
 	 *	Lookup tables for randstr char classes
@@ -3074,7 +3074,7 @@ if ("foo" =~ /^(?<name>.*)/) {
  */
 static xlat_action_t xlat_func_regex(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				     UNUSED xlat_ctx_t const *xctx,
-				     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				     request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t	*in_head = fr_value_box_list_head(in);
 
@@ -3187,7 +3187,7 @@ static xlat_arg_parser_t const xlat_func_sha_arg[] = {
  */
 static xlat_action_t xlat_func_sha1(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				    UNUSED xlat_ctx_t const *xctx,
-				    UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				    UNUSED request_t *request, fr_value_box_list_t *args)
 {
 	uint8_t		digest[SHA1_DIGEST_LENGTH];
 	fr_sha1_ctx	sha1_ctx;
@@ -3225,7 +3225,7 @@ static xlat_action_t xlat_func_sha1(TALLOC_CTX *ctx, fr_dcursor_t *out,
 #ifdef HAVE_OPENSSL_EVP_H
 static xlat_action_t xlat_evp_md(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 UNUSED xlat_ctx_t const *xctx,
-				 UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args, EVP_MD const *md)
+				 UNUSED request_t *request, fr_value_box_list_t *args, EVP_MD const *md)
 {
 	uint8_t		digest[EVP_MAX_MD_SIZE];
 	unsigned int	digestlen;
@@ -3257,7 +3257,7 @@ static xlat_action_t xlat_evp_md(TALLOC_CTX *ctx, fr_dcursor_t *out,
 static xlat_action_t xlat_func_##_md(TALLOC_CTX *ctx, fr_dcursor_t *out,\
 				     xlat_ctx_t const *xctx, \
 				     request_t *request,\
-				     FR_DLIST_HEAD(fr_value_box_list) *in)\
+				     fr_value_box_list_t *in)\
 {\
 	return xlat_evp_md(ctx, out, xctx, request, in, EVP_##_md_func());\
 }
@@ -3292,7 +3292,7 @@ static xlat_arg_parser_t const xlat_func_string_arg[] = {
  */
 static xlat_action_t xlat_func_string(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      UNUSED xlat_ctx_t const *xctx,
-				      UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				      UNUSED request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t	*in_head = fr_value_box_list_pop_head(in);
 
@@ -3324,7 +3324,7 @@ static xlat_arg_parser_t const xlat_func_strlen_arg[] = {
  */
 static xlat_action_t xlat_func_strlen(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      UNUSED xlat_ctx_t const *xctx,
-				      UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				      UNUSED request_t *request, fr_value_box_list_t *args)
 {
 	fr_value_box_t	*vb;
 	fr_value_box_t	*in_head;
@@ -3365,7 +3365,7 @@ static xlat_action_t xlat_func_strlen(TALLOC_CTX *ctx, fr_dcursor_t *out,
  */
 static xlat_action_t xlat_func_subst_regex(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					   UNUSED xlat_ctx_t const *xctx, request_t *request,
-					   FR_DLIST_HEAD(fr_value_box_list) *args)
+					   fr_value_box_list_t *args)
 {
 	char const		*p, *q, *end;
 	char const		*regex;
@@ -3468,7 +3468,7 @@ static xlat_action_t xlat_func_subst(TALLOC_CTX *ctx, fr_dcursor_t *out,
 #else
 				   UNUSED xlat_ctx_t const *xctx,
 #endif
-				   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				   request_t *request, fr_value_box_list_t *args)
 {
 	char const		*p, *q, *end;
 	char			*vb_str;
@@ -3560,7 +3560,7 @@ update reply {
  */
 static xlat_action_t xlat_func_time(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				    UNUSED xlat_ctx_t const *xctx,
-				    request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				    request_t *request, fr_value_box_list_t *args)
 {
 	fr_value_box_t		*arg;
 	fr_value_box_t		*vb;
@@ -3641,7 +3641,7 @@ append:
  * If upper is true, change to uppercase, otherwise, change to lowercase
  */
 static xlat_action_t xlat_change_case(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
-				       UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args, bool upper)
+				       UNUSED request_t *request, fr_value_box_list_t *args, bool upper)
 {
 	char		*p;
 	char const	*end;
@@ -3682,7 +3682,7 @@ static xlat_arg_parser_t const xlat_change_case_arg[] = {
  */
 static xlat_action_t xlat_func_tolower(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       UNUSED xlat_ctx_t const *xctx,
-				       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				       request_t *request, fr_value_box_list_t *in)
 {
 	return xlat_change_case(ctx, out, request, in, false);
 }
@@ -3701,7 +3701,7 @@ static xlat_action_t xlat_func_tolower(TALLOC_CTX *ctx, fr_dcursor_t *out,
  */
 static xlat_action_t xlat_func_toupper(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       UNUSED xlat_ctx_t const *xctx,
-				       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				       request_t *request, fr_value_box_list_t *in)
 {
 	return xlat_change_case(ctx, out, request, in, true);
 }
@@ -3723,7 +3723,7 @@ static xlat_arg_parser_t const xlat_func_urlquote_arg[] = {
  */
 static xlat_action_t xlat_func_urlquote(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					UNUSED xlat_ctx_t const *xctx,
-					UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+					UNUSED request_t *request, fr_value_box_list_t *args)
 {
 	char const	*p, *end;
 	char		*buff_p;
@@ -3806,7 +3806,7 @@ static xlat_arg_parser_t const xlat_func_urlunquote_arg[] = {
  */
 static xlat_action_t xlat_func_urlunquote(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					  UNUSED xlat_ctx_t const *xctx,
-					  request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+					  request_t *request, fr_value_box_list_t *args)
 {
 	char const	*p, *end;
 	char		*buff_p;
@@ -3881,7 +3881,7 @@ static xlat_arg_parser_t const protocol_decode_xlat_args[] = {
  */
 static xlat_action_t protocol_decode_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					  xlat_ctx_t const *xctx,
-					  request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					  request_t *request, fr_value_box_list_t *in)
 {
 	int					decoded;
 	fr_value_box_t				*vb;
@@ -3938,7 +3938,7 @@ static xlat_arg_parser_t const protocol_encode_xlat_args[] = {
  */
 static xlat_action_t protocol_encode_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					  xlat_ctx_t const *xctx,
-					  request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+					  request_t *request, fr_value_box_list_t *args)
 {
 	tmpl_t		*vpt;
 	fr_pair_t	*vp;
diff --git a/src/lib/unlang/xlat_eval.c b/src/lib/unlang/xlat_eval.c
index 564fb1f176a..9b25324c7ac 100644
--- a/src/lib/unlang/xlat_eval.c
+++ b/src/lib/unlang/xlat_eval.c
@@ -184,7 +184,7 @@ static char *xlat_fmt_aprint(TALLOC_CTX *ctx, xlat_exp_t const *node)
  * @param[in] args	from previous expansion.
  * @param[in] line	Unused
  */
-static inline void xlat_debug_log_expansion(request_t *request, xlat_exp_t const *node, FR_DLIST_HEAD(fr_value_box_list) const *args, UNUSED int line)
+static inline void xlat_debug_log_expansion(request_t *request, xlat_exp_t const *node, fr_value_box_list_t const *args, UNUSED int line)
 {
 	if (node->flags.constant) return;
 
@@ -216,7 +216,7 @@ static inline void xlat_debug_log_expansion(request_t *request, xlat_exp_t const
  * @param[in] node	which was expanded.
  * @param[in] result	of the expansion.
  */
-static inline void xlat_debug_log_list_result(request_t *request, xlat_exp_t const *node, FR_DLIST_HEAD(fr_value_box_list) const *result)
+static inline void xlat_debug_log_list_result(request_t *request, xlat_exp_t const *node, fr_value_box_list_t const *result)
 {
 	if (node->flags.constant) return;
 
@@ -252,7 +252,7 @@ static inline void xlat_debug_log_result(request_t *request, xlat_exp_t const *n
  *	- XLAT_ACTION_DONE on success.
  *	- XLAT_ACTION_FAIL on failure.
  */
-static xlat_action_t xlat_process_arg_list(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *list, request_t *request,
+static xlat_action_t xlat_process_arg_list(TALLOC_CTX *ctx, fr_value_box_list_t *list, request_t *request,
 					   char const *name, xlat_arg_parser_t const *arg, unsigned int arg_num)
 {
 	fr_value_box_t *vb;
@@ -366,7 +366,7 @@ do { \
  * @param[in] func		to call
  */
 static inline CC_HINT(always_inline)
-xlat_action_t xlat_process_args(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *list,
+xlat_action_t xlat_process_args(TALLOC_CTX *ctx, fr_value_box_list_t *list,
 				request_t *request, xlat_t const *func)
 {
 	xlat_arg_parser_t const	*arg_p = func->args;
@@ -508,7 +508,7 @@ xlat_action_t xlat_process_args(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list
  *	- false - If the return values were incorrect.
  */
 static inline CC_HINT(nonnull(1,2,3))
-bool xlat_process_return(request_t *request, xlat_t const *func, FR_DLIST_HEAD(fr_value_box_list) const *returned, fr_value_box_t *pos)
+bool xlat_process_return(request_t *request, xlat_t const *func, fr_value_box_list_t const *returned, fr_value_box_t *pos)
 {
 	unsigned int count = 0;
 
@@ -555,7 +555,7 @@ bool xlat_process_return(request_t *request, xlat_t const *func, FR_DLIST_HEAD(f
  *
  */
 static inline CC_HINT(always_inline)
-xlat_action_t xlat_eval_one_letter(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out,
+xlat_action_t xlat_eval_one_letter(TALLOC_CTX *ctx, fr_value_box_list_t *out,
 				   request_t *request, char letter)
 {
 
@@ -743,12 +743,12 @@ xlat_action_t xlat_eval_one_letter(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_l
 
 typedef struct {
 	int			status;
-	FR_DLIST_HEAD(fr_value_box_list)	list;
+	fr_value_box_list_t	list;
 } xlat_exec_rctx_t;
 
 static xlat_action_t xlat_exec_resume(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      xlat_ctx_t const *xctx,
-				      UNUSED request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+				      UNUSED request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	xlat_exec_rctx_t *rctx = talloc_get_type_abort(xctx->rctx, xlat_exec_rctx_t);
 
@@ -757,7 +757,7 @@ static xlat_action_t xlat_exec_resume(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
 		return XLAT_ACTION_FAIL;
 	}
 
-	fr_value_box_list_move((FR_DLIST_HEAD(fr_value_box_list) *)out->dlist, &rctx->list);
+	fr_value_box_list_move((fr_value_box_list_t *)out->dlist, &rctx->list);
 
 	return XLAT_ACTION_DONE;
 }
@@ -802,7 +802,7 @@ void xlat_signal(xlat_func_signal_t signal, xlat_exp_t const *exp,
 xlat_action_t xlat_frame_eval_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				     xlat_exp_head_t const **child,
 				     request_t *request,  xlat_exp_head_t const *head, xlat_exp_t const **in,
-				     FR_DLIST_HEAD(fr_value_box_list) *result, xlat_func_t resume, void *rctx)
+				     fr_value_box_list_t *result, xlat_func_t resume, void *rctx)
 {
 	xlat_action_t		xa;
 	xlat_exp_t const	*node = *in;
@@ -838,7 +838,7 @@ xlat_action_t xlat_frame_eval_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 		fr_dcursor_next(out);		/* Wind to the start of this functions output */
 		RDEBUG2("| --> %pV", fr_dcursor_current(out));
 		if (node->call.func &&
-		    !xlat_process_return(request, node->call.func, (FR_DLIST_HEAD(fr_value_box_list) *)out->dlist,
+		    !xlat_process_return(request, node->call.func, (fr_value_box_list_t *)out->dlist,
 					 fr_dcursor_current(out))) {
 			return XLAT_ACTION_FAIL;
 		}
@@ -878,7 +878,7 @@ xlat_action_t xlat_frame_eval_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 xlat_action_t xlat_frame_eval_repeat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				     xlat_exp_head_t const **child, bool *alternate,
 				     request_t *request, xlat_exp_head_t const *head, xlat_exp_t const **in,
-				     FR_DLIST_HEAD(fr_value_box_list) *result)
+				     fr_value_box_list_t *result)
 {
 	xlat_exp_t const	*node = *in;
 
@@ -889,7 +889,7 @@ xlat_action_t xlat_frame_eval_repeat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 	{
 		xlat_action_t		xa;
 		xlat_thread_inst_t	*t;
-		FR_DLIST_HEAD(fr_value_box_list)	result_copy;
+		fr_value_box_list_t	result_copy;
 
 		t = xlat_thread_instance_find(node);
 		fr_assert(t);
@@ -954,7 +954,7 @@ xlat_action_t xlat_frame_eval_repeat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 			REXDENT();
 			xlat_debug_log_result(request, *in, fr_dcursor_current(out));
 			if (!xlat_process_return(request, node->call.func,
-						 (FR_DLIST_HEAD(fr_value_box_list) *)out->dlist,
+						 (fr_value_box_list_t *)out->dlist,
 						 fr_dcursor_current(out))) return XLAT_ACTION_FAIL;
 			RINDENT();
 			break;
@@ -997,7 +997,7 @@ xlat_action_t xlat_frame_eval_repeat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 		xlat_debug_log_list_result(request, *in, result);
 
 		VALUE_BOX_TALLOC_LIST_VERIFY(result);
-		fr_value_box_list_move((FR_DLIST_HEAD(fr_value_box_list) *)out->dlist, result);
+		fr_value_box_list_move((fr_value_box_list_t *)out->dlist, result);
 	}
 		break;
 
@@ -1040,7 +1040,7 @@ xlat_action_t xlat_frame_eval_repeat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 		 *	First entry is the command to run.  Subsequent entries are the options to pass to the
 		 *	command.
 		 */
-		fr_value_box_list_move((FR_DLIST_HEAD(fr_value_box_list) *)out->dlist, result);
+		fr_value_box_list_move((fr_value_box_list_t *)out->dlist, result);
 		break;
 
 	default:
@@ -1087,7 +1087,7 @@ xlat_action_t xlat_frame_eval(TALLOC_CTX *ctx, fr_dcursor_t *out, xlat_exp_head_
 {
 	xlat_action_t		xa = XLAT_ACTION_DONE;
 	xlat_exp_t const       	*node;
-	FR_DLIST_HEAD(fr_value_box_list)	result;		/* tmp list so debug works correctly */
+	fr_value_box_list_t	result;		/* tmp list so debug works correctly */
 	fr_value_box_t		*value;
 
 	fr_value_box_list_init(&result);
@@ -1101,7 +1101,7 @@ xlat_action_t xlat_frame_eval(TALLOC_CTX *ctx, fr_dcursor_t *out, xlat_exp_head_
 	for (node = *in; node; node = xlat_exp_next(head, node)) {
 	     	*in = node;		/* Update node in our caller */
 		fr_dcursor_tail(out);	/* Needed for debugging */
-		VALUE_BOX_TALLOC_LIST_VERIFY((FR_DLIST_HEAD(fr_value_box_list) *)out->dlist);
+		VALUE_BOX_TALLOC_LIST_VERIFY((fr_value_box_list_t *)out->dlist);
 
 		fr_assert(fr_value_box_list_num_elements(&result) == 0);	/* Should all have been moved */
 
@@ -1139,7 +1139,7 @@ xlat_action_t xlat_frame_eval(TALLOC_CTX *ctx, fr_dcursor_t *out, xlat_exp_head_
 				goto finish;
 			}
 			xlat_debug_log_list_result(request, *in, &result);
-			fr_value_box_list_move((FR_DLIST_HEAD(fr_value_box_list) *)out->dlist, &result);
+			fr_value_box_list_move((fr_value_box_list_t *)out->dlist, &result);
 			continue;
 
 		case XLAT_TMPL:
@@ -1158,7 +1158,7 @@ xlat_action_t xlat_frame_eval(TALLOC_CTX *ctx, fr_dcursor_t *out, xlat_exp_head_
 				 */
 				if (tmpl_eval_cast(ctx, &result, node->vpt) < 0) goto fail;
 
-				fr_value_box_list_move((FR_DLIST_HEAD(fr_value_box_list) *)out->dlist, &result);
+				fr_value_box_list_move((fr_value_box_list_t *)out->dlist, &result);
 				continue;
 
 			} else if (tmpl_is_attr(node->vpt)) {
@@ -1206,7 +1206,7 @@ xlat_action_t xlat_frame_eval(TALLOC_CTX *ctx, fr_dcursor_t *out, xlat_exp_head_
 			}
 
 			xlat_debug_log_list_result(request, node, &result);
-			fr_value_box_list_move((FR_DLIST_HEAD(fr_value_box_list) *)out->dlist, &result);
+			fr_value_box_list_move((fr_value_box_list_t *)out->dlist, &result);
 			continue;
 
 		case XLAT_VIRTUAL:
@@ -1303,7 +1303,7 @@ xlat_action_t xlat_frame_eval(TALLOC_CTX *ctx, fr_dcursor_t *out, xlat_exp_head_
 	}
 
 finish:
-	VALUE_BOX_TALLOC_LIST_VERIFY((FR_DLIST_HEAD(fr_value_box_list) *)out->dlist);
+	VALUE_BOX_TALLOC_LIST_VERIFY((fr_value_box_list_t *)out->dlist);
 	XLAT_DEBUG("** [%i] %s << %s", unlang_interpret_stack_depth(request),
 		   __FUNCTION__, fr_table_str_by_value(xlat_action_table, xa, "<INVALID>"));
 
@@ -1313,7 +1313,7 @@ finish:
 static ssize_t xlat_eval_sync(TALLOC_CTX *ctx, char **out, request_t *request, xlat_exp_head_t const * const head,
 			      xlat_escape_legacy_t escape, void const *escape_ctx)
 {
-	FR_DLIST_HEAD(fr_value_box_list)	result;
+	fr_value_box_list_t	result;
 	bool			success = false;
 	TALLOC_CTX		*pool = talloc_new(NULL);
 	rlm_rcode_t		rcode;
@@ -1355,7 +1355,7 @@ static ssize_t xlat_eval_sync(TALLOC_CTX *ctx, char **out, request_t *request, x
 			 *	For tainted boxes perform the requested escaping
 			 */
 			while ((vb = fr_value_box_list_next(&result, vb))) {
-				FR_DLIST_ENTRY(fr_value_box_list) entry;
+				fr_value_box_entry_t entry;
 				size_t len, real_len;
 				char *escaped;
 
@@ -1606,7 +1606,7 @@ int xlat_flatten_compiled_argv(TALLOC_CTX *ctx, xlat_exp_head_t ***argv, xlat_ex
 		my_argv[i++] = talloc_steal(my_argv, node->group);
 	}
 
-	fr_value_box_list_talloc_free((FR_DLIST_HEAD(fr_value_box_list) *)&head->dlist);
+	fr_value_box_list_talloc_free((fr_value_box_list_t *)&head->dlist);
 
 	return count;
 }
diff --git a/src/lib/unlang/xlat_expr.c b/src/lib/unlang/xlat_expr.c
index a83a57534a8..42803cb6209 100644
--- a/src/lib/unlang/xlat_expr.c
+++ b/src/lib/unlang/xlat_expr.c
@@ -354,7 +354,7 @@ static xlat_arg_parser_t const binary_op_xlat_args[] = {
 
 static xlat_action_t xlat_binary_op(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				    UNUSED xlat_ctx_t const *xctx,
-				    request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in,
+				    request_t *request, fr_value_box_list_t *in,
 				    fr_token_t op,
 				    fr_type_t default_type, fr_dict_attr_t const *enumv)
 {
@@ -426,7 +426,7 @@ static xlat_arg_parser_t const xlat_paircmp_xlat_args[] = {
  */
 static xlat_action_t xlat_paircmp_func(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				    UNUSED xlat_ctx_t const *xctx,
-				    request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				    request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t	*dst, *vb_da, *vb;
 	fr_dict_attr_t const *da;
@@ -461,7 +461,7 @@ static xlat_action_t xlat_paircmp_func(TALLOC_CTX *ctx, fr_dcursor_t *out,
 #define XLAT_BINARY_FUNC(_name, _op)  \
 static xlat_action_t xlat_func_ ## _name(TALLOC_CTX *ctx, fr_dcursor_t *out, \
 				   xlat_ctx_t const *xctx, \
-				   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)  \
+				   request_t *request, fr_value_box_list_t *in)  \
 { \
 	return xlat_binary_op(ctx, out, xctx, request, in, _op, FR_TYPE_NULL, NULL); \
 }
@@ -480,7 +480,7 @@ XLAT_BINARY_FUNC(op_lshift, T_LSHIFT)
 #define XLAT_CMP_FUNC(_name, _op)  \
 static xlat_action_t xlat_func_ ## _name(TALLOC_CTX *ctx, fr_dcursor_t *out, \
 				   xlat_ctx_t const *xctx, \
-				   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)  \
+				   request_t *request, fr_value_box_list_t *in)  \
 { \
 	return xlat_binary_op(ctx, out, xctx, request, in, _op, FR_TYPE_BOOL, attr_expr_bool_enum); \
 }
@@ -503,7 +503,7 @@ typedef struct {
 
 typedef struct {
 	bool			last_success;
-	FR_DLIST_HEAD(fr_value_box_list)	list;
+	fr_value_box_list_t	list;
 } xlat_regex_rctx_t;
 
 static fr_slen_t xlat_expr_print_regex(fr_sbuff_t *out, xlat_exp_t const *node, void *instance, fr_sbuff_escape_rules_t const *e_rules)
@@ -647,7 +647,7 @@ static xlat_arg_parser_t const regex_op_xlat_args[] = {
  *	- 0 for "no match".
  *	- 1 for "match".
  */
-static xlat_action_t xlat_regex_match(TALLOC_CTX *ctx, request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in, regex_t **preg,
+static xlat_action_t xlat_regex_match(TALLOC_CTX *ctx, request_t *request, fr_value_box_list_t *in, regex_t **preg,
 				      fr_dcursor_t *out, fr_token_t op)
 {
 	uint32_t	subcaptures;
@@ -676,7 +676,7 @@ static xlat_action_t xlat_regex_match(TALLOC_CTX *ctx, request_t *request, FR_DL
 			len = vb->vb_length;
 
 		} else {
-			FR_DLIST_HEAD(fr_value_box_list)	list;
+			fr_value_box_list_t	list;
 
 			fr_value_box_list_init(&list);
 			fr_value_box_list_insert_head(&list, vb);
@@ -735,7 +735,7 @@ done:
 
 static xlat_action_t xlat_regex_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       xlat_ctx_t const *xctx,
-				       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				       request_t *request, fr_value_box_list_t *in)
 {
 	xlat_regex_inst_t const *inst = talloc_get_type_abort_const(xctx->inst, xlat_regex_inst_t);
 	xlat_regex_rctx_t	*rctx = talloc_get_type_abort(xctx->rctx, xlat_regex_rctx_t);
@@ -775,7 +775,7 @@ static xlat_action_t xlat_regex_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 
 static xlat_action_t xlat_regex_op(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				   xlat_ctx_t const *xctx,
-				   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in,
+				   request_t *request, fr_value_box_list_t *in,
 				   fr_token_t op)
 {
 	xlat_regex_inst_t const	*inst = talloc_get_type_abort_const(xctx->inst, xlat_regex_inst_t);
@@ -809,7 +809,7 @@ static xlat_action_t xlat_regex_op(TALLOC_CTX *ctx, fr_dcursor_t *out,
 #define XLAT_REGEX_FUNC(_name, _op)  \
 static xlat_action_t xlat_func_ ## _name(TALLOC_CTX *ctx, fr_dcursor_t *out, \
 				   xlat_ctx_t const *xctx, \
-				   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)  \
+				   request_t *request, fr_value_box_list_t *in)  \
 { \
 	return xlat_regex_op(ctx, out, xctx, request, in, _op); \
 }
@@ -827,7 +827,7 @@ typedef struct {
 	bool			last_success;
 	fr_value_box_t		*box;		//!< output value-box
 	int			current;
-	FR_DLIST_HEAD(fr_value_box_list)	list;
+	fr_value_box_list_t	list;
 } xlat_logical_rctx_t;
 
 static fr_slen_t xlat_expr_print_logical(fr_sbuff_t *out, xlat_exp_t const *node, void *instance, fr_sbuff_escape_rules_t const *e_rules)
@@ -1098,7 +1098,7 @@ static int xlat_expr_logical_purify(xlat_exp_t *node, void *instance, request_t
  *
  *  Empty lists are not truthy.
  */
-static bool xlat_logical_match(fr_value_box_t **dst, FR_DLIST_HEAD(fr_value_box_list) const *in, bool logical_or)
+static bool xlat_logical_match(fr_value_box_t **dst, fr_value_box_list_t const *in, bool logical_or)
 {
 	fr_value_box_t *last = NULL;
 
@@ -1149,7 +1149,7 @@ static bool xlat_logical_match(fr_value_box_t **dst, FR_DLIST_HEAD(fr_value_box_
 
 static xlat_action_t xlat_logical_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					 xlat_ctx_t const *xctx,
-					 request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in);
+					 request_t *request, fr_value_box_list_t *in);
 
 /** Process one argument of a logical operation.
  *
@@ -1161,7 +1161,7 @@ static xlat_action_t xlat_logical_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
  */
 static xlat_action_t xlat_logical_process_arg(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 					      xlat_ctx_t const *xctx,
-					      request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+					      request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	xlat_logical_inst_t const *inst = talloc_get_type_abort_const(xctx->inst, xlat_logical_inst_t);
 	xlat_logical_rctx_t	*rctx = talloc_get_type_abort(xctx->rctx, xlat_logical_rctx_t);
@@ -1187,7 +1187,7 @@ static xlat_action_t xlat_logical_process_arg(UNUSED TALLOC_CTX *ctx, UNUSED fr_
  */
 static xlat_action_t xlat_logical_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					 xlat_ctx_t const *xctx,
-					 request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					 request_t *request, fr_value_box_list_t *in)
 {
 	xlat_logical_inst_t const *inst = talloc_get_type_abort_const(xctx->inst, xlat_logical_inst_t);
 	xlat_logical_rctx_t	*rctx = talloc_get_type_abort(xctx->rctx, xlat_logical_rctx_t);
@@ -1256,7 +1256,7 @@ next:
  */
 static xlat_action_t xlat_func_logical(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       xlat_ctx_t const *xctx,
-				       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				       request_t *request, fr_value_box_list_t *in)
 {
 	xlat_logical_rctx_t	*rctx;
 
@@ -1278,7 +1278,7 @@ static xlat_arg_parser_t const unary_op_xlat_args[] = {
 
 static xlat_action_t xlat_func_unary_op(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					UNUSED xlat_ctx_t const *xctx,
-					request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in, fr_token_t op)
+					request_t *request, fr_value_box_list_t *in, fr_token_t op)
 {
 	int rcode;
 	fr_value_box_t *dst, *group, *vb;
@@ -1322,7 +1322,7 @@ static xlat_action_t xlat_func_unary_op(TALLOC_CTX *ctx, fr_dcursor_t *out,
 
 static xlat_action_t xlat_func_unary_not(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					 UNUSED xlat_ctx_t const *xctx,
-					 UNUSED request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					 UNUSED request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t *dst, *group, *vb;
 
@@ -1349,14 +1349,14 @@ static xlat_action_t xlat_func_unary_not(TALLOC_CTX *ctx, fr_dcursor_t *out,
 
 static xlat_action_t xlat_func_unary_minus(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					   xlat_ctx_t const *xctx,
-					   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					   request_t *request, fr_value_box_list_t *in)
 {
 	return xlat_func_unary_op(ctx, out, xctx, request, in, T_SUB);
 }
 
 static xlat_action_t xlat_func_unary_complement(TALLOC_CTX *ctx, fr_dcursor_t *out,
 						xlat_ctx_t const *xctx,
-						request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+						request_t *request, fr_value_box_list_t *in)
 {
 	return xlat_func_unary_op(ctx, out, xctx, request, in, T_COMPLEMENT);
 }
@@ -1423,7 +1423,7 @@ static xlat_arg_parser_t const xlat_func_rcode_arg[] = {
  */
 static xlat_action_t xlat_func_rcode(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				     UNUSED xlat_ctx_t const *xctx,
-				     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *args)
+				     request_t *request, fr_value_box_list_t *args)
 {
 	fr_value_box_t	*vb;
 	fr_value_box_t	*src;
@@ -1457,7 +1457,7 @@ typedef struct {
 
 typedef struct {
 	bool			last_success;
-	FR_DLIST_HEAD(fr_value_box_list)	list;
+	fr_value_box_list_t	list;
 } xlat_exists_rctx_t;
 
 static xlat_arg_parser_t const xlat_func_exists_arg[] = {
@@ -1530,7 +1530,7 @@ static xlat_action_t xlat_attr_exists(TALLOC_CTX *ctx, fr_dcursor_t *out,
 
 static xlat_action_t xlat_exists_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					xlat_ctx_t const *xctx,
-					request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+					request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	xlat_exists_rctx_t	*rctx = talloc_get_type_abort(xctx->rctx, xlat_exists_rctx_t);
 	ssize_t			slen;
@@ -1590,7 +1590,7 @@ static xlat_action_t xlat_exists_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
  */
 static xlat_action_t xlat_func_exists(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				     xlat_ctx_t const *xctx,
-				     request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+				     request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	xlat_exists_inst_t const *inst = talloc_get_type_abort_const(xctx->inst, xlat_exists_inst_t);
 	xlat_exists_rctx_t	*rctx;
diff --git a/src/lib/unlang/xlat_pair.c b/src/lib/unlang/xlat_pair.c
index 38f238d0e13..023c8f2226c 100644
--- a/src/lib/unlang/xlat_pair.c
+++ b/src/lib/unlang/xlat_pair.c
@@ -89,7 +89,7 @@ static ssize_t fr_pair_decode_multi(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_dic
  */
 int xlat_decode_value_box_list(TALLOC_CTX *ctx, fr_pair_list_t *out,
 			       request_t *request, void *decode_ctx, fr_pair_decode_t decode,
-			       FR_DLIST_HEAD(fr_value_box_list) *in)
+			       fr_value_box_list_t *in)
 {
 	int		decoded = 0;
 	fr_value_box_t	*vb = NULL;
diff --git a/src/lib/unlang/xlat_priv.h b/src/lib/unlang/xlat_priv.h
index 0fd1303aa26..483626a33cc 100644
--- a/src/lib/unlang/xlat_priv.h
+++ b/src/lib/unlang/xlat_priv.h
@@ -334,12 +334,12 @@ void		xlat_signal(xlat_func_signal_t signal, xlat_exp_t const *exp,
 xlat_action_t	xlat_frame_eval_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       xlat_exp_head_t const **child,
 				       request_t *request,  xlat_exp_head_t const *head, xlat_exp_t const **in,
-				       FR_DLIST_HEAD(fr_value_box_list) *result, xlat_func_t resume, void *rctx);
+				       fr_value_box_list_t *result, xlat_func_t resume, void *rctx);
 
 xlat_action_t	xlat_frame_eval_repeat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       xlat_exp_head_t const **child, bool *alternate,
 				       request_t *request, xlat_exp_head_t const *head, xlat_exp_t const **in,
-				       FR_DLIST_HEAD(fr_value_box_list) *result) CC_HINT(nonnull(1,2,3,5));
+				       fr_value_box_list_t *result) CC_HINT(nonnull(1,2,3,5));
 
 xlat_action_t	xlat_frame_eval(TALLOC_CTX *ctx, fr_dcursor_t *out, xlat_exp_head_t const **child,
 				request_t *request, xlat_exp_head_t const *head, xlat_exp_t const **in);
@@ -352,12 +352,12 @@ void		xlat_eval_free(void);
 
 void		unlang_xlat_init(void);
 
-int		unlang_xlat_push_node(TALLOC_CTX *ctx, bool *p_success, FR_DLIST_HEAD(fr_value_box_list) *out,
+int		unlang_xlat_push_node(TALLOC_CTX *ctx, bool *p_success, fr_value_box_list_t *out,
 				      request_t *request, xlat_exp_t *node);
 
 int 		xlat_decode_value_box_list(TALLOC_CTX *ctx, fr_pair_list_t *out,
 					   request_t *request, void *decode_ctx, fr_pair_decode_t decode,
-					   FR_DLIST_HEAD(fr_value_box_list) *in);
+					   fr_value_box_list_t *in);
 /*
  *	xlat_expr.c
  */
diff --git a/src/lib/unlang/xlat_purify.c b/src/lib/unlang/xlat_purify.c
index 84cc828655a..57c3d73199b 100644
--- a/src/lib/unlang/xlat_purify.c
+++ b/src/lib/unlang/xlat_purify.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/unlang/xlat_priv.h>
 #include <freeradius-devel/util/calc.h>
 
-static void xlat_value_list_to_xlat(xlat_exp_head_t *head, FR_DLIST_HEAD(fr_value_box_list) *list)
+static void xlat_value_list_to_xlat(xlat_exp_head_t *head, fr_value_box_list_t *list)
 {
 	fr_value_box_t *box;
 	xlat_exp_t *node;
@@ -60,7 +60,7 @@ int xlat_purify_list(xlat_exp_head_t *head, request_t *request)
 {
 	int rcode;
 	bool success;
-	FR_DLIST_HEAD(fr_value_box_list) list;
+	fr_value_box_list_t list;
 	xlat_flags_t our_flags;
 
 	if (!head->flags.can_purify) return 0;
diff --git a/src/lib/util/calc.c b/src/lib/util/calc.c
index 691f0c74a6d..30dea38bdd7 100644
--- a/src/lib/util/calc.c
+++ b/src/lib/util/calc.c
@@ -2293,7 +2293,7 @@ int fr_value_calc_unary_op(TALLOC_CTX *ctx, fr_value_box_t *dst, fr_token_t op,
 /** Apply a set of operations in order to create an output box.
  *
  */
-int fr_value_calc_list_op(TALLOC_CTX *ctx, fr_value_box_t *box, fr_token_t op, FR_DLIST_HEAD(fr_value_box_list) const *list)
+int fr_value_calc_list_op(TALLOC_CTX *ctx, fr_value_box_t *box, fr_token_t op, fr_value_box_list_t const *list)
 {
 	/*
 	 *	For octets and string and prepend / append, figure out
@@ -2362,7 +2362,7 @@ brute_force:
  *	This implementation is arguably wrong... it should be checking individual entries in list1 against individual entries in list2.
  *	Instead, it checks if ANY entry in list1 matches ANY entry in list2.
  */
-int fr_value_calc_list_cmp(TALLOC_CTX *ctx, fr_value_box_t *dst, FR_DLIST_HEAD(fr_value_box_list) const *list1, fr_token_t op, FR_DLIST_HEAD(fr_value_box_list) const *list2)
+int fr_value_calc_list_cmp(TALLOC_CTX *ctx, fr_value_box_t *dst, fr_value_box_list_t const *list1, fr_token_t op, fr_value_box_list_t const *list2)
 {
 	int rcode;
 	bool invert = false;
diff --git a/src/lib/util/calc.h b/src/lib/util/calc.h
index cc82f7044cf..a28fb0c5e42 100644
--- a/src/lib/util/calc.h
+++ b/src/lib/util/calc.h
@@ -38,9 +38,9 @@ int fr_value_calc_assignment_op(TALLOC_CTX *ctx, fr_value_box_t *dst, fr_token_t
 
 int fr_value_calc_unary_op(TALLOC_CTX *ctx, fr_value_box_t *dst, fr_token_t op, fr_value_box_t const *src) CC_HINT(nonnull(1));
 
-int fr_value_calc_list_op(TALLOC_CTX *ctx, fr_value_box_t *box, fr_token_t op, FR_DLIST_HEAD(fr_value_box_list) const *list);
+int fr_value_calc_list_op(TALLOC_CTX *ctx, fr_value_box_t *box, fr_token_t op, fr_value_box_list_t const *list);
 
-int fr_value_calc_list_cmp(TALLOC_CTX *ctx, fr_value_box_t *dst, FR_DLIST_HEAD(fr_value_box_list) const *list1, fr_token_t op, FR_DLIST_HEAD(fr_value_box_list) const *list2) CC_HINT(nonnull);
+int fr_value_calc_list_cmp(TALLOC_CTX *ctx, fr_value_box_t *dst, fr_value_box_list_t const *list1, fr_token_t op, fr_value_box_list_t const *list2) CC_HINT(nonnull);
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/util/print.c b/src/lib/util/print.c
index 8dfb41abd63..1b80e719f79 100644
--- a/src/lib/util/print.c
+++ b/src/lib/util/print.c
@@ -770,7 +770,7 @@ char *fr_vasprintf(TALLOC_CTX *ctx, char const *fmt, va_list ap)
 
 			case 'M':
 			{
-				FR_DLIST_HEAD(fr_value_box_list) const *in = va_arg(ap_q, FR_DLIST_HEAD(fr_value_box_list) const *);
+				fr_value_box_list_t const *in = va_arg(ap_q, fr_value_box_list_t const *);
 
 				if (!in) {
 					subst = talloc_strdup(NULL, "(null)");
diff --git a/src/lib/util/uri.c b/src/lib/util/uri.c
index ba49194055f..b959316418b 100644
--- a/src/lib/util/uri.c
+++ b/src/lib/util/uri.c
@@ -38,7 +38,7 @@ RCSID("$Id$")
  * 	- 0 on success
  * 	- -1 on failure
  */
-int fr_uri_escape(FR_DLIST_HEAD(fr_value_box_list) *uri, fr_uri_part_t const *uri_parts, void *uctx)
+int fr_uri_escape(fr_value_box_list_t *uri, fr_uri_part_t const *uri_parts, void *uctx)
 {
 	fr_uri_part_t const	*uri_part;
 	fr_sbuff_t		sbuff;
diff --git a/src/lib/util/uri.h b/src/lib/util/uri.h
index 20b60150af9..e634d87cb71 100644
--- a/src/lib/util/uri.h
+++ b/src/lib/util/uri.h
@@ -55,7 +55,7 @@ typedef struct {
 
 #define XLAT_URI_PART_TERMINATOR { .name = NULL, .terminals = NULL, .tainted_allowed = false, .func = NULL }
 
-int fr_uri_escape(FR_DLIST_HEAD(fr_value_box_list) *uri, fr_uri_part_t const *uri_parts, void *uctx);
+int fr_uri_escape(fr_value_box_list_t *uri, fr_uri_part_t const *uri_parts, void *uctx);
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/util/value.c b/src/lib/util/value.c
index 47bc410dca5..56dc11828fa 100644
--- a/src/lib/util/value.c
+++ b/src/lib/util/value.c
@@ -2095,7 +2095,7 @@ static inline int fr_value_box_cast_to_strvalue(TALLOC_CTX *ctx, fr_value_box_t
 
 	case FR_TYPE_GROUP:
 		return fr_value_box_list_concat_in_place(ctx,
-							 dst, UNCONST(FR_DLIST_HEAD(fr_value_box_list) *, &src->vb_group),
+							 dst, UNCONST(fr_value_box_list_t *, &src->vb_group),
 							 FR_TYPE_STRING,
 							 FR_VALUE_BOX_LIST_NONE, false,
 							 SIZE_MAX);
@@ -2144,7 +2144,7 @@ static inline int fr_value_box_cast_to_octets(TALLOC_CTX *ctx, fr_value_box_t *d
 
 	case FR_TYPE_GROUP:
 		return fr_value_box_list_concat_in_place(ctx,
-							 dst, UNCONST(FR_DLIST_HEAD(fr_value_box_list) *, &src->vb_group),
+							 dst, UNCONST(fr_value_box_list_t *, &src->vb_group),
 							 FR_TYPE_OCTETS,
 							 FR_VALUE_BOX_LIST_NONE, false,
 							 SIZE_MAX);
@@ -3401,7 +3401,7 @@ int fr_value_box_cast_in_place(TALLOC_CTX *ctx, fr_value_box_t *vb,
 	/*
 	 *	Store list poiters to restore later - fr_value_box_cast clears them
 	 */
-	FR_DLIST_ENTRY(fr_value_box_list) entry = vb->entry;
+	fr_value_box_entry_t entry = vb->entry;
 
 	/*
 	 *	Simple case, destination type and current
@@ -5245,7 +5245,7 @@ ssize_t fr_value_box_print(fr_sbuff_t *out, fr_value_box_t const *data, fr_sbuff
 		 */
 		FR_SBUFF_IN_CHAR_RETURN(&our_out, '{');
 		FR_SBUFF_RETURN(fr_value_box_list_concat_as_string,
-				NULL, &our_out, UNCONST(FR_DLIST_HEAD(fr_value_box_list) *, &data->vb_group),
+				NULL, &our_out, UNCONST(fr_value_box_list_t *, &data->vb_group),
 				", ", (sizeof(", ") - 1), e_rules,
 				0, false, true);
 		FR_SBUFF_IN_CHAR_RETURN(&our_out, '}');
@@ -5323,7 +5323,7 @@ ssize_t fr_value_box_print_quoted(fr_sbuff_t *out, fr_value_box_t const *data, f
  *	- <0 how many additional bytes we would have needed to
  *	  concat the next box.
  */
-ssize_t fr_value_box_list_concat_as_string(bool *tainted, fr_sbuff_t *sbuff, FR_DLIST_HEAD(fr_value_box_list) *list,
+ssize_t fr_value_box_list_concat_as_string(bool *tainted, fr_sbuff_t *sbuff, fr_value_box_list_t *list,
 					   char const *sep, size_t sep_len, fr_sbuff_escape_rules_t const *e_rules,
 					   fr_value_box_list_action_t proc_action, bool flatten, bool printable)
 {
@@ -5412,7 +5412,7 @@ ssize_t fr_value_box_list_concat_as_string(bool *tainted, fr_sbuff_t *sbuff, FR_
  *	- <0 how many additional bytes we would have needed to
  *	  concat the next box.
  */
-ssize_t fr_value_box_list_concat_as_octets(bool *tainted, fr_dbuff_t *dbuff, FR_DLIST_HEAD(fr_value_box_list) *list,
+ssize_t fr_value_box_list_concat_as_octets(bool *tainted, fr_dbuff_t *dbuff, fr_value_box_list_t *list,
 					   uint8_t const *sep, size_t sep_len,
 					   fr_value_box_list_action_t proc_action, bool flatten)
 {
@@ -5509,7 +5509,7 @@ ssize_t fr_value_box_list_concat_as_octets(bool *tainted, fr_dbuff_t *dbuff, FR_
  *	- -1 on failure.
  */
 int fr_value_box_list_concat_in_place(TALLOC_CTX *ctx,
-				      fr_value_box_t *out, FR_DLIST_HEAD(fr_value_box_list) *list, fr_type_t type,
+				      fr_value_box_t *out, fr_value_box_list_t *list, fr_type_t type,
 				      fr_value_box_list_action_t proc_action, bool flatten,
 				      size_t max_size)
 {
@@ -5522,7 +5522,7 @@ int fr_value_box_list_concat_in_place(TALLOC_CTX *ctx,
 	fr_value_box_t			*head_vb = fr_value_box_list_head(list);
 	bool				tainted = false;
 
-	FR_DLIST_ENTRY(fr_value_box_list)	entry;
+	fr_value_box_entry_t		entry;
 
 	if (fr_value_box_list_empty(list)) {
 		fr_strerror_const("Invalid arguments.  List contains no elements");
@@ -5668,7 +5668,7 @@ int fr_value_box_list_concat_in_place(TALLOC_CTX *ctx,
  * @param[in] free	whether to free any group boxes which have had
  *			their children removed.
  */
-void fr_value_box_flatten(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *list, bool steal, bool free)
+void fr_value_box_flatten(TALLOC_CTX *ctx, fr_value_box_list_t *list, bool steal, bool free)
 {
 	fr_value_box_list_foreach_safe(list, child) {
 		if (!fr_type_is_structural(child->type)) continue;
@@ -5693,7 +5693,7 @@ void fr_value_box_flatten(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *lis
  *	- NULL on error.
  *	- The concatenation of the string values of the value box list on success.
  */
-char *fr_value_box_list_aprint(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) const *list, char const *delim,
+char *fr_value_box_list_aprint(TALLOC_CTX *ctx, fr_value_box_list_t const *list, char const *delim,
 			       fr_sbuff_escape_rules_t const *e_rules)
 {
 	fr_value_box_t const	*vb = fr_value_box_list_head(list);
@@ -5765,7 +5765,7 @@ uint32_t fr_value_box_hash(fr_value_box_t const *vb)
  *	- A duplicate list of value boxes, allocated in the context of 'ctx'
  *	- NULL on error, or empty input list.
  */
-int fr_value_box_list_acopy(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out, FR_DLIST_HEAD(fr_value_box_list) const *in)
+int fr_value_box_list_acopy(TALLOC_CTX *ctx, fr_value_box_list_t *out, fr_value_box_list_t const *in)
 {
 	fr_value_box_t const *in_p = NULL;
 
@@ -5793,7 +5793,7 @@ int fr_value_box_list_acopy(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *o
  *	- true if a list member is tainted.
  *	- false if no list members are tainted.
  */
-bool fr_value_box_list_tainted(FR_DLIST_HEAD(fr_value_box_list) const *head)
+bool fr_value_box_list_tainted(fr_value_box_list_t const *head)
 {
 	fr_value_box_t *vb = NULL;
 
@@ -5809,7 +5809,7 @@ bool fr_value_box_list_tainted(FR_DLIST_HEAD(fr_value_box_list) const *head)
  *
  * @param[in] head	of list.
  */
-void fr_value_box_list_taint(FR_DLIST_HEAD(fr_value_box_list) *head)
+void fr_value_box_list_taint(fr_value_box_list_t *head)
 {
 	fr_value_box_t *vb = NULL;
 
@@ -5823,7 +5823,7 @@ void fr_value_box_list_taint(FR_DLIST_HEAD(fr_value_box_list) *head)
  *
  * @param[in] head	of list.
  */
-void fr_value_box_list_untaint(FR_DLIST_HEAD(fr_value_box_list) *head)
+void fr_value_box_list_untaint(fr_value_box_list_t *head)
 {
 	fr_value_box_t *vb = NULL;
 
@@ -5877,7 +5877,7 @@ DIAG_ON(nonnull-compare)
 	}
 }
 
-void fr_value_box_list_verify(char const *file, int line, FR_DLIST_HEAD(fr_value_box_list) const *list, bool talloced)
+void fr_value_box_list_verify(char const *file, int line, fr_value_box_list_t const *list, bool talloced)
 {
 	fr_value_box_list_foreach(list, vb) fr_value_box_verify(file, line, vb, talloced);
 }
@@ -5960,7 +5960,7 @@ bool fr_value_box_is_truthy(fr_value_box_t const *in)
 #define INFO_INDENT(_fmt, ...)  FR_FAULT_LOG("%*s"_fmt, depth * 2, " ", ## __VA_ARGS__)
 
 static void _fr_value_box_debug(fr_value_box_t const *vb, int depth, int idx);
-static void _fr_value_box_list_debug(FR_DLIST_HEAD(fr_value_box_list) const *head, int depth)
+static void _fr_value_box_list_debug(fr_value_box_list_t const *head, int depth)
 {
 	int i = 0;
 
@@ -5973,7 +5973,7 @@ static void _fr_value_box_list_debug(FR_DLIST_HEAD(fr_value_box_list) const *hea
  *
  * @note Call directly from the debugger
  */
-void fr_value_box_list_debug(FR_DLIST_HEAD(fr_value_box_list) const *head)
+void fr_value_box_list_debug(fr_value_box_list_t const *head)
 {
 	_fr_value_box_list_debug(head, 0);
 }
diff --git a/src/lib/util/value.h b/src/lib/util/value.h
index 761e674c299..d82aac003b0 100644
--- a/src/lib/util/value.h
+++ b/src/lib/util/value.h
@@ -89,6 +89,7 @@ extern fr_sbuff_escape_rules_t fr_value_escape_unprintables;
 /** @name List and cursor type definitions
  */
 FR_DLIST_TYPES(fr_value_box_list)
+FR_DLIST_TYPEDEFS(fr_value_box_list, fr_value_box_list_t, fr_value_box_entry_t)
 FR_DCURSOR_DLIST_TYPES(fr_value_box_dcursor, fr_value_box_list, fr_value_box_t)
 /** @{ */
 
@@ -137,7 +138,7 @@ typedef union {
 	size_t					size;			//!< System specific file/memory size.
 	fr_time_delta_t				time_delta;		//!< a delta time in nanoseconds
 
-	FR_DLIST_HEAD(fr_value_box_list)	children;		//!< for groups
+	fr_value_box_list_t			children;		//!< for groups
 } fr_value_box_datum_t;
 
 /** Union containing all data types supported by the server
@@ -156,7 +157,7 @@ struct value_box_s {
 	bool					tainted;		//!< i.e. did it come from an untrusted source
 	uint16_t		_CONST		safe;			//!< more detailed safety
 
-	FR_DLIST_ENTRY(fr_value_box_list)	entry;			//!< Doubly linked list entry.
+	fr_value_box_entry_t			entry;			//!< Doubly linked list entry.
 
 	fr_dict_attr_t const			*enumv;			//!< Enumeration values.
 
@@ -403,7 +404,7 @@ extern fr_sbuff_parse_rules_t const *value_parse_rules_quoted_char[UINT8_MAX];
  *	- false if the list has fewer than min boxes.
  */
 static inline CC_HINT(nonnull)
-bool fr_value_box_list_len_min(FR_DLIST_HEAD(fr_value_box_list) const *list, unsigned int min)
+bool fr_value_box_list_len_min(fr_value_box_list_t const *list, unsigned int min)
 {
 	unsigned int i = fr_value_box_list_num_elements(list);
 
@@ -996,39 +997,39 @@ ssize_t		fr_value_box_from_str(TALLOC_CTX *ctx, fr_value_box_t *dst,
  *
  * @{
  */
-ssize_t 	fr_value_box_list_concat_as_string(bool *tainted, fr_sbuff_t *sbuff, FR_DLIST_HEAD(fr_value_box_list) *list,
+ssize_t 	fr_value_box_list_concat_as_string(bool *tainted, fr_sbuff_t *sbuff, fr_value_box_list_t *list,
 					   	  char const *sep, size_t sep_len, fr_sbuff_escape_rules_t const *e_rules,
 					   	  fr_value_box_list_action_t proc_action, bool flatten, bool printable)
 		CC_HINT(nonnull(2,3));
 
-ssize_t		fr_value_box_list_concat_as_octets(bool *tainted, fr_dbuff_t *dbuff, FR_DLIST_HEAD(fr_value_box_list) *list,
+ssize_t		fr_value_box_list_concat_as_octets(bool *tainted, fr_dbuff_t *dbuff, fr_value_box_list_t *list,
 						   uint8_t const *sep, size_t sep_len,
 						   fr_value_box_list_action_t proc_action, bool flatten)
 		CC_HINT(nonnull(2,3));
 
 int		fr_value_box_list_concat_in_place(TALLOC_CTX *ctx,
-						  fr_value_box_t *out, FR_DLIST_HEAD(fr_value_box_list) *list, fr_type_t type,
+						  fr_value_box_t *out, fr_value_box_list_t *list, fr_type_t type,
 						  fr_value_box_list_action_t proc_action, bool flatten,
 						  size_t max_size)
 		CC_HINT(nonnull(2,3));
 
-void		fr_value_box_flatten(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *list, bool steal, bool free)
+void		fr_value_box_flatten(TALLOC_CTX *ctx, fr_value_box_list_t *list, bool steal, bool free)
 		CC_HINT(nonnull(2));
 
-char		*fr_value_box_list_aprint(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) const *list, char const *delim,
+char		*fr_value_box_list_aprint(TALLOC_CTX *ctx, fr_value_box_list_t const *list, char const *delim,
 					  fr_sbuff_escape_rules_t const *e_rules)
 		CC_HINT(nonnull(2));
 
-int		fr_value_box_list_acopy(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *out, FR_DLIST_HEAD(fr_value_box_list) const *in)
+int		fr_value_box_list_acopy(TALLOC_CTX *ctx, fr_value_box_list_t *out, fr_value_box_list_t const *in)
 		CC_HINT(nonnull(2,3));
 
-bool		fr_value_box_list_tainted(FR_DLIST_HEAD(fr_value_box_list) const *head)
+bool		fr_value_box_list_tainted(fr_value_box_list_t const *head)
 		CC_HINT(nonnull(1));
 
-void		fr_value_box_list_taint(FR_DLIST_HEAD(fr_value_box_list) *head)
+void		fr_value_box_list_taint(fr_value_box_list_t *head)
 		CC_HINT(nonnull(1));
 
-void		fr_value_box_list_untaint(FR_DLIST_HEAD(fr_value_box_list) *head)
+void		fr_value_box_list_untaint(fr_value_box_list_t *head)
 		CC_HINT(nonnull(1));
 /** @} */
 
@@ -1063,7 +1064,7 @@ uint32_t	fr_value_box_hash(fr_value_box_t const *vb);
 
 void		fr_value_box_verify(char const *file, int line, fr_value_box_t const *vb, bool talloced)
 		CC_HINT(nonnull(3));
-void		fr_value_box_list_verify(char const *file, int line, FR_DLIST_HEAD(fr_value_box_list) const *list, bool talloced)
+void		fr_value_box_list_verify(char const *file, int line, fr_value_box_list_t const *list, bool talloced)
 		CC_HINT(nonnull(3));
 
 #ifdef WITH_VERIFY_PTR
@@ -1087,7 +1088,7 @@ void		fr_value_box_list_verify(char const *file, int line, FR_DLIST_HEAD(fr_valu
  *
  * @{
  */
-void fr_value_box_list_debug(FR_DLIST_HEAD(fr_value_box_list) const *head);
+void fr_value_box_list_debug(fr_value_box_list_t const *head);
 void fr_value_box_debug(fr_value_box_t const *vb);
 /** @} */
 
diff --git a/src/modules/rlm_always/rlm_always.c b/src/modules/rlm_always/rlm_always.c
index 980c2276316..0cc551339ee 100644
--- a/src/modules/rlm_always/rlm_always.c
+++ b/src/modules/rlm_always/rlm_always.c
@@ -65,7 +65,7 @@ static xlat_arg_parser_t const always_xlat_args[] = {
  */
 static xlat_action_t always_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 xlat_ctx_t const *xctx,
-				 request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				 request_t *request, fr_value_box_list_t *in)
 {
 	rlm_always_t		*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_always_t);
 	module_instance_t	*mi = inst->mi;
diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 74907a79825..6075eaffab5 100644
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -813,7 +813,7 @@ static xlat_arg_parser_t const cache_xlat_args[] = {
 static CC_HINT(nonnull)
 xlat_action_t cache_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 			 xlat_ctx_t const *xctx,
-			 request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+			 request_t *request, fr_value_box_list_t *in)
 {
 	rlm_cache_entry_t 		*c = NULL;
 	rlm_cache_t			*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_cache_t);
diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c
index 79359c5e4d7..0de20ca7195 100644
--- a/src/modules/rlm_chap/rlm_chap.c
+++ b/src/modules/rlm_chap/rlm_chap.c
@@ -78,7 +78,7 @@ static xlat_arg_parser_t const xlat_func_chap_password_args[] = {
  */
 static xlat_action_t xlat_func_chap_password(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 	     UNUSED xlat_ctx_t const *xctx,
-					     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					     request_t *request, fr_value_box_list_t *in)
 {
 	uint8_t		chap_password[1 + RADIUS_CHAP_CHALLENGE_LENGTH];
 	fr_value_box_t	*vb;
diff --git a/src/modules/rlm_cipher/rlm_cipher.c b/src/modules/rlm_cipher/rlm_cipher.c
index e8323998493..c8b8674545c 100644
--- a/src/modules/rlm_cipher/rlm_cipher.c
+++ b/src/modules/rlm_cipher/rlm_cipher.c
@@ -582,7 +582,7 @@ static xlat_arg_parser_t const cipher_rsa_encrypt_xlat_arg[] = {
  */
 static xlat_action_t cipher_rsa_encrypt_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					     xlat_ctx_t const *xctx,
-					     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					     request_t *request, fr_value_box_list_t *in)
 {
 	rlm_cipher_rsa_thread_inst_t	*t = talloc_get_type_abort(xctx->mctx->thread, rlm_cipher_rsa_thread_inst_t);
 
@@ -643,7 +643,7 @@ static xlat_arg_parser_t const cipher_rsa_sign_xlat_arg[] = {
  */
 static xlat_action_t cipher_rsa_sign_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					  xlat_ctx_t const *xctx,
-					  request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					  request_t *request, fr_value_box_list_t *in)
 {
 	rlm_cipher_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_cipher_t);
 	rlm_cipher_rsa_thread_inst_t	*t = talloc_get_type_abort(xctx->mctx->thread, rlm_cipher_rsa_thread_inst_t);
@@ -721,7 +721,7 @@ static xlat_arg_parser_t const cipher_rsa_decrypt_xlat_arg[] = {
  */
 static xlat_action_t cipher_rsa_decrypt_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					     xlat_ctx_t const *xctx,
-					     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					     request_t *request, fr_value_box_list_t *in)
 {
 	rlm_cipher_rsa_thread_inst_t	*t = talloc_get_type_abort(xctx->mctx->thread, rlm_cipher_rsa_thread_inst_t);
 
@@ -784,7 +784,7 @@ static xlat_arg_parser_t const cipher_rsa_verify_xlat_arg[] = {
  */
 static xlat_action_t cipher_rsa_verify_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 	    xlat_ctx_t const *xctx,
-					    request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					    request_t *request, fr_value_box_list_t *in)
 {
 	rlm_cipher_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_cipher_t);
 	rlm_cipher_rsa_thread_inst_t	*t = talloc_get_type_abort(xctx->mctx->thread, rlm_cipher_rsa_thread_inst_t);
@@ -896,7 +896,7 @@ static xlat_arg_parser_t const cipher_certificate_xlat_args[] = {
  */
 static xlat_action_t cipher_fingerprint_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 	     xlat_ctx_t const *xctx,
-					     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					     request_t *request, fr_value_box_list_t *in)
 {
 	rlm_cipher_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_cipher_t);
 	char const			*md_name;
@@ -945,7 +945,7 @@ static xlat_action_t cipher_fingerprint_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
  */
 static xlat_action_t cipher_serial_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 	xlat_ctx_t const *xctx,
-					request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+					request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	rlm_cipher_t const	*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_cipher_t);
 	ASN1_INTEGER const	*serial;
@@ -967,7 +967,7 @@ static xlat_action_t cipher_serial_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 
 static xlat_action_t cipher_certificate_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 	     xlat_ctx_t const *xctx,
-					     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					     request_t *request, fr_value_box_list_t *in)
 {
 	rlm_cipher_t const	*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_cipher_t);
 	char const		*attribute = fr_value_box_list_head(in)->vb_strvalue;
diff --git a/src/modules/rlm_client/rlm_client.c b/src/modules/rlm_client/rlm_client.c
index 26d7f122b82..b99b6b5bbc5 100644
--- a/src/modules/rlm_client/rlm_client.c
+++ b/src/modules/rlm_client/rlm_client.c
@@ -115,7 +115,7 @@ static int _map_proc_client_get_vp(TALLOC_CTX *ctx, fr_pair_list_t *out, request
  *	- #RLM_MODULE_FAIL if an error occurred.
  */
 static rlm_rcode_t map_proc_client(UNUSED void *mod_inst, UNUSED void *proc_inst, request_t *request,
-				   FR_DLIST_HEAD(fr_value_box_list) *client_override, map_list_t const *maps)
+				   fr_value_box_list_t *client_override, map_list_t const *maps)
 {
 	rlm_rcode_t		rcode = RLM_MODULE_OK;
 	map_t const		*map = NULL;
@@ -231,7 +231,7 @@ static xlat_arg_parser_t const xlat_client_args[] = {
  */
 static xlat_action_t xlat_client(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 UNUSED xlat_ctx_t const *xctx,
-				 request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				 request_t *request, fr_value_box_list_t *in)
 {
 	char const	*value = NULL;
 	fr_ipaddr_t	ip;
diff --git a/src/modules/rlm_csv/rlm_csv.c b/src/modules/rlm_csv/rlm_csv.c
index 0fd54f03c02..799a3b3b553 100644
--- a/src/modules/rlm_csv/rlm_csv.c
+++ b/src/modules/rlm_csv/rlm_csv.c
@@ -32,7 +32,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/map_proc.h>
 
 static rlm_rcode_t mod_map_proc(void *mod_inst, UNUSED void *proc_inst, request_t *request,
-				FR_DLIST_HEAD(fr_value_box_list) *key, map_list_t const *maps);
+				fr_value_box_list_t *key, map_list_t const *maps);
 
 /*
  *	Define a structure for our module configuration.
@@ -975,7 +975,7 @@ finish:
  *	- #RLM_MODULE_FAIL if an error occurred.
  */
 static rlm_rcode_t mod_map_proc(void *mod_inst, UNUSED void *proc_inst, request_t *request,
-				FR_DLIST_HEAD(fr_value_box_list) *key, map_list_t const *maps)
+				fr_value_box_list_t *key, map_list_t const *maps)
 {
 	rlm_csv_t		*inst = talloc_get_type_abort(mod_inst, rlm_csv_t);
 	fr_value_box_t		*key_head = fr_value_box_list_head(key);
diff --git a/src/modules/rlm_date/rlm_date.c b/src/modules/rlm_date/rlm_date.c
index 15e423846ab..77cda9bbeb2 100644
--- a/src/modules/rlm_date/rlm_date.c
+++ b/src/modules/rlm_date/rlm_date.c
@@ -167,7 +167,7 @@ update request {
  */
 static xlat_action_t xlat_date_convert(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       xlat_ctx_t const *xctx,
-				       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				       request_t *request, fr_value_box_list_t *in)
 {
 	rlm_date_t const	*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_date_t);
 	struct tm 		tminfo;
diff --git a/src/modules/rlm_delay/rlm_delay.c b/src/modules/rlm_delay/rlm_delay.c
index 3aa65b7cd09..286c9898c62 100644
--- a/src/modules/rlm_delay/rlm_delay.c
+++ b/src/modules/rlm_delay/rlm_delay.c
@@ -179,7 +179,7 @@ static unlang_action_t CC_HINT(nonnull) mod_delay(rlm_rcode_t *p_result, module_
 
 static xlat_action_t xlat_delay_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       xlat_ctx_t const *xctx,
-				       request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+				       request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	fr_time_t	*yielded_at = talloc_get_type_abort(xctx->rctx, fr_time_t);
 	fr_time_delta_t	delayed;
@@ -221,7 +221,7 @@ static xlat_arg_parser_t const xlat_delay_args[] = {
  */
 static xlat_action_t xlat_delay(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 				xlat_ctx_t const *xctx,
-				request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				request_t *request, fr_value_box_list_t *in)
 {
 	rlm_delay_t const	*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_delay_t);
 	fr_time_t		resume_at, *yielded_at;
diff --git a/src/modules/rlm_dict/rlm_dict.c b/src/modules/rlm_dict/rlm_dict.c
index 5df2f16d00f..561915734b6 100644
--- a/src/modules/rlm_dict/rlm_dict.c
+++ b/src/modules/rlm_dict/rlm_dict.c
@@ -38,7 +38,7 @@ static xlat_arg_parser_t const xlat_dict_attr_by_num_args[] = {
  */
 static xlat_action_t xlat_dict_attr_by_num(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					   UNUSED xlat_ctx_t const *xctx,
-					   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					   request_t *request, fr_value_box_list_t *in)
 {
 	fr_dict_attr_t const	*da;
 	fr_value_box_t		*attr = fr_value_box_list_head(in);
@@ -72,7 +72,7 @@ static xlat_arg_parser_t const xlat_dict_attr_by_oid_args[] = {
  */
 static xlat_action_t xlat_dict_attr_by_oid(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					   UNUSED xlat_ctx_t const *xctx,
-					   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					   request_t *request, fr_value_box_list_t *in)
 {
 	unsigned int		attr = 0;
 	fr_dict_attr_t const	*parent = fr_dict_root(request->dict);
@@ -111,7 +111,7 @@ static xlat_arg_parser_t const xlat_vendor_args[] = {
  */
 static xlat_action_t xlat_vendor(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 UNUSED xlat_ctx_t const *xctx,
-				 request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				 request_t *request, fr_value_box_list_t *in)
 {
 	fr_pair_t		*vp;
 	fr_dict_vendor_t const	*vendor;
@@ -145,7 +145,7 @@ static xlat_arg_parser_t const xlat_vendor_num_args[] = {
  */
 static xlat_action_t xlat_vendor_num(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				     UNUSED xlat_ctx_t const *xctx,
-				     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				     request_t *request, fr_value_box_list_t *in)
 {
 	fr_pair_t	*vp;
 	fr_value_box_t	*attr = fr_value_box_list_head(in);
@@ -170,7 +170,7 @@ static xlat_arg_parser_t const xlat_attr_args[] = {
  */
 static xlat_action_t xlat_attr(TALLOC_CTX *ctx, fr_dcursor_t *out,
 			       UNUSED xlat_ctx_t const *xctx,
-			       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+			       request_t *request, fr_value_box_list_t *in)
 {
 	fr_pair_t	*vp;
 	fr_value_box_t	*attr = fr_value_box_list_head(in);
@@ -200,7 +200,7 @@ static xlat_arg_parser_t const xlat_attr_num_args[] = {
  */
 static xlat_action_t xlat_attr_num(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				   UNUSED xlat_ctx_t const *xctx,
-				   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				   request_t *request, fr_value_box_list_t *in)
 {
 	fr_pair_t	*vp;
 	fr_value_box_t	*attr = fr_value_box_list_head(in);
diff --git a/src/modules/rlm_escape/rlm_escape.c b/src/modules/rlm_escape/rlm_escape.c
index 861bb21192d..1fcee457018 100644
--- a/src/modules/rlm_escape/rlm_escape.c
+++ b/src/modules/rlm_escape/rlm_escape.c
@@ -62,7 +62,7 @@ static xlat_arg_parser_t const escape_xlat_arg[] = {
  */
 static xlat_action_t escape_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 xlat_ctx_t const *xctx,
-				 request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				 request_t *request, fr_value_box_list_t *in)
 {
 	rlm_escape_t const	*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_escape_t);
 	fr_value_box_t		*arg = fr_value_box_list_head(in);
@@ -136,7 +136,7 @@ static xlat_arg_parser_t const unescape_xlat_arg[] = {
  */
 static xlat_action_t unescape_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				   UNUSED xlat_ctx_t const *xctx,
-				   request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				   request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t	*arg = fr_value_box_list_head(in);
 	char const	*p, *end;
diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c
index 497f6de8d12..769bece3ad1 100644
--- a/src/modules/rlm_exec/rlm_exec.c
+++ b/src/modules/rlm_exec/rlm_exec.c
@@ -65,7 +65,7 @@ static const CONF_PARSER module_config[] = {
 
 static xlat_action_t exec_xlat_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      xlat_ctx_t const *xctx,
-				      request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+				      request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	fr_exec_state_t	*exec = talloc_get_type_abort(xctx->rctx, fr_exec_state_t);
 	fr_value_box_t	*vb;
@@ -114,7 +114,7 @@ static xlat_arg_parser_t const exec_xlat_args[] = {
  */
 static xlat_action_t exec_xlat(TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 			       xlat_ctx_t const *xctx,
-			       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+			       request_t *request, fr_value_box_list_t *in)
 {
 	rlm_exec_t const	*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_exec_t);
 	fr_pair_list_t		*env_pairs = NULL;
@@ -281,7 +281,7 @@ static unlang_action_t mod_exec_nowait_resume(rlm_rcode_t *p_result, module_ctx_
 					      request_t *request)
 {
 	rlm_exec_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_exec_t);
-	FR_DLIST_HEAD(fr_value_box_list)	*box = talloc_get_type_abort(mctx->rctx, FR_DLIST_HEAD(fr_value_box_list));
+	fr_value_box_list_t	*box = talloc_get_type_abort(mctx->rctx, fr_value_box_list_t);
 	fr_pair_list_t		*env_pairs = NULL;
 
 	/*
@@ -303,7 +303,7 @@ static unlang_action_t mod_exec_nowait_resume(rlm_rcode_t *p_result, module_ctx_
 }
 
 typedef struct {
-	FR_DLIST_HEAD(fr_value_box_list)	box;
+	fr_value_box_list_t	box;
 	int			status;
 } rlm_exec_ctx_t;
 
@@ -439,7 +439,7 @@ static unlang_action_t CC_HINT(nonnull) mod_exec_dispatch(rlm_rcode_t *p_result,
 	 *	Do the asynchronous xlat expansion.
 	 */
 	if (!inst->wait) {
-		FR_DLIST_HEAD(fr_value_box_list) *box = talloc_zero(ctx, FR_DLIST_HEAD(fr_value_box_list));
+		fr_value_box_list_t *box = talloc_zero(ctx, fr_value_box_list_t);
 
 		fr_value_box_list_init(box);
 		return unlang_module_yield_to_xlat(request, NULL, box, request, tmpl_xlat(inst->tmpl),
diff --git a/src/modules/rlm_icmp/rlm_icmp.c b/src/modules/rlm_icmp/rlm_icmp.c
index 1483980adc9..87fd3cb36b3 100644
--- a/src/modules/rlm_icmp/rlm_icmp.c
+++ b/src/modules/rlm_icmp/rlm_icmp.c
@@ -111,7 +111,7 @@ static const CONF_PARSER module_config[] = {
 
 static xlat_action_t xlat_icmp_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      xlat_ctx_t const *xctx,
-				      UNUSED request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+				      UNUSED request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	rlm_icmp_echo_t *echo = talloc_get_type_abort(xctx->rctx, rlm_icmp_echo_t);
 	rlm_icmp_thread_t *t = talloc_get_type_abort(xctx->mctx->thread, rlm_icmp_thread_t);
@@ -169,7 +169,7 @@ static xlat_arg_parser_t const xlat_icmp_args[] = {
  */
 static xlat_action_t xlat_icmp(TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 			       xlat_ctx_t const *xctx,
-			       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+			       request_t *request, fr_value_box_list_t *in)
 {
 	rlm_icmp_t		*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_icmp_t);
 	rlm_icmp_thread_t	*t = talloc_get_type_abort(xctx->mctx->thread, rlm_icmp_thread_t);
diff --git a/src/modules/rlm_idn/rlm_idn.c b/src/modules/rlm_idn/rlm_idn.c
index db7a5a5a9fe..7caff0b7486 100644
--- a/src/modules/rlm_idn/rlm_idn.c
+++ b/src/modules/rlm_idn/rlm_idn.c
@@ -101,7 +101,7 @@ static xlat_arg_parser_t const xlat_idna_arg[] = {
  */
 static xlat_action_t xlat_idna(TALLOC_CTX *ctx, fr_dcursor_t *out,
 			       xlat_ctx_t const *xctx,
-			       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+			       request_t *request, fr_value_box_list_t *in)
 {
 	rlm_idn_t const	*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_idn_t);
 	char		*idna = NULL;
diff --git a/src/modules/rlm_json/rlm_json.c b/src/modules/rlm_json/rlm_json.c
index a43538d75fa..ec392a2dd7a 100644
--- a/src/modules/rlm_json/rlm_json.c
+++ b/src/modules/rlm_json/rlm_json.c
@@ -89,7 +89,7 @@ static xlat_arg_parser_t const json_quote_xlat_arg[] = {
  */
 static xlat_action_t json_quote_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				     UNUSED xlat_ctx_t const *xctx,
-				     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				     request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t *vb;
 	fr_value_box_t *in_head = fr_value_box_list_head(in);
@@ -124,7 +124,7 @@ static xlat_arg_parser_t const jpath_validate_xlat_arg[] = {
  */
 static xlat_action_t jpath_validate_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					 UNUSED xlat_ctx_t const *xctx,
-					 request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					 request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t	*path = fr_value_box_list_head(in);
 	fr_jpath_node_t *head;
@@ -166,7 +166,7 @@ static xlat_arg_parser_t const json_encode_xlat_arg[] = {
  */
 static xlat_action_t json_encode_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      xlat_ctx_t const *xctx,
-				      request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				      request_t *request, fr_value_box_list_t *in)
 {
 	rlm_json_t const	*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_json_t);
 	fr_json_format_t const	*format = inst->format;
@@ -378,7 +378,7 @@ static int _json_map_proc_get_value(TALLOC_CTX *ctx, fr_pair_list_t *out, reques
 	fr_pair_t			*vp;
 	rlm_json_jpath_to_eval_t	*to_eval = uctx;
 	fr_value_box_t			*value;
-	FR_DLIST_HEAD(fr_value_box_list)		head;
+	fr_value_box_list_t		head;
 	int				ret;
 
 	fr_pair_list_free(out);
@@ -422,7 +422,7 @@ static int _json_map_proc_get_value(TALLOC_CTX *ctx, fr_pair_list_t *out, reques
  *	- #RLM_MODULE_FAIL if a fault occurred.
  */
 static rlm_rcode_t mod_map_proc(UNUSED void *mod_inst, void *proc_inst, request_t *request,
-			      	FR_DLIST_HEAD(fr_value_box_list) *json, map_list_t const *maps)
+			      	fr_value_box_list_t *json, map_list_t const *maps)
 {
 	rlm_rcode_t			rcode = RLM_MODULE_UPDATED;
 	struct json_tokener		*tok;
diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 6697c757c15..23249cb48a5 100644
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -187,7 +187,7 @@ static xlat_arg_parser_t const ldap_escape_xlat_arg[] = {
  */
 static xlat_action_t ldap_escape_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      UNUSED xlat_ctx_t const *xctx,
-				      request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				      request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t		*vb, *in_vb = fr_value_box_list_head(in);
 	fr_sbuff_t		sbuff;
@@ -225,7 +225,7 @@ static xlat_action_t ldap_escape_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
  */
 static xlat_action_t ldap_unescape_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					UNUSED xlat_ctx_t const *xctx,
-					request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+					request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t		*vb, *in_vb = fr_value_box_list_head(in);
 	fr_sbuff_t		sbuff;
@@ -310,7 +310,7 @@ static void ldap_query_timeout(UNUSED fr_event_list_t *el, UNUSED fr_time_t now,
  */
 static xlat_action_t ldap_xlat_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      xlat_ctx_t const *xctx,
-	 			      request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+	 			      request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	fr_ldap_query_t		*query = talloc_get_type_abort(xctx->rctx, fr_ldap_query_t);
 	fr_ldap_connection_t	*ldap_conn = query->ldap_conn;
@@ -397,7 +397,7 @@ static xlat_arg_parser_t const ldap_xlat_arg[] = {
  */
 static xlat_action_t ldap_xlat(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 			       xlat_ctx_t const *xctx,
-	 		       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+	 		       request_t *request, fr_value_box_list_t *in)
 {
 	fr_ldap_thread_t	*t = talloc_get_type_abort(xctx->mctx->thread, fr_ldap_thread_t);
 	fr_value_box_t		*uri_components, *uri;
@@ -650,7 +650,7 @@ static void _ldap_async_bind_auth_watch(fr_connection_t *conn, UNUSED fr_connect
  *	- #RLM_MODULE_FAIL if an error occurred.
  */
 static rlm_rcode_t mod_map_proc(void *mod_inst, UNUSED void *proc_inst, request_t *request,
-				FR_DLIST_HEAD(fr_value_box_list) *url, map_list_t const *maps)
+				fr_value_box_list_t *url, map_list_t const *maps)
 {
 	rlm_rcode_t		rcode = RLM_MODULE_UPDATED;
 	rlm_ldap_t		*inst = talloc_get_type_abort(mod_inst, rlm_ldap_t);
diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c
index a58090e80ed..da5b80747bd 100644
--- a/src/modules/rlm_linelog/rlm_linelog.c
+++ b/src/modules/rlm_linelog/rlm_linelog.c
@@ -515,7 +515,7 @@ finish:
 
 static xlat_action_t linelog_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				  xlat_ctx_t const *xctx, request_t *request,
-				  FR_DLIST_HEAD(fr_value_box_list) *args)
+				  fr_value_box_list_t *args)
 {
 	rlm_linelog_t const	*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_linelog_t);
 	struct iovec		vector[2];
diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index 3ffee6df276..60d29507f31 100644
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -303,7 +303,7 @@ static xlat_arg_parser_t const mschap_xlat_args[] = {
  */
 static xlat_action_t mschap_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 xlat_ctx_t const *xctx,
-				 request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				 request_t *request, fr_value_box_list_t *in)
 {
 	size_t			data_len;
 	uint8_t const  		*data = NULL;
diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c
index 01232009333..63c7a8dd3ca 100644
--- a/src/modules/rlm_perl/rlm_perl.c
+++ b/src/modules/rlm_perl/rlm_perl.c
@@ -251,7 +251,7 @@ static void xs_init(pTHX)
  * 	- 0 on success
  * 	- -1 on failure
  */
-static int perl_vblist_to_av(AV *av, FR_DLIST_HEAD(fr_value_box_list) *head) {
+static int perl_vblist_to_av(AV *av, fr_value_box_list_t *head) {
 	fr_value_box_t	*vb = NULL;
 	SV		*sv;
 
@@ -305,7 +305,7 @@ static int perl_vblist_to_av(AV *av, FR_DLIST_HEAD(fr_value_box_list) *head) {
  * 	- 0 on success
  * 	- -1 on failure
  */
-static int perl_sv_to_vblist(TALLOC_CTX *ctx, FR_DLIST_HEAD(fr_value_box_list) *list, request_t *request, SV *sv) {
+static int perl_sv_to_vblist(TALLOC_CTX *ctx, fr_value_box_list_t *list, request_t *request, SV *sv) {
 	fr_value_box_t	*vb = NULL;
 	char		*tmp;
 	STRLEN		len;
@@ -421,7 +421,7 @@ static xlat_arg_parser_t const perl_xlat_args[] = {
  */
 static xlat_action_t perl_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 			       xlat_ctx_t const *xctx,
-			       request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+			       request_t *request, fr_value_box_list_t *in)
 {
 	rlm_perl_thread_t const		*t = talloc_get_type_abort_const(xctx->mctx->thread, rlm_perl_thread_t);
 	int				count, i;
@@ -431,7 +431,7 @@ static xlat_action_t perl_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 	fr_value_box_t			*arg = NULL, *child;
 	SV				*sv;
 	AV				*av;
-	FR_DLIST_HEAD(fr_value_box_list)		list, sub_list;
+	fr_value_box_list_t		list, sub_list;
 	fr_value_box_t			*vb = NULL;
 
 	fr_value_box_list_init(&list);
diff --git a/src/modules/rlm_redis/rlm_redis.c b/src/modules/rlm_redis/rlm_redis.c
index 110a62a7510..6c5c786fbe8 100644
--- a/src/modules/rlm_redis/rlm_redis.c
+++ b/src/modules/rlm_redis/rlm_redis.c
@@ -154,7 +154,7 @@ static xlat_arg_parser_t const redis_remap_xlat_args[] = {
  */
 static xlat_action_t redis_remap_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      xlat_ctx_t const *xctx,
-				      request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				      request_t *request, fr_value_box_list_t *in)
 {
 	rlm_redis_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_redis_t);
 
@@ -208,7 +208,7 @@ static xlat_arg_parser_t const redis_node_xlat_args[] = {
  */
 static xlat_action_t redis_node_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				     xlat_ctx_t const *xctx,
-				     request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				     request_t *request, fr_value_box_list_t *in)
 {
 	rlm_redis_t const			*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_redis_t);
 
@@ -264,7 +264,7 @@ static xlat_arg_parser_t const redis_args[] = {
  */
 static xlat_action_t redis_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				xlat_ctx_t const *xctx,
-				request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				request_t *request, fr_value_box_list_t *in)
 {
 	rlm_redis_t const	*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_redis_t);
 	xlat_action_t		action = XLAT_ACTION_DONE;
diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
index d7ef00605de..586e2c3a423 100644
--- a/src/modules/rlm_rest/rlm_rest.c
+++ b/src/modules/rlm_rest/rlm_rest.c
@@ -262,7 +262,7 @@ static int rlm_rest_perform(module_ctx_t const *mctx,
 
 static xlat_action_t rest_xlat_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      xlat_ctx_t const *xctx,
-				      request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+				      request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	rlm_rest_xlat_rctx_t		*rctx = talloc_get_type_abort(xctx->rctx, rlm_rest_xlat_rctx_t);
 	int				hcode;
@@ -400,7 +400,7 @@ static xlat_arg_parser_t const rest_xlat_args[] = {
  */
 static xlat_action_t rest_xlat(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 			       xlat_ctx_t const *xctx, request_t *request,
-			       FR_DLIST_HEAD(fr_value_box_list) *in)
+			       fr_value_box_list_t *in)
 {
 	rlm_rest_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_rest_t);
 	rlm_rest_thread_t		*t = talloc_get_type_abort(xctx->mctx->thread, rlm_rest_thread_t);
diff --git a/src/modules/rlm_soh/rlm_soh.c b/src/modules/rlm_soh/rlm_soh.c
index 1b3a0be3b87..52ea25d15fe 100644
--- a/src/modules/rlm_soh/rlm_soh.c
+++ b/src/modules/rlm_soh/rlm_soh.c
@@ -82,7 +82,7 @@ static xlat_arg_parser_t const soh_xlat_args[] = {
  */
 static xlat_action_t soh_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 			      UNUSED xlat_ctx_t const *xctx, request_t *request,
-			      FR_DLIST_HEAD(fr_value_box_list) *in)
+			      fr_value_box_list_t *in)
 {
 	fr_value_box_t	*in_head = fr_value_box_list_head(in);
 	fr_value_box_t	*vb;
diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index cd0c7ebd534..33cfa4ea4f2 100644
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -167,7 +167,7 @@ static int sql_xlat_escape(request_t *request, fr_value_box_t *vb, void *uctx)
 	size_t					len;
 	rlm_sql_handle_t			*handle;
 	rlm_sql_t				*inst = talloc_get_type_abort(uctx, rlm_sql_t);
-	FR_DLIST_ENTRY(fr_value_box_list)	entry;
+	fr_value_box_entry_t			entry;
 
 	handle = fr_pool_connection_get(inst->pool, request);
 	if (!handle) {
@@ -212,7 +212,7 @@ static int sql_xlat_escape(request_t *request, fr_value_box_t *vb, void *uctx)
  */
 static xlat_action_t sql_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 			      xlat_ctx_t const *xctx,
-			      request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+			      request_t *request, fr_value_box_list_t *in)
 {
 	rlm_sql_handle_t	*handle = NULL;
 	rlm_sql_row_t		row;
@@ -380,7 +380,7 @@ static int sql_map_verify(CONF_SECTION *cs, UNUSED void *mod_inst, UNUSED void *
  *	- #RLM_MODULE_FAIL if a fault occurred.
  */
 static rlm_rcode_t mod_map_proc(void *mod_inst, UNUSED void *proc_inst, request_t *request,
-				FR_DLIST_HEAD(fr_value_box_list) *query, map_list_t const *maps)
+				fr_value_box_list_t *query, map_list_t const *maps)
 {
 	rlm_sql_t		*inst = talloc_get_type_abort(mod_inst, rlm_sql_t);
 	rlm_sql_handle_t	*handle = NULL;
diff --git a/src/modules/rlm_test/rlm_test.c b/src/modules/rlm_test/rlm_test.c
index 77dd73f4488..274ad5ae813 100644
--- a/src/modules/rlm_test/rlm_test.c
+++ b/src/modules/rlm_test/rlm_test.c
@@ -358,7 +358,7 @@ static xlat_arg_parser_t const trigger_test_xlat_args[] = {
  */
 static xlat_action_t trigger_test_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       UNUSED xlat_ctx_t const *xctx, request_t *request,
-				       FR_DLIST_HEAD(fr_value_box_list) *in)
+				       fr_value_box_list_t *in)
 {
 	fr_value_box_t	*in_head = fr_value_box_list_head(in);
 	fr_value_box_t	*vb;
@@ -390,7 +390,7 @@ static xlat_arg_parser_t const test_xlat_args[] = {
  */
 static xlat_action_t test_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 			       UNUSED xlat_ctx_t const *xctx, UNUSED request_t *request,
-			       FR_DLIST_HEAD(fr_value_box_list) *in)
+			       fr_value_box_list_t *in)
 {
 	fr_value_box_t	*vb_p = NULL;
 	fr_value_box_t	*vb;
diff --git a/src/modules/rlm_unbound/rlm_unbound.c b/src/modules/rlm_unbound/rlm_unbound.c
index c6880ee080e..ee006a3393c 100644
--- a/src/modules/rlm_unbound/rlm_unbound.c
+++ b/src/modules/rlm_unbound/rlm_unbound.c
@@ -59,7 +59,7 @@ typedef struct {
 	fr_type_t		return_type;	//!< Data type to parse results into
 	bool			has_priority;	//!< Does the returned data start with a priority field
 	uint16_t		count;		//!< Number of results to return
-	FR_DLIST_HEAD(fr_value_box_list)	list;		//!< Where to put the parsed results
+	fr_value_box_list_t	list;		//!< Where to put the parsed results
 	TALLOC_CTX		*out_ctx;	//!< CTX to allocate parsed results in
 	fr_event_timer_t const	*ev;		//!< Event for timeout
 } unbound_request_t;
@@ -282,7 +282,7 @@ static void xlat_unbound_signal(xlat_ctx_t const *xctx, request_t *request, fr_s
  */
 static xlat_action_t xlat_unbound_resume(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
 					 xlat_ctx_t const *xctx,
-					 request_t *request, UNUSED FR_DLIST_HEAD(fr_value_box_list) *in)
+					 request_t *request, UNUSED fr_value_box_list_t *in)
 {
 	fr_value_box_t		*vb;
 	unbound_request_t	*ur = talloc_get_type_abort(xctx->rctx, unbound_request_t);
@@ -342,7 +342,7 @@ static xlat_arg_parser_t const xlat_unbound_args[] = {
  */
 static xlat_action_t xlat_unbound(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				  xlat_ctx_t const *xctx,
-				  request_t *request, FR_DLIST_HEAD(fr_value_box_list) *in)
+				  request_t *request, fr_value_box_list_t *in)
 {
 	rlm_unbound_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_unbound_t);
 	rlm_unbound_thread_t		*t = talloc_get_type_abort(xctx->mctx->thread, rlm_unbound_thread_t);
diff --git a/src/modules/rlm_unpack/rlm_unpack.c b/src/modules/rlm_unpack/rlm_unpack.c
index 8e8879f4f04..0c0148af279 100644
--- a/src/modules/rlm_unpack/rlm_unpack.c
+++ b/src/modules/rlm_unpack/rlm_unpack.c
@@ -50,7 +50,7 @@ static xlat_arg_parser_t const unpack_xlat_args[] = {
  */
 static xlat_action_t unpack_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 UNUSED xlat_ctx_t const *xctx, request_t *request,
-				 FR_DLIST_HEAD(fr_value_box_list) *in)
+				 fr_value_box_list_t *in)
 {
 	size_t		len, input_len, offset;
 	fr_type_t	type;
diff --git a/src/modules/rlm_yubikey/rlm_yubikey.c b/src/modules/rlm_yubikey/rlm_yubikey.c
index b5a371f9b13..51a5e184d38 100644
--- a/src/modules/rlm_yubikey/rlm_yubikey.c
+++ b/src/modules/rlm_yubikey/rlm_yubikey.c
@@ -142,7 +142,7 @@ static xlat_arg_parser_t const modhex_to_hex_xlat_arg[] = {
  */
 static xlat_action_t modhex_to_hex_xlat(UNUSED TALLOC_CTX *ctx, fr_dcursor_t * out,
 					UNUSED xlat_ctx_t const *xctx, request_t *request,
-					FR_DLIST_HEAD(fr_value_box_list) *in)
+					fr_value_box_list_t *in)
 {
 	ssize_t 	len;
 	fr_value_box_t	*arg = fr_value_box_list_pop_head(in);