Index: eagle_bin.c
===================================================================
--- eagle_bin.c	(revision 29256)
+++ eagle_bin.c	(revision 29257)
@@ -38,9 +38,9 @@
 
 #include "eagle_bin.h"
 #include "egb_tree.h"
-#include "error.h"
+#include <librnd/core/error.h>
 #include "math_helper.h"
-#include "misc_util.h"
+#include <librnd/core/misc_util.h>
 
 /* Describe a bitfield: width of the field that hosts the bitfield, first
 and last bit offsets, inclusive. Bit offsets are starting from 0 at LSB. */
Index: egb_tree.c
===================================================================
--- egb_tree.c	(revision 29256)
+++ egb_tree.c	(revision 29257)
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <genht/hash.h>
 #include "egb_tree.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 
 egb_node_t *egb_node_alloc(int id, const char *id_name)
 {
Index: io_eagle.c
===================================================================
--- io_eagle.c	(revision 29256)
+++ io_eagle.c	(revision 29257)
@@ -28,12 +28,12 @@
  */
 
 #include "config.h"
-#include "plugins.h"
-#include "hid.h"
+#include <librnd/core/plugins.h>
+#include <librnd/core/hid.h>
 #include "plug_io.h"
 #include "read.h"
 #include "read_dru.h"
-#include "actions.h"
+#include <librnd/core/actions.h>
 
 static pcb_plug_io_t io_eagle_xml, io_eagle_bin, io_eagle_dru;
 static const char *eagle_cookie = "eagle plugin";
Index: read.c
===================================================================
--- read.c	(revision 29256)
+++ read.c	(revision 29257)
@@ -34,14 +34,14 @@
 #include "board.h"
 #include "data.h"
 #include "read.h"
-#include "conf.h"
+#include <librnd/core/conf.h>
 #include "conf_core.h"
-#include "error.h"
+#include <librnd/core/error.h>
 #include "polygon.h"
 #include "rtree.h"
-#include "actions.h"
+#include <librnd/core/actions.h>
 #include "undo.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "trparse.h"
 #include "trparse_xml.h"
 #include "trparse_bin.h"
Index: read.h
===================================================================
--- read.h	(revision 29256)
+++ read.h	(revision 29257)
@@ -1,5 +1,5 @@
 #include "board.h"
-#include "conf.h"
+#include <librnd/core/conf.h>
 #include "plug_io.h"
 
 int io_eagle_test_parse_xml(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f);
Index: read_dru.c
===================================================================
--- read_dru.c	(revision 29256)
+++ read_dru.c	(revision 29257)
@@ -131,10 +131,10 @@
 
 #ifndef PCB_EAGLE_DRU_PARSER_TEST
 
-#include "safe_fs.h"
+#include <librnd/core/safe_fs.h>
 #include "board.h"
 #include "layer_grp.h"
-#include "error.h"
+#include <librnd/core/error.h>
 
 int io_eagle_test_parse_dru(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f)
 {
Index: trparse_bin.c
===================================================================
--- trparse_bin.c	(revision 29256)
+++ trparse_bin.c	(revision 29257)
@@ -31,8 +31,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "error.h"
-#include "safe_fs.h"
+#include <librnd/core/error.h>
+#include <librnd/core/safe_fs.h>
 #include "egb_tree.h"
 #include "eagle_bin.h"
 
Index: trparse_xml.c
===================================================================
--- trparse_xml.c	(revision 29256)
+++ trparse_xml.c	(revision 29257)
@@ -32,8 +32,8 @@
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 
-#include "error.h"
-#include "safe_fs.h"
+#include <librnd/core/error.h>
+#include <librnd/core/safe_fs.h>
 
 #include "trparse.h"
 #include "trparse_xml.h"