Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 29269)
+++ trunk/src/Makefile.dep	(revision 29270)
@@ -1801,7 +1801,7 @@
  buffer.h data.h ../src/librnd/core/error.h obj_subc.h obj_subc_list.h obj_subc_op.h \
  operation.h ../src/librnd/core/compat_misc.h ../src/librnd/core/pcb-printf.h operation.h plug_io.h ../src/librnd/core/safe_fs.h
 ../src_plugins/fp_fs/fp_fs.o: ../src_plugins/fp_fs/fp_fs.c ../config.h \
- compat_inc.h board.h ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
+ ../src/librnd/core/compat_inc.h board.h ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
  ../src/librnd/core/global_typedefs.h ../src/librnd/core/pcb_bool.h vtroutestyle.h ../src/librnd/core/unit.h ../src/librnd/core/attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h ../src/librnd/core/globalconst.h ../src/librnd/core/color.h \
@@ -1826,7 +1826,7 @@
  ../src_3rd/puplug/error.h plug_footprint.h vtlibrary.h data.h ../src/librnd/core/conf.h \
  ../src/librnd/core/pcb-printf.h ../src_3rd/liblihata/lihata.h ../src/librnd/core/list_conf.h ../src/librnd/core/compat_fs.h \
  ../src/librnd/core/compat_misc.h ../src/librnd/core/error.h ../src/librnd/core/conf.h conf_core.h ../src/librnd/core/hid_init.h macro.h ../src/librnd/core/safe_fs.h \
- safe_fs_dir.h compat_inc.h
+ safe_fs_dir.h ../src/librnd/core/compat_inc.h
 ../src_plugins/fp_wget/edakrill.o: ../src_plugins/fp_wget/edakrill.c \
  ../config.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -5499,7 +5499,7 @@
  ../src/librnd/core/pcb-printf.h ../src_3rd/genvector/gds_char.h ../src/librnd/core/hid_dad_spin.h ../src/librnd/core/safe_fs.h \
  ../src/librnd/core/conf.h ../src_3rd/liblihata/lihata.h ../src/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
- ../src_3rd/genlist/gendlist.h safe_fs_dir.h compat_inc.h ../src/librnd/core/compat_fs.h \
+ ../src_3rd/genlist/gendlist.h safe_fs_dir.h ../src/librnd/core/compat_inc.h ../src/librnd/core/compat_fs.h \
  ../src/librnd/core/event.h ../src/librnd/core/hidlib.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \
  ../src/librnd/core/globalconst.h ../src_plugins/script/script.h \
  ../src_plugins/script/live_script.h
@@ -6195,7 +6195,7 @@
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h \
  ../src_3rd/genvector/genvector_impl.c
-compat_fs.o: compat_fs.c ../config.h compat_inc.h ../src/librnd/core/compat_fs.h \
+compat_fs.o: compat_fs.c ../config.h ../src/librnd/core/compat_inc.h ../src/librnd/core/compat_fs.h \
  ../src/librnd/core/compat_misc.h ../src/librnd/core/globalconst.h ../src/librnd/core/safe_fs.h ../src/librnd/core/global_typedefs.h ../src/librnd/core/pcb_bool.h \
  ../src/librnd/core/conf.h ../src/librnd/core/pcb-printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -6209,9 +6209,9 @@
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
  ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h ../src/librnd/core/hid.h ../src/librnd/core/error.h \
  ../src/librnd/core/attrib.h ../src/librnd/core/box.h math_helper.h ../src/librnd/core/misc_util.h
-compat_lrealpath.o: compat_lrealpath.c compat_inc.h ../config.h \
+compat_lrealpath.o: compat_lrealpath.c ../src/librnd/core/compat_inc.h ../config.h \
  ../src/librnd/core/compat_lrealpath.h ../src/librnd/core/compat_misc.h
-compat_misc.o: compat_misc.c compat_inc.h ../config.h \
+compat_misc.o: compat_misc.c ../src/librnd/core/compat_inc.h ../config.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h ../src/librnd/core/compat_misc.h
 conf.o: conf.c ../src_3rd/genht/htsi.h ../src_3rd/genht/ht.h \
@@ -6687,7 +6687,7 @@
  ../src_3rd/genht/htpp.h ../src/librnd/core/hid_attrib.h ../src_3rd/genlist/gendlist.h \
  ../src/librnd/core/color.h ../src/librnd/core/hid_init.h ../src_3rd/genvector/vtp0.h ../src/librnd/core/hid_dad_unit.h ../src/librnd/core/hid_dad.h \
  ../src/librnd/core/compat_misc.h ../src/librnd/core/pcb-printf.h ../src_3rd/genvector/gds_char.h \
- ../src/librnd/core/hid_dad_spin.h compat_inc.h ../src/librnd/core/compat_fs.h ../src/librnd/core/file_loaded.h ../src/librnd/core/hidlib_conf.h \
+ ../src/librnd/core/hid_dad_spin.h ../src/librnd/core/compat_inc.h ../src/librnd/core/compat_fs.h ../src/librnd/core/file_loaded.h ../src/librnd/core/hidlib_conf.h \
  ../src/librnd/core/conf.h ../src_3rd/liblihata/lihata.h ../src/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h
