Index: trunk/src/font.c
===================================================================
--- trunk/src/font.c	(revision 30967)
+++ trunk/src/font.c	(revision 30968)
@@ -89,7 +89,7 @@
 {
 	int res = pcb_parse_font(ptr, filename);
 	if (res == 0)
-		pcb_file_loaded_set_at("font", "default", filename, "original default font");
+		rnd_file_loaded_set_at("font", "default", filename, "original default font");
 	return res;
 }
 
@@ -109,7 +109,7 @@
 		s = rnd_conf_concat_strlist(&conf_core.rc.default_font_file, &buff, NULL, ':');
 		rnd_message(RND_MSG_WARNING, "Can't find font-symbol-file. Searched: '%s'; falling back to the embedded default font\n", s);
 		pcb_font_load_internal(&pcb->fontkit.dflt);
-		pcb_file_loaded_set_at("font", "default", "<internal>", "original default font");
+		rnd_file_loaded_set_at("font", "default", "<internal>", "original default font");
 		gds_uninit(&buff);
 	}
 }
Index: trunk/src/librnd/core/conf.c
===================================================================
--- trunk/src/librnd/core/conf.c	(revision 30967)
+++ trunk/src/librnd/core/conf.c	(revision 30968)
@@ -174,7 +174,7 @@
 		lht_dom_uninit(pcb_conf_main_root[role]);
 		pcb_conf_main_root[role] = NULL;
 		if (role_name != NULL)
-			pcb_file_loaded_del_at(flcat, role_name);
+			rnd_file_loaded_del_at(flcat, role_name);
 	}
 	if (fn_is_text) {
 		d = pcb_hid_cfg_load_str(fn);
@@ -208,7 +208,7 @@
 		d->root = prjroot;
 		pcb_conf_main_root[role] = d;
 		if (role_name != NULL)
-			pcb_file_loaded_set_at(flcat, role_name, ifn, "project/conf");
+			rnd_file_loaded_set_at(flcat, role_name, ifn, "project/conf");
 		return 0;
 	}
 
@@ -215,7 +215,7 @@
 	if ((d->root->type == LHT_LIST) && (strcmp(d->root->name, "pcb-rnd-conf-v1") == 0)) {
 		pcb_conf_main_root[role] = d;
 		if (role_name != NULL)
-			pcb_file_loaded_set_at(flcat, role_name, ifn, "conf");
+			rnd_file_loaded_set_at(flcat, role_name, ifn, "conf");
 		return 0;
 	}
 
@@ -224,7 +224,7 @@
 		confroot = lht_tree_path_(d, d->root, "pcb-rnd-conf-v1", 1, 0, NULL);
 
 		if (role_name != NULL)
-			pcb_file_loaded_set_at(flcat, role_name, ifn, "project/conf");
+			rnd_file_loaded_set_at(flcat, role_name, ifn, "project/conf");
 
 		if ((confroot != NULL)  && (confroot->type == LHT_LIST) && (strcmp(confroot->name, "li:pcb-rnd-conf-v1") == 0)) {
 			pcb_conf_main_root[role] = d;
@@ -292,7 +292,7 @@
 				if (res) {
 					char id[256];
 					pcb_snprintf(id, sizeof(id), "%s:%s", rnd_conf_role_name(role), fn);
-					pcb_file_loaded_set_at("conf/plugin", id, path, NULL);
+					rnd_file_loaded_set_at("conf/plugin", id, path, NULL);
 				}
 				cnt += res;
 			}
Index: trunk/src/librnd/core/file_loaded.c
===================================================================
--- trunk/src/librnd/core/file_loaded.c	(revision 30967)
+++ trunk/src/librnd/core/file_loaded.c	(revision 30968)
@@ -32,23 +32,23 @@
 #include <librnd/core/file_loaded.h>
 #include <librnd/core/compat_misc.h>
 
-htsp_t pcb_file_loaded;
+htsp_t rnd_file_loaded;
 
