Index: autoplace.c
===================================================================
--- autoplace.c	(revision 34508)
+++ autoplace.c	(revision 34509)
@@ -57,7 +57,7 @@
 #include "draw.h"
 #include <librnd/core/error.h>
 #include "layer.h"
-#include "intersect.h"
+#include <librnd/core/box_isc.h>
 #include <librnd/poly/rtree.h>
 #include "move.h"
 #include "netlist.h"
@@ -371,9 +371,9 @@
 	/* now compute penalty function Wc which is proportional to
 	 * amount of overlap and congestion. */
 	/* delta1 is congestion penalty function */
-	delta1 = CostParameter.congestion_penalty * sqrt(fabs(pcb_intersect_box_box(bounds.Box, bounds.BoxN)));
+	delta1 = CostParameter.congestion_penalty * sqrt(fabs(rnd_intersect_box_box(bounds.Box, bounds.BoxN)));
 #if 0
-	printf("Wire Congestion Area: %f\n", pcb_intersect_box_box(bounds.Box, bounds.BoxN));
+	printf("Wire Congestion Area: %f\n", rnd_intersect_box_box(bounds.Box, bounds.BoxN));
 #endif
 	/* free bounding rectangles */
 	pcb_box_free(&bounds);
@@ -437,10 +437,10 @@
 	PCB_END_LOOP;
 
 	/* compute intersection area of module areas box list */
-	delta2 = sqrt(fabs(pcb_intersect_box_box(solderside.Box, solderside.BoxN) + pcb_intersect_box_box(componentside.Box, componentside.BoxN))) * (CostParameter.overlap_penalty_min + (1 - (T / T0)) * CostParameter.overlap_penalty_max);
+	delta2 = sqrt(fabs(rnd_intersect_box_box(solderside.Box, solderside.BoxN) + rnd_intersect_box_box(componentside.Box, componentside.BoxN))) * (CostParameter.overlap_penalty_min + (1 - (T / T0)) * CostParameter.overlap_penalty_max);
 #if 0
-	printf("Module Overlap Area (solder): %f\n", pcb_intersect_box_box(solderside.Box, solderside.BoxN));
-	printf("Module Overlap Area (component): %f\n", pcb_intersect_box_box(componentside.Box, componentside.BoxN));
+	printf("Module Overlap Area (solder): %f\n", rnd_intersect_box_box(solderside.Box, solderside.BoxN));
+	printf("Module Overlap Area (component): %f\n", rnd_intersect_box_box(componentside.Box, componentside.BoxN));
 #endif
 	pcb_box_free(&solderside);
 	pcb_box_free(&componentside);