Index: act.c
===================================================================
--- act.c	(revision 30970)
+++ act.c	(revision 30971)
@@ -86,8 +86,8 @@
 /* DOC: swapsides.html */
 fgw_error_t pcb_act_SwapSides(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
-	pcb_layergrp_id_t active_group = pcb_layer_get_group(PCB, pcb_layer_stack[0]);
-	pcb_layergrp_id_t comp_group = -1, solder_group = -1;
+	rnd_layergrp_id_t active_group = pcb_layer_get_group(PCB, pcb_layer_stack[0]);
+	rnd_layergrp_id_t comp_group = -1, solder_group = -1;
 	rnd_bool comp_on = pcb_false, solder_on = pcb_false;
 	rnd_rnd_box_t vb;
 	rnd_coord_t x, y;
@@ -116,7 +116,7 @@
 	pcb_draw_inhibit_inc();
 	if (argc > 1) {
 		const char *a, *b = "";
-		pcb_layer_id_t lid;
+		rnd_layer_id_t lid;
 		pcb_layer_type_t lyt;
 
 		RND_PCB_ACT_CONVARG(1, FGW_STR, SwapSides, a = argv[1].val.str);
Index: layer_menu.c
===================================================================
--- layer_menu.c	(revision 30970)
+++ layer_menu.c	(revision 30971)
@@ -57,7 +57,7 @@
 	pcb_menu_prop_t props;
 	char act[256], chk[256];
 	int idx, max_ml, sect;
-	pcb_layergrp_id_t gid;
+	rnd_layergrp_id_t gid;
 	const pcb_menu_layers_t *ml;
 
 	memset(&props, 0, sizeof(props));
@@ -137,7 +137,7 @@
 				continue;
 
 			for(n = g->len-1; n >= 0; n--) {
-				pcb_layer_id_t lid = g->lid[n];
+				rnd_layer_id_t lid = g->lid[n];
 				pcb_layer_t *l = pcb_get_layer(PCB->Data, lid);
 				pcb_layer_type_t lyt = pcb_layer_flags_(l);
 
@@ -169,7 +169,7 @@
 	*end = '\0';
 }
 
-static void custom_layer_attr_key(pcb_layer_t *l, pcb_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, pcb_menu_prop_t *keyprops, char *path, char *end, int len_avail)
 {
 	char *key = rnd_attribute_get(&l->Attributes, attrname);
 	if (key != NULL) {
@@ -188,7 +188,7 @@
 	int len_avail = 125;
 	char *end = path + plen;
 	char act[256];
-	pcb_layer_id_t lid;
+	rnd_layer_id_t lid;
 	pcb_layer_t *l;
 	pcb_menu_prop_t keyprops;
 
Index: layersel.c
===================================================================
--- layersel.c	(revision 30970)
+++ layersel.c	(revision 30971)
@@ -156,13 +156,13 @@
 typedef struct {
 	int wopen, wclosed;
 	layersel_ctx_t *ls;
-	pcb_layergrp_id_t gid;
+	rnd_layergrp_id_t gid;
 	virt_grp_id_t vid;
 	unsigned int is_open:1;
 } ls_group_t;
 
 struct layersel_ctx_s {
-	pcb_hid_dad_subdialog_t sub;
+	rnd_hid_dad_subdialog_t sub;
 	int sub_inited;
 	int lock_vis, lock_sel;
 	int w_last_sel, w_last_sel_closed, w_last_unsel_closed;
@@ -197,7 +197,7 @@
 	return *res;
 }
 
-static ls_group_t *lgs_get_real(layersel_ctx_t *ls, pcb_layergrp_id_t gid, int alloc)
+static ls_group_t *lgs_get_real(layersel_ctx_t *ls, rnd_layergrp_id_t gid, int alloc)
 {
 	ls_group_t *lgs = lgs_get_(ls, gid+LGS_max, alloc);
 	lgs->gid = gid;
@@ -262,7 +262,7 @@
 
 	if (lys->ly != NULL) {
 		if (lys->grp_vis) {
-			pcb_layer_id_t lid = lys->ly - PCB->Data->Layer;
+			rnd_layer_id_t lid = lys->ly - PCB->Data->Layer;
 			pcb_layervis_change_group_vis(&PCB->hidlib, lid, 1, 1);
 		}
 		else {
@@ -288,7 +288,7 @@
 	locked_layersel(lys->ls, lys->wlab, lys->wunsel_closed, lys->wsel_closed);
 }
 
-static void layer_sel_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void layer_sel_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	layer_select(attr->user_data);
 }
@@ -330,12 +330,12 @@
 	}
 }
 
-static void all_open_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void all_open_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	all_open_close(1);
 }
 
-static void all_close_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void all_close_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	all_open_close(0);
 }
@@ -346,8 +346,8 @@
 static void ensure_visible_current(layersel_ctx_t *ls)
 {
 	pcb_layer_t *ly;
-	pcb_layer_id_t lid;
-	pcb_layergrp_id_t gid;
+	rnd_layer_id_t lid;
+	rnd_layergrp_id_t gid;
 	pcb_layer_t *l;
 	ls_layer_t *lys;
 	int repeat = 0;
@@ -393,7 +393,7 @@
 }
 
 
-static void layer_vis_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void layer_vis_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	ls_layer_t *lys = attr->user_data;
 	rnd_bool *vis;
@@ -406,7 +406,7 @@
 		return;
 
 	if (lys->grp_vis) {
-		pcb_layer_id_t lid = lys->ly - PCB->Data->Layer;
+		rnd_layer_id_t lid = lys->ly - PCB->Data->Layer;
 		pcb_layervis_change_group_vis(&PCB->hidlib, lid, !*vis, 1);
 	}
 	else {
@@ -420,7 +420,7 @@
 	pcb_hid_redraw(PCB);
 }
 
-static void layer_right_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void layer_right_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	ls_layer_t *lys = attr->user_data;
 
@@ -433,8 +433,8 @@
 	rnd_actionva(&PCB->hidlib, "Popup", "layer", NULL);
 }
 
