Index: trunk/src/main.c
===================================================================
--- trunk/src/main.c	(revision 34758)
+++ trunk/src/main.c	(revision 34759)
@@ -90,8 +90,6 @@
 static const char *menu_name_fmt = "pcb-menu-%s.lht";
 
 #define CONF_USER_DIR "~/" DOT_PCB_RND
-const char *rnd_conf_userdir_path, *rnd_conf_user_path;
-const char *rnd_conf_sysdir_path, *rnd_conf_sys_path;
 
 /* Figure out the canonical name of the executed program
    and fix up the defaults for various paths; returns exec prefix that
@@ -203,10 +201,10 @@
 	menu_file_paths[2] = rnd_concat(PCBCONFDIR, "/", NULL);
 	menu_file_paths[3] = NULL;
 
-	rnd_conf_userdir_path = CONF_USER_DIR;
-	rnd_conf_user_path = rnd_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL);
-	rnd_conf_sysdir_path = PCBCONFDIR;
-	rnd_conf_sys_path = rnd_concat(PCBCONFDIR, "/pcb-conf.lht", NULL);
+	rnd_app.conf_userdir_path = CONF_USER_DIR;
+	rnd_app.conf_user_path = rnd_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL);
+	rnd_app.conf_sysdir_path = PCBCONFDIR;
+	rnd_app.conf_sys_path = rnd_concat(PCBCONFDIR, "/pcb-conf.lht", NULL);
 
 	free(bindir);
 	return exec_prefix;
@@ -216,8 +214,8 @@
 {
 	/* const for all other parts of the code, but we had to concat (alloc) it above */
 	free((char *)menu_file_paths[2]);
-	free((char *)rnd_conf_user_path);
-	free((char *)rnd_conf_sys_path);
+	free((char *)rnd_app.conf_user_path);
+	free((char *)rnd_app.conf_sys_path);
 }
 
 
Index: trunk/src_plugins/lib_formula/test/glue.c
===================================================================
--- trunk/src_plugins/lib_formula/test/glue.c	(revision 34758)
+++ trunk/src_plugins/lib_formula/test/glue.c	(revision 34759)
@@ -2,6 +2,8 @@
 
 #include <librnd/core/hidlib.h>
 
+TODO
+
 const char *rnd_menu_file_paths[4];
 const char *rnd_menu_name_fmt = "pcb-menu-%s.lht";
 
Index: trunk/tests/conf/conftest.c
===================================================================
--- trunk/tests/conf/conftest.c	(revision 34758)
+++ trunk/tests/conf/conftest.c	(revision 34759)
@@ -14,6 +14,8 @@
 int global_notify = 0;
 rnd_conf_hid_id_t hid_id;
 const char *hid_cookie = "conftest cookie";
+
+TODO
 const char *rnd_hidlib_default_embedded_menu = "";
 const char *rnd_menu_file_paths[] = { "./", "~/.pcb-rnd/", PCBSHAREDIR "/", NULL };
 const char *rnd_menu_name_fmt = "pcb-menu-%s.lht";
Index: trunk/tests/propedit/glue.c
===================================================================
--- trunk/tests/propedit/glue.c	(revision 34758)
+++ trunk/tests/propedit/glue.c	(revision 34759)
@@ -2,6 +2,8 @@
 #include <puplug/libs.h>
 #include <librnd/core/hidlib.h>
 
+TODO
+
 /*** hidlib glue ***/
 
 const char *rnd_hidlib_default_embedded_menu = "";
Index: trunk/util/gsch2pcb-rnd/gsch2pcb.c
===================================================================
--- trunk/util/gsch2pcb-rnd/gsch2pcb.c	(revision 34758)
+++ trunk/util/gsch2pcb-rnd/gsch2pcb.c	(revision 34759)
@@ -56,10 +56,6 @@
 static const char *want_method_default = "import";
 
 #define CONF_USER_DIR "~/" DOT_PCB_RND
-const char *rnd_conf_userdir_path;
-const char *rnd_conf_user_path;
-const char *rnd_conf_sysdir_path;
-const char *rnd_conf_sys_path;
 
 const char *rnd_app_package = "gsch2pcb-rnd";
 
@@ -393,10 +389,10 @@
 
 	method_import_register();
 
-	rnd_conf_userdir_path = CONF_USER_DIR;
-	rnd_conf_user_path = rnd_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL);
-	rnd_conf_sysdir_path = PCBCONFDIR;
-	rnd_conf_sys_path = rnd_concat(PCBCONFDIR, "/pcb-conf.lht", NULL);
+	rnd_app.conf_userdir_path = CONF_USER_DIR;
+	rnd_app.conf_user_path = rnd_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL);
+	rnd_app.conf_sysdir_path = PCBCONFDIR;
+	rnd_app.conf_sys_path = rnd_concat(PCBCONFDIR, "/pcb-conf.lht", NULL);
 
 	rnd_hidlib_init1(gsch2pcb_conf_core_init);