Index: trunk/src_plugins/cam/cam_compile.h
===================================================================
--- trunk/src_plugins/cam/cam_compile.h	(revision 30901)
+++ trunk/src_plugins/cam/cam_compile.h	(revision 30902)
@@ -73,7 +73,7 @@
 #include <genvector/genvector_undef.h>
 
 typedef struct {
-	pcb_hidlib_t *hidlib;
+	rnd_hidlib_t *hidlib;
 	char *prefix;            /* strdup'd file name prefix from the last prefix command */
 	pcb_hid_t *exporter;
 	unsigned partial:1;      /* when 1, there are objects marked with the EXPORTSEL flag */
Index: trunk/src_plugins/cam/cam_gui.c
===================================================================
--- trunk/src_plugins/cam/cam_gui.c	(revision 30901)
+++ trunk/src_plugins/cam/cam_gui.c	(revision 30902)
@@ -257,7 +257,7 @@
 	PCB_DAD_END(ctx->dlg);
 }
 
-static int cam_gui(pcb_hidlib_t *hidlib, const char *arg)
+static int cam_gui(rnd_hidlib_t *hidlib, const char *arg)
 {
 	cam_dlg_t *ctx = calloc(sizeof(cam_dlg_t), 1);
 	const char *opt_hdr[] = {"key", "option value", NULL};
Index: trunk/src_plugins/ddraft/constraint.c
===================================================================
--- trunk/src_plugins/ddraft/constraint.c	(revision 30901)
+++ trunk/src_plugins/ddraft/constraint.c	(revision 30902)
@@ -171,7 +171,7 @@
 	pcb_crosshair.AttachedObject.ty = pcb_crosshair.AttachedObject.Y + dy;
 }
 
-static void cnst_enforce(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void cnst_enforce(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((pcb_crosshair.AttachedLine.State == PCB_CH_STATE_SECOND) || (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_THIRD))
 		cnst_line2(&cons);
Index: trunk/src_plugins/ddraft/ddraft.c
===================================================================
--- trunk/src_plugins/ddraft/ddraft.c	(revision 30901)
+++ trunk/src_plugins/ddraft/ddraft.c	(revision 30902)
@@ -441,7 +441,7 @@
 	return 0;
 }
 
-void ddraft_tool_draw_attached(pcb_hidlib_t *hl)
+void ddraft_tool_draw_attached(rnd_hidlib_t *hl)
 {
 	int n;
 	pcb_render->set_line_cap(pcb_crosshair.GC, pcb_cap_round);
Index: trunk/src_plugins/diag/diag.c
===================================================================
--- trunk/src_plugins/diag/diag.c	(revision 30901)
+++ trunk/src_plugins/diag/diag.c	(revision 30902)
@@ -393,7 +393,7 @@
 	return 0;
 }
 
-static void ev_ui_post(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void ev_ui_post(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 
 	if (conf_diag.plugins.diag.auto_integrity) {
Index: trunk/src_plugins/dialogs/dlg_fontsel.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_fontsel.c	(revision 30901)
+++ trunk/src_plugins/dialogs/dlg_fontsel.c	(revision 30902)
@@ -229,7 +229,7 @@
 	return 0;
 }
 
-static void fontsel_mchanged_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void fontsel_mchanged_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	fontsel_ctx_t *c;
 
@@ -240,7 +240,7 @@
 		fontsel_preview_update(c);
 }
 
-static void fontsel_bchanged_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void fontsel_bchanged_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	fontsel_ctx_t *c, *next;
 	pcb_dad_retovr_t retovr;
@@ -274,7 +274,7 @@
 	fontsel_timer = pcb_gui->add_timer(pcb_gui, fontsel_timer_cb, 500, fontsel_timer);
 }
 
-static void fontsel_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void fontsel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	fontsel_timer_cb(fontsel_timer);
 	fontsel_timer_active = 1;
Index: trunk/src_plugins/dialogs/dlg_library.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_library.c	(revision 30901)
+++ trunk/src_plugins/dialogs/dlg_library.c	(revision 30902)
@@ -726,7 +726,7 @@
 	return 0;
 }
 
-static void library_changed_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void library_changed_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if (library_ctx.active)
 		library_lib2dlg(&library_ctx);
Index: trunk/src_plugins/dialogs/dlg_netlist.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_netlist.c	(revision 30901)
+++ trunk/src_plugins/dialogs/dlg_netlist.c	(revision 30902)
@@ -454,7 +454,7 @@
 }
 
 /* update the dialog after a netlist change */
-static void pcb_dlg_netlist_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_dlg_netlist_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	netlist_ctx_t *ctx = user_data;
 	if (!ctx->active)
Index: trunk/src_plugins/dialogs/dlg_pref.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref.c	(revision 30901)
+++ trunk/src_plugins/dialogs/dlg_pref.c	(revision 30902)
@@ -335,7 +335,7 @@
 		PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, pref_ctx.wtab, lng, target_tab);
 }
 
