Index: read.c
===================================================================
--- read.c	(revision 36697)
+++ read.c	(revision 36698)
@@ -2175,7 +2175,7 @@
 	pcb_fontkit_reset (fk);
 
 	for(n = lht_dom_first(&it, nd); n != NULL; n = lht_dom_next(&it)) {
-		pcb_font_t *f;
+		rnd_font_t *f;
 
 		if (strcmp(n->name, "geda_pcb") != 0) {
 			char *end;
@@ -2187,12 +2187,12 @@
 				return iolht_error(nd, "Failed to allocate font id %d (name '%s').\n", id, n->name);
 		}
 		else {
-			rnd_font_free(&fk->dflt.rnd_font);
-			fk->dflt.rnd_font.id = 0; /* restore default font's ID */
+			rnd_font_free(&fk->dflt);
+			fk->dflt.id = 0; /* restore default font's ID */
 			f = &fk->dflt;
 		}
 
-		if (rnd_font_lht_parse_font(&f->rnd_font, n) != 0)
+		if (rnd_font_lht_parse_font(f, n) != 0)
 			return -1;
 	}
 
@@ -2776,7 +2776,7 @@
 	return (state == TPS_GOOD);
 }
 
-int io_lihata_parse_font(pcb_plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename)
+int io_lihata_parse_font(pcb_plug_io_t *ctx, rnd_font_t *Ptr, const char *Filename)
 {
 	int res;
 	char *errmsg = NULL, *realfn;
@@ -2801,7 +2801,7 @@
 	}
 	else {
 		TODO("font: remove this whole function and call rnd_font_load(Ptr, Filanem, pcb_io_err_inhibit) instead");
-		res = rnd_font_lht_parse_font(&Ptr->rnd_font, doc->root->data.list.first);
+		res = rnd_font_lht_parse_font(Ptr, doc->root->data.list.first);
 	}
 
 	free(errmsg);
Index: read.h
===================================================================
--- read.h	(revision 36697)
+++ read.h	(revision 36698)
@@ -28,7 +28,7 @@
 
 int io_lihata_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f);
 int io_lihata_parse_pcb(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, rnd_conf_role_t settings_dest);
-int io_lihata_parse_font(pcb_plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename);
+int io_lihata_parse_font(pcb_plug_io_t *ctx, rnd_font_t *Ptr, const char *Filename);
 int io_lihata_parse_subc(pcb_plug_io_t *ctx, pcb_data_t *Ptr, const char *name, const char *subfpname);
 int io_lihata_parse_padstack(pcb_plug_io_t *ctx, pcb_pstk_proto_t *proto, const char *filename);
 int io_lihata_parse_buffer(pcb_plug_io_t *ctx, pcb_buffer_t *buff, const char *filename);
Index: write.c
===================================================================
--- write.c	(revision 36697)
+++ write.c	(revision 36698)
@@ -1514,9 +1514,9 @@
 
 #include "brave.h"
 
-static lht_node_t *build_font(pcb_font_t *font)
+static lht_node_t *build_font(rnd_font_t *font)
 {
-	return build_font_rnd(&font->rnd_font);
+	return build_font_rnd(font);
 }
 
 
@@ -1989,7 +1989,7 @@
 	return io_lihata_write_pcb(ctx, FP, old_filename, new_filename, emergency, 8);
 }
 
-int io_lihata_write_font(pcb_plug_io_t *ctx, pcb_font_t *font, const char *Filename)
+int io_lihata_write_font(pcb_plug_io_t *ctx, rnd_font_t *font, const char *Filename)
 {
 	FILE *f;
 	int res;