Index: act.c
===================================================================
--- act.c	(revision 30979)
+++ act.c	(revision 30980)
@@ -62,7 +62,7 @@
 		if (rnd_strcasecmp(vp, "selected") == 0) {
 			rnd_rnd_box_t sb;
 			if (pcb_get_selection_bbox(&sb, PCB->Data) > 0)
-				pcb_gui->zoom_win(pcb_gui, sb.X1, sb.Y1, sb.X2, sb.Y2, 1);
+				rnd_gui->zoom_win(rnd_gui, sb.X1, sb.Y1, sb.X2, sb.Y2, 1);
 			else
 				rnd_message(RND_MSG_ERROR, "Can't zoom to selection: nothing selected\n");
 			return 0;
@@ -71,7 +71,7 @@
 		if (rnd_strcasecmp(vp, "found") == 0) {
 			rnd_rnd_box_t sb;
 			if (pcb_get_found_bbox(&sb, PCB->Data) > 0)
-				pcb_gui->zoom_win(pcb_gui, sb.X1, sb.Y1, sb.X2, sb.Y2, 1);
+				rnd_gui->zoom_win(rnd_gui, sb.X1, sb.Y1, sb.X2, sb.Y2, 1);
 			else
 				rnd_message(RND_MSG_ERROR, "Can't zoom to 'found': nothing found\n");
 			return 0;
@@ -100,7 +100,7 @@
 	x = pcb_crosshair.X;
 	y = pcb_crosshair.Y;
 
-	pcb_gui->view_get(pcb_gui, &vb);
+	rnd_gui->view_get(rnd_gui, &vb);
 	xcent = (double)(vb.X1 + vb.X2)/2.0;
 	ycent = (double)(vb.Y1 + vb.Y2)/2.0;
 	xoffs = xcent - x;
@@ -175,10 +175,10 @@
 	pcb_draw_inhibit_dec();
 
 /*rnd_trace("-jump-> %mm;%mm -> %mm;%mm\n", x, y, (rnd_coord_t)(x + xoffs), (rnd_coord_t)(y + yoffs));*/
-	pcb_gui->pan(pcb_gui, rnd_round(x + xoffs), rnd_round(y + yoffs), 0);
-	pcb_gui->set_crosshair(pcb_gui, x, y, HID_SC_PAN_VIEWPORT);
+	rnd_gui->pan(rnd_gui, rnd_round(x + xoffs), rnd_round(y + yoffs), 0);
+	rnd_gui->set_crosshair(rnd_gui, x, y, HID_SC_PAN_VIEWPORT);
 
-	pcb_gui->invalidate_all(pcb_gui);
+	rnd_gui->invalidate_all(rnd_gui);
 
 	RND_ACT_IRES(0);
 	return 0;
@@ -255,9 +255,9 @@
 	}
 
 	if (*name != '\0')
-		r = pcb_gui->open_popup(pcb_gui, name);
+		r = rnd_gui->open_popup(rnd_gui, name);
 	if ((r != 0) && (*name2 != '\0'))
-		r = pcb_gui->open_popup(pcb_gui, name2);
+		r = rnd_gui->open_popup(rnd_gui, name2);
 
 	RND_ACT_IRES(r);
 	return 0;
Index: infobar.c
===================================================================
--- infobar.c	(revision 30979)
+++ infobar.c	(revision 30980)
@@ -49,7 +49,7 @@
 static void infobar_tick(rnd_hidval_t user_data)
 {
 	if (conf_core.rc.file_changed_interval > 0) {
-		infobar_timer = pcb_gui->add_timer(pcb_gui, infobar_tick, (conf_core.rc.file_changed_interval * 1000.0), user_data);
+		infobar_timer = rnd_gui->add_timer(rnd_gui, infobar_tick, (conf_core.rc.file_changed_interval * 1000.0), user_data);
 		last_interval = conf_core.rc.file_changed_interval;
 		infobar_timer_active = 1;
 	}
@@ -71,8 +71,8 @@
 {
 	if ((!infobar_gui_inited) || (last_interval == conf_core.rc.file_changed_interval))
 		return;
-	if ((infobar_timer_active) && (pcb_gui != NULL) && (pcb_gui->stop_timer != NULL)) {
-		pcb_gui->stop_timer(pcb_gui, infobar_timer);
+	if ((infobar_timer_active) && (rnd_gui != NULL) && (rnd_gui->stop_timer != NULL)) {
+		rnd_gui->stop_timer(rnd_gui, infobar_timer);
 		infobar_timer_active = 0;
 	}
 	infobar_tick(infobar_timer);
Index: layer_menu.c
===================================================================
--- layer_menu.c	(revision 30979)
+++ layer_menu.c	(revision 30980)
@@ -83,12 +83,12 @@
 			sprintf(chk, "ChkView(ui:%d)", idx);
 
 			pcb_snprintf(end, len_avail, "  %s", ly->name);
-			pcb_gui->create_menu(pcb_gui, path, &props);
+			rnd_gui->create_menu(rnd_gui, path, &props);
 		}
 
 		props.checked = NULL;
 		pcb_snprintf(end, len_avail, "[UI]");
-		pcb_gui->create_menu(pcb_gui, path, &props);
+		rnd_gui->create_menu(rnd_gui, path, &props);
 	}
 
 	/* menu-only virtual layers; have to go reverse to keep order because this will insert items */
@@ -107,12 +107,12 @@
 			sprintf(chk, "ChkLayer(%s)", ml->abbrev);
 		}
 		pcb_snprintf(end, len_avail, "  %s", ml->name);
-		pcb_gui->create_menu(pcb_gui, path, &props);
+		rnd_gui->create_menu(rnd_gui, path, &props);
 	}
 
 	props.checked = NULL;
 	pcb_snprintf(end, len_avail, "[virtual]");
