Index: trunk/src/change.c
===================================================================
--- trunk/src/change.c	(revision 2509)
+++ trunk/src/change.c	(revision 2510)
@@ -845,7 +845,7 @@
 		Line->Clearance = value;
 		if (Line->Clearance == 0) {
 			CLEAR_FLAG(PCB_FLAG_CLEARLINE, Line);
-			Line->Clearance = MIL_TO_COORD(10);
+			Line->Clearance = PCB_MIL_TO_COORD(10);
 		}
 		SetLineBoundingBox(Line);
 		r_insert_entry(Layer->line_tree, (BoxTypePtr) Line, 0);
@@ -917,7 +917,7 @@
 		Arc->Clearance = value;
 		if (Arc->Clearance == 0) {
 			CLEAR_FLAG(PCB_FLAG_CLEARLINE, Arc);
-			Arc->Clearance = MIL_TO_COORD(10);
+			Arc->Clearance = PCB_MIL_TO_COORD(10);
 		}
 		SetArcBoundingBox(Arc);
 		r_insert_entry(Layer->arc_tree, (BoxTypePtr) Arc, 0);
@@ -934,8 +934,8 @@
  */
 static void *ChangeTextSize(LayerTypePtr Layer, TextTypePtr Text)
 {
-	int value = Absolute ? COORD_TO_MIL(Absolute)
-		: Text->Scale + COORD_TO_MIL(Delta);
+	int value = Absolute ? PCB_COORD_TO_MIL(Absolute)
+		: Text->Scale + PCB_COORD_TO_MIL(Delta);
 
 	if (TEST_FLAG(PCB_FLAG_LOCK, Text))
 		return (NULL);
@@ -1001,8 +1001,8 @@
  */
 static void *ChangeElementNameSize(ElementTypePtr Element)
 {
-	int value = Absolute ? COORD_TO_MIL(Absolute)
-		: DESCRIPTION_TEXT(Element).Scale + COORD_TO_MIL(Delta);
+	int value = Absolute ? PCB_COORD_TO_MIL(Absolute)
+		: DESCRIPTION_TEXT(Element).Scale + PCB_COORD_TO_MIL(Delta);
 
 	if (TEST_FLAG(PCB_FLAG_LOCK, &Element->Name[0]))
 		return (NULL);
Index: trunk/src/conf_core.c
===================================================================
--- trunk/src/conf_core.c	(revision 2509)
+++ trunk/src/conf_core.c	(revision 2510)
@@ -42,8 +42,8 @@
 
 void conf_core_postproc()
 {
-	conf_clamp_to(CFT_COORD, conf_core.design.line_thickness, MIN_LINESIZE, MAX_LINESIZE, MIL_TO_COORD(10));
-	conf_clamp_to(CFT_COORD, conf_core.design.via_thickness, MIN_PINORVIASIZE, MAX_PINORVIASIZE, MIL_TO_COORD(40));
+	conf_clamp_to(CFT_COORD, conf_core.design.line_thickness, MIN_LINESIZE, MAX_LINESIZE, PCB_MIL_TO_COORD(10));
+	conf_clamp_to(CFT_COORD, conf_core.design.via_thickness, MIN_PINORVIASIZE, MAX_PINORVIASIZE, PCB_MIL_TO_COORD(40));
 	conf_clamp_to(CFT_COORD, conf_core.design.via_drilling_hole, 0, MAX_COORD, DEFAULT_DRILLINGHOLE * conf_core.design.via_thickness / 100);
 	conf_clamp(CFT_COORD, conf_core.design.max_width, MIN_SIZE, MAX_COORD);
 	conf_clamp(CFT_COORD, conf_core.design.max_height, MIN_SIZE, MAX_COORD);
Index: trunk/src/const.h
===================================================================
--- trunk/src/const.h	(revision 2509)
+++ trunk/src/const.h	(revision 2510)
@@ -48,26 +48,26 @@
 #ifndef M_SQRT1_2
 #define M_SQRT1_2 		0.707106781	/* 1/sqrt(2) */
 #endif
-#define	M180			(M_PI/180.0)
-#define RAD_TO_DEG		(180.0/M_PI)
-#define	TAN_22_5_DEGREE_2	0.207106781	/* 0.5*tan(22.5) */
-#define COS_22_5_DEGREE		0.923879533	/* cos(22.5) */
-#define	TAN_30_DEGREE		0.577350269	/* tan(30) */
-#define	TAN_60_DEGREE		1.732050808	/* tan(60) */
-#define LN_2_OVER_2		0.346573590
+#define	PCB_M180			(M_PI/180.0)
+#define PCB_RAD_TO_DEG		(180.0/M_PI)
+#define	PCB_TAN_22_5_DEGREE_2	0.207106781	/* 0.5*tan(22.5) */
+#define PCB_COS_22_5_DEGREE		0.923879533	/* cos(22.5) */
+#define	PCB_TAN_30_DEGREE		0.577350269	/* tan(30) */
+#define	PCB_TAN_60_DEGREE		1.732050808	/* tan(60) */
+#define PCB_LN_2_OVER_2		0.346573590
 
 /* PCB/physical unit conversions */
-#define COORD_TO_MIL(n)	((n) / 25400.0)
-#define MIL_TO_COORD(n)	((n) * 25400.0)
-#define COORD_TO_MM(n)	((n) / 1000000.0)
-#define MM_TO_COORD(n)	((n) * 1000000.0)
-#define COORD_TO_INCH(n)	(COORD_TO_MIL(n) / 1000.0)
-#define INCH_TO_COORD(n)	(MIL_TO_COORD(n) * 1000.0)
+#define PCB_COORD_TO_MIL(n)	((n) / 25400.0)
+#define PCB_MIL_TO_COORD(n)	((n) * 25400.0)
+#define PCB_COORD_TO_MM(n)	((n) / 1000000.0)
+#define PCB_MM_TO_COORD(n)	((n) * 1000000.0)
+#define PCB_COORD_TO_INCH(n)	(PCB_COORD_TO_MIL(n) / 1000.0)
+#define PCB_INCH_TO_COORD(n)	(PCB_MIL_TO_COORD(n) * 1000.0)
 
 /* These need to be carefully written to avoid overflows, and return
    a Coord type.  */
-#define SCALE_TEXT(COORD,TEXTSCALE) ((Coord)((COORD) * ((double)(TEXTSCALE) / 100.0)))
-#define UNSCALE_TEXT(COORD,TEXTSCALE) ((Coord)((COORD) * (100.0 / (double)(TEXTSCALE))))
+#define PCB_SCALE_TEXT(COORD,TEXTSCALE) ((Coord)((COORD) * ((double)(TEXTSCALE) / 100.0)))
+#define PCB_UNPCB_SCALE_TEXT(COORD,TEXTSCALE) ((Coord)((COORD) * (100.0 / (double)(TEXTSCALE))))
 
 /* ---------------------------------------------------------------------------
  * modes
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 2509)
+++ trunk/src/crosshair.c	(revision 2510)
@@ -1000,8 +1000,8 @@
 	Crosshair.Y = PCB_CLAMP(Y, Crosshair.MinY, Crosshair.MaxY);
 
 	if (PCB->RatDraw) {
-		nearest_grid_x = -MIL_TO_COORD(6);
-		nearest_grid_y = -MIL_TO_COORD(6);
+		nearest_grid_x = -PCB_MIL_TO_COORD(6);
+		nearest_grid_y = -PCB_MIL_TO_COORD(6);
 	}
 	else {
 		nearest_grid_x = GridFit(Crosshair.X, PCB->Grid, PCB->GridOffsetX);
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 2509)
+++ trunk/src/draw.c	(revision 2510)
@@ -1180,11 +1180,11 @@
 			for (n = font->Symbol[*string].LineN; n; n--, line++) {
 				/* create one line, scale, move, rotate and swap it */
 				newline = *line;
-				newline.Point1.X = SCALE_TEXT(newline.Point1.X + x, Text->Scale);
-				newline.Point1.Y = SCALE_TEXT(newline.Point1.Y, Text->Scale);
-				newline.Point2.X = SCALE_TEXT(newline.Point2.X + x, Text->Scale);
-				newline.Point2.Y = SCALE_TEXT(newline.Point2.Y, Text->Scale);
-				newline.Thickness = SCALE_TEXT(newline.Thickness, Text->Scale / 2);
+				newline.Point1.X = PCB_SCALE_TEXT(newline.Point1.X + x, Text->Scale);
+				newline.Point1.Y = PCB_SCALE_TEXT(newline.Point1.Y, Text->Scale);
+				newline.Point2.X = PCB_SCALE_TEXT(newline.Point2.X + x, Text->Scale);
+				newline.Point2.Y = PCB_SCALE_TEXT(newline.Point2.Y, Text->Scale);
+				newline.Thickness = PCB_SCALE_TEXT(newline.Thickness, Text->Scale / 2);
 				if (newline.Thickness < min_line_width)
 					newline.Thickness = min_line_width;
 
@@ -1215,10 +1215,10 @@
 			BoxType defaultsymbol = PCB->Font.DefaultSymbol;
 			Coord size = (defaultsymbol.X2 - defaultsymbol.X1) * 6 / 5;
 
-			defaultsymbol.X1 = SCALE_TEXT(defaultsymbol.X1 + x, Text->Scale);
-			defaultsymbol.Y1 = SCALE_TEXT(defaultsymbol.Y1, Text->Scale);
-			defaultsymbol.X2 = SCALE_TEXT(defaultsymbol.X2 + x, Text->Scale);
-			defaultsymbol.Y2 = SCALE_TEXT(defaultsymbol.Y2, Text->Scale);
+			defaultsymbol.X1 = PCB_SCALE_TEXT(defaultsymbol.X1 + x, Text->Scale);
+			defaultsymbol.Y1 = PCB_SCALE_TEXT(defaultsymbol.Y1, Text->Scale);
+			defaultsymbol.X2 = PCB_SCALE_TEXT(defaultsymbol.X2 + x, Text->Scale);
+			defaultsymbol.Y2 = PCB_SCALE_TEXT(defaultsymbol.Y2, Text->Scale);
 
 			RotateBoxLowLevel(&defaultsymbol, 0, 0, Text->Direction);
 
Index: trunk/src/draw_fab.c
===================================================================
--- trunk/src/draw_fab.c	(revision 2509)
+++ trunk/src/draw_fab.c	(revision 2510)
@@ -53,10 +53,10 @@
  * prints a FAB drawing.
  */
 
-#define TEXT_SIZE	MIL_TO_COORD(150)
-#define TEXT_LINE	MIL_TO_COORD(150)
-#define DRILL_MARK_SIZE	MIL_TO_COORD(16)
-#define FAB_LINE_W      MIL_TO_COORD(8)
+#define TEXT_SIZE	PCB_MIL_TO_COORD(150)
+#define TEXT_LINE	PCB_MIL_TO_COORD(150)
+#define DRILL_MARK_SIZE	PCB_MIL_TO_COORD(16)
+#define FAB_LINE_W      PCB_MIL_TO_COORD(8)
 
 static void fab_line(hidGC gc, int x1, int y1, int x2, int y2)
 {
@@ -82,13 +82,13 @@
 	va_end(a);
 	t.Direction = 0;
 	t.TextString = tmp;
-	t.Scale = COORD_TO_MIL(TEXT_SIZE);	/* pcnt of 100mil base height */
+	t.Scale = PCB_COORD_TO_MIL(TEXT_SIZE);	/* pcnt of 100mil base height */
 	t.Flags = NoFlags();
 	t.X = x;
 	t.Y = y;
 	for (i = 0; tmp[i]; i++)
 		w += (font->Symbol[(int) tmp[i]].Width + font->Symbol[(int) tmp[i]].Delta);
-	w = SCALE_TEXT(w, t.Scale);
+	w = PCB_SCALE_TEXT(w, t.Scale);
 	t.X -= w * (align & 3) / 2;
 	if (t.X < 0)
 		t.X = 0;
@@ -95,8 +95,8 @@
 	DrawTextLowLevel(&t, 0);
 	if (align & 8)
 		fab_line(gc, t.X,
-						 t.Y + SCALE_TEXT(font->MaxHeight, t.Scale) + MIL_TO_COORD(10),
-						 t.X + w, t.Y + SCALE_TEXT(font->MaxHeight, t.Scale) + MIL_TO_COORD(10));
+						 t.Y + PCB_SCALE_TEXT(font->MaxHeight, t.Scale) + PCB_MIL_TO_COORD(10),
+						 t.X + w, t.Y + PCB_SCALE_TEXT(font->MaxHeight, t.Scale) + PCB_MIL_TO_COORD(10));
 }
 
 /* Y, +, X, circle, square */
@@ -180,7 +180,7 @@
 	time_t currenttime;
 	char utcTime[64];
 	AllDrills = GetDrillInfo(PCB->Data);
-	RoundDrillInfo(AllDrills, MIL_TO_COORD(1));
+	RoundDrillInfo(AllDrills, PCB_MIL_TO_COORD(1));
 	yoff = -TEXT_LINE;
 
 	/* count how many drill description lines will be needed */
@@ -209,8 +209,8 @@
 			drill_sym(gc, TEST_FLAG(PCB_FLAG_HOLE, drill->Pin[i]) ? unplated_sym : plated_sym, drill->Pin[i]->X, drill->Pin[i]->Y);
 		if (plated_sym != -1) {
 			drill_sym(gc, plated_sym, TEXT_SIZE, yoff + TEXT_SIZE / 4);
-			text_at(gc, MIL_TO_COORD(1350), yoff, MIL_TO_COORD(2), "YES");
-			text_at(gc, MIL_TO_COORD(980), yoff, MIL_TO_COORD(2), "%d", drill->PinCount + drill->ViaCount - drill->UnplatedCount);
+			text_at(gc, PCB_MIL_TO_COORD(1350), yoff, PCB_MIL_TO_COORD(2), "YES");
+			text_at(gc, PCB_MIL_TO_COORD(980), yoff, PCB_MIL_TO_COORD(2), "%d", drill->PinCount + drill->ViaCount - drill->UnplatedCount);
 
 			if (unplated_sym != -1)
 				yoff -= TEXT_LINE;
@@ -217,13 +217,13 @@
 		}
 		if (unplated_sym != -1) {
 			drill_sym(gc, unplated_sym, TEXT_SIZE, yoff + TEXT_SIZE / 4);
-			text_at(gc, MIL_TO_COORD(1400), yoff, MIL_TO_COORD(2), "NO");
-			text_at(gc, MIL_TO_COORD(980), yoff, MIL_TO_COORD(2), "%d", drill->UnplatedCount);
+			text_at(gc, PCB_MIL_TO_COORD(1400), yoff, PCB_MIL_TO_COORD(2), "NO");
+			text_at(gc, PCB_MIL_TO_COORD(980), yoff, PCB_MIL_TO_COORD(2), "%d", drill->UnplatedCount);
 		}
 		gui->set_color(gc, PCB->ElementColor);
-		text_at(gc, MIL_TO_COORD(450), yoff, MIL_TO_COORD(2), "%0.3f", COORD_TO_INCH(drill->DrillSize) + 0.0004);
+		text_at(gc, PCB_MIL_TO_COORD(450), yoff, PCB_MIL_TO_COORD(2), "%0.3f", PCB_COORD_TO_INCH(drill->DrillSize) + 0.0004);
 		if (plated_sym != -1 && unplated_sym != -1)
-			text_at(gc, MIL_TO_COORD(450), yoff + TEXT_LINE, MIL_TO_COORD(2), "%0.3f", COORD_TO_INCH(drill->DrillSize) + 0.0004);
+			text_at(gc, PCB_MIL_TO_COORD(450), yoff + TEXT_LINE, PCB_MIL_TO_COORD(2), "%0.3f", PCB_COORD_TO_INCH(drill->DrillSize) + 0.0004);
 		yoff -= TEXT_LINE;
 		total_drills += drill->PinCount;
 		total_drills += drill->ViaCount;
@@ -230,10 +230,10 @@
 	}
 
 	gui->set_color(gc, PCB->ElementColor);
-	text_at(gc, 0, yoff, MIL_TO_COORD(9), "Symbol");
-	text_at(gc, MIL_TO_COORD(410), yoff, MIL_TO_COORD(9), "Diam. (Inch)");
-	text_at(gc, MIL_TO_COORD(950), yoff, MIL_TO_COORD(9), "Count");
-	text_at(gc, MIL_TO_COORD(1300), yoff, MIL_TO_COORD(9), "Plated?");
+	text_at(gc, 0, yoff, PCB_MIL_TO_COORD(9), "Symbol");
+	text_at(gc, PCB_MIL_TO_COORD(410), yoff, PCB_MIL_TO_COORD(9), "Diam. (Inch)");
+	text_at(gc, PCB_MIL_TO_COORD(950), yoff, PCB_MIL_TO_COORD(9), "Count");
+	text_at(gc, PCB_MIL_TO_COORD(1300), yoff, PCB_MIL_TO_COORD(9), "Plated?");
 	yoff -= TEXT_LINE;
 	text_at(gc, 0, yoff, 0,
 					"There are %d different drill sizes used in this layout, %d holes total", AllDrills->DrillN, total_drills);
@@ -255,7 +255,7 @@
 		}
 	}
 	if (i == max_copper_layer) {
-		gui->set_line_width(gc, MIL_TO_COORD(10));
+		gui->set_line_width(gc, PCB_MIL_TO_COORD(10));
 		gui->draw_line(gc, 0, 0, PCB->MaxWidth, 0);
 		gui->draw_line(gc, 0, 0, 0, PCB->MaxHeight);
 		gui->draw_line(gc, PCB->MaxWidth, 0, PCB->MaxWidth, PCB->MaxHeight);
@@ -262,16 +262,16 @@
 		gui->draw_line(gc, 0, PCB->MaxHeight, PCB->MaxWidth, PCB->MaxHeight);
 		/*FPrintOutline (); */
 		gui->set_line_width(gc, FAB_LINE_W);
-		text_at(gc, MIL_TO_COORD(2000), yoff, 0,
-						"Maximum Dimensions: %f mils wide, %f mils high", COORD_TO_MIL(PCB->MaxWidth), COORD_TO_MIL(PCB->MaxHeight));
-		text_at(gc, PCB->MaxWidth / 2, PCB->MaxHeight + MIL_TO_COORD(20), 1,
+		text_at(gc, PCB_MIL_TO_COORD(2000), yoff, 0,
+						"Maximum Dimensions: %f mils wide, %f mils high", PCB_COORD_TO_MIL(PCB->MaxWidth), PCB_COORD_TO_MIL(PCB->MaxHeight));
+		text_at(gc, PCB->MaxWidth / 2, PCB->MaxHeight + PCB_MIL_TO_COORD(20), 1,
 						"Board outline is the centerline of this %f mil"
 						" rectangle - 0,0 to %f,%f mils",
-						COORD_TO_MIL(FAB_LINE_W), COORD_TO_MIL(PCB->MaxWidth), COORD_TO_MIL(PCB->MaxHeight));
+						PCB_COORD_TO_MIL(FAB_LINE_W), PCB_COORD_TO_MIL(PCB->MaxWidth), PCB_COORD_TO_MIL(PCB->MaxHeight));
 	}
 	else {
 		LayerTypePtr layer = LAYER_PTR(i);
-		gui->set_line_width(gc, MIL_TO_COORD(10));
+		gui->set_line_width(gc, PCB_MIL_TO_COORD(10));
 		LINE_LOOP(layer);
 		{
 			gui->draw_line(gc, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
@@ -288,12 +288,12 @@
 		}
 		END_LOOP;
 		gui->set_line_width(gc, FAB_LINE_W);
-		text_at(gc, PCB->MaxWidth / 2, PCB->MaxHeight + MIL_TO_COORD(20), 1, "Board outline is the centerline of this path");
+		text_at(gc, PCB->MaxWidth / 2, PCB->MaxHeight + PCB_MIL_TO_COORD(20), 1, "Board outline is the centerline of this path");
 	}
 	yoff -= TEXT_LINE;
-	text_at(gc, MIL_TO_COORD(2000), yoff, 0, "Date: %s", utcTime);
+	text_at(gc, PCB_MIL_TO_COORD(2000), yoff, 0, "Date: %s", utcTime);
 	yoff -= TEXT_LINE;
-	text_at(gc, MIL_TO_COORD(2000), yoff, 0, "Author: %s", pcb_author());
+	text_at(gc, PCB_MIL_TO_COORD(2000), yoff, 0, "Author: %s", pcb_author());
 	yoff -= TEXT_LINE;
-	text_at(gc, MIL_TO_COORD(2000), yoff, 0, "Title: %s - Fabrication Drawing", UNKNOWN(PCB->Name));
+	text_at(gc, PCB_MIL_TO_COORD(2000), yoff, 0, "Title: %s - Fabrication Drawing", UNKNOWN(PCB->Name));
 }
