diff -r e79a60b3a7cb -r 7c3ff86ee9d4 ui/gtk/toolbar.h
--- a/ui/gtk/toolbar.h	Sun Apr 16 10:20:21 2023 +0200
+++ b/ui/gtk/toolbar.h	Tue May 23 11:11:28 2023 +0200
@@ -30,8 +30,8 @@
 #define	TOOLBAR_H
 
 #include "../ui/toolbar.h"
-#include <ucx/map.h>
-#include <ucx/list.h>
+#include <cx/map.h>
+#include <cx/list.h>
 
 #include "model.h"
 #include "tree.h"
@@ -61,7 +61,7 @@
     ui_callback    callback;
     void           *userdata;
     const char     *varname;
-    UcxList        *groups;
+    CxList         *groups;
     int            isimportant;
 };
 
@@ -71,7 +71,7 @@
     ui_callback    callback;
     void           *userdata;
     const char     *varname;
-    UcxList        *groups;
+    CxList         *groups;
     int            isimportant;
 };
 
@@ -82,7 +82,7 @@
     const char     *stockid;
     UiInteger      *value;
     const char     *var;
-    UcxList        *groups;
+    CxList         *groups;
     int            isimportant;
 };
 
@@ -97,7 +97,7 @@
 struct UiToolbarComboBoxNV {
     UiToolItemI         item;
     char                *listname;
-    ui_getvaluefunc getvalue;
+    ui_getvaluefunc     getvalue;
     ui_callback         callback;
     void                *userdata;
 };