diff --git a/modules/access/dv.c b/modules/access/dv.c
index b23d6fd908..20079512b4 100644
--- a/modules/access/dv.c
+++ b/modules/access/dv.c
@@ -39,9 +39,6 @@
 #ifdef HAVE_SYS_TIME_H
 #   include <sys/time.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #   include <fcntl.h>
 #endif
diff --git a/modules/access/dvb/en50221.c b/modules/access/dvb/en50221.c
index 1ad3c0e801..c3504ac2ed 100644
--- a/modules/access/dvb/en50221.c
+++ b/modules/access/dvb/en50221.c
@@ -33,12 +33,10 @@
 #include <errno.h>
 
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <time.h>
 #include <unistd.h>
-#include <sys/stat.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <netinet/in.h>
 
 /* DVB Card Drivers */
diff --git a/modules/access/dvb/linux_dvb.c b/modules/access/dvb/linux_dvb.c
index af792d8fef..8235c82119 100644
--- a/modules/access/dvb/linux_dvb.c
+++ b/modules/access/dvb/linux_dvb.c
@@ -34,12 +34,10 @@
 #include <errno.h>
 
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <time.h>
 #include <unistd.h>
-#include <sys/stat.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <vlc_charset.h>
 
 /* DVB Card Drivers */
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index a691a49817..8b4a05b27f 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -48,7 +48,6 @@
 
 #include <fcntl.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #ifdef HAVE_DVDREAD_DVD_READER_H
   #include <dvdread/dvd_reader.h>
diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index ebbf2239eb..ce2d9217bc 100644
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -47,9 +47,6 @@
 #ifdef HAVE_SYS_TYPES_H
 #   include <sys/types.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
 #ifdef HAVE_POLL
 #   include <poll.h>
 #endif
diff --git a/modules/access/pvr.c b/modules/access/pvr.c
index 0247a88dce..ce0da917ae 100644
--- a/modules/access/pvr.c
+++ b/modules/access/pvr.c
@@ -35,7 +35,6 @@
 #include <vlc_charset.h>
 
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <linux/types.h>
diff --git a/modules/access_output/file.c b/modules/access_output/file.c
index 123bcaec47..3bb110d826 100644
--- a/modules/access_output/file.c
+++ b/modules/access_output/file.c
@@ -31,7 +31,6 @@
 #endif
 
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c
index 2733660eeb..afb9bf16dc 100644
--- a/modules/access_output/udp.c
+++ b/modules/access_output/udp.c
@@ -33,7 +33,6 @@
 #include <vlc_plugin.h>
 
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <assert.h>
 
diff --git a/modules/control/http/http.h b/modules/control/http/http.h
index 7fabbac7cc..a24c6f2fcd 100644
--- a/modules/control/http/http.h
+++ b/modules/control/http/http.h
@@ -45,9 +45,6 @@
 #include <vlc_acl.h>
 #include <vlc_charset.h>
 
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #   include <fcntl.h>
 #endif
diff --git a/modules/control/telnet.c b/modules/control/telnet.c
index f35fb288b6..c2370cbec5 100644
--- a/modules/control/telnet.c
+++ b/modules/control/telnet.c
@@ -36,7 +36,6 @@
 #include <vlc_input.h>
 
 #include <stdbool.h>
-#include <sys/stat.h>
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/modules/misc/dummy/decoder.c b/modules/misc/dummy/decoder.c
index 3254168fa2..d4eb09f151 100644
--- a/modules/misc/dummy/decoder.c
+++ b/modules/misc/dummy/decoder.c
@@ -40,9 +40,6 @@
 #ifdef HAVE_SYS_TYPES_H
 #   include <sys/types.h> /* open() */
 #endif
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #   include <fcntl.h>
 #endif
diff --git a/modules/misc/lua/demux.c b/modules/misc/lua/demux.c
index 09d5f89e0a..dce8c7ae6a 100644
--- a/modules/misc/lua/demux.c
+++ b/modules/misc/lua/demux.c
@@ -36,10 +36,6 @@
 #include <vlc_strings.h>
 #include <vlc_charset.h>
 
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
-
 #include "vlc.h"
 #include "libs.h"
 #include "libs/playlist.h"
diff --git a/modules/misc/lua/libs/net.c b/modules/misc/lua/libs/net.c
index ebe5b78525..eb56a95842 100644
--- a/modules/misc/lua/libs/net.c
+++ b/modules/misc/lua/libs/net.c
@@ -42,6 +42,7 @@
 #ifdef HAVE_POLL
 #include <poll.h>       /* poll structures and defines */
 #endif
+#include <sys/stat.h>
 
 #include "../vlc.h"
 #include "../libs.h"
diff --git a/modules/misc/lua/vlc.h b/modules/misc/lua/vlc.h
index ba7fd05283..11530b87f7 100644
--- a/modules/misc/lua/vlc.h
+++ b/modules/misc/lua/vlc.h
@@ -37,10 +37,6 @@
 #include <vlc_stream.h>
 #include <vlc_charset.h>
 
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
-
 #include <lua.h>        /* Low level lua C API */
 #include <lauxlib.h>    /* Higher level C API */
 #include <lualib.h>     /* Lua libs */
diff --git a/modules/services_discovery/mtp.c b/modules/services_discovery/mtp.c
index f40fd07576..f82edf1250 100644
--- a/modules/services_discovery/mtp.c
+++ b/modules/services_discovery/mtp.c
@@ -31,10 +31,6 @@
 #include <vlc_interface.h>
 #include <vlc_services_discovery.h>
 
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #include "libmtp.h"
 
 /*****************************************************************************
diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 7de60c7564..1f6ee72543 100644
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -50,7 +50,6 @@
 #   include <sys/types.h>
 #   include <unistd.h>
 #   include <fcntl.h>
-#   include <sys/stat.h>
 #endif
 #ifdef HAVE_ARPA_INET_H
 #   include <arpa/inet.h>
diff --git a/modules/video_filter/atmo/AtmoSerialConnection.cpp b/modules/video_filter/atmo/AtmoSerialConnection.cpp
index 3d1975a814..73c1a4c097 100644
--- a/modules/video_filter/atmo/AtmoSerialConnection.cpp
+++ b/modules/video_filter/atmo/AtmoSerialConnection.cpp
@@ -15,8 +15,6 @@
 #include <stdio.h>
 #include <fcntl.h>
 
-#include <sys/stat.h>
-
 #if !defined(WIN32)
 #include <termios.h>
 #include <unistd.h>
@@ -24,7 +22,6 @@
 
 /*
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
 #include <termios.h>
diff --git a/src/interface/intf_eject.c b/src/interface/intf_eject.c
index e6618218e0..17946e41c5 100644
--- a/src/interface/intf_eject.c
+++ b/src/interface/intf_eject.c
@@ -55,7 +55,6 @@
 #   endif
 
 #   include <sys/types.h>
-#   include <sys/stat.h>
 #   include <sys/ioctl.h>
 
 #   include <sys/ioctl.h>
diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index a0c1e2aaf3..3336481769 100644
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -33,7 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>                                                /* free() */
 #include <sys/types.h>                                          /* opendir() */
-#include <sys/stat.h>
 #include <dirent.h>                                             /* opendir() */
 #include <assert.h>
 #include <time.h>                                           /* strftime */