Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 31015)
+++ trunk/src/buffer.c	(revision 31016)
@@ -380,7 +380,7 @@
 	PCB_ENDALL_LOOP;
 
 	/* finally the origin and the bounding box */
-	PCB_COORD_ROTATE90(Buffer->X, Buffer->Y, Buffer->X, Buffer->Y, Number);
+	RND_COORD_ROTATE90(Buffer->X, Buffer->Y, Buffer->X, Buffer->Y, Number);
 	rnd_box_rotate90(&Buffer->BoundingBox, Buffer->X, Buffer->Y, Number);
 
 	pcb_undo_unfreeze_add();
Index: trunk/src/librnd/core/box.c
===================================================================
--- trunk/src/librnd/core/box.c	(revision 31015)
+++ trunk/src/librnd/core/box.c	(revision 31016)
@@ -37,8 +37,8 @@
 {
 	rnd_coord_t x1 = Box->X1, y1 = Box->Y1, x2 = Box->X2, y2 = Box->Y2;
 
-	PCB_COORD_ROTATE90(x1, y1, X, Y, Number);
-	PCB_COORD_ROTATE90(x2, y2, X, Y, Number);
+	RND_COORD_ROTATE90(x1, y1, X, Y, Number);
+	RND_COORD_ROTATE90(x2, y2, X, Y, Number);
 	Box->X1 = MIN(x1, x2);
 	Box->Y1 = MIN(y1, y2);
 	Box->X2 = MAX(x1, x2);
Index: trunk/src/librnd/core/rotate.h
===================================================================
--- trunk/src/librnd/core/rotate.h	(revision 31015)
+++ trunk/src/librnd/core/rotate.h	(revision 31016)
@@ -34,7 +34,7 @@
 #include <librnd/core/compat_misc.h>
 
 /*** Transformation macros ***/
-#define	PCB_COORD_ROTATE90(x,y,x0,y0,n)							\
+#define	RND_COORD_ROTATE90(x,y,x0,y0,n)							\
 	do {												\
 		rnd_coord_t	dx = (x)-(x0),					\
 					dy = (y)-(y0);					\
@@ -51,7 +51,7 @@
 		}											\
 	} while(0)
 
-RND_INLINE void pcb_rotate(rnd_coord_t * x, rnd_coord_t * y, rnd_coord_t cx, rnd_coord_t cy, double cosa, double sina)
+RND_INLINE void rnd_rotate(rnd_coord_t * x, rnd_coord_t * y, rnd_coord_t cx, rnd_coord_t cy, double cosa, double sina)
 {
 	double nx, ny;
 	rnd_coord_t px = *x - cx;
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 31015)
+++ trunk/src/librnd/pcb_compat.h	(revision 31016)
@@ -1084,3 +1084,5 @@
 #define PCB_HOOK_CALL_ALL RND_HOOK_CALL_ALL
 #define PCB_HOOK_REGISTER RND_HOOK_REGISTER
 #define PCB_HOOK_UNREGISTER RND_HOOK_UNREGISTER
+#define PCB_COORD_ROTATE90 RND_COORD_ROTATE90
+#define pcb_rotate rnd_rotate
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 31015)
+++ trunk/src/obj_arc.c	(revision 31016)
@@ -782,7 +782,7 @@
 
 	/* add Number*90 degrees (i.e., Number quarter-turns) */
 	Arc->StartAngle = pcb_normalize_angle(Arc->StartAngle + Number * 90);
