Index: dxf.c
===================================================================
--- dxf.c	(revision 30902)
+++ dxf.c	(revision 30903)
@@ -90,7 +90,7 @@
 	pcb_core_gc_t core_gc;
 	pcb_hid_t *me_pointer;
 	pcb_cap_style_t cap;
-	pcb_coord_t width;
+	rnd_coord_t width;
 	char *color;
 	int drill;
 	unsigned warned_elliptical:1;
@@ -247,7 +247,7 @@
 			dxf_gen_layer(&dxf_ctx, *s);
 	}
 	else {
-		pcb_message(PCB_MSG_ERROR, "Invalid header insertion: '%s'\n", name);
+		rnd_message(PCB_MSG_ERROR, "Invalid header insertion: '%s'\n", name);
 		return -1;
 	}
 
@@ -256,7 +256,7 @@
 
 int insert_ftr(FILE *f, const char *prefix, char *name, lht_err_t *err)
 {
-	pcb_message(PCB_MSG_ERROR, "Invalid footer insertion: '%s'\n", name);
+	rnd_message(PCB_MSG_ERROR, "Invalid footer insertion: '%s'\n", name);
 	return -1;
 }
 
@@ -310,7 +310,7 @@
 	}
 
 	if (dxf_ctx.temp == NULL) {
-		pcb_message(PCB_MSG_ERROR, "Can't open dxf template: %s\n", fn);
+		rnd_message(PCB_MSG_ERROR, "Can't open dxf template: %s\n", fn);
 		fclose(dxf_ctx.f);
 		return;
 	}
@@ -318,7 +318,7 @@
 	dxf_ctx.handle = 100;
 	if (dxf_ctx.f != NULL) {
 		if (lht_temp_exec(dxf_ctx.f, "", dxf_ctx.temp, "header", insert_hdr, &err) != 0)
-			pcb_message(PCB_MSG_ERROR, "Can't render dxf template header\n");
+			rnd_message(PCB_MSG_ERROR, "Can't render dxf template header\n");
 	}
 
 	if (!dxf_cam.active)
@@ -330,7 +330,7 @@
 		pcb_hid_restore_layer_ons(save_ons);
 
 	if (lht_temp_exec(dxf_ctx.f, "", dxf_ctx.temp, "footer", insert_ftr, &err) != 0)
-		pcb_message(PCB_MSG_ERROR, "Can't render dxf template header\n");
+		rnd_message(PCB_MSG_ERROR, "Can't render dxf template header\n");
 	fclose(dxf_ctx.f);
 
 	if (!dxf_cam.active) dxf_cam.okempty_content = 1; /* never warn in direct export */
@@ -337,11 +337,11 @@
 
 	if (pcb_cam_end(&dxf_cam) == 0) {
 		if (!dxf_cam.okempty_group)
-			pcb_message(PCB_MSG_ERROR, "dxf cam export for '%s' failed to produce any content (layer group missing)\n", options[HA_cam].str);
+			rnd_message(PCB_MSG_ERROR, "dxf cam export for '%s' failed to produce any content (layer group missing)\n", options[HA_cam].str);
 	}
 	else if (dxf_ctx.drawn_objs == 0) {
 		if (!dxf_cam.okempty_content)
-			pcb_message(PCB_MSG_ERROR, "dxf cam export for '%s' failed to produce any content (no objects)\n", options[HA_cam].str);
+			rnd_message(PCB_MSG_ERROR, "dxf cam export for '%s' failed to produce any content (no objects)\n", options[HA_cam].str);
 	}
 }
 
@@ -363,7 +363,7 @@
 
 		if (dxf_ctx.f != NULL) {
 			if (lht_temp_exec(dxf_ctx.f, "", dxf_ctx.temp, "footer", insert_ftr, &err) != 0)
-				pcb_message(PCB_MSG_ERROR, "Can't render dxf template header\n");
+				rnd_message(PCB_MSG_ERROR, "Can't render dxf template header\n");
 			fclose(dxf_ctx.f);
 		}
 
@@ -373,7 +373,7 @@
 			return 0;
 		}
 		if (lht_temp_exec(dxf_ctx.f, "", dxf_ctx.temp, "header", insert_hdr, &err) != 0)
