Index: draw_fab.c
===================================================================
--- draw_fab.c	(revision 30970)
+++ draw_fab.c	(revision 30971)
@@ -60,12 +60,12 @@
 #define DRILL_MARK_SIZE	PCB_MIL_TO_COORD(16)
 #define FAB_LINE_W      PCB_MIL_TO_COORD(8)
 
-static void fab_line(pcb_hid_gc_t gc, int x1, int y1, int x2, int y2)
+static void fab_line(rnd_hid_gc_t gc, int x1, int y1, int x2, int y2)
 {
 	pcb_render->draw_line(gc, x1, y1, x2, y2);
 }
 
-static void fab_circle(pcb_hid_gc_t gc, int x, int y, int r)
+static void fab_circle(rnd_hid_gc_t gc, int x, int y, int r)
 {
 	pcb_render->draw_arc(gc, x, y, r, r, 0, 180);
 	pcb_render->draw_arc(gc, x, y, r, r, 180, 180);
@@ -72,7 +72,7 @@
 }
 
 /* align is 0=left, 1=center, 2=right, add 8 for underline */
-static void text_at(pcb_draw_info_t *info, pcb_hid_gc_t gc, int x, int y, int align, const char *fmt, ...)
+static void text_at(pcb_draw_info_t *info, rnd_hid_gc_t gc, int x, int y, int align, const char *fmt, ...)
 {
 	char tmp[512];
 	int w = 0, i;
@@ -103,7 +103,7 @@
 }
 
 /* Y, +, X, circle, square */
-static void drill_sym(pcb_hid_gc_t gc, int idx, int x, int y)
+static void drill_sym(rnd_hid_gc_t gc, int idx, int x, int y)
 {
 	int type = idx % 5;
 	int size = idx / 5;
@@ -176,7 +176,7 @@
 	return (ds + 2) * TEXT_LINE;
 }
 
-static void draw_fab_layer(pcb_draw_info_t *info, pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e, pcb_layer_t *layer, int found)
+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));
 	PCB_LINE_LOOP(layer);
@@ -200,7 +200,7 @@
 	}
 }
 
-static void DrawFab(pcb_draw_info_t *info, pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e)
+static void DrawFab(pcb_draw_info_t *info, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e)
 {
 	pcb_drill_info_t *AllDrills;
 	int i, n, yoff, total_drills = 0, ds = 0, found;