Index: excitation.c
===================================================================
--- excitation.c	(revision 36985)
+++ excitation.c	(revision 36986)
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include "event.h"
 
 #define MAX_EXC 16
Index: export_openems.c
===================================================================
--- export_openems.c	(revision 36985)
+++ export_openems.c	(revision 36986)
@@ -44,12 +44,12 @@
 #include "obj_subc_parent.h"
 #include "obj_pstk_inlines.h"
 
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid_nogui.h>
 #include "hid_cam.h"
-#include <librnd/core/hid_attrib.h>
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
 #include "../src_plugins/lib_polyhelp/topoly.h"
 #include "mesh.h"
 
Index: mesh.c
===================================================================
--- mesh.c	(revision 36985)
+++ mesh.c	(revision 36986)
@@ -32,7 +32,7 @@
 #include <librnd/core/actions.h>
 #include "board.h"
 #include "data.h"
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include "event.h"
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/rnd_printf.h>