Index: attribs.c
===================================================================
--- attribs.c	(revision 29256)
+++ attribs.c	(revision 29257)
@@ -25,9 +25,9 @@
  */
 
 #include "config.h"
-#include "conf.h"
+#include <librnd/core/conf.h>
 #include "board.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 
 #define LISTSEP " [[pcb-rnd]] "
 
Index: file.c
===================================================================
--- file.c	(revision 29256)
+++ file.c	(revision 29257)
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #include "conf_core.h"
-#include "hidlib_conf.h"
+#include <librnd/core/hidlib_conf.h>
 
 #include <locale.h>
 #include <time.h>
@@ -43,30 +43,30 @@
 #include "change.h"
 #include "crosshair.h"
 #include "data.h"
-#include "error.h"
+#include <librnd/core/error.h>
 #include "file.h"
 #include "plug_io.h"
-#include "hid.h"
+#include <librnd/core/hid.h>
 #include "layer.h"
 #include "layer_grp.h"
 #include "move.h"
 #include "parse_common.h"
-#include "pcb-printf.h"
+#include <librnd/core/pcb-printf.h>
 #include "polygon.h"
 #include "polygon1_gen.h"
 #include "remove.h"
 #include "flag_str.h"
-#include "compat_fs.h"
-#include "compat_misc.h"
-#include "paths.h"
+#include <librnd/core/compat_fs.h>
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/paths.h>
 #include "rats_patch.h"
-#include "actions.h"
+#include <librnd/core/actions.h>
 #include "flag_str.h"
 #include "attribs.h"
 #include "route_style.h"
 #include "obj_poly.h"
 #include "thermal.h"
-#include "event.h"
+#include <librnd/core/event.h>
 #include "macro.h"
 #include "funchash_core.h"
 #include "netlist.h"
Index: io_pcb.c
===================================================================
--- io_pcb.c	(revision 29256)
+++ io_pcb.c	(revision 29257)
@@ -28,7 +28,7 @@
  */
 
 #include "config.h"
-#include "plugins.h"
+#include <librnd/core/plugins.h>
 #include "parse_common.h"
 #include "file.h"
 
Index: parse_l.c
===================================================================
--- parse_l.c	(revision 29256)
+++ parse_l.c	(revision 29257)
@@ -915,7 +915,7 @@
 
 #include "crosshair.h"
 #include "data.h"
-#include "error.h"
+#include <librnd/core/error.h>
 #include "file.h"
 #include "flag_str.h"
 #include "parse_common.h"
@@ -922,11 +922,11 @@
 #include "parse_y.h"
 #include "plug_footprint.h"
 #include "attribs.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "compat_cc.h"
 #include "obj_common.h"
-#include "paths.h"
-#include "safe_fs.h"
+#include <librnd/core/paths.h>
+#include <librnd/core/safe_fs.h>
 #include "macro.h"
 
 #define YY_NO_INPUT
Index: parse_l.l
===================================================================
--- parse_l.l	(revision 29256)
+++ parse_l.l	(revision 29257)
@@ -46,7 +46,7 @@
 
 #include "crosshair.h"
 #include "data.h"
-#include "error.h"
+#include <librnd/core/error.h>
 #include "file.h"
 #include "flag_str.h"
 #include "parse_common.h"
@@ -53,11 +53,11 @@
 #include "parse_y.h"
 #include "plug_footprint.h"
 #include "attribs.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "compat_cc.h"
 #include "obj_common.h"
-#include "paths.h"
-#include "safe_fs.h"
+#include <librnd/core/paths.h>
+#include <librnd/core/safe_fs.h>
 #include "macro.h"
 
 #define YY_NO_INPUT
Index: parse_y.c
===================================================================
--- parse_y.c	(revision 29256)
+++ parse_y.c	(revision 29257)
@@ -113,7 +113,7 @@
 #include "conf_core.h"
 #include "layer.h"
 #include "data.h"
-#include "error.h"
+#include <librnd/core/error.h>
 #include "file.h"
 #include "parse_l.h"
 #include "polygon.h"
@@ -123,7 +123,7 @@
 #include "obj_pinvia_therm.h"
 #include "rats_patch.h"
 #include "route_style.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "src_plugins/lib_compat_help/pstk_compat.h"
 #include "netlist.h"
 
Index: parse_y.y
===================================================================
--- parse_y.y	(revision 29256)
+++ parse_y.y	(revision 29257)
@@ -36,7 +36,7 @@
 #include "conf_core.h"
 #include "layer.h"
 #include "data.h"
-#include "error.h"
+#include <librnd/core/error.h>
 #include "file.h"
 #include "parse_l.h"
 #include "polygon.h"
@@ -46,7 +46,7 @@
 #include "obj_pinvia_therm.h"
 #include "rats_patch.h"
 #include "route_style.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "src_plugins/lib_compat_help/pstk_compat.h"
 #include "netlist.h"