diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index c11175fe27..ab06f4952b 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -453,7 +453,7 @@ ARDOUR_UI::check_memory_locking ()
 #ifdef __APPLE__
 	/* OS X doesn't support mlockall(2), and so testing for memory locking capability there is pointless */
 	return;
-#endif
+#else // !__APPLE__
 
 	XMLNode* memory_warning_node = Config->instant_xml (X_("no-memory-warning"), get_user_ardour_path());
 
@@ -499,6 +499,7 @@ ARDOUR_UI::check_memory_locking ()
 			}
 		}
 	}
+#endif // !__APPLE__
 }
 
 
diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h
index 8e6c0bd1c7..b4d2e5e99d 100644
--- a/libs/ardour/ardour/plugin_manager.h
+++ b/libs/ardour/ardour/plugin_manager.h
@@ -7,7 +7,6 @@
 
 #include <ardour/types.h>
 #include <ardour/plugin.h>
-#include <ardour/audio_unit.h>
 
 namespace ARDOUR {