diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 6255bfa108..280f72a8dc 100644
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <unistd.h>
 #include <sys/types.h>
+#include <sys/wait.h>
 #include <cstdio>
 #include <ctime>
 #include <cstdlib>
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 7bfc9426cd..c302e06681 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -27,6 +27,8 @@
 #include <fcntl.h>
 #include <cstdlib>
 #include <ctime>
+#include <sys/stat.h>
+#include <sys/mman.h>
 
 #include "pbd/error.h"
 #include "pbd/xml++.h"
diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc
index e11fe1c4fa..74dd52d504 100644
--- a/libs/ardour/audiosource.cc
+++ b/libs/ardour/audiosource.cc
@@ -20,6 +20,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <poll.h>
 #include <float.h>
 #include <utime.h>
 #include <cerrno>
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index 6ef4327343..a359f228e8 100644
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -29,6 +29,7 @@
 #include <cstdlib>
 #include <ctime>
 #include <sys/stat.h>
+#include <sys/mman.h>
 
 #include <glibmm/threads.h>
 
diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc
index 8906ddb6c4..6f54d17d02 100644
--- a/libs/ardour/midi_clock_slave.cc
+++ b/libs/ardour/midi_clock_slave.cc
@@ -20,6 +20,7 @@
 
 #include <cmath>
 #include <errno.h>
+#include <poll.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include "pbd/error.h"
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index a21f3fb6f4..9c11e818ac 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -28,6 +28,7 @@
 #include <ctime>
 #include <strings.h> // for ffs(3)
 #include <sys/stat.h>
+#include <sys/mman.h>
 
 #include "pbd/error.h"
 #include "pbd/basename.h"
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index 1887b74302..124d3f7c9b 100644
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -20,6 +20,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <poll.h>
 #include <float.h>
 #include <cerrno>
 #include <ctime>
diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index 14ca928905..8ce0722d8b 100644
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -19,6 +19,7 @@
 */
 #include <iostream>
 #include <errno.h>
+#include <poll.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index 3e7c2226cc..1d235b051a 100644
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -17,6 +17,16 @@
 
 */
 
+#include <algorithm>
+#include <string>
+#include <cmath>
+#include <cerrno>
+#include <unistd.h>
+#include <fcntl.h>
+#include <poll.h>
+
+#include <glibmm/threads.h>
+
 #include "pbd/error.h"
 #include "pbd/pthread_utils.h"
 #include "pbd/stacktrace.h"
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index 9feaa1fb2b..50a7178f1b 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -22,6 +22,8 @@
 #include <cerrno>
 #include <cassert>
 #include <unistd.h>
+#include <fcntl.h>
+#include <poll.h>
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index ff7da665ed..49a0eed559 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -33,11 +33,17 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <climits>
+#include <fcntl.h>
+#include <poll.h>
 #include <signal.h>
+#include <sys/mman.h>
 #include <sys/time.h>
 
 #ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
+#else
+#include <sys/param.h>
+#include <sys/mount.h>
 #endif
 
 #ifdef HAVE_SYS_STATVFS_H
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index f29682aeaa..cf75cffba3 100644
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -26,6 +26,8 @@
 #include <climits>
 #include <cstdarg>
 
+#include <pwd.h>
+#include <sys/utsname.h>
 #include <sys/stat.h>
 
 #include <glibmm/miscutils.h>
diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index 03039fea5b..618dddc70b 100644
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -19,6 +19,8 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
+#include <fcntl.h>
+#include <poll.h>
 #include <float.h>
 #include <cerrno>
 #include <ctime>
diff --git a/libs/pbd/sndfile_manager.cc b/libs/pbd/sndfile_manager.cc
index c028bc11ba..d1dcd05256 100644
--- a/libs/pbd/sndfile_manager.cc
+++ b/libs/pbd/sndfile_manager.cc
@@ -22,6 +22,7 @@
  */
 
 #include <sys/time.h>
+#include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>