Index: read.c
===================================================================
--- read.c	(revision 38522)
+++ read.c	(revision 38523)
@@ -2195,11 +2195,7 @@
 #define HASH_GET(hash, name)        hash_get(hash, name, 0)
 #define RND_LHT_ERROR               iolht_error
 
-#ifdef PCB_WANT_FONT2
-#	include <librnd/font2/font_lht.h>
-#else
-#	include <librnd/font/font_lht.h>
-#endif
+#include <librnd/font2/font_lht.h>
 
 #undef PARSE_COORD
 #undef PARSE_DOUBLE
@@ -2234,12 +2230,10 @@
 			f = &fk->dflt;
 		}
 
-#ifdef PCB_WANT_FONT2
 		if (rctx->rdver >= 9)
 			f->filever = 2;
 		else
 			f->filever = 1;
-#endif
 
 		if (rnd_font_lht_parse_font(f, n) != 0)
 			return -1;
Index: write.c
===================================================================
--- write.c	(revision 38522)
+++ write.c	(revision 38523)
@@ -1439,7 +1439,6 @@
 	lht_dom_hash_put(ndt, build_textf("height", CFMT, g->height));
 	lht_dom_hash_put(ndt, build_textf("delta", CFMT, g->xdelta));
 
-#ifdef PCB_WANT_FONT2
 	if (g->advance_valid) {
 		if (wrver >= 9)
 			lht_dom_hash_put(ndt, build_textf("advance", CFMT, g->advance));
@@ -1446,7 +1445,6 @@
 		else
 			pcb_io_incompat_save(NULL, NULL, "font", "lihata board before v9 did not have font glyph advance", "glyph width and delta are saved; there may be slight variations in glyph spacing (this error should be in the range of nanometers)");
 	}
-#endif
 
 	lst = lht_dom_node_alloc(LHT_LIST, "objects");
 	lht_dom_hash_put(ndt, lst);
@@ -1461,7 +1459,6 @@
 	return ndt;
 }
 
-#ifdef PCB_WANT_FONT2
 static lht_node_t *build_entity_tbl(rnd_font_t *font)
 {
 	lht_node_t *ntbl;
@@ -1506,7 +1503,6 @@
 	gds_uninit(&tmp);
 	return ntbl;
 }
-#endif
 
 static lht_node_t *build_font_rnd(rnd_font_t *font)
 {
@@ -1529,7 +1525,6 @@
 	if (font->name != NULL)
 		lht_dom_hash_put(ndt, build_text("name", font->name));
 
-#ifdef PCB_WANT_FONT2
 	/* font v2 fields, avaliable from lihata board 9 */
 	if (wrver >= 9) {
 		/* fields always saved */
@@ -1575,7 +1570,6 @@
 		if ((font->kerning_tbl_valid) && (font->kerning_tbl.used > 0))
 			pcb_io_incompat_save(NULL, NULL, "font", "lihata board before v9 did not have font kerning table", "Kerning table is lost, inter-glyph spacing will change when rendering this font");
 	}
-#endif
 
 	syms = lht_dom_node_alloc(LHT_HASH, "symbols");
 	lht_dom_hash_put(ndt, syms);