Index: dlg_search.c
===================================================================
--- dlg_search.c	(revision 36985)
+++ dlg_search.c	(revision 36986)
@@ -31,7 +31,7 @@
 #include <librnd/core/actions.h>
 #include <librnd/core/conf_hid.h>
 #include <librnd/core/hidlib_conf.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include <librnd/core/event.h>
 #include <librnd/core/error.h>
 #include "query.h"
Index: dlg_search_edit.c
===================================================================
--- dlg_search_edit.c	(revision 36985)
+++ dlg_search_edit.c	(revision 36986)
@@ -28,8 +28,8 @@
 
 #include <librnd/core/actions.h>
 #include <librnd/core/conf_hid.h>
-#include <librnd/core/hid_dad.h>
-#include <librnd/core/hid_dad_tree.h>
+#include <librnd/hid/hid_dad.h>
+#include <librnd/hid/hid_dad_tree.h>
 #include <librnd/core/error.h>
 
 typedef struct{
Index: query.c
===================================================================
--- query.c	(revision 36985)
+++ query.c	(revision 36986)
@@ -35,7 +35,7 @@
 #include <librnd/core/error.h>
 #include "undo.h"
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/compat_misc.h>
 #include "query.h"