Index: io_autotrax.c
===================================================================
--- io_autotrax.c	(revision 29256)
+++ io_autotrax.c	(revision 29257)
@@ -32,17 +32,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "plugins.h"
+#include <librnd/core/plugins.h>
 #include "plug_io.h"
 #include "write.h"
 #include "read.h"
-#include "actions.h"
+#include <librnd/core/actions.h>
 
 #include "board.h"
 #include "conf_core.h"
 #include "buffer.h"
-#include "hid.h"
-#include "compat_misc.h"
+#include <librnd/core/hid.h>
+#include <librnd/core/compat_misc.h>
 
 static pcb_plug_io_t io_autotrax;
 static const char *autotrax_cookie = "autotrax IO";
Index: read.c
===================================================================
--- read.c	(revision 29256)
+++ read.c	(revision 29257)
@@ -33,21 +33,21 @@
 #include <assert.h>
 #include <math.h>
 #include <qparse/qparse.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 "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 "safe_fs.h"
+#include <librnd/core/safe_fs.h>
 #include "rotate.h"
-#include "actions.h"
+#include <librnd/core/actions.h>
 #include "undo.h"
 
 #include "../src_plugins/lib_compat_help/pstk_compat.h"
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 "netlist.h"
 #include "data.h"
 #include "write.h"