Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 30996)
+++ trunk/src/crosshair.c	(revision 30997)
@@ -1054,12 +1054,12 @@
 /* allocate GC only when the GUI is already up and running */
 static void pcb_crosshair_gui_init(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
-	pcb_crosshair.GC = pcb_hid_make_gc();
+	pcb_crosshair.GC = rnd_hid_make_gc();
 
 	rnd_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
-	pcb_hid_set_draw_xor(pcb_crosshair.GC, 1);
-	pcb_hid_set_line_cap(pcb_crosshair.GC, rnd_cap_round);
-	pcb_hid_set_line_width(pcb_crosshair.GC, 1);
+	rnd_hid_set_draw_xor(pcb_crosshair.GC, 1);
+	rnd_hid_set_line_cap(pcb_crosshair.GC, rnd_cap_round);
+	rnd_hid_set_line_width(pcb_crosshair.GC, 1);
 }
 
 /* ---------------------------------------------------------------------------
@@ -1093,7 +1093,7 @@
 	pcb_poly_free_fields(&pcb_crosshair.AttachedPolygon);
 	pcb_route_destroy(&pcb_crosshair.Route);
 	if (rnd_render != NULL)
-		pcb_hid_destroy_gc(pcb_crosshair.GC);
+		rnd_hid_destroy_gc(pcb_crosshair.GC);
 	rnd_event_unbind_allcookie(crosshair_cookie);
 }
 
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 30996)
+++ trunk/src/draw.c	(revision 30997)
@@ -273,8 +273,8 @@
 	rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
 	rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE_XOR, pcb_draw_out.direct, info->drawn_area);
 
-	pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
-	pcb_hid_set_draw_xor(pcb_draw_out.fgGC, 1);
+	rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
+	rnd_hid_set_draw_xor(pcb_draw_out.fgGC, 1);
 
 	if (PCB->SubcOn) {
 		info->objcb.subc.per_side = per_side;
@@ -281,16 +281,16 @@
 		pcb_r_search(PCB->Data->subc_tree, info->drawn_area, NULL, draw_subc_mark_callback, info, NULL);
 	}
 
-	pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+	rnd_hid_set_line_width(pcb_draw_out.fgGC, 0);
 
 	if ((PCB->padstack_mark_on) && (conf_core.appearance.padstack.cross_thick > 0)) {
-		pcb_hid_set_line_width(pcb_draw_out.fgGC, -conf_core.appearance.padstack.cross_thick);
+		rnd_hid_set_line_width(pcb_draw_out.fgGC, -conf_core.appearance.padstack.cross_thick);
 		pcb_draw_pstk_marks(info);
 	}
 
 	rnd_event(&PCB->hidlib, RND_EVENT_GUI_DRAW_OVERLAY_XOR, "p", &pcb_draw_out.fgGC, NULL);
 
-	pcb_hid_set_draw_xor(pcb_draw_out.fgGC, 0);
+	rnd_hid_set_draw_xor(pcb_draw_out.fgGC, 0);
 	rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area);
 }
 
@@ -312,14 +312,14 @@
 	/* Draw pins' and pads' names */
 	rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
 	rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
-	pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
-	pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+	rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
+	rnd_hid_set_line_width(pcb_draw_out.fgGC, 0);
 	if (PCB->SubcOn) {
 		info->objcb.subc.per_side = per_side;
 		pcb_r_search(PCB->Data->subc_tree, info->drawn_area, NULL, draw_subc_label_callback, info, NULL);
 	}
 	if (PCB->padstack_mark_on) {
-		pcb_hid_set_line_width(pcb_draw_out.fgGC, -conf_core.appearance.padstack.cross_thick);
+		rnd_hid_set_line_width(pcb_draw_out.fgGC, -conf_core.appearance.padstack.cross_thick);
 		pcb_draw_pstk_labels(info);
 	}
 	pcb_draw_pstk_names(info, info->xform->show_solder_side ? solder : component, info->drawn_area);
@@ -742,8 +742,8 @@
 		/* print the non-clearing polys */
 	if (lflg & PCB_LYT_COPPER) {
 		delayed_terms_enabled = pcb_true;
-		pcb_hid_set_line_width(pcb_draw_out.fgGC, 1);
-		pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_square);
+		rnd_hid_set_line_width(pcb_draw_out.fgGC, 1);
+		rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_square);
 		pcb_r_search(Layer->polygon_tree, info->drawn_area, NULL, pcb_poly_draw_term_callback, info, NULL);
 		delayed_terms_enabled = pcb_false;
 		may_have_delayed = 1;
@@ -1076,12 +1076,12 @@
 	vtp0_truncate(&delayed_objs, 0);
 
 	rnd_render = pcb_draw_out.hid = hid;
-	pcb_draw_out.fgGC = pcb_hid_make_gc();
-	pcb_draw_out.padGC = pcb_hid_make_gc();
-	pcb_draw_out.backpadGC = pcb_hid_make_gc();
-	pcb_draw_out.padselGC = pcb_hid_make_gc();
-	pcb_draw_out.drillGC = pcb_hid_make_gc();
-	pcb_draw_out.pmGC = pcb_hid_make_gc();
+	pcb_draw_out.fgGC = rnd_hid_make_gc();
+	pcb_draw_out.padGC = rnd_hid_make_gc();
+	pcb_draw_out.backpadGC = rnd_hid_make_gc();
+	pcb_draw_out.padselGC = rnd_hid_make_gc();
+	pcb_draw_out.drillGC = rnd_hid_make_gc();
+	pcb_draw_out.pmGC = rnd_hid_make_gc();
 
 	if (hid->force_compositing)
 		pcb_draw_out.direct = 0;
