diff -r 16e2a3391e88 -r d4baf4dd55c3 src/cx/tree.h
--- a/src/cx/tree.h	Thu May 23 18:21:36 2024 +0200
+++ b/src/cx/tree.h	Thu May 23 19:29:14 2024 +0200
@@ -58,10 +58,7 @@
  * @see CxIterator
  */
 typedef struct cx_tree_iterator_s {
-    /**
-     * The base properties of this iterator.
-     */
-    struct cx_iterator_base_s base;
+    CX_ITERATOR_BASE
     /**
      * Indicates whether the subtree below the current node shall be skipped.
      */
@@ -97,7 +94,7 @@
      * Stores a copy of the next pointer of the visited node.
      * Allows freeing a node on exit without corrupting the iteration.
      */
-    void *next;
+    void *node_next;
     /**
      * Internal stack.
      * Will be automatically freed once the iterator becomes invalid.
@@ -157,10 +154,7 @@
  * @see CxIterator
  */
 typedef struct cx_tree_visitor_s {
-    /**
-     * The base properties of this iterator.
-     */
-    struct cx_iterator_base_s base;
+    CX_ITERATOR_BASE
     /**
      * Indicates whether the subtree below the current node shall be skipped.
      */