-	pcb_gui->create_menu(pcb_gui, path, &props);
+	rnd_gui->create_menu(rnd_gui, path, &props);
 
 
 	/* have to go reverse to keep order because this will insert items */
@@ -124,7 +124,7 @@
 		props.checked = NULL;
 		*act = '\0';
 		*chk = '\0';
-		pcb_gui->create_menu(pcb_gui, path, &props);
+		rnd_gui->create_menu(rnd_gui, path, &props);
 
 		for(gid = pcb_max_group(PCB)-1; gid >= 0; gid--) {
 			pcb_layergrp_t *g = &PCB->LayerGroups.grp[gid];
@@ -153,7 +153,7 @@
 					sprintf(chk, "ChkLayer(%ld)", lid+1);
 				}
 				pcb_snprintf(end, len_avail, "  %s", l->name);
-				pcb_gui->create_menu(pcb_gui, path, &props);
+				rnd_gui->create_menu(rnd_gui, path, &props);
 			}
 
 			props.foreground = NULL;
@@ -160,7 +160,7 @@
 			props.background = NULL;
 			props.checked = NULL;
 			pcb_snprintf(end, len_avail, "[%s]", g->name);
-			pcb_gui->create_menu(pcb_gui, path, &props);
+			rnd_gui->create_menu(rnd_gui, path, &props);
 		}
 	}
 
@@ -176,7 +176,7 @@
 		keyprops->accel = key;
 		pcb_snprintf(end, len_avail, "%s %ld:%s", menu_prefix, lid+1, l->name);
 		sprintf((char *)keyprops->action, "%s(%ld)", action_prefix, lid+1);
-		pcb_gui->create_menu(pcb_gui, path, keyprops);
+		rnd_gui->create_menu(rnd_gui, path, keyprops);
 	}
 }
 
@@ -243,16 +243,16 @@
 {
 	rnd_hidval_t timerdata;
 
-	if ((pcb_gui == NULL) || (!pcb_gui->gui))
+	if ((rnd_gui == NULL) || (!rnd_gui->gui))
 		return;
 
 	if (layer_menu_install_timer_active) {
-		pcb_gui->stop_timer(pcb_gui, layer_menu_install_timer);
+		rnd_gui->stop_timer(rnd_gui, layer_menu_install_timer);
 		layer_menu_install_timer_active = 0;
 	}
 
 	timerdata.ptr = NULL;
-	layer_menu_install_timer = pcb_gui->add_timer(pcb_gui, layer_install_menu_cb, MENU_REFRESH_TIME_MS, timerdata);
+	layer_menu_install_timer = rnd_gui->add_timer(rnd_gui, layer_install_menu_cb, MENU_REFRESH_TIME_MS, timerdata);
 	layer_menu_install_timer_active = 1;
 
 }
