Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 30980)
+++ trunk/src/buffer.c	(revision 30981)
@@ -208,7 +208,7 @@
 	else
 		ctx.buffer.extraflg =  0;
 
-	pcb_hid_notify_crosshair_change(hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(hidlib, pcb_false);
 	ctx.buffer.src = pcb->Data;
 	ctx.buffer.dst = Buffer->Data;
 	pcb_selected_operation(pcb, pcb->Data, fnc, &ctx, pcb_false, PCB_OBJ_ANY & (~PCB_OBJ_SUBC_PART), on_locked_too);
@@ -224,7 +224,7 @@
 	}
 	Buffer->from_outside = 0;
 	free(Buffer->source_path); Buffer->source_path = NULL;
-	pcb_hid_notify_crosshair_change(hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(hidlib, pcb_true);
 }
 
 void pcb_buffer_add_selected(pcb_board_t *pcb, pcb_buffer_t *Buffer, rnd_coord_t X, rnd_coord_t Y, rnd_bool LeaveSelected, rnd_bool keep_id)
@@ -456,7 +456,7 @@
 	RND_ACT_IRES(0);
 
 	if (angle_s == NULL)
-		angle_s = pcb_hid_prompt_for(RND_ACT_HIDLIB, "Enter Rotation (degrees, CCW):", "0", "Rotation angle");
+		angle_s = rnd_hid_prompt_for(RND_ACT_HIDLIB, "Enter Rotation (degrees, CCW):", "0", "Rotation angle");
 
 	if ((angle_s == NULL) || (*angle_s == '\0')) {
 		free(angle_s);
@@ -478,9 +478,9 @@
 		return 0;
 	}
 
-	pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+	rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 	pcb_buffer_rotate(PCB_PASTEBUFFER, ang);
-	pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+	rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 	return 0;
 }
 
@@ -593,9 +593,9 @@
 
 	RND_ACT_IRES(0);
 
-	pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+	rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 	pcb_buffer_scale(PCB_PASTEBUFFER, x, y, th, recurse);
-	pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+	rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 	return 0;
 }
 
@@ -990,7 +990,7 @@
 
 	force = (forces != NULL) && ((*forces == '1') || (*forces == 'y') || (*forces == 'Y'));
 
-	pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+	rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 	switch (op) {
 			/* clear contents of paste buffer */
 		case F_Clear:
@@ -1078,7 +1078,7 @@
 
 				if ((!force) && ((exist = pcb_fopen(RND_ACT_HIDLIB, name, "r")))) {
 					fclose(exist);
-					if (pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "Buffer: overwrite file", "File exists!  Ok to overwrite?", "cancel", 0, "yes", 1, NULL) == 1)
+					if (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "Buffer: overwrite file", "File exists!  Ok to overwrite?", "cancel", 0, "yes", 1, NULL) == 1)
 						pcb_save_buffer(name, fmt);
 				}
 				else
@@ -1118,7 +1118,7 @@
 		case F_Save:
 			name = sbufnum;
 			rv = rnd_actionva(RND_ACT_HIDLIB, "SaveTo", "PasteBuffer", name, fmt, NULL);
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 			return rv;
 
 		case F_ToLayout:
@@ -1143,7 +1143,7 @@
 				}
 
 				else {
-					pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+					rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 					RND_ACT_FAIL(PasteBuffer);
 				}
 
@@ -1166,13 +1166,13 @@
 				number = strtol(sbufnum, &end, 10);
 				if (*end != 0) {
 					rnd_message(RND_MSG_ERROR, "invalid buffer number '%s': should be an integer\n", sbufnum);
-					pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+					rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 					return FGW_ERR_ARG_CONV;
 				}
 				number--;
 				if ((number < 0) || (number >= PCB_MAX_BUFFER)) {
 					rnd_message(RND_MSG_ERROR, "invalid buffer number '%d': out of range 1..%d\n", number+1, PCB_MAX_BUFFER);
-					pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+					rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 					return FGW_ERR_ARG_CONV;
 				}
 			}
@@ -1180,7 +1180,7 @@
 				number = conf_core.editor.buffer_number;
 			res->type = FGW_STR;
 			res->val.str = pcb_buffers[number].source_path;
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 			return 0;
 
 			/* set number */
@@ -1194,12 +1194,12 @@
 			}
 	}
 
-	pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+	rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 	RND_ACT_IRES(0);
 	return 0;
 
 	error:;
-	pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+	rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 	RND_ACT_IRES(-1);
 	return 0;
 }
Index: trunk/src/change.c
===================================================================
--- trunk/src/change.c	(revision 30980)
+++ trunk/src/change.c	(revision 30981)
@@ -825,23 +825,23 @@
 			if ((parent_subc != NULL) && !PCB_FLAG_TEST(PCB_FLAG_FLOATER, obj) && !PCB_FLAG_TEST(PCB_FLAG_DYNTEXT, obj))
 				goto term_name; /* special case: dyntext floaters are rarely temrinals */
 			if ((parent_subc != NULL) && PCB_FLAG_TEST(PCB_FLAG_DYNTEXT, obj) && (strstr(((pcb_text_t *)obj)->TextString, "%a.parent.refdes%"))) {
-				if (pcb_hid_message_box(&PCB->hidlib, "question", "Text edit: refdes or template?", "Text object seems to be a refdes text", "edit the text (template)", 0, "edit subcircuit refdes", 1, NULL) == 1) {
+				if (rnd_hid_message_box(&PCB->hidlib, "question", "Text edit: refdes or template?", "Text object seems to be a refdes text", "edit the text (template)", 0, "edit subcircuit refdes", 1, NULL) == 1) {
 					obj = (pcb_any_obj_t *)parent_subc;
 					goto subc_name;
 				}
 			}
-			name = pcb_hid_prompt_for(&PCB->hidlib, "Enter text:", PCB_EMPTY(((pcb_text_t *)obj)->TextString), "Change text");
+			name = rnd_hid_prompt_for(&PCB->hidlib, "Enter text:", PCB_EMPTY(((pcb_text_t *)obj)->TextString), "Change text");
 			break;
 
 		case PCB_OBJ_SUBC:
 			subc_name:;
-			name = pcb_hid_prompt_for(&PCB->hidlib, "Subcircuit refdes:", PCB_EMPTY(((pcb_subc_t *)obj)->refdes), "Change refdes");
+			name = rnd_hid_prompt_for(&PCB->hidlib, "Subcircuit refdes:", PCB_EMPTY(((pcb_subc_t *)obj)->refdes), "Change refdes");
 			break;
 
 		default:
 			term_name:;
 			{
-				name = pcb_hid_prompt_for(&PCB->hidlib, "Enter terminal ID:", PCB_EMPTY(obj->term), "Change terminal ID");
+				name = rnd_hid_prompt_for(&PCB->hidlib, "Enter terminal ID:", PCB_EMPTY(obj->term), "Change terminal ID");
 				if (name != NULL) {
 					pcb_term_undoable_rename(PCB, obj, name);
 					pcb_draw();
Index: trunk/src/change_act.c
===================================================================
--- trunk/src/change_act.c	(revision 30980)
+++ trunk/src/change_act.c	(revision 30981)
@@ -507,7 +507,7 @@
 				if (type != PCB_OBJ_VOID) {
 					pcb_undo_save_serial();
 					if (pcb_chg_obj_name_query(ptr2)) {
-						pcb_hid_redraw(PCB);
+						rnd_hid_redraw(PCB);
 						pcb_board_set_changed_flag(pcb_true);
 						rnd_actionva(RND_ACT_HIDLIB, "DeleteRats", "AllRats", NULL);
 					}
@@ -527,7 +527,7 @@
 
 			/* change the layout's name */
 		case F_Layout:
-			name = pcb_hid_prompt_for(RND_ACT_HIDLIB, "Enter the layout name:", PCB_EMPTY(RND_ACT_HIDLIB->name), "Layout name");
+			name = rnd_hid_prompt_for(RND_ACT_HIDLIB, "Enter the layout name:", PCB_EMPTY(RND_ACT_HIDLIB->name), "Layout name");
 			/* NB: ChangeLayoutName takes ownership of the passed memory */
 			if (name && pcb_board_change_name(name))
 				pcb_board_set_changed_flag(pcb_true);
@@ -535,7 +535,7 @@
 
 			/* change the name of the active layer */
 		case F_Layer:
-			name = pcb_hid_prompt_for(RND_ACT_HIDLIB, "Enter the layer name:", PCB_EMPTY(PCB_CURRLAYER(PCB_ACT_BOARD)->name), "Layer name");
+			name = rnd_hid_prompt_for(RND_ACT_HIDLIB, "Enter the layer name:", PCB_EMPTY(PCB_CURRLAYER(PCB_ACT_BOARD)->name), "Layer name");
 			/* NB: pcb_layer_rename_ takes ownership of the passed memory */
 			if (name && (pcb_layer_rename_(PCB_CURRLAYER(PCB_ACT_BOARD), name, 1) == 0))
 				pcb_board_set_changed_flag(pcb_true);
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 30980)
+++ trunk/src/crosshair.c	(revision 30981)
@@ -721,7 +721,7 @@
 	}
 
 	if (redraw) {
-		pcb_hid_redraw(PCB);
+		rnd_hid_redraw(PCB);
 	}
 }
 
@@ -1029,7 +1029,7 @@
 		x = z;
 		z = pcb_crosshair.Y;
 		PCB->hidlib.ch_y = pcb_crosshair.Y = y;
-		pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); /* Our caller notifies when it has done */
+		rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); /* Our caller notifies when it has done */
 		/* now move forward again */
 		PCB->hidlib.ch_x = pcb_crosshair.X = x;
 		PCB->hidlib.ch_y = pcb_crosshair.Y = z;
@@ -1046,7 +1046,7 @@
 	rnd_coord_t save_grid = PCB->hidlib.grid;
 	PCB->hidlib.grid = 1;
 	if (pcb_crosshair_move_absolute(X, Y))
-		pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+		rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 	rnd_gui->set_crosshair(rnd_gui, pcb_crosshair.X, pcb_crosshair.Y, HID_SC_WARP_POINTER);
 	PCB->hidlib.grid = save_grid;
 }
@@ -1126,7 +1126,7 @@
 		/* update object position and cursor location */
 		pcb_tool_adjust_attached(&PCB->hidlib);
 		rnd_event(&PCB->hidlib, PCB_EVENT_DRAW_CROSSHAIR_CHATT, NULL);
-		pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+		rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 	}
 }
 
@@ -1142,11 +1142,11 @@
 	buf->obj = pcb_crosshair.AttachedObject.State;
 	buf->line = pcb_crosshair.AttachedLine.State;
 	buf->box = pcb_crosshair.AttachedBox.State;
-	pcb_hid_notify_crosshair_change(hl, pcb_false);
+	rnd_hid_notify_crosshair_change(hl, pcb_false);
 	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
 	pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
 	pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
-	pcb_hid_notify_crosshair_change(hl, pcb_true);
+	rnd_hid_notify_crosshair_change(hl, pcb_true);
 	return buf;
 }
 
@@ -1154,11 +1154,11 @@
 {
 	old_crosshair_t *buf = susp_data;
 
-	pcb_hid_notify_crosshair_change(hl, pcb_false);
+	rnd_hid_notify_crosshair_change(hl, pcb_false);
 	pcb_crosshair.AttachedObject.State = buf->obj;
 	pcb_crosshair.AttachedLine.State = buf->line;
 	pcb_crosshair.AttachedBox.State = buf->box;
-	pcb_hid_notify_crosshair_change(hl, pcb_true);
+	rnd_hid_notify_crosshair_change(hl, pcb_true);
 
 	free(buf);
 }
