Index: eps.c
===================================================================
--- eps.c	(revision 31019)
+++ eps.c	(revision 31020)
@@ -171,7 +171,7 @@
 
 	fprintf(f, "%%!PS-Adobe-3.0 EPSF-3.0\n");
 
-#define pcb2em(x) 1 + PCB_COORD_TO_INCH (x) * 72.0 * options_[HA_scale].dbl
+#define pcb2em(x) 1 + RND_COORD_TO_INCH (x) * 72.0 * options_[HA_scale].dbl
 	fprintf(f, "%%%%BoundingBox: 0 0 %f %f\n", pcb2em(bounds->X2 - bounds->X1), pcb2em(bounds->Y2 - bounds->Y1));
 #undef pcb2em
 	fprintf(f, "%%%%Pages: 1\n");
@@ -188,7 +188,7 @@
 	if (options_[HA_as_shown].lng && conf_core.editor.show_solder_side)
 		rnd_fprintf(f, "-1 1 scale %mi 0 translate\n", bounds->X1 - bounds->X2);
 
-#define Q (rnd_coord_t) PCB_MIL_TO_COORD(10)
+#define Q (rnd_coord_t) RND_MIL_TO_COORD(10)
 	rnd_fprintf(f,
 							"/nclip { %mi %mi moveto %mi %mi lineto %mi %mi lineto %mi %mi lineto %mi %mi lineto eoclip newpath } def\n",
 							bounds->X1 - Q, bounds->Y1 - Q, bounds->X1 - Q, bounds->Y2 + Q,
Index: ps.c
===================================================================
--- ps.c	(revision 31019)
+++ ps.c	(revision 31020)
@@ -281,7 +281,7 @@
 %end-doc
 */
 	{"drill-helper-size", "Diameter of the small hole when drill-helper is on",
-	 RND_HATT_COORD, 0, PCB_MM_TO_COORD(10), {0, 0, 0, PCB_MIN_PINORVIAHOLE}, 0, 0},
+	 RND_HATT_COORD, 0, RND_MM_TO_COORD(10), {0, 0, 0, PCB_MIN_PINORVIAHOLE}, 0, 0},
 #define HA_drillhelpersize 19
 
 
@@ -446,8 +446,8 @@
 	 */
 	rnd_fprintf(f, "%%%%DocumentMedia: %s %f %f 0 \"\" \"\"\n",
 							pcb_media_data[global.media_idx].name,
-							72 * PCB_COORD_TO_INCH(pcb_media_data[global.media_idx].width),
-							72 * PCB_COORD_TO_INCH(pcb_media_data[global.media_idx].height));
+							72 * RND_COORD_TO_INCH(pcb_media_data[global.media_idx].width),
+							72 * RND_COORD_TO_INCH(pcb_media_data[global.media_idx].height));
 	rnd_fprintf(f, "%%%%DocumentPaperSizes: %s\n", pcb_media_data[global.media_idx].name);
 
 	/* End General Header Comments. */
@@ -678,8 +678,8 @@
 
 static void corner(FILE * fh, rnd_coord_t x, rnd_coord_t y, int dx, int dy)
 {
-	rnd_coord_t len = PCB_MIL_TO_COORD(2000);
-	rnd_coord_t len2 = PCB_MIL_TO_COORD(200);
+	rnd_coord_t len = RND_MIL_TO_COORD(2000);
+	rnd_coord_t len2 = RND_MIL_TO_COORD(200);
 	rnd_coord_t thick = 0;
 	/*
 	 * Originally 'thick' used thicker lines.  Currently is uses
@@ -873,7 +873,7 @@
 		 * If users don't want to make smaller boards, or use fewer drill
 		 * sizes, they can always ignore this sheet. */
 		if (PCB_LAYER_IS_FAB(flags, purpi)) {
-			rnd_coord_t natural = boffset - PCB_MIL_TO_COORD(500) - PCB->hidlib.size_y / 2;
+			rnd_coord_t natural = boffset - RND_MIL_TO_COORD(500) - PCB->hidlib.size_y / 2;
 			rnd_coord_t needed = pcb_stub_draw_fab_overhang();
 			rnd_fprintf(global.f, "%% PrintFab overhang natural %mi, needed %mi\n", natural, needed);
 			if (needed > natural)