Index: layersel.c
===================================================================
--- layersel.c	(revision 30980)
+++ layersel.c	(revision 30981)
@@ -279,7 +279,7 @@
 	else
 		return;
 
-	pcb_hid_redraw(PCB);
+	rnd_hid_redraw(PCB);
 
 	if (vis != NULL) {
 		lys_update_vis(lys, *vis);
@@ -417,7 +417,7 @@
 
 	ensure_visible_current(lys->ls);
 
-	pcb_hid_redraw(PCB);
+	rnd_hid_redraw(PCB);
 }
 
 static void layer_right_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
@@ -832,7 +832,7 @@
 static void layersel_build(void)
 {
 	layersel_docked_create(&layersel, PCB);
-	if (pcb_hid_dock_enter(&layersel.sub, RND_HID_DOCK_LEFT, "layersel") == 0) {
+	if (rnd_hid_dock_enter(&layersel.sub, RND_HID_DOCK_LEFT, "layersel") == 0) {
 		layersel.sub_inited = 1;
 		layersel_update_vis(&layersel, PCB);
 	}
@@ -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) && (rnd_gui->get_menu_cfg != NULL))
+	if ((RND_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL))
 		layersel_build();
 }
 
@@ -853,8 +853,8 @@
 
 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) && (rnd_gui->get_menu_cfg != NULL) && (layersel.sub_inited)) {
-		pcb_hid_dock_leave(&layersel.sub);
+	if ((RND_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL) && (layersel.sub_inited)) {
+		rnd_hid_dock_leave(&layersel.sub);
 		layersel.sub_inited = 0;
 		layersel_build();
 	}
Index: routest.c
===================================================================
--- routest.c	(revision 30980)
+++ routest.c	(revision 30981)
@@ -208,9 +208,9 @@
 
 void pcb_rst_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
-	if (PCB_HAVE_GUI_ATTR_DLG) {
+	if (RND_HAVE_GUI_ATTR_DLG) {
 		rst_docked_create();
-		if (pcb_hid_dock_enter(&rst.sub, RND_HID_DOCK_LEFT, "Route styles") == 0)
+		if (rnd_hid_dock_enter(&rst.sub, RND_HID_DOCK_LEFT, "Route styles") == 0)
 			rst.sub_inited = 1;
 	}
 	rst_update();
Index: status.c
===================================================================
--- status.c	(revision 30980)
+++ status.c	(revision 30981)
@@ -304,15 +304,15 @@
 
 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) && (rnd_gui->get_menu_cfg != NULL)) {
+	if ((RND_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) {
+		if (rnd_hid_dock_enter(&status.stsub, RND_HID_DOCK_BOTTOM, "status") == 0) {
 			status.stsub_inited = 1;
 			status_st_pcb2dlg();
 		}
 
 		status_docked_create_rd();
-		if (pcb_hid_dock_enter(&status.rdsub, RND_HID_DOCK_TOP_RIGHT, "readout") == 0) {
+		if (rnd_hid_dock_enter(&status.rdsub, RND_HID_DOCK_TOP_RIGHT, "readout") == 0) {
 			status.rdsub_inited = 1;
 			status_rd_pcb2dlg();
 		}