Index: trunk/src/safe_fs_dir.h
===================================================================
--- trunk/src/safe_fs_dir.h	(revision 29280)
+++ trunk/src/safe_fs_dir.h	(nonexistent)
@@ -1,4 +0,0 @@
-#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/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 29280)
+++ trunk/src/Makefile.dep	(revision 29281)
@@ -2502,7 +2502,7 @@
  vtlibrary.h data.h librnd/core/conf.h librnd/core/pcb-printf.h \
  ../src_3rd/liblihata/lihata.h librnd/core/list_conf.h \
  librnd/core/compat_fs.h librnd/core/compat_misc.h conf_core.h \
- librnd/core/hid_init.h macro.h librnd/core/safe_fs.h safe_fs_dir.h
+ librnd/core/hid_init.h macro.h librnd/core/safe_fs.h librnd/core/math_helper.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 \
@@ -6674,7 +6674,7 @@
  librnd/core/hid_dad_spin.h librnd/core/safe_fs.h librnd/core/conf.h \
  ../src_3rd/liblihata/lihata.h 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 librnd/core/compat_inc.h \
+ ../src_3rd/genlist/gendlist.h librnd/core/math_helper.h librnd/core/compat_inc.h \
  librnd/core/compat_fs.h librnd/core/event.h librnd/core/hidlib.h undo.h \
  ../src_3rd/libuundo/uundo.h undo_old.h librnd/core/globalconst.h \
  ../src_plugins/script/script.h ../src_plugins/script/live_script.h
Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 29280)
+++ trunk/src/Makefile.in	(revision 29281)
@@ -606,7 +606,7 @@
 # rndlib: corner case: some headers are not derived from the objects
 sub /local/pcb/HDRS_HIDLIB {$(LIBRND)/core/hid_dlg.h } {}
 sub /local/pcb/HDRS_HIDLIB {polygon1.h } {}
-append /local/pcb/HDRS_HIDLIB {$(LIBRND)/core/hid.h polyarea.h $(LIBRND)/core/global_typedefs.h $(LIBRND)/core/globalconst.h $(LIBRND)/core/math_helper.h $(LIBRND)/core/buildin.hidlib.h $(LIBRND)/core/hid_inlines.h $(LIBRND)/core/rotate.h $(LIBRND)/core/fptr_cast.h safe_fs_dir.h $(LIBRND)/core/compat_inc.h }
+append /local/pcb/HDRS_HIDLIB {$(LIBRND)/core/hid.h polyarea.h $(LIBRND)/core/global_typedefs.h $(LIBRND)/core/globalconst.h $(LIBRND)/core/math_helper.h $(LIBRND)/core/buildin.hidlib.h $(LIBRND)/core/hid_inlines.h $(LIBRND)/core/rotate.h $(LIBRND)/core/fptr_cast.h $(LIBRND)/core/safe_fs_dir.h $(LIBRND)/core/compat_inc.h }
 gsub /local/pcb/HDRS_3RDLIB {../src_3rd/liblihata/dom_[^ ]*.h } {}
 gsub /local/pcb/HDRS_3RDLIB {../src_3rd/liblihata/tree_[^ ]*.h } {}
 gsub /local/pcb/HDRS_3RDLIB {../src_3rd/libfungw/fungw_ptr.h ../src_3rd/libfungw/fungw_debug.h ../src_3rd/libfungw/fungw_call.h } {}
Index: trunk/src/librnd/core/safe_fs_dir.h
===================================================================
--- trunk/src/librnd/core/safe_fs_dir.h	(nonexistent)
+++ trunk/src/librnd/core/safe_fs_dir.h	(revision 29281)
@@ -0,0 +1,4 @@
+#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 29280)
+++ trunk/src_plugins/fp_fs/fp_fs.c	(revision 29281)
@@ -47,7 +47,7 @@
 #include <librnd/core/hid_init.h>
 #include "macro.h"
 #include <librnd/core/safe_fs.h>
-#include "safe_fs_dir.h"
+#include <librnd/core/safe_fs_dir.h>
 
 static pcb_fptype_t pcb_fp_file_type(const char *fn, void ***tags);
 
Index: trunk/src_plugins/script/live_script.c
===================================================================
--- trunk/src_plugins/script/live_script.c	(revision 29280)
+++ trunk/src_plugins/script/live_script.c	(revision 29281)
@@ -36,7 +36,7 @@
 #include <librnd/core/hid_cfg.h>
 #include <librnd/core/hid_dad.h>
 #include <librnd/core/safe_fs.h>
-#include "safe_fs_dir.h"
+#include <librnd/core/safe_fs_dir.h>
 #include <librnd/core/compat_fs.h>
 #include <librnd/core/event.h>
 #include "undo.h"