-static void pref_ev_board_changed(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pref_ev_board_changed(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pref_ctx_t *ctx = user_data;
 	if (!pref_ctx.active)
@@ -347,7 +347,7 @@
 	pref_win_brd2dlg(ctx);
 }
 
-static void pref_ev_board_meta_changed(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pref_ev_board_meta_changed(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pref_ctx_t *ctx = user_data;
 	if (!pref_ctx.active)
Index: trunk/src_plugins/dialogs/dlg_undo.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_undo.c	(revision 30901)
+++ trunk/src_plugins/dialogs/dlg_undo.c	(revision 30902)
@@ -158,7 +158,7 @@
 }
 
 /* update the dialog after an undo operation */
-static void pcb_dlg_undo_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_dlg_undo_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	undo_ctx_t *ctx = user_data;
 	if (!ctx->active)
@@ -167,7 +167,7 @@
 }
 
 /* Check if the serial has changed and update the dialog if so */
-static void pcb_dlg_undo_ev_chk(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_dlg_undo_ev_chk(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	undo_ctx_t *ctx = user_data;
 	if (!ctx->active)
Index: trunk/src_plugins/dialogs/dlg_view.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_view.c	(revision 30901)
+++ trunk/src_plugins/dialogs/dlg_view.c	(revision 30902)
@@ -811,7 +811,7 @@
 	return 0;
 }
 
-static void view_preview_update_cb(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void view_preview_update_cb(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if (drc_gui_ctx.active)
 		view_preview_update(&drc_gui_ctx);
Index: trunk/src_plugins/drc_orig/drc_orig.c
===================================================================
--- trunk/src_plugins/drc_orig/drc_orig.c	(revision 30901)
+++ trunk/src_plugins/drc_orig/drc_orig.c	(revision 30902)
@@ -340,7 +340,7 @@
 	}
 }
 
-static void pcb_drc_orig(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_drc_orig(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pcb_view_list_t *lst = &pcb_drc_lst;
 
Index: trunk/src_plugins/drc_query/dlg.c
===================================================================
--- trunk/src_plugins/drc_query/dlg.c	(revision 30901)
+++ trunk/src_plugins/drc_query/dlg.c	(revision 30902)
@@ -101,7 +101,7 @@
 	}
 }
 
-static void drcq_open_view_win(pcb_hidlib_t *hidlib, pcb_view_list_t *view)
+static void drcq_open_view_win(rnd_hidlib_t *hidlib, pcb_view_list_t *view)
 {
 	fgw_arg_t args[4], ares;
 	args[1].type = FGW_STR; args[1].val.str = "drc_query: manual run";
Index: trunk/src_plugins/drc_query/drc_query.c
===================================================================
--- trunk/src_plugins/drc_query/drc_query.c	(revision 30901)
+++ trunk/src_plugins/drc_query/drc_query.c	(revision 30902)
@@ -200,7 +200,7 @@
 	return nat->val.boolean;
 }
 
-static void pcb_drc_query(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_drc_query(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pcb_board_t *pcb = (pcb_board_t *)hidlib;
 	gdl_iterator_t it;
Index: trunk/src_plugins/export_excellon/excellon.c
===================================================================
--- trunk/src_plugins/export_excellon/excellon.c	(revision 30901)
+++ trunk/src_plugins/export_excellon/excellon.c	(revision 30902)
@@ -475,7 +475,7 @@
 {
 }
 
-static void exc_session_begin(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void exc_session_begin(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	exc_aperture_cnt = 0;
 }
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 30901)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 30902)
@@ -1055,7 +1055,7 @@
 {
 }
 
-static void gerber_session_begin(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void gerber_session_begin(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	gerber_global_aperture_cnt = 0;
 }
Index: trunk/src_plugins/export_openems/excitation.c
===================================================================
--- trunk/src_plugins/export_openems/excitation.c	(revision 30901)
+++ trunk/src_plugins/export_openems/excitation.c	(revision 30902)
@@ -534,7 +534,7 @@
 	return excitations[exc_ctx.selected].get(exc_ctx.selected);
 }
 
-static void exc_ev_board_changed(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void exc_ev_board_changed(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	load_selector();
 	if (exc_ctx.active)
Index: trunk/src_plugins/hid_batch/batch.c
===================================================================
--- trunk/src_plugins/hid_batch/batch.c	(revision 30901)
+++ trunk/src_plugins/hid_batch/batch.c	(revision 30902)
@@ -62,7 +62,7 @@
 	}
 }
 
-static void ev_pcb_changed(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void ev_pcb_changed(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if (prompt != NULL)
 		free(prompt);
@@ -96,7 +96,7 @@
 	line->seen = 1;
 }
 
-static void ev_log_append(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void ev_log_append(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if (!batch_active)
 		return;
@@ -299,7 +299,7 @@
 {
 }
 
-static void batch_set_hidlib(pcb_hid_t *hid, pcb_hidlib_t *hidlib)
+static void batch_set_hidlib(pcb_hid_t *hid, rnd_hidlib_t *hidlib)
 {
 	hid->hid_data = hidlib;
 }
@@ -307,7 +307,7 @@
 
 static void batch_view_get(pcb_hid_t *hid, pcb_box_t *viewbox)
 {
-	pcb_hidlib_t *hidlib = hid->hid_data;
+	rnd_hidlib_t *hidlib = hid->hid_data;
 	viewbox->X1 = 0;
 	viewbox->Y1 = 0;
 	viewbox->X2 = hidlib->size_x;
Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 30901)
+++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 30902)
@@ -138,7 +138,7 @@
 		gdk_gc_set_clip_mask(gc, NULL);
 }
 
-static inline void ghid_gdk_draw_grid_global(pcb_hidlib_t *hidlib)
+static inline void ghid_gdk_draw_grid_global(rnd_hidlib_t *hidlib)
 {
 	render_priv_t *priv = ghidgui->port.render_priv;
 	pcb_coord_t x, y, x1, y1, x2, y2, grd;
@@ -203,7 +203,7 @@
 	}
 }
 
-static void ghid_gdk_draw_grid_local_(pcb_hidlib_t *hidlib, pcb_coord_t cx, pcb_coord_t cy, int radius)
+static void ghid_gdk_draw_grid_local_(rnd_hidlib_t *hidlib, pcb_coord_t cx, pcb_coord_t cy, int radius)
 {
 	render_priv_t *priv = ghidgui->port.render_priv;
 	static GdkPoint *points_base = NULL;
@@ -261,7 +261,7 @@
 static int grid_local_have_old = 0, grid_local_old_r = 0;
 static pcb_coord_t grid_local_old_x, grid_local_old_y;
 
-static void ghid_gdk_draw_grid_local(pcb_hidlib_t *hidlib, pcb_coord_t cx, pcb_coord_t cy)
+static void ghid_gdk_draw_grid_local(rnd_hidlib_t *hidlib, pcb_coord_t cx, pcb_coord_t cy)
 {
 	if (grid_local_have_old) {
 		ghid_gdk_draw_grid_local_(hidlib, grid_local_old_x, grid_local_old_y, grid_local_old_r);
@@ -285,7 +285,7 @@
 	grid_local_old_r = pcb_conf_hid_gtk.plugins.hid_gtk.local_grid.radius;
 }
 
-static void ghid_gdk_draw_grid(pcb_hidlib_t *hidlib)
+static void ghid_gdk_draw_grid(rnd_hidlib_t *hidlib)
 {
 	static GdkColormap *colormap = NULL;
 	render_priv_t *priv = ghidgui->port.render_priv;
@@ -320,7 +320,7 @@
 }
 
 /* ------------------------------------------------------------ */
-static void ghid_gdk_draw_pixmap(pcb_hidlib_t *hidlib, pcb_gtk_pixmap_t *gpm, pcb_coord_t ox, pcb_coord_t oy, pcb_coord_t dw, pcb_coord_t dh)
+static void ghid_gdk_draw_pixmap(rnd_hidlib_t *hidlib, pcb_gtk_pixmap_t *gpm, pcb_coord_t ox, pcb_coord_t oy, pcb_coord_t dw, pcb_coord_t dh)
 {
 	GdkInterpType interp_type;
 	gint src_x, src_y, dst_x, dst_y, w, h, w_src, h_src;
@@ -354,7 +354,7 @@
 		gdk_pixbuf_render_to_drawable(gpm->cache.pb, priv->out_pixel, priv->bg_gc, src_x, src_y, dst_x, dst_y, w - src_x, h - src_y, GDK_RGB_DITHER_NORMAL, 0, 0);
 }
 
-static void ghid_gdk_draw_bg_image(pcb_hidlib_t *hidlib)
+static void ghid_gdk_draw_bg_image(rnd_hidlib_t *hidlib)
 {
 	if (ghidgui->bg_pixmap.image != NULL)
 		ghid_gdk_draw_pixmap(hidlib, &ghidgui->bg_pixmap, 0, 0, hidlib->size_x, hidlib->size_y);
@@ -1016,7 +1016,7 @@
 		gdk_draw_rectangle(priv->out_clip, priv->clip_gc, TRUE, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
 }
 
-static void redraw_region(pcb_hidlib_t *hidlib, GdkRectangle *rect)
+static void redraw_region(rnd_hidlib_t *hidlib, GdkRectangle *rect)
 {
 	int eleft, eright, etop, ebottom;
 	pcb_hid_expose_ctx_t ctx;
@@ -1107,7 +1107,7 @@
 static int preview_lock = 0;
 static void ghid_gdk_invalidate_lr(pcb_hid_t *hid, pcb_coord_t left, pcb_coord_t right, pcb_coord_t top, pcb_coord_t bottom)
 {
-	pcb_hidlib_t *hidlib = ghidgui->hidlib;
+	rnd_hidlib_t *hidlib = ghidgui->hidlib;
 	int dleft, dright, dtop, dbottom;
 	int minx, maxx, miny, maxy;
 	GdkRectangle rect;
@@ -1140,7 +1140,7 @@
 
 static void ghid_gdk_invalidate_all(pcb_hid_t *hid)
 {
-	pcb_hidlib_t *hidlib = ghidgui->hidlib;
+	rnd_hidlib_t *hidlib = ghidgui->hidlib;
 	if (ghidgui && ghidgui->topwin.menu.menu_bar) {
 		redraw_region(hidlib, NULL);
 		if (!preview_lock) {
@@ -1154,7 +1154,7 @@
 
 static void ghid_gdk_notify_crosshair_change(pcb_hid_t *hid, pcb_bool changes_complete)
 {
-	pcb_hidlib_t *hidlib = ghidgui->hidlib;
+	rnd_hidlib_t *hidlib = ghidgui->hidlib;
 	render_priv_t *priv = ghidgui->port.render_priv;
 
 	/* We sometimes get called before the GUI is up */
@@ -1189,7 +1189,7 @@
 
 static void ghid_gdk_notify_mark_change(pcb_hid_t *hid, pcb_bool changes_complete)
 {
-	pcb_hidlib_t *hidlib = ghidgui->hidlib;
+	rnd_hidlib_t *hidlib = ghidgui->hidlib;
 	render_priv_t *priv = ghidgui->port.render_priv;
 
 	/* We sometimes get called before the GUI is up */
Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 30901)
+++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 30902)
@@ -137,7 +137,7 @@
 
 int ghid_gl_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)
 {
-	pcb_hidlib_t *hidlib = ghidgui->hidlib;
+	rnd_hidlib_t *hidlib = ghidgui->hidlib;
 	render_priv_t *priv = ghidgui->port.render_priv;
 
 	glMatrixMode(GL_MODELVIEW);
@@ -180,7 +180,7 @@
 	return rv;
 }
 
-void ghid_gl_draw_grid_local(pcb_hidlib_t *hidlib, pcb_coord_t cx, pcb_coord_t cy)
+void ghid_gl_draw_grid_local(rnd_hidlib_t *hidlib, pcb_coord_t cx, pcb_coord_t cy)
 {
 	/* cx and cy are the actual cursor snapped to wherever - round them to the nearest real grid point */
 	grid_local_x = (cx / hidlib->grid) * hidlib->grid + hidlib->grid_ox;
@@ -188,7 +188,7 @@
 	grid_local_radius = pcb_conf_hid_gtk.plugins.hid_gtk.local_grid.radius;
 }
 
-static void ghid_gl_draw_grid(pcb_hidlib_t *hidlib, pcb_box_t *drawn_area)
+static void ghid_gl_draw_grid(rnd_hidlib_t *hidlib, pcb_box_t *drawn_area)
 {
 	render_priv_t *priv = ghidgui->port.render_priv;
 
@@ -208,12 +208,12 @@
 	glDisable(GL_COLOR_LOGIC_OP);
 }
 
-static void pcb_gl_draw_texture(pcb_hidlib_t *hidlib, pcb_gtk_pixmap_t *gpm, pcb_coord_t ox, pcb_coord_t oy, pcb_coord_t bw, pcb_coord_t bh)
+static void pcb_gl_draw_texture(rnd_hidlib_t *hidlib, pcb_gtk_pixmap_t *gpm, pcb_coord_t ox, pcb_coord_t oy, pcb_coord_t bw, pcb_coord_t bh)
 {
 	hidgl_draw_texture_rect(	ox,oy,ox+bw,oy+bh, gpm->cache.lng );
 }
 
-static void ghid_gl_draw_pixmap(pcb_hidlib_t *hidlib, pcb_gtk_pixmap_t *gpm, pcb_coord_t ox, pcb_coord_t oy, pcb_coord_t bw, pcb_coord_t bh)
+static void ghid_gl_draw_pixmap(rnd_hidlib_t *hidlib, pcb_gtk_pixmap_t *gpm, pcb_coord_t ox, pcb_coord_t oy, pcb_coord_t bw, pcb_coord_t bh)
 {
 	GLuint texture_handle = gpm->cache.lng;
 	if (texture_handle == 0) {
@@ -240,7 +240,7 @@
 	pcb_gl_draw_texture(hidlib, gpm, ox, oy, bw, bh);
 }
 
-static void ghid_gl_draw_bg_image(pcb_hidlib_t *hidlib)
+static void ghid_gl_draw_bg_image(rnd_hidlib_t *hidlib)
 {
 	if (ghidgui->bg_pixmap.image != NULL)
 		ghid_gl_draw_pixmap(hidlib, &ghidgui->bg_pixmap, 0, 0, hidlib->size_x, hidlib->size_y);
@@ -547,7 +547,7 @@
 	ghid_gl_invalidate_all(hid);
 }
 
-static void pcb_gl_draw_right_cross(pcb_hidlib_t *hidlib, GLint x, GLint y, GLint z, pcb_coord_t minx, pcb_coord_t miny, pcb_coord_t maxx, pcb_coord_t maxy)
+static void pcb_gl_draw_right_cross(rnd_hidlib_t *hidlib, GLint x, GLint y, GLint z, pcb_coord_t minx, pcb_coord_t miny, pcb_coord_t maxx, pcb_coord_t maxy)
 {
 	glVertex3i(x, miny, z);
 	glVertex3i(x, maxy, z);
@@ -555,7 +555,7 @@
 	glVertex3i(maxx, y, z);
 }
 
-static void pcb_gl_draw_slanted_cross(pcb_hidlib_t *hidlib, GLint x, GLint y, GLint z, pcb_coord_t minx, pcb_coord_t miny, pcb_coord_t maxx, pcb_coord_t maxy)
+static void pcb_gl_draw_slanted_cross(rnd_hidlib_t *hidlib, GLint x, GLint y, GLint z, pcb_coord_t minx, pcb_coord_t miny, pcb_coord_t maxx, pcb_coord_t maxy)
 {
 	pcb_coord_t cmax = MAX(maxx-minx, maxy-miny);
 
@@ -566,7 +566,7 @@
 	glVertex3i(x+cmax, y-cmax, z);
 }
 
-static void pcb_gl_draw_dozen_cross(pcb_hidlib_t *hidlib, GLint x, GLint y, GLint z, pcb_coord_t minx, pcb_coord_t miny, pcb_coord_t maxx, pcb_coord_t maxy)
+static void pcb_gl_draw_dozen_cross(rnd_hidlib_t *hidlib, GLint x, GLint y, GLint z, pcb_coord_t minx, pcb_coord_t miny, pcb_coord_t maxx, pcb_coord_t maxy)
 {
 	pcb_coord_t cmax = MAX(maxx-minx, maxy-miny);
 	double c30 = cos(M_PI/6.0), s30 = sin(M_PI/6.0);
@@ -583,7 +583,7 @@
 	glVertex3i(x+cmax*c60, y-cmax*s60, z);
 }
 
-static void pcb_gl_draw_crosshair(pcb_hidlib_t *hidlib, GLint x, GLint y, GLint z, pcb_coord_t minx, pcb_coord_t miny, pcb_coord_t maxx, pcb_coord_t maxy)
+static void pcb_gl_draw_crosshair(rnd_hidlib_t *hidlib, GLint x, GLint y, GLint z, pcb_coord_t minx, pcb_coord_t miny, pcb_coord_t maxx, pcb_coord_t maxy)
 {
 	static enum pcb_crosshair_shape_e prev = pcb_ch_shape_basic;
 
@@ -598,7 +598,7 @@
 	prev = pcbhl_conf.editor.crosshair_shape_idx;
 }
 
-static void ghid_gl_show_crosshair(pcb_hidlib_t *hidlib, gboolean paint_new_location, pcb_coord_t minx, pcb_coord_t miny, pcb_coord_t maxx, pcb_coord_t maxy)
+static void ghid_gl_show_crosshair(rnd_hidlib_t *hidlib, gboolean paint_new_location, pcb_coord_t minx, pcb_coord_t miny, pcb_coord_t maxx, pcb_coord_t maxy)
 {
 	GLint x, y, z;
 	static int done_once = 0;
@@ -752,7 +752,7 @@
 static gboolean ghid_gl_drawing_area_expose_cb(GtkWidget *widget, pcb_gtk_expose_t *ev, void *vport)
 {
 	pcb_gtk_port_t *port = vport;
-	pcb_hidlib_t *hidlib = ghidgui->hidlib;
+	rnd_hidlib_t *hidlib = ghidgui->hidlib;
 	render_priv_t *priv = port->render_priv;
 	GtkAllocation allocation;
 	pcb_hid_expose_ctx_t ctx;
@@ -829,7 +829,7 @@
 	GdkGLDrawable *pGlDrawable = gtk_widget_get_gl_drawable(widget);
 	GtkAllocation allocation;
 	render_priv_t *priv = ghidgui->port.render_priv;
-	pcb_hidlib_t *hidlib = ghidgui->hidlib;
+	rnd_hidlib_t *hidlib = ghidgui->hidlib;
 	pcb_gtk_view_t save_view;
 	int save_width, save_height;
 	double xz, yz, vw, vh;
Index: trunk/src_plugins/hid_lesstif/dialogs.c
===================================================================
--- trunk/src_plugins/hid_lesstif/dialogs.c	(revision 30901)
+++ trunk/src_plugins/hid_lesstif/dialogs.c	(revision 30902)
@@ -31,7 +31,7 @@
 #include "plug_io.h"
 
 int pcb_ltf_ok;
-extern pcb_hidlib_t *ltf_hidlib;
+extern rnd_hidlib_t *ltf_hidlib;
 
 
 #define COMPONENT_SIDE_NAME "(top)"
@@ -1180,7 +1180,7 @@
 	return;
 }
 
-pcb_hidlib_t *ltf_attr_get_dad_hidlib(void *hid_ctx)
+rnd_hidlib_t *ltf_attr_get_dad_hidlib(void *hid_ctx)
 {
 	return ltf_hidlib;
 }
Index: trunk/src_plugins/hid_lesstif/lesstif.h
===================================================================
--- trunk/src_plugins/hid_lesstif/lesstif.h	(revision 30901)
+++ trunk/src_plugins/hid_lesstif/lesstif.h	(revision 30902)
@@ -54,7 +54,7 @@
 extern void lesstif_attributes_dialog(pcb_hid_t *hid, const char *, pcb_attribute_list_t *);
 void *lesstif_attr_sub_new(Widget parent_box, pcb_hid_attribute_t *attrs, int n_attrs, void *caller_data);
 char *pcb_ltf_fileselect(pcb_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, pcb_hid_dad_subdialog_t *sub);
-pcb_hidlib_t *ltf_attr_get_dad_hidlib(void *hid_ctx);
+rnd_hidlib_t *ltf_attr_get_dad_hidlib(void *hid_ctx);
 
 extern int pcb_ltf_ok;
 int pcb_ltf_wait_for_dialog(Widget w);
Index: trunk/src_plugins/hid_lesstif/library.c
===================================================================
--- trunk/src_plugins/hid_lesstif/library.c	(revision 30901)
+++ trunk/src_plugins/hid_lesstif/library.c	(revision 30902)
@@ -21,7 +21,7 @@
 #include <librnd/core/event.h>
 #include <librnd/core/tool.h>
 
-extern pcb_hidlib_t *ltf_hidlib;
+extern rnd_hidlib_t *ltf_hidlib;
 
 static Widget library_dialog = 0;
 static Widget library_list, libnode_list;
@@ -132,7 +132,7 @@
 		lib_dfs(l, level+1);
 }
 
-void LesstifLibraryChanged(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void LesstifLibraryChanged(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	int i;
 	if (pcb_library.data.dir.children.used == 0)
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 30901)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 30902)
@@ -60,7 +60,7 @@
 
 const char *lesstif_cookie = "lesstif HID";
 
-pcb_hidlib_t *ltf_hidlib;
+rnd_hidlib_t *ltf_hidlib;
 
 pcb_hid_cfg_mouse_t lesstif_mouse;
 pcb_hid_cfg_keys_t lesstif_keymap;
@@ -398,11 +398,11 @@
 	old_cursor_mode = -1;
 }
 
-extern void LesstifNetlistChanged(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-extern void LesstifLibraryChanged(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+extern void LesstifNetlistChanged(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+extern void LesstifLibraryChanged(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 
 
-static void ltf_set_hidlib(pcb_hid_t *hid, pcb_hidlib_t *hidlib)
+static void ltf_set_hidlib(pcb_hid_t *hid, rnd_hidlib_t *hidlib)
 {
 	ltf_hidlib = hidlib;
 	if ((work_area == 0) || (hidlib == NULL))
@@ -623,7 +623,7 @@
 	unsigned inited:1;
 } pcb_ltf_pixmap_t;
 
-static void pcb_ltf_draw_pixmap_(pcb_hidlib_t *hidlib, pcb_ltf_pixmap_t *lpm, pcb_coord_t ox, pcb_coord_t oy, pcb_coord_t dw, pcb_coord_t dh)
+static void pcb_ltf_draw_pixmap_(rnd_hidlib_t *hidlib, pcb_ltf_pixmap_t *lpm, pcb_coord_t ox, pcb_coord_t oy, pcb_coord_t dw, pcb_coord_t dh)
 {
 	int w, h, sx3, done = 0;
 
Index: trunk/src_plugins/hid_lesstif/menu.c
===================================================================
--- trunk/src_plugins/hid_lesstif/menu.c	(revision 30901)
+++ trunk/src_plugins/hid_lesstif/menu.c	(revision 30902)
@@ -30,7 +30,7 @@
 
 #include "../src_plugins/lib_hid_common/menu_helper.h"
 
-extern pcb_hidlib_t *ltf_hidlib;
+extern rnd_hidlib_t *ltf_hidlib;
 
 Widget lesstif_menubar;
 pcb_hid_cfg_t *lesstif_cfg;
Index: trunk/src_plugins/hid_lesstif/netlist.c
===================================================================
--- trunk/src_plugins/hid_lesstif/netlist.c	(revision 30901)
+++ trunk/src_plugins/hid_lesstif/netlist.c	(revision 30902)
@@ -33,7 +33,7 @@
 static int n_netnode_strings;
 static char *last_pick;
 
-extern pcb_hidlib_t *ltf_hidlib;
+extern rnd_hidlib_t *ltf_hidlib;
 
 static void pick_net(XmString *name, int pick)
 {
@@ -344,7 +344,7 @@
 	return 0;
 }
 
-void LesstifNetlistChanged(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void LesstifNetlistChanged(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	htsp_entry_t *e;
 	int i;
Index: trunk/src_plugins/hid_remote/remote.c
===================================================================
--- trunk/src_plugins/hid_remote/remote.c	(revision 30901)
+++ trunk/src_plugins/hid_remote/remote.c	(revision 30902)
@@ -40,7 +40,7 @@
 
 /* ----------------------------------------------------------------------------- */
 
-static void ev_pcb_changed(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void ev_pcb_changed(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 }
 
Index: trunk/src_plugins/import_mentor_sch/netlist_helper.c
===================================================================
--- trunk/src_plugins/import_mentor_sch/netlist_helper.c	(revision 30901)
+++ trunk/src_plugins/import_mentor_sch/netlist_helper.c	(revision 30902)
@@ -214,7 +214,7 @@
 	htsp_set(&ectx->attr, pcb_strdup(r->new_key), pcb_strdup(dst));
 }
 
-void nethlp_elem_done(pcb_hidlib_t *hl, nethlp_elem_ctx_t *ectx)
+void nethlp_elem_done(rnd_hidlib_t *hl, nethlp_elem_ctx_t *ectx)
 {
 	htsp_entry_t *e;
 	char *refdes, *footprint, *value;
@@ -288,7 +288,7 @@
 	return prealloc;
 }
 
-void nethlp_net_add_term(pcb_hidlib_t *hl, nethlp_net_ctx_t *nctx, const char *part, const char *pin)
+void nethlp_net_add_term(rnd_hidlib_t *hl, nethlp_net_ctx_t *nctx, const char *part, const char *pin)
 {
 	char *refdes = htsp_get(&nctx->nhctx->id2refdes, part);
 	char term[256];
Index: trunk/src_plugins/import_mentor_sch/netlist_helper.h
===================================================================
--- trunk/src_plugins/import_mentor_sch/netlist_helper.h	(revision 30901)
+++ trunk/src_plugins/import_mentor_sch/netlist_helper.h	(revision 30902)
@@ -43,9 +43,9 @@
 nethlp_elem_ctx_t *nethlp_elem_new(nethlp_ctx_t *nhctx, nethlp_elem_ctx_t *prealloc, const char *id);
 void nethlp_elem_refdes(nethlp_elem_ctx_t *ectx, const char *refdes);
 void nethlp_elem_attr(nethlp_elem_ctx_t *ectx, const char *key, const char *val);
-void nethlp_elem_done(pcb_hidlib_t *hl, nethlp_elem_ctx_t *ectx);
+void nethlp_elem_done(rnd_hidlib_t *hl, nethlp_elem_ctx_t *ectx);
 
 
 nethlp_net_ctx_t *nethlp_net_new(nethlp_ctx_t *nhctx, nethlp_net_ctx_t *prealloc, const char *netname);
-void nethlp_net_add_term(pcb_hidlib_t *hl, nethlp_net_ctx_t *nctx, const char *part, const char *pin);
+void nethlp_net_add_term(rnd_hidlib_t *hl, nethlp_net_ctx_t *nctx, const char *part, const char *pin);
 void nethlp_net_destroy(nethlp_net_ctx_t *nctx);
Index: trunk/src_plugins/import_pxm_gd/import_pxm_gd.c
===================================================================
--- trunk/src_plugins/import_pxm_gd/import_pxm_gd.c	(revision 30901)
+++ trunk/src_plugins/import_pxm_gd/import_pxm_gd.c	(revision 30902)
@@ -39,7 +39,7 @@
 
 static const char *import_pxm_gd_cookie = "import_pxm_gd";
 
-static int gd_load(pcb_hidlib_t *hidlib, pcb_pixmap_t *pxm, const char *fn, gdImagePtr (*loader)(FILE *f))
+static int gd_load(rnd_hidlib_t *hidlib, pcb_pixmap_t *pxm, const char *fn, gdImagePtr (*loader)(FILE *f))
 {
 	int x, y;
 	gdImagePtr gdi;
@@ -88,7 +88,7 @@
 }
 
 #ifdef HAVE_GDIMAGEPNG
-static int gd_png_load(pcb_hidlib_t *hidlib, pcb_pixmap_t *pxm, const char *fn)
+static int gd_png_load(rnd_hidlib_t *hidlib, pcb_pixmap_t *pxm, const char *fn)
 {
 	return gd_load(hidlib, pxm, fn, gdImageCreateFromPng);
 }
@@ -100,7 +100,7 @@
 #endif
 
 #ifdef HAVE_GDIMAGEJPEG
-static int gd_jpg_load(pcb_hidlib_t *hidlib, pcb_pixmap_t *pxm, const char *fn)
+static int gd_jpg_load(rnd_hidlib_t *hidlib, pcb_pixmap_t *pxm, const char *fn)
 {
 	return gd_load(hidlib, pxm, fn, gdImageCreateFromJpeg);
 }
@@ -112,7 +112,7 @@
 #endif
 
 #ifdef HAVE_GDIMAGEGIF
-static int gd_gif_load(pcb_hidlib_t *hidlib, pcb_pixmap_t *pxm, const char *fn)
+static int gd_gif_load(rnd_hidlib_t *hidlib, pcb_pixmap_t *pxm, const char *fn)
 {
 	return gd_load(hidlib, pxm, fn, gdImageCreateFromGif);
 }
Index: trunk/src_plugins/import_pxm_pnm/import_pxm_pnm.c
===================================================================
--- trunk/src_plugins/import_pxm_pnm/import_pxm_pnm.c	(revision 30901)
+++ trunk/src_plugins/import_pxm_pnm/import_pxm_pnm.c	(revision 30902)
@@ -64,7 +64,7 @@
 	break; \
 }
 
-static int pnm_load(pcb_hidlib_t *hidlib, pcb_pixmap_t *pxm, const char *fn)
+static int pnm_load(rnd_hidlib_t *hidlib, pcb_pixmap_t *pxm, const char *fn)
 {
 	FILE *f;
 	char *s, line[1024];
Index: trunk/src_plugins/io_autotrax/read.c
===================================================================
--- trunk/src_plugins/io_autotrax/read.c	(revision 30901)
+++ trunk/src_plugins/io_autotrax/read.c	(revision 30902)
@@ -82,7 +82,7 @@
 
 #define null_empty(s) ((s) == NULL ? "" : (s))
 
-static void sym_flush(pcb_hidlib_t *hl, symattr_t *sattr)
+static void sym_flush(rnd_hidlib_t *hl, symattr_t *sattr)
 {
 	if (sattr->refdes != NULL) {
 		if (sattr->footprint == NULL)
Index: trunk/src_plugins/io_bxl/read.c
===================================================================
--- trunk/src_plugins/io_bxl/read.c	(revision 30901)
+++ trunk/src_plugins/io_bxl/read.c	(revision 30902)
@@ -577,7 +577,7 @@
 
 int io_bxl_parse_footprint(pcb_plug_io_t *ctx, pcb_data_t *data, const char *filename, const char *subfpname)
 {
-	pcb_hidlib_t *hl = &PCB->hidlib;
+	rnd_hidlib_t *hl = &PCB->hidlib;
 	FILE *f;
 	int chr, tok, yres, ret = 0;
 	hdecode_t hctx;
@@ -640,7 +640,7 @@
 	return ret;
 }
 
-int io_bxl_test_parse2(pcb_hidlib_t *hl, pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *filename, FILE *f_ignore, void *cbctx, void (*pat_cb)(void *cbctx, const char *name))
+int io_bxl_test_parse2(rnd_hidlib_t *hl, pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *filename, FILE *f_ignore, void *cbctx, void (*pat_cb)(void *cbctx, const char *name))
 {
 	FILE *f;
 	int chr, tok, found_tok = 0, ret = 0;
Index: trunk/src_plugins/lib_gtk_common/bu_command.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/bu_command.c	(revision 30901)
+++ trunk/src_plugins/lib_gtk_common/bu_command.c	(revision 30902)
@@ -231,7 +231,7 @@
 }
 
 
-void ghid_handle_user_command(pcb_hidlib_t *hl, pcb_gtk_command_t *ctx, pcb_bool raise)
+void ghid_handle_user_command(rnd_hidlib_t *hl, pcb_gtk_command_t *ctx, pcb_bool raise)
 {
 	char *command;
 
Index: trunk/src_plugins/lib_gtk_common/bu_command.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/bu_command.h	(revision 30901)
+++ trunk/src_plugins/lib_gtk_common/bu_command.h	(revision 30902)
@@ -21,7 +21,7 @@
 	void *status_ctx;
 } pcb_gtk_command_t;
 
-void ghid_handle_user_command(pcb_hidlib_t *hl, pcb_gtk_command_t *ctx, pcb_bool raise);
+void ghid_handle_user_command(rnd_hidlib_t *hl, pcb_gtk_command_t *ctx, pcb_bool raise);
 char *ghid_command_entry_get(pcb_gtk_command_t *ctx, const char *prompt, const char *command);
 
 /* Update the prompt text before the command entry - call it when any of conf_core.rc.cli_* change */
Index: trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c	(revision 30901)
+++ trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c	(revision 30902)
@@ -39,7 +39,7 @@
 #define TOOLTIP_UPDATE_DELAY 200
 
 static int tooltip_update_timeout_id = 0;
-gboolean pcb_gtk_dwg_tooltip_check_object(pcb_hidlib_t *hl, GtkWidget *drawing_area, pcb_coord_t crosshairx, pcb_coord_t crosshairy)
+gboolean pcb_gtk_dwg_tooltip_check_object(rnd_hidlib_t *hl, GtkWidget *drawing_area, pcb_coord_t crosshairx, pcb_coord_t crosshairy)
 {
 	const char *description;
 	fgw_arg_t res, argv[3];
Index: trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.h	(revision 30901)
+++ trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.h	(revision 30902)
@@ -1,5 +1,5 @@
 #include <gtk/gtk.h>
-gboolean pcb_gtk_dwg_tooltip_check_object(pcb_hidlib_t *hl, GtkWidget *drawing_area, pcb_coord_t crosshairx, pcb_coord_t crosshairy);
+gboolean pcb_gtk_dwg_tooltip_check_object(rnd_hidlib_t *hl, GtkWidget *drawing_area, pcb_coord_t crosshairx, pcb_coord_t crosshairy);
 void pcb_gtk_dwg_tooltip_cancel_update(void);
 void pcb_gtk_dwg_tooltip_queue(GtkWidget *drawing_area, GSourceFunc cb, void *ctx);
 
Index: trunk/src_plugins/lib_gtk_common/bu_menu.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/bu_menu.c	(revision 30901)
+++ trunk/src_plugins/lib_gtk_common/bu_menu.c	(revision 30902)
@@ -362,7 +362,7 @@
    flag (maybe NULL), and its active flag (maybe NULL), to a
    callback function. It is the responsibility of the function
    to actually change the state of the action. */
-void ghid_main_menu_update_toggle_state(pcb_hidlib_t *hidlib, GHidMainMenu *menu, void (*cb)(pcb_hidlib_t *, GtkAction *, const char *toggle_flag, const char *active_flag))
+void ghid_main_menu_update_toggle_state(rnd_hidlib_t *hidlib, GHidMainMenu *menu, void (*cb)(rnd_hidlib_t *, GtkAction *, const char *toggle_flag, const char *active_flag))
 {
 	GList *list;
 	for (list = menu->actions; list; list = list->next) {
@@ -428,7 +428,7 @@
 }
 
 /* callback for ghid_main_menu_update_toggle_state() */
-void menu_toggle_update_cb(pcb_hidlib_t *hidlib, GtkAction *act, const char *tflag, const char *aflag)
+void menu_toggle_update_cb(rnd_hidlib_t *hidlib, GtkAction *act, const char *tflag, const char *aflag)
 {
 	if (tflag != NULL) {
 		int v = pcb_hid_get_flag(hidlib, tflag);
@@ -462,7 +462,7 @@
 }
 
 
-GtkWidget *ghid_load_menus(pcb_gtk_menu_ctx_t *menu, pcb_hidlib_t *hidlib, pcb_hid_cfg_t **cfg_out)
+GtkWidget *ghid_load_menus(pcb_gtk_menu_ctx_t *menu, rnd_hidlib_t *hidlib, pcb_hid_cfg_t **cfg_out)
 {
 	const lht_node_t *mr;
 	GtkWidget *menu_bar = NULL;
Index: trunk/src_plugins/lib_gtk_common/bu_menu.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/bu_menu.h	(revision 30901)
+++ trunk/src_plugins/lib_gtk_common/bu_menu.h	(revision 30902)
@@ -21,7 +21,7 @@
 	GtkWidget *menu_bar;
 	conf_hid_id_t ghid_menuconf_id;
 	void (*confchg_checkbox)(conf_native_t *cfg, int arr_idx);
-	pcb_hidlib_t *hidlib;
+	rnd_hidlib_t *hidlib;
 } pcb_gtk_menu_ctx_t;
 
 GType ghid_main_menu_get_type(void);
@@ -28,7 +28,7 @@
 GtkWidget *ghid_main_menu_new(GCallback action_cb);
 void ghid_main_menu_add_node(pcb_gtk_menu_ctx_t *ctx, GHidMainMenu *menu, const lht_node_t *base);
 GtkAccelGroup *ghid_main_menu_get_accel_group(GHidMainMenu *menu);
-void ghid_main_menu_update_toggle_state(pcb_hidlib_t *hidlib, GHidMainMenu *menu, void (*cb)(pcb_hidlib_t *hidlib, GtkAction *, const char *toggle_flag, const char *active_flag));
+void ghid_main_menu_update_toggle_state(rnd_hidlib_t *hidlib, GHidMainMenu *menu, void (*cb)(rnd_hidlib_t *hidlib, GtkAction *, const char *toggle_flag, const char *active_flag));
 
 void ghid_main_menu_add_popup_node(pcb_gtk_menu_ctx_t *ctx, GHidMainMenu *menu, lht_node_t *base);
 
@@ -35,9 +35,9 @@
 int ghid_remove_menu_widget(void *ctx, lht_node_t *nd);
 int ghid_create_menu_widget(void *ctx_, const char *path, const char *name, int is_main, lht_node_t *parent, lht_node_t *ins_after, lht_node_t *menu_item);
 
-void menu_toggle_update_cb(pcb_hidlib_t *hidlib, GtkAction *act, const char *tflag, const char *aflag);
+void menu_toggle_update_cb(rnd_hidlib_t *hidlib, GtkAction *act, const char *tflag, const char *aflag);
 
-GtkWidget *ghid_load_menus(pcb_gtk_menu_ctx_t *menu, pcb_hidlib_t *hidlib, pcb_hid_cfg_t **cfg_out);
+GtkWidget *ghid_load_menus(pcb_gtk_menu_ctx_t *menu, rnd_hidlib_t *hidlib, pcb_hid_cfg_t **cfg_out);
 
 GtkWidget *pcb_gtk_menu_widget(lht_node_t *node);
 
Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_attribute.c	(revision 30901)
+++ trunk/src_plugins/lib_gtk_common/dlg_attribute.c	(revision 30902)
@@ -1017,7 +1017,7 @@
 	}
 }
 
-int pcb_gtk_winplace_cfg(pcb_hidlib_t *hidlib, GtkWidget *widget, void *ctx, const char *id)
+int pcb_gtk_winplace_cfg(rnd_hidlib_t *hidlib, GtkWidget *widget, void *ctx, const char *id)
 {
 	GtkAllocation allocation;
 
@@ -1032,7 +1032,7 @@
 	return 0;
 }
 
-pcb_hidlib_t *ghid_attr_get_dad_hidlib(void *hid_ctx)
+rnd_hidlib_t *ghid_attr_get_dad_hidlib(void *hid_ctx)
 {
 	attr_dlg_t *ctx = hid_ctx;
 	return ctx->gctx->hidlib;
Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_attribute.h	(revision 30901)
+++ trunk/src_plugins/lib_gtk_common/dlg_attribute.h	(revision 30902)
@@ -24,7 +24,7 @@
 
 /* Report new window coords to the central window placement code
    emitting an event */
-int pcb_gtk_winplace_cfg(pcb_hidlib_t *hidlib, GtkWidget *widget, void *ctx, const char *id);
+int pcb_gtk_winplace_cfg(rnd_hidlib_t *hidlib, GtkWidget *widget, void *ctx, const char *id);
 
-pcb_hidlib_t *ghid_attr_get_dad_hidlib(void *hid_ctx);
+rnd_hidlib_t *ghid_attr_get_dad_hidlib(void *hid_ctx);
 
Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_topwin.c	(revision 30901)
+++ trunk/src_plugins/lib_gtk_common/dlg_topwin.c	(revision 30902)
@@ -139,7 +139,7 @@
 
 /*** static top window code ***/
 /* sync the menu checkboxes with actual pcb state */
-void ghid_update_toggle_flags(pcb_hidlib_t *hidlib, pcb_gtk_topwin_t *tw, const char *cookie)
+void ghid_update_toggle_flags(rnd_hidlib_t *hidlib, pcb_gtk_topwin_t *tw, const char *cookie)
 {
 	ghid_main_menu_update_toggle_state(hidlib, GHID_MAIN_MENU(tw->menu.menu_bar), menu_toggle_update_cb);
 }
Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_topwin.h	(revision 30901)
+++ trunk/src_plugins/lib_gtk_common/dlg_topwin.h	(revision 30902)
@@ -12,7 +12,7 @@
 #include "bu_menu.h"
 #include "bu_command.h"
 
-void ghid_update_toggle_flags(pcb_hidlib_t *hidlib, pcb_gtk_topwin_t *tw, const char *cookie);
+void ghid_update_toggle_flags(rnd_hidlib_t *hidlib, pcb_gtk_topwin_t *tw, const char *cookie);
 void ghid_install_accel_groups(GtkWindow *window, pcb_gtk_topwin_t *tw);
 void ghid_remove_accel_groups(GtkWindow *window, pcb_gtk_topwin_t *tw);
 void ghid_create_pcb_widgets(pcb_gtk_t *ctx, pcb_gtk_topwin_t *tw, GtkWidget *in_top_window);
Index: trunk/src_plugins/lib_gtk_common/glue_hid.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 30901)
+++ trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 30902)
@@ -198,7 +198,7 @@
 	gtk_main_quit();
 }
 
-static void pcb_gtk_topwinplace(pcb_hidlib_t *hidlib, GtkWidget *dialog, const char *id)
+static void pcb_gtk_topwinplace(rnd_hidlib_t *hidlib, GtkWidget *dialog, const char *id)
 {
 	int plc[4] = {-1, -1, -1, -1};
 
@@ -510,7 +510,7 @@
 	return 0;
 }
 
-static void ghid_set_hidlib(pcb_hid_t *hid, pcb_hidlib_t *hidlib)
+static void ghid_set_hidlib(pcb_hid_t *hid, rnd_hidlib_t *hidlib)
 {
 	pcb_gtk_t *gctx = hid->hid_data;
 
Index: trunk/src_plugins/lib_gtk_common/pcb_gtk.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/pcb_gtk.h	(revision 30901)
+++ trunk/src_plugins/lib_gtk_common/pcb_gtk.h	(revision 30902)
@@ -61,7 +61,7 @@
 	gboolean (*preview_expose)(GtkWidget *widget, pcb_gtk_expose_t *p, pcb_hid_expose_t expcall, pcb_hid_expose_ctx_t *ctx); /* p == NULL when called from the code, not from a GUI expose event */
 	void (*load_bg_image)(void);
 	void (*init_renderer)(int *argc, char ***argv, void *port);
-	void (*draw_grid_local)(pcb_hidlib_t *hidlib, pcb_coord_t cx, pcb_coord_t cy);
+	void (*draw_grid_local)(rnd_hidlib_t *hidlib, pcb_coord_t cx, pcb_coord_t cy);
 
 	/* screen */
 	void (*screen_update)(void);
@@ -71,7 +71,7 @@
 	const gchar *(*get_color_name)(pcb_gtk_color_t *color);
 
 	void (*set_special_colors)(conf_native_t *cfg);
-	void (*draw_pixmap)(pcb_hidlib_t *hidlib, pcb_gtk_pixmap_t *gpm, pcb_coord_t ox, pcb_coord_t oy, pcb_coord_t dw, pcb_coord_t dh);
+	void (*draw_pixmap)(rnd_hidlib_t *hidlib, pcb_gtk_pixmap_t *gpm, pcb_coord_t ox, pcb_coord_t oy, pcb_coord_t dw, pcb_coord_t dh);
 };
 
 #include "../src_plugins/lib_gtk_common/ui_zoompan.h"
@@ -170,7 +170,7 @@
 	pcb_gtk_impl_t impl;
 	pcb_gtk_port_t port;
 
-	pcb_hidlib_t *hidlib;
+	rnd_hidlib_t *hidlib;
 
 	GtkWidget *wtop_window;
 	GtkActionGroup *main_actions;
Index: trunk/src_plugins/lib_hid_common/act_dad.c
===================================================================
--- trunk/src_plugins/lib_hid_common/act_dad.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_common/act_dad.c	(revision 30902)
@@ -62,7 +62,7 @@
 
 typedef struct {
 	PCB_DAD_DECL_NOINIT(dlg)
-	pcb_hidlib_t *hidlib;
+	rnd_hidlib_t *hidlib;
 	char *name;
 	const char *row_domain;
 	int level;
@@ -73,7 +73,7 @@
 
 htsp_t dads;
 
-static int dad_new(pcb_hidlib_t *hl, const char *name)
+static int dad_new(rnd_hidlib_t *hl, const char *name)
 {
 	dad_t *dad;
 
Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c
===================================================================
--- trunk/src_plugins/lib_hid_common/dlg_comm_m.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c	(revision 30902)
@@ -219,7 +219,7 @@
 
 fgw_error_t pcb_act_gui_MayOverwriteFile(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
-	pcb_hidlib_t *hidlib;
+	rnd_hidlib_t *hidlib;
 	const char *fn;
 	const char *pcb_acts_gui_MayOverwriteFile = nope;
 	const char **xpm;
Index: trunk/src_plugins/lib_hid_common/dlg_log.c
===================================================================
--- trunk/src_plugins/lib_hid_common/dlg_log.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_common/dlg_log.c	(revision 30902)
@@ -42,7 +42,7 @@
 	int active;
 	int wtxt, wscroll;
 	int gui_inited;
-	pcb_hidlib_t *hidlib;
+	rnd_hidlib_t *hidlib;
 } log_ctx_t;
 
 static log_ctx_t log_ctx;
@@ -130,7 +130,7 @@
 		txt->hid_scroll_to_bottom(atxt, log_ctx.dlg_hid_ctx);
 }
 
-static void log_window_create(pcb_hidlib_t *hidlib)
+static void log_window_create(rnd_hidlib_t *hidlib)
 {
 	log_ctx_t *ctx = &log_ctx;
 	pcb_hid_attr_val_t hv;
@@ -193,7 +193,7 @@
 	return 0;
 }
 
-static void log_append_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void log_append_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pcb_logline_t *line = argv[1].d.p;
 
@@ -213,7 +213,7 @@
 	}
 }
 
-static void log_clear_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void log_clear_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if (log_ctx.active) {
 		pcb_hid_attribute_t *atxt = &log_ctx.dlg[log_ctx.wtxt];
@@ -224,7 +224,7 @@
 	}
 }
 
-static void log_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void log_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pcb_logline_t *n;
 
Index: trunk/src_plugins/lib_hid_common/grid_menu.c
===================================================================
--- trunk/src_plugins/lib_hid_common/grid_menu.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_common/grid_menu.c	(revision 30902)
@@ -100,7 +100,7 @@
 	grid_lock--;
 }
 
-void pcb_grid_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_grid_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if (grid_lock) return;
 	grid_lock++;
Index: trunk/src_plugins/lib_hid_common/grid_menu.h
===================================================================
--- trunk/src_plugins/lib_hid_common/grid_menu.h	(revision 30901)
+++ trunk/src_plugins/lib_hid_common/grid_menu.h	(revision 30902)
@@ -2,4 +2,4 @@
 #include <librnd/core/event.h>
 
 void pcb_grid_update_conf(conf_native_t *cfg, int arr_idx);
-void pcb_grid_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_grid_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
Index: trunk/src_plugins/lib_hid_common/lead_user.c
===================================================================
--- trunk/src_plugins/lib_hid_common/lead_user.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_common/lead_user.c	(revision 30902)
@@ -41,7 +41,7 @@
 static pcb_coord_t leadx, leady, step;
 static pcb_bool lead;
 static pcb_hidval_t lead_timer;
-static pcb_hidlib_t *lead_hidlib;
+static rnd_hidlib_t *lead_hidlib;
 
 static void lead_cb(pcb_hidval_t user_data)
 {
@@ -56,7 +56,7 @@
 		lead_timer = pcb_gui->add_timer(pcb_gui, lead_cb, LEAD_PERIOD_MS, user_data);
 }
 
-static void pcb_lead_user_to_location(pcb_hidlib_t *hidlib, pcb_coord_t x, pcb_coord_t y, pcb_bool enabled)
+static void pcb_lead_user_to_location(rnd_hidlib_t *hidlib, pcb_coord_t x, pcb_coord_t y, pcb_bool enabled)
 {
 	pcb_hidval_t user_data;
 
@@ -75,7 +75,7 @@
 		lead_timer = pcb_gui->add_timer(pcb_gui, lead_cb, LEAD_PERIOD_MS, user_data);
 }
 
-void pcb_lead_user_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_lead_user_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if (argc < 4)
 		return;
@@ -88,7 +88,7 @@
 
 
 #define ARL LEAD_ARROW_LEN/3
-void pcb_lead_user_draw_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_lead_user_draw_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if (lead) {
 		pcb_hid_gc_t *gc = argv[1].d.p;
Index: trunk/src_plugins/lib_hid_common/lead_user.h
===================================================================
--- trunk/src_plugins/lib_hid_common/lead_user.h	(revision 30901)
+++ trunk/src_plugins/lib_hid_common/lead_user.h	(revision 30902)
@@ -1,5 +1,5 @@
-void pcb_lead_user_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_lead_user_draw_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_lead_user_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_lead_user_draw_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 
 
 
Index: trunk/src_plugins/lib_hid_common/menu_helper.c
===================================================================
--- trunk/src_plugins/lib_hid_common/menu_helper.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_common/menu_helper.c	(revision 30902)
@@ -41,7 +41,7 @@
 
 #include "menu_helper.h"
 
-int pcb_hid_get_flag(pcb_hidlib_t *hidlib, const char *name)
+int pcb_hid_get_flag(rnd_hidlib_t *hidlib, const char *name)
 {
 	const char *cp;
 
Index: trunk/src_plugins/lib_hid_common/menu_helper.h
===================================================================
--- trunk/src_plugins/lib_hid_common/menu_helper.h	(revision 30901)
+++ trunk/src_plugins/lib_hid_common/menu_helper.h	(revision 30902)
@@ -41,7 +41,7 @@
    an action (if name has a parenthesis). When an action is run, it has 0
    or 1 argument only and the return value of the action is returned.
    On error, returns -1. */
-int pcb_hid_get_flag(pcb_hidlib_t *hidlib, const char *name);
+int pcb_hid_get_flag(rnd_hidlib_t *hidlib, const char *name);
 
 /* Return non-zero if submenu has further submenus; generate pcb_message(PCB_MSG_ERROR, ) if
    there is a submenu field with the wrong lihata type */
Index: trunk/src_plugins/lib_hid_common/place.c
===================================================================
--- trunk/src_plugins/lib_hid_common/place.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_common/place.c	(revision 30902)
@@ -78,7 +78,7 @@
 }
 
 
-void pcb_dialog_place(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_dialog_place(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	const char *id;
 	int *geo;
@@ -100,7 +100,7 @@
 /*	pcb_trace("dialog place: %p '%s'\n", hid_ctx, id);*/
 }
 
-void pcb_dialog_resize(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_dialog_resize(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((argc < 7) || (argv[1].type != PCB_EVARG_PTR) || (argv[2].type != PCB_EVARG_STR))
 		return;
@@ -195,7 +195,7 @@
 }
 
 
-static void place_maybe_save(pcb_hidlib_t *hidlib, conf_role_t role, int force)
+static void place_maybe_save(rnd_hidlib_t *hidlib, conf_role_t role, int force)
 {
 	htsw_entry_t *e;
 	char path[128 + sizeof(BASEPATH)];
@@ -235,24 +235,24 @@
 /* event handlers that run before the current pcb is saved to save win geo
    in the board conf and after loading a new board to fetch window placement
    info. */
-static void place_save_pre(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void place_save_pre(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	place_maybe_save(hidlib, CFR_PROJECT, 0);
 	place_maybe_save(hidlib, CFR_DESIGN, 0);
 }
 
-static void place_load_post(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void place_load_post(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pcb_wplc_load(CFR_PROJECT);
 	pcb_wplc_load(CFR_DESIGN);
 }
 
-void pcb_wplc_save_to_role(pcb_hidlib_t *hidlib, conf_role_t role)
+void pcb_wplc_save_to_role(rnd_hidlib_t *hidlib, conf_role_t role)
 {
 	place_maybe_save(hidlib, role, 1);
 }
 
-int pcb_wplc_save_to_file(pcb_hidlib_t *hidlib, const char *fn)
+int pcb_wplc_save_to_file(rnd_hidlib_t *hidlib, const char *fn)
 {
 	htsw_entry_t *e;
 	FILE *f;
Index: trunk/src_plugins/lib_hid_common/place.h
===================================================================
--- trunk/src_plugins/lib_hid_common/place.h	(revision 30901)
+++ trunk/src_plugins/lib_hid_common/place.h	(revision 30902)
@@ -5,6 +5,6 @@
 /*** for internal use ***/
 void pcb_dialog_place_uninit(void);
 void pcb_dialog_place_init(void);
-void pcb_dialog_resize(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_dialog_place(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_dialog_resize(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_dialog_place(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 
Index: trunk/src_plugins/lib_hid_common/toolbar.c
===================================================================
--- trunk/src_plugins/lib_hid_common/toolbar.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_common/toolbar.c	(revision 30902)
@@ -179,13 +179,13 @@
 	}
 }
 
-void pcb_toolbar_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_toolbar_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL))
 		toolbar_create();
 }
 
-void pcb_toolbar_reg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_toolbar_reg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((toolbar.sub_inited) && (argv[1].type == PCB_EVARG_PTR)) {
 		pcb_tool_t *tool = argv[1].d.p;
Index: trunk/src_plugins/lib_hid_common/toolbar.h
===================================================================
--- trunk/src_plugins/lib_hid_common/toolbar.h	(revision 30901)
+++ trunk/src_plugins/lib_hid_common/toolbar.h	(revision 30902)
@@ -7,8 +7,8 @@
 
 
 /* Alternatively, the caller can bind these */
-void pcb_toolbar_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_toolbar_reg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_toolbar_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_toolbar_reg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 void pcb_toolbar_update_conf(conf_native_t *cfg, int arr_idx);
 
 
Index: trunk/src_plugins/lib_hid_common/zoompan.c
===================================================================
--- trunk/src_plugins/lib_hid_common/zoompan.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_common/zoompan.c	(revision 30902)
@@ -38,7 +38,7 @@
 const char pcb_acts_Zoom_default[] = pcb_gui_acts_zoom;
 fgw_error_t pcb_gui_act_zoom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
-	pcb_hidlib_t *hidlib = RND_ACT_HIDLIB;
+	rnd_hidlib_t *hidlib = RND_ACT_HIDLIB;
 	const char *vp, *ovp;
 	double v;
 	pcb_coord_t x = 0, y = 0;
Index: trunk/src_plugins/lib_hid_gl/hidgl.c
===================================================================
--- trunk/src_plugins/lib_hid_gl/hidgl.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_gl/hidgl.c	(revision 30902)
@@ -196,7 +196,7 @@
 	}
 }
 
-void hidgl_draw_local_grid(pcb_hidlib_t *hidlib, pcb_coord_t cx, pcb_coord_t cy, int radius)
+void hidgl_draw_local_grid(rnd_hidlib_t *hidlib, pcb_coord_t cx, pcb_coord_t cy, int radius)
 {
 	int npoints = 0;
 	pcb_coord_t x, y;
@@ -225,7 +225,7 @@
 
 }
 
-void hidgl_draw_grid(pcb_hidlib_t *hidlib, pcb_box_t *drawn_area)
+void hidgl_draw_grid(rnd_hidlib_t *hidlib, pcb_box_t *drawn_area)
 {
 	pcb_coord_t x1, y1, x2, y2, n, i;
 	double x, y;
Index: trunk/src_plugins/lib_hid_gl/hidgl.h
===================================================================
--- trunk/src_plugins/lib_hid_gl/hidgl.h	(revision 30901)
+++ trunk/src_plugins/lib_hid_gl/hidgl.h	(revision 30902)
@@ -29,8 +29,8 @@
 #define PCB_HID_COMMON_HIDGL_H
 
 /*extern float global_depth;*/
-void hidgl_draw_local_grid(pcb_hidlib_t *hidlib, pcb_coord_t cx, pcb_coord_t cy, int radius);
-void hidgl_draw_grid(pcb_hidlib_t *hidlib, pcb_box_t *drawn_area);
+void hidgl_draw_local_grid(rnd_hidlib_t *hidlib, pcb_coord_t cx, pcb_coord_t cy, int radius);
+void hidgl_draw_grid(rnd_hidlib_t *hidlib, pcb_box_t *drawn_area);
 void hidgl_set_depth(float depth);
 void hidgl_draw_line(int cap, pcb_coord_t width, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, double scale);
 void hidgl_draw_arc(pcb_coord_t width, pcb_coord_t vx, pcb_coord_t vy, pcb_coord_t vrx, pcb_coord_t vry, pcb_angle_t start_angle, pcb_angle_t delta_angle, double scale);
Index: trunk/src_plugins/lib_hid_pcbui/infobar.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/infobar.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_pcbui/infobar.c	(revision 30902)
@@ -36,7 +36,7 @@
 static double last_date = -1;
 static int infobar_gui_inited = 0;
 
-static void pcb_infobar_brdchg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_infobar_brdchg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	rnd_actionva(hidlib, "InfoBarFileChanged", "close", NULL);
 	if ((hidlib != NULL) && (hidlib->filename != NULL))
@@ -79,7 +79,7 @@
 }
 
 
-static void pcb_infobar_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_infobar_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	infobar_gui_inited = 1;
 	pcb_infobar_brdchg_ev(hidlib, NULL, 0, NULL); /* this may have happened ebfore plugin init if file was specified on the CLI and is already loaded - pick up file data from memory */
@@ -87,7 +87,7 @@
 		infobar_tick(infobar_timer);
 }
 
-static void pcb_infobar_fn_chg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_infobar_fn_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((PCB != NULL) && (PCB->hidlib.filename != NULL)) {
 		last_date = pcb_file_mtime(NULL, PCB->hidlib.filename);
Index: trunk/src_plugins/lib_hid_pcbui/layer_menu.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/layer_menu.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_pcbui/layer_menu.c	(revision 30902)
@@ -257,7 +257,7 @@
 
 }
 
-void pcb_layer_menu_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_layer_menu_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	layer_install_menu();
 	if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL))
@@ -264,7 +264,7 @@
 		pcb_gui->update_menu_checkbox(pcb_gui, NULL);
 }
 
-void pcb_layer_menu_vis_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_layer_menu_vis_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL))
 		pcb_gui->update_menu_checkbox(pcb_gui, NULL);
@@ -282,7 +282,7 @@
 }
 
 
-void pcb_layer_menu_key_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_layer_menu_key_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pcb_hidval_t timerdata;
 
Index: trunk/src_plugins/lib_hid_pcbui/layer_menu.h
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/layer_menu.h	(revision 30901)
+++ trunk/src_plugins/lib_hid_pcbui/layer_menu.h	(revision 30902)
@@ -1,7 +1,7 @@
 #include <librnd/core/event.h>
 
-void pcb_layer_menu_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_layer_menu_vis_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_layer_menu_key_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_layer_menu_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_layer_menu_vis_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_layer_menu_key_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 
 
Index: trunk/src_plugins/lib_hid_pcbui/layersel.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/layersel.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_pcbui/layersel.c	(revision 30902)
@@ -838,13 +838,13 @@
 	}
 }
 
-void pcb_layersel_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_layersel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL))
 		layersel_build();
 }
 
-void pcb_layersel_vis_chg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_layersel_vis_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((!layersel.sub_inited) || (layersel.lock_vis > 0))
 		return;
@@ -851,7 +851,7 @@
 	layersel_update_vis(&layersel, PCB);
 }
 
-void pcb_layersel_stack_chg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_layersel_stack_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL) && (layersel.sub_inited)) {
 		pcb_hid_dock_leave(&layersel.sub);
Index: trunk/src_plugins/lib_hid_pcbui/layersel.h
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/layersel.h	(revision 30901)
+++ trunk/src_plugins/lib_hid_pcbui/layersel.h	(revision 30902)
@@ -1,3 +1,3 @@
-void pcb_layersel_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_layersel_vis_chg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_layersel_stack_chg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_layersel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_layersel_vis_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_layersel_stack_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
Index: trunk/src_plugins/lib_hid_pcbui/rendering.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/rendering.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_pcbui/rendering.c	(revision 30902)
@@ -90,7 +90,7 @@
 	return common_set_layer_group(hid, group, purpose, purpi, layer, flags, is_empty, xform);
 }
 
-static void pcb_rendering_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_rendering_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	/* hook in our dispatcher */
 	gui_set_layer_group = pcb_gui->set_layer_group;
Index: trunk/src_plugins/lib_hid_pcbui/routest.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/routest.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_pcbui/routest.c	(revision 30902)
@@ -201,12 +201,12 @@
 }
 
 
-void pcb_rst_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_rst_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	rst_update();
 }
 
-void pcb_rst_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_rst_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if (PCB_HAVE_GUI_ATTR_DLG) {
 		rst_docked_create();
Index: trunk/src_plugins/lib_hid_pcbui/routest.h
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/routest.h	(revision 30901)
+++ trunk/src_plugins/lib_hid_pcbui/routest.h	(revision 30902)
@@ -2,8 +2,8 @@
 #include <librnd/core/event.h>
 #include <librnd/core/actions.h>
 
-void pcb_rst_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_rst_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_rst_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_rst_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 void pcb_rst_update_conf(conf_native_t *cfg, int arr_idx);
 
 
Index: trunk/src_plugins/lib_hid_pcbui/status.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/status.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_pcbui/status.c	(revision 30902)
@@ -302,7 +302,7 @@
 }
 
 
-void pcb_status_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_status_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL)) {
 		status_docked_create_st();
@@ -329,12 +329,12 @@
 	status_rd_pcb2dlg();
 }
 
-void pcb_status_st_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_status_st_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	status_st_pcb2dlg();
 }
 
-void pcb_status_rd_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_status_rd_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	status_rd_pcb2dlg();
 }