Index: trunk/src/find_geo.c
===================================================================
--- trunk/src/find_geo.c	(revision 2509)
+++ trunk/src/find_geo.c	(revision 2510)
@@ -74,7 +74,7 @@
 
 static int radius_crosses_arc(double x, double y, ArcTypePtr arc)
 {
-	double alpha = atan2(y - arc->Y, -x + arc->X) * RAD_TO_DEG;
+	double alpha = atan2(y - arc->Y, -x + arc->X) * PCB_RAD_TO_DEG;
 	Angle sa = arc->StartAngle, d = arc->Delta;
 
 	normalize_angles(&sa, &d);
@@ -87,10 +87,10 @@
 
 static void get_arc_ends(Coord * box, ArcTypePtr arc)
 {
-	box[0] = arc->X - arc->Width * cos(M180 * arc->StartAngle);
-	box[1] = arc->Y + arc->Height * sin(M180 * arc->StartAngle);
-	box[2] = arc->X - arc->Width * cos(M180 * (arc->StartAngle + arc->Delta));
-	box[3] = arc->Y + arc->Height * sin(M180 * (arc->StartAngle + arc->Delta));
+	box[0] = arc->X - arc->Width * cos(PCB_M180 * arc->StartAngle);
+	box[1] = arc->Y + arc->Height * sin(PCB_M180 * arc->StartAngle);
+	box[2] = arc->X - arc->Width * cos(PCB_M180 * (arc->StartAngle + arc->Delta));
+	box[3] = arc->Y + arc->Height * sin(PCB_M180 * (arc->StartAngle + arc->Delta));
 }
 
 /* ---------------------------------------------------------------------------
Index: trunk/src/globalconst.h
===================================================================
--- trunk/src/globalconst.h	(revision 2509)
+++ trunk/src/globalconst.h	(revision 2510)
@@ -38,8 +38,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	GROUNDPLANEFRAME        MIL_TO_COORD(15)
-#define MASKFRAME               MIL_TO_COORD(3)
+#define	GROUNDPLANEFRAME        PCB_MIL_TO_COORD(15)
+#define MASKFRAME               PCB_MIL_TO_COORD(3)
 
 /* ---------------------------------------------------------------------------
  * some limit specifications
@@ -48,30 +48,30 @@
  
 #define	MAX_LAYER		16	/* max number of layer, check source */
 					/* code for more changes, a *lot* more changes */
-#define	MIN_LINESIZE		MIL_TO_COORD(0.01)	/* thickness of lines */
+#define	MIN_LINESIZE		PCB_MIL_TO_COORD(0.01)	/* thickness of lines */
 #define	MAX_LINESIZE		LARGE_VALUE
 #define	MIN_TEXTSCALE		10	/* scaling of text objects in percent */
 #define	MAX_TEXTSCALE		10000
-#define	MIN_PINORVIASIZE	MIL_TO_COORD(20)	/* size of a pin or via */
-#define	MIN_PINORVIAHOLE	MIL_TO_COORD(4)	/* size of a pins or vias drilling hole */
+#define	MIN_PINORVIASIZE	PCB_MIL_TO_COORD(20)	/* size of a pin or via */
+#define	MIN_PINORVIAHOLE	PCB_MIL_TO_COORD(4)	/* size of a pins or vias drilling hole */
 #define	MAX_PINORVIASIZE	LARGE_VALUE
-#define	MIN_PINORVIACOPPER	MIL_TO_COORD(4)	/* min difference outer-inner diameter */
-#define	MIN_PADSIZE		MIL_TO_COORD(1)	/* min size of a pad */
+#define	MIN_PINORVIACOPPER	PCB_MIL_TO_COORD(4)	/* min difference outer-inner diameter */
+#define	MIN_PADSIZE		PCB_MIL_TO_COORD(1)	/* min size of a pad */
 #define	MAX_PADSIZE		LARGE_VALUE   /* max size of a pad */
-#define	MIN_DRC_VALUE		MIL_TO_COORD(0.1)
-#define	MAX_DRC_VALUE		MIL_TO_COORD(500)
-#define	MIN_DRC_SILK		MIL_TO_COORD(1)
-#define	MAX_DRC_SILK		MIL_TO_COORD(30)
-#define	MIN_DRC_DRILL		MIL_TO_COORD(1)
-#define	MAX_DRC_DRILL		MIL_TO_COORD(50)
+#define	MIN_DRC_VALUE		PCB_MIL_TO_COORD(0.1)
+#define	MAX_DRC_VALUE		PCB_MIL_TO_COORD(500)
+#define	MIN_DRC_SILK		PCB_MIL_TO_COORD(1)
+#define	MAX_DRC_SILK		PCB_MIL_TO_COORD(30)
+#define	MIN_DRC_DRILL		PCB_MIL_TO_COORD(1)
+#define	MAX_DRC_DRILL		PCB_MIL_TO_COORD(50)
 #define	MIN_DRC_RING		0
-#define	MAX_DRC_RING		MIL_TO_COORD(100)
+#define	MAX_DRC_RING		PCB_MIL_TO_COORD(100)
 #define	MIN_GRID		1
-#define	MAX_GRID		MIL_TO_COORD(1000)
+#define	MAX_GRID		PCB_MIL_TO_COORD(1000)
 #define	MAX_FONTPOSITION	255	/* upper limit of characters in my font */
 
 #define	MAX_COORD		LARGE_VALUE	/* coordinate limits */
-#define	MIN_SIZE		MIL_TO_COORD(10)	/* lowest width and height of the board */
+#define	MIN_SIZE		PCB_MIL_TO_COORD(10)	/* lowest width and height of the board */
 #define	MAX_BUFFER		5	/* number of pastebuffers */
 					/* additional changes in menu.c are */
 					/* also required to select more buffers */
@@ -104,7 +104,7 @@
 #define	MIN_GRID_DISTANCE		4	/* minimum distance between point */
 						/* to enable grid drawing */
 	/* size of diamond element mark */
-#define EMARK_SIZE	MIL_TO_COORD (10)
+#define EMARK_SIZE	PCB_MIL_TO_COORD (10)
 
 
 /**** Font ***/
@@ -111,7 +111,7 @@
 /* These are used in debug draw font rendering (e.g. pin names) and reverse
    scale calcualtions (e.g. when report is trying to figure how the font
    is scaled. Changing these values is not really supported. */
-#define  FONT_CAPHEIGHT    MIL_TO_COORD (45)   /* (Approximate) capheight size of the default PCB font */
+#define  FONT_CAPHEIGHT    PCB_MIL_TO_COORD (45)   /* (Approximate) capheight size of the default PCB font */
 #define  DEFAULT_CELLSIZE  50                  /* default cell size for symbols */
 
 #endif
Index: trunk/src/hid_draw_helpers.c
===================================================================
--- trunk/src/hid_draw_helpers.c	(revision 2509)
+++ trunk/src/hid_draw_helpers.c	(revision 2510)
@@ -286,14 +286,14 @@
 static void draw_square_pin_poly(hidGC gc, Coord X, Coord Y, Coord Thickness, Coord thin_draw, int style)
 {
 	static FloatPolyType p[8] = {
-		{0.5, -TAN_22_5_DEGREE_2},
-		{TAN_22_5_DEGREE_2, -0.5},
-		{-TAN_22_5_DEGREE_2, -0.5},
-		{-0.5, -TAN_22_5_DEGREE_2},
-		{-0.5, TAN_22_5_DEGREE_2},
-		{-TAN_22_5_DEGREE_2, 0.5},
-		{TAN_22_5_DEGREE_2, 0.5},
-		{0.5, TAN_22_5_DEGREE_2}
+		{0.5, -PCB_TAN_22_5_DEGREE_2},
+		{PCB_TAN_22_5_DEGREE_2, -0.5},
+		{-PCB_TAN_22_5_DEGREE_2, -0.5},
+		{-0.5, -PCB_TAN_22_5_DEGREE_2},
+		{-0.5, PCB_TAN_22_5_DEGREE_2},
+		{-PCB_TAN_22_5_DEGREE_2, 0.5},
+		{PCB_TAN_22_5_DEGREE_2, 0.5},
+		{0.5, PCB_TAN_22_5_DEGREE_2}
 	};
 	static int special_size = 0;
 	static int scaled_x[8];
Index: trunk/src/insert.c
===================================================================
--- trunk/src/insert.c	(revision 2509)
+++ trunk/src/insert.c	(revision 2510)
@@ -239,10 +239,10 @@
 	else {
 		m = (double) (Crosshair.X - line->Point1.X) / (Crosshair.Y - line->Point1.Y);
 		m1 = 0;
-		if (m > TAN_30_DEGREE)
-			m1 = (m > TAN_60_DEGREE) ? 2 : 1;
-		else if (m < -TAN_30_DEGREE)
-			m1 = (m < -TAN_60_DEGREE) ? 2 : -1;
+		if (m > PCB_TAN_30_DEGREE)
+			m1 = (m > PCB_TAN_60_DEGREE) ? 2 : 1;
+		else if (m < -PCB_TAN_30_DEGREE)
+			m1 = (m < -PCB_TAN_60_DEGREE) ? 2 : -1;
 	}
 	if (Crosshair.X == line->Point2.X)
 		m2 = 2;											/* 2 signals infinite slope */
@@ -249,10 +249,10 @@
 	else {
 		m = (double) (Crosshair.X - line->Point1.X) / (Crosshair.Y - line->Point1.Y);
 		m2 = 0;
-		if (m > TAN_30_DEGREE)
-			m2 = (m > TAN_60_DEGREE) ? 2 : 1;
-		else if (m < -TAN_30_DEGREE)
-			m2 = (m < -TAN_60_DEGREE) ? 2 : -1;
+		if (m > PCB_TAN_30_DEGREE)
+			m2 = (m > PCB_TAN_60_DEGREE) ? 2 : 1;
+		else if (m < -PCB_TAN_30_DEGREE)
+			m2 = (m < -PCB_TAN_60_DEGREE) ? 2 : -1;
 	}
 	if (m1 == m2) {
 		InsertedPoint.X = line->Point1.X;
Index: trunk/src/line.c
===================================================================
--- trunk/src/line.c	(revision 2509)
+++ trunk/src/line.c	(revision 2510)
@@ -98,10 +98,10 @@
 	else {
 		m = (double) dy / dx;
 		direction = 2;
-		if (m > TAN_30_DEGREE)
-			direction = m > TAN_60_DEGREE ? 0 : 1;
-		else if (m < -TAN_30_DEGREE)
-			direction = m < -TAN_60_DEGREE ? 0 : 3;
+		if (m > PCB_TAN_30_DEGREE)
+			direction = m > PCB_TAN_60_DEGREE ? 0 : 1;
+		else if (m < -PCB_TAN_30_DEGREE)
+			direction = m < -PCB_TAN_60_DEGREE ? 0 : 3;
 	}
 	if (dx < 0)
 		direction += 4;
Index: trunk/src/macro.h
===================================================================
--- trunk/src/macro.h	(revision 2509)
+++ trunk/src/macro.h	(revision 2510)
@@ -67,7 +67,7 @@
 #define	EMPTY_STRING_P(a)	((a) ? (a)[0]==0 : 1)
 #define XOR(a,b)		(((a) && !(b)) || (!(a) && (b)))
 #define SQUARE(x)		((float) (x) * (float) (x))
-#define TO_RADIANS(degrees)	(M180 * (degrees))
+#define TO_RADIANS(degrees)	(PCB_M180 * (degrees))
 
 /* ---------------------------------------------------------------------------
  * layer macros
Index: trunk/src/misc.c
===================================================================
--- trunk/src/misc.c	(revision 2509)
+++ trunk/src/misc.c	(revision 2510)
@@ -373,7 +373,7 @@
 	 * bounds of the un-scaled text, and the thickness clamping applies to
 	 * scaled text.
 	 */
-	min_unscaled_radius = UNSCALE_TEXT(min_final_radius, Text->Scale);
+	min_unscaled_radius = PCB_UNPCB_SCALE_TEXT(min_final_radius, Text->Scale);
 
 	/* calculate size of the bounding box */
 	for (; s && *s; s++) {
@@ -424,10 +424,10 @@
 	}
 
 	/* scale values */
-	minx = SCALE_TEXT(minx, Text->Scale);
-	miny = SCALE_TEXT(miny, Text->Scale);
-	maxx = SCALE_TEXT(maxx, Text->Scale);
-	maxy = SCALE_TEXT(maxy, Text->Scale);
+	minx = PCB_SCALE_TEXT(minx, Text->Scale);
+	miny = PCB_SCALE_TEXT(miny, Text->Scale);
+	maxx = PCB_SCALE_TEXT(maxx, Text->Scale);
+	maxy = PCB_SCALE_TEXT(maxy, Text->Scale);
 
 	/* set upper-left and lower-right corner;
 	 * swap coordinates if necessary (origin is already in 'swapped')
@@ -1140,10 +1140,10 @@
 		ang2 = ang1 + 360;
 
 	/* calculate sines, cosines */
-	sa1 = sin(M180 * ang1);
-	ca1 = cos(M180 * ang1);
-	sa2 = sin(M180 * ang2);
-	ca2 = cos(M180 * ang2);
+	sa1 = sin(PCB_M180 * ang1);
+	ca1 = cos(PCB_M180 * ang1);
+	sa2 = sin(PCB_M180 * ang2);
+	ca2 = cos(PCB_M180 * ang2);
 
 	minx = MIN(ca1, ca2);
 	maxx = MAX(ca1, ca2);
@@ -1265,10 +1265,10 @@
 BoxTypePtr GetArcEnds(ArcTypePtr Arc)
 {
 	static BoxType box;
-	box.X1 = Arc->X - Arc->Width * cos(Arc->StartAngle * M180);
-	box.Y1 = Arc->Y + Arc->Height * sin(Arc->StartAngle * M180);
-	box.X2 = Arc->X - Arc->Width * cos((Arc->StartAngle + Arc->Delta) * M180);
-	box.Y2 = Arc->Y + Arc->Height * sin((Arc->StartAngle + Arc->Delta) * M180);
+	box.X1 = Arc->X - Arc->Width * cos(Arc->StartAngle * PCB_M180);
+	box.Y1 = Arc->Y + Arc->Height * sin(Arc->StartAngle * PCB_M180);
+	box.X2 = Arc->X - Arc->Width * cos((Arc->StartAngle + Arc->Delta) * PCB_M180);
+	box.Y2 = Arc->Y + Arc->Height * sin((Arc->StartAngle + Arc->Delta) * PCB_M180);
 	return &box;
 }
 
Index: trunk/src/object_act.c
===================================================================
--- trunk/src/object_act.c	(revision 2509)
+++ trunk/src/object_act.c	(revision 2510)
@@ -211,7 +211,7 @@
 
 %end-doc */
 
-#define GAP MIL_TO_COORD(100)
+#define GAP PCB_MIL_TO_COORD(100)
 
 static int ActionDisperseElements(int argc, char **argv, Coord x, Coord y)
 {
Index: trunk/src/pcb-printf.c
===================================================================
--- trunk/src/pcb-printf.c	(revision 2509)
+++ trunk/src/pcb-printf.c	(revision 2510)
@@ -112,7 +112,7 @@
 		int met_votes = 0, imp_votes = 0;
 
 		for (i = 0; i < n_coords; ++i)
-			if (min_sig_figs(COORD_TO_MIL(coord[i])) < min_sig_figs(COORD_TO_MM(coord[i])))
+			if (min_sig_figs(PCB_COORD_TO_MIL(coord[i])) < min_sig_figs(PCB_COORD_TO_MM(coord[i])))
 				++imp_votes;
 			else
 				++met_votes;
@@ -127,10 +127,10 @@
 	for (i = 0; i < n_coords; ++i) {
 		switch (family) {
 		case METRIC:
-			value[i] = COORD_TO_MM(coord[i]);
+			value[i] = PCB_COORD_TO_MM(coord[i]);
 			break;
 		case IMPERIAL:
-			value[i] = COORD_TO_MIL(coord[i]);
+			value[i] = PCB_COORD_TO_MIL(coord[i]);
 			break;
 		}
 	}
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 2509)
+++ trunk/src/polygon.c	(revision 2510)
@@ -357,36 +357,36 @@
 #warning TODO: rewrite this to use the same table as the square/oct pin draw function
 	/* point 7 */
 	v[0] = x + ROUND(radius * 0.5) * xm[7];
-	v[1] = y + ROUND(radius * TAN_22_5_DEGREE_2) * ym[7];
+	v[1] = y + ROUND(radius * PCB_TAN_22_5_DEGREE_2) * ym[7];
 	if ((contour = poly_NewContour(v)) == NULL)
 		return NULL;
 	/* point 6 */
-	v[0] = x + ROUND(radius * TAN_22_5_DEGREE_2) * xm[6];
+	v[0] = x + ROUND(radius * PCB_TAN_22_5_DEGREE_2) * xm[6];
 	v[1] = y + ROUND(radius * 0.5) * ym[6];
 	poly_InclVertex(contour->head.prev, poly_CreateNode(v));
 	/* point 5 */
-	v[0] = x - ROUND(radius * TAN_22_5_DEGREE_2) * xm[5];
+	v[0] = x - ROUND(radius * PCB_TAN_22_5_DEGREE_2) * xm[5];
 	v[1] = y + ROUND(radius * 0.5) * ym[5];
 	poly_InclVertex(contour->head.prev, poly_CreateNode(v));
 	/* point 4 */
 	v[0] = x - ROUND(radius * 0.5) * xm[4];
-	v[1] = y + ROUND(radius * TAN_22_5_DEGREE_2) * ym[4];
+	v[1] = y + ROUND(radius * PCB_TAN_22_5_DEGREE_2) * ym[4];
 	poly_InclVertex(contour->head.prev, poly_CreateNode(v));
 	/* point 3 */
 	v[0] = x - ROUND(radius * 0.5) * xm[3];
-	v[1] = y - ROUND(radius * TAN_22_5_DEGREE_2) * ym[3];
+	v[1] = y - ROUND(radius * PCB_TAN_22_5_DEGREE_2) * ym[3];
 	poly_InclVertex(contour->head.prev, poly_CreateNode(v));
 	/* point 2 */
-	v[0] = x - ROUND(radius * TAN_22_5_DEGREE_2) * xm[2];
+	v[0] = x - ROUND(radius * PCB_TAN_22_5_DEGREE_2) * xm[2];
 	v[1] = y - ROUND(radius * 0.5) * ym[2];
 	poly_InclVertex(contour->head.prev, poly_CreateNode(v));
 	/* point 1 */
-	v[0] = x + ROUND(radius * TAN_22_5_DEGREE_2) * xm[1];
+	v[0] = x + ROUND(radius * PCB_TAN_22_5_DEGREE_2) * xm[1];
 	v[1] = y - ROUND(radius * 0.5) * ym[1];
 	poly_InclVertex(contour->head.prev, poly_CreateNode(v));
 	/* point 0 */
 	v[0] = x + ROUND(radius * 0.5) * xm[0];
-	v[1] = y - ROUND(radius * TAN_22_5_DEGREE_2) * ym[0];
+	v[1] = y - ROUND(radius * PCB_TAN_22_5_DEGREE_2) * ym[0];
 	poly_InclVertex(contour->head.prev, poly_CreateNode(v));
 	return ContourToPoly(contour);
 }
@@ -501,20 +501,20 @@
 	ang = a->StartAngle;
 	da = (1.0 * a->Delta) / segs;
 	radius_adj = (M_PI * da / 360) * (M_PI * da / 360) / 2;
-	v[0] = a->X - rx * cos(ang * M180);
-	v[1] = a->Y + ry * sin(ang * M180);
+	v[0] = a->X - rx * cos(ang * PCB_M180);
+	v[1] = a->Y + ry * sin(ang * PCB_M180);
 	if ((contour = poly_NewContour(v)) == NULL)
 		return 0;
 	for (i = 0; i < segs - 1; i++) {
 		ang += da;
-		v[0] = a->X - rx * cos(ang * M180);
-		v[1] = a->Y + ry * sin(ang * M180);
+		v[0] = a->X - rx * cos(ang * PCB_M180);
+		v[1] = a->Y + ry * sin(ang * PCB_M180);
 		poly_InclVertex(contour->head.prev, poly_CreateNode(v));
 	}
 	/* find last point */
 	ang = a->StartAngle + a->Delta;
-	v[0] = a->X - rx * cos(ang * M180) * (1 - radius_adj);
-	v[1] = a->Y + ry * sin(ang * M180) * (1 - radius_adj);
+	v[0] = a->X - rx * cos(ang * PCB_M180) * (1 - radius_adj);
+	v[1] = a->Y + ry * sin(ang * PCB_M180) * (1 - radius_adj);
 	/* add the round cap at the end */
 	frac_circle(contour, ends->X2, ends->Y2, v, 2);
 	/* and now do the outer arc (going backwards) */
@@ -522,15 +522,15 @@
 	ry = (a->Width + half) * (1 + radius_adj);
 	da = -da;
 	for (i = 0; i < segs; i++) {
-		v[0] = a->X - rx * cos(ang * M180);
-		v[1] = a->Y + ry * sin(ang * M180);
+		v[0] = a->X - rx * cos(ang * PCB_M180);
+		v[1] = a->Y + ry * sin(ang * PCB_M180);
 		poly_InclVertex(contour->head.prev, poly_CreateNode(v));
 		ang += da;
 	}
 	/* now add other round cap */
 	ang = a->StartAngle;
-	v[0] = a->X - rx * cos(ang * M180) * (1 - radius_adj);
-	v[1] = a->Y + ry * sin(ang * M180) * (1 - radius_adj);
+	v[0] = a->X - rx * cos(ang * PCB_M180) * (1 - radius_adj);
+	v[1] = a->Y + ry * sin(ang * PCB_M180) * (1 - radius_adj);
 	frac_circle(contour, ends->X1, ends->Y1, v, 2);
 	/* now we have the whole contour */
 	if (!(np = ContourToPoly(contour)))
Index: trunk/src/route_style.c
===================================================================
--- trunk/src/route_style.c	(revision 2509)
+++ trunk/src/route_style.c	(revision 2510)
@@ -102,7 +102,7 @@
 	/* for backwards-compatibility, we use a 10-mil default
 	 * for styles which omit the clearance specification. */
 	if (*s != ',')
-		routeStyle->Clearance = MIL_TO_COORD(10);
+		routeStyle->Clearance = PCB_MIL_TO_COORD(10);
 	else {
 		s++;
 		while (*s && isspace((int) *s))
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 2509)
+++ trunk/src/search.c	(revision 2510)
@@ -908,7 +908,7 @@
 	/* Calculate angle of point from arc center */
 	double p_dist = Distance(X, Y, Arc->X, Arc->Y);
 	double p_cos = (X - Arc->X) / p_dist;
-	Angle p_ang = acos(p_cos) * RAD_TO_DEG;
+	Angle p_ang = acos(p_cos) * PCB_RAD_TO_DEG;
 	Angle ang1, ang2;
 
 	/* Convert StartAngle, Delta into bounding angles in [0, 720) */
@@ -934,13 +934,13 @@
 	if (ang1 >= p_ang || ang2 <= p_ang) {
 		Coord ArcX, ArcY;
 
-		ArcX = Arc->X + Arc->Width * cos((Arc->StartAngle + 180) / RAD_TO_DEG);
-		ArcY = Arc->Y - Arc->Width * sin((Arc->StartAngle + 180) / RAD_TO_DEG);
+		ArcX = Arc->X + Arc->Width * cos((Arc->StartAngle + 180) / PCB_RAD_TO_DEG);
+		ArcY = Arc->Y - Arc->Width * sin((Arc->StartAngle + 180) / PCB_RAD_TO_DEG);
 		if (Distance(X, Y, ArcX, ArcY) < Radius + Arc->Thickness / 2)
 			return true;
 
-		ArcX = Arc->X + Arc->Width * cos((Arc->StartAngle + Arc->Delta + 180) / RAD_TO_DEG);
-		ArcY = Arc->Y - Arc->Width * sin((Arc->StartAngle + Arc->Delta + 180) / RAD_TO_DEG);
+		ArcX = Arc->X + Arc->Width * cos((Arc->StartAngle + Arc->Delta + 180) / PCB_RAD_TO_DEG);
+		ArcY = Arc->Y - Arc->Width * sin((Arc->StartAngle + Arc->Delta + 180) / PCB_RAD_TO_DEG);
 		if (Distance(X, Y, ArcX, ArcY) < Radius + Arc->Thickness / 2)
 			return true;
 		return false;
Index: trunk/src/unit.c
===================================================================
--- trunk/src/unit.c	(revision 2509)
+++ trunk/src/unit.c	(revision 2510)
@@ -31,12 +31,12 @@
 #include "unit.h"
 
 /* Helper macros for tables */
-#define MM_TO_COORD3(a,b,c)		MM_TO_COORD (a), MM_TO_COORD (b), MM_TO_COORD (c)
-#define MIL_TO_COORD3(a,b,c)		MIL_TO_COORD (a), MIL_TO_COORD (b), MIL_TO_COORD (c)
-#define MM_TO_COORD5(a,b,c,d,e)		MM_TO_COORD (a), MM_TO_COORD (b), MM_TO_COORD (c),	\
-                              		MM_TO_COORD (d), MM_TO_COORD (e)
-#define MIL_TO_COORD5(a,b,c,d,e)	MIL_TO_COORD (a), MIL_TO_COORD (b), MIL_TO_COORD (c),	\
-                               		MIL_TO_COORD (d), MIL_TO_COORD (e)
+#define PCB_MM_TO_COORD3(a,b,c)		PCB_MM_TO_COORD (a), PCB_MM_TO_COORD (b), PCB_MM_TO_COORD (c)
+#define PCB_MIL_TO_COORD3(a,b,c)		PCB_MIL_TO_COORD (a), PCB_MIL_TO_COORD (b), PCB_MIL_TO_COORD (c)
+#define PCB_MM_TO_COORD5(a,b,c,d,e)		PCB_MM_TO_COORD (a), PCB_MM_TO_COORD (b), PCB_MM_TO_COORD (c),	\
+                              		PCB_MM_TO_COORD (d), PCB_MM_TO_COORD (e)
+#define PCB_MIL_TO_COORD5(a,b,c,d,e)	PCB_MIL_TO_COORD (a), PCB_MIL_TO_COORD (b), PCB_MIL_TO_COORD (c),	\
+                               		PCB_MIL_TO_COORD (d), PCB_MIL_TO_COORD (e)
 
 /* These should be kept in order of smallest scale_factor
  * to largest -- the code uses this ordering when finding
@@ -98,43 +98,43 @@
 	 *          line  |           |       |
 	 *         clear  |           |       |
 	 */
-	{"km", MM_TO_COORD3(0.1, 0.01, 1.0),
-	 MM_TO_COORD3(0.2, 0.01, 0.5),
-	 MM_TO_COORD3(0.1, 0.005, 0.5),
-	 MM_TO_COORD3(0.05, 0.005, 0.5)},
-	{"m", MM_TO_COORD3(0.1, 0.01, 1.0),
-	 MM_TO_COORD3(0.2, 0.01, 0.5),
-	 MM_TO_COORD3(0.1, 0.005, 0.5),
-	 MM_TO_COORD3(0.05, 0.005, 0.5)},
-	{"cm", MM_TO_COORD3(0.1, 0.01, 1.0),
-	 MM_TO_COORD3(0.2, 0.01, 0.5),
-	 MM_TO_COORD3(0.1, 0.005, 0.5),
-	 MM_TO_COORD3(0.05, 0.005, 0.5)},
-	{"mm", MM_TO_COORD3(0.1, 0.01, 1.0),
-	 MM_TO_COORD3(0.2, 0.01, 0.5),
-	 MM_TO_COORD3(0.1, 0.005, 0.5),
-	 MM_TO_COORD3(0.05, 0.005, 0.5)},
-	{"um", MM_TO_COORD3(0.1, 0.01, 1.0),
-	 MM_TO_COORD3(0.2, 0.01, 0.5),
-	 MM_TO_COORD3(0.1, 0.005, 0.5),
-	 MM_TO_COORD3(0.05, 0.005, 0.5)},
-	{"nm", MM_TO_COORD3(0.1, 0.01, 1.0),
-	 MM_TO_COORD3(0.2, 0.01, 0.5),
-	 MM_TO_COORD3(0.1, 0.005, 0.5),
-	 MM_TO_COORD3(0.05, 0.005, 0.5)},
+	{"km", PCB_MM_TO_COORD3(0.1, 0.01, 1.0),
+	 PCB_MM_TO_COORD3(0.2, 0.01, 0.5),
+	 PCB_MM_TO_COORD3(0.1, 0.005, 0.5),
+	 PCB_MM_TO_COORD3(0.05, 0.005, 0.5)},
+	{"m", PCB_MM_TO_COORD3(0.1, 0.01, 1.0),
+	 PCB_MM_TO_COORD3(0.2, 0.01, 0.5),
+	 PCB_MM_TO_COORD3(0.1, 0.005, 0.5),
+	 PCB_MM_TO_COORD3(0.05, 0.005, 0.5)},
+	{"cm", PCB_MM_TO_COORD3(0.1, 0.01, 1.0),
+	 PCB_MM_TO_COORD3(0.2, 0.01, 0.5),
+	 PCB_MM_TO_COORD3(0.1, 0.005, 0.5),
+	 PCB_MM_TO_COORD3(0.05, 0.005, 0.5)},
+	{"mm", PCB_MM_TO_COORD3(0.1, 0.01, 1.0),
+	 PCB_MM_TO_COORD3(0.2, 0.01, 0.5),
+	 PCB_MM_TO_COORD3(0.1, 0.005, 0.5),
+	 PCB_MM_TO_COORD3(0.05, 0.005, 0.5)},
+	{"um", PCB_MM_TO_COORD3(0.1, 0.01, 1.0),
+	 PCB_MM_TO_COORD3(0.2, 0.01, 0.5),
+	 PCB_MM_TO_COORD3(0.1, 0.005, 0.5),
+	 PCB_MM_TO_COORD3(0.05, 0.005, 0.5)},
+	{"nm", PCB_MM_TO_COORD3(0.1, 0.01, 1.0),
+	 PCB_MM_TO_COORD3(0.2, 0.01, 0.5),
+	 PCB_MM_TO_COORD3(0.1, 0.005, 0.5),
+	 PCB_MM_TO_COORD3(0.05, 0.005, 0.5)},
 
-	{"cmil", MIL_TO_COORD3(5, 1, 25),
-	 MIL_TO_COORD3(10, 1, 10),
-	 MIL_TO_COORD3(5, 0.5, 10),
-	 MIL_TO_COORD3(2, 0.5, 10)},
-	{"mil", MIL_TO_COORD3(5, 1, 25),
-	 MIL_TO_COORD3(10, 1, 10),
-	 MIL_TO_COORD3(5, 0.5, 10),
-	 MIL_TO_COORD3(2, 0.5, 10)},
-	{"in", MIL_TO_COORD3(5, 1, 25),
-	 MIL_TO_COORD3(10, 1, 10),
-	 MIL_TO_COORD3(5, 0.5, 10),
-	 MIL_TO_COORD3(2, 0.5, 10)},
+	{"cmil", PCB_MIL_TO_COORD3(5, 1, 25),
+	 PCB_MIL_TO_COORD3(10, 1, 10),
+	 PCB_MIL_TO_COORD3(5, 0.5, 10),
+	 PCB_MIL_TO_COORD3(2, 0.5, 10)},
+	{"mil", PCB_MIL_TO_COORD3(5, 1, 25),
+	 PCB_MIL_TO_COORD3(10, 1, 10),
+	 PCB_MIL_TO_COORD3(5, 0.5, 10),
+	 PCB_MIL_TO_COORD3(2, 0.5, 10)},
+	{"in", PCB_MIL_TO_COORD3(5, 1, 25),
+	 PCB_MIL_TO_COORD3(10, 1, 10),
+	 PCB_MIL_TO_COORD3(5, 0.5, 10),
+	 PCB_MIL_TO_COORD3(2, 0.5, 10)},
 };
 
 #define N_INCREMENTS (sizeof increments / sizeof increments[0])
@@ -210,8 +210,8 @@
 	double base;
 	if (unit == NULL)
 		return -1;
-	base = unit->family == METRIC ? COORD_TO_MM(1)
-		: COORD_TO_MIL(1);
+	base = unit->family == METRIC ? PCB_COORD_TO_MM(1)
+		: PCB_COORD_TO_MIL(1);
 	return x * unit->scale_factor * base;
 }
 
Index: trunk/src_plugins/autoplace/autoplace.c
===================================================================
--- trunk/src_plugins/autoplace/autoplace.c	(revision 2509)
+++ trunk/src_plugins/autoplace/autoplace.c	(revision 2510)
@@ -109,8 +109,8 @@
 		0.75,												/* annealing schedule constant: 0.85 */
 		40,													/* halt when there are 60 times as many moves as good moves */
 		false,											/* don't ignore SMD/pin conflicts */
-		MIL_TO_COORD(100),					/* coarse grid is 100 mils */
-		MIL_TO_COORD(10),						/* fine grid is 10 mils */
+		PCB_MIL_TO_COORD(100),					/* coarse grid is 100 mils */
+		PCB_MIL_TO_COORD(10),						/* fine grid is 10 mils */
 };
 
 typedef struct {
@@ -339,7 +339,7 @@
 			box->Y2 = maxy;
 		}
 		/* okay, add half-perimeter to cost! */
