Index: search.c
===================================================================
--- search.c	(revision 31019)
+++ search.c	(revision 31020)
@@ -1075,12 +1075,12 @@
 
 	/* Convert StartAngle, Delta into bounding angles in [0, 720) */
 	if (Arc->Delta > 0) {
-		ang1 = pcb_normalize_angle(Arc->StartAngle);
-		ang2 = pcb_normalize_angle(Arc->StartAngle + Arc->Delta);
+		ang1 = rnd_normalize_angle(Arc->StartAngle);
+		ang2 = rnd_normalize_angle(Arc->StartAngle + Arc->Delta);
 	}
 	else {
-		ang1 = pcb_normalize_angle(Arc->StartAngle + Arc->Delta);
-		ang2 = pcb_normalize_angle(Arc->StartAngle);
+		ang1 = rnd_normalize_angle(Arc->StartAngle + Arc->Delta);
+		ang2 = rnd_normalize_angle(Arc->StartAngle);
 	}
 	if (ang1 > ang2)
 		ang2 += 360;
@@ -1111,7 +1111,7 @@
 		return rnd_false;
 	}
 
-	if ((Arc->Width == Arc->Height) || (fabs(Arc->Width - Arc->Height) < PCB_MM_TO_COORD(0.1))) {
+	if ((Arc->Width == Arc->Height) || (fabs(Arc->Width - Arc->Height) < RND_MM_TO_COORD(0.1))) {
 		/* Simple circular case: if point is inside the arc range, just compare it to the arc */
 		return fabs(rnd_distance(X, Y, Arc->X, Arc->Y) - Arc->Width) < Radius + Arc->Thickness / 2;
 	}