@@ -1167,10 +1167,10 @@
 void pcb_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot)
 {
 	if (!mouse_mot) {
-		pcb_hid_notify_crosshair_change(hl, pcb_false);
+		rnd_hid_notify_crosshair_change(hl, pcb_false);
 		if (pcb_crosshair_move_absolute(abs_x, abs_y))
-			pcb_hid_notify_crosshair_change(hl, pcb_true);
-		pcb_hid_notify_crosshair_change(hl, pcb_true);
+			rnd_hid_notify_crosshair_change(hl, pcb_true);
+		rnd_hid_notify_crosshair_change(hl, pcb_true);
 	}
 	else
 		pcb_event_move_crosshair(abs_x, abs_y);
Index: trunk/src/data.c
===================================================================
--- trunk/src/data.c	(revision 30980)
+++ trunk/src/data.c	(revision 30981)
@@ -764,14 +764,14 @@
 				} PCB_ENDALL_LOOP;
 				ctx->inited = 1;
 			}
-			if (pcb_hid_progress(ctx->at, ctx->total, "Clipping polygons...") != 0) {
-				int rv = pcb_hid_message_box(&PCB->hidlib, "warning", "Stop poly clipping", "The only way to cancel poly clipping is to quit pcb-rnd.\nAre you sure you want to quit?", "yes, quit pcb-rnd", 1, "no, continue clipping", 2, NULL);
+			if (rnd_hid_progress(ctx->at, ctx->total, "Clipping polygons...") != 0) {
+				int rv = rnd_hid_message_box(&PCB->hidlib, "warning", "Stop poly clipping", "The only way to cancel poly clipping is to quit pcb-rnd.\nAre you sure you want to quit?", "yes, quit pcb-rnd", 1, "no, continue clipping", 2, NULL);
 				if (rv == 1) {
 					exit(1);
 				}
 				else {
 					/* Have to recreate the dialog next time, that's the only way to get it out from the cancel state */
-					pcb_hid_progress(0, 0, NULL);
+					rnd_hid_progress(0, 0, NULL);
 				}
 			}
 		}
@@ -810,7 +810,7 @@
 	} PCB_ENDALL_LOOP;
 
 	if (enable_progbar)
-		pcb_hid_progress(0, 0, NULL);
+		rnd_hid_progress(0, 0, NULL);
 }
 
 void pcb_data_clip_dirty(pcb_data_t *data, rnd_bool enable_progbar)
Index: trunk/src/drc.c
===================================================================
--- trunk/src/drc.c	(revision 30980)
+++ trunk/src/drc.c	(revision 30981)
@@ -71,7 +71,7 @@
 	args[1].type = FGW_STR;
 
 	if (rnd_strcasecmp(dlg_type, "list") == 0) {
-		if (PCB_HAVE_GUI_ATTR_DLG) {
+		if (RND_HAVE_GUI_ATTR_DLG) {
 			args[1].val.str = "list";
 			return rnd_actionv_bin(RND_ACT_HIDLIB, dlgact, res, 2, args);
 		}
@@ -79,7 +79,7 @@
 	}
 
 	if (rnd_strcasecmp(dlg_type, "simple") == 0) {
-		if (PCB_HAVE_GUI_ATTR_DLG) {
+		if (RND_HAVE_GUI_ATTR_DLG) {
 			args[1].val.str = "simple";
 			return rnd_actionv_bin(RND_ACT_HIDLIB, dlgact, res, 2, args);
 		}
@@ -176,7 +176,7 @@
 	rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, IOIncompatList, aauto = argv[2].val.str);
 
 	if ((aauto != NULL) && (strcmp(aauto, "auto") == 0)) {
-		if (pcbhl_conf.rc.quiet && !PCB_HAVE_GUI_ATTR_DLG) {
+		if (pcbhl_conf.rc.quiet && !RND_HAVE_GUI_ATTR_DLG) {
 			/* if not explicitly asked for a listing style and we are on CLI and quiet is set, don't print anything */
 			RND_ACT_IRES(0);
 			return 0;
Index: trunk/src/file_act.c
===================================================================
--- trunk/src/file_act.c	(revision 30980)
+++ trunk/src/file_act.c	(revision 30981)
@@ -76,21 +76,21 @@
 		case F_SubcToBuffer:
 		case F_Subcircuit:
 		case F_Footprint:
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 			if (pcb_buffer_load_footprint(PCB_PASTEBUFFER, name, format))
 				pcb_tool_select_by_name(RND_ACT_HIDLIB, "buffer");
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 			break;
 
 		case F_LayoutToBuffer:
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 			if (pcb_buffer_load_layout(PCB, PCB_PASTEBUFFER, name, format))
 				pcb_tool_select_by_name(RND_ACT_HIDLIB, "buffer");
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 			break;
 
 		case F_Layout:
-			if (!PCB->Changed ||  pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "File overwrite", "OK to override layout data?", "cancel", 0, "ok", 1, NULL))
+			if (!PCB->Changed ||  rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "File overwrite", "OK to override layout data?", "cancel", 0, "ok", 1, NULL))
 				pcb_load_pcb(name, format, pcb_true, 0);
 			break;
 
@@ -112,7 +112,7 @@
 			break;
 
 		case F_Revert:
-			if (RND_ACT_HIDLIB->filename && (!PCB->Changed || (pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "Revert: lose data", "Really revert all modifications?", "no", 0, "yes", 1, NULL) == 1)))
+			if (RND_ACT_HIDLIB->filename && (!PCB->Changed || (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "Revert: lose data", "Really revert all modifications?", "no", 0, "yes", 1, NULL) == 1)))
 				pcb_revert_pcb();
 			break;
 
@@ -136,11 +136,11 @@
 
 	rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, New, argument_name = argv[1].val.str);
 
-	if (!PCB->Changed || (pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "New pcb", "OK to clear layout data?", "cancel", 0, "yes", 1, NULL) == 1)) {
+	if (!PCB->Changed || (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "New pcb", "OK to clear layout data?", "cancel", 0, "yes", 1, NULL) == 1)) {
 		if (argument_name)
 			name = rnd_strdup(argument_name);
 		else
-			name = pcb_hid_prompt_for(RND_ACT_HIDLIB, "Enter the layout name:", "", "Layout name");
+			name = rnd_hid_prompt_for(RND_ACT_HIDLIB, "Enter the layout name:", "", "Layout name");
 
 		if (!name)
 			return 1;
@@ -148,7 +148,7 @@
 /* PCB usgae: at the moment, while having only one global PCB, this function
    legitimately uses that */
 
-		pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+		rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 		/* do emergency saving
 		 * clear the old struct and allocate memory for the new one
 		 */
@@ -175,8 +175,8 @@
 		pcb_layervis_reset_stack(&PCB->hidlib);
 		pcb_center_display(PCB->hidlib.size_x / 2, PCB->hidlib.size_y / 2);
 		pcb_board_changed(0);
-		pcb_hid_redraw(PCB);
-		pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+		rnd_hid_redraw(PCB);
+		rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 		RND_ACT_IRES(0);
 		return 0;
 	}
@@ -472,7 +472,7 @@
 
 	if ((force != NULL) && (rnd_strcasecmp(force, "force") == 0))
 		exit(0);
-	if (!PCB->Changed || (pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "Close: lose data", "OK to lose data?", "cancel", 0, "ok", 1, NULL) == 1))
+	if (!PCB->Changed || (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "Close: lose data", "OK to lose data?", "cancel", 0, "ok", 1, NULL) == 1))
 		pcb_quit_app();
 	RND_ACT_IRES(-1);
 	return 0;
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 30980)
+++ trunk/src/gui_act.c	(revision 30981)
@@ -138,7 +138,7 @@
 			/* redraw layout */
 		case F_ClearAndRedraw:
 		case F_Redraw:
-			pcb_hid_redraw(PCB);
+			rnd_hid_redraw(PCB);
 			break;
 
 			/* toggle line-adjust flag */
@@ -148,7 +148,7 @@
 			break;
 
 		case F_CycleClip:
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 			if (conf_core.editor.all_direction_lines) {
 				rnd_conf_toggle_editor(all_direction_lines);
 				rnd_conf_setf(RND_CFR_DESIGN,"editor/line_refraction",-1,"%d",0);
@@ -157,27 +157,27 @@
 				rnd_conf_setf(RND_CFR_DESIGN,"editor/line_refraction",-1,"%d",(conf_core.editor.line_refraction +1) % 3);
 			}
 			pcb_tool_adjust_attached(RND_ACT_HIDLIB);
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 			break;
 
 		case F_CycleCrosshair:
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 			rnd_conf_setf(RND_CFR_CLI, "editor/crosshair_shape_idx", 0, "%d", CrosshairShapeIncrement(pcbhl_conf.editor.crosshair_shape_idx));
 			if (pcb_ch_shape_NUM == pcbhl_conf.editor.crosshair_shape_idx)
 				rnd_conf_set(RND_CFR_CLI, "editor/crosshair_shape_idx", 0, "0", RND_POL_OVERWRITE);
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 			break;
 
 		case F_ToggleRubberBandMode:
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 			rnd_conf_toggle_editor(rubber_band_mode);
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 			break;
 
 		case F_ToggleStartDirection:
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 			rnd_conf_toggle_editor(swap_start_direction);
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 			break;
 
 		case F_ToggleUniqueNames:
@@ -185,21 +185,21 @@
 			break;
 
 		case F_ToggleSnapPin:
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 			rnd_conf_toggle_editor(snap_pin);
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 			break;
 
 		case F_ToggleSnapOffGridLine:
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 			rnd_conf_toggle_editor(snap_offgrid_line);
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 			break;
 
 		case F_ToggleHighlightOnPoint:
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 			rnd_conf_toggle_editor(highlight_on_point);
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 			break;
 
 		case F_ToggleLocalRef:
@@ -208,12 +208,12 @@
 
 		case F_ToggleThindraw:
 			rnd_conf_toggle_editor(thin_draw);
-			pcb_hid_redraw(PCB);
+			rnd_hid_redraw(PCB);
 			break;
 
 		case F_ToggleThindrawPoly:
 			rnd_conf_toggle_editor(thin_draw_poly);
-			pcb_hid_redraw(PCB);
+			rnd_hid_redraw(PCB);
 			break;
 
 		case F_ToggleLockNames:
@@ -228,7 +228,7 @@
 
 		case F_ToggleHideNames:
 			rnd_conf_toggle_editor(hide_names);
-			pcb_hid_redraw(PCB);
+			rnd_hid_redraw(PCB);
 			break;
 
 		case F_ToggleStroke:
@@ -244,7 +244,7 @@
 			break;
 
 		case F_ToggleAutoDRC:
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 			rnd_conf_toggle_editor(auto_drc);
 			if (conf_core.editor.auto_drc && pcbhl_conf.editor.mode == pcb_crosshair.tool_line) {
 				if (pcb_data_clear_flag(PCB->Data, PCB_FLAG_FOUND, 1, 1) > 0) {
@@ -260,12 +260,12 @@
 					pcb_find_free(&fctx);
 				}
 			}
-			pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+			rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 			break;
 
 		case F_ToggleCheckPlanes:
 			rnd_conf_toggle_editor(check_planes);
-			pcb_hid_redraw(PCB);
+			rnd_hid_redraw(PCB);
 			break;
 
 		case F_ToggleOrthoMove:
