Index: footprint.c
===================================================================
--- footprint.c	(revision 29256)
+++ footprint.c	(revision 29257)
@@ -36,14 +36,14 @@
 #include "footprint.h"
 #include "parse.h"
 
-#include "unit.h"
-#include "attrib.h"
-#include "error.h"
+#include <librnd/core/unit.h>
+#include <librnd/core/attrib.h>
+#include <librnd/core/error.h>
 #include "data.h"
 #include "board.h"
-#include "pcb-printf.h"
-#include "compat_misc.h"
-#include "safe_fs.h"
+#include <librnd/core/pcb-printf.h>
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/safe_fs.h>
 #include "obj_line.h"
 #include "obj_arc.h"
 #include "obj_pstk.h"
Index: io_tedax.c
===================================================================
--- io_tedax.c	(revision 29256)
+++ io_tedax.c	(revision 29257)
@@ -37,10 +37,10 @@
 #include "board.h"
 #include "conf_core.h"
 #include "buffer.h"
-#include "plugins.h"
-#include "hid.h"
-#include "actions.h"
-#include "compat_misc.h"
+#include <librnd/core/plugins.h>
+#include <librnd/core/hid.h>
+#include <librnd/core/actions.h>
+#include <librnd/core/compat_misc.h>
 #include "plug_io.h"
 #include "stackup.h"
 #include "tlayer.h"
Index: parse.c
===================================================================
--- parse.c	(revision 29256)
+++ parse.c	(revision 29257)
@@ -31,8 +31,8 @@
 #include <assert.h>
 
 #include "parse.h"
-#include "error.h"
-#include "compat_misc.h"
+#include <librnd/core/error.h>
+#include <librnd/core/compat_misc.h>
 
 int tedax_getline(FILE *f, char *buff, int buff_size, char *argv[], int argv_size)
 {
Index: stackup.c
===================================================================
--- stackup.c	(revision 29256)
+++ stackup.c	(revision 29257)
@@ -35,9 +35,9 @@
 
 #include "stackup.h"
 #include "parse.h"
-#include "compat_misc.h"
-#include "safe_fs.h"
-#include "error.h"
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/safe_fs.h>
+#include <librnd/core/error.h>
 #include "plug_io.h"
 
 void tedax_stackup_init(tedax_stackup_t *ctx)
Index: tboard.c
===================================================================
--- tboard.c	(revision 29256)
+++ tboard.c	(revision 29257)
@@ -39,8 +39,8 @@
 #include "data.h"
 #include "tboard.h"
 #include "parse.h"
-#include "error.h"
-#include "safe_fs.h"
+#include <librnd/core/error.h>
+#include <librnd/core/safe_fs.h>
 #include "stackup.h"
 #include "footprint.h"
 #include "tdrc.h"
@@ -47,7 +47,7 @@
 #include "tlayer.h"
 #include "ht_subc.h"
 #include "obj_pstk.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "plug_io.h"
 #include "tnetlist.h"
 
Index: tdrc.c
===================================================================
--- tdrc.c	(revision 29256)
+++ tdrc.c	(revision 29257)
@@ -32,8 +32,8 @@
 
 #include "board.h"
 #include "parse.h"
-#include "safe_fs.h"
-#include "error.h"
+#include <librnd/core/safe_fs.h>
+#include <librnd/core/error.h>
 #include "tdrc.h"
 
 typedef struct {
Index: tetest.c
===================================================================
--- tetest.c	(revision 29256)
+++ tetest.c	(revision 29257)
@@ -34,8 +34,8 @@
 #include "board.h"
 #include "data.h"
 #include "parse.h"
-#include "safe_fs.h"
-#include "error.h"
+#include <librnd/core/safe_fs.h>
+#include <librnd/core/error.h>
 #include "tetest.h"
 #include "rtree.h"
 #include "obj_subc_parent.h"
@@ -42,13 +42,13 @@
 #include "obj_pstk.h"
 #include "obj_pstk_inlines.h"
 #include "netlist.h"
-#include "plugins.h"
+#include <librnd/core/plugins.h>
 #include "plug_io.h"
-#include "hid.h"
+#include <librnd/core/hid.h>
 #include "hid_cam.h"
-#include "hid_nogui.h"
-#include "hid_init.h"
-#include "hid_attrib.h"
+#include <librnd/core/hid_nogui.h>
+#include <librnd/core/hid_init.h>
+#include <librnd/core/hid_attrib.h>
 
 static const char *sides(pcb_layer_type_t lyt)
 {
Index: tlayer.c
===================================================================
--- tlayer.c	(revision 29256)
+++ tlayer.c	(revision 29257)
@@ -32,14 +32,14 @@
 #include <genht/hash.h>
 #include "data.h"
 #include "tlayer.h"
-#include "safe_fs.h"
-#include "error.h"
+#include <librnd/core/safe_fs.h>
+#include <librnd/core/error.h>
 #include "parse.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "obj_line.h"
 #include "obj_arc.h"
 #include "obj_poly.h"
-#include "vtc0.h"
+#include <librnd/core/vtc0.h>
 #include "plug_io.h"
 
 int tedax_layer_fsave(pcb_board_t *pcb, pcb_layergrp_id_t gid, const char *layname, FILE *f)
Index: tnetlist.c
===================================================================
--- tnetlist.c	(revision 29256)
+++ tnetlist.c	(revision 29257)
@@ -33,11 +33,11 @@
 
 #include "board.h"
 #include "data.h"
-#include "error.h"
-#include "pcb-printf.h"
-#include "compat_misc.h"
-#include "actions.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/actions.h>
+#include <librnd/core/safe_fs.h>
 #include "obj_subc.h"
 #include "netlist.h"