@@ -260,14 +260,14 @@
 void pcb_layer_menu_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	layer_install_menu();
-	if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL))
-		pcb_gui->update_menu_checkbox(pcb_gui, NULL);
+	if ((rnd_gui != NULL) && (rnd_gui->update_menu_checkbox != NULL))
+		rnd_gui->update_menu_checkbox(rnd_gui, NULL);
 }
 
 void pcb_layer_menu_vis_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
-	if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL))
-		pcb_gui->update_menu_checkbox(pcb_gui, NULL);
+	if ((rnd_gui != NULL) && (rnd_gui->update_menu_checkbox != NULL))
+		rnd_gui->update_menu_checkbox(rnd_gui, NULL);
 }
 
 
@@ -288,15 +288,15 @@
 
 /*	rnd_trace("************ layer key update ev!\n");*/
 
-	if ((pcb_gui == NULL) || (!pcb_gui->gui))
+	if ((rnd_gui == NULL) || (!rnd_gui->gui))
 		return;
 
 	if (layer_menu_key_timer_active) {
-		pcb_gui->stop_timer(pcb_gui, layer_menu_key_timer);
+		rnd_gui->stop_timer(rnd_gui, layer_menu_key_timer);
 		layer_menu_key_timer_active = 0;
 	}
 
 	timerdata.ptr = NULL;
-	layer_menu_key_timer = pcb_gui->add_timer(pcb_gui, timed_layer_menu_key_update_cb, MENU_REFRESH_TIME_MS, timerdata);
+	layer_menu_key_timer = rnd_gui->add_timer(rnd_gui, timed_layer_menu_key_update_cb, MENU_REFRESH_TIME_MS, timerdata);
 	layer_menu_key_timer_active = 1;
 }
Index: layersel.c
===================================================================
--- layersel.c	(revision 30979)
+++ layersel.c	(revision 30980)
@@ -226,17 +226,17 @@
 
 	ls->lock_sel = 1;
 	if (ls->w_last_sel != 0) {
-		pcb_gui->attr_dlg_widget_state(ls->sub.dlg_hid_ctx, ls->w_last_sel, 1);
-		pcb_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_unsel_closed, 0);
-		pcb_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_sel_closed, 1);
+		rnd_gui->attr_dlg_widget_state(ls->sub.dlg_hid_ctx, ls->w_last_sel, 1);
+		rnd_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_unsel_closed, 0);
+		rnd_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_sel_closed, 1);
 	}
 	ls->w_last_sel = wid;
 	ls->w_last_sel_closed = wid_sel_closed;
 	ls->w_last_unsel_closed = wid_unsel_closed;
 	if (ls->w_last_sel != 0) {
-		pcb_gui->attr_dlg_widget_state(ls->sub.dlg_hid_ctx, ls->w_last_sel, 2);
-		pcb_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_unsel_closed, 1);
-		pcb_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_sel_closed, 0);
+		rnd_gui->attr_dlg_widget_state(ls->sub.dlg_hid_ctx, ls->w_last_sel, 2);
+		rnd_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_unsel_closed, 1);
+		rnd_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, ls->w_last_sel_closed, 0);
 	}
 	ls->lock_sel = 0;
 }
@@ -250,10 +250,10 @@
 
 static void lys_update_vis(ls_layer_t *lys, pcb_bool_t vis)
 {
-	pcb_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_on_open, !vis);
-	pcb_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_on_closed, !vis);
-	pcb_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_off_open, !!vis);
-	pcb_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_off_closed, !!vis);
+	rnd_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_on_open, !vis);
+	rnd_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_on_closed, !vis);
+	rnd_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_off_open, !!vis);
+	rnd_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_off_closed, !!vis);
 }
 
 static void layer_select(ls_layer_t *lys)
@@ -313,8 +313,8 @@
 {
 	group_sync_core(PCB, lgs, 0);
 
-	pcb_gui->attr_dlg_widget_hide(lgs->ls->sub.dlg_hid_ctx, lgs->wopen, !lgs->is_open);
-	pcb_gui->attr_dlg_widget_hide(lgs->ls->sub.dlg_hid_ctx, lgs->wclosed, !!lgs->is_open);
+	rnd_gui->attr_dlg_widget_hide(lgs->ls->sub.dlg_hid_ctx, lgs->wopen, !lgs->is_open);
+	rnd_gui->attr_dlg_widget_hide(lgs->ls->sub.dlg_hid_ctx, lgs->wclosed, !!lgs->is_open);
 }
 
 static void all_open_close(int is_open)
