diff --git a/src/background.c b/src/background.c
index 0ed0473b0..9eadd29f2 100644
--- a/src/background.c
+++ b/src/background.c
@@ -39,6 +39,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/wait.h>	/* waitpid() */
 #include <unistd.h>
 #include <fcntl.h>
 
diff --git a/src/command.c b/src/command.c
index e4553ea92..8b0f27422 100644
--- a/src/command.c
+++ b/src/command.c
@@ -28,6 +28,7 @@
 
 #include <config.h>
 
+#include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/src/dialog.c b/src/dialog.c
index 12d5b20a5..a7c8216b5 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -24,6 +24,7 @@
 #include <config.h>
 
 #include <ctype.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/ext.c b/src/ext.c
index ea796a413..b79bc0784 100644
--- a/src/ext.c
+++ b/src/ext.c
@@ -27,6 +27,7 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/src/file.c b/src/file.c
index 0b99bc5a5..15d5f70b8 100644
--- a/src/file.c
+++ b/src/file.c
@@ -47,9 +47,9 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/layout.c b/src/layout.c
index feb9f68cc..e801a991e 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -28,9 +28,9 @@
 
 #include <signal.h>
 #include <stdarg.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/src/main.c b/src/main.c
index 909f702d0..1e6f74beb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -36,6 +36,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 #include <unistd.h>
 #include <pwd.h>
 
diff --git a/src/setup.c b/src/setup.c
index f1bb7831e..ad8aa988b 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -22,6 +22,7 @@
 
 #include <config.h>
 
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/src/subshell.c b/src/subshell.c
index 7253415c9..c768a8354 100644
--- a/src/subshell.c
+++ b/src/subshell.c
@@ -29,13 +29,14 @@
 #endif
 
 #include <ctype.h>
-#include <stdio.h>      
+#include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <sys/types.h>
+#include <sys/wait.h>
 #ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>
 #endif
diff --git a/src/user.c b/src/user.c
index 8a16aa211..5d8eb4fe3 100644
--- a/src/user.c
+++ b/src/user.c
@@ -24,6 +24,7 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -47,7 +48,6 @@
 #include "dialog.h"
 #include "widget.h"
 #include "wtools.h"
-
 #include "view.h" /* for default_* externs */
 
 #define MAX_ENTRIES 16
diff --git a/src/utilunix.c b/src/utilunix.c
index 71a12d95d..38fe8e690 100644
--- a/src/utilunix.c
+++ b/src/utilunix.c
@@ -40,6 +40,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 #ifdef HAVE_SYS_IOCTL_H
 #   include <sys/ioctl.h>
 #endif
diff --git a/src/widget.c b/src/widget.c
index 45c1c4225..86eb69203 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -34,6 +34,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
diff --git a/vfs/vfs.h b/vfs/vfs.h
index 6abb39cb7..cc7d34238 100644
--- a/vfs/vfs.h
+++ b/vfs/vfs.h
@@ -7,6 +7,10 @@
 #ifndef MC_VFS_VFS_H
 #define MC_VFS_VFS_H
 
+#include <sys/types.h>
+#include <dirent.h>
+#include <utime.h>
+
 void vfs_init (void);
 void vfs_shut (void);