Index: file.c
===================================================================
--- file.c	(revision 31019)
+++ file.c	(revision 31020)
@@ -295,7 +295,7 @@
 	rnd_fprintf(FP, "Grid[%[0] %[0] %[0] %d]\n", PCB->hidlib.grid, PCB->hidlib.grid_ox, PCB->hidlib.grid_oy, rnd_conf.editor.draw_grid);
 	rnd_fprintf(FP, "Cursor[%[0] %[0] 1000]\n", pcb_crosshair.X, pcb_crosshair.Y);
 	/* PolyArea should be output in square cmils, no suffix */
-	fprintf(FP, "PolyArea[%s]\n", c_dtostr(PCB_COORD_TO_MIL(PCB_COORD_TO_MIL(conf_core.design.poly_isle_area) * 100) * 100));
+	fprintf(FP, "PolyArea[%s]\n", c_dtostr(RND_COORD_TO_MIL(RND_COORD_TO_MIL(conf_core.design.poly_isle_area) * 100) * 100));
 	rnd_fprintf(FP, "Thermal[%s]\n", c_dtostr(PCB->ThermScale));
 	rnd_fprintf(FP, "DRC[%[0] %[0] %[0] %[0] %[0] %[0]]\n", conf_core.design.bloat, conf_core.design.shrink,
 							conf_core.design.min_wid, conf_core.design.min_slk, conf_core.design.min_drill, conf_core.design.min_ring);
Index: parse_y.c
===================================================================
--- parse_y.c	(revision 31019)
+++ parse_y.c	(revision 31020)
@@ -130,8 +130,8 @@
 /* frame between the groundplane and the copper or mask - noone seems
    to remember what these two are for; changing them may have unforeseen
    side effects. */
-#define PCB_GROUNDPLANEFRAME        PCB_MIL_TO_COORD(15)
-#define PCB_MASKFRAME               PCB_MIL_TO_COORD(3)
+#define PCB_GROUNDPLANEFRAME        RND_MIL_TO_COORD(15)
+#define PCB_MASKFRAME               RND_MIL_TO_COORD(3)
 
 /* default inner/outer ratio for pins/vias in percent */
 #define PCB_DEFAULT_DRILLINGHOLE 40
@@ -2064,7 +2064,7 @@
 #line 392 "parse_y.y" /* yacc.c:1652  */
     {
 				/* Read in cmil^2 for now; in future this should be a noop. */
-				load_meta_float("design/poly_isle_area", PCB_MIL_TO_COORD(PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0) / 100.0);
+				load_meta_float("design/poly_isle_area", RND_MIL_TO_COORD(RND_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0) / 100.0);
 			}
 #line 2070 "parse_y.c" /* yacc.c:1652  */
     break;
@@ -2967,61 +2967,61 @@
 
   case 205:
 #line 1345 "parse_y.y" /* yacc.c:1652  */
-    { do_measure(&(yyval.measure), (yyvsp[0].number), PCB_MIL_TO_COORD ((yyvsp[0].number)) / 100.0, 0); }
+    { do_measure(&(yyval.measure), (yyvsp[0].number), RND_MIL_TO_COORD ((yyvsp[0].number)) / 100.0, 0); }
 #line 2972 "parse_y.c" /* yacc.c:1652  */
     break;
 
   case 206:
 #line 1346 "parse_y.y" /* yacc.c:1652  */