@@ -1093,22 +1093,22 @@
 	hid->set_color(pcb_draw_out.padGC, &conf_core.appearance.color.pin);
 	hid->set_color(pcb_draw_out.backpadGC, &conf_core.appearance.color.invisible_objects);
 	hid->set_color(pcb_draw_out.padselGC, &conf_core.appearance.color.selected);
-	pcb_hid_set_line_width(pcb_draw_out.backpadGC, -1);
-	pcb_hid_set_line_cap(pcb_draw_out.backpadGC, rnd_cap_square);
-	pcb_hid_set_line_width(pcb_draw_out.padselGC, -1);
-	pcb_hid_set_line_cap(pcb_draw_out.padselGC, rnd_cap_square);
-	pcb_hid_set_line_width(pcb_draw_out.padGC, -1);
-	pcb_hid_set_line_cap(pcb_draw_out.padGC, rnd_cap_square);
+	rnd_hid_set_line_width(pcb_draw_out.backpadGC, -1);
+	rnd_hid_set_line_cap(pcb_draw_out.backpadGC, rnd_cap_square);
+	rnd_hid_set_line_width(pcb_draw_out.padselGC, -1);
+	rnd_hid_set_line_cap(pcb_draw_out.padselGC, rnd_cap_square);
+	rnd_hid_set_line_width(pcb_draw_out.padGC, -1);
+	rnd_hid_set_line_cap(pcb_draw_out.padGC, rnd_cap_square);
 }
 
 static void expose_end(pcb_output_t *save)
 {
-	pcb_hid_destroy_gc(pcb_draw_out.fgGC);
-	pcb_hid_destroy_gc(pcb_draw_out.padGC);
-	pcb_hid_destroy_gc(pcb_draw_out.backpadGC);
-	pcb_hid_destroy_gc(pcb_draw_out.padselGC);
-	pcb_hid_destroy_gc(pcb_draw_out.drillGC);
-	pcb_hid_destroy_gc(pcb_draw_out.pmGC);
+	rnd_hid_destroy_gc(pcb_draw_out.fgGC);
+	rnd_hid_destroy_gc(pcb_draw_out.padGC);
+	rnd_hid_destroy_gc(pcb_draw_out.backpadGC);
+	rnd_hid_destroy_gc(pcb_draw_out.padselGC);
+	rnd_hid_destroy_gc(pcb_draw_out.drillGC);
+	rnd_hid_destroy_gc(pcb_draw_out.pmGC);
 
 	pcb_draw_out.fgGC = NULL;
 
Index: trunk/src/draw.h
===================================================================
--- trunk/src/draw.h	(revision 30996)
+++ trunk/src/draw.h	(revision 30997)
@@ -149,7 +149,7 @@
 #ifdef PCB_BBOX_DEBUG
 #define PCB_DRAW_BBOX(obj) \
 	do { \
-		pcb_hid_set_line_width(pcb_draw_out.fgGC, 0); \
+		rnd_hid_set_line_width(pcb_draw_out.fgGC, 0); \
 		rnd_render->draw_rect(pcb_draw_out.fgGC, obj->BoundingBox.X1, obj->BoundingBox.Y1, obj->BoundingBox.X2, obj->BoundingBox.Y2); \
 	} while(0)
 #else
Index: trunk/src/draw_ly_spec.c
===================================================================
--- trunk/src/draw_ly_spec.c	(revision 30996)
+++ trunk/src/draw_ly_spec.c	(revision 30997)
@@ -291,8 +291,8 @@
 		rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
 
 		rnd_render->set_color(pcb_draw_out.fgGC, &PCB->Data->Layer[goutl->lid[0]].meta.real.color);
-		pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
-		pcb_hid_set_line_width(pcb_draw_out.fgGC, conf_core.design.min_wid);
+		rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
+		rnd_hid_set_line_width(pcb_draw_out.fgGC, conf_core.design.min_wid);
 		rnd_render->draw_rect(pcb_draw_out.fgGC, 0, 0, PCB->hidlib.size_x, PCB->hidlib.size_y);
 
 		rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area);
@@ -344,9 +344,9 @@
 		return;
 
 	pcb_draw_doing_assy = pcb_true;
-	pcb_hid_set_draw_faded(pcb_draw_out.fgGC, 1);
+	rnd_hid_set_draw_faded(pcb_draw_out.fgGC, 1);
 	pcb_draw_layer_grp(info, side_group, 0);
-	pcb_hid_set_draw_faded(pcb_draw_out.fgGC, 0);
+	rnd_hid_set_draw_faded(pcb_draw_out.fgGC, 0);
 
 	/* draw package */
 	pcb_draw_silk_doc(info, lyt_side, PCB_LYT_SILK, 0, 0);
