Index: dxf.c
===================================================================
--- dxf.c	(revision 31006)
+++ dxf.c	(revision 31007)
@@ -240,7 +240,7 @@
 	if (strcmp(name, "extmin") == 0)
 		fprintf(f, "10\n0\n20\n0\n30\n0\n");
 	else if (strcmp(name, "extmax") == 0)
-		pcb_fprintf(f, "10\n%mm\n20\n0\n30\n%mm\n", PCB->hidlib.size_x, PCB->hidlib.size_y);
+		rnd_fprintf(f, "10\n%mm\n20\n0\n30\n%mm\n", PCB->hidlib.size_x, PCB->hidlib.size_y);
 	else if (strcmp(name, "layers") == 0) {
 		const char **s;
 		for(s = layer_names; *s != NULL; s++)
Index: dxf_draw.c
===================================================================
--- dxf_draw.c	(revision 31006)
+++ dxf_draw.c	(revision 31007)
@@ -79,8 +79,8 @@
 	dxf_draw_handle(ctx);
 	dxf_draw_line_props(ctx, gc);
 	fprintf(ctx->f, "100\nAcDbLine\n");
-	pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(x1), TRY(y1));
-	pcb_fprintf(ctx->f, "11\n%mm\n21\n%mm\n", TRX(x2), TRY(y2));
+	rnd_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(x1), TRY(y1));
+	rnd_fprintf(ctx->f, "11\n%mm\n21\n%mm\n", TRX(x2), TRY(y2));
 }
 
 static void dxf_fill_circle(rnd_hid_gc_t gc, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t r)
@@ -93,19 +93,19 @@
 	/* contour, just in case the hatch fails */
 	if (ctx->drill_contour) {
 		fprintf(ctx->f, "100\nAcDbCircle\n");
-		pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy));
-		pcb_fprintf(ctx->f, "40\n%mm\n", r);
+		rnd_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy));
+		rnd_fprintf(ctx->f, "40\n%mm\n", r);
 	}
 
 	/* hatch for fill circle: use it for copper or if explicitly requested */
 	if (ctx->drill_fill || !gc->drawing_hole) {
 		dxf_hatch_pre(ctx, &thin, 1);
-		pcb_fprintf(ctx->f, "72\n2\n"); /* circular contour */
-		pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy));
-		pcb_fprintf(ctx->f, "40\n%mm\n", r);
-		pcb_fprintf(ctx->f, "50\n0\n");
-		pcb_fprintf(ctx->f, "51\n360\n");
-		pcb_fprintf(ctx->f, "73\n1\n"); /* is closed */
+		rnd_fprintf(ctx->f, "72\n2\n"); /* circular contour */
+		rnd_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy));
+		rnd_fprintf(ctx->f, "40\n%mm\n", r);
+		rnd_fprintf(ctx->f, "50\n0\n");
+		rnd_fprintf(ctx->f, "51\n360\n");
+		rnd_fprintf(ctx->f, "73\n1\n"); /* is closed */
 		dxf_hatch_post(ctx);
 	}
 }
@@ -134,8 +134,8 @@
 	dxf_draw_handle(ctx);
 	dxf_draw_line_props(ctx, gc);
 	fprintf(ctx->f, "100\nAcDbCircle\n");
-	pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy));
-	pcb_fprintf(ctx->f, "40\n%mm\n", (width + height)/2);
+	rnd_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy));
+	rnd_fprintf(ctx->f, "40\n%mm\n", (width + height)/2);
 	fprintf(ctx->f, "100\nAcDbArc\n");
 	fprintf(ctx->f, "50\n%f\n", start_angle);
 	fprintf(ctx->f, "51\n%f\n", end_angle);
@@ -167,8 +167,8 @@
 			if (to == n_coords)
 				to = 0;
 			fprintf(ctx->f, "72\n1\n"); /* edge=line */
-			pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(x[n]+dx), TRY(y[n]+dy));
-			pcb_fprintf(ctx->f, "11\n%mm\n21\n%mm\n", TRX(x[to]+dx), TRY(y[to]+dy));
+			rnd_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(x[n]+dx), TRY(y[n]+dy));
+			rnd_fprintf(ctx->f, "11\n%mm\n21\n%mm\n", TRX(x[to]+dx), TRY(y[to]+dy));
 		}
 		dxf_hatch_post(ctx);
 	}