Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4909)
+++ trunk/doc-rnd/hacking/renames	(revision 4910)
@@ -451,3 +451,6 @@
 OBJECT_ID -> PCB_OBJECT_ID
 FRONT -> PCB_FRONT
 ON_SIDE -> PCB_ON_SIDE
+TO_RADIANS -> PCB_TO_RADIANS
+MAKEMIN -> PCB_MAKE_MIN
+MAKEMAX -> PCB_MAKE_MAX
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 4909)
+++ trunk/src/crosshair.c	(revision 4910)
@@ -744,10 +744,10 @@
 	pcb_arc_t *arc = (pcb_arc_t *) box;
 	pcb_coord_t p1x, p1y, p2x, p2y;
 
-	p1x = arc->X - arc->Width * cos(TO_RADIANS(arc->StartAngle));
-	p1y = arc->Y + arc->Height * sin(TO_RADIANS(arc->StartAngle));
-	p2x = arc->X - arc->Width * cos(TO_RADIANS(arc->StartAngle + arc->Delta));
-	p2y = arc->Y + arc->Height * sin(TO_RADIANS(arc->StartAngle + arc->Delta));
+	p1x = arc->X - arc->Width * cos(PCB_TO_RADIANS(arc->StartAngle));
+	p1y = arc->Y + arc->Height * sin(PCB_TO_RADIANS(arc->StartAngle));
+	p2x = arc->X - arc->Width * cos(PCB_TO_RADIANS(arc->StartAngle + arc->Delta));
+	p2y = arc->Y + arc->Height * sin(PCB_TO_RADIANS(arc->StartAngle + arc->Delta));
 
 	/* printf("p1=%ld;%ld p2=%ld;%ld info=%ld;%ld\n", p1x, p1y, p2x, p2y, info->X, info->Y); */
 
Index: trunk/src/math_helper.h
===================================================================
--- trunk/src/math_helper.h	(revision 4909)
+++ trunk/src/math_helper.h	(revision 4910)
@@ -42,7 +42,7 @@
 #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
-#define TO_RADIANS(degrees)	(PCB_M180 * (degrees))
+#define PCB_TO_RADIANS(degrees)	(PCB_M180 * (degrees))
 
 #define PCB_CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
 #define PCB_ABS(a)	   (((a) < 0) ? -(a) : (a))
@@ -58,8 +58,8 @@
 #define SGN(a)			((a) >0 ? 1 : ((a) == 0 ? 0 : -1))
 #endif
 #define SGNZ(a)                 ((a) >=0 ? 1 : -1)
-#define MAKEMIN(a,b)            if ((b) < (a)) (a) = (b)
-#define MAKEMAX(a,b)            if ((b) > (a)) (a) = (b)
+#define PCB_MAKE_MIN(a,b)            if ((b) < (a)) (a) = (b)
+#define PCB_MAKE_MAX(a,b)            if ((b) > (a)) (a) = (b)
 
 
 #define	SWAP_SIGN_X(x)		(x)
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 4909)
+++ trunk/src/obj_elem.c	(revision 4910)
@@ -745,23 +745,23 @@
 	ELEMENTLINE_LOOP(Element);
 	{
 		SetLineBoundingBox(line);
-		MAKEMIN(box->X1, line->Point1.X - (line->Thickness + 1) / 2);
-		MAKEMIN(box->Y1, line->Point1.Y - (line->Thickness + 1) / 2);
-		MAKEMIN(box->X1, line->Point2.X - (line->Thickness + 1) / 2);
-		MAKEMIN(box->Y1, line->Point2.Y - (line->Thickness + 1) / 2);
-		MAKEMAX(box->X2, line->Point1.X + (line->Thickness + 1) / 2);
-		MAKEMAX(box->Y2, line->Point1.Y + (line->Thickness + 1) / 2);
-		MAKEMAX(box->X2, line->Point2.X + (line->Thickness + 1) / 2);
-		MAKEMAX(box->Y2, line->Point2.Y + (line->Thickness + 1) / 2);
+		PCB_MAKE_MIN(box->X1, line->Point1.X - (line->Thickness + 1) / 2);
+		PCB_MAKE_MIN(box->Y1, line->Point1.Y - (line->Thickness + 1) / 2);
+		PCB_MAKE_MIN(box->X1, line->Point2.X - (line->Thickness + 1) / 2);
+		PCB_MAKE_MIN(box->Y1, line->Point2.Y - (line->Thickness + 1) / 2);
+		PCB_MAKE_MAX(box->X2, line->Point1.X + (line->Thickness + 1) / 2);
+		PCB_MAKE_MAX(box->Y2, line->Point1.Y + (line->Thickness + 1) / 2);
+		PCB_MAKE_MAX(box->X2, line->Point2.X + (line->Thickness + 1) / 2);
+		PCB_MAKE_MAX(box->Y2, line->Point2.Y + (line->Thickness + 1) / 2);
 	}
 	END_LOOP;
 	ARC_LOOP(Element);
 	{
 		SetArcBoundingBox(arc);
-		MAKEMIN(box->X1, arc->BoundingBox.X1);
-		MAKEMIN(box->Y1, arc->BoundingBox.Y1);
-		MAKEMAX(box->X2, arc->BoundingBox.X2);
-		MAKEMAX(box->Y2, arc->BoundingBox.Y2);
+		PCB_MAKE_MIN(box->X1, arc->BoundingBox.X1);
+		PCB_MAKE_MIN(box->Y1, arc->BoundingBox.Y1);
+		PCB_MAKE_MAX(box->X2, arc->BoundingBox.X2);
+		PCB_MAKE_MAX(box->Y2, arc->BoundingBox.Y2);
 	}
 	END_LOOP;
 	*vbox = *box;