@@ -274,7 +274,7 @@
 
 		case F_ToggleName:
 			rnd_conf_toggle_editor(show_number);
-			pcb_hid_redraw(PCB);
+			rnd_hid_redraw(PCB);
 			break;
 
 		case F_ToggleClearLine:
@@ -292,7 +292,7 @@
 
 				RND_ACT_HIDLIB->grid = 1;
 				if (pcb_crosshair_move_absolute(pcb_crosshair.X, pcb_crosshair.Y))
-					pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); /* first notify was in MoveCrosshairAbs */
+					rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); /* first notify was in MoveCrosshairAbs */
 				pcb_hidlib_set_grid(RND_ACT_HIDLIB, oldGrid, pcb_true, pcb_crosshair.X, pcb_crosshair.Y);
 				rnd_grid_inval();
 			}
@@ -301,7 +301,7 @@
 			/* toggle displaying of the grid */
 		case F_Grid:
 			rnd_conf_toggle_heditor(draw_grid);
-			pcb_hid_redraw(PCB);
+			rnd_hid_redraw(PCB);
 			break;
 
 			/* display the pinout of a subcircuit */
@@ -366,7 +366,7 @@
 				RND_ACT_HIDLIB->grid_ox = pcb_get_value(argv[2].val.str, NULL, NULL, NULL);
 				RND_ACT_HIDLIB->grid_oy = pcb_get_value(argv[3].val.str, NULL, NULL, NULL);
 				if (pcbhl_conf.editor.draw_grid)
-					pcb_hid_redraw(PCB);
+					rnd_hid_redraw(PCB);
 			}
 			break;
 
@@ -588,22 +588,22 @@
 /* set layer current and size from line or arc */
 	switch (type) {
 	case PCB_OBJ_LINE:
-		pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+		rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 		set_same_(((pcb_line_t *) ptr2)->Thickness, -1, -1, ((pcb_line_t *) ptr2)->Clearance / 2, NULL);
 		layer = (pcb_layer_t *) ptr1;
 		if (pcbhl_conf.editor.mode != pcb_crosshair.tool_line)
 			pcb_tool_select_by_name(RND_ACT_HIDLIB, "line");
-		pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+		rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 		rnd_event(RND_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL);
 		break;
 
 	case PCB_OBJ_ARC:
-		pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+		rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 		set_same_(((pcb_arc_t *) ptr2)->Thickness, -1, -1, ((pcb_arc_t *) ptr2)->Clearance / 2, NULL);
 		layer = (pcb_layer_t *) ptr1;
 		if (pcbhl_conf.editor.mode != pcb_crosshair.tool_arc)
 			pcb_tool_select_by_name(RND_ACT_HIDLIB, "arc");
-		pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+		rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 		rnd_event(RND_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL);
 		break;
 
@@ -617,7 +617,7 @@
 	}
 	if (layer != PCB_CURRLAYER(PCB_ACT_BOARD)) {
 		pcb_layervis_change_group_vis(RND_ACT_HIDLIB, pcb_layer_id(PCB_ACT_BOARD->Data, layer), pcb_true, pcb_true);
-		pcb_hid_redraw(PCB);
+		rnd_hid_redraw(PCB);
 	}
 	RND_ACT_IRES(0);
 	return 0;
Index: trunk/src/layer.c
===================================================================
--- trunk/src/layer.c	(revision 30980)
+++ trunk/src/layer.c	(revision 30981)
@@ -1071,12 +1071,12 @@
 	}
 
 	if (new_index == -1 && is_last_top_copper_layer(pcb, old_index)) {
-		pcb_hid_message_box(&pcb->hidlib, "warning", "Layer delete", "You can't delete the last top-side layer\n", "cancel", 0, NULL);
+		rnd_hid_message_box(&pcb->hidlib, "warning", "Layer delete", "You can't delete the last top-side layer\n", "cancel", 0, NULL);
 		return 1;
 	}
 
 	if (new_index == -1 && is_last_bottom_copper_layer(pcb, old_index)) {
-		pcb_hid_message_box(&pcb->hidlib, "warning", "Layer delete", "You can't delete the last bottom-side layer\n", "cancel", 0, NULL);
+		rnd_hid_message_box(&pcb->hidlib, "warning", "Layer delete", "You can't delete the last bottom-side layer\n", "cancel", 0, NULL);
 		return 1;
 	}
 
Index: trunk/src/librnd/core/hid.c
===================================================================
--- trunk/src/librnd/core/hid.c	(revision 30980)
+++ trunk/src/librnd/core/hid.c	(revision 30981)
@@ -31,7 +31,7 @@
 #include <librnd/core/hid.h>
 #include <librnd/core/event.h>
 
-void pcb_hid_notify_crosshair_change(rnd_hidlib_t *hl, rnd_bool changes_complete)
+void rnd_hid_notify_crosshair_change(rnd_hidlib_t *hl, rnd_bool changes_complete)
 {
 	if (rnd_gui->notify_crosshair_change)
 		rnd_gui->notify_crosshair_change(rnd_gui, changes_complete);
Index: trunk/src/librnd/core/hid.h
===================================================================
--- trunk/src/librnd/core/hid.h	(revision 30980)
+++ trunk/src/librnd/core/hid.h	(revision 30981)
@@ -94,7 +94,7 @@
 	RND_HID_BURST_END
 } rnd_burst_op_t;
 
-typedef enum pcb_hid_attr_ev_e {
+typedef enum rnd_hid_attr_ev_e {
 	RND_HID_ATTR_EV_WINCLOSE = 2, /* window closed (window manager close) */
 	RND_HID_ATTR_EV_CODECLOSE     /* closed by the code, including standard close buttons */
 } rnd_hid_attr_ev_t;
@@ -599,30 +599,30 @@
    value. "msg" is printed above the query. The optional title
    is the window title.
    Returns NULL on cancel. The caller needs to free the returned string */
-char *pcb_hid_prompt_for(rnd_hidlib_t *hl, const char *msg, const char *default_string, const char *title);
+char *rnd_hid_prompt_for(rnd_hidlib_t *hl, const char *msg, const char *default_string, const char *title);
 
 /* Present a dialog box with a message and variable number of buttons. If icon
    is not NULL, attempt to draw the named icon on the left. The vararg part is
    one or more buttons, as a list of "char *label, int retval", terminated with
    NULL. */
-int pcb_hid_message_box(rnd_hidlib_t *hl, const char *icon, const char *title, const char *label, ...);
+int rnd_hid_message_box(rnd_hidlib_t *hl, const char *icon, const char *title, const char *label, ...);
 
 /* Show modal progressbar to the user, offering cancel long running processes.
    Pass all zeros to flush display and remove the dialog.
    Returns nonzero if the user wishes to cancel the operation.  */
-int pcb_hid_progress(long so_far, long total, const char *message);
+int rnd_hid_progress(long so_far, long total, const char *message);
 
 /* non-zero if DAD dialogs are available currently */
-#define PCB_HAVE_GUI_ATTR_DLG \
-	((rnd_gui != NULL) && (rnd_gui->gui) && (rnd_gui->attr_dlg_new != NULL) && (rnd_gui->attr_dlg_new != pcb_nogui_attr_dlg_new))
-void *pcb_nogui_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny);
+#define RND_HAVE_GUI_ATTR_DLG \
+	((rnd_gui != NULL) && (rnd_gui->gui) && (rnd_gui->attr_dlg_new != NULL) && (rnd_gui->attr_dlg_new != rnd_nogui_attr_dlg_new))
+void *rnd_nogui_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny);
 
-int pcb_hid_dock_enter(rnd_hid_dad_subdialog_t *sub, rnd_hid_dock_t where, const char *id);
-void pcb_hid_dock_leave(rnd_hid_dad_subdialog_t *sub);
+int rnd_hid_dock_enter(rnd_hid_dad_subdialog_t *sub, rnd_hid_dock_t where, const char *id);
+void rnd_hid_dock_leave(rnd_hid_dad_subdialog_t *sub);
 
-#define pcb_hid_redraw(pcb) rnd_gui->invalidate_all(rnd_gui)
+#define rnd_hid_redraw(pcb) rnd_gui->invalidate_all(rnd_gui)
 
-#define pcb_hid_busy(pcb, is_busy) \
+#define rnd_hid_busy(pcb, is_busy) \
 do { \
 	rnd_event(&pcb->hidlib, RND_EVENT_BUSY, "i", is_busy, NULL); \
 	if ((rnd_gui != NULL) && (rnd_gui->busy != NULL)) \
@@ -643,7 +643,7 @@
  * They should initiate a redraw of the crosshair attached objects - which may
  * (if necessary) mean repainting the whole screen if the GUI hasn't tracked the
  * location of existing attached drawing. */
-void pcb_hid_notify_crosshair_change(rnd_hidlib_t *hl, rnd_bool changes_complete);
+void rnd_hid_notify_crosshair_change(rnd_hidlib_t *hl, rnd_bool changes_complete);
 
 
 #endif
Index: trunk/src/librnd/core/hid_dad.c
===================================================================
--- trunk/src/librnd/core/hid_dad.c	(revision 30980)
+++ trunk/src/librnd/core/hid_dad.c	(revision 30981)
@@ -140,7 +140,7 @@
 	return pcb_attribute_dialog_(id, attrs, n_attrs, title, caller_data, NULL, 0, 0, 0, 0, NULL);
 }
 
-int pcb_hid_dock_enter(rnd_hid_dad_subdialog_t *sub, rnd_hid_dock_t where, const char *id)
+int rnd_hid_dock_enter(rnd_hid_dad_subdialog_t *sub, rnd_hid_dock_t where, const char *id)
 {
 	if ((rnd_gui == NULL) || (rnd_gui->dock_enter == NULL))
 		return -1;
@@ -147,7 +147,7 @@
 	return rnd_gui->dock_enter(rnd_gui, sub, where, id);
 }
 
-void pcb_hid_dock_leave(rnd_hid_dad_subdialog_t *sub)
+void rnd_hid_dock_leave(rnd_hid_dad_subdialog_t *sub)
 {
 	if ((rnd_gui == NULL) || (rnd_gui->dock_leave == NULL))
 		return;
Index: trunk/src/librnd/core/hid_dlg.c
===================================================================
--- trunk/src/librnd/core/hid_dlg.c	(revision 30980)
+++ trunk/src/librnd/core/hid_dlg.c	(revision 30981)
@@ -48,7 +48,7 @@
 
 	strcpy(tmp, "gui_");
 	strncpy(tmp+4, act_name, sizeof(tmp)-5);
-	if (PCB_HAVE_GUI_ATTR_DLG && (fgw_func_lookup(&rnd_fgw, tmp) != NULL))
+	if (RND_HAVE_GUI_ATTR_DLG && (fgw_func_lookup(&rnd_fgw, tmp) != NULL))
 		return rnd_actionv_bin(RND_ACT_HIDLIB, tmp, res, argc, argv);
 
 	tmp[0] = 'c'; tmp[1] = 'l';
@@ -66,7 +66,7 @@
 	return call_dialog("promptfor", res, argc, argv);
 }
 
-char *pcb_hid_prompt_for(rnd_hidlib_t *hl, const char *msg, const char *default_string, const char *title)
+char *rnd_hid_prompt_for(rnd_hidlib_t *hl, const char *msg, const char *default_string, const char *title)
 {
 	fgw_arg_t res, argv[4];
 
@@ -92,7 +92,7 @@
 	return call_dialog("messagebox", res, argc, argv);
 }
 