-		W += COORD_TO_MIL(maxx - minx) + COORD_TO_MIL(maxy - miny) + ((allpads && !allsameside) ? CostParameter.via_cost : 0);
+		W += PCB_COORD_TO_MIL(maxx - minx) + PCB_COORD_TO_MIL(maxy - miny) + ((allpads && !allsameside) ? CostParameter.via_cost : 0);
 	}
 	/* now compute penalty function Wc which is proportional to
 	 * amount of overlap and congestion. */
@@ -526,7 +526,7 @@
 		}
 		END_LOOP;
 		if (minX < maxX && minY < maxY)
-			delta5 = CostParameter.overall_area_penalty * sqrt(COORD_TO_MIL(maxX - minX) * COORD_TO_MIL(maxY - minY));
+			delta5 = CostParameter.overall_area_penalty * sqrt(PCB_COORD_TO_MIL(maxX - minX) * PCB_COORD_TO_MIL(maxY - minY));
 	}
 	if (T == 5) {
 		T = W + delta1 + delta2 + delta3 - delta4 + delta5;
@@ -555,13 +555,13 @@
 	case 0:
 		{														/* shift! */
 			Coord grid;
-			double scaleX = PCB_CLAMP(sqrt(T), MIL_TO_COORD(2.5), PCB->MaxWidth / 3);
-			double scaleY = PCB_CLAMP(sqrt(T), MIL_TO_COORD(2.5), PCB->MaxHeight / 3);
+			double scaleX = PCB_CLAMP(sqrt(T), PCB_MIL_TO_COORD(2.5), PCB->MaxWidth / 3);
+			double scaleY = PCB_CLAMP(sqrt(T), PCB_MIL_TO_COORD(2.5), PCB->MaxHeight / 3);
 			pt.which = SHIFT;
 			pt.DX = scaleX * 2 * ((((double) random()) / RAND_MAX) - 0.5);
 			pt.DY = scaleY * 2 * ((((double) random()) / RAND_MAX) - 0.5);
 			/* snap to grid. different grids for "high" and "low" T */
-			grid = (T > MIL_TO_COORD(10)) ? CostParameter.large_grid_size : CostParameter.small_grid_size;
+			grid = (T > PCB_MIL_TO_COORD(10)) ? CostParameter.large_grid_size : CostParameter.small_grid_size;
 			/* (round away from zero) */
 			pt.DX = ((pt.DX / grid) + SGN(pt.DX)) * grid;
 			pt.DY = ((pt.DY / grid) + SGN(pt.DY)) * grid;
@@ -696,12 +696,12 @@
 	/* simulated annealing */
 	{															/* compute T0 by doing a random series of moves. */
 		const int TRIALS = 10;
-		const double Tx = MIL_TO_COORD(300), P = 0.95;
+		const double Tx = PCB_MIL_TO_COORD(300), P = 0.95;
 		double Cs = 0.0;
 		int i;
 		C0 = ComputeCost(Nets, Tx, Tx);
 		for (i = 0; i < TRIALS; i++) {
-			pt = createPerturbation(&Selected, INCH_TO_COORD(1));
+			pt = createPerturbation(&Selected, PCB_INCH_TO_COORD(1));
 			doPerturb(&pt, false);
 			Cs += fabs(ComputeCost(Nets, Tx, Tx) - C0);
 			doPerturb(&pt, true);
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 2509)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 2510)
@@ -4023,7 +4023,7 @@
 	AutoRouteParameters.style = style;
 	AutoRouteParameters.bloat = style->Clearance + HALF_THICK(style->Thick);
 	/* costs */
-	AutoRouteParameters.ViaCost = INCH_TO_COORD(3.5) + style->Diameter * (is_smoothing ? 80 : 30);
+	AutoRouteParameters.ViaCost = PCB_INCH_TO_COORD(3.5) + style->Diameter * (is_smoothing ? 80 : 30);
 	AutoRouteParameters.LastConflictPenalty = (400 * pass / passes + 2) / (pass + 1);
 	AutoRouteParameters.ConflictPenalty = 4 * AutoRouteParameters.LastConflictPenalty;
 	AutoRouteParameters.JogPenalty = 1000 * (is_smoothing ? 20 : 4);
Index: trunk/src_plugins/export_gcode/gcode.c
===================================================================
--- trunk/src_plugins/export_gcode/gcode.c	(revision 2509)
+++ trunk/src_plugins/export_gcode/gcode.c	(revision 2510)
@@ -183,7 +183,7 @@
 /* convert from default PCB units to gcode units */
 		 static int pcb_to_gcode(int pcb)
 {
-	return round(COORD_TO_INCH(pcb) * gcode_dpi);
+	return round(PCB_COORD_TO_INCH(pcb) * gcode_dpi);
 }
 
 static char *gcode_get_png_name(const char *basename, const char *suffix)
@@ -389,14 +389,14 @@
 	}
 	unit = &(get_unit_list()[options[HA_unit].int_value]);
 	metric = (unit->family == METRIC);
-	scale = metric ? 1.0 / coord_to_unit(unit, MM_TO_COORD(1.0))
-		: 1.0 / coord_to_unit(unit, INCH_TO_COORD(1.0));
+	scale = metric ? 1.0 / coord_to_unit(unit, PCB_MM_TO_COORD(1.0))
+		: 1.0 / coord_to_unit(unit, PCB_INCH_TO_COORD(1.0));
 
 	gcode_cutdepth = options[HA_cutdepth].real_value * scale;
 	gcode_drilldepth = options[HA_drilldepth].real_value * scale;
 	gcode_safeZ = options[HA_safeZ].real_value * scale;
-	gcode_toolradius = metric ? MM_TO_COORD(options[HA_toolradius].real_value * scale)
-		: INCH_TO_COORD(options[HA_toolradius].real_value * scale);
+	gcode_toolradius = metric ? PCB_MM_TO_COORD(options[HA_toolradius].real_value * scale)
+		: PCB_INCH_TO_COORD(options[HA_toolradius].real_value * scale);
 	gcode_choose_groups();
 
 	for (i = 0; i < MAX_LAYER; i++) {
@@ -822,8 +822,8 @@
 			drill = (struct drill_struct *) realloc(drill, (nmax_drill + 100) * sizeof(struct drill_struct));
 			nmax_drill += 100;
 		}
-		drill[n_drill].x = COORD_TO_INCH(PCB->MaxWidth - cx);	/* convert to inch, flip: will drill from bottom side */
-		drill[n_drill].y = COORD_TO_INCH(PCB->MaxHeight - cy);	/* PCB reverses y axis */
+		drill[n_drill].x = PCB_COORD_TO_INCH(PCB->MaxWidth - cx);	/* convert to inch, flip: will drill from bottom side */
+		drill[n_drill].y = PCB_COORD_TO_INCH(PCB->MaxHeight - cy);	/* PCB reverses y axis */
 		n_drill++;
 /*              printf("Circle %d %d\n",cx,cy); */
 	}
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 2509)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 2510)
@@ -129,7 +129,7 @@
 /*----------------------------------------------------------------------------*/
 /* Defined Constants                                                          */
 /*----------------------------------------------------------------------------*/
