Index: export_openems.c
===================================================================
--- export_openems.c	(revision 24882)
+++ export_openems.c	(revision 24883)
@@ -345,9 +345,9 @@
 	else {
 		/* rectangular board size */
 		pcb_fprintf(ctx->f, "outline_xy(1, 1) = 0; outline_xy(2, 1) = 0;\n");
-		pcb_fprintf(ctx->f, "outline_xy(1, 2) = %mm; outline_xy(2, 2) = 0;\n", ctx->pcb->MaxWidth);
-		pcb_fprintf(ctx->f, "outline_xy(1, 3) = %mm; outline_xy(2, 3) = %mm;\n", ctx->pcb->MaxWidth, -ctx->pcb->MaxHeight);
-		pcb_fprintf(ctx->f, "outline_xy(1, 4) = 0; outline_xy(2, 4) = %mm;\n", -ctx->pcb->MaxHeight);
+		pcb_fprintf(ctx->f, "outline_xy(1, 2) = %mm; outline_xy(2, 2) = 0;\n", ctx->pcb->hidlib.size_x);
+		pcb_fprintf(ctx->f, "outline_xy(1, 3) = %mm; outline_xy(2, 3) = %mm;\n", ctx->pcb->hidlib.size_x, -ctx->pcb->hidlib.size_y);
+		pcb_fprintf(ctx->f, "outline_xy(1, 4) = 0; outline_xy(2, 4) = %mm;\n", -ctx->pcb->hidlib.size_y);
 	}
 
 	/* create all substrate layers using this polygon*/
@@ -604,8 +604,8 @@
 
 	ctx.view.X1 = 0;
 	ctx.view.Y1 = 0;
-	ctx.view.X2 = PCB->MaxWidth;
-	ctx.view.Y2 = PCB->MaxHeight;
+	ctx.view.X2 = PCB->hidlib.size_x;
+	ctx.view.Y2 = PCB->hidlib.size_y;
 
 	f = the_file;
 
Index: mesh.c
===================================================================
--- mesh.c	(revision 24882)
+++ mesh.c	(revision 24883)
@@ -560,7 +560,7 @@
 
 	r = vtr0_alloc_append(&mesh->line[dir].dens, 1);
 	r->begin = mesh->line[dir].dens.array[vtr0_len(&mesh->line[dir].dens)-2].end;
-	r->end = (dir == PCB_MESH_HORIZONTAL) ? PCB->MaxHeight : PCB->MaxWidth;
+	r->end = (dir == PCB_MESH_HORIZONTAL) ? PCB->hidlib.size_y : PCB->hidlib.size_x;
 	r->data[0].c = mesh->dens_gap;
 
 
@@ -728,7 +728,7 @@
 	mesh_trace("\n");
 
 	mesh_trace("%s result:\n", dir == PCB_MESH_HORIZONTAL ? "horizontal" : "vertical");
-	end = (dir == PCB_MESH_HORIZONTAL) ? PCB->MaxWidth : PCB->MaxHeight;
+	end = (dir == PCB_MESH_HORIZONTAL) ? PCB->hidlib.size_x : PCB->hidlib.size_y;
 	for(n = 0; n < vtc0_len(&mesh->line[dir].result); n++) {
 		mesh_trace(" %mm", mesh->line[dir].result.array[n]);
 		mesh_draw_line(mesh, dir, mesh->line[dir].result.array[n], 0, end, PCB_MM_TO_COORD(0.03));
@@ -742,9 +742,9 @@
 {
 	int n;
 	pcb_layergrp_id_t gid;
-	pcb_coord_t x0 = PCB->MaxWidth/15, y0 = PCB->MaxHeight/3, y = y0, y2;
-	pcb_coord_t xl = PCB->MaxWidth/5; /* board left */
-	pcb_coord_t xr = PCB->MaxWidth/5*3; /* board right */
+	pcb_coord_t x0 = PCB->hidlib.size_x/15, y0 = PCB->hidlib.size_y/3, y = y0, y2;
+	pcb_coord_t xl = PCB->hidlib.size_x/5; /* board left */
+	pcb_coord_t xr = PCB->hidlib.size_x/5*3; /* board right */
 	pcb_coord_t spen = PCB_MM_TO_COORD(0.3), cpen = PCB_MM_TO_COORD(0.2), mpen = PCB_MM_TO_COORD(0.03);
 	int mag = 2;
 
@@ -770,7 +770,7 @@
 	for(n = 0; n < vtc0_len(&mesh->line[PCB_MESH_Z].result); n++) {
 		pcb_coord_t y = y0+mesh->line[PCB_MESH_Z].result.array[n]*mag;
 		mesh_trace(" %mm", y);
-		pcb_line_new(mesh->ui_layer_z, 0, y, PCB->MaxWidth, y, mpen, 0, pcb_no_flags());
+		pcb_line_new(mesh->ui_layer_z, 0, y, PCB->hidlib.size_x, y, mpen, 0, pcb_no_flags());
 	}
 	mesh_trace("\n");
 	return 0;
@@ -892,7 +892,7 @@
 	/* right edge, after the last known line */
 	if (!mesh->noimpl) {
 		c1 = mesh->line[dir].edge.array[vtc0_len(&mesh->line[dir].edge)-1];
-		c2 = (dir == PCB_MESH_HORIZONTAL) ? PCB->MaxHeight : PCB->MaxWidth;
+		c2 = (dir == PCB_MESH_HORIZONTAL) ? PCB->hidlib.size_y : PCB->hidlib.size_x;
 		mesh_find_range(&mesh->line[dir].dens, (c1+c2)/2, &d, &d1, &d2);
 		if (mesh->smooth)
 			mesh_auto_add_smooth(&mesh->line[dir].result, c1, c2, d1, d, d2);