Index: eps.c
===================================================================
--- eps.c	(revision 29256)
+++ eps.c	(revision 29257)
@@ -8,19 +8,19 @@
 
 #include "math_helper.h"
 #include "board.h"
-#include "color.h"
+#include <librnd/core/color.h>
 #include "data.h"
 #include "draw.h"
 #include "layer.h"
 #include "layer_vis.h"
-#include "pcb-printf.h"
-#include "safe_fs.h"
+#include <librnd/core/pcb-printf.h>
+#include <librnd/core/safe_fs.h>
 
-#include "hid.h"
-#include "hid_nogui.h"
+#include <librnd/core/hid.h>
+#include <librnd/core/hid_nogui.h>
 #include "ps.h"
-#include "hid_init.h"
-#include "hid_attrib.h"
+#include <librnd/core/hid_init.h>
+#include <librnd/core/hid_attrib.h>
 #include "hid_cam.h"
 #include "funchash_core.h"
 
Index: ps.c
===================================================================
--- ps.c	(revision 29256)
+++ ps.c	(revision 29257)
@@ -10,23 +10,23 @@
 #include "board.h"
 #include "data.h"
 #include "layer.h"
-#include "error.h"
+#include <librnd/core/error.h>
 #include "draw.h"
-#include "pcb-printf.h"
-#include "plugins.h"
+#include <librnd/core/pcb-printf.h>
+#include <librnd/core/plugins.h>
 #include "hid_cam.h"
-#include "safe_fs.h"
+#include <librnd/core/safe_fs.h>
 #include "funchash_core.h"
 #include "layer_vis.h"
 
-#include "hid.h"
-#include "hid_nogui.h"
+#include <librnd/core/hid.h>
+#include <librnd/core/hid_nogui.h>
 #include "ps.h"
-#include "hid_init.h"
-#include "hid_attrib.h"
-#include "actions.h"
+#include <librnd/core/hid_init.h>
+#include <librnd/core/hid_attrib.h>
+#include <librnd/core/actions.h>
 #include "conf_core.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "stub_draw.h"
 #include "../src_plugins/lib_compat_help/media.h"