Make header files more self-contained - add missing Ardour and lib includes

gtk2_ardour/audio_trigger_properties_box.h

@@ -22,6 +22,7 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
+#include <gtkmm/spinbutton.h>
 #include <gtkmm/table.h>
 
 #include "ardour/ardour.h"

gtk2_ardour/axis_view.h

@@ -33,6 +33,7 @@
 #include "pbd/xml++.h"
 #include "pbd/signals.h"
 
+#include "ardour/automation_control.h"
 #include "ardour/session_handle.h"
 
 #include "gui_object.h"

gtk2_ardour/bundle_manager.h

@@ -20,6 +20,7 @@
 
 #pragma once
 
+#include <gtkmm/comboboxtext.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/treeview.h>

gtk2_ardour/crossfade_edit.h

@@ -28,12 +28,17 @@
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>
 #include <gtkmm/radiobutton.h>
+#include <gtkmm/table.h>
 
 #include "canvas/canvas.h"
+#include "canvas/poly_line.h"
 
 #include "evoral/Curve.h"
+#include "ardour/automation_list.h"
 #include "ardour/session_handle.h"
 
+#include "waveview/wave_view.h"
+
 #include "ardour_dialog.h"
 
 namespace ARDOUR

gtk2_ardour/cuebox_ui.h

@@ -22,6 +22,7 @@
 
 #include <gtkmm/window.h>
 #include <gtkmm/colorselection.h>
+#include <gtkmm/menu.h>
 
 #include "pbd/properties.h"
 

gtk2_ardour/editor_route_groups.h

@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include <gtkmm/box.h>
+#include <gtkmm/colorselection.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/treemodel.h>
@@ -27,6 +29,9 @@
 
 #include "editor_component.h"
 
