Fix OSX builds in the wake of the source-tree layout changes

gtk2_ardour/au_pluginui.mm

@@ -3,6 +3,7 @@
 
 #include <sys/time.h>
 #include <gtkmm/button.h>
+#include <gtkmm/comboboxtext.h>
 #include <gdk/gdkquartz.h>
 
 #include "pbd/convert.h"

libs/waveview/wave_view.cc

@@ -51,6 +51,10 @@
 #include "waveview/wave_view.h"
 #include "waveview/wave_view_private.h"
 
+#ifdef __APPLE__
+#define Rect ArdourCanvas::Rect
+#endif
+
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;