Index: autocrop.c
===================================================================
--- autocrop.c	(revision 4991)
+++ autocrop.c	(revision 4992)
@@ -64,13 +64,13 @@
 static void *MyMoveViaLowLevel(pcb_data_t * Data, pcb_pin_t * Via, pcb_coord_t dx, pcb_coord_t dy)
 {
 	if (Data) {
-		RestoreToPolygon(Data, PCB_TYPE_VIA, Via, Via);
+		pcb_poly_restore_to_poly(Data, PCB_TYPE_VIA, Via, Via);
 		r_delete_entry(Data->via_tree, (pcb_box_t *) Via);
 	}
 	pcb_via_move(Via, dx, dy);
 	if (Data) {
 		r_insert_entry(Data->via_tree, (pcb_box_t *) Via, 0);
-		ClearFromPolygon(Data, PCB_TYPE_VIA, Via, Via);
+		pcb_poly_clear_from_poly(Data, PCB_TYPE_VIA, Via, Via);
 	}
 	return Via;
 }
@@ -78,13 +78,13 @@
 static void *MyMoveLineLowLevel(pcb_data_t * Data, pcb_layer_t * Layer, pcb_line_t * Line, pcb_coord_t dx, pcb_coord_t dy)
 {
 	if (Data) {
-		RestoreToPolygon(Data, PCB_TYPE_LINE, Layer, Line);
+		pcb_poly_restore_to_poly(Data, PCB_TYPE_LINE, Layer, Line);
 		r_delete_entry(Layer->line_tree, (pcb_box_t *) Line);
 	}
 	pcb_line_move(Line, dx, dy);
 	if (Data) {
 		r_insert_entry(Layer->line_tree, (pcb_box_t *) Line, 0);
-		ClearFromPolygon(Data, PCB_TYPE_LINE, Layer, Line);
+		pcb_poly_clear_from_poly(Data, PCB_TYPE_LINE, Layer, Line);
 	}
 	return Line;
 }
@@ -92,13 +92,13 @@
 static void *MyMoveArcLowLevel(pcb_data_t * Data, pcb_layer_t * Layer, pcb_arc_t * Arc, pcb_coord_t dx, pcb_coord_t dy)
 {
 	if (Data) {
-		RestoreToPolygon(Data, PCB_TYPE_ARC, Layer, Arc);
+		pcb_poly_restore_to_poly(Data, PCB_TYPE_ARC, Layer, Arc);
 		r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc);
 	}
 	pcb_arc_move(Arc, dx, dy);
 	if (Data) {
 		r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc, 0);
-		ClearFromPolygon(Data, PCB_TYPE_ARC, Layer, Arc);
+		pcb_poly_clear_from_poly(Data, PCB_TYPE_ARC, Layer, Arc);
 	}
 	return Arc;
 }
@@ -112,7 +112,7 @@
 	pcb_poly_move(Polygon, dx, dy);
 	if (Data) {
 		r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon, 0);
-		InitClip(Data, Layer, Polygon);
+		pcb_poly_init_clip(Data, Layer, Polygon);
 	}
 	return Polygon;
 }