@@ -775,14 +775,14 @@
 				Data->pin_tree = r_create_tree(NULL, 0, 0);
 			r_insert_entry(Data->pin_tree, (pcb_box_t *) pin, 0);
 		}
-		MAKEMIN(box->X1, pin->BoundingBox.X1);
-		MAKEMIN(box->Y1, pin->BoundingBox.Y1);
-		MAKEMAX(box->X2, pin->BoundingBox.X2);
-		MAKEMAX(box->Y2, pin->BoundingBox.Y2);
-		MAKEMIN(vbox->X1, pin->X - pin->Thickness / 2);
-		MAKEMIN(vbox->Y1, pin->Y - pin->Thickness / 2);
-		MAKEMAX(vbox->X2, pin->X + pin->Thickness / 2);
-		MAKEMAX(vbox->Y2, pin->Y + pin->Thickness / 2);
+		PCB_MAKE_MIN(box->X1, pin->BoundingBox.X1);
+		PCB_MAKE_MIN(box->Y1, pin->BoundingBox.Y1);
+		PCB_MAKE_MAX(box->X2, pin->BoundingBox.X2);
+		PCB_MAKE_MAX(box->Y2, pin->BoundingBox.Y2);
+		PCB_MAKE_MIN(vbox->X1, pin->X - pin->Thickness / 2);
+		PCB_MAKE_MIN(vbox->Y1, pin->Y - pin->Thickness / 2);
+		PCB_MAKE_MAX(vbox->X2, pin->X + pin->Thickness / 2);
+		PCB_MAKE_MAX(vbox->Y2, pin->Y + pin->Thickness / 2);
 	}
 	END_LOOP;
 	PAD_LOOP(Element);
@@ -795,14 +795,14 @@
 				Data->pad_tree = r_create_tree(NULL, 0, 0);
 			r_insert_entry(Data->pad_tree, (pcb_box_t *) pad, 0);
 		}
