Index: tool_arc.c
===================================================================
--- tool_arc.c	(revision 30979)
+++ tool_arc.c	(revision 30980)
@@ -134,7 +134,7 @@
 
 void pcb_tool_arc_adjust_attached_objects(rnd_hidlib_t *hl)
 {
-	pcb_crosshair.AttachedBox.otherway = pcb_gui->shift_is_pressed(pcb_gui);
+	pcb_crosshair.AttachedBox.otherway = rnd_gui->shift_is_pressed(rnd_gui);
 }
 
 void pcb_tool_arc_draw_attached(rnd_hidlib_t *hl)
@@ -144,15 +144,15 @@
 	if (pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) {
 		pcb_xordraw_attached_arc(conf_core.design.line_thickness);
 		if (conf_core.editor.show_drc) {
-			pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
+			rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
 			pcb_xordraw_attached_arc(conf_core.design.line_thickness + 2 * (conf_core.design.bloat + 1));
-			pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
+			rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
 		}
 	}
 	else {
 		/* Draw a circle (0 length line) to show where the arc will start when placed */
 		if(PCB_CURRLAYER(pcb))
-			pcb_render->set_color(pcb_crosshair.GC, &PCB_CURRLAYER(pcb)->meta.real.color);
+			rnd_render->set_color(pcb_crosshair.GC, &PCB_CURRLAYER(pcb)->meta.real.color);
 
 		pcb_draw_wireframe_line(pcb_crosshair.GC,
 			pcb_crosshair.X, pcb_crosshair.Y,
@@ -160,12 +160,12 @@
 			conf_core.design.line_thickness, 0);
 
 		if(conf_core.editor.show_drc) {
-			pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
+			rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
 			pcb_draw_wireframe_line(pcb_crosshair.GC,
 				pcb_crosshair.X, pcb_crosshair.Y,
 				pcb_crosshair.X, pcb_crosshair.Y,
 				conf_core.design.line_thickness + (2 * conf_core.design.bloat), 0);
-			pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
+			rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
 		}
 	}
 
