Index: conf/Makefile
===================================================================
--- conf/Makefile	(revision 34100)
+++ conf/Makefile	(revision 34101)
@@ -1,9 +1,12 @@
 ROOT=../..
 include $(ROOT)/Makefile.conf
 
-CFLAGS = $(PCB_RND_C89FLAGS) -I../.. -I../../src_3rd -I../../src $(CFLAGS_LIBRND_FUNGW)
-LDLIBS = -lm $(LDFLAGS_LIBRND_FUNGW)
+LIBRND_ROOT=$(ROOT)/src_3rd/librnd-local
+include $(LIBRND_ROOT)/src/librnd/core/librnd.mak
 
+CFLAGS = $(PCB_RND_C89FLAGS) -I../.. -I../../src_3rd -I../../src $(CFLAGS_LIBRND_FUNGW) $(CFLAGS_LIBRND)
+LDLIBS = -lm $(LDFLAGS_LIBRND_FUNGW) $(LDFLAGS_LIBRND)
+
 LIB_HIDLIB=\
 	../../src_3rd/librnd-local/src/librnd-hid.a \
 	../../src_3rd/librnd-local/src/librnd-3rd.a
Index: conf/conftest.c
===================================================================
--- conf/conftest.c	(revision 34100)
+++ conf/conftest.c	(revision 34101)
@@ -14,7 +14,6 @@
 int global_notify = 0;
 rnd_conf_hid_id_t hid_id;
 const char *hid_cookie = "conftest cookie";
-rnd_hid_t *rnd_gui = NULL;
 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";
@@ -26,10 +25,6 @@
 const char *rnd_conf_sysdir_path = PCBSHAREDIR;
 const char *rnd_conf_sys_path = PCBSHAREDIR "/pcb-conf.lht";
 
-void pcbhl_conf_postproc(void)
-{
-}
-
 const char *pcb_board_get_filename(void)
 {
 	return "dummy_brd.lht";
@@ -40,17 +35,11 @@
 	return "dummy_brd";
 }
 
-int rnd_file_loaded_set_at(const char *catname, const char *name, const char *path, const char *desc)
+void rnd_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot)
 {
-	return 0;
 }
 
-int rnd_file_loaded_del_at(const char *catname, const char *name)
-{
-	return 0;
-}
 
-
 void watch_pre(rnd_conf_native_t *cfg, int idx)
 {
 	printf("watch_pre:  '%s' old value\n", cfg->hash_path);
@@ -351,6 +340,7 @@
 
 	hid_id = rnd_conf_hid_reg(hid_cookie, &global_cbs);
 
+	rnd_file_loaded_init();
 	rnd_conf_init();
 	conf_core_init();
 	rnd_hidlib_conf_init();