-		MAKEMIN(box->X1, pad->BoundingBox.X1);
-		MAKEMIN(box->Y1, pad->BoundingBox.Y1);
-		MAKEMAX(box->X2, pad->BoundingBox.X2);
-		MAKEMAX(box->Y2, pad->BoundingBox.Y2);
-		MAKEMIN(vbox->X1, MIN(pad->Point1.X, pad->Point2.X) - pad->Thickness / 2);
-		MAKEMIN(vbox->Y1, MIN(pad->Point1.Y, pad->Point2.Y) - pad->Thickness / 2);
-		MAKEMAX(vbox->X2, MAX(pad->Point1.X, pad->Point2.X) + pad->Thickness / 2);
-		MAKEMAX(vbox->Y2, MAX(pad->Point1.Y, pad->Point2.Y) + pad->Thickness / 2);
+		PCB_MAKE_MIN(box->X1, pad->BoundingBox.X1);
+		PCB_MAKE_MIN(box->Y1, pad->BoundingBox.Y1);
+		PCB_MAKE_MAX(box->X2, pad->BoundingBox.X2);
+		PCB_MAKE_MAX(box->Y2, pad->BoundingBox.Y2);
+		PCB_MAKE_MIN(vbox->X1, MIN(pad->Point1.X, pad->Point2.X) - pad->Thickness / 2);
+		PCB_MAKE_MIN(vbox->Y1, MIN(pad->Point1.Y, pad->Point2.Y) - pad->Thickness / 2);
+		PCB_MAKE_MAX(vbox->X2, MAX(pad->Point1.X, pad->Point2.X) + pad->Thickness / 2);
+		PCB_MAKE_MAX(vbox->Y2, MAX(pad->Point1.Y, pad->Point2.Y) + pad->Thickness / 2);
 	}
 	END_LOOP;
 	/* now we set the PCB_FLAG_EDGE2 of the pad if Point2
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 4909)
+++ trunk/src/obj_poly.c	(revision 4910)
@@ -137,10 +137,10 @@
 	Polygon->BoundingBox.X2 = Polygon->BoundingBox.Y2 = 0;
 	POLYGONPOINT_LOOP(Polygon);
 	{
-		MAKEMIN(Polygon->BoundingBox.X1, point->X);
-		MAKEMIN(Polygon->BoundingBox.Y1, point->Y);
-		MAKEMAX(Polygon->BoundingBox.X2, point->X);
-		MAKEMAX(Polygon->BoundingBox.Y2, point->Y);
+		PCB_MAKE_MIN(Polygon->BoundingBox.X1, point->X);
+		PCB_MAKE_MIN(Polygon->BoundingBox.Y1, point->Y);
+		PCB_MAKE_MAX(Polygon->BoundingBox.X2, point->X);
+		PCB_MAKE_MAX(Polygon->BoundingBox.Y2, point->Y);
 	}
 	/* boxes don't include the lower right corner */
 	pcb_close_box(&Polygon->BoundingBox);
Index: trunk/src/polygon1.c
===================================================================
--- trunk/src/polygon1.c	(revision 4909)
+++ trunk/src/polygon1.c	(revision 4910)
@@ -1807,10 +1807,10 @@
 	b = bpa;
 	while ((b = b->f) != bpa) {
 		pcb_box_t *b_box = (pcb_box_t *) b->contours;
-		MAKEMIN(box.X1, b_box->X1);
-		MAKEMIN(box.Y1, b_box->Y1);
-		MAKEMAX(box.X2, b_box->X2);
-		MAKEMAX(box.Y2, b_box->Y2);
+		PCB_MAKE_MIN(box.X1, b_box->X1);
+		PCB_MAKE_MIN(box.Y1, b_box->Y1);
+		PCB_MAKE_MAX(box.X2, b_box->X2);
+		PCB_MAKE_MAX(box.Y2, b_box->Y2);
 	}
 
 	if (del_inside) {
Index: trunk/src/rtree.c
===================================================================
--- trunk/src/rtree.c	(revision 4909)
+++ trunk/src/rtree.c	(revision 4910)
@@ -317,10 +317,10 @@
 		for (i = 1; i < M_SIZE + 1; i++) {
 			if (!node->u.rects[i].bptr)
 				return;
-			MAKEMIN(node->box.X1, node->u.rects[i].bounds.X1);
-			MAKEMAX(node->box.X2, node->u.rects[i].bounds.X2);
-			MAKEMIN(node->box.Y1, node->u.rects[i].bounds.Y1);
-			MAKEMAX(node->box.Y2, node->u.rects[i].bounds.Y2);
+			PCB_MAKE_MIN(node->box.X1, node->u.rects[i].bounds.X1);
+			PCB_MAKE_MAX(node->box.X2, node->u.rects[i].bounds.X2);
+			PCB_MAKE_MIN(node->box.Y1, node->u.rects[i].bounds.Y1);
+			PCB_MAKE_MAX(node->box.Y2, node->u.rects[i].bounds.Y2);
 		}
 	}
 	else {
@@ -328,10 +328,10 @@
 		for (i = 1; i < M_SIZE + 1; i++) {
 			if (!node->u.kids[i])
 				return;
-			MAKEMIN(node->box.X1, node->u.kids[i]->box.X1);
-			MAKEMAX(node->box.X2, node->u.kids[i]->box.X2);
-			MAKEMIN(node->box.Y1, node->u.kids[i]->box.Y1);
-			MAKEMAX(node->box.Y2, node->u.kids[i]->box.Y2);
+			PCB_MAKE_MIN(node->box.X1, node->u.kids[i]->box.X1);
+			PCB_MAKE_MAX(node->box.X2, node->u.kids[i]->box.X2);
+			PCB_MAKE_MIN(node->box.Y1, node->u.kids[i]->box.Y1);
+			PCB_MAKE_MAX(node->box.Y2, node->u.kids[i]->box.Y2);
 		}
 	}
 }
