Index: read.c
===================================================================
--- read.c	(revision 30945)
+++ read.c	(revision 30946)
@@ -383,7 +383,7 @@
 	if (parse_coord(&tmp, nd) != 0)
 		return -1;
 
-	if (cfg_dest != CFR_invalid)
+	if (cfg_dest != RND_CFR_invalid)
 		pcb_conf_set(cfg_dest, path, -1, nd->data.text.value, RND_POL_OVERWRITE);
 	return 0;
 }
@@ -2215,7 +2215,7 @@
 
 static void parse_conf(pcb_board_t *pcb, lht_node_t *sub)
 {
-	if (cfg_dest == CFR_invalid)
+	if (cfg_dest == RND_CFR_invalid)
 		return;
 	if (pcb_conf_insert_tree_as(cfg_dest, sub) != 0)
 		rnd_message(PCB_MSG_ERROR, "Failed to insert the config subtree '%s' found in %s\n", sub->name, pcb->hidlib.filename);
@@ -2394,7 +2394,7 @@
 	char *errmsg = NULL, *realfn;
 	lht_doc_t *doc = NULL;
 
-	cfg_dest = CFR_invalid;
+	cfg_dest = RND_CFR_invalid;
 
 	realfn = pcb_fopen_check(NULL, filename, "r");
 	if (realfn != NULL)
@@ -2527,7 +2527,7 @@
 	FILE *f;
 	pcb_subc_t *sc;
 
-	cfg_dest = CFR_invalid;
+	cfg_dest = RND_CFR_invalid;
 
 	f = pcb_fp_fopen(&conf_core.rc.library_search_paths, name, &st, NULL);
 
Index: write.c
===================================================================
--- write.c	(revision 30945)
+++ write.c	(revision 30946)
@@ -1394,7 +1394,7 @@
 	return nls;
 }
 
-extern lht_doc_t *pcb_conf_main_root[CFR_max_alloc];
+extern lht_doc_t *pcb_conf_main_root[RND_CFR_max_alloc];
 static lht_node_t *build_conf()
 {
 	const char **s, *del_paths[] = { "editor/mode", NULL };
@@ -1403,10 +1403,10 @@
 	if (conf_io_lihata.plugins.io_lihata.omit_config)
 		return dummy_node("pcb-rnd-conf-v1");
 
-	if ((pcb_conf_main_root[CFR_DESIGN] == NULL) || (pcb_conf_main_root[CFR_DESIGN]->root == NULL) || (pcb_conf_main_root[CFR_DESIGN]->root->type != LHT_LIST))
+	if ((pcb_conf_main_root[RND_CFR_DESIGN] == NULL) || (pcb_conf_main_root[RND_CFR_DESIGN]->root == NULL) || (pcb_conf_main_root[RND_CFR_DESIGN]->root->type != LHT_LIST))
 		return lht_dom_node_alloc(LHT_LIST, "pcb-rnd-conf-v1");
 
-	res = lht_dom_duptree(pcb_conf_main_root[CFR_DESIGN]->root);
+	res = lht_dom_duptree(pcb_conf_main_root[RND_CFR_DESIGN]->root);
 
 	for(n = res->data.list.first; n != NULL; n = n->next) {
 		for(s = del_paths; *s != NULL; s++) {
@@ -1791,13 +1791,13 @@
 		int omit_styles = !!sub->dlg[save->womit_styles].val.lng;
 
 		if (omit_font != !!conf_io_lihata.plugins.io_lihata.omit_font)
-			pcb_conf_setf(CFR_CLI, "plugins/io_lihata/omit_font", 0, "%d", omit_font);
+			pcb_conf_setf(RND_CFR_CLI, "plugins/io_lihata/omit_font", 0, "%d", omit_font);
 
 		if (omit_config != !!conf_io_lihata.plugins.io_lihata.omit_config)
-			pcb_conf_setf(CFR_CLI, "plugins/io_lihata/omit_config", 0, "%d", omit_config);
+			pcb_conf_setf(RND_CFR_CLI, "plugins/io_lihata/omit_config", 0, "%d", omit_config);
 
 		if (omit_styles != !!conf_io_lihata.plugins.io_lihata.omit_styles)
-			pcb_conf_setf(CFR_CLI, "plugins/io_lihata/omit_styles", 0, "%d", omit_styles);
+			pcb_conf_setf(RND_CFR_CLI, "plugins/io_lihata/omit_styles", 0, "%d", omit_styles);
 	}
 
 	free(save);