@@ -816,8 +816,8 @@
 			continue;
 
 		group_sync_core(pcb, *lgs, 1);
-		pcb_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, (*lgs)->wopen, !(*lgs)->is_open);
-		pcb_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, (*lgs)->wclosed, (*lgs)->is_open);
+		rnd_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, (*lgs)->wopen, !(*lgs)->is_open);
+		rnd_gui->attr_dlg_widget_hide(ls->sub.dlg_hid_ctx, (*lgs)->wclosed, (*lgs)->is_open);
 	}
 
 	{ /* ifPCB_CURRLAYER(PCB) is not selected, select it */
@@ -840,7 +840,7 @@
 
 void pcb_layersel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
-	if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL))
+	if ((PCB_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL))
 		layersel_build();
 }
 
@@ -853,7 +853,7 @@
 
 void pcb_layersel_stack_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
-	if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL) && (layersel.sub_inited)) {
+	if ((PCB_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL) && (layersel.sub_inited)) {
 		pcb_hid_dock_leave(&layersel.sub);
 		layersel.sub_inited = 0;
 		layersel_build();
Index: rendering.c
===================================================================
--- rendering.c	(revision 30979)
+++ rendering.c	(revision 30980)
@@ -93,7 +93,7 @@
 static void pcb_rendering_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	/* hook in our dispatcher */
-	gui_set_layer_group = pcb_gui->set_layer_group;
-	pcb_gui->set_layer_group = pcbui_set_layer_group;
+	gui_set_layer_group = rnd_gui->set_layer_group;
+	rnd_gui->set_layer_group = pcbui_set_layer_group;
 }
 
Index: routest.c
===================================================================
--- routest.c	(revision 30979)
+++ routest.c	(revision 30980)
@@ -75,7 +75,7 @@
 		sprintf(act, "RouteStyle(%d)", idx+1); /* for historical reasons this action counts from 1 */
 		sprintf(chk, "ChkRst(%d)", idx);
 		strcpy(end, PCB->RouteStyle.array[idx].name);
-		pcb_gui->create_menu(pcb_gui, path, &props);
+		rnd_gui->create_menu(rnd_gui, path, &props);
 	}
 }
 
@@ -87,7 +87,7 @@
 
 	for(n = 0; n < vtroutestyle_len(&PCB->RouteStyle); n++) {
 		hv.lng = (n == target);
-		pcb_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wchk[n], &hv);
+		rnd_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wchk[n], &hv);
 	}
 	rstdlg_pcb2dlg(target);
 }
@@ -107,16 +107,16 @@
 
 			hv.lng = (n == target);
 			if (rst.sub.dlg[rst.wlab[n]].val.lng != hv.lng)
-				pcb_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wchk[n], &hv);
+				rnd_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wchk[n], &hv);
 
 			hv.str = PCB->RouteStyle.array[n].name;
 			if (strcmp(rst.sub.dlg[rst.wlab[n]].name, hv.str) != 0)
-				pcb_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wlab[n], &hv);
+				rnd_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wlab[n], &hv);
 		}
 		if (vtroutestyle_len(&PCB->RouteStyle) != rst.last_len) {
 			rst.last_len = vtroutestyle_len(&PCB->RouteStyle);
 			for(n = 0; n < MAX_STYLES; n++)
-				pcb_gui->attr_dlg_widget_hide(rst.sub.dlg_hid_ctx, rst.whbox[n], n >= rst.last_len);
+				rnd_gui->attr_dlg_widget_hide(rst.sub.dlg_hid_ctx, rst.whbox[n], n >= rst.last_len);
 		}
 		rstdlg_pcb2dlg(target);
 	}
@@ -218,9 +218,9 @@
 
 void pcb_rst_update_conf(rnd_conf_native_t *cfg, int arr_idx)
 {
-	if ((PCB != NULL) && (pcb_gui != NULL)) {
-		if (pcb_gui->update_menu_checkbox != NULL)
-			pcb_gui->update_menu_checkbox(pcb_gui, NULL);
+	if ((PCB != NULL) && (rnd_gui != NULL)) {
+		if (rnd_gui->update_menu_checkbox != NULL)
+			rnd_gui->update_menu_checkbox(rnd_gui, NULL);
 		if (rst.sub_inited)
 			rst_force_update_chk_and_dlg();
 	}
Index: routest_dlg.c
===================================================================
--- routest_dlg.c	(revision 30979)
+++ routest_dlg.c	(revision 30980)
@@ -74,25 +74,25 @@
 	rst = vtroutestyle_get(&PCB->RouteStyle, rst_idx, 0);
 
 	hv.str = rst->name;
-	pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wname, &hv);
+	rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wname, &hv);
 
 	hv.crd = rst->Thick;
-	pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wlineth, &hv);
+	rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wlineth, &hv);
 
 	hv.crd = rst->textt;
-	pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wtxtth, &hv);
+	rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wtxtth, &hv);
 
 	hv.crd = rst->texts;
-	pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wtxtscale, &hv);
+	rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wtxtscale, &hv);
 
 	hv.crd = rst->Clearance;
-	pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wclr, &hv);
+	rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wclr, &hv);
 
 	hv.crd = rst->Hole;
-	pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviahole, &hv);
+	rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviahole, &hv);
 
 	hv.crd = rst->Diameter;
-	pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviaring, &hv);
+	rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviaring, &hv);
 
 	pcb_dad_tree_clear(tree);
 
@@ -144,7 +144,7 @@
 		rst->Hole = attr->val.crd;
 		if (rst->Hole * 1.1 >= rstdlg_ctx.dlg[rstdlg_ctx.wviaring].val.crd) {
 			hv.crd = rst->Hole * 1.1;
-			pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviaring, &hv);
+			rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviaring, &hv);
 			rst->Diameter = hv.crd;
 		}
 	}
@@ -152,7 +152,7 @@
 		rst->Diameter = attr->val.crd;
 		if (rst->Diameter / 1.1 <= rstdlg_ctx.dlg[rstdlg_ctx.wviahole].val.crd) {
 			hv.crd = rst->Diameter / 1.1;
-			pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviahole, &hv);
+			rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviahole, &hv);
 			rst->Hole = hv.crd;
 		}
 
Index: status.c
===================================================================
--- status.c	(revision 30979)
+++ status.c	(revision 30980)
@@ -61,7 +61,7 @@
 {
 	char kbd[128];
 	const char *flag = conf_core.editor.all_direction_lines ? "*" : (conf_core.editor.line_refraction == 0 ? "X" : (conf_core.editor.line_refraction == 1 ? "_/" : "\\_"));
-	pcb_hid_cfg_keys_t *kst = pcb_gui->key_state;
+	pcb_hid_cfg_keys_t *kst = rnd_gui->key_state;
 
 	if (kst != NULL) {
 		if (kst->seq_len_action > 0) {
@@ -141,24 +141,24 @@
 	build_st_line1();
 	if (!conf_core.appearance.compact) {
 		build_st_line2();
-		pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst2, 1);
+		rnd_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst2, 1);
 	}
 	hv.str = status.buf.array;
-	pcb_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst1, &hv);
+	rnd_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst1, &hv);
 
 	if (conf_core.appearance.compact) {
 		status.buf.used = 0;
 		build_st_line2();
 		hv.str = status.buf.array;
-		pcb_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst2, &hv);
+		rnd_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst2, &hv);
 		if (!status.st_has_text)
-			pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst2, 0);
+			rnd_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst2, 0);
 	}
 
 	status.buf.used = 0;
 	build_st_help();
-	pcb_gui->attr_dlg_set_help(status.stsub.dlg_hid_ctx, status.wst1, status.buf.array);
-	pcb_gui->attr_dlg_set_help(status.stsub.dlg_hid_ctx, status.wst2, status.buf.array);
+	rnd_gui->attr_dlg_set_help(status.stsub.dlg_hid_ctx, status.wst1, status.buf.array);
+	rnd_gui->attr_dlg_set_help(status.stsub.dlg_hid_ctx, status.wst2, status.buf.array);
 }
 
 static void status_rd_pcb2dlg(void)
@@ -175,20 +175,20 @@
 		status.buf.used = 0;
 		pcb_append_printf(&status.buf, "%m+%-mS", pcbhl_conf.editor.grid_unit->allow, pcb_crosshair.X);
 		hv.str = status.buf.array;
-		pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[0], &hv);
+		rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[0], &hv);
 
 		status.buf.used = 0;
 		pcb_append_printf(&status.buf, "%m+%-mS", pcbhl_conf.editor.grid_unit->allow, pcb_crosshair.Y);
 		hv.str = status.buf.array;
-		pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[1], &hv);
-		pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd2[1], 0);
+		rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[1], &hv);
+		rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd2[1], 0);
 	}
 	else {
 		status.buf.used = 0;
 		pcb_append_printf(&status.buf, "%m+%-mS %-mS", pcbhl_conf.editor.grid_unit->allow, pcb_crosshair.X, pcb_crosshair.Y);
 		hv.str = status.buf.array;
-		pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[0], &hv);
-		pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd2[1], 1);
+		rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[0], &hv);
+		rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd2[1], 1);
 	}
 
 	/* distance readout (left side box) */
@@ -216,18 +216,18 @@
 	}
 
 	hv.str = s1;
-	pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[0], &hv);
+	rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[0], &hv);
 	if (conf_core.appearance.compact) {
 		hv.str = s2;
-		pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[1], &hv);
+		rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[1], &hv);
 		hv.str = s3;
-		pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[2], &hv);
-		pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[1], 0);
-		pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[2], 0);
+		rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[2], &hv);
+		rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[1], 0);
+		rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[2], 0);
 	}
 	else {
-		pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[1], 1);
-		pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[2], 1);
+		rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[1], 1);
+		rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[2], 1);
 	}
 
 	if (status.last_unit != pcbhl_conf.editor.grid_unit) {
@@ -234,7 +234,7 @@
 		status.lock++;
 		status.last_unit = pcbhl_conf.editor.grid_unit;
 		hv.str = pcbhl_conf.editor.grid_unit->suffix;
-		pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrdunit, &hv);
+		rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrdunit, &hv);
 		status.lock--;
 	}
 }
@@ -304,7 +304,7 @@
 
 void pcb_status_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
-	if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL)) {
+	if ((PCB_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL)) {
 		status_docked_create_st();
 		if (pcb_hid_dock_enter(&status.stsub, RND_HID_DOCK_BOTTOM, "status") == 0) {
 			status.stsub_inited = 1;
@@ -353,17 +353,17 @@
 	if (text != NULL) {
 		rnd_hid_attr_val_t hv;
 		hv.str = text;
-		pcb_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wsttxt, &hv);
+		rnd_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wsttxt, &hv);
 		hv.str = "";
-		pcb_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst2, &hv);
-		pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst1, 1);
-		pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wsttxt, 0);
+		rnd_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst2, &hv);
+		rnd_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst1, 1);
+		rnd_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wsttxt, 0);
 		status.st_has_text = 1;
 	}
 	else {
 		status.st_has_text = 0;
-		pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst1, 0);
-		pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wsttxt, 1);
+		rnd_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst1, 0);
+		rnd_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wsttxt, 1);
 		status_st_pcb2dlg();
 	}
 
Index: title.c
===================================================================
--- title.c	(revision 30979)
+++ title.c	(revision 30980)
@@ -38,7 +38,7 @@
 {
 	const char *filename, *name;
 
-	if ((pcb_gui == NULL) || (pcb_gui->set_top_title == NULL) || (!gui_inited))
+	if ((rnd_gui == NULL) || (rnd_gui->set_top_title == NULL) || (!gui_inited))
 		return;
 
 	if ((PCB->hidlib.name == NULL) || (*PCB->hidlib.name == '\0'))
@@ -53,7 +53,7 @@
 
 	title_buf.used = 0;
 	pcb_append_printf(&title_buf, "%s%s (%s) - %s - pcb-rnd", PCB->Changed ? "*" : "", name, filename, PCB->is_footprint ? "footprint" : "board");
-	pcb_gui->set_top_title(pcb_gui, title_buf.array);
+	rnd_gui->set_top_title(rnd_gui, title_buf.array);
 }
 
 static void pcb_title_board_changed_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])