-			pcb_message(PCB_MSG_ERROR, "Can't render dxf template header\n");
+			rnd_message(PCB_MSG_ERROR, "Can't render dxf template header\n");
 	}
 
 	if (!dxf_cam.active) {
@@ -443,7 +443,7 @@
 	free(gc);
 }
 
-static void dxf_set_drawing_mode(pcb_hid_t *hid, pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen)
+static void dxf_set_drawing_mode(pcb_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const pcb_box_t *screen)
 {
 	if (direct)
 		return;
@@ -473,7 +473,7 @@
 	gc->cap = style;
 }
 
-static void dxf_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+static void dxf_set_line_width(pcb_hid_gc_t gc, rnd_coord_t width)
 {
 	gc->width = width;
 }
@@ -486,22 +486,22 @@
 
 #define fix_rect_coords() \
 	if (x1 > x2) {\
-		pcb_coord_t t = x1; \
+		rnd_coord_t t = x1; \
 		x1 = x2; \
 		x2 = t; \
 	} \
 	if (y1 > y2) { \
-		pcb_coord_t t = y1; \
+		rnd_coord_t t = y1; \
 		y1 = y2; \
 		y2 = t; \
 	}
 
-static void dxf_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+static void dxf_draw_rect(pcb_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2)
 {
 	fix_rect_coords();
 }
 
-static void dxf_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+static void dxf_fill_rect(pcb_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2)
 {
 	fix_rect_coords();
 }
@@ -508,11 +508,11 @@
 
 static void dxf_calibrate(pcb_hid_t *hid, double xval, double yval)
 {
-	pcb_message(PCB_MSG_ERROR, "dxf_calibrate() not implemented");
+	rnd_message(PCB_MSG_ERROR, "dxf_calibrate() not implemented");
 	return;
 }
 
-static void dxf_set_crosshair(pcb_hid_t *hid, pcb_coord_t x, pcb_coord_t y, int a)
+static void dxf_set_crosshair(pcb_hid_t *hid, rnd_coord_t x, rnd_coord_t y, int a)
 {
 }
 
Index: dxf_draw.c
===================================================================
--- dxf_draw.c	(revision 30902)
+++ dxf_draw.c	(revision 30903)
@@ -72,7 +72,7 @@
 	fprintf(ctx->f, "98\n0\n"); /* number of seed points */
 }
 
-static void dxf_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+static void dxf_draw_line(pcb_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2)
 {
 	dxf_ctx_t *ctx = &dxf_ctx;
 	fprintf(ctx->f, "0\nLINE\n");
@@ -83,7 +83,7 @@
 	pcb_fprintf(ctx->f, "11\n%mm\n21\n%mm\n", TRX(x2), TRY(y2));
 }
 
-static void dxf_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t r)
+static void dxf_fill_circle(pcb_hid_gc_t gc, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t r)
 {
 	dxf_ctx_t *ctx = &dxf_ctx;
 	fprintf(ctx->f, "0\nCIRCLE\n");
@@ -110,7 +110,7 @@
 	}
 }
 
-static void dxf_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+static void dxf_draw_arc(pcb_hid_gc_t gc, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t width, rnd_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
 {
 	pcb_angle_t end_angle, tmp;
 	dxf_ctx_t *ctx = &dxf_ctx;
@@ -141,7 +141,7 @@
 	fprintf(ctx->f, "51\n%f\n", end_angle);
 }
 
-static void dxf_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+static void dxf_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, rnd_coord_t *x, rnd_coord_t *y, rnd_coord_t dx, rnd_coord_t dy)
 {
 	dxf_ctx_t *ctx = &dxf_ctx;
 	int n, to;
@@ -149,7 +149,7 @@
 	dxf_ctx.drawn_objs++;
 
 #if HATCH_NEEDS_BBOX
-	pcb_coord_t x_min, x_max, y_min, y_max;
+	rnd_coord_t x_min, x_max, y_min, y_max;
 	x_max = x_min = *x + dx;
 	y_max = y_min = *y + dy;
 	for(n = 1; n < n_coords; n++) {
@@ -184,7 +184,7 @@
 }
 
 
-static void dxf_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+static void dxf_fill_polygon(pcb_hid_gc_t gc, int n_coords, rnd_coord_t *x, rnd_coord_t *y)
 {
 	dxf_fill_polygon_offs(gc, n_coords, x, y, 0, 0);
 }