Index: trunk/src/extobj_helper.h
===================================================================
--- trunk/src/extobj_helper.h	(revision 30996)
+++ trunk/src/extobj_helper.h	(revision 30997)
@@ -136,7 +136,7 @@
 		return;
 
 	rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.extobj);
-	pcb_hid_set_line_width(pcb_draw_out.fgGC, -2);
+	rnd_hid_set_line_width(pcb_draw_out.fgGC, -2);
 	rnd_render->draw_line(pcb_draw_out.fgGC, x, y, x, y + unit);
 	rnd_render->draw_line(pcb_draw_out.fgGC, x, y, x + unit/2, y);
 	rnd_render->draw_line(pcb_draw_out.fgGC, x, y + unit, x + unit/2, y + unit);
Index: trunk/src/librnd/core/hid_inlines.h
===================================================================
--- trunk/src/librnd/core/hid_inlines.h	(revision 30996)
+++ trunk/src/librnd/core/hid_inlines.h	(revision 30997)
@@ -24,13 +24,13 @@
  *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
  */
 
-#ifndef PCB_HID_INLINES
-#define PCB_HID_INLINES
+#ifndef RND_HID_INLINES
+#define RND_HID_INLINES
 
 #include <librnd/core/hid.h>
 #include "globalconst.h"
 
-RND_INLINE rnd_hid_gc_t pcb_hid_make_gc(void)
+RND_INLINE rnd_hid_gc_t rnd_hid_make_gc(void)
 {
 	rnd_hid_gc_t res;
 	rnd_core_gc_t *hc;
@@ -44,12 +44,12 @@
 	return res;
 }
 
-RND_INLINE void pcb_hid_destroy_gc(rnd_hid_gc_t gc)
+RND_INLINE void rnd_hid_destroy_gc(rnd_hid_gc_t gc)
 {
 	rnd_render->destroy_gc(gc);
 }
 
-RND_INLINE void pcb_hid_set_line_cap(rnd_hid_gc_t gc, rnd_cap_style_t style)
+RND_INLINE void rnd_hid_set_line_cap(rnd_hid_gc_t gc, rnd_cap_style_t style)
 {
 	rnd_core_gc_t *hc = (rnd_core_gc_t *)gc;
 	if (hc->cap != style) {
@@ -58,7 +58,7 @@
 	}
 }
 
-RND_INLINE void pcb_hid_set_line_width(rnd_hid_gc_t gc, rnd_coord_t width)
+RND_INLINE void rnd_hid_set_line_width(rnd_hid_gc_t gc, rnd_coord_t width)
 {
 	rnd_core_gc_t *hc = (rnd_core_gc_t *)gc;
 	if (hc->width != width) {
@@ -67,7 +67,7 @@
 	}
 }
 
-RND_INLINE void pcb_hid_set_draw_xor(rnd_hid_gc_t gc, int xor)
+RND_INLINE void rnd_hid_set_draw_xor(rnd_hid_gc_t gc, int xor)
 {
 	rnd_core_gc_t *hc = (rnd_core_gc_t *)gc;
 	if (hc->xor != xor) {
@@ -76,7 +76,7 @@
 	}
 }
 
-RND_INLINE void pcb_hid_set_draw_faded(rnd_hid_gc_t gc, int faded)
+RND_INLINE void rnd_hid_set_draw_faded(rnd_hid_gc_t gc, int faded)
 {
 	rnd_core_gc_t *hc = (rnd_core_gc_t *)gc;
 	if (hc->faded != faded) {
@@ -85,7 +85,7 @@
 	}
 }
 