-#define AUTO_OUTLINE_WIDTH MIL_TO_COORD(8)	/* Auto-geneated outline width of 8 mils */
+#define AUTO_OUTLINE_WIDTH PCB_MIL_TO_COORD(8)	/* Auto-geneated outline width of 8 mils */
 
 /*----------------------------------------------------------------------------*/
 /* Aperture Routines                                                          */
@@ -217,7 +217,7 @@
 		break;
 	case OCTAGON:
 		pcb_fprintf(f, "%%AMOCT%d*5,0,8,0,0,%.4mi,22.5*%%\r\n"
-								"%%ADD%dOCT%d*%%\r\n", aptr->dCode, (Coord) ((double) aptr->width / COS_22_5_DEGREE), aptr->dCode, aptr->dCode);
+								"%%ADD%dOCT%d*%%\r\n", aptr->dCode, (Coord) ((double) aptr->width / PCB_COS_22_5_DEGREE), aptr->dCode, aptr->dCode);
 		break;
 #if 0
 	case THERMAL:
Index: trunk/src_plugins/export_nelma/nelma.c
===================================================================
--- trunk/src_plugins/export_nelma/nelma.c	(revision 2509)
+++ trunk/src_plugins/export_nelma/nelma.c	(revision 2510)
@@ -218,7 +218,7 @@
 /* convert from default PCB units to nelma units */
 		 static int pcb_to_nelma(Coord pcb)
 {
-	return COORD_TO_INCH(pcb) * nelma_dpi;
+	return PCB_COORD_TO_INCH(pcb) * nelma_dpi;
 }
 
 static char *nelma_get_png_name(const char *basename, const char *suffix)
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 2509)
+++ trunk/src_plugins/export_png/png.c	(revision 2510)
@@ -698,7 +698,7 @@
 		 * a scale of 1  means 1 pixel is 1 inch
 		 * a scale of 10 means 1 pixel is 10 inches
 		 */