-int pcb_hid_message_box(rnd_hidlib_t *hl, const char *icon, const char *title, const char *label, ...)
+int rnd_hid_message_box(rnd_hidlib_t *hl, const char *icon, const char *title, const char *label, ...)
 {
 	fgw_arg_t res, argv[128];
 	int argc;
@@ -138,17 +138,17 @@
 
 static void progress_close_cb(void *caller_data, rnd_hid_attr_ev_t ev)
 {
-	pcb_hid_progress(0, 0, NULL);
+	rnd_hid_progress(0, 0, NULL);
 }
 
 static void progress_close_btn_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
-	pcb_hid_progress(0, 0, cancel);
+	rnd_hid_progress(0, 0, cancel);
 }
 
 static void progress_refresh_cb(rnd_hidval_t user_data)
 {
-	pcb_hid_progress(0, 0, refresh);
+	rnd_hid_progress(0, 0, refresh);
 }
 
 static int pcb_gui_progress(long so_far, long total, const char *message)
@@ -244,11 +244,11 @@
 }
 
 
-int pcb_hid_progress(long so_far, long total, const char *message)
+int rnd_hid_progress(long so_far, long total, const char *message)
 {
 	if (rnd_gui == NULL)
 		return 0;
-	if ((rnd_gui->gui) && (PCB_HAVE_GUI_ATTR_DLG) && (hid_dlg_gui_inited || rnd_gui->allow_dad_before_init))
+	if ((rnd_gui->gui) && (RND_HAVE_GUI_ATTR_DLG) && (hid_dlg_gui_inited || rnd_gui->allow_dad_before_init))
 		return pcb_gui_progress(so_far, total, message);
 
 	return pcb_nogui_progress(so_far, total, message);
@@ -259,7 +259,7 @@
 /* DOC: print.html */
 static fgw_error_t pcb_act_Print(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
-	if (PCB_HAVE_GUI_ATTR_DLG && (fgw_func_lookup(&rnd_fgw, "printgui") != NULL))
+	if (RND_HAVE_GUI_ATTR_DLG && (fgw_func_lookup(&rnd_fgw, "printgui") != NULL))
 		return rnd_actionv_bin(RND_ACT_HIDLIB, "printgui", res, argc, argv);
 	rnd_message(RND_MSG_ERROR, "action Print() is available only under a GUI HID. Please use the lpr exporter instead.\n");
 	return FGW_ERR_NOT_FOUND;
Index: trunk/src/librnd/core/hid_nogui.c
===================================================================
--- trunk/src/librnd/core/hid_nogui.c	(revision 30980)
+++ trunk/src/librnd/core/hid_nogui.c	(revision 30981)
@@ -350,7 +350,7 @@
 		return rnd_strdup(answer);
 }
 
-void *pcb_nogui_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny)
+void *rnd_nogui_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny)
 {
 	CRASH("attr_dlg_new");
 }
@@ -515,7 +515,7 @@
 	hid->watch_file = nogui_watch_file;
 	hid->unwatch_file = nogui_unwatch_file;
 	hid->fileselect = nogui_fileselect;
-	hid->attr_dlg_new = pcb_nogui_attr_dlg_new;
+	hid->attr_dlg_new = rnd_nogui_attr_dlg_new;
 	hid->attr_dlg_run = nogui_attr_dlg_run;
 	hid->attr_dlg_raise = nogui_attr_dlg_raise;
 	hid->attr_dlg_close = nogui_attr_dlg_close;
Index: trunk/src/librnd/core/hid_nogui.h
===================================================================
--- trunk/src/librnd/core/hid_nogui.h	(revision 30980)
+++ trunk/src/librnd/core/hid_nogui.h	(revision 30981)
@@ -5,7 +5,7 @@
 rnd_hid_t *pcb_hid_nogui_get_hid(void);
 
 /* For checking if attr dialogs are not available: */
-void *pcb_nogui_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny);
+void *rnd_nogui_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny);
 
 int pcb_nogui_progress(long so_far, long total, const char *message);
 
Index: trunk/src/librnd/core/tool.c
===================================================================
--- trunk/src/librnd/core/tool.c	(revision 30980)
+++ trunk/src/librnd/core/tool.c	(revision 30981)
@@ -304,7 +304,7 @@
 	/* it is okay to use crosshair directly here, the mode command is called from a click when it needs coords */
 	hidlib->tool_x = hidlib->ch_x;
 	hidlib->tool_y = hidlib->ch_y;
-	pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+	rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 	if (rnd_strcasecmp(cmd, "Cancel") == 0) {
 		pcb_tool_select_by_id(RND_ACT_HIDLIB, pcbhl_conf.editor.mode);
 	}
@@ -331,7 +331,7 @@
 			   action script, so actions after this one could do things
 			   that would be executed only after non-recognized gestures */
 				do_release(RND_ACT_HIDLIB);
-				pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+				rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 				return 1;
 			}
 		}
@@ -353,7 +353,7 @@
 		if (pcb_tool_select_by_name(RND_ACT_HIDLIB, cmd) != 0)
 			rnd_message(RND_MSG_ERROR, "No such tool: '%s'\n", cmd);
 	}
-	pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+	rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 	return 0;
 }
 
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 30980)
+++ trunk/src/librnd/pcb_compat.h	(revision 30981)
@@ -605,3 +605,14 @@
 #define pcb_exporter rnd_exporter
 #define pcb_current_action rnd_current_action
 #define pcb_pixel_slop rnd_pixel_slop
+#define pcb_hid_prompt_for rnd_hid_prompt_for
+#define pcb_hid_message_box rnd_hid_message_box
+#define pcb_hid_progress rnd_hid_progress
+#define PCB_HAVE_GUI_ATTR_DLG RND_HAVE_GUI_ATTR_DLG
+#define pcb_nogui_attr_dlg_new rnd_nogui_attr_dlg_new
+#define pcb_hid_dock_enter rnd_hid_dock_enter
+#define pcb_hid_dock_leave rnd_hid_dock_leave
+#define pcb_hid_redraw rnd_hid_redraw
+#define pcb_hid_busy rnd_hid_busy
+#define pcb_hid_notify_crosshair_change rnd_hid_notify_crosshair_change
+#define pcb_hid_attr_ev_e rnd_hid_attr_ev_e
Index: trunk/src/main.c
===================================================================
--- trunk/src/main.c	(revision 30980)
+++ trunk/src/main.c	(revision 30981)
@@ -492,7 +492,7 @@
 		exit(n);
 	}
 
-	if (PCB_HAVE_GUI_ATTR_DLG)
+	if (RND_HAVE_GUI_ATTR_DLG)
 		gui_support_plugins(1);
 
 	/* Create a new PCB object in memory */
@@ -554,7 +554,7 @@
 	pcb_enable_autosave();
 
 	/* main loop */
-	if (PCB_HAVE_GUI_ATTR_DLG)
+	if (RND_HAVE_GUI_ATTR_DLG)
 		gui_support_plugins(1);
 
 	if (EXPERIMENTAL != NULL) {
Index: trunk/src/netlist.c
===================================================================
--- trunk/src/netlist.c	(revision 30980)
+++ trunk/src/netlist.c	(revision 30981)
@@ -1017,7 +1017,7 @@
 			sprintf(ratname_, "pcbrnd%ld", ++netname_cnt);
 		} while(htsp_has(&pcb->netlist[PCB_NETLIST_EDITED], ratname_));
 		if (interactive) {
-			ratname = pcb_hid_prompt_for(&pcb->hidlib, "Name of the new net", ratname_, "rat net name");
+			ratname = rnd_hid_prompt_for(&pcb->hidlib, "Name of the new net", ratname_, "rat net name");
 			if (ratname == NULL) /* cancel */
 				return NULL;
 		}