@@ -812,10 +812,10 @@
 		if (i == 0)
 			node->box = *query;
 		else if (force) {
-			MAKEMIN(node->box.X1, query->X1);
-			MAKEMAX(node->box.X2, query->X2);
-			MAKEMIN(node->box.Y1, query->Y1);
-			MAKEMAX(node->box.Y2, query->Y2);
+			PCB_MAKE_MIN(node->box.X1, query->X1);
+			PCB_MAKE_MAX(node->box.X2, query->X2);
+			PCB_MAKE_MIN(node->box.Y1, query->Y1);
+			PCB_MAKE_MAX(node->box.Y2, query->Y2);
 		}
 		if (i < M_SIZE) {
 			sort_node(node);
@@ -831,10 +831,10 @@
 		double score, best_score;
 
 		if (force) {
-			MAKEMIN(node->box.X1, query->X1);
-			MAKEMAX(node->box.X2, query->X2);
-			MAKEMIN(node->box.Y1, query->Y1);
-			MAKEMAX(node->box.Y2, query->Y2);
+			PCB_MAKE_MIN(node->box.X1, query->X1);
+			PCB_MAKE_MAX(node->box.X2, query->X2);
+			PCB_MAKE_MIN(node->box.Y1, query->Y1);
+			PCB_MAKE_MAX(node->box.Y2, query->Y2);
 		}
 
 		/* this node encloses it, but it's not a leaf, so descend the tree */
Index: trunk/src_plugins/autoplace/autoplace.c
===================================================================
--- trunk/src_plugins/autoplace/autoplace.c	(revision 4909)
+++ trunk/src_plugins/autoplace/autoplace.c	(revision 4910)
@@ -324,10 +324,10 @@
 		allsameside = pcb_true;
 		for (j = 1; j < n->ConnectionN; j++) {
 			pcb_connection_t *c = &(n->Connection[j]);
-			MAKEMIN(minx, c->X);
-			MAKEMAX(maxx, c->X);
-			MAKEMIN(miny, c->Y);
-			MAKEMAX(maxy, c->Y);
+			PCB_MAKE_MIN(minx, c->X);
+			PCB_MAKE_MAX(maxx, c->X);
+			PCB_MAKE_MIN(miny, c->Y);
+			PCB_MAKE_MAX(maxy, c->Y);
 			if (c->type != PCB_TYPE_PAD)
 				allpads = pcb_false;
 			if (c->group != thegroup)
@@ -522,10 +522,10 @@
 		pcb_coord_t maxX = -MAX_COORD, maxY = -MAX_COORD;
 		ELEMENT_LOOP(PCB->Data);
 		{
-			MAKEMIN(minX, element->VBox.X1);
-			MAKEMIN(minY, element->VBox.Y1);
-			MAKEMAX(maxX, element->VBox.X2);
-			MAKEMAX(maxY, element->VBox.Y2);
+			PCB_MAKE_MIN(minX, element->VBox.X1);
+			PCB_MAKE_MIN(minY, element->VBox.Y1);
+			PCB_MAKE_MAX(maxX, element->VBox.X2);
+			PCB_MAKE_MAX(maxY, element->VBox.Y2);
 		}
 		END_LOOP;
 		if (minX < maxX && minY < maxY)
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 4909)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 4910)
@@ -4153,10 +4153,10 @@
 		pcb_box_t bb = shrink_routebox(net);
 		LIST_LOOP(net, same_net, p);
 		{
-			MAKEMIN(bb.X1, p->sbox.X1);
-			MAKEMIN(bb.Y1, p->sbox.Y1);
-			MAKEMAX(bb.X2, p->sbox.X2);
-			MAKEMAX(bb.Y2, p->sbox.Y2);
+			PCB_MAKE_MIN(bb.X1, p->sbox.X1);
+			PCB_MAKE_MIN(bb.Y1, p->sbox.Y1);
+			PCB_MAKE_MAX(bb.X2, p->sbox.X2);
+			PCB_MAKE_MAX(bb.Y2, p->sbox.Y2);
 		}
 		END_LOOP;
 		area = (double) (bb.X2 - bb.X1) * (bb.Y2 - bb.Y1);