-		scale = INCH_TO_COORD(1) / dpi;
+		scale = PCB_INCH_TO_COORD(1) / dpi;
 		w = w / scale;
 		h = h / scale;
 	}
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 2509)
+++ trunk/src_plugins/export_ps/eps.c	(revision 2510)
@@ -257,7 +257,7 @@
 
 	in_mono = options[HA_mono].int_value;
 
-#define pcb2em(x) 1 + COORD_TO_INCH (x) * 72.0 * options[HA_scale].real_value
+#define pcb2em(x) 1 + PCB_COORD_TO_INCH (x) * 72.0 * options[HA_scale].real_value
 	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");
@@ -275,7 +275,7 @@
 	linewidth = -1;
 	lastcap = -1;
 	lastcolor = -1;
-#define Q (Coord) MIL_TO_COORD(10)
+#define Q (Coord) PCB_MIL_TO_COORD(10)
 	pcb_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: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 2509)
+++ trunk/src_plugins/export_ps/ps.c	(revision 2510)
@@ -96,44 +96,44 @@
  * {A,B,C,D,E}-Size here are the ANSI sizes and not the architectural sizes.
  */
 
-#define MARGINX MIL_TO_COORD(500)
-#define MARGINY MIL_TO_COORD(500)
+#define MARGINX PCB_MIL_TO_COORD(500)
+#define MARGINY PCB_MIL_TO_COORD(500)
 
 static MediaType media_data[] = {
-	{"A0", MM_TO_COORD(841), MM_TO_COORD(1189), MARGINX, MARGINY},
-	{"A1", MM_TO_COORD(594), MM_TO_COORD(841), MARGINX, MARGINY},
-	{"A2", MM_TO_COORD(420), MM_TO_COORD(594), MARGINX, MARGINY},
-	{"A3", MM_TO_COORD(297), MM_TO_COORD(420), MARGINX, MARGINY},
-	{"A4", MM_TO_COORD(210), MM_TO_COORD(297), MARGINX, MARGINY},
-	{"A5", MM_TO_COORD(148), MM_TO_COORD(210), MARGINX, MARGINY},
-	{"A6", MM_TO_COORD(105), MM_TO_COORD(148), MARGINX, MARGINY},
-	{"A7", MM_TO_COORD(74), MM_TO_COORD(105), MARGINX, MARGINY},
-	{"A8", MM_TO_COORD(52), MM_TO_COORD(74), MARGINX, MARGINY},
-	{"A9", MM_TO_COORD(37), MM_TO_COORD(52), MARGINX, MARGINY},
-	{"A10", MM_TO_COORD(26), MM_TO_COORD(37), MARGINX, MARGINY},
-	{"B0", MM_TO_COORD(1000), MM_TO_COORD(1414), MARGINX, MARGINY},
-	{"B1", MM_TO_COORD(707), MM_TO_COORD(1000), MARGINX, MARGINY},
-	{"B2", MM_TO_COORD(500), MM_TO_COORD(707), MARGINX, MARGINY},
-	{"B3", MM_TO_COORD(353), MM_TO_COORD(500), MARGINX, MARGINY},
-	{"B4", MM_TO_COORD(250), MM_TO_COORD(353), MARGINX, MARGINY},
-	{"B5", MM_TO_COORD(176), MM_TO_COORD(250), MARGINX, MARGINY},
-	{"B6", MM_TO_COORD(125), MM_TO_COORD(176), MARGINX, MARGINY},
-	{"B7", MM_TO_COORD(88), MM_TO_COORD(125), MARGINX, MARGINY},
-	{"B8", MM_TO_COORD(62), MM_TO_COORD(88), MARGINX, MARGINY},
-	{"B9", MM_TO_COORD(44), MM_TO_COORD(62), MARGINX, MARGINY},
-	{"B10", MM_TO_COORD(31), MM_TO_COORD(44), MARGINX, MARGINY},
-	{"Letter", INCH_TO_COORD(8.5), INCH_TO_COORD(11), MARGINX, MARGINY},
-	{"11x17", INCH_TO_COORD(11), INCH_TO_COORD(17), MARGINX, MARGINY},
-	{"Ledger", INCH_TO_COORD(17), INCH_TO_COORD(11), MARGINX, MARGINY},
-	{"Legal", INCH_TO_COORD(8.5), INCH_TO_COORD(14), MARGINX, MARGINY},
-	{"Executive", INCH_TO_COORD(7.5), INCH_TO_COORD(10), MARGINX, MARGINY},
-	{"A-size", INCH_TO_COORD(8.5), INCH_TO_COORD(11), MARGINX, MARGINY},
-	{"B-size", INCH_TO_COORD(11), INCH_TO_COORD(17), MARGINX, MARGINY},
-	{"C-size", INCH_TO_COORD(17), INCH_TO_COORD(22), MARGINX, MARGINY},
-	{"D-size", INCH_TO_COORD(22), INCH_TO_COORD(34), MARGINX, MARGINY},
-	{"E-size", INCH_TO_COORD(34), INCH_TO_COORD(44), MARGINX, MARGINY},
-	{"US-Business_Card", INCH_TO_COORD(3.5), INCH_TO_COORD(2.0), 0, 0},
-	{"Intl-Business_Card", INCH_TO_COORD(3.375), INCH_TO_COORD(2.125), 0, 0}
+	{"A0", PCB_MM_TO_COORD(841), PCB_MM_TO_COORD(1189), MARGINX, MARGINY},
+	{"A1", PCB_MM_TO_COORD(594), PCB_MM_TO_COORD(841), MARGINX, MARGINY},
+	{"A2", PCB_MM_TO_COORD(420), PCB_MM_TO_COORD(594), MARGINX, MARGINY},
+	{"A3", PCB_MM_TO_COORD(297), PCB_MM_TO_COORD(420), MARGINX, MARGINY},
+	{"A4", PCB_MM_TO_COORD(210), PCB_MM_TO_COORD(297), MARGINX, MARGINY},
+	{"A5", PCB_MM_TO_COORD(148), PCB_MM_TO_COORD(210), MARGINX, MARGINY},
+	{"A6", PCB_MM_TO_COORD(105), PCB_MM_TO_COORD(148), MARGINX, MARGINY},
+	{"A7", PCB_MM_TO_COORD(74), PCB_MM_TO_COORD(105), MARGINX, MARGINY},
+	{"A8", PCB_MM_TO_COORD(52), PCB_MM_TO_COORD(74), MARGINX, MARGINY},
+	{"A9", PCB_MM_TO_COORD(37), PCB_MM_TO_COORD(52), MARGINX, MARGINY},
+	{"A10", PCB_MM_TO_COORD(26), PCB_MM_TO_COORD(37), MARGINX, MARGINY},
+	{"B0", PCB_MM_TO_COORD(1000), PCB_MM_TO_COORD(1414), MARGINX, MARGINY},
+	{"B1", PCB_MM_TO_COORD(707), PCB_MM_TO_COORD(1000), MARGINX, MARGINY},
+	{"B2", PCB_MM_TO_COORD(500), PCB_MM_TO_COORD(707), MARGINX, MARGINY},
+	{"B3", PCB_MM_TO_COORD(353), PCB_MM_TO_COORD(500), MARGINX, MARGINY},
+	{"B4", PCB_MM_TO_COORD(250), PCB_MM_TO_COORD(353), MARGINX, MARGINY},
+	{"B5", PCB_MM_TO_COORD(176), PCB_MM_TO_COORD(250), MARGINX, MARGINY},
+	{"B6", PCB_MM_TO_COORD(125), PCB_MM_TO_COORD(176), MARGINX, MARGINY},
+	{"B7", PCB_MM_TO_COORD(88), PCB_MM_TO_COORD(125), MARGINX, MARGINY},
+	{"B8", PCB_MM_TO_COORD(62), PCB_MM_TO_COORD(88), MARGINX, MARGINY},
+	{"B9", PCB_MM_TO_COORD(44), PCB_MM_TO_COORD(62), MARGINX, MARGINY},
+	{"B10", PCB_MM_TO_COORD(31), PCB_MM_TO_COORD(44), MARGINX, MARGINY},
+	{"Letter", PCB_INCH_TO_COORD(8.5), PCB_INCH_TO_COORD(11), MARGINX, MARGINY},
+	{"11x17", PCB_INCH_TO_COORD(11), PCB_INCH_TO_COORD(17), MARGINX, MARGINY},
+	{"Ledger", PCB_INCH_TO_COORD(17), PCB_INCH_TO_COORD(11), MARGINX, MARGINY},
+	{"Legal", PCB_INCH_TO_COORD(8.5), PCB_INCH_TO_COORD(14), MARGINX, MARGINY},
+	{"Executive", PCB_INCH_TO_COORD(7.5), PCB_INCH_TO_COORD(10), MARGINX, MARGINY},
+	{"A-size", PCB_INCH_TO_COORD(8.5), PCB_INCH_TO_COORD(11), MARGINX, MARGINY},
+	{"B-size", PCB_INCH_TO_COORD(11), PCB_INCH_TO_COORD(17), MARGINX, MARGINY},
+	{"C-size", PCB_INCH_TO_COORD(17), PCB_INCH_TO_COORD(22), MARGINX, MARGINY},
+	{"D-size", PCB_INCH_TO_COORD(22), PCB_INCH_TO_COORD(34), MARGINX, MARGINY},
+	{"E-size", PCB_INCH_TO_COORD(34), PCB_INCH_TO_COORD(44), MARGINX, MARGINY},
+	{"US-Business_Card", PCB_INCH_TO_COORD(3.5), PCB_INCH_TO_COORD(2.0), 0, 0},
+	{"Intl-Business_Card", PCB_INCH_TO_COORD(3.375), PCB_INCH_TO_COORD(2.125), 0, 0}
 };
 
 #undef MARGINX