Index: trunk/src/netlist_act.c
===================================================================
--- trunk/src/netlist_act.c	(revision 30980)
+++ trunk/src/netlist_act.c	(revision 30981)
@@ -372,7 +372,7 @@
 			if (a1 == NULL)
 				RND_ACT_FAIL(Netlist);
 			if (a2 == NULL) {
-				a2 = a2free = pcb_hid_prompt_for(RND_ACT_HIDLIB, "New name of the network", NULL, "net rename");
+				a2 = a2free = rnd_hid_prompt_for(RND_ACT_HIDLIB, "New name of the network", NULL, "net rename");
 				if (a2 == NULL) {
 					RND_ACT_IRES(1);
 					return 0;
@@ -385,7 +385,7 @@
 			if (a1 == NULL)
 				RND_ACT_FAIL(Netlist);
 			if (a2 == NULL) {
-				a2 = a2free = pcb_hid_prompt_for(RND_ACT_HIDLIB, "Network name to merge into", NULL, "net merge");
+				a2 = a2free = rnd_hid_prompt_for(RND_ACT_HIDLIB, "Network name to merge into", NULL, "net merge");
 				if (a2 == NULL) {
 					RND_ACT_IRES(1);
 					return 0;
@@ -584,7 +584,7 @@
 	}
 
 	if (netname == NULL) {
-		free_netname = netname = pcb_hid_prompt_for(RND_ACT_HIDLIB, "Name of the new network", NULL, "net name");
+		free_netname = netname = rnd_hid_prompt_for(RND_ACT_HIDLIB, "Name of the new network", NULL, "net name");
 		if (netname == NULL) {
 			vtp0_uninit(&termlist);
 			RND_ACT_IRES(1);
Index: trunk/src/object_act.c
===================================================================
--- trunk/src/object_act.c	(revision 30980)
+++ trunk/src/object_act.c	(revision 30981)
@@ -246,7 +246,7 @@
 	/* done with our action so increment the undo # */
 	pcb_undo_inc_serial();
 
-	pcb_hid_redraw(pcb);
+	rnd_hid_redraw(pcb);
 	pcb_board_set_changed_flag(pcb_true);
 
 	return 0;
Index: trunk/src/polygon_act.c
===================================================================
--- trunk/src/polygon_act.c	(revision 30980)
+++ trunk/src/polygon_act.c	(revision 30981)
@@ -99,7 +99,7 @@
 	RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Polygon, op = fgw_keyword(&argv[1]));
 
 	if ((argc > 1) && ((pcbhl_conf.editor.mode == pcb_crosshair.tool_poly) || (pcbhl_conf.editor.mode == pcb_crosshair.tool_poly_hole))) {
-		pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+		rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 		switch(op) {
 			/* close open polygon if possible */
 		case F_Close:
@@ -116,7 +116,7 @@
 			pcb_polygon_go_to_prev_point();
 			break;
 		}
-		pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+		rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 	}
 	RND_ACT_IRES(0);
 	return 0;
Index: trunk/src/rats_patch.c
===================================================================
--- trunk/src/rats_patch.c	(revision 30980)
+++ trunk/src/rats_patch.c	(revision 30981)
@@ -474,7 +474,7 @@
 	const char *what, *what2;
 
 	if (fpname == NULL) {
-		fpname = pcb_hid_prompt_for(&PCB->hidlib, "Footprint name to use for replacement:", "", "Footprint");
+		fpname = rnd_hid_prompt_for(&PCB->hidlib, "Footprint name to use for replacement:", "", "Footprint");
 		if (fpname == NULL) {
 			rnd_message(RND_MSG_ERROR, "No footprint name supplied\n");
 			return 1;
Index: trunk/src/select_act.c
===================================================================
--- trunk/src/select_act.c	(revision 30980)
+++ trunk/src/select_act.c	(revision 30981)
@@ -102,13 +102,13 @@
 				box.Y1 = MIN(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y);
 				box.X2 = MAX(pcb_crosshair.AttachedBox.Point1.X, pcb_crosshair.AttachedBox.Point2.X);
 				box.Y2 = MAX(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y);
-				pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+				rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 				pcb_tool_notify_block();
 				if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD && pcb_select_block(PCB, &box, pcb_true, pcb_true, pcb_false)) {
 					pcb_board_set_changed_flag(pcb_true);
 					pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
 				}
-				pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+				rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 				rnd_gui->invalidate_all(rnd_gui);
 				break;
 			}
@@ -203,13 +203,13 @@
 				box.Y1 = MIN(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y);
 				box.X2 = MAX(pcb_crosshair.AttachedBox.Point1.X, pcb_crosshair.AttachedBox.Point2.X);
 				box.Y2 = MAX(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y);
-				pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+				rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 				pcb_tool_notify_block();
 				if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD && pcb_select_block(PCB, &box, pcb_false, pcb_true, pcb_false)) {
 					pcb_board_set_changed_flag(pcb_true);
 					pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
 				}
-				pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+				rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 				break;
 			}
 
Index: trunk/src/tool_logic.c
===================================================================
--- trunk/src/tool_logic.c	(revision 30980)
+++ trunk/src/tool_logic.c	(revision 30981)
@@ -166,7 +166,7 @@
 
 void pcb_tool_notify_block(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	switch (pcb_crosshair.AttachedBox.State) {
 	case PCB_CH_STATE_FIRST:						/* setup first point */
 		pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair.AttachedBox.Point2.X = pcb_crosshair.X;
@@ -178,7 +178,7 @@
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_THIRD;
 		break;
 	}
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 /*** old helpers ***/
Index: trunk/src/undo.c
===================================================================
--- trunk/src/undo.c	(revision 30980)
+++ trunk/src/undo.c	(revision 30981)
@@ -221,7 +221,7 @@
  */
 void pcb_undo_clear_list(rnd_bool Force)
 {
-	if (pcb_uundo.num_undo && (Force || pcb_hid_message_box(&PCB->hidlib, "warning", "clear undo buffer", "Do you reall want to clear 'undo' buffer?", "yes", 1, "no", 0, NULL) == 1)) {
+	if (pcb_uundo.num_undo && (Force || rnd_hid_message_box(&PCB->hidlib, "warning", "clear undo buffer", "Do you reall want to clear 'undo' buffer?", "yes", 1, "no", 0, NULL) == 1)) {
 		uundo_list_clear(&pcb_uundo);
 		rnd_event(&PCB->hidlib, PCB_EVENT_UNDO_POST, "i", PCB_UNDO_EV_CLEAR_LIST);
 	}
Index: trunk/src/undo_act.c
===================================================================
--- trunk/src/undo_act.c	(revision 30980)
+++ trunk/src/undo_act.c	(revision 30981)
@@ -103,13 +103,13 @@
 	const char *function = NULL;
 	rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Undo, function = argv[1].val.str);
 	if (!function || !*function) {
-		pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+		rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 		if (pcb_tool_undo_act(RND_ACT_HIDLIB))
 			if (pcb_undo(pcb_true) == 0)
 				pcb_board_set_changed_flag(pcb_true);
 	}
 	else if (function) {
-		pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+		rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 		if (rnd_strcasecmp(function, "ClearList") == 0)
 			pcb_undo_clear_list(pcb_false);
 		else if (rnd_strcasecmp(function, "FreezeSerial") == 0)
@@ -119,7 +119,7 @@
 		else if (rnd_strcasecmp(function, "IncSerial") == 0)
 			pcb_undo_inc_serial();
 	}
-	pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+	rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 	RND_ACT_IRES(0);
 	return 0;
 }
@@ -134,11 +134,11 @@
 
 fgw_error_t pcb_act_Redo(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
-	pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
+	rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false);
 	if (pcb_tool_redo_act(RND_ACT_HIDLIB))
 		if (pcb_redo(pcb_true))
 			pcb_board_set_changed_flag(pcb_true);
-	pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
+	rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true);
 	RND_ACT_IRES(0);
 	return 0;
 }
Index: trunk/src_plugins/asm/asm.c
===================================================================
--- trunk/src_plugins/asm/asm.c	(revision 30980)
+++ trunk/src_plugins/asm/asm.c	(revision 30981)
@@ -306,7 +306,7 @@
 			ly->meta.real.color = asm_ctx.layer_colors.array[n];
 		vtclr_uninit(&asm_ctx.layer_colors);
 	}
-	pcb_hid_redraw(PCB);
+	rnd_hid_redraw(PCB);
 }
 
 /*** UI callbacks ***/
@@ -385,7 +385,7 @@
 	rnd_gui->attr_dlg_widget_state(hid_ctx, asm_ctx.wdoneg, isgrp | ispart);
 	rnd_gui->attr_dlg_widget_state(hid_ctx, asm_ctx.wskipp, ispart);
 	rnd_gui->attr_dlg_widget_state(hid_ctx, asm_ctx.wdonep, ispart);
-	pcb_hid_redraw(PCB); /* for displaying the new selection */
+	rnd_hid_redraw(PCB); /* for displaying the new selection */
 }
 
 static void skip(void *hid_ctx, int pick_grp, pcb_hid_row_t *row)
Index: trunk/src_plugins/autocrop/autocrop.c
===================================================================
--- trunk/src_plugins/autocrop/autocrop.c	(revision 30980)
+++ trunk/src_plugins/autocrop/autocrop.c	(revision 30981)
@@ -65,7 +65,7 @@
 	pcb_draw_inhibit_dec();
 
 	pcb_undo_inc_serial();
-	pcb_hid_redraw(PCB);
+	rnd_hid_redraw(PCB);
 	pcb_board_set_changed_flag(1);
 
 	RND_ACT_IRES(0);
Index: trunk/src_plugins/autoplace/action.c
===================================================================
--- trunk/src_plugins/autoplace/action.c	(revision 30980)
+++ trunk/src_plugins/autoplace/action.c	(revision 30981)
@@ -44,12 +44,12 @@
 /* DOC: autoplaceselected */
 static fgw_error_t pcb_act_AutoPlaceSelected(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
-	pcb_hid_busy(PCB, 1);
-	if (pcb_hid_message_box(RND_ACT_HIDLIB, "question", "Autoplace start", "Auto-placement can NOT be undone.\nDo you want to continue anyway?", "no", 0, "yes", 1, NULL) == 1) {
+	rnd_hid_busy(PCB, 1);
+	if (rnd_hid_message_box(RND_ACT_HIDLIB, "question", "Autoplace start", "Auto-placement can NOT be undone.\nDo you want to continue anyway?", "no", 0, "yes", 1, NULL) == 1) {
 		if (AutoPlaceSelected())
 			pcb_board_set_changed_flag(pcb_true);
 	}
-	pcb_hid_busy(PCB, 0);
+	rnd_hid_busy(PCB, 0);
 	RND_ACT_IRES(0);
 	return 0;
 }
Index: trunk/src_plugins/autoplace/autoplace.c
===================================================================
--- trunk/src_plugins/autoplace/autoplace.c	(revision 30980)
+++ trunk/src_plugins/autoplace/autoplace.c	(revision 30981)
@@ -793,7 +793,7 @@
 			if (good_moves >= good_move_cutoff || moves >= move_cutoff) {
 				printf("END OF STAGE: COST %.0f\t" "GOOD_MOVES %d\tMOVES %d\t" "T: %.1f\n", C0, good_moves, moves, T);
 				pcb_draw();
-				if (pcb_hid_progress(C00-T, C00, "Optimizing the placement..."))
+				if (rnd_hid_progress(C00-T, C00, "Optimizing the placement..."))
 					break;
 				/* is this the end? */
 				if (T < 5 || good_moves < moves / CostParameter.good_ratio)
@@ -808,11 +808,11 @@
 		changed = (steps > 0);
 	}
 done:
-	pcb_hid_progress(0, 0, NULL);
+	rnd_hid_progress(0, 0, NULL);
 	if (changed) {
 		pcb_rats_destroy(pcb_false);
 		pcb_net_add_all_rats(PCB, PCB_RATACC_PRECISE);
-		pcb_hid_redraw(PCB);
+		rnd_hid_redraw(PCB);
 	}
 	vtp0_uninit(&Selected);
 	return changed;
Index: trunk/src_plugins/autoroute/action.c
===================================================================
--- trunk/src_plugins/autoroute/action.c	(revision 30980)
+++ trunk/src_plugins/autoroute/action.c	(revision 30981)
@@ -48,7 +48,7 @@
 
 	RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, AutoRoute, op = fgw_keyword(&argv[1]));
 
-	pcb_hid_busy(PCB, 1);
+	rnd_hid_busy(PCB, 1);
 	switch(op) {
 		case F_AllRats:
 		case F_All:
@@ -64,7 +64,7 @@
 			RND_ACT_FAIL(AutoRoute);
 			return 1;
 	}
-	pcb_hid_busy(PCB, 0);
+	rnd_hid_busy(PCB, 0);
 	RND_ACT_IRES(0);
 	return 0;
 }
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 30980)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 30981)
@@ -4375,7 +4375,7 @@
 					 * to route a net from a particular starting point, but perfectly
 					 * able to route it from some other. */
 					percent = calculate_progress(this_heap_item, this_heap_size, &ras);
-					request_cancel = pcb_hid_progress(percent * 100., 100, "Autorouting tracks");
+					request_cancel = rnd_hid_progress(percent * 100., 100, "Autorouting tracks");
 					if (request_cancel) {
 						ras.total_nets_routed = 0;
 						ras.conflict_subnets = 0;
@@ -4746,7 +4746,7 @@
 	/* auto-route all nets */
 	changed = (RouteAll(rd).total_nets_routed > 0) || changed;
 donerouting:
-	pcb_hid_progress(0, 0, NULL);
+	rnd_hid_progress(0, 0, NULL);
 	if (conf_core.editor.live_routing) {
 		int i;
 		rnd_rnd_box_t big = { 0, 0, RND_MAX_COORD, RND_MAX_COORD };
@@ -4774,7 +4774,7 @@
 
 		pcb_undo_inc_serial();
 
-		pcb_hid_redraw(PCB);
+		rnd_hid_redraw(PCB);
 	}
 #if defined (ROUTE_DEBUG)
 	aabort = 0;
Index: trunk/src_plugins/dialogs/dlg_infobar.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_infobar.c	(revision 30980)
+++ trunk/src_plugins/dialogs/dlg_infobar.c	(revision 30981)
@@ -56,7 +56,7 @@
 	rnd_hid_attr_val_t hv;
 	const char *cmd;
 
-	if (!PCB_HAVE_GUI_ATTR_DLG) {
+	if (!RND_HAVE_GUI_ATTR_DLG) {
 		RND_ACT_IRES(0);
 		return 0;
 	}
@@ -89,7 +89,7 @@
 						PCB_DAD_CHANGE_CB(sub.dlg, ifb_file_chg_close_cb);
 				PCB_DAD_END(sub.dlg);
 			PCB_DAD_END(sub.dlg);
-			if (pcb_hid_dock_enter(&sub, RND_HID_DOCK_TOP_INFOBAR, "file_changed") != 0) {
+			if (rnd_hid_dock_enter(&sub, RND_HID_DOCK_TOP_INFOBAR, "file_changed") != 0) {
 				RND_ACT_IRES(1);
 				return 0;
 			}
@@ -106,7 +106,7 @@
 	}
 	else if (strcmp(cmd, "close") == 0) {
 		if (active) {
-			pcb_hid_dock_leave(&sub);
+			rnd_hid_dock_leave(&sub);
 			active = 0;
 		}
 	}
Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_confedit.c	(revision 30980)
+++ trunk/src_plugins/dialogs/dlg_pref_confedit.c	(revision 30981)
@@ -208,7 +208,7 @@
 
 static void pref_conf_editval_edit(void *hid_ctx, confedit_ctx_t *ctx, rnd_hid_attribute_t *attr, pcb_hid_row_t *r)
 {
-	char *nv = pcb_hid_prompt_for(&PCB->hidlib, "list item value:", r->cell[0], "Edit config list item");
+	char *nv = rnd_hid_prompt_for(&PCB->hidlib, "list item value:", r->cell[0], "Edit config list item");
 	if (nv == NULL)
 		return;
 
Index: trunk/src_plugins/distalign/distalign.c
===================================================================
--- trunk/src_plugins/distalign/distalign.c	(revision 30980)
+++ trunk/src_plugins/distalign/distalign.c	(revision 30981)
@@ -357,7 +357,7 @@
 
 	if (changed) {
 		pcb_undo_inc_serial();
-		pcb_hid_redraw(PCB);
+		rnd_hid_redraw(PCB);
 		pcb_board_set_changed_flag(1);
 	}
 	free_objs_by_pos();
@@ -525,7 +525,7 @@
 	}
 	if (changed) {
 		pcb_undo_inc_serial();
-		pcb_hid_redraw(PCB);
+		rnd_hid_redraw(PCB);
 		pcb_board_set_changed_flag(1);
 	}
 	free_objs_by_pos();
Index: trunk/src_plugins/djopt/djopt.c
===================================================================
--- trunk/src_plugins/djopt/djopt.c	(revision 30980)
+++ trunk/src_plugins/djopt/djopt.c	(revision 30981)
@@ -735,7 +735,7 @@
 				break;
 			}
 		}