-RND_INLINE const char *pcb_hid_command_entry(const char *ovr, int *cursor)
+RND_INLINE const char *rnd_hid_command_entry(const char *ovr, int *cursor)
 {
 	if ((rnd_gui == NULL) || (rnd_gui->command_entry == NULL)) {
 		if (cursor != NULL)
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 30996)
+++ trunk/src/librnd/pcb_compat.h	(revision 30997)
@@ -922,3 +922,10 @@
 #define pcb_w32_sharedir rnd_w32_sharedir
 #define pcb_w32_cachedir rnd_w32_cachedir
 #define pcb_hid_register_hid rnd_hid_register_hid
+#define pcb_hid_make_gc rnd_hid_make_gc
+#define pcb_hid_destroy_gc rnd_hid_destroy_gc
+#define pcb_hid_set_line_cap rnd_hid_set_line_cap
+#define pcb_hid_set_line_width rnd_hid_set_line_width
+#define pcb_hid_set_draw_xor rnd_hid_set_draw_xor
+#define pcb_hid_set_draw_faded rnd_hid_set_draw_faded
+#define pcb_hid_command_entry rnd_hid_command_entry
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 30996)
+++ trunk/src/obj_arc.c	(revision 30997)
@@ -1066,20 +1066,20 @@
 	if (!info->xform->thin_draw && !info->xform->wireframe)
 	{
 		if ((allow_term_gfx) && pcb_draw_term_need_gfx(arc) && pcb_draw_term_hid_permission()) {
-			pcb_hid_set_line_cap(pcb_draw_out.active_padGC, rnd_cap_round);
-			pcb_hid_set_line_width(pcb_draw_out.active_padGC, thickness);
+			rnd_hid_set_line_cap(pcb_draw_out.active_padGC, rnd_cap_round);
+			rnd_hid_set_line_width(pcb_draw_out.active_padGC, thickness);
 			rnd_render->draw_arc(pcb_draw_out.active_padGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
-			pcb_hid_set_line_width(pcb_draw_out.fgGC, PCB_DRAW_TERM_GFX_WIDTH);
+			rnd_hid_set_line_width(pcb_draw_out.fgGC, PCB_DRAW_TERM_GFX_WIDTH);
 		}
 		else
-			pcb_hid_set_line_width(pcb_draw_out.fgGC, thickness);
-		pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
+			rnd_hid_set_line_width(pcb_draw_out.fgGC, thickness);
+		rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
 		rnd_render->draw_arc(pcb_draw_out.fgGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
 	}
 	else
 	{
-		pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
-		pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
+		rnd_hid_set_line_width(pcb_draw_out.fgGC, 0);
+		rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
 
 		if(info->xform->thin_draw)
 			rnd_render->draw_arc(pcb_draw_out.fgGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
Index: trunk/src/obj_common.h
===================================================================
--- trunk/src/obj_common.h	(revision 30996)
+++ trunk/src/obj_common.h	(revision 30997)
@@ -321,8 +321,8 @@
 	rnd_coord_t radius = PCB_MM_TO_COORD(0.2); \
 	int selected = PCB_FLAG_TEST(PCB_FLAG_SELECTED, obj); \
 	rnd_render->set_color(pcb_draw_out.fgGC, selected ? &conf_core.appearance.color.selected : &conf_core.appearance.color.subc); \
-	pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); \
-	pcb_hid_set_line_width(pcb_draw_out.fgGC, -2); \
+	rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); \
+	rnd_hid_set_line_width(pcb_draw_out.fgGC, -2); \
 	rnd_render->draw_line(pcb_draw_out.fgGC, cx-radius, cy-radius, cx+radius, cy+radius); \
 	rnd_render->draw_line(pcb_draw_out.fgGC, cx+radius, cy-radius, cx-radius, cy+radius); \
 } while(0)
Index: trunk/src/obj_gfx.c
===================================================================
--- trunk/src/obj_gfx.c	(revision 30996)
+++ trunk/src/obj_gfx.c	(revision 30997)
@@ -635,8 +635,8 @@
 			color = &conf_core.appearance.color.selected;
 
 		rnd_render->set_color(pcb_draw_out.fgGC, color);
-		pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
-		pcb_hid_set_line_width(pcb_draw_out.fgGC, -2);
+		rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
+		rnd_hid_set_line_width(pcb_draw_out.fgGC, -2);
 		rnd_render->draw_line(pcb_draw_out.fgGC, gfx->cox[0], gfx->coy[0], gfx->cox[1], gfx->coy[1]);
 		rnd_render->draw_line(pcb_draw_out.fgGC, gfx->cox[1], gfx->coy[1], gfx->cox[2], gfx->coy[2]);
 		rnd_render->draw_line(pcb_draw_out.fgGC, gfx->cox[2], gfx->coy[2], gfx->cox[3], gfx->coy[3]);
@@ -646,8 +646,8 @@
 
 	if ((gfx->pxm_neutral == NULL) || (rnd_render->draw_pixmap == NULL)) {
 		rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.warn);
-		pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
-		pcb_hid_set_line_width(pcb_draw_out.fgGC, PCB_MM_TO_COORD(0.1));
+		rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
+		rnd_hid_set_line_width(pcb_draw_out.fgGC, PCB_MM_TO_COORD(0.1));
 		rnd_render->draw_line(pcb_draw_out.fgGC, gfx->cox[0], gfx->coy[0], gfx->cox[2], gfx->coy[2]);
 		rnd_render->draw_line(pcb_draw_out.fgGC, gfx->cox[1], gfx->coy[1], gfx->cox[3], gfx->coy[3]);
 	}
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 30996)
+++ trunk/src/obj_line.c	(revision 30997)
@@ -1178,26 +1178,26 @@
 	}
 
 	PCB_DRAW_BBOX(line);