Index: trunk/src_plugins/lib_hid_pcbui/status.h
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/status.h	(revision 30901)
+++ trunk/src_plugins/lib_hid_pcbui/status.h	(revision 30902)
@@ -2,11 +2,11 @@
 #include <librnd/core/conf.h>
 #include <librnd/core/actions.h>
 
-void pcb_status_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_status_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 void pcb_status_st_update_conf(conf_native_t *cfg, int arr_idx);
 void pcb_status_rd_update_conf(conf_native_t *cfg, int arr_idx);
-void pcb_status_st_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_status_rd_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_status_st_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_status_rd_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 
 extern const char pcb_acts_StatusSetText[];
 extern const char pcb_acth_StatusSetText[];
Index: trunk/src_plugins/lib_hid_pcbui/title.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/title.c	(revision 30901)
+++ trunk/src_plugins/lib_hid_pcbui/title.c	(revision 30902)
@@ -56,13 +56,13 @@
 	pcb_gui->set_top_title(pcb_gui, title_buf.array);
 }
 
-static void pcb_title_board_changed_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_title_board_changed_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	brd_changed = 0;
 	update_title();
 }
 
-static void pcb_title_meta_changed_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_title_meta_changed_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if (brd_changed == PCB->Changed)
 		return;
@@ -70,7 +70,7 @@
 	update_title();
 }
 
