diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index cd217d6102..a0f7e18826 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -1523,7 +1523,7 @@ Editor::sensitize_the_right_region_actions (bool because_canvas_crossing)
 
 	if (rs.size() > 1) {
 		_region_actions->get_action("show-region-list-editor")->set_sensitive (false);
-		_region_actions->get_action("show-region-properties")->set_sensitive (false);
+		_region_actions->get_action("edit-region-dedicated-window")->set_sensitive (false);
 		_region_actions->get_action("rename-region")->set_sensitive (false);
 		/* XXX need to check whether there is than 1 per
 		   playlist, because otherwise this makes no sense.
diff --git a/gtk2_ardour/nsmclient.cc b/gtk2_ardour/nsmclient.cc
index 4bcd7b43ad..7df9b7fcf3 100644
--- a/gtk2_ardour/nsmclient.cc
+++ b/gtk2_ardour/nsmclient.cc
@@ -29,7 +29,6 @@
 #ifndef COMPILER_MSVC
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #else
-#include <process.h>  // Needed for 'getpid()'
 
 #include <lo/lo_osc_types.h>
 #define LO_TT_IMMEDIATE lo_get_tt_immediate()
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index be9cb36b81..1bcf456152 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -492,6 +492,8 @@ def configure(conf):
     autowaf.check_pkg(conf, 'pangoft2', uselib_store='PANGOFT2', atleast_version='1.36.8', mandatory=False)
     autowaf.check_pkg(conf, 'fontconfig', uselib_store='FONTCONFIG')
 
+    conf.check(header_name='unistd.h', define_name='HAVE_UNISTD_H',mandatory=False)
+
     if conf.env.CC_NAME == 'gcc' and Options.options.strict:
         conf.define('GLIB_DISABLE_DEPRECATION_WARNINGS', 1)
         for var in ['CFLAGS', 'CXXFLAGS']:
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 1f940d57c7..b6b55fb697 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -341,7 +341,6 @@ def configure(conf):
 
     conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H',mandatory=False)
     conf.check(header_name='sys/statvfs.h', define_name='HAVE_SYS_STATVFS_H',mandatory=False)
-    conf.check(header_name='unistd.h', define_name='HAVE_UNISTD_H',mandatory=False)
 
     have_sys_ioprio = conf.check_cc(
             msg="Checking for 'ioprio_set' syscall support",
diff --git a/libs/pbd/pbd/abstract_ui.inc.cc b/libs/pbd/pbd/abstract_ui.inc.cc
index f3f735c973..dbc0061060 100644
--- a/libs/pbd/pbd/abstract_ui.inc.cc
+++ b/libs/pbd/pbd/abstract_ui.inc.cc
@@ -21,7 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <unistd.h>
 #include <iostream>
 #include <algorithm>
 
diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h
index dd0e2b0e08..a9f32659ba 100644
--- a/libs/surfaces/mackie/surface.h
+++ b/libs/surfaces/mackie/surface.h
@@ -20,6 +20,7 @@
 #ifndef mackie_surface_h
 #define mackie_surface_h
 
+#include <array>
 #include <stdint.h>
 
 #include <sigc++/trackable.h>