-	pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
+	rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
 	if (!info->xform->thin_draw && !info->xform->wireframe) {
 		if ((allow_term_gfx) && pcb_draw_term_need_gfx(line) && pcb_draw_term_hid_permission()) {
-			pcb_hid_set_line_cap(pcb_draw_out.active_padGC, rnd_cap_round);
-			pcb_hid_set_line_width(pcb_draw_out.active_padGC, thickness);
+			rnd_hid_set_line_cap(pcb_draw_out.active_padGC, rnd_cap_round);
+			rnd_hid_set_line_width(pcb_draw_out.active_padGC, thickness);
 			rnd_render->draw_line(pcb_draw_out.active_padGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
-			pcb_hid_set_line_width(pcb_draw_out.fgGC, PCB_DRAW_TERM_GFX_WIDTH);
+			rnd_hid_set_line_width(pcb_draw_out.fgGC, PCB_DRAW_TERM_GFX_WIDTH);
 		}
 		else
-			pcb_hid_set_line_width(pcb_draw_out.fgGC, thickness);
+			rnd_hid_set_line_width(pcb_draw_out.fgGC, thickness);
 		rnd_render->draw_line(pcb_draw_out.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
 	}
 	else {
 		if(info->xform->thin_draw) {
-			pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+			rnd_hid_set_line_width(pcb_draw_out.fgGC, 0);
 			rnd_render->draw_line(pcb_draw_out.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
 		}
 
 		if (info->xform->wireframe) {
-			pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+			rnd_hid_set_line_width(pcb_draw_out.fgGC, 0);
 			pcb_draw_wireframe_line(pcb_draw_out.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, thickness, 0);
 		}
 	}
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 30996)
+++ trunk/src/obj_poly.c	(revision 30997)
@@ -1243,8 +1243,8 @@
 	else
 		rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.pin_name);
 
-	pcb_hid_set_line_width(pcb_draw_out.fgGC, -1);
-	pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
+	rnd_hid_set_line_width(pcb_draw_out.fgGC, -1);
+	rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
 
 	if (poly->HoleIndexN > 0)
 		np = poly->HoleIndex[0];
@@ -1348,7 +1348,7 @@
 			int i;
 			pcb_dhlp_fill_pcb_polygon(pcb_draw_out.active_padGC, polygon, info->drawn_area);
 			head = polygon->Clipped->contours->head;
-			pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_square);
+			rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_square);
 			for(n = head, i = 0; (n != head) || (i == 0); n = n->next, i++) {
 				rnd_coord_t x, y, r;
 				x = (n->prev->point[0] + n->point[0] + n->next->point[0]) / 3;
@@ -1356,8 +1356,8 @@
 
 TODO("subc: check if x;y is within the poly, but use a cheaper method than the official")
 				r = PCB_DRAW_TERM_GFX_WIDTH;
-				pcb_hid_set_line_width(pcb_draw_out.fgGC, r);
-				pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_square);
+				rnd_hid_set_line_width(pcb_draw_out.fgGC, r);
+				rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_square);
 				rnd_render->draw_line(pcb_draw_out.fgGC, x, y, x, y);
 			}
 		}
Index: trunk/src/obj_poly_draw_helper.c
===================================================================
--- trunk/src/obj_poly_draw_helper.c	(revision 30996)
+++ trunk/src/obj_poly_draw_helper.c	(revision 30997)
@@ -97,8 +97,8 @@
 	while ((v = v->next) != pl->head->next);
 
 	if (i < 3) {
-		pcb_hid_set_line_width(gc, PCB_MM_TO_COORD(0.01));
-		pcb_hid_set_line_cap(gc, rnd_cap_round);
+		rnd_hid_set_line_width(gc, PCB_MM_TO_COORD(0.01));
+		rnd_hid_set_line_cap(gc, rnd_cap_round);
 		rnd_render->draw_line(gc, last_x, last_y, this_x, this_y);
 	}
 	else
@@ -113,8 +113,8 @@
 	pcb_vnode_t *v;
 
 
