Index: board.c
===================================================================
--- board.c	(revision 36990)
+++ board.c	(revision 36991)
@@ -29,7 +29,7 @@
 #include "board.h"
 #include "data.h"
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "plug_io.h"
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/actions.h>
Index: change_act.c
===================================================================
--- change_act.c	(revision 36990)
+++ change_act.c	(revision 36991)
@@ -51,7 +51,7 @@
 #include "data_it.h"
 #include <librnd/hid/grid.h>
 #include "route_style.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "obj_subc_parent.h"
 
 #define PCB (do not use PCB directly)
Index: conf_act.c
===================================================================
--- conf_act.c	(revision 36990)
+++ conf_act.c	(revision 36991)
@@ -28,7 +28,7 @@
 #include "board.h"
 #include <librnd/core/actions.h>
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "funchash_core.h"
 #include "route_style.h"
 #include <librnd/core/error.h>
Index: conf_core.c
===================================================================
--- conf_core.c	(revision 36990)
+++ conf_core.c	(revision 36991)
@@ -1,7 +1,7 @@
 #include "config.h"
 #include <librnd/core/conf.h>
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/conf_hid.h>
 #include <genvector/gds_char.h>
 #include <genht/htpp.h>
Index: crosshair.c
===================================================================
--- crosshair.c	(revision 36990)
+++ crosshair.c	(revision 36991)
@@ -30,7 +30,7 @@
 #include "config.h"
 
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include "brave.h"
 
Index: draw.c
===================================================================
--- draw.c	(revision 36990)
+++ draw.c	(revision 36991)
@@ -30,7 +30,7 @@
 #include "config.h"
 
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/math_helper.h>
 #include "board.h"
 #include "data.h"
Index: drc.c
===================================================================
--- drc.c	(revision 36990)
+++ drc.c	(revision 36991)
@@ -31,7 +31,7 @@
 #include <librnd/hid/hid.h>
 #include "board.h"
 #include "drc.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "conf_core.h"
 #include <librnd/core/compat_misc.h>
 #include "event.h"
Index: gui_act.c
===================================================================
--- gui_act.c	(revision 36990)
+++ gui_act.c	(revision 36991)
@@ -36,7 +36,7 @@
 #include "board.h"
 #include "build_run.h"
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "data.h"
 #include <librnd/hid/tool.h>
 #include <librnd/hid/grid.h>
Index: main.c
===================================================================
--- main.c	(revision 36990)
+++ main.c	(revision 36991)
@@ -60,7 +60,7 @@
 #include <librnd/core/funchash.h>
 #include <librnd/core/conf.h>
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <genvector/vtp0.h>
 #include "layer_vis.h"
 #include "layer_ui.h"
Index: obj_subc.c
===================================================================
--- obj_subc.c	(revision 36990)
+++ obj_subc.c	(revision 36991)
@@ -59,7 +59,7 @@
 #include <librnd/core/math_helper.h>
 #include "pcb_minuid.h"
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/hid/hid_inlines.h>
 #include "extobj.h"
 
Index: object_act.c
===================================================================
--- object_act.c	(revision 36990)
+++ object_act.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 "data.h"
 #include "board.h"
Index: plug_io.c
===================================================================
--- plug_io.c	(revision 36990)
+++ plug_io.c	(revision 36991)
@@ -40,7 +40,7 @@
 #include "config.h"
 
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include <locale.h>
 #include <dirent.h>
Index: polygon.c
===================================================================
--- polygon.c	(revision 36990)
+++ polygon.c	(revision 36991)
@@ -39,7 +39,7 @@
 
 #include "board.h"
 #include <librnd/core/box.h>
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "data.h"
 #include "draw.h"
 #include <librnd/core/error.h>
Index: polygon_act.c
===================================================================
--- polygon_act.c	(revision 36990)
+++ polygon_act.c	(revision 36991)
@@ -33,7 +33,7 @@
  */
 #include "config.h"
 
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include "board.h"
 #include "data.h"
Index: route.c
===================================================================
--- route.c	(revision 36990)
+++ route.c	(revision 36991)
@@ -30,7 +30,7 @@
 
 #include <librnd/core/compat_misc.h>
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include <librnd/core/math_helper.h>
 #include "board.h"
 #include "data.h"
Index: select.c
===================================================================
--- select.c	(revision 36990)
+++ select.c	(revision 36991)
@@ -34,7 +34,7 @@
 #include "config.h"
 
 #include "conf_core.h"
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 
 #include "board.h"
 #include "data.h"
Index: tool_logic.c
===================================================================
--- tool_logic.c	(revision 36990)
+++ tool_logic.c	(revision 36991)
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/rnd_conf.h>
 #include "event.h"
 #include <librnd/hid/grid.h>
 #include <librnd/core/actions.h>