Index: trunk/src/conf.c
===================================================================
--- trunk/src/conf.c	(revision 2575)
+++ trunk/src/conf.c	(revision 2576)
@@ -20,7 +20,6 @@
  *
  */
 
-#include <sys/stat.h>
 #include <assert.h>
 #include <genht/hash.h>
 #include <liblihata/tree.h>
Index: trunk/src/plug_footprint.c
===================================================================
--- trunk/src/plug_footprint.c	(revision 2575)
+++ trunk/src/plug_footprint.c	(revision 2576)
@@ -31,10 +31,6 @@
 
 #include <genht/htsp.h>
 #include <genht/hash.h>
-
-#include <dirent.h>
-#include <sys/stat.h>
-
 #include "conf_core.h"
 #include "plugins.h"
 #include "error.h"
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 2575)
+++ trunk/src/plug_io.c	(revision 2576)
@@ -43,8 +43,6 @@
 #include <dirent.h>
 #include <time.h>
 
-#include <sys/stat.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -66,6 +64,9 @@
 #include "event.h"
 #include "compat_misc.h"
 
+/* for opendir */
+#include "compat_inc.h"
+
 plug_io_t *plug_io_chain = NULL;
 
 static void plug_io_err(int res, const char *what, const char *filename)
Index: trunk/src_plugins/fp_fs/fp_fs.c
===================================================================
--- trunk/src_plugins/fp_fs/fp_fs.c	(revision 2575)
+++ trunk/src_plugins/fp_fs/fp_fs.c	(revision 2576)
@@ -30,10 +30,6 @@
 #include <unistd.h>
 #endif
 
-#include <dirent.h>
-#include <sys/stat.h>
-
-
 #include <stdlib.h>
 #include <string.h>
 
@@ -49,6 +45,9 @@
 #include "conf.h"
 #include "conf_core.h"
 
+/* opendir, readdir */
+#include "compat_inc.h"
+
 static fp_type_t pcb_fp_file_type(const char *fn, void ***tags);
 
 /* ---------------------------------------------------------------------------
Index: trunk/src_plugins/hid_gtk/gui.h
===================================================================
--- trunk/src_plugins/hid_gtk/gui.h	(revision 2575)
+++ trunk/src_plugins/hid_gtk/gui.h	(revision 2576)
@@ -32,7 +32,6 @@
 
 #include "data.h"
 #include "misc.h"
-#include <sys/stat.h>
 
 #include <gtk/gtk.h>
 #include "ghid-coord-entry.h"
Index: trunk/src_plugins/io_pcb/file.c
===================================================================
--- trunk/src_plugins/io_pcb/file.c	(revision 2575)
+++ trunk/src_plugins/io_pcb/file.c	(revision 2576)
@@ -33,11 +33,8 @@
 #include <locale.h>
 #include "global.h"
 
-#include <dirent.h>
 #include <time.h>
 
-#include <sys/stat.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>