-	pcb_hid_progress(0, 0, 0);
+	rnd_hid_progress(0, 0, 0);
 	check(c, 0);
 }
 
@@ -2445,7 +2445,7 @@
 	SwitchDrawingWindow(PCB->Zoom, Output.drawing_area->window, conf_core.editor.show_solder_side, pcb_false);
 #endif
 
-	pcb_hid_busy(PCB, 1);
+	rnd_hid_busy(PCB, 1);
 
 	lines = 0;
 	corners = 0;
@@ -2483,7 +2483,7 @@
 	if (PCB_NSTRCMP(arg, "splitlines") == 0) {
 		if (canonicalize_lines())
 			pcb_undo_inc_serial();
-		pcb_hid_busy(PCB, 0);
+		rnd_hid_busy(PCB, 0);
 		return 0;
 	}
 
@@ -2545,7 +2545,7 @@
 		saved += miter();
 	else {
 		printf("unknown command: %s\n", arg);
-		pcb_hid_busy(PCB, 0);
+		rnd_hid_busy(PCB, 0);
 		return 1;
 	}
 
@@ -2555,7 +2555,7 @@
 	if (saved)
 		pcb_undo_inc_serial();
 
-	pcb_hid_busy(PCB, 0);
+	rnd_hid_busy(PCB, 0);
 	RND_ACT_IRES(0);
 	return 0;
 }
Index: trunk/src_plugins/drc_orig/drc_orig.c
===================================================================
--- trunk/src_plugins/drc_orig/drc_orig.c	(revision 30980)
+++ trunk/src_plugins/drc_orig/drc_orig.c	(revision 30981)
@@ -151,7 +151,7 @@
 		pcb_any_obj_t *o;
 		pcb_data_it_t it;
 
-		if (pcb_hid_progress(sofar, total, "drc_orig: Checking nets from subc terminals...") != 0)
+		if (rnd_hid_progress(sofar, total, "drc_orig: Checking nets from subc terminals...") != 0)
 			return 1;
 		for(o = pcb_data_first(&it, subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
 			if (o->term == NULL) /* only terminals can be starting point of DRC net checks */
@@ -176,7 +176,7 @@
 
 	PCB_PADSTACK_LOOP(PCB->Data);
 	{
-		if (pcb_hid_progress(sofar, total, "drc_orig: Checking nets from subc non-terminals...") != 0)
+		if (rnd_hid_progress(sofar, total, "drc_orig: Checking nets from subc non-terminals...") != 0)
 			return 1;
 
 		if ((padstack->term == NULL) && pcb_net_integrity(PCB, (pcb_any_obj_t *)padstack, conf_core.design.shrink, conf_core.design.bloat, drc_broken_cb, lst))
@@ -352,32 +352,32 @@
 	rnd_event(&PCB->hidlib, PCB_EVENT_LAYERVIS_CHANGED, NULL);
 
 	/* actual tests */
-	pcb_hid_progress(0, 0, NULL);
+	rnd_hid_progress(0, 0, NULL);
 	if (drc_nets_from_subc_term(lst) != 0) goto out;
-	pcb_hid_progress(0, 0, NULL);
+	rnd_hid_progress(0, 0, NULL);
 	if (drc_nets_from_pstk(lst)) goto out;
 
-	pcb_hid_progress(0, 0, NULL);
-	if (pcb_hid_progress(0, 6, "drc_orig: Checking objects: text")) goto out;
+	rnd_hid_progress(0, 0, NULL);
+	if (rnd_hid_progress(0, 6, "drc_orig: Checking objects: text")) goto out;
 	drc_all_texts(lst);
-	pcb_hid_progress(0, 0, NULL);
-	if (pcb_hid_progress(1, 6, "drc_orig: Checking objects: line")) goto out;
+	rnd_hid_progress(0, 0, NULL);
+	if (rnd_hid_progress(1, 6, "drc_orig: Checking objects: line")) goto out;
 	drc_copper_lines(lst);
-	pcb_hid_progress(0, 0, NULL);
-	if (pcb_hid_progress(2, 6, "drc_orig: Checking objects: arc")) goto out;
+	rnd_hid_progress(0, 0, NULL);
+	if (rnd_hid_progress(2, 6, "drc_orig: Checking objects: arc")) goto out;
 	drc_copper_arcs(lst);
-	pcb_hid_progress(0, 0, NULL);
-	if (pcb_hid_progress(3, 6, "drc_orig: Checking objects: padstack")) goto out;
+	rnd_hid_progress(0, 0, NULL);
+	if (rnd_hid_progress(3, 6, "drc_orig: Checking objects: padstack")) goto out;
 	drc_global_pstks(lst);
-	pcb_hid_progress(0, 0, NULL);
-	if (pcb_hid_progress(4, 6, "drc_orig: Checking objects: extent")) goto out;
+	rnd_hid_progress(0, 0, NULL);
+	if (rnd_hid_progress(4, 6, "drc_orig: Checking objects: extent")) goto out;
 	drc_beyond_extents(lst, PCB->Data);
-	pcb_hid_progress(0, 0, NULL);
-	if (pcb_hid_progress(5, 6, "drc_orig: Checking objects: silk")) goto out;
+	rnd_hid_progress(0, 0, NULL);
+	if (rnd_hid_progress(5, 6, "drc_orig: Checking objects: silk")) goto out;
 	drc_global_silk_lines(lst);
 
 	out:;
-	pcb_hid_progress(0, 0, NULL);
+	rnd_hid_progress(0, 0, NULL);
 	pcb_layervis_restore_stack();
 	rnd_event(&PCB->hidlib, PCB_EVENT_LAYERVIS_CHANGED, NULL);
 	rnd_gui->invalidate_all(rnd_gui);
Index: trunk/src_plugins/export_oldconn/oldconn.c
===================================================================
--- trunk/src_plugins/export_oldconn/oldconn.c	(revision 30980)
+++ trunk/src_plugins/export_oldconn/oldconn.c	(revision 30981)
@@ -231,7 +231,7 @@
 
 	if (conf_core.editor.beep_when_finished)
 		rnd_gui->beep(rnd_gui);
-	pcb_hid_redraw(PCB);
+	rnd_hid_redraw(PCB);
 }
 
 static FILE *pcb_check_and_open_file(const char *Filename)
@@ -244,7 +244,7 @@
 
 		if (rnd_file_readable(Filename)) {
 			sprintf(message, "File '%s' exists, use anyway?", Filename);
-			response = pcb_hid_message_box(&PCB->hidlib, "warning", "Overwrite file", message, "cancel", 0, "ok", 1, NULL);
+			response = rnd_hid_message_box(&PCB->hidlib, "warning", "Overwrite file", message, "cancel", 0, "ok", 1, NULL);
 			if (response != 1)
 				return NULL;
 		}
Index: trunk/src_plugins/extedit/extedit.c
===================================================================
--- trunk/src_plugins/extedit/extedit.c	(revision 30980)
+++ trunk/src_plugins/extedit/extedit.c	(revision 30981)
@@ -135,7 +135,7 @@
 			while(ctx.stay) {
 				if (rnd_gui != NULL) {
 					n++;
-					pcb_hid_progress(50+sin((double)n/10.0)*40, 100, "Invoked external editor. Please edit, save and close there to finish this operation");
+					rnd_hid_progress(50+sin((double)n/10.0)*40, 100, "Invoked external editor. Please edit, save and close there to finish this operation");
 				}
 				rnd_ms_sleep(50);
 			}
@@ -147,7 +147,7 @@
 		old_wait:;
 
 		if (rnd_gui != NULL) {
-			pcb_hid_progress(50, 100, "Invoked external editor. Please edit, save and close there to finish this operation");
+			rnd_hid_progress(50, 100, "Invoked external editor. Please edit, save and close there to finish this operation");
 			rnd_ms_sleep(1000); /* ugly hack: give the GUI some time to flush */
 		}
 		while(!(feof(fc))) {
@@ -158,7 +158,7 @@
 	pclose(fc);
 
 	if (rnd_gui != NULL)
-		pcb_hid_progress(0, 0, NULL);
+		rnd_hid_progress(0, 0, NULL);
 	free(cmd);
 }
 
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 30980)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 30981)
@@ -229,13 +229,13 @@
 	if (crosshair_on == show)
 		return;
 
-	pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(ltf_hidlib, pcb_false);
 	if (pcb_marked.status)
 		pcb_notify_mark_change(pcb_false);
 
 	crosshair_on = show;
 
-	pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(ltf_hidlib, pcb_true);
 	if (pcb_marked.status)
 		pcb_notify_mark_change(pcb_true);
 }
@@ -483,12 +483,12 @@
 		return;
 
 	in_move_event = 1;
-	pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(ltf_hidlib, pcb_false);
 	if (panning)
 		Pan(2, e->x, e->y);
 	pcb_hidcore_crosshair_move_to(ltf_hidlib, Px(e->x), Py(e->y), 1);
 	pcb_hidlib_adjust_attached_objects(ltf_hidlib);
-	pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(ltf_hidlib, pcb_true);
 	in_move_event = 0;
 }
 
@@ -1023,7 +1023,7 @@
 			if (lesstif_button_event(w, e))
 				return;
 
-			pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_false);
+			rnd_hid_notify_crosshair_change(ltf_hidlib, pcb_false);
 			pressed_button = e->xbutton.button;
 			mods = ((e->xbutton.state & ShiftMask) ? PCB_M_Shift : 0)
 				+ ((e->xbutton.state & ControlMask) ? PCB_M_Ctrl : 0)