-static void pcb_title_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_title_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	gui_inited = 1;
 	update_title();
Index: trunk/src_plugins/mincut/rats_mincut.c
===================================================================
--- trunk/src_plugins/mincut/rats_mincut.c	(revision 30901)
+++ trunk/src_plugins/mincut/rats_mincut.c	(revision 30902)
@@ -323,7 +323,7 @@
 	return bad_gr;
 }
 
-static void pcb_mincut_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_mincut_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	int *handled, *cancel;
 	pcb_any_obj_t *term;
Index: trunk/src_plugins/order/order.c
===================================================================
--- trunk/src_plugins/order/order.c	(revision 30901)
+++ trunk/src_plugins/order/order.c	(revision 30902)
@@ -193,7 +193,7 @@
 }
 
 
-static void order_menu_init(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void order_menu_init(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pcb_hid_cfg_map_anchor_menus(ANCH, order_install_menu, NULL);
 }
Index: trunk/src_plugins/order_pcbway/pcbway.c
===================================================================
--- trunk/src_plugins/order_pcbway/pcbway.c	(revision 30901)
+++ trunk/src_plugins/order_pcbway/pcbway.c	(revision 30902)
@@ -65,7 +65,7 @@
 	vts0_t country_codes;
 } pcbway_form_t;
 
