diff -r 89cd8dfdc3c2 -r ea1ac0e8225c tests/test_tree.c
--- a/tests/test_tree.c	Sun Sep 29 13:49:33 2024 +0200
+++ b/tests/test_tree.c	Sun Sep 29 14:38:41 2024 +0200
@@ -41,11 +41,7 @@
 } tree_node;
 
 typedef struct tree_node2 {
-    struct tree_node2 *parent;
-    struct tree_node2 *next;
-    struct tree_node2 *prev;
-    struct tree_node2 *children;
-    struct tree_node2 *last_child;
+    CX_TREE_NODE_BASE(struct tree_node2);
     int data;
 } tree_node2;
 
@@ -99,7 +95,7 @@
     offsetof(structname, parent), offsetof(structname, children),\
     offsetof(structname, last_child), \
     offsetof(structname, prev), offsetof(structname, next)
-#define tree_node2_layout tree_node_full_layout(tree_node2)
+#define tree_node2_layout cx_tree_node_base_layout
 #define tree_node_file_layout tree_node_full_layout(tree_node_file)
 
 #define tree_children(type) offsetof(type, children), offsetof(type, next)