-	pcb_hid_set_line_width(gc, 0);
-	pcb_hid_set_line_cap(gc, rnd_cap_round);
+	rnd_hid_set_line_width(gc, 0);
+	rnd_hid_set_line_cap(gc, rnd_cap_round);
 
 	/* If the contour is round, use an arc drawing routine. */
 	if (pl->is_round) {
Index: trunk/src/obj_pstk.c
===================================================================
--- trunk/src/obj_pstk.c	(revision 30996)
+++ trunk/src/obj_pstk.c	(revision 30997)
@@ -423,7 +423,7 @@
 
 	if (shape->data.poly.pa == NULL)
 		pcb_pstk_shape_update_pa(&shape->data.poly);
-	pcb_hid_set_line_cap(gc, rnd_cap_round);
+	rnd_hid_set_line_cap(gc, rnd_cap_round);
 	if (dthick != 0) {
 		/* slow - but would be used on export mostly, not on-screen drawing */
 		pcb_polo_t *p, p_st[32];
@@ -491,13 +491,13 @@
 			pcb_pstk_draw_poly(info, gc, ps, shape, 1, dthick);
 			break;
 		case PCB_PSSH_LINE:
-			pcb_hid_set_line_cap(gc, shape->data.line.square ? rnd_cap_square : rnd_cap_round);
-			pcb_hid_set_line_width(gc, MAX(shape->data.line.thickness + dthick, 1));
+			rnd_hid_set_line_cap(gc, shape->data.line.square ? rnd_cap_square : rnd_cap_round);
+			rnd_hid_set_line_width(gc, MAX(shape->data.line.thickness + dthick, 1));
 			rnd_render->draw_line(gc, ps->x + shape->data.line.x1, ps->y + shape->data.line.y1, ps->x + shape->data.line.x2, ps->y + shape->data.line.y2);
 			break;
 		case PCB_PSSH_CIRC:
 			r = MAX(shape->data.circ.dia/2 + dthick/2, 1);
-			pcb_hid_set_line_cap(gc, rnd_cap_round);
+			rnd_hid_set_line_cap(gc, rnd_cap_round);
 			rnd_render->fill_circle(gc, ps->x + shape->data.circ.x, ps->y + shape->data.circ.y, r);
 			break;
 		case PCB_PSSH_HSHADOW:
@@ -508,7 +508,7 @@
 static void pcb_pstk_draw_shape_thin(pcb_draw_info_t *info, rnd_hid_gc_t gc, pcb_pstk_t *ps, pcb_pstk_shape_t *shape)
 {
 	rnd_coord_t r, dthick = 0;
-	pcb_hid_set_line_cap(gc, rnd_cap_round);
+	rnd_hid_set_line_cap(gc, rnd_cap_round);
 
 	if ((info != NULL) && (info->xform != NULL) && (info->xform->bloat != 0))
 		dthick = info->xform->bloat;
@@ -568,7 +568,7 @@
 		else
 			set_ps_color(ps, info->objcb.pstk.is_current, grp->ltype, info->objcb.pstk.layer1, info->xform);
 		if (info->xform->thin_draw || info->xform->wireframe) {
-			pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+			rnd_hid_set_line_width(pcb_draw_out.fgGC, 0);
 			pcb_pstk_draw_shape_thin(info, pcb_draw_out.fgGC, ps, shape);
 		}
 		else
@@ -586,7 +586,7 @@
 
 	/* mark is a cross in the middle, right on the hole;
 	   cross size should extend beyond the hole */
-	pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
+	rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
 	mark = conf_core.appearance.padstack.cross_size;
 	proto = pcb_pstk_get_proto(ps);
 	if (proto != NULL)
@@ -598,7 +598,7 @@
 
 	/* draw the cross using xor */
 	set_ps_annot_color(pcb_draw_out.fgGC, ps);
-	pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+	rnd_hid_set_line_width(pcb_draw_out.fgGC, 0);
 	if (mark2 > rnd_render->coord_per_pix*3) {
 		rnd_render->draw_line(pcb_draw_out.fgGC, ps->x-mark, ps->y, ps->x+mark, ps->y);
 		rnd_render->draw_line(pcb_draw_out.fgGC, ps->x, ps->y-mark, ps->x, ps->y+mark);
@@ -666,8 +666,8 @@
 		return PCB_R_DIR_NOT_FOUND;
 
 	/* actual hole */
-	pcb_hid_set_line_width(pcb_draw_out.drillGC, 0);
-	pcb_hid_set_line_cap(pcb_draw_out.drillGC, rnd_cap_round);
+	rnd_hid_set_line_width(pcb_draw_out.drillGC, 0);
+	rnd_hid_set_line_cap(pcb_draw_out.drillGC, rnd_cap_round);
 	rnd_render->fill_circle(pcb_draw_out.drillGC, ps->x, ps->y, proto->hdia / 2);
 
 	/* indicate unplated holes with an arc; unplated holes are more rare
@@ -676,7 +676,7 @@
 		rnd_coord_t r = proto->hdia / 2;
 		r -= r/8; /* +12.5% */
 		rnd_render->set_color(pcb_draw_out.fgGC, PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps) ? &conf_core.appearance.color.selected : &conf_core.appearance.color.subc);
-		pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+		rnd_hid_set_line_width(pcb_draw_out.fgGC, 0);
 		rnd_render->draw_arc(pcb_draw_out.fgGC, ps->x, ps->y, r, r, 20, 290);
 	}
 
@@ -727,7 +727,7 @@
 	shape = pcb_pstk_shape(ps, PCB_LYT_MECH, PCB_LYC_AUTO);
 	if (shape != NULL) {
 		if (info->xform->thin_draw || info->xform->wireframe) {
-			pcb_hid_set_line_width(pcb_draw_out.drillGC, 0);
+			rnd_hid_set_line_width(pcb_draw_out.drillGC, 0);
 			pcb_pstk_draw_shape_thin(info, pcb_draw_out.drillGC, ps, shape);
 		}
 		else
Index: trunk/src/obj_rat.c
===================================================================
--- trunk/src/obj_rat.c	(revision 30996)
+++ trunk/src/obj_rat.c	(revision 30997)
@@ -466,9 +466,9 @@
 		int w = rat->Thickness;
 
 		if (info->xform->thin_draw || info->xform->wireframe)
-			pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+			rnd_hid_set_line_width(pcb_draw_out.fgGC, 0);
 		else
-			pcb_hid_set_line_width(pcb_draw_out.fgGC, w);
+			rnd_hid_set_line_width(pcb_draw_out.fgGC, w);
 		rnd_render->draw_arc(pcb_draw_out.fgGC, rat->Point1.X, rat->Point1.Y, w * 2, w * 2, 0, 360);
 	}
 	else
Index: trunk/src/obj_subc.c
===================================================================
--- trunk/src/obj_subc.c	(revision 30996)
+++ trunk/src/obj_subc.c	(revision 30997)
@@ -1984,7 +1984,7 @@
 
 	nnclr = (PCB_FLAG_TEST(PCB_FLAG_NONETLIST, subc)) ? &conf_core.appearance.color.subc_nonetlist : &conf_core.appearance.color.subc;
 	rnd_render->set_color(pcb_draw_out.fgGC, selected ? &conf_core.appearance.color.selected : nnclr);
-	pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+	rnd_hid_set_line_width(pcb_draw_out.fgGC, 0);
 	pcb_subc_draw_origin(pcb_draw_out.fgGC, subc, 0, 0);
 
 	if (locked) {
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 30996)
+++ trunk/src/obj_text.c	(revision 30997)
@@ -1140,8 +1140,8 @@
 				cheap_text_line(pcb_crosshair.GC, mx, 0, h/2, w, h/2, xordx, xordy);
 			}
 			else {
-				pcb_hid_set_line_width(pcb_draw_out.fgGC, -1);
-				pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_square);
+				rnd_hid_set_line_width(pcb_draw_out.fgGC, -1);
+				rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_square);
 				cheap_text_line(pcb_draw_out.fgGC, mx, 0, h/2, w, h/2, 0, 0);
 			}
 			return 1;
