Index: diag.c
===================================================================
--- diag.c	(revision 29256)
+++ diag.c	(revision 29257)
@@ -34,15 +34,15 @@
 #include "flag_str.h"
 #include "layer.h"
 #include "diag_conf.h"
-#include "actions.h"
-#include "plugins.h"
-#include "conf.h"
-#include "error.h"
-#include "event.h"
+#include <librnd/core/actions.h>
+#include <librnd/core/plugins.h>
+#include <librnd/core/conf.h>
+#include <librnd/core/error.h>
+#include <librnd/core/event.h>
 #include "integrity.h"
-#include "hid.h"
-#include "hid_attrib.h"
-#include "hid_dad.h"
+#include <librnd/core/hid.h>
+#include <librnd/core/hid_attrib.h>
+#include <librnd/core/hid_dad.h>
 #include "search.h"
 #include "macro.h"
 #include "plug_footprint.h"
Index: diag_conf.c
===================================================================
--- diag_conf.c	(revision 29256)
+++ diag_conf.c	(revision 29257)
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#include "conf.h"
+#include <librnd/core/conf.h>
 
 void conf_dump(FILE *f, const char *prefix, int verbose, const char *match_prefix)
 {
Index: diag_conf.h
===================================================================
--- diag_conf.h	(revision 29256)
+++ diag_conf.h	(revision 29257)
@@ -1,7 +1,7 @@
 #ifndef PCB_DIAG_CONF_H
 #define PCB_DIAG_CONF_H
 
-#include "conf.h"
+#include <librnd/core/conf.h>
 
 typedef struct {
 	const struct {
Index: integrity.c
===================================================================
--- integrity.c	(revision 29256)
+++ integrity.c	(revision 29257)
@@ -28,7 +28,7 @@
 
 #include "board.h"
 #include "data.h"
-#include "error.h"
+#include <librnd/core/error.h>
 #include "undo.h"
 
 #define CHK "Broken integrity: "