-static int pcbway_cahce_update_(pcb_hidlib_t *hidlib, const char *url, const char *path, int update, pcb_wget_opts_t *wopts)
+static int pcbway_cahce_update_(rnd_hidlib_t *hidlib, const char *url, const char *path, int update, pcb_wget_opts_t *wopts)
 {
 	double mt, now = pcb_dtime();
 
@@ -88,7 +88,7 @@
 	return 0;
 }
 
-static int pcbway_cache_update(pcb_hidlib_t *hidlib)
+static int pcbway_cache_update(rnd_hidlib_t *hidlib)
 {
 	char *hdr[5];
 	pcb_wget_opts_t wopts;
@@ -186,7 +186,7 @@
 }
 
 
-static int pcbway_load_fields_(pcb_hidlib_t *hidlib, pcb_order_imp_t *imp, order_ctx_t *octx, xmlNode *root)
+static int pcbway_load_fields_(rnd_hidlib_t *hidlib, pcb_order_imp_t *imp, order_ctx_t *octx, xmlNode *root)
 {
 	xmlNode *n, *v;
 	pcbway_form_t *form = (pcbway_form_t *)octx->odata;
Index: trunk/src_plugins/rubberband_orig/rubberband.c
===================================================================
--- trunk/src_plugins/rubberband_orig/rubberband.c	(revision 30901)
+++ trunk/src_plugins/rubberband_orig/rubberband.c	(revision 30902)
@@ -1020,7 +1020,7 @@
 }
 
 /*** event handlers ***/
