Index: layer_menu.c
===================================================================
--- layer_menu.c	(revision 30978)
+++ layer_menu.c	(revision 30979)
@@ -54,7 +54,7 @@
 	int plen = strlen(path);
 	int len_avail = 125;
 	char *end = path + plen;
-	pcb_menu_prop_t props;
+	rnd_menu_prop_t props;
 	char act[256], chk[256];
 	int idx, max_ml, sect;
 	rnd_layergrp_id_t gid;
@@ -169,7 +169,7 @@
 	*end = '\0';
 }
 
-static void custom_layer_attr_key(pcb_layer_t *l, rnd_layer_id_t lid, const char *attrname, const char *menu_prefix, const char *action_prefix, pcb_menu_prop_t *keyprops, char *path, char *end, int len_avail)
+static void custom_layer_attr_key(pcb_layer_t *l, rnd_layer_id_t lid, const char *attrname, const char *menu_prefix, const char *action_prefix, rnd_menu_prop_t *keyprops, char *path, char *end, int len_avail)
 {
 	char *key = rnd_attribute_get(&l->Attributes, attrname);
 	if (key != NULL) {
@@ -190,7 +190,7 @@
 	char act[256];
 	rnd_layer_id_t lid;
 	pcb_layer_t *l;
-	pcb_menu_prop_t keyprops;
+	rnd_menu_prop_t keyprops;
 
 	pcb_hid_cfg_del_anchor_menus(node, ctx->anch);
 
Index: layersel.c
===================================================================
--- layersel.c	(revision 30978)
+++ layersel.c	(revision 30979)
@@ -832,7 +832,7 @@
 static void layersel_build(void)
 {
 	layersel_docked_create(&layersel, PCB);
-	if (pcb_hid_dock_enter(&layersel.sub, PCB_HID_DOCK_LEFT, "layersel") == 0) {
+	if (pcb_hid_dock_enter(&layersel.sub, RND_HID_DOCK_LEFT, "layersel") == 0) {
 		layersel.sub_inited = 1;
 		layersel_update_vis(&layersel, PCB);
 	}
Index: routest.c
===================================================================
--- routest.c	(revision 30978)
+++ routest.c	(revision 30979)
@@ -53,7 +53,7 @@
 
 static void rst_install_menu(void *ctx, rnd_hid_cfg_t *cfg, lht_node_t *node, char *path)
 {
-	pcb_menu_prop_t props;
+	rnd_menu_prop_t props;
 	char *end = path + strlen(path);
 	char act[256], chk[256];
 	int idx;
@@ -210,7 +210,7 @@
 {
 	if (PCB_HAVE_GUI_ATTR_DLG) {
 		rst_docked_create();
-		if (pcb_hid_dock_enter(&rst.sub, PCB_HID_DOCK_LEFT, "Route styles") == 0)
+		if (pcb_hid_dock_enter(&rst.sub, RND_HID_DOCK_LEFT, "Route styles") == 0)
 			rst.sub_inited = 1;
 	}
 	rst_update();
Index: routest_dlg.c
===================================================================
--- routest_dlg.c	(revision 30978)
+++ routest_dlg.c	(revision 30979)
@@ -37,7 +37,7 @@
 
 rstdlg_ctx_t rstdlg_ctx;
 
-static void rstdlg_close_cb(void *caller_data, pcb_hid_attr_ev_t ev)
+static void rstdlg_close_cb(void *caller_data, rnd_hid_attr_ev_t ev)
 {
 	rstdlg_ctx_t *ctx = caller_data;
 
Index: status.c
===================================================================
--- status.c	(revision 30978)
+++ status.c	(revision 30979)
@@ -306,13 +306,13 @@
 {
 	if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL)) {
 		status_docked_create_st();
-		if (pcb_hid_dock_enter(&status.stsub, PCB_HID_DOCK_BOTTOM, "status") == 0) {
+		if (pcb_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, PCB_HID_DOCK_TOP_RIGHT, "readout") == 0) {
+		if (pcb_hid_dock_enter(&status.rdsub, RND_HID_DOCK_TOP_RIGHT, "readout") == 0) {
 			status.rdsub_inited = 1;
 			status_rd_pcb2dlg();
 		}