Index: trunk/src_plugins/export_dxf/dxf.c
===================================================================
--- trunk/src_plugins/export_dxf/dxf.c	(revision 4909)
+++ trunk/src_plugins/export_dxf/dxf.c	(revision 4910)
@@ -5347,10 +5347,10 @@
 		return;
 	}
 	dxf_use_gc(gc, 0);
-	arcStartX = cx - width * cos(TO_RADIANS(start_angle));
-	arcStartY = cy + height * sin(TO_RADIANS(start_angle));
-	arcStopX = cx - width * cos(TO_RADIANS(start_angle + delta_angle));
-	arcStopY = cy + height * sin(TO_RADIANS(start_angle + delta_angle));
+	arcStartX = cx - width * cos(PCB_TO_RADIANS(start_angle));
+	arcStartY = cy + height * sin(PCB_TO_RADIANS(start_angle));
+	arcStopX = cx - width * cos(PCB_TO_RADIANS(start_angle + delta_angle));
+	arcStopY = cy + height * sin(PCB_TO_RADIANS(start_angle + delta_angle));
 	if (dxf_metric) {
 		/* use metric (mm) */
 		dxf_x0 = PCB_COORD_TO_MM(DXF_X(PCB, cx));
@@ -5426,8 +5426,8 @@
 	 * in the pcb universe 0 degrees (the negative X-axis) is to the left,
 	 * and in the dxf universe 0 degrees is to the right.
 	 */
-	dxf_start_angle = TO_RADIANS(start_angle + 180);
-	dxf_end_angle = TO_RADIANS(start_angle + delta_angle + 180);
+	dxf_start_angle = PCB_TO_RADIANS(start_angle + 180);
+	dxf_end_angle = PCB_TO_RADIANS(start_angle + delta_angle + 180);
 	if (dxf_start_angle >= (2 * M_PI)) {
 		dxf_start_angle = dxf_start_angle - (2 * M_PI);
 	}
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 4909)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 4910)
@@ -986,8 +986,8 @@
 	if (!f)
 		return;
 
-	arcStartX = cx - width * cos(TO_RADIANS(start_angle));
-	arcStartY = cy + height * sin(TO_RADIANS(start_angle));
+	arcStartX = cx - width * cos(PCB_TO_RADIANS(start_angle));
+	arcStartY = cy + height * sin(PCB_TO_RADIANS(start_angle));
 
 	/* I checked three different gerber viewers, and they all disagreed
 	   on how ellipses should be drawn.  The spec just calls G74/G75
@@ -1014,8 +1014,8 @@
 		angle = start_angle;
 		while (nsteps > 0) {
 			nsteps--;
-			x1 = cx - width * cos(TO_RADIANS(angle + step));
-			y1 = cy + height * sin(TO_RADIANS(angle + step));
+			x1 = cx - width * cos(PCB_TO_RADIANS(angle + step));
+			y1 = cy + height * sin(PCB_TO_RADIANS(angle + step));
 			gerber_draw_line(gc, x0, y0, x1, y1);
 			x0 = x1;
 			y0 = y1;
@@ -1024,8 +1024,8 @@
 		return;
 	}
 
-	arcStopX = cx - width * cos(TO_RADIANS(start_angle + delta_angle));
-	arcStopY = cy + height * sin(TO_RADIANS(start_angle + delta_angle));
+	arcStopX = cx - width * cos(PCB_TO_RADIANS(start_angle + delta_angle));
+	arcStopY = cy + height * sin(PCB_TO_RADIANS(start_angle + delta_angle));
 	if (arcStartX != lastX) {
 		m = pcb_true;
 		lastX = arcStartX;
Index: trunk/src_plugins/jostle/jostle.c
===================================================================
--- trunk/src_plugins/jostle/jostle.c	(revision 4909)
+++ trunk/src_plugins/jostle/jostle.c	(revision 4910)
@@ -146,10 +146,10 @@
 			first = 0;
 		}
 		else {
-			MAKEMIN(box.X1, pa->xmin);
-			MAKEMAX(box.X2, pa->xmax + 1);
-			MAKEMIN(box.Y1, pa->ymin);
-			MAKEMAX(box.Y2, pa->ymax + 1);
+			PCB_MAKE_MIN(box.X1, pa->xmin);
+			PCB_MAKE_MAX(box.X2, pa->xmax + 1);
+			PCB_MAKE_MIN(box.Y1, pa->ymin);
+			PCB_MAKE_MAX(box.Y2, pa->ymax + 1);
 		}
 	} while ((n = n->f) != a);
 	return box;