diff -r 2cb06c231057 -r bc63cb601f6d ui/motif/toolbar.h
--- a/ui/motif/toolbar.h	Mon May 22 19:44:27 2023 +0200
+++ b/ui/motif/toolbar.h	Mon May 22 21:21:20 2023 +0200
@@ -30,8 +30,8 @@
 #define	TOOLBAR_H
 
 #include "../ui/toolbar.h"
-#include <ucx/map.h>
-#include <ucx/list.h>
+#include <cx/hash_map.h>
+#include <cx/linked_list.h>
 
 #ifdef	__cplusplus
 extern "C" {
@@ -56,7 +56,7 @@
     void           *image;
     ui_callback    callback;
     void           *userdata;
-    UcxList        *groups;
+    CxList         *groups;
     Boolean        isimportant;
 };
 
@@ -65,7 +65,7 @@
     char           *stockid;
     ui_callback    callback;
     void           *userdata;
-    UcxList        *groups;
+    CxList         *groups;
     Boolean        isimportant;
 };