-pcb_file_loaded_t *pcb_file_loaded_category(const char *name, int alloc)
+rnd_file_loaded_t *rnd_file_loaded_category(const char *name, int alloc)
 {
-	pcb_file_loaded_t *cat = htsp_get(&pcb_file_loaded, name);
+	rnd_file_loaded_t *cat = htsp_get(&rnd_file_loaded, name);
 
 	if ((cat == NULL) && (alloc)) {
-		cat = calloc(sizeof(pcb_file_loaded_t), 1);
-		cat->type = PCB_FLT_CATEGORY;
+		cat = calloc(sizeof(rnd_file_loaded_t), 1);
+		cat->type = RND_FLT_CATEGORY;
 		cat->name = rnd_strdup(name);
 		htsp_init(&cat->data.category.children, strhash, strkeyeq);
-		htsp_set(&pcb_file_loaded, cat->name, cat);
+		htsp_set(&rnd_file_loaded, cat->name, cat);
 	}
 	return cat;
 }
 
-int pcb_file_loaded_file_free(pcb_file_loaded_t *file)
+int pcb_file_loaded_file_free(rnd_file_loaded_t *file)
 {
 	free(file->data.file.path);
 	free(file->data.file.desc);
@@ -57,11 +57,11 @@
 	return 0;
 }
 
