diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index bf4ef28765..a57e814e93 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <unistd.h>
 #include <cerrno>
 #include <vector>
 #include <exception>
diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 02e3b474fe..2bd738f724 100644
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -26,10 +26,8 @@
 
 #include <vector>
 
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <stdio.h> // for rename(), sigh
-#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 
diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc
index c9e52cb42c..c39687d2d7 100644
--- a/libs/ardour/butler.cc
+++ b/libs/ardour/butler.cc
@@ -22,7 +22,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <unistd.h>
 
 #ifdef HAVE_IOPRIO
 #include <sys/syscall.h>
diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc
index a63f050287..9cac4f0f4d 100644
--- a/libs/ardour/file_source.cc
+++ b/libs/ardour/file_source.cc
@@ -22,9 +22,7 @@
 
 #include <vector>
 
-#include <sys/time.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 
diff --git a/libs/ardour/find_session.cc b/libs/ardour/find_session.cc
index e10a155aa0..62a0fa5226 100644
--- a/libs/ardour/find_session.cc
+++ b/libs/ardour/find_session.cc
@@ -19,8 +19,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <unistd.h>
-
 #include <cstring>
 #include <climits>
 #include <cerrno>
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 8ffb70fae6..a21360f160 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -37,7 +37,6 @@
 #include <sstream>
 
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #ifndef PLATFORM_WINDOWS
 #include <sys/resource.h>
@@ -45,7 +44,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <time.h>
-#include <unistd.h>
 
 #include <glib.h>
 #include "pbd/gstdio_compat.h"
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 4fb85f8686..60f99bc84a 100644
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -29,7 +29,6 @@
 #include <string>
 #include <climits>
 #include <cerrno>
-#include <unistd.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <stdint.h>
diff --git a/libs/ardour/import_pt.cc b/libs/ardour/import_pt.cc
index 708c1e201b..e10643ae74 100644
--- a/libs/ardour/import_pt.cc
+++ b/libs/ardour/import_pt.cc
@@ -18,9 +18,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <errno.h>
-#include <unistd.h>
 #include <algorithm>
 #include <glibmm.h>
 
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 7c02d13edb..49bd225ad7 100644
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -28,7 +28,6 @@
 #include <cmath>
 #include <vector>
 
-#include <unistd.h>
 #include <locale.h>
 #include <errno.h>
 
diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index 95e1311268..3082f7ed38 100644
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -27,7 +27,6 @@
 #include <algorithm>
 #include <set>
 #include <cstdio> /* for sprintf */
-#include <unistd.h>
 #include <cerrno>
 #include <ctime>
 #include <list>
diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc
index 2ba9e60b74..204f6f0641 100644
--- a/libs/ardour/ltc_slave.cc
+++ b/libs/ardour/ltc_slave.cc
@@ -20,7 +20,6 @@
 #include <iostream>
 #include <errno.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc
index b2ead5452f..f0f00bc9eb 100644
--- a/libs/ardour/midi_clock_slave.cc
+++ b/libs/ardour/midi_clock_slave.cc
@@ -25,7 +25,7 @@
 #include <cmath>
 #include <errno.h>
 #include <sys/types.h>
-#include <unistd.h>
+
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
 #include "pbd/pthread_utils.h"
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index f7be87cb75..e6458acccc 100644
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -23,7 +23,6 @@
  */
 
 #include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <float.h>
 #include <cerrno>
diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index 8df785c51a..554b008d38 100644
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -22,7 +22,6 @@
 #include <iostream>
 #include <errno.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #include "pbd/error.h"
 #include "pbd/pthread_utils.h"
diff --git a/libs/ardour/panner_manager.cc b/libs/ardour/panner_manager.cc
index 17b4c50f85..0932c42f8b 100644
--- a/libs/ardour/panner_manager.cc
+++ b/libs/ardour/panner_manager.cc
@@ -21,8 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <unistd.h>
-
 #include <glibmm/pattern.h>
 #include <glibmm/fileutils.h>
 
diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc
index 215fb03cb8..031809ae90 100644
--- a/libs/ardour/panner_shell.cc
+++ b/libs/ardour/panner_shell.cc
@@ -29,7 +29,6 @@
 #include <string>
 #include <cstdio>
 #include <locale.h>
-#include <unistd.h>
 #include <float.h>
 #include <iomanip>
 
diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index ecc6fefacc..8a62933082 100644
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -20,7 +20,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <unistd.h>
 #include <cstdio> /* for snprintf, grrr */
 
 #include <glib.h>
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 99e6ed1854..4372cc1c20 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -36,7 +36,6 @@
 #include <cstdio> /* sprintf(3) ... grrr */
 #include <cmath>
 #include <cerrno>
-#include <unistd.h>
 #include <limits.h>
 
 #include <glibmm/datetime.h>
diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc
index 22694c9a2d..f79d12b4b3 100644
--- a/libs/ardour/session_events.cc
+++ b/libs/ardour/session_events.cc
@@ -20,7 +20,6 @@
  */
 
 #include <cmath>
-#include <unistd.h>
 
 #include "pbd/error.h"
 #include "pbd/enumwriter.h"
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index 0f13d47d2f..1c89c7cab5 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -29,8 +29,6 @@
 #include <memory>
 #include <string>
 
-#include <unistd.h>
-
 #include <glibmm/main.h>
 
 #include "midi++/mmc.h"
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index a1983cc76e..e8fd3a7cec 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -24,7 +24,6 @@
 #include <cmath>
 #include <cerrno>
 #include <algorithm>
-#include <unistd.h>
 
 #include "pbd/i18n.h"
 #include "pbd/error.h"
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 2c94165b8a..6de1b6b4e0 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -40,10 +40,8 @@
 #include <cstdio> /* snprintf(3) ... grrr */
 #include <cmath>
 
-#include <unistd.h>
 #include <climits>
 #include <signal.h>
-#include <sys/time.h>
 /* for open(2) */
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index 62125f0e9d..82063e4dc2 100644
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -25,7 +25,6 @@
 
 #include <iostream>
 #include <cmath>
-#include <unistd.h>
 
 #include "ardour/timestamps.h"
 
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index b3d7026dcf..3a852f1047 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -30,7 +30,6 @@
 
 #include <cmath>
 #include <cerrno>
-#include <unistd.h>
 
 #include "pbd/atomic.h"
 #include "pbd/error.h"
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 0d6a928898..729d2b764e 100644
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -25,14 +25,9 @@
 
 #include <vector>
 
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <errno.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "pbd/file_utils.h"
 #include "pbd/stl_delete.h"
 #include "pbd/strsplit.h"
diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index ec62828120..5d196b1ec3 100644
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -24,7 +24,7 @@
  */
 
 #include <sys/stat.h>
-#include <unistd.h>
+
 #include <float.h>
 #include <cerrno>
 #include <ctime>
diff --git a/libs/ardour/vst2_scan.cc b/libs/ardour/vst2_scan.cc
index 0233b27c74..b66de3a8fb 100644
--- a/libs/ardour/vst2_scan.cc
+++ b/libs/ardour/vst2_scan.cc
@@ -36,7 +36,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <stdint.h>
 #else
 #include <sys/utsname.h>
diff --git a/libs/ardour/worker.cc b/libs/ardour/worker.cc
index 7d13e91762..5dc6decc5d 100644
--- a/libs/ardour/worker.cc
+++ b/libs/ardour/worker.cc
@@ -18,7 +18,6 @@
  */
 
 #include <stdlib.h>
-#include <unistd.h>
 
 #include <glibmm/timer.h>