Index: ch_editpoint/ch_editpoint.c
===================================================================
--- ch_editpoint/ch_editpoint.c	(revision 36990)
+++ ch_editpoint/ch_editpoint.c	(revision 36991)
@@ -38,7 +38,7 @@
 #include <librnd/poly/rtree.h>
 #include <librnd/poly/rtree2_compat.h>
 #include <librnd/hid/hid_menu.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "board.h"
 #include "conf_core.h"
 #include "crosshair.h"
Index: ch_onpoint/ch_onpoint.c
===================================================================
--- ch_onpoint/ch_onpoint.c	(revision 36990)
+++ ch_onpoint/ch_onpoint.c	(revision 36991)
@@ -39,7 +39,7 @@
 #include <librnd/hid/tool.h>
 #include <librnd/poly/rtree.h>
 #include <librnd/poly/rtree2_compat.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "tool_logic.h"
 #include "board.h"
 #include "conf_core.h"
Index: ddraft/cli.c
===================================================================
--- ddraft/cli.c	(revision 36990)
+++ ddraft/cli.c	(revision 36991)
@@ -29,7 +29,7 @@
 #include <librnd/hid/hid_inlines.h>
 #include <librnd/core/compat_misc.h>
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #define CLI_MAX_INS_LEN 128
 
Index: dialogs/dlg_loadsave.c
===================================================================
--- dialogs/dlg_loadsave.c	(revision 36990)
+++ dialogs/dlg_loadsave.c	(revision 36991)
@@ -34,7 +34,7 @@
 #include <librnd/hid/hid_dad.h>
 #include <librnd/core/compat_fs.h>
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "plug_io.h"
 #include <librnd/plugins/lib_hid_common/dialogs_conf.h>
 
Index: dialogs/dlg_netlist.c
===================================================================
--- dialogs/dlg_netlist.c	(revision 36990)
+++ dialogs/dlg_netlist.c	(revision 36991)
@@ -27,7 +27,7 @@
 #include "event.h"
 #include "netlist.h"
 #include <genvector/vtp0.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 const char *dlg_netlist_cookie = "netlist dialog";
 
Index: dialogs/dlg_padstack.c
===================================================================
--- dialogs/dlg_padstack.c	(revision 36990)
+++ dialogs/dlg_padstack.c	(revision 36991)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include <librnd/core/actions.h>
 #include <librnd/hid/hid_dad.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "funchash_core.h"
 #include "obj_pstk.h"
 #include "obj_pstk_op.h"
Index: dialogs/dlg_view.c
===================================================================
--- dialogs/dlg_view.c	(revision 36990)
+++ dialogs/dlg_view.c	(revision 36991)
@@ -33,7 +33,7 @@
 #include <librnd/core/actions.h>
 #include "board.h"
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "view.h"
 #include "draw.h"
 #include "drc.h"
Index: djopt/djopt.c
===================================================================
--- djopt/djopt.c	(revision 36990)
+++ djopt/djopt.c	(revision 36991)
@@ -33,7 +33,7 @@
 
 #include "config.h"
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "board.h"
 
 #include <memory.h>
Index: draw_csect/draw_csect.c
===================================================================
--- draw_csect/draw_csect.c	(revision 36990)
+++ draw_csect/draw_csect.c	(revision 36991)
@@ -35,7 +35,7 @@
 #include "stub_draw.h"
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "event.h"
 #include "undo.h"
 #include "layer_vis.h"
Index: draw_fab/draw_fab.c
===================================================================
--- draw_fab/draw_fab.c	(revision 36990)
+++ draw_fab/draw_fab.c	(revision 36991)
@@ -41,7 +41,7 @@
 #include "stub_draw.h"
 #include "draw_fab_conf.h"
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "obj_pstk_inlines.h"
 #include <librnd/hid/hid_inlines.h>
 #include "funchash_core.h"
Index: export_gerber/gerber.c
===================================================================
--- export_gerber/gerber.c	(revision 36990)
+++ export_gerber/gerber.c	(revision 36991)
@@ -34,7 +34,7 @@
 #include <librnd/hid/hid_inlines.h>
 #include <librnd/hid/hid_dad.h>
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/actions.h>
 
 #include "../src_plugins/export_excellon/aperture.h"
Index: export_ipcd356/ipcd356.c
===================================================================
--- export_ipcd356/ipcd356.c	(revision 36990)
+++ export_ipcd356/ipcd356.c	(revision 36991)
@@ -34,7 +34,7 @@
 #include "data.h"
 #include <librnd/core/safe_fs.h>
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/compat_misc.h>
 #include "netlist.h"
 #include <librnd/core/math_helper.h>
