Index: eps.c
===================================================================
--- eps.c	(revision 30977)
+++ eps.c	(revision 30978)
@@ -29,8 +29,8 @@
 static pcb_cam_t eps_cam;
 
 typedef struct rnd_hid_gc_s {
-	pcb_core_gc_t core_gc;
-	pcb_cap_style_t cap;
+	rnd_core_gc_t core_gc;
+	rnd_cap_style_t cap;
 	rnd_coord_t width;
 	unsigned long color;
 	int erase;
@@ -432,7 +432,7 @@
 static rnd_hid_gc_t eps_make_gc(rnd_hid_t *hid)
 {
 	rnd_hid_gc_t rv = (rnd_hid_gc_t) malloc(sizeof(rnd_hid_gc_s));
-	rv->cap = pcb_cap_round;
+	rv->cap = rnd_cap_round;
 	rv->width = 0;
 	rv->color = 0;
 	return rv;
@@ -487,7 +487,7 @@
 		gc->color = 0;
 }
 
-static void eps_set_line_cap(rnd_hid_gc_t gc, pcb_cap_style_t style)
+static void eps_set_line_cap(rnd_hid_gc_t gc, rnd_cap_style_t style)
 {
 	gc->cap = style;
 }
@@ -512,10 +512,10 @@
 	if (lastcap != gc->cap) {
 		int c;
 		switch (gc->cap) {
-		case pcb_cap_round:
+		case rnd_cap_round:
 			c = 1;
 			break;
-		case pcb_cap_square:
+		case rnd_cap_square:
 			c = 2;
 			break;
 		default:
@@ -546,7 +546,7 @@
 {
 	rnd_coord_t w = gc->width / 2;
 	if (x1 == x2 && y1 == y2) {
-		if (gc->cap == pcb_cap_square)
+		if (gc->cap == rnd_cap_square)
 			eps_fill_rect(gc, x1 - w, y1 - w, x1 + w, y1 + w);
 		else
 			eps_fill_circle(gc, x1, y1, w);
@@ -553,7 +553,7 @@
 		return;
 	}
 	use_gc(gc);
-	if (gc->erase && gc->cap != pcb_cap_square) {
+	if (gc->erase && gc->cap != rnd_cap_square) {
 		double ang = atan2(y2 - y1, x2 - x1);
 		double dx = w * sin(ang);
 		double dy = -w * cos(ang);
Index: ps.c
===================================================================
--- ps.c	(revision 30977)
+++ ps.c	(revision 30978)
@@ -36,9 +36,9 @@
 static void use_gc(rnd_hid_gc_t gc);
 
 typedef struct rnd_hid_gc_s {
-	pcb_core_gc_t core_gc;
+	rnd_core_gc_t core_gc;
 	rnd_hid_t *me_pointer;
-	pcb_cap_style_t cap;
+	rnd_cap_style_t cap;
 	rnd_coord_t width;
 	unsigned char r, g, b;
 	int erase;
@@ -954,7 +954,7 @@
 {
 	rnd_hid_gc_t rv = (rnd_hid_gc_t) calloc(1, sizeof(rnd_hid_gc_s));
 	rv->me_pointer = &ps_hid;
-	rv->cap = pcb_cap_round;
+	rv->cap = rnd_cap_round;
 	return rv;
 }
 
@@ -991,7 +991,7 @@
 	}
 }
 
-static void ps_set_line_cap(rnd_hid_gc_t gc, pcb_cap_style_t style)
+static void ps_set_line_cap(rnd_hid_gc_t gc, rnd_cap_style_t style)
 {
 	gc->cap = style;
 }
@@ -1032,10 +1032,10 @@
 	if (lastcap != gc->cap) {
 		int c;
 		switch (gc->cap) {
-		case pcb_cap_round:
+		case rnd_cap_round:
 			c = 1;
 			break;
-		case pcb_cap_square:
+		case rnd_cap_square:
 			c = 2;
 			break;
 		default:
@@ -1085,7 +1085,7 @@
 	/* If you're etching your own paste mask, this will reduce the
 	   amount of brass you need to etch by drawing outlines for large
 	   pads.  See also ps_fill_rect.  */
-	if (is_paste && gc->width > 2500 && gc->cap == pcb_cap_square && (x1 == x2 || y1 == y2)) {
+	if (is_paste && gc->width > 2500 && gc->cap == rnd_cap_square && (x1 == x2 || y1 == y2)) {
 		rnd_coord_t t, w;
 		if (x1 > x2) {
 			t = x1;
@@ -1104,7 +1104,7 @@
 #endif
 	if (x1 == x2 && y1 == y2) {
 		rnd_coord_t w = gc->width / 2;
-		if (gc->cap == pcb_cap_square)
+		if (gc->cap == rnd_cap_square)
 			ps_fill_rect(gc, x1 - w, y1 - w, x1 + w, y1 + w);
 		else
 			ps_fill_circle(gc, x1, y1, w);
@@ -1238,7 +1238,7 @@
 	/* See comment in ps_draw_line.  */
 	if (is_paste && (x2 - x1) > 2500 && (y2 - y1) > 2500) {
 		linewidth = 1000;
-		lastcap = pcb_cap_round;
+		lastcap = rnd_cap_round;
 		fprintf(f, "1000 setlinewidth 1 setlinecap 1 setlinejoin\n");
 		fprintf(f, "%d %d moveto %d %d lineto %d %d lineto %d %d lineto closepath stroke\n",
 						x1 + 500 - bloat, y1 + 500 - bloat,