-	PCB_COORD_ROTATE90(Arc->X, Arc->Y, X, Y, Number);
+	RND_COORD_ROTATE90(Arc->X, Arc->Y, X, Y, Number);
 
 	/* now change width and height */
 	if (Number == 1 || Number == 3) {
@@ -799,7 +799,7 @@
 {
 	if (layer->arc_tree != NULL)
 		pcb_r_delete_entry(layer->arc_tree, (rnd_rnd_box_t *) arc);
-	pcb_rotate(&arc->X, &arc->Y, X, Y, cosa, sina);
+	rnd_rotate(&arc->X, &arc->Y, X, Y, cosa, sina);
 	arc->StartAngle = pcb_normalize_angle(arc->StartAngle + angle);
 	if (layer->arc_tree != NULL)
 		pcb_r_insert_entry(layer->arc_tree, (rnd_rnd_box_t *) arc);
Index: trunk/src/obj_gfx.c
===================================================================
--- trunk/src/obj_gfx.c	(revision 31015)
+++ trunk/src/obj_gfx.c	(revision 31016)
@@ -130,7 +130,7 @@
 		cosa = cos(a);
 		sina = sin(a);
 		for(n = 0; n < 4; n++)
-			pcb_rotate(&gfx->cox[n], &gfx->coy[n], gfx->cx, gfx->cy, cosa, sina);
+			rnd_rotate(&gfx->cox[n], &gfx->coy[n], gfx->cx, gfx->cy, cosa, sina);
 	}
 }
 
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 31015)
+++ trunk/src/obj_line.c	(revision 31016)
@@ -912,8 +912,8 @@
 /* rotates a line in 90 degree steps */
 void pcb_line_rotate90(pcb_line_t *Line, rnd_coord_t X, rnd_coord_t Y, unsigned Number)
 {
-	PCB_COORD_ROTATE90(Line->Point1.X, Line->Point1.Y, X, Y, Number);
-	PCB_COORD_ROTATE90(Line->Point2.X, Line->Point2.Y, X, Y, Number);
+	RND_COORD_ROTATE90(Line->Point1.X, Line->Point1.Y, X, Y, Number);
+	RND_COORD_ROTATE90(Line->Point2.X, Line->Point2.Y, X, Y, Number);
 	/* keep horizontal, vertical Point2 > Point1 */
 	if (Line->Point1.X == Line->Point2.X) {
 		if (Line->Point1.Y > Line->Point2.Y) {
@@ -939,8 +939,8 @@
 {
 	if (layer->line_tree != NULL)
 		pcb_r_delete_entry(layer->line_tree, (rnd_rnd_box_t *) line);
-	pcb_rotate(&line->Point1.X, &line->Point1.Y, X, Y, cosa, sina);
-	pcb_rotate(&line->Point2.X, &line->Point2.Y, X, Y, cosa, sina);
+	rnd_rotate(&line->Point1.X, &line->Point1.Y, X, Y, cosa, sina);
+	rnd_rotate(&line->Point2.X, &line->Point2.Y, X, Y, cosa, sina);
 	pcb_line_bbox(line);
 	if (layer->line_tree != NULL)
 		pcb_r_insert_entry(layer->line_tree, (rnd_rnd_box_t *) line);
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 31015)
+++ trunk/src/obj_poly.c	(revision 31016)
@@ -179,7 +179,7 @@
 	assert(Polygon->parent_type = PCB_PARENT_LAYER);
 	PCB_POLY_POINT_LOOP(Polygon);
 	{
-		PCB_COORD_ROTATE90(point->X, point->Y, X, Y, Number);
+		RND_COORD_ROTATE90(point->X, point->Y, X, Y, Number);
 	}
 	PCB_END_LOOP;
 
@@ -195,7 +195,7 @@
 		pcb_r_delete_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon);
 	PCB_POLY_POINT_LOOP(polygon);
 	{
-		pcb_rotate(&point->X, &point->Y, X, Y, cosa, sina);
+		rnd_rotate(&point->X, &point->Y, X, Y, cosa, sina);
 	}
 	PCB_END_LOOP;
 	if (layer->parent_type == PCB_PARENT_DATA)
Index: trunk/src/obj_pstk_op.c
===================================================================
--- trunk/src/obj_pstk_op.c	(revision 31015)
+++ trunk/src/obj_pstk_op.c	(revision 31016)
@@ -202,7 +202,7 @@
 		if (ps->parent.data->padstack_tree != NULL)
 			pcb_r_delete_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps);
 
-		pcb_rotate(&nx, &ny, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.cosa, ctx->rotate.sina);
+		rnd_rotate(&nx, &ny, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.cosa, ctx->rotate.sina);
 		if ((nx != ps->x) || (ny != ps->y))
 			pcb_pstk_move_(ps, nx - ps->x, ny - ps->y);
 
Index: trunk/src/obj_pstk_proto.c
===================================================================
--- trunk/src/obj_pstk_proto.c	(revision 31015)
+++ trunk/src/obj_pstk_proto.c	(revision 31016)
@@ -555,11 +555,11 @@
 
 	switch(sh->shape) {
 		case PCB_PSSH_LINE:
-			pcb_rotate(&sh->data.line.x1, &sh->data.line.y1, 0, 0, cosa, sina);
-			pcb_rotate(&sh->data.line.x2, &sh->data.line.y2, 0, 0, cosa, sina);
+			rnd_rotate(&sh->data.line.x1, &sh->data.line.y1, 0, 0, cosa, sina);
+			rnd_rotate(&sh->data.line.x2, &sh->data.line.y2, 0, 0, cosa, sina);
 			break;
 		case PCB_PSSH_CIRC:
-			pcb_rotate(&sh->data.circ.x, &sh->data.circ.y, 0, 0, cosa, sina);
+			rnd_rotate(&sh->data.circ.x, &sh->data.circ.y, 0, 0, cosa, sina);
 			break;
 		case PCB_PSSH_HSHADOW:
 			break;
@@ -567,7 +567,7 @@
 			if (sh->data.poly.pa != NULL)
 				pcb_polyarea_free(&sh->data.poly.pa);
 			for(i = 0; i < sh->data.poly.len; i++)
-				pcb_rotate(&sh->data.poly.x[i], &sh->data.poly.y[i], 0, 0, cosa, sina);
+				rnd_rotate(&sh->data.poly.x[i], &sh->data.poly.y[i], 0, 0, cosa, sina);
 			pcb_pstk_shape_update_pa(&sh->data.poly);
 			break;
 	}
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 31015)
+++ trunk/src/obj_text.c	(revision 31016)
@@ -767,7 +767,7 @@
 void pcb_text_rotate90(pcb_text_t *Text, rnd_coord_t X, rnd_coord_t Y, unsigned Number)
 {
 	int number = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Text) ? (4 - Number) & 3 : Number;
