Index: file.c
===================================================================
--- file.c	(revision 24882)
+++ file.c	(revision 24883)
@@ -289,7 +289,7 @@
 
 	fputs("\nPCB[", FP);
 	pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB->Name));
-	pcb_fprintf(FP, " %[0] %[0]]\n\n", PCB->MaxWidth, PCB->MaxHeight);
+	pcb_fprintf(FP, " %[0] %[0]]\n\n", PCB->hidlib.size_x, PCB->hidlib.size_y);
 	pcb_fprintf(FP, "Grid[%[0] %[0] %[0] %d]\n", PCB->hidlib.grid, PCB->hidlib.grid_ox, PCB->hidlib.grid_oy, conf_core.editor.draw_grid);
 	pcb_fprintf(FP, "Cursor[%[0] %[0] 1000]\n", pcb_crosshair.X, pcb_crosshair.Y);
 	/* PolyArea should be output in square cmils, no suffix */
@@ -759,8 +759,8 @@
 	pcb_data_bbox(&dbb, yyPCB->Data, pcb_false);
 	pcb_data_normalize_(yyPCB->Data, &dbb);
 	PCB = pcb_save;
-	yyPCB->MaxWidth = dbb.X2*2;
-	yyPCB->MaxHeight = dbb.Y2*2;
+	yyPCB->hidlib.size_x = dbb.X2*2;
+	yyPCB->hidlib.size_y = dbb.Y2*2;
 	yyPCB->is_footprint = 1;
 
 	/* opening a footprint: we don't have a layer stack; make sure top and bottom copper exist */
Index: parse_y.c
===================================================================
--- parse_y.c	(revision 24882)
+++ parse_y.c	(revision 24883)
@@ -1966,8 +1966,8 @@
 #line 305 "parse_y.y" /* yacc.c:1652  */
     {
 				yyPCB->Name = (yyvsp[-1].string);
-				yyPCB->MaxWidth = PCB_MAX_COORD;
-				yyPCB->MaxHeight = PCB_MAX_COORD;
+				yyPCB->hidlib.size_x = PCB_MAX_COORD;
+				yyPCB->hidlib.size_y = PCB_MAX_COORD;
 				old_fmt = 1;
 			}
 #line 1974 "parse_y.c" /* yacc.c:1652  */
@@ -1977,8 +1977,8 @@
 #line 312 "parse_y.y" /* yacc.c:1652  */
     {
 				yyPCB->Name = (yyvsp[-3].string);
-				yyPCB->MaxWidth = OU ((yyvsp[-2].measure));
-				yyPCB->MaxHeight = OU ((yyvsp[-1].measure));
+				yyPCB->hidlib.size_x = OU ((yyvsp[-2].measure));
+				yyPCB->hidlib.size_y = OU ((yyvsp[-1].measure));
 				old_fmt = 1;
 			}
 #line 1985 "parse_y.c" /* yacc.c:1652  */
@@ -1988,8 +1988,8 @@
 #line 319 "parse_y.y" /* yacc.c:1652  */
     {
 				yyPCB->Name = (yyvsp[-3].string);
-				yyPCB->MaxWidth = NU ((yyvsp[-2].measure));
-				yyPCB->MaxHeight = NU ((yyvsp[-1].measure));
+				yyPCB->hidlib.size_x = NU ((yyvsp[-2].measure));
+				yyPCB->hidlib.size_y = NU ((yyvsp[-1].measure));
 				old_fmt = 0;
 			}
 #line 1996 "parse_y.c" /* yacc.c:1652  */
Index: parse_y.y
===================================================================
--- parse_y.y	(revision 24882)
+++ parse_y.y	(revision 24883)
@@ -304,22 +304,22 @@
 		: T_PCB '(' STRING ')'
 			{
 				yyPCB->Name = $3;
-				yyPCB->MaxWidth = PCB_MAX_COORD;
-				yyPCB->MaxHeight = PCB_MAX_COORD;
+				yyPCB->hidlib.size_x = PCB_MAX_COORD;
+				yyPCB->hidlib.size_y = PCB_MAX_COORD;
 				old_fmt = 1;
 			}
 		| T_PCB '(' STRING measure measure ')'
 			{
 				yyPCB->Name = $3;
-				yyPCB->MaxWidth = OU ($4);
-				yyPCB->MaxHeight = OU ($5);
+				yyPCB->hidlib.size_x = OU ($4);
+				yyPCB->hidlib.size_y = OU ($5);
 				old_fmt = 1;
 			}
 		| T_PCB '[' STRING measure measure ']'
 			{
 				yyPCB->Name = $3;
-				yyPCB->MaxWidth = NU ($4);
-				yyPCB->MaxHeight = NU ($5);
+				yyPCB->hidlib.size_x = NU ($4);
+				yyPCB->hidlib.size_y = NU ($5);
 				old_fmt = 0;
 			}
 		;