-int pcb_file_loaded_clear(pcb_file_loaded_t *cat)
+int rnd_file_loaded_clear(rnd_file_loaded_t *cat)
 {
 	htsp_entry_t *e;
 
-	assert(cat->type == PCB_FLT_CATEGORY);
+	assert(cat->type == RND_FLT_CATEGORY);
 
 	for (e = htsp_first(&cat->data.category.children); e; e = htsp_next(&cat->data.category.children, e)) {
 		pcb_file_loaded_file_free(e->value);
@@ -70,19 +70,19 @@
 	return 0;
 }
 
-int pcb_file_loaded_clear_at(const char *catname)
+int rnd_file_loaded_clear_at(const char *catname)
 {
-	pcb_file_loaded_t *cat = pcb_file_loaded_category(catname, 0);
+	rnd_file_loaded_t *cat = rnd_file_loaded_category(catname, 0);
 	if (cat != NULL)
-		return pcb_file_loaded_clear(cat);
+		return rnd_file_loaded_clear(cat);
 	return 0;
 }
 
-int pcb_file_loaded_set(pcb_file_loaded_t *cat, const char *name, const char *path, const char *desc)
+int rnd_file_loaded_set(rnd_file_loaded_t *cat, const char *name, const char *path, const char *desc)
 {
-	pcb_file_loaded_t *file;
+	rnd_file_loaded_t *file;
 
-	assert(cat->type == PCB_FLT_CATEGORY);
+	assert(cat->type == RND_FLT_CATEGORY);
 	file = htsp_get(&cat->data.category.children, name);
 	if (file != NULL) {
 		free(file->data.file.path);
@@ -89,8 +89,8 @@
 		free(file->data.file.desc);
 	}
 	else {
-		file = malloc(sizeof(pcb_file_loaded_t));
-		file->type = PCB_FLT_FILE;
+		file = malloc(sizeof(rnd_file_loaded_t));
+		file->type = RND_FLT_FILE;
 		file->name = rnd_strdup(name);
 		htsp_set(&cat->data.category.children, file->name, file);
 	}
@@ -106,19 +106,19 @@
 	return 0;
 }
 
-int pcb_file_loaded_set_at(const char *catnam, const char *name, const char *path, const char *desc)
+int rnd_file_loaded_set_at(const char *catnam, const char *name, const char *path, const char *desc)
 {
-	pcb_file_loaded_t *cat = pcb_file_loaded_category(catnam, 1);
-	return pcb_file_loaded_set(cat, name, path, desc);
+	rnd_file_loaded_t *cat = rnd_file_loaded_category(catnam, 1);
+	return rnd_file_loaded_set(cat, name, path, desc);
 }
 
-int pcb_file_loaded_del(pcb_file_loaded_t *cat, const char *name)
+int rnd_file_loaded_del(rnd_file_loaded_t *cat, const char *name)
 {
-	pcb_file_loaded_t *file;
-	assert(cat->type == PCB_FLT_CATEGORY);
+	rnd_file_loaded_t *file;
+	assert(cat->type == RND_FLT_CATEGORY);
 	file = htsp_pop(&cat->data.category.children, name);
 	if (file != NULL) {
-		if (file->type != PCB_FLT_FILE)
+		if (file->type != RND_FLT_FILE)
 			return -1;
 		pcb_file_loaded_file_free(file);
 	}
@@ -125,31 +125,31 @@
 	return 0;
 }
 
-int pcb_file_loaded_del_at(const char *catname, const char *name)
+int rnd_file_loaded_del_at(const char *catname, const char *name)
 {
-	pcb_file_loaded_t *cat = pcb_file_loaded_category(catname, 1);
-	return pcb_file_loaded_del(cat, name);
+	rnd_file_loaded_t *cat = rnd_file_loaded_category(catname, 1);
+	return rnd_file_loaded_del(cat, name);
 }
 
-void pcb_file_loaded_init(void)
+void rnd_file_loaded_init(void)
 {
-	htsp_init(&pcb_file_loaded, strhash, strkeyeq);
+	htsp_init(&rnd_file_loaded, strhash, strkeyeq);
 }
 
-void pcb_file_loaded_uninit(void)
+void rnd_file_loaded_uninit(void)
 {
 	htsp_entry_t *e;
 
-	for (e = htsp_first(&pcb_file_loaded); e; e = htsp_next(&pcb_file_loaded, e)) {
-		pcb_file_loaded_t *cat = e->value;
-		pcb_file_loaded_clear(cat);
+	for (e = htsp_first(&rnd_file_loaded); e; e = htsp_next(&rnd_file_loaded, e)) {
+		rnd_file_loaded_t *cat = e->value;
+		rnd_file_loaded_clear(cat);
 		free(cat->name);
 		htsp_uninit(&cat->data.category.children);
 		free(cat);
-		htsp_delentry(&pcb_file_loaded, e);
+		htsp_delentry(&rnd_file_loaded, e);
 	}
 
-	htsp_uninit(&pcb_file_loaded);
+	htsp_uninit(&rnd_file_loaded);
 }
 
 
Index: trunk/src/librnd/core/file_loaded.h
===================================================================
--- trunk/src/librnd/core/file_loaded.h	(revision 30967)
+++ trunk/src/librnd/core/file_loaded.h	(revision 30968)
@@ -28,23 +28,23 @@
 
 /* info on where files are loaded from */
 
-#ifndef PCB_FILE_LOADED_H
-#define PCB_FILE_LOADED_H
+#ifndef RND_FILE_LOADED_H
+#define RND_FILE_LOADED_H
 
 #include <genht/htsp.h>
 
 /* Hash-in-hash tree with the top tree being categories. */
 
-typedef enum pcb_file_loaded_type_e {
-	PCB_FLT_CATEGORY,
-	PCB_FLT_FILE
-} pcb_file_loaded_type_t;
+typedef enum rnd_file_loaded_type_e {
+	RND_FLT_CATEGORY,
+	RND_FLT_FILE
+} rnd_file_loaded_type_t;
 
-typedef struct pcb_file_loaded_s pcb_file_loaded_t;
+typedef struct rnd_file_loaded_s rnd_file_loaded_t;
 
-struct pcb_file_loaded_s {
+struct rnd_file_loaded_s {
 	char *name; /* same as the hash key; strdup'd */
-	pcb_file_loaded_type_t type;
+	rnd_file_loaded_type_t type;
 	union {
 		struct {
 			htsp_t children;
@@ -56,27 +56,27 @@
 	} data;
 };
 
-extern htsp_t pcb_file_loaded;
+extern htsp_t rnd_file_loaded;
 
 /* Return the category called name; if doesn't exist and alloc is 1,
    allocate it it (else return NULL) */
-pcb_file_loaded_t *pcb_file_loaded_category(const char *name, int alloc);
+rnd_file_loaded_t *rnd_file_loaded_category(const char *name, int alloc);
 
 /* clear the subtree of a category, keeping the category; return 0 on success */
-int pcb_file_loaded_clear(pcb_file_loaded_t *cat);
-int pcb_file_loaded_clear_at(const char *catname);
+int rnd_file_loaded_clear(rnd_file_loaded_t *cat);
+int rnd_file_loaded_clear_at(const char *catname);
 
 /* clear the subtree of a category, keeping the category; return 0 on success */
-int pcb_file_loaded_set(pcb_file_loaded_t *cat, const char *name, const char *path, const char *desc);
-int pcb_file_loaded_set_at(const char *catname, const char *name, const char *path, const char *desc);
+int rnd_file_loaded_set(rnd_file_loaded_t *cat, const char *name, const char *path, const char *desc);
+int rnd_file_loaded_set_at(const char *catname, const char *name, const char *path, const char *desc);
 
 /* remove an entry */
-int pcb_file_loaded_del(pcb_file_loaded_t *cat, const char *name);
-int pcb_file_loaded_del_at(const char *catname, const char *name);
+int rnd_file_loaded_del(rnd_file_loaded_t *cat, const char *name);
+int rnd_file_loaded_del_at(const char *catname, const char *name);
 
 
 /* called once, from main */
-void pcb_file_loaded_init(void);
-void pcb_file_loaded_uninit(void);
+void rnd_file_loaded_init(void);
+void rnd_file_loaded_uninit(void);
 
 #endif
Index: trunk/src/librnd/core/hid_cfg.c
===================================================================
--- trunk/src/librnd/core/hid_cfg.c	(revision 30967)
+++ trunk/src/librnd/core/hid_cfg.c	(revision 30968)
@@ -156,7 +156,7 @@
 				sprintf(end, pcbhl_menu_name_fmt, fn);
 				doc = pcb_hid_cfg_load_lht(hidlib, *p);
 				if (doc != NULL)
-					pcb_file_loaded_set_at("menu", "HID main", *p, "main menu system");
+					rnd_file_loaded_set_at("menu", "HID main", *p, "main menu system");
 			}
 			free(*p);
 		}
@@ -167,7 +167,7 @@
 
 	if (doc == NULL) {
 		doc = pcb_hid_cfg_load_str(embedded_fallback);
-		pcb_file_loaded_set_at("menu", "HID main", "<internal>", "main menu system");
+		rnd_file_loaded_set_at("menu", "HID main", "<internal>", "main menu system");
 	}
 	if (doc == NULL)
 		return NULL;
Index: trunk/src/librnd/core/hid_init.c
===================================================================
--- trunk/src/librnd/core/hid_init.c	(revision 30967)
+++ trunk/src/librnd/core/hid_init.c	(revision 30968)
@@ -305,7 +305,7 @@
 void pcb_hidlib_init1(void (*conf_core_init)(void))
 {
 	pcb_events_init();
-	pcb_file_loaded_init();
+	rnd_file_loaded_init();
 	rnd_conf_init();
 	conf_core_init();
 	pcbhl_conf_postproc();
Index: trunk/src/librnd/core/main_act.c
===================================================================
--- trunk/src/librnd/core/main_act.c	(revision 30967)
+++ trunk/src/librnd/core/main_act.c	(revision 30968)
@@ -64,12 +64,12 @@
 
 static const char pcb_acts_PrintFiles[] = "PrintFiles()";
 static const char pcb_acth_PrintFiles[] = "Print files currently loaded.";
-static void print_cat(pcb_file_loaded_t *cat)
+static void print_cat(rnd_file_loaded_t *cat)
 {
 	htsp_entry_t *e;
 	printf("%s\n", cat->name);
 	for (e = htsp_first(&cat->data.category.children); e; e = htsp_next(&cat->data.category.children, e)) {
-		pcb_file_loaded_t *file = e->value;
+		rnd_file_loaded_t *file = e->value;
 		printf(" %s\t%s\t%s\n", file->name, file->data.file.path, file->data.file.desc);
 	}
 }
@@ -77,7 +77,7 @@
 {
 	htsp_entry_t *e;
 	printf("# Data files loaded\n");
-	for (e = htsp_first(&pcb_file_loaded); e; e = htsp_next(&pcb_file_loaded, e))
+	for (e = htsp_first(&rnd_file_loaded); e; e = htsp_next(&rnd_file_loaded, e))
 		print_cat(e->value);
 	RND_ACT_IRES(0);
 	return 0;
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 30967)
+++ trunk/src/librnd/pcb_compat.h	(revision 30968)
@@ -432,3 +432,19 @@
 #define PCB_EVENT_BOARD_CHANGED           RND_EVENT_BOARD_CHANGED
 #define PCB_EVENT_BOARD_META_CHANGED      RND_EVENT_BOARD_META_CHANGED
 #define PCB_EVENT_BOARD_FN_CHANGED        RND_EVENT_BOARD_FN_CHANGED
+#define PCB_FLT_FILE RND_FLT_FILE
+#define pcb_file_loaded_s rnd_file_loaded_s
+#define pcb_file_loaded_t rnd_file_loaded_t
+#define pcb_file_loaded rnd_file_loaded
+#define pcb_file_loaded_category rnd_file_loaded_category
+#define pcb_file_loaded_clear rnd_file_loaded_clear
+#define pcb_file_loaded_clear_at rnd_file_loaded_clear_at
+#define pcb_file_loaded_set rnd_file_loaded_set
+#define pcb_file_loaded_set_at rnd_file_loaded_set_at
+#define pcb_file_loaded_del rnd_file_loaded_del
+#define pcb_file_loaded_del_at rnd_file_loaded_del_at
+#define pcb_file_loaded_init rnd_file_loaded_init
+#define pcb_file_loaded_uninit rnd_file_loaded_uninit
+#define pcb_file_loaded_type_t rnd_file_loaded_type_t
+#define pcb_file_loaded_type_e rnd_file_loaded_type_e
+#define PCB_FLT_CATEGORY RND_FLT_CATEGORY
Index: trunk/src/main.c
===================================================================
--- trunk/src/main.c	(revision 30967)
+++ trunk/src/main.c	(revision 30968)
@@ -348,7 +348,7 @@
 	pcb_hidlib_uninit(); /* plugin unload */
 
 	pcb_funchash_uninit();
-	pcb_file_loaded_uninit();
+	rnd_file_loaded_uninit();
 	pcb_uilayer_uninit();
 	rnd_cli_uninit();
 	pcb_dynflag_uninit();
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 30967)
+++ trunk/src/plug_io.c	(revision 30968)
@@ -729,7 +729,7 @@
 {
 	int res = real_load_pcb(file, fmt, pcb_false, require_font, how);
 	if (res == 0) {
-		pcb_file_loaded_set_at("design", "main", file, PCB->is_footprint ? "footprint" : "board");
+		rnd_file_loaded_set_at("design", "main", file, PCB->is_footprint ? "footprint" : "board");
 		if (PCB->is_footprint) {
 			rnd_box_t b;
 			/* a footprint has no board size set, need to invent one */
Index: trunk/src_plugins/dialogs/dlg_about.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_about.c	(revision 30967)
+++ trunk/src_plugins/dialogs/dlg_about.c	(revision 30968)
@@ -79,13 +79,13 @@
 			PCB_DAD_BEGIN_VBOX(about_ctx.dlg);
 				PCB_DAD_COMPFLAG(about_ctx.dlg, PCB_HATF_SCROLL);
 				gds_init(&s);
-				for (e = htsp_first(&pcb_file_loaded); e; e = htsp_next(&pcb_file_loaded, e)) {
+				for (e = htsp_first(&rnd_file_loaded); e; e = htsp_next(&rnd_file_loaded, e)) {
 					htsp_entry_t *e2;
-					pcb_file_loaded_t *cat = e->value;
+					rnd_file_loaded_t *cat = e->value;
 					PCB_DAD_LABEL(about_ctx.dlg, cat->name);
 					gds_truncate(&s, 0);
 					for (e2 = htsp_first(&cat->data.category.children); e2; e2 = htsp_next(&cat->data.category.children, e2)) {
-						pcb_file_loaded_t *file = e2->value;
+						rnd_file_loaded_t *file = e2->value;
 						pcb_append_printf(&s, "  %s\t%s\t%s\n", file->name, file->data.file.path, file->data.file.desc);
 					}
 					PCB_DAD_LABEL(about_ctx.dlg, s.array);
Index: trunk/tests/conf/conftest.c
===================================================================
--- trunk/tests/conf/conftest.c	(revision 30967)
+++ trunk/tests/conf/conftest.c	(revision 30968)
@@ -39,12 +39,12 @@
 	return "dummy_brd";
 }
 
-int pcb_file_loaded_set_at(const char *catname, const char *name, const char *path, const char *desc)
+int rnd_file_loaded_set_at(const char *catname, const char *name, const char *path, const char *desc)
 {
 	return 0;
 }
 
-int pcb_file_loaded_del_at(const char *catname, const char *name)
+int rnd_file_loaded_del_at(const char *catname, const char *name)
 {
 	return 0;
 }
Index: trunk/util/gsch2pcb-rnd/gsch2pcb.c
===================================================================
--- trunk/util/gsch2pcb-rnd/gsch2pcb.c	(revision 30967)
+++ trunk/util/gsch2pcb-rnd/gsch2pcb.c	(revision 30968)
@@ -398,7 +398,7 @@
 	pcbhl_menu_file_paths[2] = pcb_concat(PCBCONFDIR, "/", NULL);
 	pcbhl_menu_file_paths[3] = NULL;
 
-	pcb_file_loaded_init();
+	rnd_file_loaded_init();
 	rnd_conf_init();
 	conf_core_init();
 	pcb_hidlib_conf_init();