Index: export.c
===================================================================
--- export.c	(revision 36985)
+++ export.c	(revision 36986)
@@ -29,9 +29,9 @@
 
 #include "config.h"
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_nogui.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_nogui.h>
+#include <librnd/hid/hid_attrib.h>
 #include <librnd/core/safe_fs.h>
 
 #include "board.h"
Index: io_dsn.c
===================================================================
--- io_dsn.c	(revision 36985)
+++ io_dsn.c	(revision 36986)
@@ -35,7 +35,7 @@
 #include "read.h"
 #include "write.h"
 
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/compat_misc.h>
 #include "plug_io.h"
 #include <librnd/core/plugins.h>
Index: ses.c
===================================================================
--- ses.c	(revision 36985)
+++ ses.c	(revision 36986)
@@ -42,8 +42,8 @@
 #include <librnd/core/safe_fs.h>
 
 #include <librnd/core/actions.h>
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/plugins.h>
 #include <librnd/core/compat_misc.h>