@@ -1156,8 +1156,8 @@
 			}
 			else {
 				h /= 4;
-				pcb_hid_set_line_width(pcb_draw_out.fgGC, -1);
-				pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_square);
+				rnd_hid_set_line_width(pcb_draw_out.fgGC, -1);
+				rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_square);
 				cheap_text_line(pcb_draw_out.fgGC, mx, 0, h,   w, h,   0, 0);
 				cheap_text_line(pcb_draw_out.fgGC, mx, 0, h,   w, h*3, 0, 0);
 				cheap_text_line(pcb_draw_out.fgGC, mx, 0, h*3, w, h*3, 0, 0);
Index: trunk/src_plugins/ddraft/cli.c
===================================================================
--- trunk/src_plugins/ddraft/cli.c	(revision 30996)
+++ trunk/src_plugins/ddraft/cli.c	(revision 30997)
@@ -521,7 +521,7 @@
 	if ((cmd != NULL) && (*cmd != '/'))
 		cline = cmd;
 	else
-		cline = pcb_hid_command_entry(NULL, &cursor);
+		cline = rnd_hid_command_entry(NULL, &cursor);
 	if (cline == NULL)
 		cline = "";
 
Index: trunk/src_plugins/ddraft/cli_line.c
===================================================================
--- trunk/src_plugins/ddraft/cli_line.c	(revision 30996)
+++ trunk/src_plugins/ddraft/cli_line.c	(revision 30997)
@@ -210,7 +210,7 @@
 
 rnd_trace("line='%s'\n", line);
 	update:;
-	pcb_hid_command_entry(line, &cursor);
+	rnd_hid_command_entry(line, &cursor);
 
 	return 0;
 }
Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_lib_pstk.c	(revision 30996)
+++ trunk/src_plugins/dialogs/dlg_lib_pstk.c	(revision 30997)
@@ -174,8 +174,8 @@
 	pcb_pstk_draw_preview(PCB, &ps, layers, 0, 0, &e->view);
 
 	rnd_render->set_color(gc, rnd_color_black);
-	pcb_hid_set_line_cap(gc, rnd_cap_round);
-	pcb_hid_set_line_width(gc, -1);
+	rnd_hid_set_line_cap(gc, rnd_cap_round);
+	rnd_hid_set_line_width(gc, -1);
 
 	x1 = ctx->drawbox.X1;
 	y1 = ctx->drawbox.Y1;
Index: trunk/src_plugins/draw_fab/draw_fab.c
===================================================================
--- trunk/src_plugins/draw_fab/draw_fab.c	(revision 30996)
+++ trunk/src_plugins/draw_fab/draw_fab.c	(revision 30997)
@@ -178,7 +178,7 @@
 
 static void draw_fab_layer(pcb_draw_info_t *info, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e, pcb_layer_t *layer, int found)
 {
-	pcb_hid_set_line_width(gc, PCB_MIL_TO_COORD(10));
+	rnd_hid_set_line_width(gc, PCB_MIL_TO_COORD(10));
 	PCB_LINE_LOOP(layer);
 	{
 		rnd_render->draw_line(gc, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
@@ -195,7 +195,7 @@
 	}
 	PCB_END_LOOP;
 	if (!found) {
-		pcb_hid_set_line_width(gc, FAB_LINE_W);
+		rnd_hid_set_line_width(gc, FAB_LINE_W);
 		text_at(info, gc, PCB->hidlib.size_x / 2, PCB->hidlib.size_y + PCB_MIL_TO_COORD(20), 1, "Board outline is the centerline of this path");
 	}
 }
@@ -225,8 +225,8 @@
 		yoff -= (4 - ds) * TEXT_LINE;
 	}
 
