Index: draw_fab.c
===================================================================
--- draw_fab.c	(revision 27092)
+++ draw_fab.c	(revision 27093)
@@ -63,13 +63,13 @@
 
 static void fab_line(pcb_hid_gc_t gc, int x1, int y1, int x2, int y2)
 {
-	pcb_gui->draw_line(gc, x1, y1, x2, 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)
 {
-	pcb_gui->draw_arc(gc, x, y, r, r, 0, 180);
-	pcb_gui->draw_arc(gc, x, y, r, r, 180, 180);
+	pcb_render->draw_arc(gc, x, y, r, r, 0, 180);
+	pcb_render->draw_arc(gc, x, y, r, r, 180, 180);
 }
 
 /* align is 0=left, 1=center, 2=right, add 8 for underline */
@@ -182,12 +182,12 @@
 	pcb_hid_set_line_width(gc, PCB_MIL_TO_COORD(10));
 	PCB_LINE_LOOP(layer);
 	{
-		pcb_gui->draw_line(gc, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
+		pcb_render->draw_line(gc, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
 	}
 	PCB_END_LOOP;
 	PCB_ARC_LOOP(layer);
 	{
-		pcb_gui->draw_arc(gc, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
+		pcb_render->draw_arc(gc, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
 	}
 	PCB_END_LOOP;
 	PCB_TEXT_LOOP(layer);
@@ -308,10 +308,10 @@
 	}
 	if (!found) {
 		pcb_hid_set_line_width(gc, PCB_MIL_TO_COORD(10));
-		pcb_gui->draw_line(gc, 0, 0, PCB->hidlib.size_x, 0);
-		pcb_gui->draw_line(gc, 0, 0, 0, PCB->hidlib.size_y);
-		pcb_gui->draw_line(gc, PCB->hidlib.size_x, 0, PCB->hidlib.size_x, PCB->hidlib.size_y);
-		pcb_gui->draw_line(gc, 0, PCB->hidlib.size_y, PCB->hidlib.size_x, PCB->hidlib.size_y);
+		pcb_render->draw_line(gc, 0, 0, PCB->hidlib.size_x, 0);
+		pcb_render->draw_line(gc, 0, 0, 0, PCB->hidlib.size_y);
+		pcb_render->draw_line(gc, PCB->hidlib.size_x, 0, PCB->hidlib.size_x, PCB->hidlib.size_y);
+		pcb_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);
 		text_at(info, gc, PCB_MIL_TO_COORD(2000), yoff, 0,