@@ -240,7 +240,7 @@
 %end-doc
 */
 	{"ps-bloat", "Amount to add to trace/pad/pin edges",
-	 HID_Coord, -MIL_TO_COORD(100), MIL_TO_COORD(100), {0, 0, 0}, 0, 0},
+	 HID_Coord, -PCB_MIL_TO_COORD(100), PCB_MIL_TO_COORD(100), {0, 0, 0}, 0, 0},
 #define HA_psbloat 8
 
 /* %start-doc options "91 Postscript Export"
@@ -746,8 +746,8 @@
 
 static void corner(FILE * fh, Coord x, Coord y, Coord dx, Coord dy)
 {
-	Coord len = MIL_TO_COORD(2000);
-	Coord len2 = MIL_TO_COORD(200);
+	Coord len = PCB_MIL_TO_COORD(2000);
+	Coord len2 = PCB_MIL_TO_COORD(200);
 	Coord thick = 0;
 	/*
 	 * Originally 'thick' used thicker lines.  Currently is uses
@@ -894,7 +894,7 @@
 		 * If users don't want to make smaller boards, or use fewer drill
 		 * sizes, they can always ignore this sheet. */
 		if (SL_TYPE(idx) == SL_FAB) {
-			Coord natural = boffset - MIL_TO_COORD(500) - PCB->MaxHeight / 2;
+			Coord natural = boffset - PCB_MIL_TO_COORD(500) - PCB->MaxHeight / 2;
 			Coord needed = DrawFab_overhang();
 			pcb_fprintf(global.f, "%% PrintFab overhang natural %mi, needed %mi\n", natural, needed);
 			if (needed > natural)
Index: trunk/src_plugins/fontmode/fontmode.c
===================================================================
--- trunk/src_plugins/fontmode/fontmode.c	(revision 2509)
+++ trunk/src_plugins/fontmode/fontmode.c	(revision 2510)
@@ -53,8 +53,8 @@
    should search the grid for the gridlines and use them to figure out
    where the symbols are. */
 
-#define CELL_SIZE	MIL_TO_COORD (100)
-#define CELL_OFFSET	MIL_TO_COORD (10)
+#define CELL_SIZE	PCB_MIL_TO_COORD (100)
+#define CELL_OFFSET	PCB_MIL_TO_COORD (10)
 
 #define XYtoSym(x,y) ((x1 + CELL_OFFSET) / CELL_SIZE - 1 \
 		      + 16 * ((y1 + CELL_OFFSET) / CELL_SIZE - 1))