@@ -1034,7 +1034,7 @@
 #endif
 			hid_cfg_mouse_action(ltf_hidlib, &lesstif_mouse, lesstif_mb2cfg(e->xbutton.button) | mods, cmd_is_active);
 
-			pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_true);
+			rnd_hid_notify_crosshair_change(ltf_hidlib, pcb_true);
 			break;
 		}
 
@@ -1044,7 +1044,7 @@
 			if (e->xbutton.button != pressed_button)
 				return;
 			lesstif_button_event(w, e);
-			pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_false);
+			rnd_hid_notify_crosshair_change(ltf_hidlib, pcb_false);
 			pressed_button = 0;
 			mods = ((e->xbutton.state & ShiftMask) ? PCB_M_Shift : 0)
 				+ ((e->xbutton.state & ControlMask) ? PCB_M_Ctrl : 0)
@@ -1055,7 +1055,7 @@
 #endif
 				+ PCB_M_Release;
 			hid_cfg_mouse_action(ltf_hidlib, &lesstif_mouse, lesstif_mb2cfg(e->xbutton.button) | mods, cmd_is_active);
-			pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_true);
+			rnd_hid_notify_crosshair_change(ltf_hidlib, pcb_true);
 			break;
 		}
 
Index: trunk/src_plugins/import_sch2/import_sch.c
===================================================================
--- trunk/src_plugins/import_sch2/import_sch.c	(revision 30980)
+++ trunk/src_plugins/import_sch2/import_sch.c	(revision 30981)
@@ -120,7 +120,7 @@
 			imp_name = conf_import_sch.plugins.import_sch.import_fmt;
 		}
 		else {
-			if (!PCB_HAVE_GUI_ATTR_DLG) {
+			if (!RND_HAVE_GUI_ATTR_DLG) {
 				rnd_message(RND_MSG_ERROR, "import_sch not configured; please use ImportSch(setup, ...)\n");
 				return 1;
 			}
Index: trunk/src_plugins/io_hyp/io_hyp.c
===================================================================
--- trunk/src_plugins/io_hyp/io_hyp.c	(revision 30980)
+++ trunk/src_plugins/io_hyp/io_hyp.c	(revision 30981)
@@ -106,9 +106,9 @@
 	if (debug > 0)
 		rnd_message(RND_MSG_INFO, "Importing Hyperlynx file '%s', debug level %d\n", fname, debug);
 
-	pcb_hid_busy(PCB, 1);
+	rnd_hid_busy(PCB, 1);
 	retval = hyp_parse(PCB->Data, fname, debug);
-	pcb_hid_busy(PCB, 0);
+	rnd_hid_busy(PCB, 0);
 
 	/* notify GUI */
 	rnd_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL);
Index: trunk/src_plugins/jostle/jostle.c
===================================================================
--- trunk/src_plugins/jostle/jostle.c	(revision 30980)
+++ trunk/src_plugins/jostle/jostle.c	(revision 30981)
@@ -110,10 +110,10 @@
 		}
 	} while ((p = p->f) != s);
 /*	ddraw->flush_debug_draw();*/
-/*	pcb_hid_busy(PCB, 1); */
+/*	rnd_hid_busy(PCB, 1); */
 /*	sleep(3);
 	ddraw->finish_debug_draw();*/
-/*	pcb_hid_busy(PCB, 0); */
+/*	rnd_hid_busy(PCB, 0); */
 }
 
 /* Find the bounding box of a rnd_polyarea_t.
Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c
===================================================================
--- trunk/src_plugins/lib_hid_common/dlg_comm_m.c	(revision 30980)
+++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c	(revision 30981)
@@ -228,7 +228,7 @@
 	pcb_hid_dad_buttons_t clbtn_m[] = {{"yes", 1}, {"yes to all", 2}, {"no", 0}, {NULL, 0}};
 	PCB_DAD_DECL(dlg);
 
-	if (!PCB_HAVE_GUI_ATTR_DLG) {
+	if (!RND_HAVE_GUI_ATTR_DLG) {
 		RND_ACT_IRES(0); /* no gui means auto-yes (for batch) */
 		return 2;
 	}
Index: trunk/src_plugins/lib_hid_common/dlg_log.c
===================================================================
--- trunk/src_plugins/lib_hid_common/dlg_log.c	(revision 30980)
+++ trunk/src_plugins/lib_hid_common/dlg_log.c	(revision 30981)
@@ -203,7 +203,7 @@
 		log_append(&log_ctx, atxt, line);
 		maybe_scroll_to_bottom();
 	}
