Index: draw_png.c
===================================================================
--- draw_png.c	(revision 36221)
+++ draw_png.c	(revision 36222)
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "board.h"
+#include <librnd/core/hidlib.h>
 #include <librnd/core/color.h>
 #include <librnd/core/color_cache.h>
 #include <librnd/core/error.h>
@@ -189,8 +189,8 @@
 	else {
 		pctx->x_shift = 0;
 		pctx->y_shift = 0;
-		pctx->h = PCB->hidlib.size_y;
-		pctx->w = PCB->hidlib.size_x;
+		pctx->h = pctx->hidlib->size_y;
+		pctx->w = pctx->hidlib->size_x;
 	}
 
 	/* figure out the scale factor to fit in the specified PNG file size */
@@ -612,11 +612,11 @@
 		   need to be brought in by a pixel to make sure they are not clipped
 		   by libgd - even tho they should be visible because of thickness, they
 		   would not be because the center line is off the image */
-	if (x1 == PCB->hidlib.size_x && x2 == PCB->hidlib.size_x) {
+	if (x1 == pctx->hidlib->size_x && x2 == pctx->hidlib->size_x) {
 		x1o = -1;
 		x2o = -1;
 	}
-	if (y1 == PCB->hidlib.size_y && y2 == PCB->hidlib.size_y) {
+	if (y1 == pctx->hidlib->size_y && y2 == pctx->hidlib->size_y) {
 		y1o = -1;
 		y2o = -1;
 	}