diff -r 1f419bd32da1 -r eb5269000bc8 ui/common/context.h
--- a/ui/common/context.h	Sat Dec 07 12:14:59 2013 +0100
+++ b/ui/common/context.h	Sun Dec 08 11:20:41 2013 +0000
@@ -37,8 +37,7 @@
 extern "C" {
 #endif
 
-typedef struct UiDocument UiDocument;
-typedef struct UiVar      UiVar;
+typedef struct UiVar UiVar;
 
 struct UiContext {
     UiObject     *toplevel;
@@ -47,22 +46,16 @@
     UcxMap       *vars; // key: char*  value: UiVar*
 };
 
-struct UiDocument {
-    UcxMempool   *mempool;
-    UcxAllocator *allocator;
-    UcxMap       *vars; // key: char*  value: UiVar*
-};
-
 struct UiVar {
     void *value;
     int  type;
+    int  isextern;
 };
 
-void uic_docmgr_init();
 UiContext* uic_context(UiObject *toplevel, UcxMempool *mp);
 
 UiVar* uic_getvar(UiObject *obj, char *name);
-UiVar* uic_addplaceholder(UiObject *obj, char *name);
+void uic_rmvar(UiObject *obj, char *name);
 
 
 #ifdef	__cplusplus