-	else if ((PCB_HAVE_GUI_ATTR_DLG) && (log_ctx.gui_inited)) {
+	else if ((RND_HAVE_GUI_ATTR_DLG) && (log_ctx.gui_inited)) {
 		const char *prefix;
 		int popup;
 
Index: trunk/src_plugins/lib_hid_common/toolbar.c
===================================================================
--- trunk/src_plugins/lib_hid_common/toolbar.c	(revision 30980)
+++ trunk/src_plugins/lib_hid_common/toolbar.c	(revision 30981)
@@ -173,7 +173,7 @@
 	if (cfg == NULL)
 		return;
 	toolbar_docked_create(cfg);
-	if (pcb_hid_dock_enter(&toolbar.sub, RND_HID_DOCK_TOP_LEFT, "Toolbar") == 0) {
+	if (rnd_hid_dock_enter(&toolbar.sub, RND_HID_DOCK_TOP_LEFT, "Toolbar") == 0) {
 		toolbar.sub_inited = 1;
 		toolbar_pcb2dlg();
 	}
@@ -181,7 +181,7 @@
 
 void pcb_toolbar_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
-	if ((PCB_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL))
+	if ((RND_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL))
 		toolbar_create();
 }
 
@@ -194,7 +194,7 @@
 			int *wid = vti0_get(&toolbar.tid2wid, tid, 0);
 			if ((wid != NULL) && (*wid != 0))
 				return;
-			pcb_hid_dock_leave(&toolbar.sub);
+			rnd_hid_dock_leave(&toolbar.sub);
 			toolbar.sub_inited = 0;
 			toolbar_create();
 		}
Index: trunk/src_plugins/lib_hid_pcbui/layersel.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/layersel.c	(revision 30980)
+++ trunk/src_plugins/lib_hid_pcbui/layersel.c	(revision 30981)
@@ -279,7 +279,7 @@
 	else
 		return;
 
-	pcb_hid_redraw(PCB);
+	rnd_hid_redraw(PCB);
 
 	if (vis != NULL) {
 		lys_update_vis(lys, *vis);
@@ -417,7 +417,7 @@
 
 	ensure_visible_current(lys->ls);
 
-	pcb_hid_redraw(PCB);
+	rnd_hid_redraw(PCB);
 }
 
 static void layer_right_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
@@ -832,7 +832,7 @@
 static void layersel_build(void)
 {
 	layersel_docked_create(&layersel, PCB);
-	if (pcb_hid_dock_enter(&layersel.sub, RND_HID_DOCK_LEFT, "layersel") == 0) {
+	if (rnd_hid_dock_enter(&layersel.sub, RND_HID_DOCK_LEFT, "layersel") == 0) {
 		layersel.sub_inited = 1;
 		layersel_update_vis(&layersel, PCB);
 	}
@@ -840,7 +840,7 @@
 
 void pcb_layersel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
-	if ((PCB_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL))
+	if ((RND_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL))
 		layersel_build();
 }
 
@@ -853,8 +853,8 @@
 
 void pcb_layersel_stack_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
-	if ((PCB_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL) && (layersel.sub_inited)) {
-		pcb_hid_dock_leave(&layersel.sub);
+	if ((RND_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL) && (layersel.sub_inited)) {
+		rnd_hid_dock_leave(&layersel.sub);
 		layersel.sub_inited = 0;
 		layersel_build();
 	}
Index: trunk/src_plugins/lib_hid_pcbui/routest.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/routest.c	(revision 30980)
+++ trunk/src_plugins/lib_hid_pcbui/routest.c	(revision 30981)
@@ -208,9 +208,9 @@
 
 void pcb_rst_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
-	if (PCB_HAVE_GUI_ATTR_DLG) {
+	if (RND_HAVE_GUI_ATTR_DLG) {
 		rst_docked_create();
-		if (pcb_hid_dock_enter(&rst.sub, RND_HID_DOCK_LEFT, "Route styles") == 0)
+		if (rnd_hid_dock_enter(&rst.sub, RND_HID_DOCK_LEFT, "Route styles") == 0)
 			rst.sub_inited = 1;
 	}
 	rst_update();
Index: trunk/src_plugins/lib_hid_pcbui/status.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/status.c	(revision 30980)
+++ trunk/src_plugins/lib_hid_pcbui/status.c	(revision 30981)
@@ -304,15 +304,15 @@
 
 void pcb_status_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
-	if ((PCB_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL)) {
+	if ((RND_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL)) {
 		status_docked_create_st();
-		if (pcb_hid_dock_enter(&status.stsub, RND_HID_DOCK_BOTTOM, "status") == 0) {
+		if (rnd_hid_dock_enter(&status.stsub, RND_HID_DOCK_BOTTOM, "status") == 0) {
 			status.stsub_inited = 1;
 			status_st_pcb2dlg();
 		}
 
 		status_docked_create_rd();
-		if (pcb_hid_dock_enter(&status.rdsub, RND_HID_DOCK_TOP_RIGHT, "readout") == 0) {
+		if (rnd_hid_dock_enter(&status.rdsub, RND_HID_DOCK_TOP_RIGHT, "readout") == 0) {
 			status.rdsub_inited = 1;
 			status_rd_pcb2dlg();
 		}
Index: trunk/src_plugins/loghid/hid-logger.c
===================================================================
--- trunk/src_plugins/loghid/hid-logger.c	(revision 30980)
+++ trunk/src_plugins/loghid/hid-logger.c	(revision 30981)
@@ -51,7 +51,7 @@
 
 static void log_notify_crosshair_change(rnd_hid_t *hid, rnd_bool changes_complete)
 {
-	pcb_fprintf(out_, "pcb_hid_notify_crosshair_change(%s)\n", changes_complete ? "true" : "false");
+	pcb_fprintf(out_, "rnd_hid_notify_crosshair_change(%s)\n", changes_complete ? "true" : "false");
 	delegatee_->notify_crosshair_change(hid, changes_complete);
 }
 
Index: trunk/src_plugins/mincut/rats_mincut.c
===================================================================
--- trunk/src_plugins/mincut/rats_mincut.c	(revision 30980)
+++ trunk/src_plugins/mincut/rats_mincut.c	(revision 30981)
@@ -282,7 +282,7 @@
 #endif
 
 	if (!bad_gr) {
-		solution = pcb_mincut_solve(g, pcb_hid_progress, cancel);
+		solution = pcb_mincut_solve(g, rnd_hid_progress, cancel);
 		if (cancel)
 			return 1;
 
Index: trunk/src_plugins/query/query_act.c
===================================================================
--- trunk/src_plugins/query/query_act.c	(revision 30980)
+++ trunk/src_plugins/query/query_act.c	(revision 30981)
@@ -276,8 +276,8 @@
 			printf("Failed to run the query\n");
 		if (sel.cnt > 0) {
 			pcb_board_set_changed_flag(pcb_true);
-			if (PCB_HAVE_GUI_ATTR_DLG)
-				pcb_hid_redraw(PCB);
+			if (RND_HAVE_GUI_ATTR_DLG)
+				rnd_hid_redraw(PCB);
 		}
 		RND_ACT_IRES(0);
 		return 0;
@@ -304,8 +304,8 @@
 			printf("Failed to run the query\n");
 		if (sel.cnt > 0) {
 			pcb_board_set_changed_flag(pcb_true);
-			if (PCB_HAVE_GUI_ATTR_DLG)
-				pcb_hid_redraw(PCB);
+			if (RND_HAVE_GUI_ATTR_DLG)
+				rnd_hid_redraw(PCB);
 		}
 		RND_ACT_IRES(0);
 		return 0;
Index: trunk/src_plugins/renumber/renumber.c
===================================================================
--- trunk/src_plugins/renumber/renumber.c	(revision 30980)
+++ trunk/src_plugins/renumber/renumber.c	(revision 30981)
@@ -107,7 +107,7 @@
 
 	if ((out = pcb_fopen(&PCB->hidlib, name, "r"))) {
 		fclose(out);
-		if (pcb_hid_message_box(&PCB->hidlib, "warning", "Renumber: overwrite", "File exists!  Ok to overwrite?", "cancel", 0, "overwrite", 1, NULL) != 1) {
+		if (rnd_hid_message_box(&PCB->hidlib, "warning", "Renumber: overwrite", "File exists!  Ok to overwrite?", "cancel", 0, "overwrite", 1, NULL) != 1) {
 			if (free_name && name)
 				free((char*)name);
 			RND_ACT_IRES(1);
Index: trunk/src_plugins/serpentine/serpentine.c
===================================================================
--- trunk/src_plugins/serpentine/serpentine.c	(revision 30980)
+++ trunk/src_plugins/serpentine/serpentine.c	(revision 30981)
@@ -285,16 +285,16 @@
 
 static void tool_serpentine_init(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 static void tool_serpentine_uninit(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 static void tool_serpentine_notify_mode(rnd_hidlib_t *hl)
Index: trunk/src_plugins/shand_cmd/command.c
===================================================================
--- trunk/src_plugins/shand_cmd/command.c	(revision 30980)
+++ trunk/src_plugins/shand_cmd/command.c	(revision 30981)
@@ -77,7 +77,7 @@
 	RND_PCB_ACT_CONVARG(1, FGW_STR, LoadLayout, filename = argv[1].val.str);
 	rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, LoadLayout, format = argv[2].val.str);
 
-	if (!PCB->Changed || (pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "Load data lose", "OK to override layout data?", "cancel", 0, "ok", 1, NULL) == 1))
+	if (!PCB->Changed || (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "Load data lose", "OK to override layout data?", "cancel", 0, "ok", 1, NULL) == 1))
 		pcb_load_pcb(filename, format, pcb_true, 0);
 
 	RND_ACT_IRES(0);
@@ -122,7 +122,7 @@
 /* DOC: q.html */
 static fgw_error_t pcb_act_Quit(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
-	if (!PCB->Changed || (pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "Close: lose data", "OK to lose data?", "cancel", 0, "ok", 1, NULL) == 1))
+	if (!PCB->Changed || (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "Close: lose data", "OK to lose data?", "cancel", 0, "ok", 1, NULL) == 1))
 		pcb_quit_app();
 	RND_ACT_IRES(0);
 	return 0;
Index: trunk/src_plugins/sketch_route/sketch_route.c
===================================================================
--- trunk/src_plugins/sketch_route/sketch_route.c	(revision 30980)
+++ trunk/src_plugins/sketch_route/sketch_route.c	(revision 30981)
@@ -1010,11 +1010,11 @@
 
 static void tool_skline_uninit(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	attached_path_uninit();
 	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 static void tool_skline_notify_mode(rnd_hidlib_t *hl)
Index: trunk/src_plugins/smartdisperse/smartdisperse.c
===================================================================
--- trunk/src_plugins/smartdisperse/smartdisperse.c	(revision 30980)
+++ trunk/src_plugins/smartdisperse/smartdisperse.c	(revision 30981)
@@ -217,7 +217,7 @@
 	htpi_uninit(&visited);
 
 	pcb_undo_inc_serial();
-	pcb_hid_redraw(PCB);
+	rnd_hid_redraw(PCB);
 	pcb_board_set_changed_flag(1);
 
 	RND_ACT_IRES(0);
Index: trunk/src_plugins/tool_std/tool_arc.c
===================================================================
--- trunk/src_plugins/tool_std/tool_arc.c	(revision 30980)
+++ trunk/src_plugins/tool_std/tool_arc.c	(revision 30981)
@@ -51,7 +51,7 @@
 
 void pcb_tool_arc_init(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	if (pcb_tool_prev_id == pcb_crosshair.tool_line && pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) {
 		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_SECOND;
@@ -59,12 +59,12 @@
 		pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair.AttachedBox.Point2.Y = pcb_crosshair.AttachedLine.Point1.Y;
 		pcb_tool_adjust_attached(NULL);
 	}
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 void pcb_tool_arc_uninit(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_added_lines = 0;
 	if (pcb_tool_next_id != pcb_crosshair.tool_line) {
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
@@ -71,7 +71,7 @@
 		if (!pcb_marked.user_placed)
 			pcb_crosshair_set_local_ref(0, 0, pcb_false);
 	}
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 void pcb_tool_arc_notify_mode(rnd_hidlib_t *hl)
@@ -175,7 +175,7 @@
 {
 	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_SECOND) {
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
-		pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+		rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 		return pcb_false;
 	}
 	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD) {
Index: trunk/src_plugins/tool_std/tool_arrow.c
===================================================================
--- trunk/src_plugins/tool_std/tool_arrow.c	(revision 30980)
+++ trunk/src_plugins/tool_std/tool_arrow.c	(revision 30981)
@@ -52,11 +52,11 @@
 
 void pcb_tool_arrow_uninit(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
 	pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 /* Called some time after the click if there was a release but no second click
@@ -68,7 +68,7 @@
 	pcb_board_t *pcb = hv.ptr;
 
 	if (hl->tool_click) {
-		pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+		rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 		hl->tool_click = pcb_false;
 		if (pcb_crosshair_note.Moving && !rnd_gui->shift_is_pressed(rnd_gui)) {
 			hl->tool_grabbed.status = pcb_true;
@@ -125,7 +125,7 @@
 			pcb_crosshair.AttachedBox.Point1.X = hl->tool_x;
 			pcb_crosshair.AttachedBox.Point1.Y = hl->tool_y;
 		}
-		pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+		rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 	}
 
 	if (pcb_crosshair.extobj_edit != NULL) {
Index: trunk/src_plugins/tool_std/tool_copy.c
===================================================================
--- trunk/src_plugins/tool_std/tool_copy.c	(revision 30980)
+++ trunk/src_plugins/tool_std/tool_copy.c	(revision 30981)
@@ -43,10 +43,10 @@
 
 void pcb_tool_copy_uninit(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 	pcb_crosshair.extobj_edit = NULL;
 }
 
Index: trunk/src_plugins/tool_std/tool_insert.c
===================================================================
--- trunk/src_plugins/tool_std/tool_insert.c	(revision 30980)
+++ trunk/src_plugins/tool_std/tool_insert.c	(revision 30981)
@@ -54,11 +54,11 @@
 
 void pcb_tool_insert_uninit(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
 	pcb_crosshair.extobj_edit = NULL;
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 void pcb_tool_insert_notify_mode(rnd_hidlib_t *hl)
Index: trunk/src_plugins/tool_std/tool_line.c
===================================================================
--- trunk/src_plugins/tool_std/tool_line.c	(revision 30980)
+++ trunk/src_plugins/tool_std/tool_line.c	(revision 30981)
@@ -64,7 +64,7 @@
 
 void pcb_tool_line_init(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	if (pcb_tool_prev_id == pcb_crosshair.tool_arc && pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) {
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
 		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_SECOND;
@@ -80,12 +80,12 @@
 			}
 		}
 	}
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 void pcb_tool_line_uninit(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_added_lines = 0;
 	pcb_route_reset(&pcb_crosshair.Route);
 	if (pcb_tool_next_id != pcb_crosshair.tool_arc) {
@@ -93,7 +93,7 @@
 		if (!pcb_marked.user_placed)
 			pcb_crosshair_set_local_ref(0, 0, pcb_false);
 	}
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 /* creates points of a line (when clicked) */
Index: trunk/src_plugins/tool_std/tool_move.c
===================================================================
--- trunk/src_plugins/tool_std/tool_move.c	(revision 30980)
+++ trunk/src_plugins/tool_std/tool_move.c	(revision 30981)
@@ -45,10 +45,10 @@
 
 void pcb_tool_move_uninit(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 	pcb_crosshair.extobj_edit = NULL;
 }
 
Index: trunk/src_plugins/tool_std/tool_poly.c
===================================================================
--- trunk/src_plugins/tool_std/tool_poly.c	(revision 30980)
+++ trunk/src_plugins/tool_std/tool_poly.c	(revision 30981)
@@ -44,10 +44,10 @@
 
 void pcb_tool_poly_uninit(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedPolygon.PointN = 0;
 	pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 TODO("remove this when pcb_tool_poly_notify_mode() loses PCB")
Index: trunk/src_plugins/tool_std/tool_polyhole.c
===================================================================
--- trunk/src_plugins/tool_std/tool_polyhole.c	(revision 30980)
+++ trunk/src_plugins/tool_std/tool_polyhole.c	(revision 30981)
@@ -45,10 +45,10 @@
 
 void pcb_tool_polyhole_uninit(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedPolygon.PointN = 0;
 	pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 TODO("remove this when pcb_tool_polyhole_notify_mode() loses PCB")
Index: trunk/src_plugins/tool_std/tool_rectangle.c
===================================================================
--- trunk/src_plugins/tool_std/tool_rectangle.c	(revision 30980)
+++ trunk/src_plugins/tool_std/tool_rectangle.c	(revision 30981)
@@ -48,9 +48,9 @@
 
 void pcb_tool_rectangle_uninit(void)
 {
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
-	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 void pcb_tool_rectangle_notify_mode(rnd_hidlib_t *hl)
Index: trunk/src_plugins/tool_std/tool_text.c
===================================================================
--- trunk/src_plugins/tool_std/tool_text.c	(revision 30980)
+++ trunk/src_plugins/tool_std/tool_text.c	(revision 30981)
@@ -50,7 +50,7 @@
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	char *string;
 
-	if ((string = pcb_hid_prompt_for(hl, "Enter text:", "", "text")) != NULL) {
+	if ((string = rnd_hid_prompt_for(hl, "Enter text:", "", "text")) != NULL) {
 		if (strlen(string) > 0) {
 			pcb_text_t *text;
 			int flag = PCB_FLAG_CLEARLINE;
Index: trunk/src_plugins/vendordrill/vendor.c
===================================================================
--- trunk/src_plugins/vendordrill/vendor.c	(revision 30980)
+++ trunk/src_plugins/vendordrill/vendor.c	(revision 30981)
@@ -108,9 +108,9 @@
 /* DOC: applyvendor.html */
 fgw_error_t pcb_act_ApplyVendor(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
-	pcb_hid_busy(PCB, 1);
+	rnd_hid_busy(PCB, 1);
 	apply_vendor_map();
-	pcb_hid_busy(PCB, 0);
+	rnd_hid_busy(PCB, 0);
 	RND_ACT_IRES(0);
 	return 0;
 }
@@ -372,7 +372,7 @@
 		 */
 		if (changed) {
 			pcb_board_set_changed_flag(pcb_true);
-			pcb_hid_redraw(PCB);
+			rnd_hid_redraw(PCB);
 			pcb_undo_inc_serial();
 		}
 	}