-extern pcb_layergrp_id_t pcb_actd_EditGroup_gid;
-static void group_right_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+extern rnd_layergrp_id_t pcb_actd_EditGroup_gid;
+static void group_right_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	ls_group_t *grp = attr->user_data;
 	if (grp->gid < 0)
@@ -444,7 +444,7 @@
 }
 
 
-static void group_open_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void group_open_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	ls_group_t *lgs = attr->user_data;
 	lgs->is_open = !lgs->is_open;
@@ -645,7 +645,7 @@
 /* Editable layer groups that are part of the stack */
 static void layersel_create_stack(layersel_ctx_t *ls, pcb_board_t *pcb)
 {
-	pcb_layergrp_id_t gid;
+	rnd_layergrp_id_t gid;
 	pcb_layergrp_t *g;
 	rnd_cardinal_t created = 0;
 
@@ -666,7 +666,7 @@
 /* Editable layer groups that are not part of the stack */
 static void layersel_create_global(layersel_ctx_t *ls, pcb_board_t *pcb)
 {
-	pcb_layergrp_id_t gid;
+	rnd_layergrp_id_t gid;
 	pcb_layergrp_t *g;
 	rnd_cardinal_t created = 0;
 
Index: rendering.c
===================================================================
--- rendering.c	(revision 30970)
+++ rendering.c	(revision 30971)
@@ -31,9 +31,9 @@
 #include "funchash_core.h"
 #include "layer.h"
 
-static int (*gui_set_layer_group)(pcb_hid_t *hid, pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform);
+static int (*gui_set_layer_group)(rnd_hid_t *hid, rnd_layergrp_id_t group, const char *purpose, int purpi, rnd_layer_id_t layer, unsigned int flags, int is_empty, rnd_xform_t **xform);
 
-static int common_set_layer_group(pcb_hid_t *hid, pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform)
+static int common_set_layer_group(rnd_hid_t *hid, rnd_layergrp_id_t group, const char *purpose, int purpi, rnd_layer_id_t layer, unsigned int flags, int is_empty, rnd_xform_t **xform)
 {
 	int idx = group;
 	if (idx >= 0 && idx < pcb_max_group(PCB)) {
@@ -77,7 +77,7 @@
 	return 0;
 }
 
-static int pcbui_set_layer_group(pcb_hid_t *hid, pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform)
+static int pcbui_set_layer_group(rnd_hid_t *hid, rnd_layergrp_id_t group, const char *purpose, int purpi, rnd_layer_id_t layer, unsigned int flags, int is_empty, rnd_xform_t **xform)
 {
 	int res;
 
Index: routest.c
===================================================================
--- routest.c	(revision 30970)
+++ routest.c	(revision 30971)
@@ -42,7 +42,7 @@
 #define MAX_STYLES 64
 
 typedef struct {
-	pcb_hid_dad_subdialog_t sub;
+	rnd_hid_dad_subdialog_t sub;
 	int sub_inited, last_len;
 	int whbox[MAX_STYLES], wchk[MAX_STYLES], wlab[MAX_STYLES];
 } rst_ctx_t;
@@ -83,7 +83,7 @@
 static void rst_force_update_chk_and_dlg()
 {
 	int n, target = pcb_route_style_lookup(&PCB->RouteStyle, conf_core.design.line_thickness, conf_core.design.via_thickness, conf_core.design.via_drilling_hole, conf_core.design.clearance, NULL);
-	pcb_hid_attr_val_t hv;
+	rnd_hid_attr_val_t hv;
 
 	for(n = 0; n < vtroutestyle_len(&PCB->RouteStyle); n++) {
 		hv.lng = (n == target);
@@ -103,7 +103,7 @@
 		int n, target;
 		target = pcb_route_style_lookup(&PCB->RouteStyle, conf_core.design.line_thickness, conf_core.design.via_thickness, conf_core.design.via_drilling_hole, conf_core.design.clearance, NULL);
 		for(n = 0; n < vtroutestyle_len(&PCB->RouteStyle); n++) {
-			pcb_hid_attr_val_t hv;
+			rnd_hid_attr_val_t hv;
 
 			hv.lng = (n == target);
 			if (rst.sub.dlg[rst.wlab[n]].val.lng != hv.lng)
@@ -123,7 +123,7 @@
 	rst_lock--;
 }
 
-static void rst_select_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void rst_select_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	int n, ridx = -1;
 	for(n = 0; n < vtroutestyle_len(&PCB->RouteStyle); n++) {
@@ -138,7 +138,7 @@
 	rst_force_update_chk_and_dlg();
 }
 
-static void rst_edit_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void rst_edit_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	int target = pcb_route_style_lookup(&PCB->RouteStyle, conf_core.design.line_thickness, conf_core.design.via_thickness, conf_core.design.via_drilling_hole, conf_core.design.clearance, NULL);
 	if (target >= 0)
@@ -145,7 +145,7 @@
 		pcb_dlg_rstdlg(target);
 }
 
-static void rst_new_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void rst_new_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	int target = vtroutestyle_len(&PCB->RouteStyle);
 	pcb_route_style_t *rst = vtroutestyle_alloc_append(&PCB->RouteStyle, 1);
@@ -162,7 +162,7 @@
 	rst_updated(rst);
 }
 
-static void rst_del_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void rst_del_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	int target = pcb_route_style_lookup(&PCB->RouteStyle, conf_core.design.line_thickness, conf_core.design.via_thickness, conf_core.design.via_drilling_hole, conf_core.design.clearance, NULL);
 	if (target >= 0) {
Index: routest_dlg.c
===================================================================
--- routest_dlg.c	(revision 30970)
+++ routest_dlg.c	(revision 30971)
@@ -56,9 +56,9 @@
 static void rstdlg_pcb2dlg(int rst_idx)
 {
 	int n;
-	pcb_hid_attr_val_t hv;
+	rnd_hid_attr_val_t hv;
 	pcb_route_style_t *rst;
-	pcb_hid_attribute_t *attr;
+	rnd_hid_attribute_t *attr;
 	pcb_hid_tree_t *tree;
 	rnd_attribute_t *a;
 
@@ -114,11 +114,11 @@
 	pcb_board_set_changed_flag(1);
 }
 
-static void rst_change_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void rst_change_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	int idx = attr - rstdlg_ctx.dlg;
 	pcb_route_style_t *rst = vtroutestyle_get(&PCB->RouteStyle, rstdlg_ctx.curr, 0);
-	pcb_hid_attr_val_t hv;
+	rnd_hid_attr_val_t hv;
 
 	if (rst == NULL) {
 		rnd_message(RND_MSG_ERROR, "route style does not exist");
@@ -197,7 +197,7 @@
 	return res;
 }
 
-static void rst_add_attr_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void rst_add_attr_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	pcb_route_style_t *rst = vtroutestyle_get(&PCB->RouteStyle, rstdlg_ctx.curr, 0);
 	char *key = NULL, *val = NULL;
@@ -208,10 +208,10 @@
 	}
 }
 
-static void rst_edit_attr_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void rst_edit_attr_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	pcb_route_style_t *rst = vtroutestyle_get(&PCB->RouteStyle, rstdlg_ctx.curr, 0);
-	pcb_hid_attribute_t *treea = &rstdlg_ctx.dlg[rstdlg_ctx.wattr];
+	rnd_hid_attribute_t *treea = &rstdlg_ctx.dlg[rstdlg_ctx.wattr];
 	pcb_hid_row_t *row = pcb_dad_tree_get_selected(treea);
 	char *key, *val;
 
@@ -228,10 +228,10 @@
 	}
 }
 
-static void rst_del_attr_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void rst_del_attr_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	pcb_route_style_t *rst = vtroutestyle_get(&PCB->RouteStyle, rstdlg_ctx.curr, 0);
-	pcb_hid_attribute_t *treea = &rstdlg_ctx.dlg[rstdlg_ctx.wattr];
+	rnd_hid_attribute_t *treea = &rstdlg_ctx.dlg[rstdlg_ctx.wattr];
 	pcb_hid_row_t *row = pcb_dad_tree_get_selected(treea);
 
 	if (row == NULL)
Index: status.c
===================================================================
--- status.c	(revision 30970)
+++ status.c	(revision 30971)
@@ -45,7 +45,7 @@
 #include "status.h"
 
 typedef struct {
-	pcb_hid_dad_subdialog_t stsub, rdsub; /* st is for the bottom status line, rd is for the top readouts */
+	rnd_hid_dad_subdialog_t stsub, rdsub; /* st is for the bottom status line, rd is for the top readouts */
 	int stsub_inited, rdsub_inited;
 	int wst1, wst2, wsttxt;
 	int st_has_text;
@@ -132,7 +132,7 @@
 
 static void status_st_pcb2dlg(void)
 {
-	static pcb_hid_attr_val_t hv;
+	static rnd_hid_attr_val_t hv;
 
 	if (!status.stsub_inited)
 		return;
@@ -163,7 +163,7 @@
 
 static void status_rd_pcb2dlg(void)
 {
-	static pcb_hid_attr_val_t hv;
+	static rnd_hid_attr_val_t hv;
 	const char *s1, *s2, *s3;
 	char sep;
 
@@ -239,7 +239,7 @@
 	}
 }
 
-static void unit_change_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+static void unit_change_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
 	if (pcbhl_conf.editor.grid_unit == get_unit_struct("mm"))
 		rnd_actionva(&PCB->hidlib, "SetUnits", "mil", NULL);
@@ -265,7 +265,7 @@
 }
 
 /* append an expand-vbox to eat up excess space for center-align */
-static void vpad(pcb_hid_dad_subdialog_t *sub)
+static void vpad(rnd_hid_dad_subdialog_t *sub)
 {
 	PCB_DAD_BEGIN_VBOX(sub->dlg);
 		PCB_DAD_COMPFLAG(sub->dlg, PCB_HATF_EXPFILL | PCB_HATF_TIGHT);
@@ -351,7 +351,7 @@
 	rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, StatusSetText, text = argv[1].val.str);
 
 	if (text != NULL) {
-		pcb_hid_attr_val_t hv;
+		rnd_hid_attr_val_t hv;
 		hv.str = text;
 		pcb_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wsttxt, &hv);
 		hv.str = "";
@@ -373,7 +373,7 @@
 
 /* The following code is used for the object tooltip hints: */
 
-static void append_obj_desc(pcb_board_t *pcb, gds_t *dst, pcb_any_obj_t *obj, pcb_layergrp_id_t gid, const char *prefix)
+static void append_obj_desc(pcb_board_t *pcb, gds_t *dst, pcb_any_obj_t *obj, rnd_layergrp_id_t gid, const char *prefix)
 {
 	pcb_layergrp_t *grp;