-	pcb_hid_set_line_cap(gc, rnd_cap_round);
-	pcb_hid_set_line_width(gc, FAB_LINE_W);
+	rnd_hid_set_line_cap(gc, rnd_cap_round);
+	rnd_hid_set_line_width(gc, FAB_LINE_W);
 
 	for (n = AllDrills->DrillN - 1; n >= 0; n--) {
 		int plated_sym = -1, unplated_sym = -1;
@@ -307,13 +307,13 @@
 		}
 	}
 	if (!found) {
-		pcb_hid_set_line_width(gc, PCB_MIL_TO_COORD(10));
+		rnd_hid_set_line_width(gc, PCB_MIL_TO_COORD(10));
 		rnd_render->draw_line(gc, 0, 0, PCB->hidlib.size_x, 0);
 		rnd_render->draw_line(gc, 0, 0, 0, PCB->hidlib.size_y);
 		rnd_render->draw_line(gc, PCB->hidlib.size_x, 0, PCB->hidlib.size_x, PCB->hidlib.size_y);
 		rnd_render->draw_line(gc, 0, PCB->hidlib.size_y, PCB->hidlib.size_x, PCB->hidlib.size_y);
 		/*FPrintOutline (); */
-		pcb_hid_set_line_width(gc, FAB_LINE_W);
+		rnd_hid_set_line_width(gc, FAB_LINE_W);
 		text_at(info, gc, PCB_MIL_TO_COORD(2000), yoff, 0,
 						"Maximum Dimensions: %f mils wide, %f mils high", PCB_COORD_TO_MIL(PCB->hidlib.size_x), PCB_COORD_TO_MIL(PCB->hidlib.size_y));
 		text_at(info, gc, PCB->hidlib.size_x / 2, PCB->hidlib.size_y + PCB_MIL_TO_COORD(20), 1,
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 30996)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 30997)
@@ -602,18 +602,18 @@
 			pcb_draw_groups(hid, PCB, PCB_LYT_BOUNDARY, F_uroute, NULL, &region, rnd_color_black, PCB_LYT_MECH, 0, 0);
 		}
 		else {
-			rnd_hid_gc_t gc = pcb_hid_make_gc();
+			rnd_hid_gc_t gc = rnd_hid_make_gc();
 			if (flags & PCB_LYT_SILK)
-				pcb_hid_set_line_width(gc, conf_core.design.min_slk);
+				rnd_hid_set_line_width(gc, conf_core.design.min_slk);
 			else if (group >= 0)
-				pcb_hid_set_line_width(gc, conf_core.design.min_wid);
+				rnd_hid_set_line_width(gc, conf_core.design.min_wid);
 			else
-				pcb_hid_set_line_width(gc, AUTO_OUTLINE_WIDTH);
+				rnd_hid_set_line_width(gc, AUTO_OUTLINE_WIDTH);
 			rnd_render->draw_line(gc, 0, 0, PCB->hidlib.size_x, 0);
 			rnd_render->draw_line(gc, 0, 0, 0, PCB->hidlib.size_y);
 			rnd_render->draw_line(gc, PCB->hidlib.size_x, 0, PCB->hidlib.size_x, PCB->hidlib.size_y);
 			rnd_render->draw_line(gc, 0, PCB->hidlib.size_y, PCB->hidlib.size_x, PCB->hidlib.size_y);
-			pcb_hid_destroy_gc(gc);
+			rnd_hid_destroy_gc(gc);
 		}
 	}
 	return 1;
Index: trunk/src_plugins/exto_std/bus.c
===================================================================
--- trunk/src_plugins/exto_std/bus.c	(revision 30996)
+++ trunk/src_plugins/exto_std/bus.c	(revision 30997)
@@ -224,7 +224,7 @@
 	bus = subc->extobj_data;
 
 	rnd_render->set_color(pcb_draw_out.fgGC, &conf_core.appearance.color.extobj);
-	pcb_hid_set_line_width(pcb_draw_out.fgGC, -1);
+	rnd_hid_set_line_width(pcb_draw_out.fgGC, -1);
 
 	for(l = linelist_first(&ly->Line); l != NULL; l = linelist_next(l)) {
 		rnd_coord_t x, y;
Index: trunk/src_plugins/exto_std/line_of_vias.c
===================================================================
--- trunk/src_plugins/exto_std/line_of_vias.c	(revision 30996)
+++ trunk/src_plugins/exto_std/line_of_vias.c	(revision 30997)
@@ -169,11 +169,11 @@
 
 	selected = PCB_FLAG_TEST(PCB_FLAG_SELECTED, line);
 	rnd_render->set_color(pcb_draw_out.fgGC, selected ? &conf_core.appearance.color.selected : &conf_core.appearance.color.extobj);
-	pcb_hid_set_line_width(pcb_draw_out.fgGC, -1);
+	rnd_hid_set_line_width(pcb_draw_out.fgGC, -1);
 	rnd_render->draw_line(pcb_draw_out.fgGC, x1 - dy * +disp, y1 + dx * +disp, x2 - dy * +disp, y2 + dx * +disp);
 	rnd_render->draw_line(pcb_draw_out.fgGC, x1 - dy * -disp, y1 + dx * -disp, x2 - dy * -disp, y2 + dx * -disp);
 
-	pcb_hid_set_line_width(pcb_draw_out.fgGC, -2);
+	rnd_hid_set_line_width(pcb_draw_out.fgGC, -2);
 	ax = x1 + dx * arrow;
 	ay = y1 + dy * arrow;
 	ax1 = x1 - dy * +arrow;
Index: trunk/src_plugins/jostle/jostle.c
===================================================================
--- trunk/src_plugins/jostle/jostle.c	(revision 30996)
+++ trunk/src_plugins/jostle/jostle.c	(revision 30997)
@@ -98,7 +98,7 @@
 			}
 /*			if (1) {
 				rnd_render->set_color(ddgc, color ? color : conf_core.appearance.color.connected);
-				pcb_hid_set_line_width(ddgc, 1);
+				rnd_hid_set_line_width(ddgc, 1);
 				for (i = 0; i < n - 1; i++) {
 					rnd_render->draw_line(ddgc, x[i], y[i], x[i + 1], y[i + 1]);
 					rnd_render->fill_circle (ddgc, x[i], y[i], 30);