Index: png.c
===================================================================
--- png.c	(revision 31019)
+++ png.c	(revision 31020)
@@ -679,7 +679,7 @@
 	if (dpi > 0) {
 		/* a scale of 1  means 1 pixel is 1 inch
 		   a scale of 10 means 1 pixel is 10 inches */
-		scale = PCB_INCH_TO_COORD(1) / dpi;
+		scale = RND_INCH_TO_COORD(1) / dpi;
 		w = rnd_round(w / scale) - PNG_SCALE_HACK1;
 		h = rnd_round(h / scale) - PNG_SCALE_HACK1;
 	}
@@ -1288,8 +1288,8 @@
 
 		/* make sure we start between 0 and 360 otherwise gd does
 		   strange things */
-		sa = pcb_normalize_angle(sa);
-		ea = pcb_normalize_angle(ea);
+		sa = rnd_normalize_angle(sa);
+		ea = rnd_normalize_angle(ea);
 	}
 
 	have_outline |= doing_outline;