Index: librnd/glue.c
===================================================================
--- librnd/glue.c	(revision 32770)
+++ librnd/glue.c	(revision 32771)
@@ -1,21 +1,5 @@
 /*** hidlib glue ***/
-TODO
-const char *rnd_hidlib_default_embedded_menu = "";
-const char *rnd_menu_file_paths[] = { "./", NULL };
-const char *rnd_menu_name_fmt = "menu.lht";
 
-const char *rnd_conf_userdir_path = "./";
-const char *rnd_conf_user_path = "./conf.lht";
-
-/* hack for running from ./ without internal version of the conf */
-const char *rnd_conf_sysdir_path = "./";
-const char *rnd_conf_sys_path = "./conf.lht";
-
-const char *rnd_app_package = "librnd_test";
-const char *rnd_app_version = "0.0.0";
-const char *rnd_app_url = "n/a";
-
-
 typedef struct design_s {
 	rnd_hidlib_t hidlib; /* shall be the first */
 } design_t;
Index: librnd/librnd_includes.c
===================================================================
--- librnd/librnd_includes.c	(revision 32770)
+++ librnd/librnd_includes.c	(revision 32771)
@@ -1,3 +1,5 @@
+#define RND_APP_PREFIX(x)  rndtest_ ## x
+
 /* header integrity test: nothing should be included from src/ that is
    not part of librnd */
 #include "inc_all.h"
Index: librnd/librnd_test.c
===================================================================
--- librnd/librnd_test.c	(revision 32770)
+++ librnd/librnd_test.c	(revision 32771)
@@ -1,3 +1,5 @@
+#define RND_APP_PREFIX(x)  rndtest_ ## x
+
 #include <librnd/core/unit.h>
 #include <librnd/core/hid_init.h>
 #include <librnd/core/hid.h>