diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c
index fe0b09e91fcb..208a56510048 100644
--- a/src/bin/unit_test_attribute.c
+++ b/src/bin/unit_test_attribute.c
@@ -1121,7 +1121,7 @@ static void command_print(void)
 	void *walk_ctx = NULL;
 
 	printf("Command hierarchy --------");
-	fr_command_debug(stdout, command_head);
+	fr_cmd_debug(stdout, command_head);
 
 	printf("Command list --------");
 	while (fr_command_walk(command_head, &walk_ctx, NULL, command_walk) == 1) {
diff --git a/src/lib/io/atomic_queue.c b/src/lib/io/atomic_queue.c
index 4c9b7eac8aec..7bf0bcdaf1da 100644
--- a/src/lib/io/atomic_queue.c
+++ b/src/lib/io/atomic_queue.c
@@ -169,7 +169,7 @@ bool fr_atomic_queue_push(fr_atomic_queue_t *aq, void *data)
 		 */
 		if (diff < 0) {
 #if 0
-			fr_atomic_queue_debug(aq, stderr);
+			fr_atomic_queue_debug(stderr, aq);
 #endif
 			return false;
 		}
@@ -298,7 +298,7 @@ typedef struct {
  * @param[in] aq	The atomic queue to debug.
  * @param[in] fp	where the debugging information will be printed.
  */
-void fr_atomic_queue_debug(fr_atomic_queue_t *aq, FILE *fp)
+void fr_atomic_queue_debug(FILE * fp, fr_atomic_queue_t *aq)
 {
 	size_t i;
 	int64_t head, tail;
diff --git a/src/lib/io/atomic_queue.h b/src/lib/io/atomic_queue.h
index fb096dd9a62f..015e143b73fb 100644
--- a/src/lib/io/atomic_queue.h
+++ b/src/lib/io/atomic_queue.h
@@ -64,7 +64,7 @@ void			fr_atomic_queue_verify(fr_atomic_queue_t *aq);
 #endif
 
 #ifndef NDEBUG
-void			fr_atomic_queue_debug(fr_atomic_queue_t *aq, FILE *fp);
+void			fr_atomic_queue_debug(FILE *fp, fr_atomic_queue_t *aq);
 #endif
 
 
diff --git a/src/lib/io/message.c b/src/lib/io/message.c
index 986864d4ac3f..e3e729be210e 100644
--- a/src/lib/io/message.c
+++ b/src/lib/io/message.c
@@ -1259,7 +1259,7 @@ void fr_message_set_gc(fr_message_set_t *ms)
  * @param[in] ms the message set
  * @param[in] fp the FILE where the messages are printed.
  */
-void fr_message_set_debug(fr_message_set_t *ms, FILE *fp)
+void fr_message_set_debug(FILE *fp, fr_message_set_t *ms)
 {
 	int i;
 
diff --git a/src/lib/io/message.h b/src/lib/io/message.h
index 7206e0084927..6d4182f00de1 100644
--- a/src/lib/io/message.h
+++ b/src/lib/io/message.h
@@ -64,7 +64,7 @@ fr_message_t *fr_message_localize(TALLOC_CTX *ctx, fr_message_t *m, size_t messa
 int fr_message_set_messages_used(fr_message_set_t *ms) CC_HINT(nonnull);
 void fr_message_set_gc(fr_message_set_t *ms) CC_HINT(nonnull);
 
-void fr_message_set_debug(fr_message_set_t *ms, FILE *fp) CC_HINT(nonnull);
+void fr_message_set_debug(FILE *fp, fr_message_set_t *ms) CC_HINT(nonnull);
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/io/queue.c b/src/lib/io/queue.c
index d548ba35be7e..37eb67c7cc09 100644
--- a/src/lib/io/queue.c
+++ b/src/lib/io/queue.c
@@ -252,10 +252,10 @@ int fr_queue_localize_atomic(fr_queue_t *fq, fr_atomic_queue_t *aq)
 #ifndef NDEBUG
 /**  Dump a queue.
  *
- * @param[in] fq the queue
  * @param[in] fp where the debugging information will be printed.
+ * @param[in] fq the queue
  */
-void fr_queue_debug(fr_queue_t *fq, FILE *fp)
+void fr_queue_debug(FILE *fp, fr_queue_t *fq)
 {
 	int i;
 
diff --git a/src/lib/io/queue.h b/src/lib/io/queue.h
index 12e9e6d7e79e..c6d7b536104b 100644
--- a/src/lib/io/queue.h
+++ b/src/lib/io/queue.h
@@ -47,7 +47,7 @@ int fr_queue_num_elements(fr_queue_t *fq) CC_HINT(nonnull);
 int fr_queue_localize_atomic(fr_queue_t *fq, fr_atomic_queue_t *aq) CC_HINT(nonnull);
 
 #ifndef NDEBUG
-void fr_queue_debug(fr_queue_t *fq, FILE *fp) CC_HINT(nonnull);
+void fr_queue_debug(FILE *fp, fr_queue_t *fq) CC_HINT(nonnull);
 #endif
 
 
diff --git a/src/lib/io/ring_buffer.c b/src/lib/io/ring_buffer.c
index 3589c946da23..8495779e4bab 100644
--- a/src/lib/io/ring_buffer.c
+++ b/src/lib/io/ring_buffer.c
@@ -482,7 +482,7 @@ int fr_ring_buffer_start(fr_ring_buffer_t *rb, uint8_t **p_start, size_t *p_size
  * @param[in] rb the ring buffer
  * @param[in] fp the FILE where the messages are printed.
  */
-void fr_ring_buffer_debug(fr_ring_buffer_t *rb, FILE *fp)
+void fr_ring_buffer_debug(FILE *fp, fr_ring_buffer_t *rb)
 {
 	fprintf(fp, "Buffer %p, write_offset %zu, data_start %zu, data_end %zu\n",
 		rb->buffer, rb->write_offset, rb->data_start, rb->data_end);
diff --git a/src/lib/io/ring_buffer.h b/src/lib/io/ring_buffer.h
index d8f3088307a1..2ea27b52a67d 100644
--- a/src/lib/io/ring_buffer.h
+++ b/src/lib/io/ring_buffer.h
@@ -52,7 +52,7 @@ size_t			fr_ring_buffer_size(fr_ring_buffer_t *rb) CC_HINT(nonnull);
 
 size_t 			fr_ring_buffer_used(fr_ring_buffer_t *rb) CC_HINT(nonnull);
 
-void			fr_ring_buffer_debug(fr_ring_buffer_t *rb, FILE *fp) CC_HINT(nonnull);
+void			fr_ring_buffer_debug(FILE *fp, fr_ring_buffer_t *rb) CC_HINT(nonnull);
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/server/command.c b/src/lib/server/command.c
index 98890f987989..c33ae79139fe 100644
--- a/src/lib/server/command.c
+++ b/src/lib/server/command.c
@@ -1599,7 +1599,7 @@ static void fr_command_debug_internal(FILE *fp, fr_cmd_t *head, int depth)
 	}
 }
 
-void fr_command_debug(FILE *fp, fr_cmd_t *head)
+void fr_cmd_debug(FILE *fp, fr_cmd_t *head)
 {
 	fr_command_debug_internal(fp, head, 0);
 }
diff --git a/src/lib/server/command.h b/src/lib/server/command.h
index 3cdf8eb3ff24..0ab457f3a93a 100644
--- a/src/lib/server/command.h
+++ b/src/lib/server/command.h
@@ -79,7 +79,7 @@ int fr_command_walk(fr_cmd_t *head, void **walk_ctx, void *ctx, fr_cmd_walk_t ca
 int fr_command_tab_expand(TALLOC_CTX *ctx, fr_cmd_t *head, fr_cmd_info_t *info, int max_expansions, char const **expansions);
 char const *fr_command_help(fr_cmd_t *head, int argc, char *argv[]);
 int fr_command_run(FILE *fp, FILE *fp_err, fr_cmd_info_t *info, bool read_only);
-void fr_command_debug(FILE *fp, fr_cmd_t *head);
+void fr_cmd_debug(FILE *fp, fr_cmd_t *head);
 int fr_command_str_to_argv(fr_cmd_t *head, fr_cmd_info_t *info, char const *str);
 int fr_command_clear(int new_argc, fr_cmd_info_t *info) CC_HINT(nonnull);
 
diff --git a/src/tests/util/atomic_queue_test.c b/src/tests/util/atomic_queue_test.c
index 3884f1b2cdc9..abeb02d13d40 100644
--- a/src/tests/util/atomic_queue_test.c
+++ b/src/tests/util/atomic_queue_test.c
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
 #ifndef NDEBUG
 	if (debug_lvl) {
 		printf("Start\n");
-		fr_atomic_queue_debug(aq, stdout);
+		fr_atomic_queue_debug(stdout, aq);
 
 		if (debug_lvl > 1) printf("Filling with %d\n", size);
 	}
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
 #ifndef NDEBUG
 		if (debug_lvl > 1) {
 			printf("iteration %d\n", i);
-			fr_atomic_queue_debug(aq, stdout);
+			fr_atomic_queue_debug(stdout, aq);
 		}
 #endif
 	}
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
 #ifndef NDEBUG
 	if (debug_lvl) {
 		printf("Full\n");
-		fr_atomic_queue_debug(aq, stdout);
+		fr_atomic_queue_debug(stdout, aq);
 
 		if (debug_lvl > 1) printf("Emptying\n");
 	}
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
 #ifndef NDEBUG
 		if (debug_lvl > 1) {
 			printf("iteration %d\n", i);
-			fr_atomic_queue_debug(aq, stdout);
+			fr_atomic_queue_debug(stdout, aq);
 		}
 #endif
 	}
@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
 #ifndef NDEBUG
 	if (debug_lvl) {
 		printf("Empty\n");
-		fr_atomic_queue_debug(aq, stdout);
+		fr_atomic_queue_debug(stdout, aq);
 	}
 #endif
 
diff --git a/src/tests/util/channel_test.c b/src/tests/util/channel_test.c
index d322ff20be74..aedf40e0eaaa 100644
--- a/src/tests/util/channel_test.c
+++ b/src/tests/util/channel_test.c
@@ -291,7 +291,7 @@ static void *channel_master(void *arg)
 	MPRINT2("GC\n");
 	fr_message_set_gc(ms);
 
-	if (debug_lvl > 1) fr_message_set_debug(ms, stdout);
+	if (debug_lvl > 1) fr_message_set_debug(stdout, ms);
 
 	/*
 	 *	After the garbage collection, all messages marked "done" MUST also be marked "free".
@@ -466,7 +466,7 @@ static void *channel_worker(void *arg)
 	MPRINT2("Worker GC\n");
 	fr_message_set_gc(ms);
 
-	if (debug_lvl > 1) fr_message_set_debug(ms, stdout);
+	if (debug_lvl > 1) fr_message_set_debug(stdout, ms);
 
 	/*
 	 *	After the garbage collection, all messages marked "done" MUST also be marked "free".
diff --git a/src/tests/util/message_set_test.c b/src/tests/util/message_set_test.c
index ad2272f781d6..c24680aeae8f 100644
--- a/src/tests/util/message_set_test.c
+++ b/src/tests/util/message_set_test.c
@@ -248,7 +248,7 @@ int main(int argc, char *argv[])
 
 	MPRINT1("TEST 1 used %d (%zu)\n", fr_message_set_messages_used(ms), used);
 
-	if (debug_lvl) fr_message_set_debug(ms, stdout);
+	if (debug_lvl) fr_message_set_debug(stdout, ms);
 
 	/*
 	 *	Double the size of the allocations
@@ -270,7 +270,7 @@ int main(int argc, char *argv[])
 
 	MPRINT1("TEST 2 used %d\n", fr_message_set_messages_used(ms));
 
-	if (debug_lvl) fr_message_set_debug(ms, stdout);
+	if (debug_lvl) fr_message_set_debug(stdout, ms);
 	/*
 	 *	Double the size of the allocations
 	 */
@@ -299,7 +299,7 @@ int main(int argc, char *argv[])
 
 	MPRINT1("TEST 3 used %d\n", fr_message_set_messages_used(ms));
 
-	if (debug_lvl) fr_message_set_debug(ms, stdout);
+	if (debug_lvl) fr_message_set_debug(stdout, ms);
 
 	/*
 	 *	Do another 1000 rounds of alloc / free.
@@ -313,7 +313,7 @@ int main(int argc, char *argv[])
 
 	MPRINT1("TEST 4 used %d\n", fr_message_set_messages_used(ms));
 
-	if (debug_lvl) fr_message_set_debug(ms, stdout);
+	if (debug_lvl) fr_message_set_debug(stdout, ms);
 
 #if 0
 
@@ -335,7 +335,7 @@ int main(int argc, char *argv[])
 
 	MPRINT1("TEST 5 used %d\n", fr_message_set_messages_used(ms));
 
-	if (debug_lvl) fr_message_set_debug(ms, stdout);
+	if (debug_lvl) fr_message_set_debug(stdout, ms);
 
 	/*
 	 *	Double the number of the allocations again,
@@ -355,7 +355,7 @@ int main(int argc, char *argv[])
 
 	MPRINT1("TEST 6 used %d\n", fr_message_set_messages_used(ms));
 
-	if (debug_lvl) fr_message_set_debug(ms, stdout);
+	if (debug_lvl) fr_message_set_debug(stdout, ms);
 #endif
 
 	my_alloc_size = end - start;
@@ -396,7 +396,7 @@ int main(int argc, char *argv[])
 	MPRINT1("GC\n");
 	fr_message_set_gc(ms);
 
-	if (debug_lvl) fr_message_set_debug(ms, stdout);
+	if (debug_lvl) fr_message_set_debug(stdout, ms);
 
 	/*
 	 *	After the garbage collection, all messages marked "done" MUST also be marked "free".
diff --git a/src/tests/util/radius1_test.c b/src/tests/util/radius1_test.c
index 8fd3b9be6e03..d712dc53f67e 100644
--- a/src/tests/util/radius1_test.c
+++ b/src/tests/util/radius1_test.c
@@ -502,7 +502,7 @@ static void master_process(TALLOC_CTX *ctx)
 	MPRINT2("GC\n");
 	fr_message_set_gc(ms);
 
-	if (debug_lvl > 1) fr_message_set_debug(ms, stdout);
+	if (debug_lvl > 1) fr_message_set_debug(stdout, ms);
 
 	/*
 	 *	After the garbage collection, all messages marked "done" MUST also be marked "free".
diff --git a/src/tests/util/worker_test.c b/src/tests/util/worker_test.c
index 3a4c481cc977..e3f6154876aa 100644
--- a/src/tests/util/worker_test.c
+++ b/src/tests/util/worker_test.c
@@ -455,7 +455,7 @@ static void master_process(void)
 	MPRINT2("GC\n");
 	fr_message_set_gc(ms);
 
-	if (debug_lvl > 1) fr_message_set_debug(ms, stdout);
+	if (debug_lvl > 1) fr_message_set_debug(stdout, ms);
 
 	/*
 	 *	After the garbage collection, all messages marked "done" MUST also be marked "free".