@@ -94,7 +94,7 @@
 	}
 	PCB->MaxWidth = CELL_SIZE * 18;
 	PCB->MaxHeight = CELL_SIZE * ((MAX_FONTPOSITION + 15) / 16 + 2);
-	PCB->Grid = MIL_TO_COORD(5);
+	PCB->Grid = PCB_MIL_TO_COORD(5);
 	PCB->Data->Layer[0].Name = strdup("Font");
 	PCB->Data->Layer[1].Name = strdup("OrigFont");
 	PCB->Data->Layer[2].Name = strdup("Width");
@@ -115,7 +115,7 @@
 
 		symbol = &font->Symbol[s];
 
-		miny = MIL_TO_COORD(5);
+		miny = PCB_MIL_TO_COORD(5);
 		maxy = font->MaxHeight;
 
 		for (l = 0; l < symbol->LineN; l++) {
@@ -134,16 +134,16 @@
 				maxx = symbol->Line[l].Point2.X;
 		}
 		w = maxx + symbol->Delta + ox;
-		CreateDrawnLineOnLayer(lwidth, w, miny + oy, w, maxy + oy, MIL_TO_COORD(1), MIL_TO_COORD(1), NoFlags());
+		CreateDrawnLineOnLayer(lwidth, w, miny + oy, w, maxy + oy, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), NoFlags());
 	}
 
 	for (l = 0; l < 16; l++) {
 		int x = (l + 1) * CELL_SIZE;
-		CreateDrawnLineOnLayer(lgrid, x, 0, x, PCB->MaxHeight, MIL_TO_COORD(1), MIL_TO_COORD(1), NoFlags());
+		CreateDrawnLineOnLayer(lgrid, x, 0, x, PCB->MaxHeight, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), NoFlags());
 	}
 	for (l = 0; l <= MAX_FONTPOSITION / 16 + 1; l++) {
 		int y = (l + 1) * CELL_SIZE;
-		CreateDrawnLineOnLayer(lgrid, 0, y, PCB->MaxWidth, y, MIL_TO_COORD(1), MIL_TO_COORD(1), NoFlags());
+		CreateDrawnLineOnLayer(lgrid, 0, y, PCB->MaxWidth, y, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), NoFlags());
 	}
 	return 0;
 }
Index: trunk/src_plugins/hid_gtk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-gdk.c	(revision 2509)
+++ trunk/src_plugins/hid_gtk/gtkhid-gdk.c	(revision 2510)
@@ -1161,8 +1161,8 @@
 	GtkStyle *style = gtk_widget_get_style(gport->drawing_area);
 	int i;
 	Coord radius = priv->lead_user_radius;
-	Coord width = MM_TO_COORD(LEAD_USER_WIDTH);
-	Coord separation = MM_TO_COORD(LEAD_USER_ARC_SEPARATION);
+	Coord width = PCB_MM_TO_COORD(LEAD_USER_WIDTH);
+	Coord separation = PCB_MM_TO_COORD(LEAD_USER_ARC_SEPARATION);
 	static GdkGC *lead_gc = NULL;
 	GdkColor lead_color;
 
@@ -1189,7 +1189,7 @@
 
 	for (i = 0; i < LEAD_USER_ARC_COUNT; i++, radius -= separation) {
 		if (radius < width)
-			radius += MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
+			radius += PCB_MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
 
 		/* Draw an arc at radius */
 		gdk_draw_arc(gport->drawable, lead_gc, FALSE,
@@ -1210,11 +1210,11 @@
 	elapsed_time = g_timer_elapsed(priv->lead_user_timer, NULL);
 	g_timer_start(priv->lead_user_timer);
 
-	step = MM_TO_COORD(LEAD_USER_VELOCITY * elapsed_time);
+	step = PCB_MM_TO_COORD(LEAD_USER_VELOCITY * elapsed_time);
 	if (priv->lead_user_radius > step)
 		priv->lead_user_radius -= step;
 	else
-		priv->lead_user_radius = MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
+		priv->lead_user_radius = PCB_MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
 
 	return TRUE;
 }
@@ -1228,7 +1228,7 @@
 	priv->lead_user = true;
 	priv->lead_user_x = x;
 	priv->lead_user_y = y;
-	priv->lead_user_radius = MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
+	priv->lead_user_radius = PCB_MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
 	priv->lead_user_timeout = g_timeout_add(LEAD_USER_PERIOD, lead_user_cb, priv);
 	priv->lead_user_timer = g_timer_new();
 }
Index: trunk/src_plugins/hid_gtk/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-gl.c	(revision 2509)
+++ trunk/src_plugins/hid_gtk/gtkhid-gl.c	(revision 2510)
@@ -1168,8 +1168,8 @@
 {
 	int i;
 	double radius = priv->lead_user_radius;
-	double width = MM_TO_COORD(LEAD_USER_WIDTH);
-	double separation = MM_TO_COORD(LEAD_USER_ARC_SEPARATION);
+	double width = PCB_MM_TO_COORD(LEAD_USER_WIDTH);
+	double separation = PCB_MM_TO_COORD(LEAD_USER_ARC_SEPARATION);
 
 	if (!priv->lead_user)
 		return;
@@ -1184,7 +1184,7 @@
 
 	for (i = 0; i < LEAD_USER_ARC_COUNT; i++, radius -= separation) {
 		if (radius < width)
-			radius += MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
+			radius += PCB_MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
 
 		/* Draw an arc at radius */
 		hidgl_draw_arc(width, priv->lead_user_x, priv->lead_user_y, radius, radius, 0, 360, gport->view.coord_per_px);
@@ -1207,11 +1207,11 @@
 	elapsed_time = g_timer_elapsed(priv->lead_user_timer, NULL);
 	g_timer_start(priv->lead_user_timer);
 
-	step = MM_TO_COORD(LEAD_USER_VELOCITY * elapsed_time);
+	step = PCB_MM_TO_COORD(LEAD_USER_VELOCITY * elapsed_time);
 	if (priv->lead_user_radius > step)
 		priv->lead_user_radius -= step;
 	else
-		priv->lead_user_radius = MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
+		priv->lead_user_radius = PCB_MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
 
 	return TRUE;
 }
@@ -1225,7 +1225,7 @@
 	priv->lead_user = true;
 	priv->lead_user_x = x;
 	priv->lead_user_y = y;
-	priv->lead_user_radius = MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
+	priv->lead_user_radius = PCB_MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
 	priv->lead_user_timeout = g_timeout_add(LEAD_USER_PERIOD, lead_user_cb, priv);
 	priv->lead_user_timer = g_timer_new();
 }
Index: trunk/src_plugins/hid_gtk/gui-drc-window.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-drc-window.c	(revision 2509)
+++ trunk/src_plugins/hid_gtk/gui-drc-window.c	(revision 2510)
@@ -40,7 +40,7 @@
 
 #define VIOLATION_PIXMAP_PIXEL_SIZE   100
 #define VIOLATION_PIXMAP_PIXEL_BORDER 5
-#define VIOLATION_PIXMAP_PCB_SIZE     MIL_TO_COORD (100)
+#define VIOLATION_PIXMAP_PCB_SIZE     PCB_MIL_TO_COORD (100)
 
 static GtkWidget *drc_window, *drc_list;
 static GtkListStore *drc_list_model = NULL;
Index: trunk/src_plugins/hid_gtk/gui-misc.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-misc.c	(revision 2509)
+++ trunk/src_plugins/hid_gtk/gui-misc.c	(revision 2510)
@@ -397,7 +397,7 @@
 		Coord dx = Crosshair.X - Marked.X;
 		Coord dy = Crosshair.Y - Marked.Y;
 		Coord r = Distance(Crosshair.X, Crosshair.Y, Marked.X, Marked.Y);
-		double a = atan2(dy, dx) * RAD_TO_DEG;
+		double a = atan2(dy, dx) * PCB_RAD_TO_DEG;
 
 
 		text = pcb_strdup_printf(_("%m+r %-mS;%cphi %-.1f;%c%-mS %-mS"), conf_core.editor.grid_unit->allow, r, sep, a, sep, dx, dy);
Index: trunk/src_plugins/hid_gtk/gui-pinout-preview.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-pinout-preview.c	(revision 2509)
+++ trunk/src_plugins/hid_gtk/gui-pinout-preview.c	(revision 2510)
@@ -43,7 +43,7 @@
 #include "gui-pinout-preview.h"
 
 /* Just define a sensible scale, lets say (for example), 100 pixel per 150 mil */
-#define SENSIBLE_VIEW_SCALE  (100. / MIL_TO_COORD (150.))
+#define SENSIBLE_VIEW_SCALE  (100. / PCB_MIL_TO_COORD (150.))
 static void pinout_set_view(GhidPinoutPreview * pinout)
 {
 	float scale = SENSIBLE_VIEW_SCALE;
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 2509)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 2510)
@@ -145,7 +145,7 @@
 /* Denotes PCB units per screen pixel.  Larger numbers mean zooming
    out - the largest value means you are looking at the whole
    board.  */
