Index: read.c
===================================================================
--- read.c	(revision 24881)
+++ read.c	(revision 24882)
@@ -410,9 +410,9 @@
 
 	grp = lht_dom_hash_get(nd, "grid");
 	if ((grp != NULL) && (grp->type == LHT_HASH)) {
-		err |= parse_coord(&pcb->GridOffsetX, hash_get(grp, "offs_x", 1));
-		err |= parse_coord(&pcb->GridOffsetY, hash_get(grp, "offs_y", 1));
-		err |= parse_coord(&pcb->Grid, hash_get(grp, "spacing", 1));
+		err |= parse_coord(&pcb->hidlib.grid_ox, hash_get(grp, "offs_x", 1));
+		err |= parse_coord(&pcb->hidlib.grid_oy, hash_get(grp, "offs_y", 1));
+		err |= parse_coord(&pcb->hidlib.grid, hash_get(grp, "spacing", 1));
 		if (err != 0)
 			return -1;
 	}
Index: write.c
===================================================================
--- write.c	(revision 24881)
+++ write.c	(revision 24882)
@@ -139,9 +139,9 @@
 
 	grp = lht_dom_node_alloc(LHT_HASH, "grid");
 	lht_dom_hash_put(meta, grp);
-	lht_dom_hash_put(grp, build_textf("offs_x", CFMT, pcb->GridOffsetX));
-	lht_dom_hash_put(grp, build_textf("offs_y", CFMT, pcb->GridOffsetY));
-	lht_dom_hash_put(grp, build_textf("spacing", CFMT, pcb->Grid));
+	lht_dom_hash_put(grp, build_textf("offs_x", CFMT, pcb->hidlib.grid_ox));
+	lht_dom_hash_put(grp, build_textf("offs_y", CFMT, pcb->hidlib.grid_oy));
+	lht_dom_hash_put(grp, build_textf("spacing", CFMT, pcb->hidlib.grid));
 
 	grp = lht_dom_node_alloc(LHT_HASH, "size");
 	lht_dom_hash_put(meta, grp);