diff -r 62921b370c60 -r ee49d1852a5f ui/motif/tree.h
--- a/ui/motif/tree.h	Sun Jan 21 12:13:09 2018 +0100
+++ b/ui/motif/tree.h	Sun Jul 01 19:03:26 2018 +0200
@@ -30,6 +30,7 @@
 #define	TREE_H
 
 #include "../ui/tree.h"
+#include "../common/context.h"
 
 #ifdef	__cplusplus
 extern "C" {
@@ -45,12 +46,12 @@
 
 typedef struct UiTableView {
     Widget      widget;
-    UiList      *list;
-    UiModelInfo *modelinfo;
+    UiVar       *var;
+    UiModel     *model;
 } UiTableView;
 
 void ui_table_update(UiEvent *event, UiTableView *view);
-int ui_add_icon_gadget(Widget container, UiModelInfo *modelinfo, void *data);
+int ui_add_icon_gadget(Widget container, UiModel *model, void *data);
 char* ui_type_to_string(UiModelType type, void *data, Boolean *free);
 
 void ui_table_action_callback(