@@ -7810,7 +7810,7 @@
  ../src_3rd/genrtree/genrtree_search.h \
  ../src_3rd/genrtree/genrtree_delete.h \
  ../src_3rd/genrtree/genrtree_debug.h rtree2_compat.h
-safe_fs.o: safe_fs.c compat_inc.h ../config.h ../src/librnd/core/safe_fs.h ../src/librnd/core/global_typedefs.h \
+safe_fs.o: safe_fs.c ../src/librnd/core/compat_inc.h ../config.h ../src/librnd/core/safe_fs.h ../src/librnd/core/global_typedefs.h \
  ../src/librnd/core/pcb_bool.h ../src/librnd/core/conf.h ../src/librnd/core/pcb-printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h ../src/librnd/core/unit.h \
Index: trunk/src/librnd/core/compat_fs.c
===================================================================
--- trunk/src/librnd/core/compat_fs.c	(revision 29269)
+++ trunk/src/librnd/core/compat_fs.c	(revision 29270)
@@ -32,7 +32,7 @@
 #define PCB_SAFE_FS
 #include "config.h"
 
-#include "compat_inc.h"
+#include <librnd/core/compat_inc.h>
 
 #include <stdlib.h>
 #include <stdio.h>
Index: trunk/src/librnd/core/compat_lrealpath.c
===================================================================
--- trunk/src/librnd/core/compat_lrealpath.c	(revision 29269)
+++ trunk/src/librnd/core/compat_lrealpath.c	(revision 29270)
@@ -33,7 +33,7 @@
 
 */
 
-#include "compat_inc.h"
+#include <librnd/core/compat_inc.h>
 #include "config.h"
 #include <librnd/core/compat_lrealpath.h>
 #include <limits.h>
Index: trunk/src/librnd/core/compat_misc.c
===================================================================
--- trunk/src/librnd/core/compat_misc.c	(revision 29269)
+++ trunk/src/librnd/core/compat_misc.c	(revision 29270)
@@ -25,7 +25,7 @@
  *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
  */
 
-#include "compat_inc.h"
+#include <librnd/core/compat_inc.h>
 #include "config.h"
 
 #include <stdio.h>
Index: trunk/src/librnd/core/hid_init.c
===================================================================
--- trunk/src/librnd/core/hid_init.c	(revision 29269)
+++ trunk/src/librnd/core/hid_init.c	(revision 29270)
@@ -53,7 +53,7 @@
 #include <librnd/core/hid_dad_unit.h>
 #include <librnd/core/misc_util.h>
 #include <librnd/core/compat_misc.h>
-#include "compat_inc.h"
+#include <librnd/core/compat_inc.h>
 #include <librnd/core/compat_fs.h>
 #include <librnd/core/file_loaded.h>
 #include <librnd/core/hidlib.h>
Index: trunk/src/librnd/core/hidlib_conf.c
===================================================================
--- trunk/src/librnd/core/hidlib_conf.c	(revision 29269)
+++ trunk/src/librnd/core/hidlib_conf.c	(revision 29270)
@@ -44,7 +44,7 @@
 
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	pcb_conf_reg_field(pcbhl_conf, field,isarray,type_name,cpath,cname,desc,flags);
-#include "hidlib_conf_fields.h"
+#include <librnd/core/hidlib_conf_fields.h>
 
 	return cnt;
 }
Index: trunk/src/librnd/core/safe_fs.c
===================================================================
--- trunk/src/librnd/core/safe_fs.c	(revision 29269)
+++ trunk/src/librnd/core/safe_fs.c	(revision 29270)
@@ -28,7 +28,7 @@
 #define PCB_SAFE_FS
 
 /* opendir, readdir */
-#include "compat_inc.h"
+#include <librnd/core/compat_inc.h>
 
 #include "config.h"
 
Index: trunk/src/safe_fs_dir.h
===================================================================
--- trunk/src/safe_fs_dir.h	(revision 29269)
+++ trunk/src/safe_fs_dir.h	(revision 29270)
@@ -1,4 +1,4 @@
-#include "compat_inc.h"
+#include <librnd/core/compat_inc.h>
 DIR *pcb_opendir(pcb_hidlib_t *hidlib, const char *name);
 struct dirent *pcb_readdir(DIR *dir);
 int pcb_closedir(DIR *dir);
Index: trunk/src_plugins/fp_fs/fp_fs.c
===================================================================
--- trunk/src_plugins/fp_fs/fp_fs.c	(revision 29269)
+++ trunk/src_plugins/fp_fs/fp_fs.c	(revision 29270)
@@ -32,7 +32,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include "compat_inc.h"
+#include <librnd/core/compat_inc.h>
 
 #include "board.h"
 #include "data.h"