Index: png.c
===================================================================
--- png.c	(revision 31800)
+++ png.c	(revision 31801)
@@ -443,7 +443,7 @@
 }
 
 static const char *filename;
-static rnd_rnd_box_t *bounds;
+static rnd_box_t *bounds;
 static int in_mono, as_shown;
 
 static void parse_bloat(const char *str)
@@ -526,7 +526,7 @@
 void png_hid_export_to_file(FILE *the_file, rnd_hid_attr_val_t *options, rnd_xform_t *xform)
 {
 	static int saved_layer_stack[PCB_MAX_LAYER];
-	rnd_rnd_box_t tmp, region;
+	rnd_box_t tmp, region;
 	rnd_hid_expose_ctx_t ctx;
 
 	f = the_file;
@@ -600,7 +600,7 @@
 {
 	int save_ons[PCB_MAX_LAYER];
 	int i;
-	rnd_rnd_box_t tmp, *bbox;
+	rnd_box_t tmp, *bbox;
 	int w, h;
 	int xmax, ymax, dpi;
 	rnd_xform_t xform;
@@ -873,7 +873,7 @@
 }
 
 static rnd_composite_op_t drawing_mode;
-static void png_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen)
+static void png_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_box_t *screen)
 {
 	static gdImagePtr dst_im;
 	drawing_mode = op;