-static void rbe_reset(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void rbe_reset(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	rubber_ctx_t *rbnd = user_data;
 	rbnd->lines.used = 0;
@@ -1027,7 +1027,7 @@
 	rbnd->arcs.used = 0;
 }
 
-static void rbe_move(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void rbe_move(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	rubber_ctx_t *rbnd = user_data;
 	pcb_rb_line_t *ptr = rbnd->lines.array;
@@ -1129,7 +1129,7 @@
 	}
 }
 
-static void rbe_draw(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void rbe_draw(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	rubber_ctx_t *rbnd = user_data;
 	pcb_rb_line_t *ptr;
@@ -1241,7 +1241,7 @@
 	}
 }
 
-static void rbe_rotate90(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void rbe_rotate90(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	rubber_ctx_t *rbnd = user_data;
 	pcb_rb_line_t *ptr;
@@ -1292,12 +1292,12 @@
 	}
 }
 
-static void rbe_rotate(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void rbe_rotate(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 TODO("TODO")
 }
 
-static void rbe_lookup_lines(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void rbe_lookup_lines(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	rubber_ctx_t *rbnd = user_data;
 	int type = argv[1].d.i;
@@ -1307,7 +1307,7 @@
 		pcb_rubber_band_lookup_lines(rbnd, type, ptr1, ptr2, ptr3);
 }
 
-static void rbe_lookup_rats(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void rbe_lookup_rats(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	rubber_ctx_t *rbnd = user_data;
 	int type = argv[1].d.i;
@@ -1316,7 +1316,7 @@
 	pcb_rubber_band_lookup_rat_lines(rbnd, type, ptr1, ptr2, ptr3);
 }
 
-static void rbe_constrain_main_line(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void rbe_constrain_main_line(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	rubber_ctx_t *rbnd = user_data;
 	pcb_line_t *line = argv[1].d.p;
Index: trunk/src_plugins/script/live_script.c
===================================================================
--- trunk/src_plugins/script/live_script.c	(revision 30901)
+++ trunk/src_plugins/script/live_script.c	(revision 30902)
@@ -52,7 +52,7 @@
 
 typedef struct {
 	PCB_DAD_DECL_NOINIT(dlg)
-	pcb_hidlib_t *hidlib;
+	rnd_hidlib_t *hidlib;
 	char *name, *longname, *fn;
 	char **langs;
 	char **lang_engines;
@@ -94,7 +94,7 @@
 }
 
 #ifdef PCB_HAVE_SYS_FUNGW
-static int lvs_list_langs(pcb_hidlib_t *hl, live_script_t *lvs)
+static int lvs_list_langs(rnd_hidlib_t *hl, live_script_t *lvs)
 {
 	const char **path;
 	vtp0_t vl, ve;
@@ -157,7 +157,7 @@
 	return vl.used;
 }
 #else
-static int lvs_list_langs(pcb_hidlib_t *hl, live_script_t *lvs)
+static int lvs_list_langs(rnd_hidlib_t *hl, live_script_t *lvs)
 {
 	vtp0_t vl, ve;
 
@@ -196,7 +196,7 @@
 	rnd_actionva(lvs->hidlib, "livescript", arg, lvs->name, NULL);
 }
 
-static live_script_t *pcb_dlg_live_script(pcb_hidlib_t *hidlib, const char *name)
+static live_script_t *pcb_dlg_live_script(rnd_hidlib_t *hidlib, const char *name)
 {
 	pcb_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
 	char *title;
@@ -278,7 +278,7 @@
 	return 0;
 }
 
-static int live_run(pcb_hidlib_t *hl, live_script_t *lvs)
+static int live_run(rnd_hidlib_t *hl, live_script_t *lvs)
 {
 	pcb_hid_attribute_t *atxt = &lvs->dlg[lvs->wtxt];
 	pcb_hid_text_t *txt = atxt->wdata;
@@ -348,7 +348,7 @@
 }
 
 
-static int live_load(pcb_hidlib_t *hl, live_script_t *lvs, const char *fn)
+static int live_load(rnd_hidlib_t *hl, live_script_t *lvs, const char *fn)
 {
 	pcb_hid_attribute_t *atxt = &lvs->dlg[lvs->wtxt];
 	pcb_hid_text_t *txt = atxt->wdata;
@@ -389,7 +389,7 @@
 	return 0;
 }
 
-static int live_save(pcb_hidlib_t *hl, live_script_t *lvs, const char *fn)
+static int live_save(rnd_hidlib_t *hl, live_script_t *lvs, const char *fn)
 {
 	pcb_hid_attribute_t *atxt = &lvs->dlg[lvs->wtxt];
 	pcb_hid_text_t *txt = atxt->wdata;
@@ -521,7 +521,7 @@
 }
 
 
-static void lvs_menu_init(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void lvs_menu_init(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pcb_hid_cfg_map_anchor_menus(ANCH, lvs_install_menu, NULL);
 }
Index: trunk/src_plugins/serpentine/serpentine.c
===================================================================
--- trunk/src_plugins/serpentine/serpentine.c	(revision 30901)
+++ trunk/src_plugins/serpentine/serpentine.c	(revision 30902)
@@ -297,7 +297,7 @@
 	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
-static void tool_serpentine_notify_mode(pcb_hidlib_t *hl)
+static void tool_serpentine_notify_mode(rnd_hidlib_t *hl)
 {
 	int type;
 	pcb_any_obj_t *term_obj;
Index: trunk/src_plugins/shape/shape_dialog.c
===================================================================
--- trunk/src_plugins/shape/shape_dialog.c	(revision 30901)
+++ trunk/src_plugins/shape/shape_dialog.c	(revision 30902)
@@ -115,7 +115,7 @@
 }
 
 
-static void shape_layer_chg(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void shape_layer_chg(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	void *hid_ctx;
 	int tab;
Index: trunk/src_plugins/sketch_route/sketch_route.c
===================================================================
--- trunk/src_plugins/sketch_route/sketch_route.c	(revision 30901)
+++ trunk/src_plugins/sketch_route/sketch_route.c	(revision 30902)
@@ -787,7 +787,7 @@
 
 
 /*** sketch line tool ***/
-static void tool_skline_adjust_attached_objects(pcb_hidlib_t *hl);
+static void tool_skline_adjust_attached_objects(rnd_hidlib_t *hl);
 
 struct {
 	pcb_any_obj_t *start_term;
@@ -1017,7 +1017,7 @@
 	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
-static void tool_skline_notify_mode(pcb_hidlib_t *hl)
+static void tool_skline_notify_mode(rnd_hidlib_t *hl)
 {
 	int type;
 	void *ptr1, *ptr2, *ptr3;
@@ -1067,7 +1067,7 @@
 	}
 }
 
-static void tool_skline_adjust_attached_objects(pcb_hidlib_t *hl)
+static void tool_skline_adjust_attached_objects(rnd_hidlib_t *hl)
 {
 	int last = vtp0_len(&attached_path.lines) - 1;
 	if (last >= 0) {
@@ -1076,7 +1076,7 @@
 	}
 }
 
-static void tool_skline_draw_attached(pcb_hidlib_t *hl)
+static void tool_skline_draw_attached(rnd_hidlib_t *hl)
 {
 	int i;
 	if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) {
@@ -1088,7 +1088,7 @@
 	}
 }
 
-pcb_bool tool_skline_undo_act(pcb_hidlib_t *hl)
+pcb_bool tool_skline_undo_act(rnd_hidlib_t *hl)
 {
 	/* TODO */
 	return pcb_false;
Index: trunk/src_plugins/stroke/stroke.c
===================================================================
--- trunk/src_plugins/stroke/stroke.c	(revision 30901)
+++ trunk/src_plugins/stroke/stroke.c	(revision 30902)
@@ -56,7 +56,7 @@
 static pcb_coord_t stroke_first_x, stroke_first_y, stroke_last_x, stroke_last_y;
 static pcb_bool pcb_mid_stroke = pcb_false;
 
-static int pcb_stroke_exec(pcb_hidlib_t *hl, const char *seq)
+static int pcb_stroke_exec(rnd_hidlib_t *hl, const char *seq)
 {
 	pcb_conf_listitem_t *item;
 	int idx;
@@ -70,7 +70,7 @@
 	return 0;
 }
 
-static void pcb_stroke_finish(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_stroke_finish(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	char msg[255];
 	int *handled = argv[1].d.p;
@@ -83,7 +83,7 @@
 		*handled = pcb_stroke_exec(hidlib, msg);
 }
 
-static void pcb_stroke_record(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_stroke_record(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pcb_coord_t ev_x = argv[1].d.c, ev_y = argv[2].d.c;
 
@@ -98,7 +98,7 @@
 	return;
 }
 
-static void pcb_stroke_start(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_stroke_start(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pcb_coord_t ev_x = argv[1].d.c, ev_y = argv[2].d.c;
 	pcb_mid_stroke = pcb_true;
Index: trunk/src_plugins/tool_std/tool_arc.c
===================================================================
--- trunk/src_plugins/tool_std/tool_arc.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_arc.c	(revision 30902)
@@ -74,7 +74,7 @@
 	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
-void pcb_tool_arc_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_arc_notify_mode(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -132,12 +132,12 @@
 	}
 }
 
-void pcb_tool_arc_adjust_attached_objects(pcb_hidlib_t *hl)
+void pcb_tool_arc_adjust_attached_objects(rnd_hidlib_t *hl)
 {
 	pcb_crosshair.AttachedBox.otherway = pcb_gui->shift_is_pressed(pcb_gui);
 }
 
-void pcb_tool_arc_draw_attached(pcb_hidlib_t *hl)
+void pcb_tool_arc_draw_attached(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -171,7 +171,7 @@
 
 }
 
-pcb_bool pcb_tool_arc_undo_act(pcb_hidlib_t *hl)
+pcb_bool pcb_tool_arc_undo_act(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_SECOND) {
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
@@ -193,7 +193,7 @@
 	return pcb_true;
 }
 
-void pcb_tool_arc_escape(pcb_hidlib_t *hl)
+void pcb_tool_arc_escape(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
 		pcb_tool_select_by_name(hl, "arrow");
Index: trunk/src_plugins/tool_std/tool_arc.h
===================================================================
--- trunk/src_plugins/tool_std/tool_arc.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_arc.h	(revision 30902)
@@ -2,7 +2,7 @@
 
 void pcb_tool_arc_init(void);
 void pcb_tool_arc_uninit(void);
-void pcb_tool_arc_notify_mode(pcb_hidlib_t *hl);
-void pcb_tool_arc_adjust_attached_objects(pcb_hidlib_t *hl);
-void pcb_tool_arc_draw_attached(pcb_hidlib_t *hl);
-pcb_bool pcb_tool_arc_undo_act(pcb_hidlib_t *hl);
+void pcb_tool_arc_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_arc_adjust_attached_objects(rnd_hidlib_t *hl);
+void pcb_tool_arc_draw_attached(rnd_hidlib_t *hl);
+pcb_bool pcb_tool_arc_undo_act(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_arrow.c
===================================================================
--- trunk/src_plugins/tool_std/tool_arrow.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_arrow.c	(revision 30902)
@@ -64,7 +64,7 @@
 	 at the initial click event) */
 static void click_timer_cb(pcb_hidval_t hv)
 {
-	pcb_hidlib_t *hl = hv.ptr;
+	rnd_hidlib_t *hl = hv.ptr;
 	pcb_board_t *pcb = hv.ptr;
 
 	if (hl->tool_click) {
@@ -134,7 +134,7 @@
 	}
 }
 
-void pcb_tool_arrow_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_arrow_notify_mode(rnd_hidlib_t *hl)
 {
 	void *ptr1, *ptr2, *ptr3;
 	int otype, type;
@@ -177,7 +177,7 @@
 	}
 }
 
-void pcb_tool_arrow_release_mode(pcb_hidlib_t *hl)
+void pcb_tool_arrow_release_mode(rnd_hidlib_t *hl)
 {
 	pcb_box_t box;
 	pcb_board_t *pcb = (pcb_board_t *)hl;
@@ -229,7 +229,7 @@
 	}
 }
 
-void pcb_tool_arrow_adjust_attached_objects(pcb_hidlib_t *hl)
+void pcb_tool_arrow_adjust_attached_objects(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedBox.State) {
 		pcb_crosshair.AttachedBox.Point2.X = pcb_crosshair.X;
Index: trunk/src_plugins/tool_std/tool_arrow.h
===================================================================
--- trunk/src_plugins/tool_std/tool_arrow.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_arrow.h	(revision 30902)
@@ -1,6 +1,6 @@
 extern pcb_tool_t pcb_tool_arrow;
 
 void pcb_tool_arrow_uninit(void);
-void pcb_tool_arrow_notify_mode(pcb_hidlib_t *hl);
-void pcb_tool_arrow_release_mode(pcb_hidlib_t *hl);
-void pcb_tool_arrow_adjust_attached_objects(pcb_hidlib_t *hl);
+void pcb_tool_arrow_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_arrow_release_mode(rnd_hidlib_t *hl);
+void pcb_tool_arrow_adjust_attached_objects(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_buffer.c
===================================================================
--- trunk/src_plugins/tool_std/tool_buffer.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_buffer.c	(revision 30902)
@@ -53,7 +53,7 @@
 {
 }
 
-static void pcb_tool_buffer_notify_mode_(pcb_hidlib_t *hl, pcb_bool keep_ids)
+static void pcb_tool_buffer_notify_mode_(rnd_hidlib_t *hl, pcb_bool keep_ids)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -68,12 +68,12 @@
 	}
 }
 
-void pcb_tool_buffer_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_buffer_notify_mode(rnd_hidlib_t *hl)
 {
 	pcb_tool_buffer_notify_mode_(hl, pcb_false);
 }
 
-void pcb_tool_buffer_release_mode(pcb_hidlib_t *hl)
+void pcb_tool_buffer_release_mode(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -87,13 +87,13 @@
 	}
 }
 
-void pcb_tool_buffer_adjust_attached_objects(pcb_hidlib_t *hl)
+void pcb_tool_buffer_adjust_attached_objects(rnd_hidlib_t *hl)
 {
 	pcb_crosshair.AttachedObject.tx = pcb_crosshair.X;
 	pcb_crosshair.AttachedObject.ty = pcb_crosshair.Y;
 }
 
-void pcb_tool_buffer_draw_attached(pcb_hidlib_t *hl)
+void pcb_tool_buffer_draw_attached(rnd_hidlib_t *hl)
 {
 	pcb_xordraw_buffer(PCB_PASTEBUFFER);
 }
Index: trunk/src_plugins/tool_std/tool_buffer.h
===================================================================
--- trunk/src_plugins/tool_std/tool_buffer.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_buffer.h	(revision 30902)
@@ -2,6 +2,6 @@
 
 void pcb_tool_buffer_init(void);
 void pcb_tool_buffer_uninit(void);
-void pcb_tool_buffer_notify_mode(pcb_hidlib_t *hl);
-void pcb_tool_buffer_release_mode(pcb_hidlib_t *hl);
-void pcb_tool_buffer_draw_attached(pcb_hidlib_t *hl);
+void pcb_tool_buffer_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_buffer_release_mode(rnd_hidlib_t *hl);
+void pcb_tool_buffer_draw_attached(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_copy.c
===================================================================
--- trunk/src_plugins/tool_std/tool_copy.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_copy.c	(revision 30902)
@@ -50,7 +50,7 @@
 	pcb_crosshair.extobj_edit = NULL;
 }
 
-void pcb_tool_copy_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_copy_notify_mode(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -92,7 +92,7 @@
 	}
 }
 
-void pcb_tool_copy_release_mode(pcb_hidlib_t *hl)
+void pcb_tool_copy_release_mode(rnd_hidlib_t *hl)
 {
 	if (hl->tool_hit) {
 		pcb_tool_copy_notify_mode(hl);
@@ -100,18 +100,18 @@
 	}
 }
 
-void pcb_tool_copy_adjust_attached_objects(pcb_hidlib_t *hl)
+void pcb_tool_copy_adjust_attached_objects(rnd_hidlib_t *hl)
 {
 	pcb_crosshair.AttachedObject.tx = pcb_crosshair.X;
 	pcb_crosshair.AttachedObject.ty = pcb_crosshair.Y;
 }
 
-void pcb_tool_copy_draw_attached(pcb_hidlib_t *hl)
+void pcb_tool_copy_draw_attached(rnd_hidlib_t *hl)
 {
 	pcb_xordraw_movecopy();
 }
 
-pcb_bool pcb_tool_copy_undo_act(pcb_hidlib_t *hl)
+pcb_bool pcb_tool_copy_undo_act(rnd_hidlib_t *hl)
 {
 	/* don't allow undo in the middle of an operation */
 	if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST)
Index: trunk/src_plugins/tool_std/tool_copy.h
===================================================================
--- trunk/src_plugins/tool_std/tool_copy.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_copy.h	(revision 30902)
@@ -1,7 +1,7 @@
 extern pcb_tool_t pcb_tool_copy;
 
 void pcb_tool_copy_uninit(void);
-void pcb_tool_copy_notify_mode(pcb_hidlib_t *hl);
-void pcb_tool_copy_release_mode(pcb_hidlib_t *hl);
-void pcb_tool_copy_draw_attached(pcb_hidlib_t *hl);
-pcb_bool pcb_tool_copy_undo_act(pcb_hidlib_t *hl);
+void pcb_tool_copy_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_copy_release_mode(rnd_hidlib_t *hl);
+void pcb_tool_copy_draw_attached(rnd_hidlib_t *hl);
+pcb_bool pcb_tool_copy_undo_act(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_insert.c
===================================================================
--- trunk/src_plugins/tool_std/tool_insert.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_insert.c	(revision 30902)
@@ -60,7 +60,7 @@
 	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
-void pcb_tool_insert_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_insert_notify_mode(rnd_hidlib_t *hl)
 {
 	switch (pcb_crosshair.AttachedObject.State) {
 		/* first notify, lookup object */
@@ -113,7 +113,7 @@
 	}
 }
 
-void pcb_tool_insert_adjust_attached_objects(pcb_hidlib_t *hl)
+void pcb_tool_insert_adjust_attached_objects(rnd_hidlib_t *hl)
 {
 	pcb_point_t *pnt;
 	pnt = pcb_adjust_insert_point();
@@ -121,12 +121,12 @@
 		InsertedPoint = *pnt;
 }
 
-void pcb_tool_insert_draw_attached(pcb_hidlib_t *hl)
+void pcb_tool_insert_draw_attached(rnd_hidlib_t *hl)
 {
 	pcb_xordraw_insert_pt_obj();
 }
 
-pcb_bool pcb_tool_insert_undo_act(pcb_hidlib_t *hl)
+pcb_bool pcb_tool_insert_undo_act(rnd_hidlib_t *hl)
 {
 	/* don't allow undo in the middle of an operation */
 	if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST)
Index: trunk/src_plugins/tool_std/tool_insert.h
===================================================================
--- trunk/src_plugins/tool_std/tool_insert.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_insert.h	(revision 30902)
@@ -1,7 +1,7 @@
 extern pcb_tool_t pcb_tool_insert;
 
 void pcb_tool_insert_uninit(void);
-void pcb_tool_insert_notify_mode(pcb_hidlib_t *hl);
-void pcb_tool_insert_adjust_attached_objects(pcb_hidlib_t *hl);
-void pcb_tool_insert_draw_attached(pcb_hidlib_t *hl);
-pcb_bool pcb_tool_insert_undo_act(pcb_hidlib_t *hl);
+void pcb_tool_insert_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_insert_adjust_attached_objects(rnd_hidlib_t *hl);
+void pcb_tool_insert_draw_attached(rnd_hidlib_t *hl);
+pcb_bool pcb_tool_insert_undo_act(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_line.c
===================================================================
--- trunk/src_plugins/tool_std/tool_line.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_line.c	(revision 30902)
@@ -97,7 +97,7 @@
 }
 
 /* creates points of a line (when clicked) */
-static void notify_line(pcb_hidlib_t *hl)
+static void notify_line(rnd_hidlib_t *hl)
 {
 	int type = PCB_OBJ_VOID;
 	void *ptr1, *ptr2, *ptr3;
@@ -142,7 +142,7 @@
 	}
 }
 
-void pcb_tool_line_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_line_notify_mode(rnd_hidlib_t *hl)
 {
 	void *ptr1, *ptr2, *ptr3;
 	pcb_board_t *pcb = (pcb_board_t *)hl;
@@ -338,7 +338,7 @@
 	}
 }
 
-void pcb_tool_line_adjust_attached_objects(pcb_hidlib_t *hl)
+void pcb_tool_line_adjust_attached_objects(rnd_hidlib_t *hl)
 {
 	/* don't draw outline when ctrl key is pressed */
 	if (pcb_gui->control_is_pressed(pcb_gui)) {
@@ -350,7 +350,7 @@
 	}
 }
 
-void pcb_tool_line_draw_attached(pcb_hidlib_t *hl)
+void pcb_tool_line_draw_attached(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -389,7 +389,7 @@
 	}
 }
 
-pcb_bool pcb_tool_line_undo_act(pcb_hidlib_t *hl)
+pcb_bool pcb_tool_line_undo_act(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -457,7 +457,7 @@
 	return pcb_true;
 }
 
-pcb_bool pcb_tool_line_redo_act(pcb_hidlib_t *hl)
+pcb_bool pcb_tool_line_redo_act(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -475,7 +475,7 @@
 	return pcb_false;
 }
 
-void pcb_tool_line_escape(pcb_hidlib_t *hl)
+void pcb_tool_line_escape(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
 		pcb_tool_select_by_name(hl, "arrow");
Index: trunk/src_plugins/tool_std/tool_line.h
===================================================================
--- trunk/src_plugins/tool_std/tool_line.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_line.h	(revision 30902)
@@ -2,8 +2,8 @@
 
 void pcb_tool_line_init(void);
 void pcb_tool_line_uninit(void);
-void pcb_tool_line_notify_mode(pcb_hidlib_t *hl);
-void pcb_tool_line_adjust_attached_objects(pcb_hidlib_t *hl);
-void pcb_tool_line_draw_attached(pcb_hidlib_t *hl);
-pcb_bool pcb_tool_line_undo_act(pcb_hidlib_t *hl);
-pcb_bool pcb_tool_line_redo_act(pcb_hidlib_t *hl);
+void pcb_tool_line_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_line_adjust_attached_objects(rnd_hidlib_t *hl);
+void pcb_tool_line_draw_attached(rnd_hidlib_t *hl);
+pcb_bool pcb_tool_line_undo_act(rnd_hidlib_t *hl);
+pcb_bool pcb_tool_line_redo_act(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_lock.c
===================================================================
--- trunk/src_plugins/tool_std/tool_lock.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_lock.c	(revision 30902)
@@ -46,7 +46,7 @@
 
 #define PCB_OBJ_CLASS_LOCK (PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_SUBC | PCB_OBJ_TEXT | PCB_OBJ_LOCKED)
 
-void pcb_tool_lock_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_lock_notify_mode(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	void *ptr1, *ptr2, *ptr3;
Index: trunk/src_plugins/tool_std/tool_lock.h
===================================================================
--- trunk/src_plugins/tool_std/tool_lock.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_lock.h	(revision 30902)
@@ -1,3 +1,3 @@
 extern pcb_tool_t pcb_tool_lock;
 
-void pcb_tool_lock_notify_mode(pcb_hidlib_t *hl);
+void pcb_tool_lock_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_move.c
===================================================================
--- trunk/src_plugins/tool_std/tool_move.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_move.c	(revision 30902)
@@ -52,7 +52,7 @@
 	pcb_crosshair.extobj_edit = NULL;
 }
 
-void pcb_tool_move_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_move_notify_mode(rnd_hidlib_t *hl)
 {
 	pcb_coord_t dx, dy;
 
@@ -101,7 +101,7 @@
 	}
 }
 
-void pcb_tool_move_release_mode(pcb_hidlib_t *hl)
+void pcb_tool_move_release_mode(rnd_hidlib_t *hl)
 {
 	if (hl->tool_hit) {
 		pcb_tool_move_notify_mode(hl);
@@ -109,18 +109,18 @@
 	}
 }
 
-void pcb_tool_move_adjust_attached_objects(pcb_hidlib_t *hl)
+void pcb_tool_move_adjust_attached_objects(rnd_hidlib_t *hl)
 {
 	pcb_crosshair.AttachedObject.tx = pcb_crosshair.X;
 	pcb_crosshair.AttachedObject.ty = pcb_crosshair.Y;
 }
 
-void pcb_tool_move_draw_attached(pcb_hidlib_t *hl)
+void pcb_tool_move_draw_attached(rnd_hidlib_t *hl)
 {
 	pcb_xordraw_movecopy();
 }
 
-pcb_bool pcb_tool_move_undo_act(pcb_hidlib_t *hl)
+pcb_bool pcb_tool_move_undo_act(rnd_hidlib_t *hl)
 {
 	/* don't allow undo in the middle of an operation */
 	if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST)
Index: trunk/src_plugins/tool_std/tool_move.h
===================================================================
--- trunk/src_plugins/tool_std/tool_move.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_move.h	(revision 30902)
@@ -1,7 +1,7 @@
 extern pcb_tool_t pcb_tool_move;
 
 void pcb_tool_move_uninit(void);
-void pcb_tool_move_notify_mode(pcb_hidlib_t *hl);
-void pcb_tool_move_release_mode(pcb_hidlib_t *hl);
-void pcb_tool_move_draw_attached(pcb_hidlib_t *hl);
-pcb_bool pcb_tool_move_undo_act(pcb_hidlib_t *hl);
+void pcb_tool_move_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_move_release_mode(rnd_hidlib_t *hl);
+void pcb_tool_move_draw_attached(rnd_hidlib_t *hl);
+pcb_bool pcb_tool_move_undo_act(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_poly.c
===================================================================
--- trunk/src_plugins/tool_std/tool_poly.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_poly.c	(revision 30902)
@@ -53,7 +53,7 @@
 TODO("remove this when pcb_tool_poly_notify_mode() loses PCB")
 #include "board.h"
 
-void pcb_tool_poly_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_poly_notify_mode(rnd_hidlib_t *hl)
 {
 	pcb_point_t *points = pcb_crosshair.AttachedPolygon.Points;
 	pcb_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN;
@@ -98,7 +98,7 @@
 	}
 }
 
-void pcb_tool_poly_adjust_attached_objects(pcb_hidlib_t *hl)
+void pcb_tool_poly_adjust_attached_objects(rnd_hidlib_t *hl)
 {
 	pcb_attached_line_t *line = &pcb_crosshair.AttachedLine;
 
@@ -117,7 +117,7 @@
 	pcb_line_45(line);
 }
 
-void pcb_tool_poly_draw_attached(pcb_hidlib_t *hl)
+void pcb_tool_poly_draw_attached(rnd_hidlib_t *hl)
 {
 	/* draw only if starting point is set */
 	if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST)
@@ -131,7 +131,7 @@
 	}
 }
 
-pcb_bool pcb_tool_poly_undo_act(pcb_hidlib_t *hl)
+pcb_bool pcb_tool_poly_undo_act(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedPolygon.PointN) {
 		pcb_polygon_go_to_prev_point();
@@ -140,7 +140,7 @@
 	return pcb_true;
 }
 
-pcb_bool pcb_tool_poly_redo_act(pcb_hidlib_t *hl)
+pcb_bool pcb_tool_poly_redo_act(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedPolygon.PointN) {
 		pcb_polygon_go_to_next_point();
@@ -150,7 +150,7 @@
 		return pcb_true;
 }
 
-void pcb_tool_poly_escape(pcb_hidlib_t *hl)
+void pcb_tool_poly_escape(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
 		pcb_tool_select_by_name(hl, "arrow");
Index: trunk/src_plugins/tool_std/tool_poly.h
===================================================================
--- trunk/src_plugins/tool_std/tool_poly.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_poly.h	(revision 30902)
@@ -1,8 +1,8 @@
 extern pcb_tool_t pcb_tool_poly;
 
 void pcb_tool_poly_uninit(void);
-void pcb_tool_poly_notify_mode(pcb_hidlib_t *hl);
-void pcb_tool_poly_adjust_attached_objects(pcb_hidlib_t *hl);
-void pcb_tool_poly_draw_attached(pcb_hidlib_t *hl);
-pcb_bool pcb_tool_poly_undo_act(pcb_hidlib_t *hl);
-pcb_bool pcb_tool_poly_redo_act(pcb_hidlib_t *hl);
+void pcb_tool_poly_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_poly_adjust_attached_objects(rnd_hidlib_t *hl);
+void pcb_tool_poly_draw_attached(rnd_hidlib_t *hl);
+pcb_bool pcb_tool_poly_undo_act(rnd_hidlib_t *hl);
+pcb_bool pcb_tool_poly_redo_act(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_polyhole.c
===================================================================
--- trunk/src_plugins/tool_std/tool_polyhole.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_polyhole.c	(revision 30902)
@@ -54,7 +54,7 @@
 TODO("remove this when pcb_tool_polyhole_notify_mode() loses PCB")
 #include "board.h"
 
-void pcb_tool_polyhole_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_polyhole_notify_mode(rnd_hidlib_t *hl)
 {
 	switch (pcb_crosshair.AttachedObject.State) {
 		/* first notify, lookup object */
@@ -128,7 +128,7 @@
 	}
 }
 
-void pcb_tool_polyhole_adjust_attached_objects(pcb_hidlib_t *hl)
+void pcb_tool_polyhole_adjust_attached_objects(rnd_hidlib_t *hl)
 {
 	pcb_attached_line_t *line = &pcb_crosshair.AttachedLine;
 
@@ -147,7 +147,7 @@
 	pcb_line_45(line);
 }
 
-void pcb_tool_polyhole_draw_attached(pcb_hidlib_t *hl)
+void pcb_tool_polyhole_draw_attached(rnd_hidlib_t *hl)
 {
 	/* draw only if starting point is set */
 	if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST)
@@ -161,7 +161,7 @@
 	}
 }
 
-pcb_bool pcb_tool_polyhole_undo_act(pcb_hidlib_t *hl)
+pcb_bool pcb_tool_polyhole_undo_act(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedPolygon.PointN) {
 		pcb_polygon_go_to_prev_point();
@@ -170,7 +170,7 @@
 	return pcb_true;
 }
 
-pcb_bool pcb_tool_polyhole_redo_act(pcb_hidlib_t *hl)
+pcb_bool pcb_tool_polyhole_redo_act(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedPolygon.PointN) {
 		pcb_polygon_go_to_next_point();
@@ -180,7 +180,7 @@
 		return pcb_true;
 }
 
-void pcb_tool_polyhole_escape(pcb_hidlib_t *hl)
+void pcb_tool_polyhole_escape(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
 		pcb_tool_select_by_name(hl, "arrow");
Index: trunk/src_plugins/tool_std/tool_polyhole.h
===================================================================
--- trunk/src_plugins/tool_std/tool_polyhole.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_polyhole.h	(revision 30902)
@@ -1,8 +1,8 @@
 extern pcb_tool_t pcb_tool_polyhole;
 
 void pcb_tool_polyhole_uninit(void);
-void pcb_tool_polyhole_notify_mode(pcb_hidlib_t *hl);
-void pcb_tool_polyhole_adjust_attached_objects(pcb_hidlib_t *hl);
-void pcb_tool_polyhole_draw_attached(pcb_hidlib_t *hl);
-pcb_bool pcb_tool_polyhole_undo_act(pcb_hidlib_t *hl);
-pcb_bool pcb_tool_polyhole_redo_act(pcb_hidlib_t *hl);
+void pcb_tool_polyhole_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_polyhole_adjust_attached_objects(rnd_hidlib_t *hl);
+void pcb_tool_polyhole_draw_attached(rnd_hidlib_t *hl);
+pcb_bool pcb_tool_polyhole_undo_act(rnd_hidlib_t *hl);
+pcb_bool pcb_tool_polyhole_redo_act(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_rectangle.c
===================================================================
--- trunk/src_plugins/tool_std/tool_rectangle.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_rectangle.c	(revision 30902)
@@ -53,7 +53,7 @@
 	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
-void pcb_tool_rectangle_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_rectangle_notify_mode(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -94,7 +94,7 @@
 	}
 }
 
-void pcb_tool_rectangle_adjust_attached_objects(pcb_hidlib_t *hl)
+void pcb_tool_rectangle_adjust_attached_objects(rnd_hidlib_t *hl)
 {
 	switch (pcb_crosshair.AttachedBox.State) {
 	case PCB_CH_STATE_SECOND:						/* one corner is selected */
@@ -107,7 +107,7 @@
 	}
 }
 
-pcb_bool pcb_tool_rectangle_anydo_act(pcb_hidlib_t *hl)
+pcb_bool pcb_tool_rectangle_anydo_act(rnd_hidlib_t *hl)
 {
 	/* don't allow undo in the middle of an operation */
 	if (pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST)
@@ -115,7 +115,7 @@
 	return pcb_true;
 }
 
-void pcb_tool_rectangle_escape(pcb_hidlib_t *hl)
+void pcb_tool_rectangle_escape(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
 		pcb_tool_select_by_name(hl, "arrow");
Index: trunk/src_plugins/tool_std/tool_rectangle.h
===================================================================
--- trunk/src_plugins/tool_std/tool_rectangle.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_rectangle.h	(revision 30902)
@@ -1,6 +1,6 @@
 extern pcb_tool_t pcb_tool_rectangle;
 
 void pcb_tool_rectangle_uninit(void);
-void pcb_tool_rectangle_notify_mode(pcb_hidlib_t *hl);
-void pcb_tool_rectangle_adjust_attached_objects(pcb_hidlib_t *hl);
-pcb_bool pcb_tool_rectangle_undo_act(pcb_hidlib_t *hl);
+void pcb_tool_rectangle_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_rectangle_adjust_attached_objects(rnd_hidlib_t *hl);
+pcb_bool pcb_tool_rectangle_undo_act(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_remove.c
===================================================================
--- trunk/src_plugins/tool_std/tool_remove.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_remove.c	(revision 30902)
@@ -46,7 +46,7 @@
 #include "tool_logic.h"
 
 
-void pcb_tool_remove_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_remove_notify_mode(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	void *ptr1, *ptr2, *ptr3;
Index: trunk/src_plugins/tool_std/tool_remove.h
===================================================================
--- trunk/src_plugins/tool_std/tool_remove.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_remove.h	(revision 30902)
@@ -1,3 +1,3 @@
 extern pcb_tool_t pcb_tool_remove;
 
-void pcb_tool_remove_notify_mode(pcb_hidlib_t *hl);
+void pcb_tool_remove_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_rotate.c
===================================================================
--- trunk/src_plugins/tool_std/tool_rotate.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_rotate.c	(revision 30902)
@@ -42,7 +42,7 @@
 #include "crosshair.h"
 
 
-void pcb_tool_rotate_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_rotate_notify_mode(rnd_hidlib_t *hl)
 {
 	pcb_screen_obj_rotate90((pcb_board_t *)hl, hl->tool_x, hl->tool_y,
 		pcb_gui->shift_is_pressed(pcb_gui) ? (conf_core.editor.show_solder_side ? 1 : 3) : (conf_core.editor.show_solder_side ? 3 : 1));
Index: trunk/src_plugins/tool_std/tool_rotate.h
===================================================================
--- trunk/src_plugins/tool_std/tool_rotate.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_rotate.h	(revision 30902)
@@ -1,3 +1,3 @@
 extern pcb_tool_t pcb_tool_rotate;
 
-void pcb_tool_rotate_notify_mode(pcb_hidlib_t *hl);
+void pcb_tool_rotate_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_text.c
===================================================================
--- trunk/src_plugins/tool_std/tool_text.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_text.c	(revision 30902)
@@ -45,7 +45,7 @@
 #include "obj_text_draw.h"
 
 
-void pcb_tool_text_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_text_notify_mode(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	char *string;
@@ -70,7 +70,7 @@
 	}
 }
 
-void pcb_tool_text_draw_attached(pcb_hidlib_t *hl)
+void pcb_tool_text_draw_attached(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	pcb_text_t text;
Index: trunk/src_plugins/tool_std/tool_text.h
===================================================================
--- trunk/src_plugins/tool_std/tool_text.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_text.h	(revision 30902)
@@ -1,3 +1,3 @@
 extern pcb_tool_t pcb_tool_text;
 
-void pcb_tool_text_notify_mode(pcb_hidlib_t *hl);
+void pcb_tool_text_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_thermal.c
===================================================================
--- trunk/src_plugins/tool_std/tool_thermal.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_thermal.c	(revision 30902)
@@ -89,7 +89,7 @@
 }
 
 
-void pcb_tool_thermal_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_thermal_notify_mode(rnd_hidlib_t *hl)
 {
 	void *ptr1, *ptr2, *ptr3;
 	int type;
Index: trunk/src_plugins/tool_std/tool_thermal.h
===================================================================
--- trunk/src_plugins/tool_std/tool_thermal.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_thermal.h	(revision 30902)
@@ -1,6 +1,6 @@
 extern pcb_tool_t pcb_tool_thermal;
 
-void pcb_tool_thermal_notify_mode(pcb_hidlib_t *hl);
+void pcb_tool_thermal_notify_mode(rnd_hidlib_t *hl);
 
 /* direct call: cycle through thermal modes on a padstack - provided for tool_via.h */
 void pcb_tool_thermal_on_pstk(pcb_pstk_t *ps, unsigned long lid);
Index: trunk/src_plugins/tool_std/tool_via.c
===================================================================
--- trunk/src_plugins/tool_std/tool_via.c	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_via.c	(revision 30902)
@@ -51,7 +51,7 @@
 TODO("padstack: remove this when via is removed and the padstack is created from style directly")
 #include "src_plugins/lib_compat_help/pstk_compat.h"
 
-void pcb_tool_via_notify_mode(pcb_hidlib_t *hl)
+void pcb_tool_via_notify_mode(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -92,7 +92,7 @@
 }
 
 
-void pcb_tool_via_draw_attached(pcb_hidlib_t *hl)
+void pcb_tool_via_draw_attached(rnd_hidlib_t *hl)
 {
 TODO("pstk: replace this when route style has a prototype")
 	xor_draw_fake_via(pcb_crosshair.X, pcb_crosshair.Y, conf_core.design.via_thickness, 0);
Index: trunk/src_plugins/tool_std/tool_via.h
===================================================================
--- trunk/src_plugins/tool_std/tool_via.h	(revision 30901)
+++ trunk/src_plugins/tool_std/tool_via.h	(revision 30902)
@@ -1,4 +1,4 @@
 extern pcb_tool_t pcb_tool_via;
 
-void pcb_tool_via_notify_mode(pcb_hidlib_t *hl);
-void pcb_tool_via_draw_attached(pcb_hidlib_t *hl);
+void pcb_tool_via_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_via_draw_attached(rnd_hidlib_t *hl);
Index: trunk/src_plugins/vendordrill/vendor.c
===================================================================
--- trunk/src_plugins/vendordrill/vendor.c	(revision 30901)
+++ trunk/src_plugins/vendordrill/vendor.c	(revision 30902)
@@ -640,7 +640,7 @@
 }
 
 /* Tune newly placed padstacks */
-static void vendor_new_pstk(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void vendor_new_pstk(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pcb_pstk_t *ps;
 	pcb_cardinal_t dummy;
Index: trunk/tests/librnd/glue.c
===================================================================
--- trunk/tests/librnd/glue.c	(revision 30901)
+++ trunk/tests/librnd/glue.c	(revision 30902)
@@ -18,7 +18,7 @@
 
 
 typedef struct design_s {
-	pcb_hidlib_t hidlib; /* shall be the first */
+	rnd_hidlib_t hidlib; /* shall be the first */
 } design_t;
 
 design_t CTX;
@@ -36,28 +36,28 @@
 	pcb_conf_reg_field_(NULL, 1, CFN_COORD, "should_never_match", "dummy", 0);
 }
 
-void pcb_hidlib_adjust_attached_objects(pcb_hidlib_t *hl)
+void pcb_hidlib_adjust_attached_objects(rnd_hidlib_t *hl)
 {
 }
 
-void *pcb_hidlib_crosshair_suspend(pcb_hidlib_t *hl)
+void *pcb_hidlib_crosshair_suspend(rnd_hidlib_t *hl)
 {
 	return NULL;
 }
 
-void pcb_hidlib_crosshair_restore(pcb_hidlib_t *hl, void *susp_data)
+void pcb_hidlib_crosshair_restore(rnd_hidlib_t *hl, void *susp_data)
 {
 }
 
-void pcb_hidlib_crosshair_move_to(pcb_hidlib_t *hl, pcb_coord_t abs_x, pcb_coord_t abs_y, int mouse_mot)
+void pcb_hidlib_crosshair_move_to(rnd_hidlib_t *hl, pcb_coord_t abs_x, pcb_coord_t abs_y, int mouse_mot)
 {
 }
 
-void pcbhl_draw_marks(pcb_hidlib_t *hidlib, pcb_bool inhibit_drawing_mode)
+void pcbhl_draw_marks(rnd_hidlib_t *hidlib, pcb_bool inhibit_drawing_mode)
 {
 }
 
-void pcbhl_draw_attached(pcb_hidlib_t *hidlib, pcb_bool inhibit_drawing_mode)
+void pcbhl_draw_attached(rnd_hidlib_t *hidlib, pcb_bool inhibit_drawing_mode)
 {
 }
 
Index: trunk/util/gsch2pcb-rnd/glue.c
===================================================================
--- trunk/util/gsch2pcb-rnd/glue.c	(revision 30901)
+++ trunk/util/gsch2pcb-rnd/glue.c	(revision 30902)
@@ -35,6 +35,6 @@
 
 const char *pcb_hidlib_default_embedded_menu = "";
 
-void pcb_hidlib_crosshair_move_to(pcb_hidlib_t *hl, pcb_coord_t abs_x, pcb_coord_t abs_y, int mouse_mot) { }
+void pcb_hidlib_crosshair_move_to(rnd_hidlib_t *hl, pcb_coord_t abs_x, pcb_coord_t abs_y, int mouse_mot) { }