Index: file.c
===================================================================
--- file.c	(revision 36979)
+++ file.c	(revision 36980)
@@ -293,7 +293,7 @@
 
 	fputs("\nPCB[", FP);
 	pcb_print_quoted_string(FP, (char *) RND_EMPTY(PCB->hidlib.name));
-	rnd_fprintf(FP, " %[0] %[0]]\n\n", PCB->hidlib.size_x, PCB->hidlib.size_y);
+	rnd_fprintf(FP, " %[0] %[0]]\n\n", PCB->hidlib.dwg.X2, PCB->hidlib.dwg.Y2);
 	rnd_fprintf(FP, "Grid[%[0] %[0] %[0] %d]\n", PCB->hidlib.grid, PCB->hidlib.grid_ox, PCB->hidlib.grid_oy, rnd_conf.editor.draw_grid);
 	rnd_fprintf(FP, "Cursor[%[0] %[0] 1000]\n", pcb_crosshair.X, pcb_crosshair.Y);
 	/* PolyArea should be output in square cmils, no suffix */
@@ -835,8 +835,8 @@
 	pcb_data_bbox(&dbb, yyPCB->Data, rnd_false);
 	pcb_data_normalize_(yyPCB->Data, &dbb);
 	PCB = pcb_save;
-	yyPCB->hidlib.size_x = dbb.X2*2;
-	yyPCB->hidlib.size_y = dbb.Y2*2;
+	yyPCB->hidlib.dwg.X2 = dbb.X2*2;
+	yyPCB->hidlib.dwg.Y2 = 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 36979)
+++ parse_y.c	(revision 36980)
@@ -1981,8 +1981,8 @@
 #line 318 "parse_y.y" /* yacc.c:1652  */
     {
 				yyPCB->hidlib.name = (yyvsp[-1].string);
-				yyPCB->hidlib.size_x = RND_MAX_COORD;
-				yyPCB->hidlib.size_y = RND_MAX_COORD;
+				yyPCB->hidlib.dwg.X2 = RND_MAX_COORD;
+				yyPCB->hidlib.dwg.Y2 = RND_MAX_COORD;
 				old_fmt = 1;
 			}
 #line 1989 "parse_y.c" /* yacc.c:1652  */
@@ -1992,8 +1992,8 @@
 #line 325 "parse_y.y" /* yacc.c:1652  */
     {
 				yyPCB->hidlib.name = (yyvsp[-3].string);
-				yyPCB->hidlib.size_x = OU ((yyvsp[-2].measure));
-				yyPCB->hidlib.size_y = OU ((yyvsp[-1].measure));
+				yyPCB->hidlib.dwg.X2 = OU ((yyvsp[-2].measure));
+				yyPCB->hidlib.dwg.Y2 = OU ((yyvsp[-1].measure));
 				old_fmt = 1;
 			}
 #line 2000 "parse_y.c" /* yacc.c:1652  */
@@ -2003,8 +2003,8 @@
 #line 332 "parse_y.y" /* yacc.c:1652  */
     {
 				yyPCB->hidlib.name = (yyvsp[-3].string);
-				yyPCB->hidlib.size_x = NU ((yyvsp[-2].measure));
-				yyPCB->hidlib.size_y = NU ((yyvsp[-1].measure));
+				yyPCB->hidlib.dwg.X2 = NU ((yyvsp[-2].measure));
+				yyPCB->hidlib.dwg.Y2 = NU ((yyvsp[-1].measure));
 				old_fmt = 0;
 			}
 #line 2011 "parse_y.c" /* yacc.c:1652  */
Index: parse_y.y
===================================================================
--- parse_y.y	(revision 36979)
+++ parse_y.y	(revision 36980)
@@ -317,22 +317,22 @@
 		: T_PCB '(' STRING ')'
 			{
 				yyPCB->hidlib.name = $3;
-				yyPCB->hidlib.size_x = RND_MAX_COORD;
-				yyPCB->hidlib.size_y = RND_MAX_COORD;
+				yyPCB->hidlib.dwg.X2 = RND_MAX_COORD;
+				yyPCB->hidlib.dwg.Y2 = RND_MAX_COORD;
 				old_fmt = 1;
 			}
 		| T_PCB '(' STRING measure measure ')'
 			{
 				yyPCB->hidlib.name = $3;
-				yyPCB->hidlib.size_x = OU ($4);
-				yyPCB->hidlib.size_y = OU ($5);
+				yyPCB->hidlib.dwg.X2 = OU ($4);
+				yyPCB->hidlib.dwg.Y2 = OU ($5);
 				old_fmt = 1;
 			}
 		| T_PCB '[' STRING measure measure ']'
 			{
 				yyPCB->hidlib.name = $3;
-				yyPCB->hidlib.size_x = NU ($4);
-				yyPCB->hidlib.size_y = NU ($5);
+				yyPCB->hidlib.dwg.X2 = NU ($4);
+				yyPCB->hidlib.dwg.Y2 = NU ($5);
 				old_fmt = 0;
 			}
 		;