Index: io_kicad.c
===================================================================
--- io_kicad.c	(revision 29256)
+++ io_kicad.c	(revision 29257)
@@ -28,12 +28,12 @@
  */
 
 #include "config.h"
-#include "plugins.h"
+#include <librnd/core/plugins.h>
 #include "plug_io.h"
 #include "write.h"
 #include "read.h"
 #include "read_net.h"
-#include "actions.h"
+#include <librnd/core/actions.h>
 
 static pcb_plug_io_t io_kicad;
 static const char *kicad_cookie = "kicad plugin";
Index: read.c
===================================================================
--- read.c	(revision 29256)
+++ read.c	(revision 29257)
@@ -36,22 +36,22 @@
 #include <genht/htpp.h>
 #include <genvector/vtp0.h>
 
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "board.h"
 #include "plug_io.h"
-#include "error.h"
+#include <librnd/core/error.h>
 #include "data.h"
 #include "read.h"
 #include "layer.h"
 #include "polygon.h"
 #include "plug_footprint.h"
-#include "misc_util.h" /* for distance calculations */
+#include <librnd/core/misc_util.h> /* for distance calculations */
 #include "conf_core.h"
 #include "move.h"
 #include "macro.h"
 #include "rotate.h"
-#include "safe_fs.h"
-#include "attrib.h"
+#include <librnd/core/safe_fs.h>
+#include <librnd/core/attrib.h>
 #include "netlist.h"
 #include "math_helper.h"
 #include "obj_pstk_inlines.h"
Index: read_net.c
===================================================================
--- read_net.c	(revision 29256)
+++ read_net.c	(revision 29257)
@@ -36,14 +36,14 @@
 
 #include "board.h"
 #include "data.h"
-#include "error.h"
-#include "pcb-printf.h"
-#include "compat_misc.h"
-#include "safe_fs.h"
+#include <librnd/core/error.h>
+#include <librnd/core/pcb-printf.h>
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/safe_fs.h>
 
-#include "actions.h"
-#include "plugins.h"
-#include "hid.h"
+#include <librnd/core/actions.h>
+#include <librnd/core/plugins.h>
+#include <librnd/core/hid.h>
 
 #define if_strval(node, name) \
 	if (strcmp(node->str, #name) == 0) { \
Index: read_net.h
===================================================================
--- read_net.h	(revision 29256)
+++ read_net.h	(revision 29257)
@@ -1,4 +1,4 @@
-#include "unit.h"
+#include <librnd/core/unit.h>
 #include <libfungw/fungw.h>
 
 extern const char pcb_acts_LoadeeschemaFrom[];
Index: uniq_name.c
===================================================================
--- uniq_name.c	(revision 29256)
+++ uniq_name.c	(revision 29257)
@@ -4,7 +4,7 @@
 #include <genht/hash.h>
 #include "config.h"
 #include "uniq_name.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 
 static const char *unm_default_unnamed = "unnamed";
 static const char *unm_default_suffix_sep = "_dup";
Index: write.c
===================================================================
--- write.c	(revision 29256)
+++ write.c	(revision 29257)
@@ -27,10 +27,10 @@
  */
 #include <math.h>
 #include "config.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "board.h"
 #include "plug_io.h"
-#include "error.h"
+#include <librnd/core/error.h>
 #include "uniq_name.h"
 #include "data.h"
 #include "write.h"