+#include "ardour/route_group.h"
+#include "ardour/session_handle.h"
+
 class EditorRouteGroups : public EditorComponent, public ARDOUR::SessionHandlePtr
 {
 public:

gtk2_ardour/editor_summary.h

@@ -21,7 +21,11 @@
 
 #pragma once
 
+#include "ardour/session_handle.h"
+#include "ardour/types.h"
 #include "gtkmm2ext/cairo_widget.h"
+#include "pbd/property_basics.h"
+
 #include "editor_component.h"
 
 namespace ARDOUR {
@@ -29,6 +33,8 @@ namespace ARDOUR {
 }
 
 class Editor;
+class RegionView;
+class RouteTimeAxisView;
 
 /** Class to provide a visual summary of the contents of an editor window; represents
  *  the whole session as a set of lines, one per region view.

gtk2_ardour/grid_lines.h

@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "canvas/container.h"
 #include "canvas/line_set.h"
 #include "canvas/ruler.h"
 #include "ardour/tempo.h"

gtk2_ardour/io_button.h

@@ -26,6 +26,7 @@
 #include <gtkmm/menu.h>
 
 #include "ardour/data_type.h"
+#include "ardour/types.h"
 
 #include "widgets/ardour_button.h"
 

gtk2_ardour/keyeditor.h

@@ -22,6 +22,7 @@
 
 #include <string>
 
+#include <gtkmm/action.h>
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/notebook.h>
 #include <gtkmm/scrolledwindow.h>

gtk2_ardour/luawindow.h

@@ -40,6 +40,8 @@
 #include "widgets/ardour_button.h"
 #include "widgets/ardour_dropdown.h"
 
+#include "ardour_window.h"
+
 class LuaWindow :
 	public ArdourWindow,
 	public PBD::ScopedConnectionList

gtk2_ardour/mouse_cursors.h

@@ -26,6 +26,8 @@
  *  Held centrally by the Editor because some cursors are used in several places.
  */
 
+#include <gdkmm/cursor.h>
+
 #include <string>
 
 class MouseCursors

gtk2_ardour/normalize_dialog.h

@@ -21,6 +21,7 @@
 #include "progress_reporter.h"
 
 namespace Gtk {
+	class CheckButton;
 	class RadioButton;
 	class SpinButton;
 	class ProgressBar;

gtk2_ardour/panner_ui.h

@@ -49,6 +49,7 @@ namespace ARDOUR {
 }
 
 namespace Gtk {
+	class CheckMenuItem;
 	class Menu;
 	class Menuitem;
 }

gtk2_ardour/patch_change.h

@@ -23,6 +23,11 @@
 
 #include "canvas/flag.h"
 
+#include <gtkmm/menu.h>
+
+#include "midi_view.h"
+#include "patch_change_dialog.h"
+
 class MidiRegionView;
 
 namespace MIDI {

gtk2_ardour/playlist_selector.h

@@ -28,6 +28,8 @@
 #include <gtkmm/treestore.h>
 #include <gtkmm/treeview.h>
 
+#include "widgets/ardour_button.h"
+
 #include "ardour/playlist.h"
 #include "ardour/session_handle.h"
 #include "ardour_dialog.h"

gtk2_ardour/plugin_scan_dialog.h

@@ -21,6 +21,7 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>
+#include <gtkmm/frame.h>
 #include <gtkmm/label.h>
 #include <gtkmm/progressbar.h>
 #include <gtkmm/sizegroup.h>

gtk2_ardour/port_matrix_labels.h

@@ -18,11 +18,9 @@
 
 #pragma once
 
-#include "port_matrix_component.h"
+#include "ardour/bundle.h"
 
-namespace ARDOUR {
-	class BundleChannel;
-}
+#include "port_matrix_component.h"
 
 class PortMatrixLabels : public PortMatrixComponent
 {

gtk2_ardour/prh.h

@@ -26,6 +26,8 @@
 
 #include "canvas/rectangle.h"
 
+#include <gtkmm/adjustment.h>
+
 namespace ARDOUR {
 	class MidiTrack;
 }

gtk2_ardour/region_layering_order_editor.h

@@ -31,6 +31,8 @@
 
 #include "ardour_window.h"
 #include "audio_clock.h"
+#include "region_view.h"
+#include "time_axis_view.h"
 
 class PublicEditor;
 

gtk2_ardour/region_peak_cursor.h

@@ -36,7 +36,7 @@ public:
 	RegionPeakCursor (ArdourCanvas::Item*);
 	~RegionPeakCursor ();
 
-	void set (AudioRegionView*, samplepos_t, samplecnt_t);
+	void set (AudioRegionView*, samplepos_t, ARDOUR::samplecnt_t);
 	void hide ();
 	bool visible () const;
 

gtk2_ardour/route_group_menu.h

@@ -22,6 +22,9 @@
 #include "ardour/route_group.h"
 #include "ardour/session_handle.h"
 
+#include <gtkmm/menu.h>
+#include <gtkmm/radiomenuitem.h>
+
 class RouteGroupDialog;
 
 class RouteGroupMenu : public ARDOUR::SessionHandlePtr

gtk2_ardour/route_processor_selection.h

@@ -21,6 +21,8 @@
 #pragma once
 
 #include <vector>
+
+#include "pbd/property_basics.h"
 #include "pbd/signals.h"
 
 #include "processor_selection.h"

gtk2_ardour/session_dialog.h

@@ -40,6 +40,7 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/combobox.h>
+#include <gtkmm/comboboxtext.h>
 
 #include "temporal/domain_provider.h"
 

gtk2_ardour/simple_progress_dialog.h

@@ -44,7 +44,7 @@ public:
 		get_vbox()->pack_start (*cancel_button, Gtk::PACK_SHRINK);
 	}
 
-	void update_progress (samplecnt_t c, samplecnt_t t) {
+	void update_progress (ARDOUR::samplecnt_t c, ARDOUR::samplecnt_t t) {
 		pbar->set_fraction ((float) c / (float) t);
 		// see also ARDOUR_UI::gui_idle_handler();
 		int timeout = 30;

gtk2_ardour/soundcloud_export_selector.h

@@ -19,6 +19,8 @@
 #include <gtkmm/progressbar.h>
 #include <gtkmm/table.h>
 
+#include "ardour/session_handle.h"
+
 class SoundcloudExportSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 {
 public:

gtk2_ardour/startup_fsm.h

@@ -25,6 +25,11 @@
 
 #include "ardour/types.h"
 
+namespace Gtk
+{
+class Window;
+} // namespace Gtk
+
 class ArdourDialog;
 class NewUserWizard;
 class EngineControl;

gtk2_ardour/step_editor.h

@@ -28,10 +28,12 @@
 #include "pbd/signals.h"
 
 #include "temporal/beats.h"
+#include "temporal/timeline.h"
 
 namespace ARDOUR {
 class MidiTrack;
 class MidiRegion;
+class Region;
 }
 
 class MidiRegionView;

gtk2_ardour/strip_selection.h

@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include "mixer_strip.h"
+
 #include <list>
 
 class MixerStrip;

gtk2_ardour/strip_silence_dialog.h

@@ -19,11 +19,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <glibmm/threads.h>
+#include <gtkmm/progressbar.h>
 #include <gtkmm/spinbutton.h>
 #include <glibmm/threads.h>
 
 #include <pbd/xml++.h>
 
+#include "ardour/interthread_info.h"
 #include "ardour/types.h"
 #include "ardour_dialog.h"
 #include "progress_reporter.h"

gtk2_ardour/sys_ex.h

@@ -22,6 +22,8 @@
 
 #include "canvas/flag.h"
 
+#include "ardour/midi_model.h"
+
 class MidiView;
 
 class SysEx

gtk2_ardour/tempo_curve.h

@@ -27,6 +27,7 @@
 #include "ardour/ardour.h"
 #include "pbd/signals.h"
 
+#include "canvas/container.h"
 #include "canvas/types.h"
 #include "canvas/framed_curve.h"
 #include "canvas/text.h"

gtk2_ardour/time_axis_view_item.h

@@ -28,6 +28,7 @@
 #include <gdk/gdk.h>
 #include <gdkmm/color.h>
 #include <pangomm/fontdescription.h>
+#include "ardour/types.h"
 #include "pbd/signals.h"
 #include "selectable.h"
 

gtk2_ardour/track_record_axis.h

@@ -25,6 +25,7 @@
 #include <gtkmm/alignment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/drawingarea.h>
+#include <gtkmm/entry.h>
 #include <gtkmm/eventbox.h>
 #include <gtkmm/separator.h>
 #include <gtkmm/sizegroup.h>

gtk2_ardour/trigger_page.h

@@ -31,6 +31,7 @@
 #include "audio_region_operations_box.h"
 #include "audio_region_properties_box.h"
 #include "audio_trigger_properties_box.h"
+#include "axis_provider.h"
 #include "cuebox_ui.h"
 #include "fitted_canvas_widget.h"
 #include "midi_region_operations_box.h"

gtk2_ardour/visibility_group.h

@@ -21,6 +21,8 @@
 #define __ardour_visibility_group__
 
 #include <gtkmm/liststore.h>
+#include <gtkmm/widget.h>
+
 #include "pbd/signals.h"
 
 class XMLNode;

gtk2_ardour/window_manager.h

@@ -30,6 +30,8 @@
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/window_proxy.h"
 
+#include "ardour/session_handle.h"
+
 class XMLNode;
 
 namespace Gtk {

libs/ardour/ardour/comparable_shared_ptr.h

@@ -22,6 +22,8 @@
 
 #include "ardour/libardour_visibility.h"
 
+#include <boost/operators.hpp>
+
 #include <memory>
 
 namespace ARDOUR {

libs/ardour/ardour/control_group_member.h

@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "ardour/libardour_visibility.h"
+
 #include <memory>
 
 namespace ARDOUR {

libs/ardour/ardour/convolver.h

@@ -27,6 +27,7 @@
 #include "ardour/buffer_set.h"
 #include "ardour/chan_mapping.h"
 #include "ardour/readable.h"
+#include "ardour/session_handle.h"
 
 namespace ARDOUR { namespace DSP {
 

libs/ardour/ardour/logcurve.h

@@ -23,6 +23,8 @@
 #include "pbd/fastlog.h"
 #include <glibmm/threads.h>
 
+#include "ardour/libardour_visibility.h"
+
 #include <cstdint>
 
 namespace ARDOUR {

libs/ardour/ardour/midi_scene_changer.h

@@ -21,6 +21,7 @@
 
 #include <glibmm/threads.h>
 
+#include "ardour/midi_port.h"
 #include "ardour/scene_changer.h"
 
 namespace ARDOUR

libs/ardour/ardour/midi_ui.h

@@ -25,6 +25,8 @@
 #include "pbd/abstract_ui.h"
 #include "pbd/signals.h"
 
+#include "ardour/libardour_visibility.h"
+
 namespace ARDOUR {
 
 class Session;

libs/ardour/ardour/mixer_scene.h

@@ -19,16 +19,13 @@
 #ifndef _libardour_mixer_scene_h_
 #define _libardour_mixer_scene_h_
 
+#include "pbd/controllable.h"
 #include "pbd/stateful.h"
 
 #include "ardour/libardour_visibility.h"
 #include "ardour/session_handle.h"
 #include "ardour/types.h"
 
-namespace PBD {
-	class Controllable;
-}
-
 namespace ARDOUR {
 
 class LIBARDOUR_API MixerScene : public SessionHandleRef, public PBD::Stateful

libs/ardour/ardour/monitor_port.h

@@ -25,6 +25,7 @@
 #include "zita-resampler/vmresampler.h"
 
 #include "pbd/rcu.h"
+#include <pbd/signals.h>
 
 #include "ardour/audio_buffer.h"
 #include "ardour/port_engine.h"

libs/ardour/ardour/movable.h

@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "ardour/libardour_visibility.h"
+
 namespace ARDOUR {
 
 class LIBARDOUR_API Movable {

libs/ardour/ardour/panner_shell.h

@@ -26,7 +26,9 @@
 #include <string>
 #include <iostream>
 
+#include "evoral/Parameter.h"
 #include "pbd/cartesian.h"
+#include "temporal/domain_provider.h"
 
 #include "ardour/libardour_visibility.h"
 #include "ardour/types.h"

libs/ardour/ardour/peak.h

@@ -28,7 +28,7 @@ static inline float
 default_compute_peak (const ARDOUR::Sample * const buf, ARDOUR::pframes_t nsamples, float current)
 {
 	for (ARDOUR::pframes_t i = 0; i < nsamples; ++i) {
-		current = f_max (current, fabsf (buf[i]));
+		current = ARDOUR::f_max (current, fabsf (buf[i]));
 	}
 	return current;
 }

libs/ardour/ardour/proxy_controllable.h

@@ -23,6 +23,8 @@
 #include <functional>
 
 #include "pbd/controllable.h"
+
+#include "ardour/dB.h"
 #include "ardour/libardour_visibility.h"
 
 namespace ARDOUR {

libs/ardour/ardour/session_playlists.h

@@ -27,6 +27,10 @@
 
 #include <glibmm/threads.h>
 
+#include "ardour/libardour_visibility.h"
+#include "ardour/types.h"
+
+#include "temporal/domain_swap.h"
 
 #include "pbd/signals.h"
 

libs/ardour/ardour/spline.h

@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include "ardour/libardour_visibility.h"
+
 #include <cstdint>
 
 #ifdef __cplusplus

libs/ardour/ardour/step_sequencer.h

@@ -22,6 +22,7 @@
 #include <unistd.h>
 
 #include <boost/intrusive/list.hpp>
+#include <boost/rational.hpp>
 
 #include <glibmm/threads.h>
 
@@ -38,6 +39,8 @@
 #include "ardour/midi_state_tracker.h"
 #include "ardour/types.h"
 
+#include "midi++/types.h"
+
 namespace ARDOUR {
 
 class MidiBuffer;
@@ -299,7 +302,7 @@ class StepSequencer : public PBD::Stateful
 		size_t          start_step;
 		size_t          end_step;
 
-		static MultiAllocSingleReleasePool pool;
+		static PBD::MultiAllocSingleReleasePool pool;
 
 		void *operator new (size_t) {
 			return pool.alloc ();
@@ -322,7 +325,7 @@ class StepSequencer : public PBD::Stateful
 		Temporal::Beats when;
 		uint8_t buf[3];
 
-		static Pool pool;
+		static PBD::Pool pool;
 
 		void *operator new (size_t) {
 			return pool.alloc ();

libs/ardour/ardour/transport_fsm.h

@@ -12,6 +12,7 @@
 #include <iostream>
 
 #include "pbd/demangle.h"
+#include "pbd/pool.h"
 
 #include "ardour/debug.h"
 #include "ardour/types.h"

libs/ardour/ardour/trimmable.h

@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "ardour/libardour_visibility.h"
+
 namespace ARDOUR {
 
 class LIBARDOUR_API Trimmable {

libs/audiographer/audiographer/general/threader.h

@@ -5,6 +5,7 @@
 #include <vector>
 #include <algorithm>
 
+#include "glibmm/threads.h"
 #include <glibmm/threadpool.h>
 #include <glibmm/timeval.h>
 #include <sigc++/slot.h>

libs/backends/alsa/alsa_slave.h

@@ -24,6 +24,7 @@
 #include <pthread.h>
 
 #include "pbd/ringbuffer.h"
+#include "pbd/signals.h"
 
 #include "zita-resampler/vresampler.h"
 #include "zita-alsa-pcmi.h"

libs/canvas/canvas/stateful_image.h

@@ -25,6 +25,8 @@
 
 #include <cairomm/cairomm.h>
 
+#include "pbd/search_path.h"
+
 #include "canvas/item.h"
 
 class XMLNode;

libs/evoral/libsmf/smf_private.h

@@ -31,6 +31,8 @@
 #include <stdint.h>
 #include <sys/types.h>
 
+#include "smf.h"
+
 //#include "config.h"
 //#define SMF_VERSION PACKAGE_VERSION
 

libs/gtkmm2ext/gtkmm2ext/dndvbox.h

@@ -23,6 +23,8 @@
 
 #include <gtkmm/window.h>
 #include <gtkmm/box.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/label.h>
 
 #include "gtkmm2ext/visibility.h"
 #include "gtkmm2ext/widget_state.h"

libs/gtkmm2ext/gtkmm2ext/gtkutils.h

@@ -22,6 +22,8 @@
 
 #include "gtkmm2ext/visibility.h"
 
+#include <glib.h>
+
 namespace Gtk {
 	class Widget;
 }

libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h

@@ -22,6 +22,9 @@
 #include <gdk/gdkevents.h>
 
 #include "gtkmm2ext/visibility.h"
+#include "gtkmm2ext/visibility_tracker.h"
+
+#include <sigc++/trackable.h>
 
 namespace Gtk {
 	class Window;

libs/gtkmm2ext/gtkmm2ext/window_proxy.h

@@ -26,6 +26,8 @@
 
 #include "pbd/statefuldestructible.h"
 
+#include <gtkmm/action.h>
+
 #include "gtkmm2ext/visibility.h"
 
 namespace Gtk {

libs/pbd/pbd/atomic_counter.h

@@ -20,6 +20,8 @@
 #ifndef PBD_ATOMIC_COUNTER_H
 #define PBD_ATOMIC_COUNTER_H
 
+#include "pbd/atomic.h"
+
 #include <atomic>
 
 #include <glib.h>

libs/pbd/pbd/property_basics_impl.h

@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "pbd/property_basics.h"
+
 namespace PBD {
 
 template<typename T>

libs/pbd/pbd/scoped_file_descriptor.h

@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include <unistd.h>
+
 namespace PBD {
 
 struct ScopedFileDescriptor {

libs/surfaces/maschine2/ui_menu.h

@@ -24,6 +24,7 @@
 
 #include "pbd/signals.h"
 #include "canvas/container.h"
+#include "canvas/rectangle.h"
 
 namespace ArdourCanvas {
 	class Text;

libs/surfaces/osc/osc_cue_observer.h

@@ -19,6 +19,8 @@
 #ifndef __osc_osccueobserver_h__
 #define __osc_osccueobserver_h__
 
+#include "osc.h"
+
 #include <string>
 #include <memory>
 

libs/surfaces/osc/osc_global_observer.h

@@ -19,6 +19,8 @@
 #ifndef __osc_oscglobalobserver_h__
 #define __osc_oscglobalobserver_h__
 
+#include "osc.h"
+
 #include <memory>
 #include <string>
 
@@ -27,6 +29,9 @@
 
 #include "pbd/controllable.h"
 #include "pbd/stateful.h"
+
+#include "ardour/route_group.h"
+#include "ardour/session.h"
 #include "ardour/types.h"
 
 class OSCGlobalObserver

libs/surfaces/osc/osc_gui.h

@@ -18,6 +18,10 @@
 #ifndef osc_gui_h
 #define osc_gui_h
 
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/label.h>
+#include <gtkmm/notebook.h>
+#include <gtkmm/spinbutton.h>
 
 #include "osc.h"
 

libs/surfaces/osc/osc_select_observer.h

@@ -28,8 +28,10 @@
 
 #include "pbd/controllable.h"
 #include "pbd/stateful.h"
-#include "ardour/types.h"
+
 #include "ardour/processor.h"
+#include "ardour/route_group.h"
+#include "ardour/types.h"
 
 #include "osc.h"
 

libs/surfaces/push2/follow_action.h

@@ -25,8 +25,12 @@
  * correctly.
  */
 
+#include "ardour/triggerbox.h"
+
 #include "canvas/rectangle.h"
 
+#include <pangomm/fontdescription.h>
+
 namespace ArdourCanvas  {
 
 class FollowActionIcon : public ArdourCanvas::Rectangle

libs/surfaces/push2/level_meter.h

@@ -23,6 +23,9 @@
 #include "canvas/container.h"
 #include "canvas/meter.h"
 
+#include "ardour/chan_count.h"
+#include "ardour/types.h"
+
 namespace ARDOUR {
 	class PeakMeter;
 }

libs/surfaces/push2/scale.h

@@ -22,9 +22,11 @@
 #include <vector>
 
 #include "layout.h"
+#include "push2.h"
 
 namespace ArdourCanvas {
 	class Rectangle;
+	class Text;
 }
 
 namespace ArdourSurface {

libs/surfaces/push2/track_mix.h

@@ -21,7 +21,10 @@
 
 #include <vector>
 
+#include "pbd/property_basics.h"
+
 #include "layout.h"
+#include "push2.h"
 
 namespace ARDOUR {
 	class Stripable;

libs/surfaces/us2400/gui.h

@@ -20,9 +20,11 @@
 #include <vector>
 
 #include <gtkmm/combobox.h>
+#include <gtkmm/comboboxtext.h>
 #include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/table.h>
+#include <gtkmm/treestore.h>
 #include <gtkmm/treeview.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/notebook.h>

libs/surfaces/us2400/surface_port.h

@@ -21,6 +21,7 @@
 #include <midi++/types.h>
 
 #include "pbd/signals.h"
+#include "pbd/xml++.h"
 
 
 #include "midi_byte_array.h"

libs/surfaces/us2400/timer.h

@@ -19,6 +19,8 @@
 #ifndef timer_h
 #define timer_h
 
+#include <glib.h>
+
 #include <cstdint>
 
 #ifdef _WIN32

libs/widgets/widgets/binding_proxy.h

@@ -25,6 +25,8 @@
 
 #include "pbd/signals.h"
 
+#include "gdk/gdkevents.h"
+
 #include "widgets/visibility.h"
 
 namespace PBD {

libs/zita-convolver/zita-convolver/zita-convolver.h

@@ -27,6 +27,10 @@
 
 #include "zita-convolver/zconvolver_visibility.h"
 
+#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(PTW32_VERSION) || defined(__WINPTHREADS_VERSION)
+#include <semaphore.h>
+#endif
+
 namespace ArdourZita {
 
 #ifdef ZCSEMA_IS_IMPLEMENTED
@@ -36,8 +40,6 @@ namespace ArdourZita {
 /* note: mingw and msvc actually use PTW32's implementation of semaphores */
 #if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(PTW32_VERSION) || defined (__WINPTHREADS_VERSION)
 
-#include <semaphore.h>
-
 class LIBZCONVOLVER_API ZCsema
 {
 public: