Index: excitation.c
===================================================================
--- excitation.c	(revision 30979)
+++ excitation.c	(revision 30980)
@@ -93,7 +93,7 @@
 		else
 			hv.lng = 0;
 
-		pcb_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, widx, &hv);
+		rnd_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, widx, &hv);
 	}
 }
 #endif
@@ -123,7 +123,7 @@
 		else
 			hv.dbl = 0;
 
-		pcb_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, widx, &hv);
+		rnd_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, widx, &hv);
 	}
 }
 
@@ -137,7 +137,7 @@
 		hv.str = ser_load(attrkey);
 		if (hv.str == NULL)
 			hv.str = "";
-		pcb_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, widx, &hv);
+		rnd_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, widx, &hv);
 	}
 }
 
@@ -375,8 +375,8 @@
 		exc_ctx.selected = 0;
 	}
 
-	pcb_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, exc_ctx.wtab, &hv);
-	pcb_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, exc_ctx.wselector, &hv);
+	rnd_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, exc_ctx.wtab, &hv);
+	rnd_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, exc_ctx.wselector, &hv);
 	if (setattr) {
 		const char *orig = rnd_attribute_get(&PCB->Attributes, "openems::excitation::type");
 		if ((orig == NULL) || (strcmp(orig, excitations[exc_ctx.selected].name) != 0)) {
Index: mesh.c
===================================================================
--- mesh.c	(revision 30979)
+++ mesh.c	(revision 30980)
@@ -969,7 +969,7 @@
 	FILE *f;
 	gds_t tmp;
 
-	fname = pcb_gui->fileselect(pcb_gui, "Save mesh settings...",
+	fname = rnd_gui->fileselect(rnd_gui, "Save mesh settings...",
 															"Picks file for saving mesh settings.\n",
 															default_file, ".lht", NULL, "mesh", RND_HID_FSD_MAY_NOT_EXIST, NULL);
 	if (fname == NULL)
@@ -999,7 +999,7 @@
 	char *fname = NULL;
 	FILE *f;
 
-	fname = pcb_gui->fileselect(pcb_gui, "Load mesh settings...",
+	fname = rnd_gui->fileselect(rnd_gui, "Load mesh settings...",
 															"Picks file for loading mesh settings from.\n",
 															default_file, ".lht", NULL, "mesh", RND_HID_FSD_READ, NULL);
 	if (fname == NULL)
@@ -1042,7 +1042,7 @@
 	mesh.ui_layer_xy->name = rnd_strdup(mesh.ui_name_xy);
 	rnd_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL);
 
-	pcb_gui->invalidate_all(pcb_gui);
+	rnd_gui->invalidate_all(rnd_gui);
 }
 
 pcb_mesh_t *pcb_mesh_get(const char *name)