diff --git a/modules/access/file.c b/modules/access/file.c
index be9044d7240fd7abcdb83380e4c8d5486813a131..92c0411d7473cd7eeb37256932e2af92813b668c 100644
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -59,8 +59,6 @@
 #   include <ctype.h>
 #   include <shlwapi.h>
 #   include <vlc_charset.h>
-#elif defined( __OS2__ )
-#   include <ctype.h>
 #else
 #   include <unistd.h>
 #endif
diff --git a/modules/access_output/livehttp.c b/modules/access_output/livehttp.c
index 52a383d4a23975d0c0a1e69fb208cb886533e739..d335a6432b25139903790271b35444333abfbca3 100644
--- a/modules/access_output/livehttp.c
+++ b/modules/access_output/livehttp.c
@@ -33,6 +33,9 @@
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
diff --git a/modules/control/motion.c b/modules/control/motion.c
index 6b620f3844ecc3115ba765229612ca5613347ece..b234f5c2548ca02502b88ab7fdd304e9c8c8e27c 100644
--- a/modules/control/motion.c
+++ b/modules/control/motion.c
@@ -31,6 +31,7 @@
 #endif
 
 #include <math.h>
+#include <unistd.h>
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index 1c31af49b6b7b093e42726bcc0e1f9acc14a3821..33c12387b199c01400e6c2e69d49278e6d56e088 100644
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -36,6 +36,8 @@
 # include "config.h"
 #endif
 
+#include <time.h>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c
index b7fee373ad10802cfcbcec30d45459bce1af4cfb..783bda46808eae31d449a05f7d87ae9aa46f8d0f 100644
--- a/modules/stream_out/rtsp.c
+++ b/modules/stream_out/rtsp.c
@@ -43,6 +43,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <time.h>
 
 #ifndef WIN32
 # include <locale.h>
diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/video_filter/dynamicoverlay/dynamicoverlay.c
index 52dba04e8f3dbab1980aed66e9366fce09d77ef9..c7079a0db20b98e0c97ebfc902cda887f276a18e 100644
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay.c
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay.c
@@ -39,6 +39,7 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
 
 #include "dynamicoverlay.h"
 
diff --git a/src/config/file.c b/src/config/file.c
index 81b8f3a08d4d7fdf4cafaf31f8a4a0c07b07bb89..84528e1b62a66ef79cfe180eda45688c90d7a91f 100644
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -35,6 +35,9 @@
 #elif defined(HAVE_USELOCALE)
 #include <locale.h>
 #endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #include <vlc_common.h>
 #include "../libvlc.h"
diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index fc45bd92d529cab5a672c56f14b772edc0b85864..891bba1495edf1742aa2ab0f55824104ae603fa9 100644
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -37,6 +37,9 @@
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #include <vlc_common.h>
 #include <vlc_fs.h>
diff --git a/src/input/item.c b/src/input/item.c
index 13a1202638001fd0edf9a7e487b79a6b99375aec..58cfc46851a3b78a0b23a01841d69b099818750e 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -25,6 +25,7 @@
 # include "config.h"
 #endif
 #include <assert.h>
+#include <time.h>
 
 #include <vlc_common.h>
 #include <vlc_url.h>
diff --git a/src/interface/interface.c b/src/interface/interface.c
index 17ca46648da70e8430be4545efeacf9c4eee2d0d..124d5cd93d8be4e01a85e05edaf14551283891e2 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -38,6 +38,10 @@
 #endif
 
 #include <assert.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 #include <vlc_common.h>
 #include <vlc_modules.h>
 #include <vlc_interface.h>
diff --git a/src/misc/block.c b/src/misc/block.c
index a37e7fd9fd1e8d46cf694297687866a2c968d8d5..d399c4aff40a136afd514f19257380f2147a332f 100644
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -32,6 +32,10 @@
 #include <sys/stat.h>
 #include <assert.h>
 #include <errno.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 #include "vlc_block.h"
 
 /**
diff --git a/src/misc/objects.c b/src/misc/objects.c
index 07336fa9ba1e9960db35a6e4dde88d75efa31952..22ac9bc063e9f32b11c72920e3d4d8b4b9cdf10e 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -55,6 +55,7 @@
 #ifdef __OS2__
 # include <sys/socket.h>
 # include <netinet/in.h>
+# include <unistd.h>    // close(), write()
 #elif defined(WIN32)
 # include <io.h>
 # include <winsock2.h>
diff --git a/src/text/filesystem.c b/src/text/filesystem.c
index d71c099bea70432e8941e48be09b219601ba52b8..78f088ee6548a33bb4c080439ad2c5d543c0048b 100644
--- a/src/text/filesystem.c
+++ b/src/text/filesystem.c
@@ -38,6 +38,9 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 /**
  * Opens a FILE pointer.
diff --git a/src/video_output/video_epg.c b/src/video_output/video_epg.c
index 05116a49421e15e82fbd132b67163d63ca234500..d25ced167179fb6c6e9af7be9a9f66723a708f79 100644
--- a/src/video_output/video_epg.c
+++ b/src/video_output/video_epg.c
@@ -24,6 +24,8 @@
 # include "config.h"
 #endif
 
+#include <time.h>
+
 #include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_vout_osd.h>