Index: export_svg/svg.c
===================================================================
--- export_svg/svg.c	(revision 36990)
+++ export_svg/svg.c	(revision 36991)
@@ -41,7 +41,7 @@
 #include <genvector/gds_char.h>
 
 #include <librnd/core/math_helper.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "board.h"
 #include "data.h"
 #include "draw.h"
Index: export_xy/xy.c
===================================================================
--- export_xy/xy.c	(revision 36990)
+++ export_xy/xy.c	(revision 36991)
@@ -1,6 +1,6 @@
 #include "config.h"
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include <stdio.h>
 #include <stdarg.h>
Index: io_pads/write.c
===================================================================
--- io_pads/write.c	(revision 36990)
+++ io_pads/write.c	(revision 36991)
@@ -34,7 +34,7 @@
 #include <genvector/vti0.h>
 #include <genvector/vtp0.h>
 #include <librnd/core/unit.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/compat_misc.h>
 
 #include "../src_plugins/lib_netmap/map_2nets.h"
Index: io_pcb/file.c
===================================================================
--- io_pcb/file.c	(revision 36990)
+++ io_pcb/file.c	(revision 36991)
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include <locale.h>
 #include <time.h>
Index: lib_hid_pcbui/act.c
===================================================================
--- lib_hid_pcbui/act.c	(revision 36990)
+++ lib_hid_pcbui/act.c	(revision 36991)
@@ -31,7 +31,7 @@
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/conf.h>
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "draw.h"
 #include <librnd/hid/hid.h>
 #include "layer.h"
Index: lib_hid_pcbui/layer_menu.c
===================================================================
--- lib_hid_pcbui/layer_menu.c	(revision 36990)
+++ lib_hid_pcbui/layer_menu.c	(revision 36991)
@@ -30,7 +30,7 @@
 #include "board.h"
 #include "data.h"
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/event.h>
 #include "layer.h"
 #include "layer_ui.h"
Index: lib_hid_pcbui/layersel.c
===================================================================
--- lib_hid_pcbui/layersel.c	(revision 36990)
+++ lib_hid_pcbui/layersel.c	(revision 36991)
@@ -42,7 +42,7 @@
 #include "layer_grp.h"
 #include "layer_ui.h"
 #include "layer_vis.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include "layersel.h"
 
Index: lib_hid_pcbui/status.c
===================================================================
--- lib_hid_pcbui/status.c	(revision 36990)
+++ lib_hid_pcbui/status.c	(revision 36991)
@@ -33,7 +33,7 @@
 #include <librnd/hid/hid_cfg_input.h>
 #include <librnd/hid/hid_dad.h>
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/plugins/lib_hid_common/xpm.h>
 #include "crosshair.h"
 #include "layer.h"
Index: propedit/propsel.c
===================================================================
--- propedit/propsel.c	(revision 36990)
+++ propedit/propsel.c	(revision 36991)
@@ -40,7 +40,7 @@
 #include "obj_pstk_inlines.h"
 #include <librnd/core/rnd_printf.h>
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "netlist.h"
 
 #include "obj_line_op.h"
Index: query/dlg_search.c
===================================================================
--- query/dlg_search.c	(revision 36990)
+++ query/dlg_search.c	(revision 36991)
@@ -30,7 +30,7 @@
 
 #include <librnd/core/actions.h>
 #include <librnd/core/conf_hid.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/hid/hid_dad.h>
 #include <librnd/core/event.h>
 #include <librnd/core/error.h>
Index: report/report.c
===================================================================
--- report/report.c	(revision 36990)
+++ report/report.c	(revision 36991)
@@ -33,7 +33,7 @@
 #include "config.h"
 
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "src_plugins/query/net_len.h"
 
 #include <math.h>
Index: rubberband_orig/rubberband.c
===================================================================
--- rubberband_orig/rubberband.c	(revision 36990)
+++ rubberband_orig/rubberband.c	(revision 36991)
@@ -55,7 +55,7 @@
 #include "route_draw.h"
 #include <librnd/core/plugins.h>
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "layer_grp.h"
 #include "fgeometry.h"
 #include "search.h"
Index: tool_std/tool_arc.c
===================================================================
--- tool_std/tool_arc.c	(revision 36990)
+++ tool_std/tool_arc.c	(revision 36991)
@@ -35,7 +35,7 @@
 #include "config.h"
 
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include "board.h"
 #include "crosshair.h"
Index: tool_std/tool_line.c
===================================================================
--- tool_std/tool_line.c	(revision 36990)
+++ tool_std/tool_line.c	(revision 36991)
@@ -35,7 +35,7 @@
 #include "config.h"
 
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include "board.h"
 #include "crosshair.h"
Index: tool_std/tool_via.c
===================================================================
--- tool_std/tool_via.c	(revision 36990)
+++ tool_std/tool_via.c	(revision 36991)
@@ -35,7 +35,7 @@
 #include "config.h"
 
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include "board.h"
 #include "change.h"