-static double view_zoom = MIL_TO_COORD(10), prev_view_zoom = MIL_TO_COORD(10);
+static double view_zoom = PCB_MIL_TO_COORD(10), prev_view_zoom = PCB_MIL_TO_COORD(10);
 static bool autofade = 0;
 static bool crosshair_on = true;
 
Index: trunk/src_plugins/io_pcb/file.c
===================================================================
--- trunk/src_plugins/io_pcb/file.c	(revision 2509)
+++ trunk/src_plugins/io_pcb/file.c	(revision 2510)
@@ -262,7 +262,7 @@
 	pcb_fprintf(FP, "Grid[%.1mr %mr %mr %d]\n", PCB->Grid, PCB->GridOffsetX, PCB->GridOffsetY, conf_core.editor.draw_grid);
 	pcb_fprintf(FP, "Cursor[%mr %mr %s]\n", Crosshair.X, Crosshair.Y, c_dtostr(PCB->Zoom));
 	/* PolyArea should be output in square cmils, no suffix */
-	fprintf(FP, "PolyArea[%s]\n", c_dtostr(COORD_TO_MIL(COORD_TO_MIL(PCB->IsleArea) * 100) * 100));
+	fprintf(FP, "PolyArea[%s]\n", c_dtostr(PCB_COORD_TO_MIL(PCB_COORD_TO_MIL(PCB->IsleArea) * 100) * 100));
 	pcb_fprintf(FP, "Thermal[%s]\n", c_dtostr(PCB->ThermScale));
 	pcb_fprintf(FP, "DRC[%mr %mr %mr %mr %mr %mr]\n", PCB->Bloat, PCB->Shrink,
 							PCB->minWid, PCB->minSlk, PCB->minDrill, PCB->minRing);
Index: trunk/src_plugins/io_pcb/parse_y.c
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.c	(revision 2509)
+++ trunk/src_plugins/io_pcb/parse_y.c	(revision 2510)
@@ -2006,7 +2006,7 @@
 #line 468 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646  */
     {
 				/* Read in cmil^2 for now; in future this should be a noop. */
-				yyPCB->IsleArea = MIL_TO_COORD (MIL_TO_COORD ((yyvsp[-1].number)) / 100.0) / 100.0;
+				yyPCB->IsleArea = PCB_MIL_TO_COORD (PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0) / 100.0;
 			}
 #line 2012 "parse_y.tab.c" /* yacc.c:1646  */
     break;
@@ -2891,61 +2891,61 @@
 
   case 205:
 #line 2000 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646  */
-    { do_measure(&(yyval.measure), (yyvsp[0].number), MIL_TO_COORD ((yyvsp[0].number)) / 100.0, 0); }
+    { do_measure(&(yyval.measure), (yyvsp[0].number), PCB_MIL_TO_COORD ((yyvsp[0].number)) / 100.0, 0); }
 #line 2896 "parse_y.tab.c" /* yacc.c:1646  */
     break;
 
   case 206:
 #line 2001 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646  */
-    { M ((yyval.measure), (yyvsp[-1].number), MIL_TO_COORD ((yyvsp[-1].number)) / 100000.0); }
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100000.0); }
 #line 2902 "parse_y.tab.c" /* yacc.c:1646  */
     break;
 
   case 207:
 #line 2002 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646  */
-    { M ((yyval.measure), (yyvsp[-1].number), MIL_TO_COORD ((yyvsp[-1].number)) / 100.0); }
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0); }
 #line 2908 "parse_y.tab.c" /* yacc.c:1646  */
     break;
 
   case 208:
 #line 2003 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646  */
-    { M ((yyval.measure), (yyvsp[-1].number), MIL_TO_COORD ((yyvsp[-1].number))); }
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number))); }
 #line 2914 "parse_y.tab.c" /* yacc.c:1646  */
     break;
 
   case 209:
 #line 2004 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646  */
-    { M ((yyval.measure), (yyvsp[-1].number), INCH_TO_COORD ((yyvsp[-1].number))); }
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_INCH_TO_COORD ((yyvsp[-1].number))); }
 #line 2920 "parse_y.tab.c" /* yacc.c:1646  */
     break;
 
   case 210:
 #line 2005 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646  */
-    { M ((yyval.measure), (yyvsp[-1].number), MM_TO_COORD ((yyvsp[-1].number)) / 1000000.0); }
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) / 1000000.0); }
 #line 2926 "parse_y.tab.c" /* yacc.c:1646  */
     break;
 
   case 211:
 #line 2006 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646  */
-    { M ((yyval.measure), (yyvsp[-1].number), MM_TO_COORD ((yyvsp[-1].number)) / 1000.0); }
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) / 1000.0); }
 #line 2932 "parse_y.tab.c" /* yacc.c:1646  */
     break;
 
   case 212:
 #line 2007 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646  */
-    { M ((yyval.measure), (yyvsp[-1].number), MM_TO_COORD ((yyvsp[-1].number))); }
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number))); }
 #line 2938 "parse_y.tab.c" /* yacc.c:1646  */
     break;
 
   case 213:
 #line 2008 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646  */
-    { M ((yyval.measure), (yyvsp[-1].number), MM_TO_COORD ((yyvsp[-1].number)) * 1000.0); }
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) * 1000.0); }
 #line 2944 "parse_y.tab.c" /* yacc.c:1646  */
     break;
 
   case 214:
 #line 2009 "../../src_plugins/io_pcb/parse_y.y" /* yacc.c:1646  */
-    { M ((yyval.measure), (yyvsp[-1].number), MM_TO_COORD ((yyvsp[-1].number)) * 1000000.0); }
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) * 1000000.0); }
 #line 2950 "parse_y.tab.c" /* yacc.c:1646  */
     break;
 
@@ -3236,7 +3236,7 @@
 {
   if (m.has_units)
     return m.bval;
-  return round (MIL_TO_COORD (m.ival));
+  return round (PCB_MIL_TO_COORD (m.ival));
 }
 
 static Coord
@@ -3244,5 +3244,5 @@
 {
   if (m.has_units)
     return m.bval;
-  return round (MIL_TO_COORD (m.ival) / 100.0);
+  return round (PCB_MIL_TO_COORD (m.ival) / 100.0);
 }
Index: trunk/src_plugins/io_pcb/parse_y.y
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.y	(revision 2509)
+++ trunk/src_plugins/io_pcb/parse_y.y	(revision 2510)
@@ -467,7 +467,7 @@
 		| T_AREA '[' number ']'
 			{
 				/* Read in cmil^2 for now; in future this should be a noop. */
-				yyPCB->IsleArea = MIL_TO_COORD (MIL_TO_COORD ($3) / 100.0) / 100.0;
+				yyPCB->IsleArea = PCB_MIL_TO_COORD (PCB_MIL_TO_COORD ($3) / 100.0) / 100.0;
 			}
 		;
 
@@ -1997,16 +1997,16 @@
 
 measure
 		/* Default unit (no suffix) is cmil */
-		: number	{ do_measure(&$$, $1, MIL_TO_COORD ($1) / 100.0, 0); }
-		| number T_UMIL	{ M ($$, $1, MIL_TO_COORD ($1) / 100000.0); }
-		| number T_CMIL	{ M ($$, $1, MIL_TO_COORD ($1) / 100.0); }
-		| number T_MIL	{ M ($$, $1, MIL_TO_COORD ($1)); }
-		| number T_IN	{ M ($$, $1, INCH_TO_COORD ($1)); }
-		| number T_NM	{ M ($$, $1, MM_TO_COORD ($1) / 1000000.0); }
-		| number T_UM	{ M ($$, $1, MM_TO_COORD ($1) / 1000.0); }
-		| number T_MM	{ M ($$, $1, MM_TO_COORD ($1)); }
-		| number T_M	{ M ($$, $1, MM_TO_COORD ($1) * 1000.0); }
-		| number T_KM	{ M ($$, $1, MM_TO_COORD ($1) * 1000000.0); }
+		: number	{ do_measure(&$$, $1, PCB_MIL_TO_COORD ($1) / 100.0, 0); }
+		| number T_UMIL	{ M ($$, $1, PCB_MIL_TO_COORD ($1) / 100000.0); }
+		| number T_CMIL	{ M ($$, $1, PCB_MIL_TO_COORD ($1) / 100.0); }
+		| number T_MIL	{ M ($$, $1, PCB_MIL_TO_COORD ($1)); }
+		| number T_IN	{ M ($$, $1, PCB_INCH_TO_COORD ($1)); }
+		| number T_NM	{ M ($$, $1, PCB_MM_TO_COORD ($1) / 1000000.0); }
+		| number T_UM	{ M ($$, $1, PCB_MM_TO_COORD ($1) / 1000.0); }
+		| number T_MM	{ M ($$, $1, PCB_MM_TO_COORD ($1)); }
+		| number T_M	{ M ($$, $1, PCB_MM_TO_COORD ($1) * 1000.0); }
+		| number T_KM	{ M ($$, $1, PCB_MM_TO_COORD ($1) * 1000000.0); }
 		;
 
 %%
@@ -2066,7 +2066,7 @@
 {
   if (m.has_units)
     return m.bval;
-  return round (MIL_TO_COORD (m.ival));
+  return round (PCB_MIL_TO_COORD (m.ival));
 }
 
 static Coord
@@ -2074,5 +2074,5 @@
 {
   if (m.has_units)
     return m.bval;
-  return round (MIL_TO_COORD (m.ival) / 100.0);
+  return round (PCB_MIL_TO_COORD (m.ival) / 100.0);
 }
Index: trunk/src_plugins/report/report.c
===================================================================
--- trunk/src_plugins/report/report.c	(revision 2509)
+++ trunk/src_plugins/report/report.c	(revision 2510)
@@ -399,7 +399,7 @@
 									EMPTY(element->Name[0].TextString),
 									EMPTY(element->Name[1].TextString),
 									EMPTY(element->Name[2].TextString),
-									SCALE_TEXT(FONT_CAPHEIGHT, element->Name[1].Scale),
+									PCB_SCALE_TEXT(FONT_CAPHEIGHT, element->Name[1].Scale),
 									element->Name[1].X, element->Name[1].Y,
 									TEST_FLAG(PCB_FLAG_HIDENAME, element) ? ",\n  but it's hidden" : "",
 									element->MarkX, element->MarkY,
@@ -437,7 +437,7 @@
 									"The bounding box is %$mD %$mD.\n"
 									"%s\n"
 									"%s", USER_UNITMASK, text->ID, flags_to_string(text->Flags, PCB_TYPE_TEXT),
-									text->X, text->Y, SCALE_TEXT(FONT_CAPHEIGHT, text->Scale),
+									text->X, text->Y, PCB_SCALE_TEXT(FONT_CAPHEIGHT, text->Scale),
 									text->TextString, text->Direction,
 									text->BoundingBox.X1, text->BoundingBox.Y1,
 									text->BoundingBox.X2, text->BoundingBox.Y2,
Index: trunk/src_plugins/vendordrill/vendor.c
===================================================================
--- trunk/src_plugins/vendordrill/vendor.c	(revision 2509)
+++ trunk/src_plugins/vendordrill/vendor.c	(revision 2510)
@@ -205,20 +205,20 @@
 	/* figure out the units, if specified */
 	sval = hid_cfg_text_value(doc, "/units");
 	if (sval == NULL) {
-		sf = MIL_TO_COORD(1);
+		sf = PCB_MIL_TO_COORD(1);
 	}
 	else if ((NSTRCMP(sval, "mil") == 0) || (NSTRCMP(sval, "mils") == 0)) {
-		sf = MIL_TO_COORD(1);
+		sf = PCB_MIL_TO_COORD(1);
 	}
 	else if ((NSTRCMP(sval, "inch") == 0) || (NSTRCMP(sval, "inches") == 0)) {
-		sf = INCH_TO_COORD(1);
+		sf = PCB_INCH_TO_COORD(1);
 	}
 	else if (NSTRCMP(sval, "mm") == 0) {
-		sf = MM_TO_COORD(1);
+		sf = PCB_MM_TO_COORD(1);
 	}
 	else {
 		Message("\"%s\" is not a supported units.  Defaulting to inch\n", sval);
-		sf = INCH_TO_COORD(1);
+		sf = PCB_INCH_TO_COORD(1);
 	}
 
 	/* default to ROUND_UP */