-	PCB_COORD_ROTATE90(Text->X, Text->Y, X, Y, Number);
+	RND_COORD_ROTATE90(Text->X, Text->Y, X, Y, Number);
 
 	Text->rot += number*90.0;
 	if (Text->rot > 360.0)
@@ -783,7 +783,7 @@
    text rotation itself is done by the drawing routines */
 void pcb_text_rotate(pcb_text_t *Text, rnd_coord_t X, rnd_coord_t Y, double cosa, double sina, double rotdeg)
 {
-	pcb_rotate(&Text->X, &Text->Y, X, Y, cosa, sina);
+	rnd_rotate(&Text->X, &Text->Y, X, Y, cosa, sina);
 	Text->rot += rotdeg;
 	if (Text->rot > 360.0)
 		Text->rot -= 360.0;
@@ -819,7 +819,7 @@
 	if (Text->rot < 0.0)
 		Text->rot += 360.0;
 
-	pcb_rotate(&Text->X, &Text->Y, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.cosa, ctx->rotate.sina);
+	rnd_rotate(&Text->X, &Text->Y, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.cosa, ctx->rotate.sina);
 	if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Text))
 		Text->rot -= ctx->rotate.angle;
 	else
Index: trunk/src/rotate.c
===================================================================
--- trunk/src/rotate.c	(revision 31015)
+++ trunk/src/rotate.c	(revision 31016)
@@ -91,7 +91,7 @@
  */
 void pcb_point_rotate90(rnd_point_t *Point, rnd_coord_t X, rnd_coord_t Y, unsigned Number)
 {
-	PCB_COORD_ROTATE90(Point->X, Point->Y, X, Y, Number);
+	RND_COORD_ROTATE90(Point->X, Point->Y, X, Y, Number);
 }
 
 pcb_any_obj_t *pcb_obj_rotate90(pcb_board_t *pcb, pcb_any_obj_t *obj, rnd_coord_t X, rnd_coord_t Y, unsigned Steps)
Index: trunk/src_plugins/io_mentor_cell/read.c
===================================================================
--- trunk/src_plugins/io_mentor_cell/read.c	(revision 31015)
+++ trunk/src_plugins/io_mentor_cell/read.c	(revision 31016)
@@ -637,7 +637,7 @@
 		rnd_coord_t ymax = height+ymin;
 		TODO(
 			"Consider rotation, using:"
-			"  pcb_rotate(rnd_coord_t * x, rnd_coord_t * y, rnd_coord_t cx, rnd_coord_t cy, double cosa, double sina)"
+			"  rnd_rotate(rnd_coord_t * x, rnd_coord_t * y, rnd_coord_t cx, rnd_coord_t cy, double cosa, double sina)"
 			"Maybe:"
 			"  double sina = sin(-(double)rot / RND_RAD_TO_DEG), cosa = cos(-(double)rot / RND_RAD_TO_DEG);");
 		if (strcmp(tmp->argv[1], "Top") == 0) {
Index: trunk/src_plugins/shape/shape.c
===================================================================
--- trunk/src_plugins/shape/shape.c	(revision 31015)
+++ trunk/src_plugins/shape/shape.c	(revision 31016)
@@ -85,7 +85,7 @@
 		x = rnd_round(cos(a) * (double)rx + (double)cx);
 		y = rnd_round(sin(a) * (double)ry + (double)cy);
 		if (rot_deg != 0.0)
-			pcb_rotate(&x, &y, cx, cy, cosra, sinra);
+			rnd_rotate(&x, &y, cx, cy, cosra, sinra);
 		pcb_poly_point_new(p, x, y);
 	}
 
@@ -108,7 +108,7 @@
 
 	/* add exact start point */
 	if (need_rot)
-		pcb_rotate(&sx, &sy, rotcx, rotcy, cosra, sinra);
+		rnd_rotate(&sx, &sy, rotcx, rotcy, cosra, sinra);
 	pcb_poly_point_new(p, sx, sy);
 	lx = sx;
 	ly = sy;
@@ -121,7 +121,7 @@
 		x = rnd_round((double)cx + cos(sa) * (double)rx);
 		y = rnd_round((double)cy - sin(sa) * (double)ry);
 		if (need_rot)
-			pcb_rotate(&x, &y, rotcx, rotcy, cosra, sinra);
+			rnd_rotate(&x, &y, rotcx, rotcy, cosra, sinra);
 		if ((x != lx) || (y != ly))
 			pcb_poly_point_new(p, x, y);
 		lx = x;
@@ -131,7 +131,7 @@
 
 	/* add exact end point */
 	if (need_rot)
-		pcb_rotate(&ex, &ey, rotcx, rotcy, cosra, sinra);
+		rnd_rotate(&ex, &ey, rotcx, rotcy, cosra, sinra);
 	if ((ex != lx) || (ey != ly))
 		pcb_poly_point_new(p, ex, ey);
 }