Index: tool_arrow.c
===================================================================
--- tool_arrow.c	(revision 30979)
+++ tool_arrow.c	(revision 30980)
@@ -70,7 +70,7 @@
 	if (hl->tool_click) {
 		pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 		hl->tool_click = pcb_false;
-		if (pcb_crosshair_note.Moving && !pcb_gui->shift_is_pressed(pcb_gui)) {
+		if (pcb_crosshair_note.Moving && !rnd_gui->shift_is_pressed(rnd_gui)) {
 			hl->tool_grabbed.status = pcb_true;
 			pcb_crosshair_note.Buffer = conf_core.editor.buffer_number;
 			pcb_buffer_set_number(PCB_MAX_BUFFER - 1);
@@ -82,13 +82,13 @@
 			pcb_tool_is_saved = pcb_true;
 			pcb_tool_select_by_name(hl, "buffer");
 		}
-		else if (hl->tool_hit && !pcb_gui->shift_is_pressed(pcb_gui)) {
+		else if (hl->tool_hit && !rnd_gui->shift_is_pressed(rnd_gui)) {
 			rnd_rnd_box_t box;
 
 			hl->tool_grabbed.status = pcb_true;
 			pcb_tool_save(hl);
 			pcb_tool_is_saved = pcb_true;
-			pcb_tool_select_by_name(hl, pcb_gui->control_is_pressed(pcb_gui)? "copy" : "move");
+			pcb_tool_select_by_name(hl, rnd_gui->control_is_pressed(rnd_gui)? "copy" : "move");
 			pcb_crosshair.AttachedObject.Ptr1 = pcb_crosshair_note.ptr1;
 			pcb_crosshair.AttachedObject.Ptr2 = pcb_crosshair_note.ptr2;
 			pcb_crosshair.AttachedObject.Ptr3 = pcb_crosshair_note.ptr3;
@@ -100,10 +100,10 @@
 			}
 			pcb_crosshair.dragx = hl->tool_x;
 			pcb_crosshair.dragy = hl->tool_y;
-			box.X1 = hl->tool_x + PCB_SLOP * pcb_pixel_slop;
-			box.X2 = hl->tool_x - PCB_SLOP * pcb_pixel_slop;
-			box.Y1 = hl->tool_y + PCB_SLOP * pcb_pixel_slop;
-			box.Y2 = hl->tool_y - PCB_SLOP * pcb_pixel_slop;
+			box.X1 = hl->tool_x + PCB_SLOP * rnd_pixel_slop;
+			box.X2 = hl->tool_x - PCB_SLOP * rnd_pixel_slop;
+			box.Y1 = hl->tool_y + PCB_SLOP * rnd_pixel_slop;
+			box.Y2 = hl->tool_y - PCB_SLOP * rnd_pixel_slop;
 			pcb_crosshair.drags = pcb_list_block(pcb, &box, &pcb_crosshair.drags_len);
 			pcb_crosshair.drags_current = 0;
 			pcb_tool_attach_for_copy(hl, hl->tool_x, hl->tool_y, pcb_true);
@@ -119,7 +119,7 @@
 			box.X2 = RND_MAX_COORD;
 			box.Y2 = RND_MAX_COORD;
 			/* unselect first if shift key not down */
-			if (!pcb_gui->shift_is_pressed(pcb_gui) && pcb_select_block(pcb, &box, pcb_false, pcb_false, pcb_false))
+			if (!rnd_gui->shift_is_pressed(rnd_gui) && pcb_select_block(pcb, &box, pcb_false, pcb_false, pcb_false))
 				pcb_board_set_changed_flag(pcb_true);
 			pcb_tool_notify_block();
 			pcb_crosshair.AttachedBox.Point1.X = hl->tool_x;
@@ -130,7 +130,7 @@
 
 	if (pcb_crosshair.extobj_edit != NULL) {
 		pcb_extobj_float_geo(pcb_crosshair.extobj_edit);
-		pcb_gui->invalidate_all(pcb_gui);
+		rnd_gui->invalidate_all(rnd_gui);
 	}
 }
 
@@ -144,7 +144,7 @@
 	hl->tool_click = pcb_true;
 	/* do something after click time */
 	hv.ptr = hl;
-	pcb_gui->add_timer(pcb_gui, click_timer_cb, conf_core.editor.click_time, hv);
+	rnd_gui->add_timer(rnd_gui, click_timer_cb, conf_core.editor.click_time, hv);
 
 	/* see if we clicked on something already selected
 	 * (pcb_crosshair_note.Moving) or clicked on a MOVE_TYPE
@@ -193,7 +193,7 @@
 		hl->tool_click = pcb_false;					/* inhibit timer action */
 		pcb_undo_save_serial();
 		/* unselect first if shift key not down */
-		if (!pcb_gui->shift_is_pressed(pcb_gui)) {
+		if (!rnd_gui->shift_is_pressed(rnd_gui)) {
 			if (pcb_select_block(pcb, &box, pcb_false, pcb_false, pcb_false))
 				pcb_board_set_changed_flag(pcb_true);
 			if (pcb_crosshair_note.Moving) {
Index: tool_buffer.c
===================================================================
--- tool_buffer.c	(revision 30979)
+++ tool_buffer.c	(revision 30980)
@@ -57,7 +57,7 @@
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
-	if (pcb_gui->shift_is_pressed(pcb_gui)) {
+	if (rnd_gui->shift_is_pressed(rnd_gui)) {
 		rnd_actionva(hl, "ReplaceFootprint", "object", "@buffer", "dumb", NULL);
 		return;
 	}
@@ -64,7 +64,7 @@
 
 	if (pcb_buffer_copy_to_layout(pcb, pcb_crosshair.AttachedObject.tx, pcb_crosshair.AttachedObject.ty, keep_ids)) {
 		pcb_board_set_changed_flag(pcb_true);
-		pcb_gui->invalidate_all(pcb_gui);
+		rnd_gui->invalidate_all(rnd_gui);
 	}
 }
 
Index: tool_line.c
===================================================================
--- tool_line.c	(revision 30979)
+++ tool_line.c	(revision 30980)
@@ -109,7 +109,7 @@
 	case PCB_CH_STATE_FIRST:						/* first point */
 TODO("subc: this should work on heavy terminals too!")
 		if (pcb->RatDraw && pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &ptr1, &ptr1, &ptr1) == PCB_OBJ_VOID) {
-			pcb_gui->beep(pcb_gui);
+			rnd_gui->beep(rnd_gui);
 			break;
 		}
 		if (conf_core.editor.auto_drc) {
@@ -341,7 +341,7 @@
 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)) {
+	if (rnd_gui->control_is_pressed(rnd_gui)) {
 		pcb_crosshair.AttachedLine.draw = pcb_false;
 	}
 	else {
@@ -366,12 +366,12 @@
 		pcb_route_draw(&pcb_crosshair.Route,pcb_crosshair.GC);
 		if (conf_core.editor.show_drc)
 			pcb_route_draw_drc(&pcb_crosshair.Route,pcb_crosshair.GC);
-		pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
+		rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
 	}
 	else {
 		/* Draw a circle (0 length line) to show where the line will be placed */
 		if (PCB_CURRLAYER(pcb))
-			pcb_render->set_color(pcb_crosshair.GC, &PCB_CURRLAYER(pcb)->meta.real.color);
+			rnd_render->set_color(pcb_crosshair.GC, &PCB_CURRLAYER(pcb)->meta.real.color);
 
 		pcb_draw_wireframe_line(pcb_crosshair.GC,
 			pcb_crosshair.X, pcb_crosshair.Y,
@@ -379,12 +379,12 @@
 			conf_core.design.line_thickness,0 );
 
 		if (conf_core.editor.show_drc) {
-			pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
+			rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
 			pcb_draw_wireframe_line(pcb_crosshair.GC,
 				pcb_crosshair.X, pcb_crosshair.Y,
 				pcb_crosshair.X, pcb_crosshair.Y, 
 				conf_core.design.line_thickness + (2 * conf_core.design.bloat), 0);
-			pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
+			rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
 		}
 	}
 }
Index: tool_poly.c
===================================================================
--- tool_poly.c	(revision 30979)
+++ tool_poly.c	(revision 30980)
@@ -102,7 +102,7 @@
 {
 	pcb_attached_line_t *line = &pcb_crosshair.AttachedLine;
 
-	if (pcb_gui->control_is_pressed(pcb_gui)) {
+	if (rnd_gui->control_is_pressed(rnd_gui)) {
 		line->draw = pcb_false;
 		return;
 	}
@@ -121,7 +121,7 @@
 {
 	/* draw only if starting point is set */
 	if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST)
-		pcb_render->draw_line(pcb_crosshair.GC,
+		rnd_render->draw_line(pcb_crosshair.GC,
 									 pcb_crosshair.AttachedLine.Point1.X,
 									 pcb_crosshair.AttachedLine.Point1.Y, pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y);
 
Index: tool_polyhole.c
===================================================================
--- tool_polyhole.c	(revision 30979)
+++ tool_polyhole.c	(revision 30980)
@@ -132,7 +132,7 @@
 {
 	pcb_attached_line_t *line = &pcb_crosshair.AttachedLine;
 
-	if (pcb_gui->control_is_pressed(pcb_gui)) {
+	if (rnd_gui->control_is_pressed(rnd_gui)) {
 		line->draw = pcb_false;
 		return;
 	}
@@ -151,7 +151,7 @@
 {
 	/* draw only if starting point is set */
 	if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST)
-		pcb_render->draw_line(pcb_crosshair.GC,
+		rnd_render->draw_line(pcb_crosshair.GC,
 									 pcb_crosshair.AttachedLine.Point1.X,
 									 pcb_crosshair.AttachedLine.Point1.Y, pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y);
 
Index: tool_rotate.c
===================================================================
--- tool_rotate.c	(revision 30979)
+++ tool_rotate.c	(revision 30980)
@@ -45,7 +45,7 @@
 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));
+		rnd_gui->shift_is_pressed(rnd_gui) ? (conf_core.editor.show_solder_side ? 1 : 3) : (conf_core.editor.show_solder_side ? 3 : 1));
 	pcb_subc_as_board_update(PCB);
 }
 
Index: tool_thermal.c
===================================================================
--- tool_thermal.c	(revision 30979)
+++ tool_thermal.c	(revision 30980)
@@ -57,7 +57,7 @@
 	int cycles = sizeof(cycle) / sizeof(cycle[0]);
 
 	th = pcb_pstk_get_thermal(ps, lid, 1);
-	if (pcb_gui->shift_is_pressed(pcb_gui)) {
+	if (rnd_gui->shift_is_pressed(rnd_gui)) {
 		int n, curr = -1;
 		/* cycle through the variants to find the current one */
 		for(n = 0; n < cycles; n++) {
Index: tool_via.c
===================================================================
--- tool_via.c	(revision 30979)
+++ tool_via.c	(revision 30980)
@@ -76,7 +76,7 @@
 		pcb_obj_add_attribs((pcb_any_obj_t *)ps, pcb->pen_attr, NULL);
 		pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, ps, ps, ps);
 
-		if (pcb_gui->shift_is_pressed(pcb_gui))
+		if (rnd_gui->shift_is_pressed(rnd_gui))
 			pcb_tool_thermal_on_pstk(ps, PCB_CURRLID(pcb));
 
 		pcb_undo_inc_serial();
@@ -88,7 +88,7 @@
 static void xor_draw_fake_via(rnd_coord_t x, rnd_coord_t y, rnd_coord_t dia, rnd_coord_t clearance)
 {
 	rnd_coord_t r = (dia/2)+clearance;
-	pcb_render->draw_arc(pcb_crosshair.GC, x, y, r, r, 0, 360);
+	rnd_render->draw_arc(pcb_crosshair.GC, x, y, r, r, 0, 360);
 }
 
 
@@ -98,9 +98,9 @@
 	xor_draw_fake_via(pcb_crosshair.X, pcb_crosshair.Y, conf_core.design.via_thickness, 0);
 	if (conf_core.editor.show_drc) {
 		/* XXX: Naughty cheat - use the mask to draw DRC clearance! */
-		pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
+		rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
 		xor_draw_fake_via(pcb_crosshair.X, pcb_crosshair.Y, conf_core.design.via_thickness, conf_core.design.clearance);
-		pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
+		rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
 	}
 }