-    { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+    { M ((yyval.measure), (yyvsp[-1].number), RND_MIL_TO_COORD ((yyvsp[-1].number)) / 100000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
 #line 2978 "parse_y.c" /* yacc.c:1652  */
     break;
 
   case 207:
 #line 1347 "parse_y.y" /* yacc.c:1652  */
-    { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+    { M ((yyval.measure), (yyvsp[-1].number), RND_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
 #line 2984 "parse_y.c" /* yacc.c:1652  */
     break;
 
   case 208:
 #line 1348 "parse_y.y" /* yacc.c:1652  */
-    { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+    { M ((yyval.measure), (yyvsp[-1].number), RND_MIL_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
 #line 2990 "parse_y.c" /* yacc.c:1652  */
     break;
 
   case 209:
 #line 1349 "parse_y.y" /* yacc.c:1652  */
-    { M ((yyval.measure), (yyvsp[-1].number), PCB_INCH_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+    { M ((yyval.measure), (yyvsp[-1].number), RND_INCH_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
 #line 2996 "parse_y.c" /* yacc.c:1652  */
     break;
 
   case 210:
 #line 1350 "parse_y.y" /* yacc.c:1652  */
-    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) / 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_NANOMETER; }
+    { M ((yyval.measure), (yyvsp[-1].number), RND_MM_TO_COORD ((yyvsp[-1].number)) / 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_NANOMETER; }
 #line 3002 "parse_y.c" /* yacc.c:1652  */
     break;
 
   case 211:
 #line 1351 "parse_y.y" /* yacc.c:1652  */
-    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) / 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+    { M ((yyval.measure), (yyvsp[-1].number), RND_MM_TO_COORD ((yyvsp[-1].number)) / 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
 #line 3008 "parse_y.c" /* yacc.c:1652  */
     break;
 
   case 212:
 #line 1352 "parse_y.y" /* yacc.c:1652  */
-    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+    { M ((yyval.measure), (yyvsp[-1].number), RND_MM_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
 #line 3014 "parse_y.c" /* yacc.c:1652  */
     break;
 
   case 213:
 #line 1353 "parse_y.y" /* yacc.c:1652  */
-    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) * 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+    { M ((yyval.measure), (yyvsp[-1].number), RND_MM_TO_COORD ((yyvsp[-1].number)) * 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
 #line 3020 "parse_y.c" /* yacc.c:1652  */
     break;
 
   case 214:
 #line 1354 "parse_y.y" /* yacc.c:1652  */
-    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) * 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+    { M ((yyval.measure), (yyvsp[-1].number), RND_MM_TO_COORD ((yyvsp[-1].number)) * 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
 #line 3026 "parse_y.c" /* yacc.c:1652  */
     break;
 
@@ -3317,7 +3317,7 @@
     return m.bval;
   if (m.ival != 0)
     pcb_io_pcb_usty_seen |= PCB_USTY_CMIL; /* ... because we can't save in mil */
-  return rnd_round(PCB_MIL_TO_COORD (m.ival));
+  return rnd_round(RND_MIL_TO_COORD (m.ival));
 }
 
 static rnd_coord_t
Index: parse_y.y
===================================================================
--- parse_y.y	(revision 31019)
+++ parse_y.y	(revision 31020)
@@ -53,8 +53,8 @@
 /* frame between the groundplane and the copper or mask - noone seems
    to remember what these two are for; changing them may have unforeseen
    side effects. */
-#define PCB_GROUNDPLANEFRAME        PCB_MIL_TO_COORD(15)
-#define PCB_MASKFRAME               PCB_MIL_TO_COORD(3)
+#define PCB_GROUNDPLANEFRAME        RND_MIL_TO_COORD(15)
+#define PCB_MASKFRAME               RND_MIL_TO_COORD(3)
 
 /* default inner/outer ratio for pins/vias in percent */
 #define PCB_DEFAULT_DRILLINGHOLE 40
@@ -391,7 +391,7 @@
 		| T_AREA '[' number ']'
 			{
 				/* Read in cmil^2 for now; in future this should be a noop. */
-				load_meta_float("design/poly_isle_area", PCB_MIL_TO_COORD(PCB_MIL_TO_COORD ($3) / 100.0) / 100.0);
+				load_meta_float("design/poly_isle_area", RND_MIL_TO_COORD(RND_MIL_TO_COORD ($3) / 100.0) / 100.0);
 			}
 		;
 
@@ -1342,16 +1342,16 @@
 
 measure
 		/* Default unit (no suffix) is cmil */
-		: number	{ do_measure(&$$, $1, PCB_MIL_TO_COORD ($1) / 100.0, 0); }
-		| number T_UMIL	{ M ($$, $1, PCB_MIL_TO_COORD ($1) / 100000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-		| number T_CMIL	{ M ($$, $1, PCB_MIL_TO_COORD ($1) / 100.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-		| number T_MIL	{ M ($$, $1, PCB_MIL_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-		| number T_IN	{ M ($$, $1, PCB_INCH_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-		| number T_NM	{ M ($$, $1, PCB_MM_TO_COORD ($1) / 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_NANOMETER; }
-		| number T_UM	{ M ($$, $1, PCB_MM_TO_COORD ($1) / 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-		| number T_MM	{ M ($$, $1, PCB_MM_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-		| number T_M	{ M ($$, $1, PCB_MM_TO_COORD ($1) * 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-		| number T_KM	{ M ($$, $1, PCB_MM_TO_COORD ($1) * 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		: number	{ do_measure(&$$, $1, RND_MIL_TO_COORD ($1) / 100.0, 0); }
+		| number T_UMIL	{ M ($$, $1, RND_MIL_TO_COORD ($1) / 100000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		| number T_CMIL	{ M ($$, $1, RND_MIL_TO_COORD ($1) / 100.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		| number T_MIL	{ M ($$, $1, RND_MIL_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		| number T_IN	{ M ($$, $1, RND_INCH_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		| number T_NM	{ M ($$, $1, RND_MM_TO_COORD ($1) / 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_NANOMETER; }
+		| number T_UM	{ M ($$, $1, RND_MM_TO_COORD ($1) / 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		| number T_MM	{ M ($$, $1, RND_MM_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		| number T_M	{ M ($$, $1, RND_MM_TO_COORD ($1) * 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		| number T_KM	{ M ($$, $1, RND_MM_TO_COORD ($1) * 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
 		;
 
 %%
@@ -1413,7 +1413,7 @@
     return m.bval;
   if (m.ival != 0)
     pcb_io_pcb_usty_seen |= PCB_USTY_CMIL; /* ... because we can't save in mil */
-  return rnd_round(PCB_MIL_TO_COORD (m.ival));
+  return rnd_round(RND_MIL_TO_COORD (m.ival));
 }
 
 static rnd_coord_t