*** NEW CODING POLICY ***

All #include statements that include a header that is a part of a library
bundled with ardour MUST use quotes, not angle brackets.

Do this:

#include "ardour/types.h"

NOT this:

#include <ardour/types.h>

Rationale:

This is best practice in general, to ensure we include the local version
and not the system version.  That quotes mean "local" (in some sense)
and angle brackets mean "system" (in some sense) is a ubiquitous
convention and IIRC right in the C spec somewhere.

More pragmatically, this is required by (my) waf (stuff) for dependencies
to work correctly.  That is:

!!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!!

Failure to comply is punishable by death by torture. :)

P.S. It's not that dramatic in all cases, but this (in combination with some
GCC flags specific to the include type) is the best way I have found to be
absolutely 100% positive the local ones are being used (and we definitely
want to be absolutely 100% positive on that one).


git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf

201 files changed, 824 insertions, 824 deletions

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 78e8778ec2..207f974d26 100644
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -25,12 +25,12 @@
 #include <ctime>
 #include <cstdlib>
 
-#include <pbd/file_utils.h>
+#include "pbd/file_utils.h"
 
-#include <ardour/svn_revision.h>
-#include <ardour/ardour.h>
-#include <ardour/version.h>
-#include <ardour/filesystem_paths.h>
+#include "ardour/svn_revision.h"
+#include "ardour/ardour.h"
+#include "ardour/version.h"
+#include "ardour/filesystem_paths.h"
 
 #include "utils.h"
 #include "version.h"
diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index fcfc6d75ce..9059ba2776 100644
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -29,11 +29,11 @@
 #include <gtkmm/accelmap.h>
 #include <gtkmm/uimanager.h>
 
-#include <pbd/error.h>
-#include <pbd/file_utils.h>
+#include "pbd/error.h"
+#include "pbd/file_utils.h"
 
-#include <ardour/ardour.h>
-#include <ardour/filesystem_paths.h>
+#include "ardour/ardour.h"
+#include "ardour/filesystem_paths.h"
 
 #include "actions.h"
 #include "i18n.h"
diff --git a/gtk2_ardour/actions.h b/gtk2_ardour/actions.h
index d8b2c64eda..c7175d1891 100644
--- a/gtk2_ardour/actions.h
+++ b/gtk2_ardour/actions.h
@@ -27,7 +27,7 @@
 #include <gtkmm/actiongroup.h>
 #include <gtkmm/accelkey.h>
 
-#include <ardour/configuration.h>
+#include "ardour/configuration.h"
 
 namespace Gtk {
 	class UIManager;
diff --git a/gtk2_ardour/add_midi_cc_track_dialog.cc b/gtk2_ardour/add_midi_cc_track_dialog.cc
index 0c393f3981..4631e1c002 100644
--- a/gtk2_ardour/add_midi_cc_track_dialog.cc
+++ b/gtk2_ardour/add_midi_cc_track_dialog.cc
@@ -22,8 +22,8 @@
 
 #include <sigc++/bind.h>
 #include <gtkmm/stock.h>
-#include <pbd/error.h>
-#include <pbd/convert.h>
+#include "pbd/error.h"
+#include "pbd/convert.h"
 
 #include "utils.h"
 #include "add_midi_cc_track_dialog.h"
diff --git a/gtk2_ardour/add_midi_cc_track_dialog.h b/gtk2_ardour/add_midi_cc_track_dialog.h
index b04456afc4..ecdc9588c8 100644
--- a/gtk2_ardour/add_midi_cc_track_dialog.h
+++ b/gtk2_ardour/add_midi_cc_track_dialog.h
@@ -25,9 +25,9 @@
 #include <gtkmm/dialog.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/spinbutton.h>
-#include <ardour/types.h>
-#include <ardour/data_type.h>
-#include <evoral/Parameter.hpp>
+#include "ardour/types.h"
+#include "ardour/data_type.h"
+#include "evoral/Parameter.hpp"
 
 class AddMidiCCTrackDialog : public Gtk::Dialog
 {
diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index ecbd2a66e3..7cc633b980 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -22,10 +22,10 @@
 
 #include <sigc++/bind.h>
 #include <gtkmm/stock.h>
-#include <pbd/error.h>
-#include <pbd/convert.h>
+#include "pbd/error.h"
+#include "pbd/convert.h"
 #include <gtkmm2ext/utils.h>
-#include <ardour/profile.h>
+#include "ardour/profile.h"
 
 #include "utils.h"
 #include "add_route_dialog.h"
diff --git a/gtk2_ardour/add_route_dialog.h b/gtk2_ardour/add_route_dialog.h
index 32e690ef27..52cb70a5da 100644
--- a/gtk2_ardour/add_route_dialog.h
+++ b/gtk2_ardour/add_route_dialog.h
@@ -31,8 +31,8 @@
 #include <gtkmm/button.h>
 #include <gtkmm/comboboxtext.h>
 
-#include <ardour/types.h>
-#include <ardour/data_type.h>
+#include "ardour/types.h"
+#include "ardour/data_type.h"
 
 class AddRouteDialog : public Gtk::Dialog
 {
diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc
index b76a1b356e..ed2b90b34f 100644
--- a/gtk2_ardour/analysis_window.cc
+++ b/gtk2_ardour/analysis_window.cc
@@ -24,9 +24,9 @@
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treeiter.h>
 
-#include <ardour/audioregion.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/types.h>
+#include "ardour/audioregion.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/types.h"
 
 #include "analysis_window.h"
 
diff --git a/gtk2_ardour/ardour_dialog.h b/gtk2_ardour/ardour_dialog.h
index 44c731b36c..3384c013d4 100644
--- a/gtk2_ardour/ardour_dialog.h
+++ b/gtk2_ardour/ardour_dialog.h
@@ -20,7 +20,7 @@
 #ifndef __ardour_dialog_h__
 #define __ardour_dialog_h__
 
-#include <ardour/ardour.h>
+#include "ardour/ardour.h"
 #include <gtkmm/window.h>
 #include <gtkmm/dialog.h>
 
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 4fdbe2209e..1038a3295c 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -36,13 +36,13 @@
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/accelmap.h>
 
-#include <pbd/error.h>
-#include <pbd/basename.h>
-#include <pbd/compose.h>
-#include <pbd/failed_constructor.h>
-#include <pbd/enumwriter.h>
-#include <pbd/memento_command.h>
-#include <pbd/file_utils.h>
+#include "pbd/error.h"
+#include "pbd/basename.h"
+#include "pbd/compose.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/enumwriter.h"
+#include "pbd/memento_command.h"
+#include "pbd/file_utils.h"
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
@@ -52,26 +52,26 @@
 #include <gtkmm2ext/popup.h>
 #include <gtkmm2ext/window_title.h>
 
-#include <midi++/manager.h>
-
-#include <ardour/ardour.h>
-#include <ardour/profile.h>
-#include <ardour/session_directory.h>
-#include <ardour/session_route.h>
-#include <ardour/session_state_utils.h>
-#include <ardour/session_utils.h>
-#include <ardour/port.h>
-#include <ardour/audioengine.h>
-#include <ardour/playlist.h>
-#include <ardour/utils.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/recent_sessions.h>
-#include <ardour/port.h>
-#include <ardour/audio_track.h>
-#include <ardour/midi_track.h>
-#include <ardour/filesystem_paths.h>
-#include <ardour/filename_extensions.h>
+#include "midi++/manager.h"
+
+#include "ardour/ardour.h"
+#include "ardour/profile.h"
+#include "ardour/session_directory.h"
+#include "ardour/session_route.h"
+#include "ardour/session_state_utils.h"
+#include "ardour/session_utils.h"
+#include "ardour/port.h"
+#include "ardour/audioengine.h"
+#include "ardour/playlist.h"
+#include "ardour/utils.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/recent_sessions.h"
+#include "ardour/port.h"
+#include "ardour/audio_track.h"
+#include "ardour/midi_track.h"
+#include "ardour/filesystem_paths.h"
+#include "ardour/filename_extensions.h"
 
 typedef uint64_t microseconds_t;
 
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 663dd633f8..f3f4d5ef3f 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -36,8 +36,8 @@
 
 #include <libgnomecanvasmm/canvas.h>
 
-#include <pbd/xml++.h>
-#include <pbd/controllable.h>
+#include "pbd/xml++.h"
+#include "pbd/controllable.h"
 #include <gtkmm/box.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/label.h>
@@ -57,10 +57,10 @@
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/stateful_button.h>
 #include <gtkmm2ext/bindable_button.h>
-#include <ardour/ardour.h>
-#include <ardour/session.h>
-#include <ardour/configuration.h>
-#include <ardour/types.h>
+#include "ardour/ardour.h"
+#include "ardour/session.h"
+#include "ardour/configuration.h"
+#include "ardour/types.h"
 
 #include "audio_clock.h"
 #include "ardour_dialog.h"
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 60f390501e..3f0b5f57e2 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -25,17 +25,17 @@
 #include <cmath>
 
 #include <sigc++/bind.h>
-#include <pbd/error.h>
-#include <pbd/basename.h>
-#include <pbd/fastlog.h>
+#include "pbd/error.h"
+#include "pbd/basename.h"
+#include "pbd/fastlog.h"
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/tearoff.h>
 
-#include <ardour/audioengine.h>
-#include <ardour/ardour.h>
-#include <ardour/profile.h>
-#include <ardour/route.h>
+#include "ardour/audioengine.h"
+#include "ardour/ardour.h"
+#include "ardour/profile.h"
+#include "ardour/route.h"
 
 #include "ardour_ui.h"
 #include "keyboard.h"
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index eacf0b50b7..2d4f390272 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -23,7 +23,7 @@
 
 #include <cstdio>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
 #include "ardour_ui.h"
 #include "public_editor.h"
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 1624824ec5..3fa662d589 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -23,7 +23,7 @@
    This is to cut down on the compile times.  It also helps with my sanity.
 */
 
-#include <ardour/session.h>
+#include "ardour/session.h"
 
 #include "actions.h"
 #include "ardour_ui.h"
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 1b4d434c15..cf8fd19ba4 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -23,8 +23,8 @@
    is to cut down on the nasty compile times for both these classes.
 */
 
-#include <pbd/file_utils.h>
-#include <pbd/fpu.h>
+#include "pbd/file_utils.h"
+#include "pbd/fpu.h"
 
 #include <glibmm/miscutils.h>
 
@@ -44,10 +44,10 @@
 #include <gtkmm2ext/sync-menu.h>
 #endif
 
-#include <ardour/session.h>
-#include <ardour/profile.h>
-#include <ardour/audioengine.h>
-#include <ardour/control_protocol_manager.h>
+#include "ardour/session.h"
+#include "ardour/profile.h"
+#include "ardour/audioengine.h"
+#include "ardour/control_protocol_manager.h"
 
 #include <control_protocol/control_protocol.h>
 
diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 1d03fd158e..f47f4c9079 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -17,17 +17,17 @@
 
 */
 
-#include <pbd/convert.h>
-#include <pbd/stacktrace.h>
+#include "pbd/convert.h"
+#include "pbd/stacktrace.h"
 
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/configuration.h>
-#include <ardour/session.h>
-#include <ardour/audioengine.h>
+#include "ardour/configuration.h"
+#include "ardour/session.h"
+#include "ardour/audioengine.h"
 
 #ifdef HAVE_LIBLO
-#include <ardour/osc.h>
+#include "ardour/osc.h"
 #endif
 
 #include "ardour_ui.h"
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index c27015801f..a53a1c7490 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -20,15 +20,15 @@
 #include <cstdio> // for sprintf
 #include <cmath>
 
-#include <pbd/convert.h>
-#include <pbd/enumwriter.h>
+#include "pbd/convert.h"
+#include "pbd/enumwriter.h"
 
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/ardour.h>
-#include <ardour/session.h>
-#include <ardour/tempo.h>
-#include <ardour/profile.h>
+#include "ardour/ardour.h"
+#include "ardour/session.h"
+#include "ardour/tempo.h"
+#include "ardour/profile.h"
 #include <sigc++/bind.h>
 
 #include "ardour_ui.h"
diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index 7c1b6d386b..1d9c550052 100644
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -25,7 +25,7 @@
 #include <gtkmm/eventbox.h>
 #include <gtkmm/label.h>
 #include <gtkmm/frame.h>
-#include <ardour/ardour.h>
+#include "ardour/ardour.h"
 
 namespace ARDOUR {
 	class Session;
diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index c36ddbc041..c746cbe6a9 100644
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -17,11 +17,11 @@
 
 */
 
-#include <pbd/memento_command.h>
+#include "pbd/memento_command.h"
 
-#include <ardour/audioregion.h>
-#include <ardour/playlist.h>
-#include <ardour/utils.h>
+#include "ardour/audioregion.h"
+#include "ardour/playlist.h"
+#include "ardour/utils.h"
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/window_title.h>
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 6af8496e9b..17de6517ac 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -24,16 +24,16 @@
 
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/playlist.h>
-#include <ardour/audioregion.h>
-#include <ardour/audiosource.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/profile.h>
+#include "ardour/playlist.h"
+#include "ardour/audioregion.h"
+#include "ardour/audiosource.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/profile.h"
 
-#include <pbd/memento_command.h>
-#include <pbd/stacktrace.h>
+#include "pbd/memento_command.h"
+#include "pbd/stacktrace.h"
 
-#include <evoral/Curve.hpp>
+#include "evoral/Curve.hpp"
 
 #include "streamview.h"
 #include "audio_region_view.h"
diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index a43ba0db86..7c40a5a4e5 100644
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -24,7 +24,7 @@
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
 #include <sigc++/signal.h>
-#include <ardour/audioregion.h>
+#include "ardour/audioregion.h"
 
 #include "region_view.h"
 #include "route_time_axis.h"
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index f102674fb4..ed56651e5f 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -24,15 +24,15 @@
 
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/audioplaylist.h>
-#include <ardour/audioregion.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/audio_track.h>
-#include <ardour/playlist_templates.h>
-#include <ardour/source.h>
-#include <ardour/region_factory.h>
-#include <ardour/profile.h>
+#include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/audio_track.h"
+#include "ardour/playlist_templates.h"
+#include "ardour/source.h"
+#include "ardour/region_factory.h"
+#include "ardour/profile.h"
 
 #include "audio_streamview.h"
 #include "audio_region_view.h"
diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index d7f0c2571e..e8a2c64a03 100644
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -25,7 +25,7 @@
 
 #include <boost/weak_ptr.hpp>
 
-#include <ardour/location.h>
+#include "ardour/location.h"
 #include "editing.h"
 #include "simplerect.h"
 #include "streamview.h"
diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 16a9ef6b2f..609d7b7d6c 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -27,9 +27,9 @@
 
 #include <sigc++/bind.h>
 
-#include <pbd/error.h>
-#include <pbd/stl_delete.h>
-#include <pbd/memento_command.h>
+#include "pbd/error.h"
+#include "pbd/stl_delete.h"
+#include "pbd/memento_command.h"
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/selector.h>
@@ -37,17 +37,17 @@
 #include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/audio_diskstream.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/event_type_map.h>
-#include <ardour/location.h>
-#include <ardour/panner.h>
-#include <ardour/playlist.h>
-#include <ardour/processor.h>
-#include <ardour/profile.h>
-#include <ardour/session.h>
-#include <ardour/session_playlist.h>
-#include <ardour/utils.h>
+#include "ardour/audio_diskstream.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/event_type_map.h"
+#include "ardour/location.h"
+#include "ardour/panner.h"
+#include "ardour/playlist.h"
+#include "ardour/processor.h"
+#include "ardour/profile.h"
+#include "ardour/session.h"
+#include "ardour/session_playlist.h"
+#include "ardour/utils.h"
 
 #include "ardour_ui.h"
 #include "audio_time_axis.h"
@@ -65,7 +65,7 @@
 #include "audio_streamview.h"
 #include "utils.h"
 
-#include <ardour/audio_track.h>
+#include "ardour/audio_track.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index f3bdbd3fb6..bd2fa6b5d6 100644
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -31,7 +31,7 @@
 #include <gtkmm2ext/selector.h>
 #include <list>
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 #include "ardour_dialog.h"
 #include "route_ui.h"
diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index 6f62608f0a..cf79eb4d48 100644
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -18,7 +18,7 @@
 
 */
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 #include "ardour/automation_list.h"
 #include "ardour/automation_control.h"
 #include "ardour/event_type_map.h"
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index d141bafad1..8156ec2a04 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -22,13 +22,13 @@
 #include <vector>
 #include <fstream>
 
-#include <pbd/stl_delete.h>
-#include <pbd/memento_command.h>
-#include <pbd/stacktrace.h>
+#include "pbd/stl_delete.h"
+#include "pbd/memento_command.h"
+#include "pbd/stacktrace.h"
 
-#include <ardour/automation_list.h>
-#include <ardour/dB.h>
-#include <evoral/Curve.hpp>
+#include "ardour/automation_list.h"
+#include "ardour/dB.h"
+#include "evoral/Curve.hpp"
 
 #include "simplerect.h"
 #include "automation_line.h"
@@ -44,8 +44,8 @@
 #include "automation_time_axis.h"
 #include "public_editor.h"
 
-#include <ardour/event_type_map.h>
-#include <ardour/session.h>
+#include "ardour/event_type_map.h"
+#include "ardour/session.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 5e1f5b6af0..b312cbd685 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -30,13 +30,13 @@
 #include "canvas.h"
 #include "simplerect.h"
 
-#include <evoral/TimeConverter.hpp>
+#include "evoral/TimeConverter.hpp"
 
-#include <pbd/undo.h>
-#include <pbd/statefuldestructible.h> 
+#include "pbd/undo.h"
+#include "pbd/statefuldestructible.h" 
 
-#include <ardour/automation_list.h>
-#include <ardour/types.h>
+#include "ardour/automation_list.h"
+#include "ardour/types.h"
 
 class AutomationLine;
 class ControlPoint;
diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index 3ba0794b17..dc0a5b07cd 100644
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -17,11 +17,11 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <pbd/memento_command.h>
-#include <ardour/automation_control.h>
-#include <ardour/event_type_map.h>
-#include <ardour/session.h>
-#include <ardour/source.h>
+#include "pbd/memento_command.h"
+#include "ardour/automation_control.h"
+#include "ardour/event_type_map.h"
+#include "ardour/session.h"
+#include "ardour/source.h"
 #include "automation_region_view.h"
 #include "public_editor.h"
 
diff --git a/gtk2_ardour/automation_region_view.h b/gtk2_ardour/automation_region_view.h
index dfe774aba6..99a344d681 100644
--- a/gtk2_ardour/automation_region_view.h
+++ b/gtk2_ardour/automation_region_view.h
@@ -20,8 +20,8 @@
 #ifndef __gtk_ardour_automation_region_view_h__
 #define __gtk_ardour_automation_region_view_h__
 
-#include <ardour/diskstream.h>
-#include <ardour/types.h>
+#include "ardour/diskstream.h"
+#include "ardour/types.h"
 
 #include "region_view.h"
 #include "automation_time_axis.h"
diff --git a/gtk2_ardour/automation_selectable.h b/gtk2_ardour/automation_selectable.h
index f81b265982..e7139bedf0 100644
--- a/gtk2_ardour/automation_selectable.h
+++ b/gtk2_ardour/automation_selectable.h
@@ -20,7 +20,7 @@
 #ifndef __ardour_gtk_automation_selectable_h__
 #define __ardour_gtk_automation_selectable_h__
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 #include "selectable.h"
 
 class TimeAxisView;
diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc
index 2769ab846d..c36085a77c 100644
--- a/gtk2_ardour/automation_streamview.cc
+++ b/gtk2_ardour/automation_streamview.cc
@@ -24,13 +24,13 @@
 
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/midi_playlist.h>
-#include <ardour/midi_region.h>
-#include <ardour/midi_source.h>
-#include <ardour/midi_diskstream.h>
-#include <ardour/midi_track.h>
-#include <ardour/smf_source.h>
-#include <ardour/region_factory.h>
+#include "ardour/midi_playlist.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_source.h"
+#include "ardour/midi_diskstream.h"
+#include "ardour/midi_track.h"
+#include "ardour/smf_source.h"
+#include "ardour/region_factory.h"
 
 #include "automation_streamview.h"
 #include "region_view.h"
diff --git a/gtk2_ardour/automation_streamview.h b/gtk2_ardour/automation_streamview.h
index 4188e7e983..d11de8113b 100644
--- a/gtk2_ardour/automation_streamview.h
+++ b/gtk2_ardour/automation_streamview.h
@@ -22,7 +22,7 @@
 #include <list>
 #include <cmath>
 
-#include <ardour/location.h>
+#include "ardour/location.h"
 #include "enums.h"
 #include "simplerect.h"
 #include "streamview.h"
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index abdfa9841d..5d6b48850e 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -19,10 +19,10 @@
 
 #include <utility>
 #include <gtkmm2ext/barcontroller.h>
-#include <pbd/memento_command.h>
-#include <ardour/automation_control.h>
-#include <ardour/event_type_map.h>
-#include <ardour/route.h>
+#include "pbd/memento_command.h"
+#include "ardour/automation_control.h"
+#include "ardour/event_type_map.h"
+#include "ardour/route.h"
 
 #include "ardour_ui.h"
 #include "automation_time_axis.h"
diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index fe44c5d2b7..6df4536ca6 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -27,9 +27,9 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <ardour/types.h>
-#include <ardour/automatable.h>
-#include <ardour/automation_list.h>
+#include "ardour/types.h"
+#include "ardour/automatable.h"
+#include "ardour/automation_list.h"
 
 #include "canvas.h"
 #include "time_axis_view.h"
diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc
index f22b0d2dc7..e4632dc9ca 100644
--- a/gtk2_ardour/axis_view.cc
+++ b/gtk2_ardour/axis_view.cc
@@ -25,14 +25,14 @@
 
 #include <list>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/session.h>
-#include <ardour/utils.h>
+#include "ardour/session.h"
+#include "ardour/utils.h"
 
 #include "public_editor.h"
 #include "axis_view.h"
diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 3a15e05c99..187443dab6 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -25,7 +25,7 @@
 #include <gtkmm/label.h>
 #include <gdkmm/color.h>
 
-#include <pbd/xml++.h>
+#include "pbd/xml++.h"
 #include "prompter.h"
 #include "selectable.h"
 
diff --git a/gtk2_ardour/canvas-flag.h b/gtk2_ardour/canvas-flag.h
index ad8c506d65..a9dbb09175 100644
--- a/gtk2_ardour/canvas-flag.h
+++ b/gtk2_ardour/canvas-flag.h
@@ -5,7 +5,7 @@
 #include <libgnomecanvasmm/group.h>
 #include <libgnomecanvasmm/widget.h>
 
-#include <ardour/midi_model.h>
+#include "ardour/midi_model.h"
 
 #include "simplerect.h"
 #include "simpleline.h"
diff --git a/gtk2_ardour/control_point.h b/gtk2_ardour/control_point.h
index 013ba71e49..d8c18f10b3 100644
--- a/gtk2_ardour/control_point.h
+++ b/gtk2_ardour/control_point.h
@@ -22,7 +22,7 @@
 
 #include <sys/types.h>
 
-#include <ardour/automation_list.h>
+#include "ardour/automation_list.h"
 
 #include "canvas.h"
 #include "simplerect.h"
diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index f6a0d7e1f7..bbbe72e91b 100644
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -27,16 +27,16 @@
 
 #include <libgnomecanvasmm/line.h>
 
-#include <ardour/automation_list.h>
-#include <evoral/Curve.hpp>
-#include <ardour/crossfade.h>
-#include <ardour/session.h>
-#include <ardour/auditioner.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audiosource.h>
-#include <ardour/playlist_templates.h>
-#include <ardour/region_factory.h>
-#include <ardour/profile.h>
+#include "ardour/automation_list.h"
+#include "evoral/Curve.hpp"
+#include "ardour/crossfade.h"
+#include "ardour/session.h"
+#include "ardour/auditioner.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audiosource.h"
+#include "ardour/playlist_templates.h"
+#include "ardour/region_factory.h"
+#include "ardour/profile.h"
 
 #include <gtkmm2ext/gtk_ui.h>
 
diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h
index 685dc43772..4b905a85c2 100644
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -26,7 +26,7 @@
 #include <gtkmm/button.h>
 #include <gtkmm/radiobutton.h>
 
-#include <evoral/Curve.hpp>
+#include "evoral/Curve.hpp"
 #include "ardour_dialog.h"
 #include "canvas.h"
 
diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc
index c4a74b8a18..63c2115b87 100644
--- a/gtk2_ardour/crossfade_view.cc
+++ b/gtk2_ardour/crossfade_view.cc
@@ -19,7 +19,7 @@
 
 #include <algorithm>
 
-#include <ardour/region.h>
+#include "ardour/region.h"
 #include <gtkmm2ext/doi.h>
 
 #include "canvas-simplerect.h"
diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h
index 6d45f05e79..fc41f7f721 100644
--- a/gtk2_ardour/crossfade_view.h
+++ b/gtk2_ardour/crossfade_view.h
@@ -23,7 +23,7 @@
 #include <vector>
 #include <libgnomecanvasmm.h>
 #include <sigc++/signal.h>
-#include <ardour/crossfade.h>
+#include "ardour/crossfade.h"
 
 #include "time_axis_view_item.h"
 
diff --git a/gtk2_ardour/curvetest.cc b/gtk2_ardour/curvetest.cc
index 15195ff2a5..4710cfb821 100644
--- a/gtk2_ardour/curvetest.cc
+++ b/gtk2_ardour/curvetest.cc
@@ -22,8 +22,8 @@
 #include <cfloat>
 #include <unistd.h>
 
-#include <ardour/automation_list.h>
-#include <evoral/Curve.hpp>
+#include "ardour/automation_list.h"
+#include "evoral/Curve.hpp"
 
 using namespace std;
 using namespace ARDOUR;
diff --git a/gtk2_ardour/draginfo.h b/gtk2_ardour/draginfo.h
index e0fccb7f70..cdc0b8e9c6 100644
--- a/gtk2_ardour/draginfo.h
+++ b/gtk2_ardour/draginfo.h
@@ -28,7 +28,7 @@
 #include "canvas.h"
 #include "editor_items.h"
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 namespace ARDOUR {
 	class Location;
diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h
index d6608e3d8b..d2c9ba97b7 100644
--- a/gtk2_ardour/editing.h
+++ b/gtk2_ardour/editing.h
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <map>
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 // This involves some cpp magic. --taybin
 
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 65a7c2ef69..2062a426a9 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -29,10 +29,10 @@
 
 #include <sigc++/bind.h>
 
-#include <pbd/convert.h>
-#include <pbd/error.h>
-#include <pbd/enumwriter.h>
-#include <pbd/memento_command.h>
+#include "pbd/convert.h"
+#include "pbd/error.h"
+#include "pbd/enumwriter.h"
+#include "pbd/memento_command.h"
 
 #include <glibmm/miscutils.h>
 #include <gtkmm/image.h>
@@ -46,20 +46,20 @@
 #include <gtkmm2ext/window_title.h>
 #include <gtkmm2ext/choice.h>
 
-#include <ardour/audio_diskstream.h>
-#include <ardour/audio_track.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audioregion.h>
-#include <ardour/location.h>
-#include <ardour/midi_region.h>
-#include <ardour/plugin_manager.h>
-#include <ardour/profile.h>
-#include <ardour/route_group.h>
-#include <ardour/session_directory.h>
-#include <ardour/session_route.h>
-#include <ardour/session_state_utils.h>
-#include <ardour/tempo.h>
-#include <ardour/utils.h>
+#include "ardour/audio_diskstream.h"
+#include "ardour/audio_track.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
+#include "ardour/location.h"
+#include "ardour/midi_region.h"
+#include "ardour/plugin_manager.h"
+#include "ardour/profile.h"
+#include "ardour/route_group.h"
+#include "ardour/session_directory.h"
+#include "ardour/session_route.h"
+#include "ardour/session_state_utils.h"
+#include "ardour/tempo.h"
+#include "ardour/utils.h"
 
 #include <control_protocol/control_protocol.h>
 
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index a77454a5e0..571b612294 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -45,14 +45,14 @@
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/dndtreeview.h>
 
-#include <pbd/stateful.h>
-#include <ardour/session.h>
-#include <ardour/tempo.h>
-#include <ardour/stretch.h>
-#include <ardour/location.h>
-#include <ardour/audioregion.h>
-#include <ardour/track.h>
-#include <ardour/types.h>
+#include "pbd/stateful.h"
+#include "ardour/session.h"
+#include "ardour/tempo.h"
+#include "ardour/stretch.h"
+#include "ardour/location.h"
+#include "ardour/audioregion.h"
+#include "ardour/track.h"
+#include "ardour/types.h"
 
 #include "audio_clock.h"
 #include "gtk-custom-ruler.h"
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 84e111e990..63c0b79bc0 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -17,8 +17,8 @@
 
 */
 
-#include <ardour/ardour.h>
-#include <ardour/profile.h>
+#include "ardour/ardour.h"
+#include "ardour/profile.h"
 
 #include "actions.h"
 #include "ardour_ui.h"
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 730063655a..4301e1ac34 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -26,28 +26,28 @@
 
 #include <sndfile.h>
 
-#include <pbd/pthread_utils.h>
-#include <pbd/basename.h>
-#include <pbd/shortpath.h>
+#include "pbd/pthread_utils.h"
+#include "pbd/basename.h"
+#include "pbd/shortpath.h"
 
 #include <gtkmm2ext/choice.h>
 #include <gtkmm2ext/window_title.h>
 
-#include <ardour/session.h>
-#include <ardour/session_directory.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audioregion.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/midi_track.h>
-#include <ardour/midi_region.h>
-#include <ardour/utils.h>
-#include <ardour/audio_track.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/region_factory.h>
-#include <ardour/source_factory.h>
-#include <ardour/session.h>
-#include <pbd/memento_command.h>
+#include "ardour/session.h"
+#include "ardour/session_directory.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/midi_track.h"
+#include "ardour/midi_region.h"
+#include "ardour/utils.h"
+#include "ardour/audio_track.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/region_factory.h"
+#include "ardour/source_factory.h"
+#include "ardour/session.h"
+#include "pbd/memento_command.h"
 
 #include "ardour_ui.h"
 #include "editor.h"
diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index 7e821f0e5e..693a7a6af9 100644
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -17,8 +17,8 @@
 
 */
 
-#include <ardour/location.h>
-#include <ardour/audio_diskstream.h>
+#include "ardour/location.h"
+#include "ardour/audio_diskstream.h"
 
 #include "ardour_ui.h"
 #include "editor.h"
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 848c663200..bdb051173d 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -22,8 +22,8 @@
 #include <jack/types.h>
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/audioregion.h>
-#include <ardour/profile.h>
+#include "ardour/audioregion.h"
+#include "ardour/profile.h"
 
 #include "ardour_ui.h"
 #include "editor.h"
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 478fc1afe4..c0e90abf39 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -22,10 +22,10 @@
 #include <algorithm>
 #include <typeinfo>
 
-#include <pbd/stacktrace.h>
+#include "pbd/stacktrace.h"
 
-#include <ardour/audio_diskstream.h>
-#include <ardour/audioplaylist.h>
+#include "ardour/audio_diskstream.h"
+#include "ardour/audioplaylist.h"
 
 #include "editor.h"
 #include "keyboard.h"
diff --git a/gtk2_ardour/editor_edit_groups.cc b/gtk2_ardour/editor_edit_groups.cc
index 371b13ed0c..55b264f87f 100644
--- a/gtk2_ardour/editor_edit_groups.cc
+++ b/gtk2_ardour/editor_edit_groups.cc
@@ -22,7 +22,7 @@
 
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/gtk_ui.h>
-#include <ardour/route_group.h>
+#include "ardour/route_group.h"
 
 #include "editor.h"
 #include "keyboard.h"
@@ -31,7 +31,7 @@
 #include "prompter.h"
 #include "gui_thread.h"
 
-#include <ardour/route.h>
+#include "ardour/route.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index ea1876ca94..ca73c4d8b0 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -32,17 +32,17 @@
 #include "audio_time_axis.h"
 #include "audio_region_view.h"
 
-#include <pbd/pthread_utils.h>
-#include <ardour/types.h>
-#include <ardour/audio_track.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/audioregion.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/chan_count.h>
-#include <ardour/session_directory.h>
-#include <ardour/source_factory.h>
-#include <ardour/audiofilesource.h>
+#include "pbd/pthread_utils.h"
+#include "ardour/types.h"
+#include "ardour/audio_track.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/audioregion.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/chan_count.h"
+#include "ardour/session_directory.h"
+#include "ardour/source_factory.h"
+#include "ardour/audiofilesource.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/editor_hscroller.cc b/gtk2_ardour/editor_hscroller.cc
index f5f94c4163..b5f265daa5 100644
--- a/gtk2_ardour/editor_hscroller.cc
+++ b/gtk2_ardour/editor_hscroller.cc
@@ -19,7 +19,7 @@
 
 #include "editor.h"
 
-#include <ardour/session.h>
+#include "ardour/session.h"
 
 using namespace std;
 using namespace ARDOUR;
diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc
index d4bf497591..5ff1fc6459 100644
--- a/gtk2_ardour/editor_imageframe.cc
+++ b/gtk2_ardour/editor_imageframe.cc
@@ -30,7 +30,7 @@
 #include "canvas_impl.h"
 
 #include <gtkmm2ext/gtk_ui.h>
-#include <pbd/error.h>
+#include "pbd/error.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
index 257ebc487a..32b797a1a0 100644
--- a/gtk2_ardour/editor_keyboard.cc
+++ b/gtk2_ardour/editor_keyboard.cc
@@ -17,11 +17,11 @@
 
 */
 
-#include <ardour/audioregion.h>
-#include <ardour/playlist.h>
-#include <ardour/location.h>
+#include "ardour/audioregion.h"
+#include "ardour/playlist.h"
+#include "ardour/location.h"
 
-#include <pbd/memento_command.h>
+#include "pbd/memento_command.h"
 
 #include "editor.h"
 #include "region_view.h"
diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index efbe0cb522..1826ee464d 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -21,10 +21,10 @@
 #include <cmath>
 #include <string>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
-#include <ardour/session.h>
-#include <ardour/region.h>
+#include "ardour/session.h"
+#include "ardour/region.h"
 #include <gtkmm/treeview.h>
 
 #include "ardour_ui.h"
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 0504c08095..6406f04e54 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -25,9 +25,9 @@
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/window_title.h>
 
-#include <ardour/location.h>
-#include <ardour/profile.h>
-#include <pbd/memento_command.h>
+#include "ardour/location.h"
+#include "ardour/profile.h"
+#include "pbd/memento_command.h"
 
 #include "editor.h"
 #include "marker.h"
diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 04caa99f28..add7213400 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -21,9 +21,9 @@
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/window_title.h>
 
-#include <pbd/enumwriter.h>
+#include "pbd/enumwriter.h"
 
-#include <ardour/audioengine.h>
+#include "ardour/audioengine.h"
 
 #include "editor.h"
 #include "mixer_strip.h"
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 49c067746d..051463f200 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -25,11 +25,11 @@
 #include <string>
 #include <algorithm>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/tearoff.h>
-#include <pbd/memento_command.h>
-#include <pbd/basename.h>
+#include "pbd/memento_command.h"
+#include "pbd/basename.h"
 
 #include "ardour_ui.h"
 #include "editor.h"
@@ -50,20 +50,20 @@
 #include "rgb_macros.h"
 #include "control_point_dialog.h"
 
-#include <ardour/types.h>
-#include <ardour/profile.h>
-#include <ardour/route.h>
-#include <ardour/audio_track.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/midi_diskstream.h>
-#include <ardour/playlist.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audioregion.h>
-#include <ardour/midi_region.h>
-#include <ardour/dB.h>
-#include <ardour/utils.h>
-#include <ardour/region_factory.h>
-#include <ardour/source_factory.h>
+#include "ardour/types.h"
+#include "ardour/profile.h"
+#include "ardour/route.h"
+#include "ardour/audio_track.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/midi_diskstream.h"
+#include "ardour/playlist.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
+#include "ardour/midi_region.h"
+#include "ardour/dB.h"
+#include "ardour/utils.h"
+#include "ardour/region_factory.h"
+#include "ardour/source_factory.h"
 
 #include <bitset>
 
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index ab53490cff..07fa68f714 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -27,33 +27,33 @@
 #include <map>
 #include <set>
 
-#include <pbd/error.h>
-#include <pbd/basename.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/memento_command.h>
-#include <pbd/whitespace.h>
+#include "pbd/error.h"
+#include "pbd/basename.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/memento_command.h"
+#include "pbd/whitespace.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/choice.h>
 #include <gtkmm2ext/window_title.h>
 #include <gtkmm2ext/popup.h>
 
-#include <ardour/audioengine.h>
-#include <ardour/session.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audioregion.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/utils.h>
-#include <ardour/location.h>
-#include <ardour/named_selection.h>
-#include <ardour/audio_track.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/region_factory.h>
-#include <ardour/playlist_factory.h>
-#include <ardour/reverse.h>
-#include <ardour/transient_detector.h>
-#include <ardour/dB.h>
-#include <ardour/quantize.h>
+#include "ardour/audioengine.h"
+#include "ardour/session.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/utils.h"
+#include "ardour/location.h"
+#include "ardour/named_selection.h"
+#include "ardour/audio_track.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/region_factory.h"
+#include "ardour/playlist_factory.h"
+#include "ardour/reverse.h"
+#include "ardour/transient_detector.h"
+#include "ardour/dB.h"
+#include "ardour/quantize.h"
 
 #include "ardour_ui.h"
 #include "editor.h"
diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc
index b97c8acc9e..338dc71221 100644
--- a/gtk2_ardour/editor_region_list.cc
+++ b/gtk2_ardour/editor_region_list.cc
@@ -23,13 +23,13 @@
 #include <string>
 #include <sstream>
 
-#include <pbd/basename.h>
+#include "pbd/basename.h"
 
-#include <ardour/audioregion.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/silentfilesource.h>
-#include <ardour/session_region.h>
-#include <ardour/profile.h>
+#include "ardour/audioregion.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/silentfilesource.h"
+#include "ardour/session_region.h"
+#include "ardour/profile.h"
 
 #include <gtkmm2ext/stop_signal.h>
 
diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index 2847416397..ef6bbde471 100644
--- a/gtk2_ardour/editor_route_list.cc
+++ b/gtk2_ardour/editor_route_list.cc
@@ -33,9 +33,9 @@
 #include "gui_thread.h"
 #include "actions.h"
 
-#include <pbd/unknown_type.h>
+#include "pbd/unknown_type.h"
 
-#include <ardour/route.h>
+#include "ardour/route.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 0835cd81ab..0998b86bd9 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -24,8 +24,8 @@
 
 #include <gtk/gtkaction.h>
 
-#include <ardour/tempo.h>
-#include <ardour/profile.h>
+#include "ardour/tempo.h"
+#include "ardour/profile.h"
 #include <gtkmm2ext/gtk_ui.h>
 
 #include "editor.h"
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index 305ad77902..05b1296075 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -20,12 +20,12 @@
 #include <algorithm>
 #include <cstdlib>
 
-#include <pbd/stacktrace.h>
+#include "pbd/stacktrace.h"
 
-#include <ardour/diskstream.h>
-#include <ardour/playlist.h>
-#include <ardour/route_group.h>
-#include <ardour/profile.h>
+#include "ardour/diskstream.h"
+#include "ardour/playlist.h"
+#include "ardour/route_group.h"
+#include "ardour/profile.h"
 
 #include "editor.h"
 #include "actions.h"
diff --git a/gtk2_ardour/editor_selection_list.cc b/gtk2_ardour/editor_selection_list.cc
index 1d75bf5d13..7f818ebe2b 100644
--- a/gtk2_ardour/editor_selection_list.cc
+++ b/gtk2_ardour/editor_selection_list.cc
@@ -23,9 +23,9 @@
 
 #include <gtkmm.h>
 
-#include <ardour/named_selection.h>
-#include <ardour/session_selection.h>
-#include <ardour/playlist.h>
+#include "ardour/named_selection.h"
+#include "ardour/session_selection.h"
+#include "ardour/playlist.h"
 
 #include <gtkmm2ext/stop_signal.h>
 
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 9bef055b57..00d0b94a0e 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -25,14 +25,14 @@
 
 #include <libgnomecanvasmm.h>
 
-#include <pbd/error.h>
-#include <pbd/memento_command.h>
+#include "pbd/error.h"
+#include "pbd/memento_command.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/session.h>
-#include <ardour/tempo.h>
+#include "ardour/session.h"
+#include "ardour/tempo.h"
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/utils.h>
 
diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc
index 8192085e96..19d574db27 100644
--- a/gtk2_ardour/editor_timefx.cc
+++ b/gtk2_ardour/editor_timefx.cc
@@ -23,9 +23,9 @@
 
 #include <string>
 
-#include <pbd/error.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/memento_command.h>
+#include "pbd/error.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/memento_command.h"
 
 #include <gtkmm2ext/window_title.h>
 #include <gtkmm2ext/utils.h>
@@ -35,15 +35,15 @@
 #include "audio_region_view.h"
 #include "region_selection.h"
 
-#include <ardour/session.h>
-#include <ardour/region.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audio_track.h>
-#include <ardour/audioregion.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/stretch.h>
-#include <ardour/midi_stretch.h>
-#include <ardour/pitch.h>
+#include "ardour/session.h"
+#include "ardour/region.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audio_track.h"
+#include "ardour/audioregion.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/stretch.h"
+#include "ardour/midi_stretch.h"
+#include "ardour/pitch.h"
 
 #ifdef USE_RUBBERBAND
 #include <rubberband/RubberBandStretcher.h>
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index f2bde63e0c..8ab92033c2 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -5,7 +5,7 @@
 
 #include <glibmm.h>
 #include <gtkmm/messagedialog.h>
-#include <pbd/xml++.h>
+#include "pbd/xml++.h"
 
 #ifdef __APPLE__
 #include <CoreAudio/CoreAudio.h>
@@ -16,15 +16,15 @@
 #include <alsa/asoundlib.h>
 #endif
 
-#include <ardour/profile.h>
+#include "ardour/profile.h"
 #include <jack/jack.h>
 
 #include <gtkmm/stock.h>
 #include <gtkmm2ext/utils.h>
 
-#include <pbd/convert.h>
-#include <pbd/error.h>
-#include <pbd/pathscanner.h>
+#include "pbd/convert.h"
+#include "pbd/error.h"
+#include "pbd/pathscanner.h"
 
 #ifdef __APPLE
 #include <CFBundle.h>
diff --git a/gtk2_ardour/enums.cc b/gtk2_ardour/enums.cc
index 9ed5bdfd8c..513be94aef 100644
--- a/gtk2_ardour/enums.cc
+++ b/gtk2_ardour/enums.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include <pbd/enumwriter.h>
+#include "pbd/enumwriter.h"
 
 #include "audio_clock.h"
 #include "editing.h"
diff --git a/gtk2_ardour/enums.h b/gtk2_ardour/enums.h
index ebd061cc40..00b7a6e56c 100644
--- a/gtk2_ardour/enums.h
+++ b/gtk2_ardour/enums.h
@@ -20,7 +20,7 @@
 #ifndef __ardour_gtk_enums_h__
 #define __ardour_gtk_enums_h__
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 enum Width {
 	Wide,
diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc
index 1f1472d830..509f465b7b 100644
--- a/gtk2_ardour/export_channel_selector.cc
+++ b/gtk2_ardour/export_channel_selector.cc
@@ -22,16 +22,16 @@
 
 #include <algorithm>
 
-#include <pbd/convert.h>
-
-#include <ardour/audio_port.h>
-#include <ardour/audio_track.h>
-#include <ardour/audioengine.h>
-#include <ardour/export_channel_configuration.h>
-#include <ardour/export_handler.h>
-#include <ardour/io.h>
-#include <ardour/route.h>
-#include <ardour/session.h>
+#include "pbd/convert.h"
+
+#include "ardour/audio_port.h"
+#include "ardour/audio_track.h"
+#include "ardour/audioengine.h"
+#include "ardour/export_channel_configuration.h"
+#include "ardour/export_handler.h"
+#include "ardour/io.h"
+#include "ardour/route.h"
+#include "ardour/session.h"
 
 #include <sstream>
 
diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h
index 595dae2562..9f1217c53d 100644
--- a/gtk2_ardour/export_channel_selector.h
+++ b/gtk2_ardour/export_channel_selector.h
@@ -23,8 +23,8 @@
 
 #include <list>
 
-#include <ardour/export_profile_manager.h>
-#include <ardour/export_channel.h>
+#include "ardour/export_profile_manager.h"
+#include "ardour/export_channel.h"
 
 #include <gtkmm.h>
 #include <sigc++/signal.h>
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index c533e4489e..4f11ad410e 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -22,10 +22,10 @@
 
 #include <sigc++/signal.h>
 
-#include <pbd/filesystem.h>
+#include "pbd/filesystem.h"
 
-#include <ardour/export_status.h>
-#include <ardour/export_handler.h>
+#include "ardour/export_status.h"
+#include "ardour/export_handler.h"
 
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index 0528c514b6..8e70920b7c 100644
--- a/gtk2_ardour/export_dialog.h
+++ b/gtk2_ardour/export_dialog.h
@@ -23,8 +23,8 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <ardour/export_handler.h>
-#include <ardour/export_profile_manager.h>
+#include "ardour/export_handler.h"
+#include "ardour/export_profile_manager.h"
 
 #include "public_editor.h"
 #include "export_timespan_selector.h"
diff --git a/gtk2_ardour/export_file_notebook.cc b/gtk2_ardour/export_file_notebook.cc
index 456483cae6..b10c0e58c1 100644
--- a/gtk2_ardour/export_file_notebook.cc
+++ b/gtk2_ardour/export_file_notebook.cc
@@ -20,7 +20,7 @@
 
 #include "export_file_notebook.h"
 
-#include <ardour/export_format_specification.h>
+#include "ardour/export_format_specification.h"
 
 #include "utils.h"
 #include "i18n.h"
diff --git a/gtk2_ardour/export_file_notebook.h b/gtk2_ardour/export_file_notebook.h
index aed9a0fcc2..b6aee9992c 100644
--- a/gtk2_ardour/export_file_notebook.h
+++ b/gtk2_ardour/export_file_notebook.h
@@ -24,7 +24,7 @@
 #include <sigc++/signal.h>
 #include <gtkmm.h>
 
-#include <ardour/export_profile_manager.h>
+#include "ardour/export_profile_manager.h"
 
 #include "export_format_selector.h"
 #include "export_filename_selector.h"
diff --git a/gtk2_ardour/export_filename_selector.cc b/gtk2_ardour/export_filename_selector.cc
index 66eb389956..a78c0e7890 100644
--- a/gtk2_ardour/export_filename_selector.cc
+++ b/gtk2_ardour/export_filename_selector.cc
@@ -20,9 +20,9 @@
 
 #include "export_filename_selector.h"
 
-#include <ardour/export_handler.h>
-#include <ardour/session.h>
-#include <ardour/session_directory.h>
+#include "ardour/export_handler.h"
+#include "ardour/session.h"
+#include "ardour/session_directory.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/export_filename_selector.h b/gtk2_ardour/export_filename_selector.h
index c21435bb57..faa508de41 100644
--- a/gtk2_ardour/export_filename_selector.h
+++ b/gtk2_ardour/export_filename_selector.h
@@ -23,8 +23,8 @@
 
 #include <gtkmm.h>
 
-#include <ardour/export_profile_manager.h>
-#include <ardour/export_filename.h>
+#include "ardour/export_profile_manager.h"
+#include "ardour/export_filename.h"
 
 namespace ARDOUR {
 	class Session;
diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc
index f123c9cbbb..b7688aec10 100644
--- a/gtk2_ardour/export_format_dialog.cc
+++ b/gtk2_ardour/export_format_dialog.cc
@@ -20,8 +20,8 @@
 
 #include "export_format_dialog.h"
 
-#include <ardour/session.h>
-#include <ardour/export_format_specification.h>
+#include "ardour/session.h"
+#include "ardour/export_format_specification.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/export_format_dialog.h b/gtk2_ardour/export_format_dialog.h
index fed081f9f0..acb561b06b 100644
--- a/gtk2_ardour/export_format_dialog.h
+++ b/gtk2_ardour/export_format_dialog.h
@@ -21,12 +21,12 @@
 #ifndef __export_format_dialog_h__
 #define __export_format_dialog_h__
 
-#include <ardour/types.h>
-#include <ardour/export_format_manager.h>
-#include <ardour/export_format_compatibility.h>
-#include <ardour/export_formats.h>
+#include "ardour/types.h"
+#include "ardour/export_format_manager.h"
+#include "ardour/export_format_compatibility.h"
+#include "ardour/export_formats.h"
 
-#include <pbd/xml++.h>
+#include "pbd/xml++.h"
 
 #include "ardour_dialog.h"
 #include "audio_clock.h"
diff --git a/gtk2_ardour/export_format_selector.cc b/gtk2_ardour/export_format_selector.cc
index 676373e5c3..122facdd39 100644
--- a/gtk2_ardour/export_format_selector.cc
+++ b/gtk2_ardour/export_format_selector.cc
@@ -22,9 +22,9 @@
 
 #include "export_format_dialog.h"
 
-#include <ardour/export_format_specification.h>
-#include <ardour/export_profile_manager.h>
-#include <ardour/session.h>
+#include "ardour/export_format_specification.h"
+#include "ardour/export_profile_manager.h"
+#include "ardour/session.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/export_format_selector.h b/gtk2_ardour/export_format_selector.h
index d4e4ae0110..78daf5b5c6 100644
--- a/gtk2_ardour/export_format_selector.h
+++ b/gtk2_ardour/export_format_selector.h
@@ -21,7 +21,7 @@
 #ifndef __export_format_selector_h__
 #define __export_format_selector_h__
 
-#include <ardour/export_profile_manager.h>
+#include "ardour/export_profile_manager.h"
 
 #include <gtkmm.h>
 #include <sigc++/signal.h>
diff --git a/gtk2_ardour/export_multiplicator.cc b/gtk2_ardour/export_multiplicator.cc
index 969548e273..757039dc9d 100644
--- a/gtk2_ardour/export_multiplicator.cc
+++ b/gtk2_ardour/export_multiplicator.cc
@@ -28,7 +28,7 @@
 
 #include <cassert>
 
-#include <pbd/compose.h>
+#include "pbd/compose.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/export_multiplicator.h b/gtk2_ardour/export_multiplicator.h
index 20ce96cda0..60c6914bf5 100644
--- a/gtk2_ardour/export_multiplicator.h
+++ b/gtk2_ardour/export_multiplicator.h
@@ -30,7 +30,7 @@
 #include <utility>
 #include <map>
 
-#include <ardour/export_profile_manager.h>
+#include "ardour/export_profile_manager.h"
 
 #include <gtkmm.h>
 #include <boost/shared_ptr.hpp>
diff --git a/gtk2_ardour/export_preset_selector.cc b/gtk2_ardour/export_preset_selector.cc
index 094fb967ce..fbbc215fb0 100644
--- a/gtk2_ardour/export_preset_selector.cc
+++ b/gtk2_ardour/export_preset_selector.cc
@@ -20,7 +20,7 @@
 
 #include "export_preset_selector.h"
 
-#include <ardour/export_preset.h>
+#include "ardour/export_preset.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/export_preset_selector.h b/gtk2_ardour/export_preset_selector.h
index 3022e224bc..ea7e61b32e 100644
--- a/gtk2_ardour/export_preset_selector.h
+++ b/gtk2_ardour/export_preset_selector.h
@@ -24,7 +24,7 @@
 #include <sigc++/signal.h>
 #include <gtkmm.h>
 
-#include <ardour/export_profile_manager.h>
+#include "ardour/export_profile_manager.h"
 
 class ExportPresetSelector : public Gtk::HBox
 {
diff --git a/gtk2_ardour/export_range_markers_dialog.cc b/gtk2_ardour/export_range_markers_dialog.cc
index cea690f74c..df612a340d 100644
--- a/gtk2_ardour/export_range_markers_dialog.cc
+++ b/gtk2_ardour/export_range_markers_dialog.cc
@@ -22,8 +22,8 @@
 
 #include <sstream>
 
-#include <ardour/audioengine.h>
-#include <ardour/sndfile_helpers.h>
+#include "ardour/audioengine.h"
+#include "ardour/sndfile_helpers.h"
 
 #include "ardour_ui.h"
 #include "export_range_markers_dialog.h"
diff --git a/gtk2_ardour/export_range_markers_dialog.h b/gtk2_ardour/export_range_markers_dialog.h
index 9083b87b26..a3a20836b1 100644
--- a/gtk2_ardour/export_range_markers_dialog.h
+++ b/gtk2_ardour/export_range_markers_dialog.h
@@ -20,7 +20,7 @@
 #ifndef __export_range_markers_dialog_h__
 #define __export_range_markers_dialog_h__
 
-#include <ardour/location.h>
+#include "ardour/location.h"
 
 #include "export_dialog.h"
 
diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc
index 29d21b25cb..59875c4872 100644
--- a/gtk2_ardour/export_timespan_selector.cc
+++ b/gtk2_ardour/export_timespan_selector.cc
@@ -22,14 +22,14 @@
 
 #include "ardour_ui.h"
 
-#include <ardour/location.h>
-#include <ardour/types.h>
-#include <ardour/session.h>
-#include <ardour/export_handler.h>
-#include <ardour/export_timespan.h>
-
-#include <pbd/enumwriter.h>
-#include <pbd/convert.h>
+#include "ardour/location.h"
+#include "ardour/types.h"
+#include "ardour/session.h"
+#include "ardour/export_handler.h"
+#include "ardour/export_timespan.h"
+
+#include "pbd/enumwriter.h"
+#include "pbd/convert.h"
 
 #include <sstream>
 #include <iomanip>
diff --git a/gtk2_ardour/export_timespan_selector.h b/gtk2_ardour/export_timespan_selector.h
index e8a97326bc..db1f4cd0e9 100644
--- a/gtk2_ardour/export_timespan_selector.h
+++ b/gtk2_ardour/export_timespan_selector.h
@@ -29,8 +29,8 @@
 #include <gtkmm.h>
 #include <boost/shared_ptr.hpp>
 
-#include <ardour/types.h>
-#include <ardour/export_profile_manager.h>
+#include "ardour/types.h"
+#include "ardour/export_profile_manager.h"
 
 namespace ARDOUR {
 	class Location;
diff --git a/gtk2_ardour/fft.h b/gtk2_ardour/fft.h
index 3a4d0f8063..ba191c03cd 100644
--- a/gtk2_ardour/fft.h
+++ b/gtk2_ardour/fft.h
@@ -30,7 +30,7 @@
 #include <fftw3.h>
 
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 class FFT
 {
diff --git a/gtk2_ardour/fft_graph.cc b/gtk2_ardour/fft_graph.cc
index 077c1e162c..aac3143aee 100644
--- a/gtk2_ardour/fft_graph.cc
+++ b/gtk2_ardour/fft_graph.cc
@@ -29,7 +29,7 @@
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treepath.h>
 
-#include <pbd/stl_delete.h>
+#include "pbd/stl_delete.h"
 
 #include <math.h>
 
diff --git a/gtk2_ardour/fft_graph.h b/gtk2_ardour/fft_graph.h
index bbf7774741..ea91a08ea9 100644
--- a/gtk2_ardour/fft_graph.h
+++ b/gtk2_ardour/fft_graph.h
@@ -20,7 +20,7 @@
 #ifndef __ardour_fft_graph_h
 #define __ardour_fft_graph_h
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 #include <fftw3.h>
 
 #include <gtkmm/drawingarea.h>
diff --git a/gtk2_ardour/fft_result.h b/gtk2_ardour/fft_result.h
index c6c952db1c..fa2a569108 100644
--- a/gtk2_ardour/fft_result.h
+++ b/gtk2_ardour/fft_result.h
@@ -21,7 +21,7 @@
 #ifndef __ardour_fft_result_h
 #define __ardour_fft_result_h
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 #include <fftw3.h>
 
 #include <gdkmm/color.h>
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 85562bac0e..3540842a83 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -19,12 +19,12 @@
 
 #include <limits.h>
 
-#include <ardour/io.h>
-#include <ardour/route.h>
-#include <ardour/route_group.h>
-#include <ardour/session.h>
-#include <ardour/session_route.h>
-#include <ardour/dB.h>
+#include "ardour/io.h"
+#include "ardour/route.h"
+#include "ardour/route_group.h"
+#include "ardour/session.h"
+#include "ardour/session_route.h"
+#include "ardour/dB.h"
 
 #include <gtkmm/style.h>
 #include <gdkmm/color.h>
@@ -33,9 +33,9 @@
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/barcontroller.h>
 #include <gtkmm2ext/gtk_ui.h>
-#include <midi++/manager.h>
-#include <pbd/fastlog.h>
-#include <pbd/stacktrace.h>
+#include "midi++/manager.h"
+#include "pbd/fastlog.h"
+#include "pbd/stacktrace.h"
 
 #include "ardour_ui.h"
 #include "gain_meter.h"
@@ -45,9 +45,9 @@
 #include "keyboard.h"
 #include "public_editor.h"
 
-#include <ardour/session.h>
-#include <ardour/route.h>
-#include <ardour/meter.h>
+#include "ardour/session.h"
+#include "ardour/route.h"
+#include "ardour/meter.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 0c4e52b7c5..1352532331 100644
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -32,7 +32,7 @@
 #include <gtkmm/drawingarea.h>
 #include <gdkmm/colormap.h>
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/focus_entry.h>
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index c7cecc7130..16dbba523f 100644
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -22,9 +22,9 @@
 #include <cmath>
 #include <string>
 
-#include <pbd/stl_delete.h>
-#include <pbd/xml++.h>
-#include <pbd/failed_constructor.h>
+#include "pbd/stl_delete.h"
+#include "pbd/xml++.h"
+#include "pbd/failed_constructor.h"
 
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/fastmeter.h>
@@ -33,13 +33,13 @@
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/slider_controller.h>
 
-#include <midi++/manager.h>
+#include "midi++/manager.h"
 
-#include <ardour/plugin.h>
-#include <ardour/plugin_insert.h>
-#include <ardour/ladspa_plugin.h>
+#include "ardour/plugin.h"
+#include "ardour/plugin_insert.h"
+#include "ardour/ladspa_plugin.h"
 #ifdef HAVE_LV2
-#include <ardour/lv2_plugin.h>
+#include "ardour/lv2_plugin.h"
 #endif
 
 #include <lrdf.h>
diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc
index dd7839612f..27de656089 100644
--- a/gtk2_ardour/ghostregion.cc
+++ b/gtk2_ardour/ghostregion.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include <evoral/Note.hpp>
+#include "evoral/Note.hpp"
 #include "ardour_ui.h"
 #include "automation_time_axis.h"
 #include "canvas-hit.h"
diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 885edfde59..8328bc0c06 100644
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -23,7 +23,7 @@
 #include <vector>
 #include <sigc++/signal.h>
 #include <libgnomecanvasmm.h>
-#include <ardour/configuration.h>
+#include "ardour/configuration.h"
 #include "canvas.h"
 
 namespace Gnome {
diff --git a/gtk2_ardour/gui_thread.h b/gtk2_ardour/gui_thread.h
index ef129ad46d..12071c5558 100644
--- a/gtk2_ardour/gui_thread.h
+++ b/gtk2_ardour/gui_thread.h
@@ -21,7 +21,7 @@
 #define __ardour_gtk_gui_thread_h__
 
 #include <gtkmm2ext/gtk_ui.h>
-#include <pbd/crossthread.h>
+#include "pbd/crossthread.h"
 
 #define ENSURE_GUI_THREAD(slot) \
      if (!Gtkmm2ext::UI::instance()->caller_is_ui_thread()) {\
diff --git a/gtk2_ardour/i18n.h b/gtk2_ardour/i18n.h
index fa19bbb8a5..8dc13404aa 100644
--- a/gtk2_ardour/i18n.h
+++ b/gtk2_ardour/i18n.h
@@ -20,8 +20,8 @@
 #ifndef __i18n_h__
 #define __i18n_h__
 
-#include <pbd/compose.h>
-#include <pbd/convert.h>
+#include "pbd/compose.h"
+#include "pbd/convert.h"
 #include "gettext.h"
 
 #include <vector>
diff --git a/gtk2_ardour/imageframe_socket_handler.cc b/gtk2_ardour/imageframe_socket_handler.cc
index dac36c6e2e..2838be6f66 100644
--- a/gtk2_ardour/imageframe_socket_handler.cc
+++ b/gtk2_ardour/imageframe_socket_handler.cc
@@ -43,8 +43,8 @@
 
 #include "i18n.h"
 
-#include <ardour/session.h>
-#include <ardour/session_utils.h>
+#include "ardour/session.h"
+#include "ardour/session_utils.h"
 
 #include <unistd.h>
 
diff --git a/gtk2_ardour/imageframe_time_axis.cc b/gtk2_ardour/imageframe_time_axis.cc
index 735855421f..2f421a1132 100644
--- a/gtk2_ardour/imageframe_time_axis.cc
+++ b/gtk2_ardour/imageframe_time_axis.cc
@@ -20,15 +20,15 @@
 #include <string>
 #include <algorithm>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
 #include <gtkmm/menu.h>
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/session.h>
-#include <ardour/utils.h>
+#include "ardour/session.h"
+#include "ardour/utils.h"
 
 #include "public_editor.h"
 #include "imageframe_time_axis.h"
diff --git a/gtk2_ardour/imageframe_time_axis_group.h b/gtk2_ardour/imageframe_time_axis_group.h
index ba7790c04a..147e6b5295 100644
--- a/gtk2_ardour/imageframe_time_axis_group.h
+++ b/gtk2_ardour/imageframe_time_axis_group.h
@@ -27,7 +27,7 @@
 
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <jack/jack.h>
-#include <ardour/types.h>
+#include "ardour/types.h"
 #include "imageframe_time_axis_view.h"
 
 class PublicEditor ;
diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index f31a2a7d3c..fb2c66a4be 100644
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -22,7 +22,7 @@
 
 #include <gtkmm2ext/doi.h>
 
-#include <ardour/port_insert.h>
+#include "ardour/port_insert.h"
 #include "ardour/session.h"
 #include "ardour/io.h"
 #include "ardour/audioengine.h"
diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index d0fcbea5cf..cd9d51c164 100644
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -18,7 +18,7 @@
 */
 
 #include <vector>
-#include <ardour/ardour.h>
+#include "ardour/ardour.h"
 
 #include "ardour_ui.h"
 
@@ -31,10 +31,10 @@
 #include <gtkmm/accelmap.h>
 
 #include <gdk/gdkkeysyms.h>
-#include <pbd/error.h>
-#include <pbd/file_utils.h>
+#include "pbd/error.h"
+#include "pbd/file_utils.h"
 
-#include <ardour/filesystem_paths.h>
+#include "ardour/filesystem_paths.h"
 
 #include "keyboard.h"
 #include "gui_thread.h"
diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h
index 5fb696e6a5..a10fdbd6ba 100644
--- a/gtk2_ardour/keyboard.h
+++ b/gtk2_ardour/keyboard.h
@@ -28,8 +28,8 @@
 #include <gtk/gtk.h>
 #include <gtkmm/accelkey.h>
 
-#include <ardour/types.h>
-#include <pbd/stateful.h>
+#include "ardour/types.h"
+#include "pbd/stateful.h"
 
 #include "selection.h"
 
diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index e44d92943f..742fc7fb69 100644
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -1,6 +1,6 @@
 #include <map>
 
-#include <ardour/profile.h>
+#include "ardour/profile.h"
 
 #include <gtkmm/stock.h>
 #include <gtkmm/label.h>
@@ -8,10 +8,10 @@
 #include <gtkmm/accelmap.h>
 #include <gtkmm/uimanager.h>
 
-#include <pbd/strsplit.h>
-#include <pbd/replace_all.h>
+#include "pbd/strsplit.h"
+#include "pbd/replace_all.h"
 
-#include <ardour/profile.h>
+#include "ardour/profile.h"
 
 #include "actions.h"
 #include "keyboard.h"
diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc
index e7c42fd780..5ca139cd40 100644
--- a/gtk2_ardour/latency_gui.cc
+++ b/gtk2_ardour/latency_gui.cc
@@ -1,7 +1,7 @@
 #define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
-#include <ardour/latent.h>
+#include "ardour/latent.h"
 #include <gtkmm2ext/utils.h>
 
 #include "latency_gui.h"
diff --git a/gtk2_ardour/latency_gui.h b/gtk2_ardour/latency_gui.h
index f352f698d7..2e350762ec 100644
--- a/gtk2_ardour/latency_gui.h
+++ b/gtk2_ardour/latency_gui.h
@@ -10,9 +10,9 @@
 #include <gtkmm/adjustment.h>
 
 #include <gtkmm2ext/barcontroller.h>
-#include <pbd/controllable.h>
+#include "pbd/controllable.h"
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 #include "ardour_dialog.h"
 
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index f7b44d1b08..96ad6879ca 100644
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -19,20 +19,20 @@
 
 #include <limits.h>
 
-#include <ardour/io.h>
-#include <ardour/route.h>
-#include <ardour/route_group.h>
-#include <ardour/session.h>
-#include <ardour/session_route.h>
-#include <ardour/dB.h>
-#include <ardour/meter.h>
+#include "ardour/io.h"
+#include "ardour/route.h"
+#include "ardour/route_group.h"
+#include "ardour/session.h"
+#include "ardour/session_route.h"
+#include "ardour/dB.h"
+#include "ardour/meter.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/fastmeter.h>
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/barcontroller.h>
-#include <midi++/manager.h>
-#include <pbd/fastlog.h>
+#include "midi++/manager.h"
+#include "pbd/fastlog.h"
 
 #include "ardour_ui.h"
 #include "level_meter.h"
@@ -42,8 +42,8 @@
 #include "keyboard.h"
 #include "public_editor.h"
 
-#include <ardour/session.h>
-#include <ardour/route.h>
+#include "ardour/session.h"
+#include "ardour/route.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h
index 0273a075c8..ee2f03e3df 100644
--- a/gtk2_ardour/level_meter.h
+++ b/gtk2_ardour/level_meter.h
@@ -30,7 +30,7 @@
 #include <gtkmm/table.h>
 #include <gtkmm/drawingarea.h>
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/focus_entry.h>
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index b3d2900673..64c551f0d1 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -24,10 +24,10 @@
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/window_title.h>
 
-#include <ardour/utils.h>
-#include <ardour/configuration.h>
-#include <ardour/session.h>
-#include <pbd/memento_command.h>
+#include "ardour/utils.h"
+#include "ardour/configuration.h"
+#include "ardour/session.h"
+#include "pbd/memento_command.h"
 
 #include "ardour_ui.h"
 #include "prompter.h"
diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h
index 3c32f02025..dabd945f95 100644
--- a/gtk2_ardour/location_ui.h
+++ b/gtk2_ardour/location_ui.h
@@ -27,8 +27,8 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
 
-#include <ardour/location.h>
-#include <ardour/session.h>
+#include "ardour/location.h"
+#include "ardour/session.h"
 
 #include "ardour_dialog.h"
 
diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc
index 02af81cbf0..d02e83d466 100644
--- a/gtk2_ardour/lv2_plugin_ui.cc
+++ b/gtk2_ardour/lv2_plugin_ui.cc
@@ -18,8 +18,8 @@
 
 */
 
-#include <ardour/processor.h>
-#include <ardour/lv2_plugin.h>
+#include "ardour/processor.h"
+#include "ardour/lv2_plugin.h"
 
 #include "ardour_ui.h"
 #include "lv2_plugin_ui.h"
diff --git a/gtk2_ardour/lv2_plugin_ui.h b/gtk2_ardour/lv2_plugin_ui.h
index fe8dd85cd2..24a6819b37 100644
--- a/gtk2_ardour/lv2_plugin_ui.h
+++ b/gtk2_ardour/lv2_plugin_ui.h
@@ -29,7 +29,7 @@
 #include <gtkmm/widget.h>
 
 #include <ardour_dialog.h>
-#include <ardour/types.h>
+#include "ardour/types.h"
 #include "plugin_ui.h"
 
 #ifdef HAVE_LV2
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index c7724cff63..6861b178d1 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -23,20 +23,20 @@
 #include <sigc++/bind.h>
 #include <gtkmm/settings.h>
 
-#include <pbd/error.h>
-#include <pbd/file_utils.h>
-#include <pbd/textreceiver.h>
-#include <pbd/failed_constructor.h>
-#include <pbd/pthread_utils.h>
+#include "pbd/error.h"
+#include "pbd/file_utils.h"
+#include "pbd/textreceiver.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/pthread_utils.h"
 
 #include <jack/jack.h>
 
-#include <ardour/svn_revision.h>
-#include <ardour/version.h>
-#include <ardour/ardour.h>
-#include <ardour/audioengine.h>
-#include <ardour/session_utils.h>
-#include <ardour/filesystem_paths.h>
+#include "ardour/svn_revision.h"
+#include "ardour/version.h"
+#include "ardour/ardour.h"
+#include "ardour/audioengine.h"
+#include "ardour/session_utils.h"
+#include "ardour/filesystem_paths.h"
 
 #include <gtkmm/main.h>
 #include <gtkmm2ext/popup.h>
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index e3330c41fb..7e0a846ec9 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -18,7 +18,7 @@
 */
 
 #include <sigc++/bind.h>
-#include <ardour/tempo.h>
+#include "ardour/tempo.h"
 
 #include "marker.h"
 #include "public_editor.h"
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 1a53726ede..8a82a90271 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -22,8 +22,8 @@
 
 #include <string>
 #include <glib.h>
-#include <ardour/ardour.h>
-#include <pbd/destructible.h>
+#include "ardour/ardour.h"
+#include "pbd/destructible.h"
 
 #include "canvas.h"
 
diff --git a/gtk2_ardour/marker_time_axis.cc b/gtk2_ardour/marker_time_axis.cc
index df041f8f76..f7867e49b0 100644
--- a/gtk2_ardour/marker_time_axis.cc
+++ b/gtk2_ardour/marker_time_axis.cc
@@ -19,14 +19,14 @@
 
 #include <string>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
 #include <gtkmm/menu.h>
 
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/session.h>
-#include <ardour/utils.h>
+#include "ardour/session.h"
+#include "ardour/utils.h"
 
 #include "ardour_ui.h"
 #include "public_editor.h"
diff --git a/gtk2_ardour/marker_time_axis_view.h b/gtk2_ardour/marker_time_axis_view.h
index fd23c1de87..ae7cddfd59 100644
--- a/gtk2_ardour/marker_time_axis_view.h
+++ b/gtk2_ardour/marker_time_axis_view.h
@@ -24,7 +24,7 @@
 #include <gdkmm/color.h>
 #include <libgnomecanvasmm/group.h>
 
-#include <ardour/location.h>
+#include "ardour/location.h"
 #include "simplerect.h"
 #include "canvas.h"
 
diff --git a/gtk2_ardour/midi_channel_selector.h b/gtk2_ardour/midi_channel_selector.h
index 7485f96257..a2b6247c75 100644
--- a/gtk2_ardour/midi_channel_selector.h
+++ b/gtk2_ardour/midi_channel_selector.h
@@ -27,7 +27,7 @@
 #include "gtkmm/button.h"
 #include "gtkmm/togglebutton.h"
 #include "gtkmm/label.h"
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 
 class MidiChannelSelector : public Gtk::Table
diff --git a/gtk2_ardour/midi_port_dialog.cc b/gtk2_ardour/midi_port_dialog.cc
index 5fa11ce987..6e692c6eac 100644
--- a/gtk2_ardour/midi_port_dialog.cc
+++ b/gtk2_ardour/midi_port_dialog.cc
@@ -2,7 +2,7 @@
 #include <sigc++/bind.h>
 #include <gtkmm/stock.h>
 
-#include <pbd/convert.h>
+#include "pbd/convert.h"
 #include <gtkmm2ext/utils.h>
 
 #include "midi_port_dialog.h"
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index aca13c8c44..2ea8316b37 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -28,16 +28,16 @@
 
 #include <sigc++/signal.h>
 
-#include <ardour/playlist.h>
-#include <ardour/tempo.h>
-#include <ardour/midi_region.h>
-#include <ardour/midi_source.h>
-#include <ardour/midi_diskstream.h>
-#include <ardour/midi_model.h>
-#include <ardour/midi_patch_manager.h>
-
-#include <evoral/Parameter.hpp>
-#include <evoral/Control.hpp>
+#include "ardour/playlist.h"
+#include "ardour/tempo.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_source.h"
+#include "ardour/midi_diskstream.h"
+#include "ardour/midi_model.h"
+#include "ardour/midi_patch_manager.h"
+
+#include "evoral/Parameter.hpp"
+#include "evoral/Control.hpp"
 
 #include "streamview.h"
 #include "midi_region_view.h"
diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index 7ee07de02f..adb4a1e316 100644
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -24,11 +24,11 @@
 
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
-#include <ardour/midi_track.h>
-#include <ardour/midi_region.h>
-#include <ardour/midi_model.h>
-#include <ardour/diskstream.h>
-#include <ardour/types.h>
+#include "ardour/midi_track.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_model.h"
+#include "ardour/diskstream.h"
+#include "ardour/types.h"
 
 #include "region_view.h"
 #include "midi_time_axis.h"
diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index ed364e7156..047020ea62 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -24,13 +24,13 @@
 
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/midi_diskstream.h>
-#include <ardour/midi_playlist.h>
-#include <ardour/midi_region.h>
-#include <ardour/midi_source.h>
-#include <ardour/midi_track.h>
-#include <ardour/region_factory.h>
-#include <ardour/smf_source.h>
+#include "ardour/midi_diskstream.h"
+#include "ardour/midi_playlist.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_source.h"
+#include "ardour/midi_track.h"
+#include "ardour/region_factory.h"
+#include "ardour/smf_source.h"
 
 #include "ardour_ui.h"
 #include "canvas-simplerect.h"
diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index 2f8e63ab9d..2780cfa3da 100644
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -22,7 +22,7 @@
 #include <list>
 #include <cmath>
 
-#include <ardour/location.h>
+#include "ardour/location.h"
 #include "enums.h"
 #include "streamview.h"
 #include "time_axis_view_item.h"
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 3df63d11f7..18786fe54a 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -25,10 +25,10 @@
 
 #include <sigc++/bind.h>
 
-#include <pbd/error.h>
-#include <pbd/stl_delete.h>
-#include <pbd/whitespace.h>
-#include <pbd/enumwriter.h>
+#include "pbd/error.h"
+#include "pbd/stl_delete.h"
+#include "pbd/whitespace.h"
+#include "pbd/enumwriter.h"
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/selector.h>
@@ -36,16 +36,16 @@
 #include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/midi_playlist.h>
-#include <ardour/midi_diskstream.h>
-#include <ardour/midi_patch_manager.h>
-#include <ardour/processor.h>
-#include <ardour/ladspa_plugin.h>
-#include <ardour/location.h>
-#include <ardour/playlist.h>
-#include <ardour/session.h>
-#include <ardour/session_playlist.h>
-#include <ardour/utils.h>
+#include "ardour/midi_playlist.h"
+#include "ardour/midi_diskstream.h"
+#include "ardour/midi_patch_manager.h"
+#include "ardour/processor.h"
+#include "ardour/ladspa_plugin.h"
+#include "ardour/location.h"
+#include "ardour/playlist.h"
+#include "ardour/session.h"
+#include "ardour/session_playlist.h"
+#include "ardour/utils.h"
 
 #include "ardour_ui.h"
 #include "midi_time_axis.h"
@@ -74,7 +74,7 @@
 #include "ghostregion.h"
 #include "canvas-note-event.h"
 
-#include <ardour/midi_track.h>
+#include "ardour/midi_track.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index f535fd6322..228e05176b 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -30,8 +30,8 @@
 #include <gtkmm2ext/selector.h>
 #include <list>
 
-#include <ardour/types.h>
-#include <ardour/region.h>
+#include "ardour/types.h"
+#include "ardour/region.h"
 
 #include "ardour_dialog.h"
 #include "route_ui.h"
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 39e23a99a4..d9770e4776 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -21,9 +21,9 @@
 
 #include <sigc++/bind.h>
 
-#include <pbd/convert.h>
-#include <pbd/enumwriter.h>
-#include <pbd/replace_all.h>
+#include "pbd/convert.h"
+#include "pbd/enumwriter.h"
+#include "pbd/replace_all.h"
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
@@ -33,19 +33,19 @@
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/bindable_button.h>
 
-#include <ardour/ardour.h>
-#include <ardour/session.h>
-#include <ardour/audioengine.h>
-#include <ardour/route.h>
-#include <ardour/route_group.h>
-#include <ardour/audio_track.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/panner.h>
-#include <ardour/send.h>
-#include <ardour/processor.h>
-#include <ardour/profile.h>
-#include <ardour/ladspa_plugin.h>
-#include <ardour/user_bundle.h>
+#include "ardour/ardour.h"
+#include "ardour/session.h"
+#include "ardour/audioengine.h"
+#include "ardour/route.h"
+#include "ardour/route_group.h"
+#include "ardour/audio_track.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/panner.h"
+#include "ardour/send.h"
+#include "ardour/processor.h"
+#include "ardour/profile.h"
+#include "ardour/ladspa_plugin.h"
+#include "ardour/user_bundle.h"
 
 #include "ardour_ui.h"
 #include "ardour_dialog.h"
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index f2191bb418..4793e2de72 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -38,13 +38,13 @@
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/slider_controller.h>
 
-#include <pbd/stateful.h>
+#include "pbd/stateful.h"
 
-#include <ardour/types.h>
-#include <ardour/ardour.h>
-#include <ardour/processor.h>
+#include "ardour/types.h"
+#include "ardour/ardour.h"
+#include "ardour/processor.h"
 
-#include <pbd/fastlog.h>
+#include "pbd/fastlog.h"
 
 #include "route_ui.h"
 #include "gain_meter.h"
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 8da14e2f46..9c9e76d5df 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -22,7 +22,7 @@
 
 #include <gtkmm/accelmap.h>
 
-#include <pbd/convert.h>
+#include "pbd/convert.h"
 #include <glibmm/thread.h>
 
 #include <gtkmm2ext/gtk_ui.h>
@@ -30,12 +30,12 @@
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/window_title.h>
 
-#include <ardour/audio_diskstream.h>
-#include <ardour/audio_track.h>
-#include <ardour/plugin_manager.h>
-#include <ardour/route_group.h>
-#include <ardour/session.h>
-#include <ardour/session_route.h>
+#include "ardour/audio_diskstream.h"
+#include "ardour/audio_track.h"
+#include "ardour/plugin_manager.h"
+#include "ardour/route_group.h"
+#include "ardour/session.h"
+#include "ardour/session_route.h"
 
 #include "keyboard.h"
 #include "mixer_ui.h"
diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 2dbddc9dd0..b445cc99db 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -32,9 +32,9 @@
 #include <gtkmm/menu.h>
 #include <gtkmm/treeview.h>
 
-#include <pbd/stateful.h>
+#include "pbd/stateful.h"
 
-#include <ardour/ardour.h>
+#include "ardour/ardour.h"
 
 #include "route_processor_selection.h"
 #include "enums.h"
diff --git a/gtk2_ardour/nag.cc b/gtk2_ardour/nag.cc
index d239d850c7..4dab7e69b7 100644
--- a/gtk2_ardour/nag.cc
+++ b/gtk2_ardour/nag.cc
@@ -1,8 +1,8 @@
 #include <fstream>
 #include <gtkmm/stock.h>
 
-#include <ardour/ardour.h>
-#include <ardour/filesystem_paths.h>
+#include "ardour/ardour.h"
+#include "ardour/filesystem_paths.h"
 
 #include "nag.h"
 #include "i18n.h"
diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc
index c28277b8ab..7e5345290c 100644
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -17,13 +17,13 @@
 
 */
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
-#include <ardour/recent_sessions.h>
-#include <ardour/session_state_utils.h>
-#include <ardour/template_utils.h>
-#include <ardour/session.h>
-#include <ardour/profile.h>
+#include "ardour/recent_sessions.h"
+#include "ardour/session_state_utils.h"
+#include "ardour/template_utils.h"
+#include "ardour/session.h"
+#include "ardour/profile.h"
 
 #include <gtkmm/entry.h>
 #include <gtkmm/filechooserbutton.h>
diff --git a/gtk2_ardour/new_session_dialog.h b/gtk2_ardour/new_session_dialog.h
index 04e30e0a94..465faa797e 100644
--- a/gtk2_ardour/new_session_dialog.h
+++ b/gtk2_ardour/new_session_dialog.h
@@ -33,7 +33,7 @@
 #include <gtkmm/frame.h>
 #include <gtkmm/expander.h>
 
-#include <ardour/utils.h>
+#include "ardour/utils.h"
 
 #include <glibmm/refptr.h>
 
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 935197a0ca..960f8065bc 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -19,18 +19,18 @@
 #include <pango/pangoft2.h> // for fontmap resolution control for GnomeCanvas
 #include <pango/pangocairo.h> // for fontmap resolution control for GnomeCanvas
 
-#include <pbd/whitespace.h>
-
-#include <ardour/ardour.h>
-#include <ardour/session.h>
-#include <ardour/audioengine.h>
-#include <ardour/configuration.h>
-#include <ardour/auditioner.h>
-#include <ardour/sndfilesource.h>
-#include <ardour/crossfade.h>
-#include <ardour/profile.h>
-#include <midi++/manager.h>
-#include <midi++/factory.h>
+#include "pbd/whitespace.h"
+
+#include "ardour/ardour.h"
+#include "ardour/session.h"
+#include "ardour/audioengine.h"
+#include "ardour/configuration.h"
+#include "ardour/auditioner.h"
+#include "ardour/sndfilesource.h"
+#include "ardour/crossfade.h"
+#include "ardour/profile.h"
+#include "midi++/manager.h"
+#include "midi++/factory.h"
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/window_title.h>
diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index 1aff7f2bcf..a6b1a74e5c 100644
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -34,7 +34,7 @@
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/comboboxtext.h>
 
-#include <ardour/session.h>
+#include "ardour/session.h"
 
 #include "ardour_dialog.h"
 #include "editing.h"
diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index aebf7cdd21..4437a9d224 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -21,7 +21,7 @@
 #include <iostream>
 #include <cstdlib>
 
-#include <ardour/session.h>
+#include "ardour/session.h"
 
 #include "opts.h"
 
diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc
index 97f7fcd123..7a081101f6 100644
--- a/gtk2_ardour/panner2d.cc
+++ b/gtk2_ardour/panner2d.cc
@@ -24,8 +24,8 @@
 #include <cairo.h>
 #include <gtkmm/menu.h>
 
-#include <pbd/error.h>
-#include <ardour/panner.h>
+#include "pbd/error.h"
+#include "ardour/panner.h"
 #include <gtkmm2ext/gtk_ui.h>
 
 #include "panner2d.h"
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index 728dfcbcfe..636035abd3 100644
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -18,13 +18,13 @@
 
 #include <limits.h>
 
-#include <ardour/io.h>
-#include <ardour/dB.h>
+#include "ardour/io.h"
+#include "ardour/dB.h"
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/barcontroller.h>
-#include <midi++/manager.h>
-#include <pbd/fastlog.h>
+#include "midi++/manager.h"
+#include "pbd/fastlog.h"
 
 #include "ardour_ui.h"
 #include "panner_ui.h"
@@ -33,9 +33,9 @@
 #include "panner.h"
 #include "gui_thread.h"
 
-#include <ardour/session.h>
-#include <ardour/panner.h>
-#include <ardour/route.h>
+#include "ardour/session.h"
+#include "ardour/panner.h"
+#include "ardour/route.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/piano_roll_header.cc b/gtk2_ardour/piano_roll_header.cc
index 9d0f1e504a..e946aa3dfb 100644
--- a/gtk2_ardour/piano_roll_header.cc
+++ b/gtk2_ardour/piano_roll_header.cc
@@ -17,8 +17,8 @@
 */
 
 #include <iostream>
-#include <evoral/midi_events.h>
-#include <ardour/midi_track.h>
+#include "evoral/midi_events.h"
+#include "ardour/midi_track.h"
 
 #include "piano_roll_header.h"
 #include "midi_time_axis.h"
diff --git a/gtk2_ardour/piano_roll_header.h b/gtk2_ardour/piano_roll_header.h
index 986a7fafc9..f005538d4a 100644
--- a/gtk2_ardour/piano_roll_header.h
+++ b/gtk2_ardour/piano_roll_header.h
@@ -19,7 +19,7 @@
 #ifndef __ardour_piano_roll_header_h__
 #define __ardour_piano_roll_header_h__
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 #include <gtkmm/drawingarea.h>
 
diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index 0ca9432fcb..dd62240e44 100644
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -20,12 +20,12 @@
 
 #include <gtkmm/button.h>
 
-#include <ardour/session_playlist.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/playlist.h>
-#include <ardour/audio_track.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/configuration.h>
+#include "ardour/session_playlist.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/playlist.h"
+#include "ardour/audio_track.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/configuration.h"
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/window_title.h>
diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc
index a7e6b4261c..2b43927278 100644
--- a/gtk2_ardour/plugin_eq_gui.cc
+++ b/gtk2_ardour/plugin_eq_gui.cc
@@ -23,8 +23,8 @@
 
 #include "ardour_ui.h"
 #include "gui_thread.h"
-#include <ardour/audio_buffer.h>
-#include <ardour/data_type.h>
+#include "ardour/audio_buffer.h"
+#include "ardour/data_type.h"
 
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>
diff --git a/gtk2_ardour/plugin_eq_gui.h b/gtk2_ardour/plugin_eq_gui.h
index cd52ed7682..05e09e3214 100644
--- a/gtk2_ardour/plugin_eq_gui.h
+++ b/gtk2_ardour/plugin_eq_gui.h
@@ -21,9 +21,9 @@
 #ifndef __ardour_plugin_eq_gui_h
 #define __ardour_plugin_eq_gui_h
 
-#include <ardour/buffer_set.h>
-#include <ardour/plugin_insert.h>
-#include <ardour/plugin.h>
+#include "ardour/buffer_set.h"
+#include "ardour/plugin_insert.h"
+#include "ardour/plugin.h"
 
 #include <gtkmm/table.h>
 #include <gtkmm/drawingarea.h>
diff --git a/gtk2_ardour/plugin_interest.h b/gtk2_ardour/plugin_interest.h
index 1b7d3c0959..9f6b293325 100644
--- a/gtk2_ardour/plugin_interest.h
+++ b/gtk2_ardour/plugin_interest.h
@@ -21,7 +21,7 @@
 #define __gtkardour_plugin_interest_h__
 
 #include <vector>
-#include <ardour/plugin.h>
+#include "ardour/plugin.h"
 
 typedef std::vector<ARDOUR::PluginPtr> SelectedPlugins;
 
diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index b49d6a0b77..ac9e785522 100644
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -30,11 +30,11 @@
 
 #include <gtkmm2ext/utils.h>
 
-#include <pbd/convert.h>
+#include "pbd/convert.h"
 
-#include <ardour/plugin_manager.h>
-#include <ardour/plugin.h>
-#include <ardour/configuration.h>
+#include "ardour/plugin_manager.h"
+#include "ardour/plugin.h"
+#include "ardour/configuration.h"
 
 #include "ardour_ui.h"
 #include "plugin_selector.h"
diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h
index e5224b4fa7..bd9bd12008 100644
--- a/gtk2_ardour/plugin_selector.h
+++ b/gtk2_ardour/plugin_selector.h
@@ -25,7 +25,7 @@
 #include <gtkmm/treeview.h>
 #include <gtkmm2ext/selector.h>
 
-#include <ardour/plugin.h>
+#include "ardour/plugin.h"
 #include "plugin_interest.h"
 
 namespace ARDOUR {
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index eae0d91388..4c7ae5b8a0 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -22,9 +22,9 @@
 #include <cmath>
 #include <string>
 
-#include <pbd/stl_delete.h>
-#include <pbd/xml++.h>
-#include <pbd/failed_constructor.h>
+#include "pbd/stl_delete.h"
+#include "pbd/xml++.h"
+#include "pbd/failed_constructor.h"
 
 #include <gtkmm/widget.h>
 #include <gtkmm/box.h>
@@ -35,16 +35,16 @@
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/slider_controller.h>
 
-#include <midi++/manager.h>
+#include "midi++/manager.h"
 
-#include <ardour/plugin.h>
-#include <ardour/plugin_insert.h>
-#include <ardour/ladspa_plugin.h>
+#include "ardour/plugin.h"
+#include "ardour/plugin_insert.h"
+#include "ardour/ladspa_plugin.h"
 #ifdef VST_SUPPORT
-#include <ardour/vst_plugin.h>
+#include "ardour/vst_plugin.h"
 #endif
 #ifdef HAVE_LV2
-#include <ardour/lv2_plugin.h>
+#include "ardour/lv2_plugin.h"
 #include "lv2_plugin_ui.h"
 #endif
 
diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index b5202a9327..fb365409d7 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -41,7 +41,7 @@
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/socket.h>
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 #include "ardour_dialog.h"
 #include "latency_gui.h"
diff --git a/gtk2_ardour/port_group.h b/gtk2_ardour/port_group.h
index c2daae341a..02dd965e1d 100644
--- a/gtk2_ardour/port_group.h
+++ b/gtk2_ardour/port_group.h
@@ -25,8 +25,8 @@
 #include <gtkmm/widget.h>
 #include <gtkmm/checkbutton.h>
 #include <boost/shared_ptr.hpp>
-#include <ardour/data_type.h>
-#include <ardour/types.h>
+#include "ardour/data_type.h"
+#include "ardour/types.h"
 
 namespace ARDOUR {
 	class Session;
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index ce7d0f5567..7ac5c4a598 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -23,7 +23,7 @@
 
 #include <sigc++/bind.h>
 
-#include <pbd/convert.h>
+#include "pbd/convert.h"
 
 #include <glibmm/miscutils.h>
 
@@ -37,17 +37,17 @@
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/window_title.h>
 
-#include <ardour/ardour.h>
-#include <ardour/session.h>
-#include <ardour/audioengine.h>
-#include <ardour/route.h>
-#include <ardour/audio_track.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/send.h>
-#include <ardour/plugin_insert.h>
-#include <ardour/port_insert.h>
-#include <ardour/ladspa_plugin.h>
-#include <ardour/profile.h>
+#include "ardour/ardour.h"
+#include "ardour/session.h"
+#include "ardour/audioengine.h"
+#include "ardour/route.h"
+#include "ardour/audio_track.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/send.h"
+#include "ardour/plugin_insert.h"
+#include "ardour/port_insert.h"
+#include "ardour/ladspa_plugin.h"
+#include "ardour/profile.h"
 
 #include "ardour_ui.h"
 #include "ardour_dialog.h"
diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h
index 76c6426686..c04498a599 100644
--- a/gtk2_ardour/processor_box.h
+++ b/gtk2_ardour/processor_box.h
@@ -32,15 +32,15 @@
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/dndtreeview.h>
 
-#include <pbd/stateful.h>
+#include "pbd/stateful.h"
 
-#include <ardour/types.h>
-#include <ardour/ardour.h>
-#include <ardour/plugin_insert.h>
-#include <ardour/port_insert.h>
-#include <ardour/processor.h>
+#include "ardour/types.h"
+#include "ardour/ardour.h"
+#include "ardour/plugin_insert.h"
+#include "ardour/port_insert.h"
+#include "ardour/processor.h"
 
-#include <pbd/fastlog.h>
+#include "pbd/fastlog.h"
 
 #include "plugin_interest.h"
 #include "route_ui.h"
diff --git a/gtk2_ardour/processor_selection.h b/gtk2_ardour/processor_selection.h
index 59354c05ac..a7d10894e9 100644
--- a/gtk2_ardour/processor_selection.h
+++ b/gtk2_ardour/processor_selection.h
@@ -20,7 +20,7 @@
 #ifndef __ardour_gtk_processor_selection_h__
 #define __ardour_gtk_processor_selection_h__
 
-#include <pbd/xml++.h>
+#include "pbd/xml++.h"
 
 class ProcessorSelection {
   public:
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 97fbdd47b8..ef087fa2cc 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -30,7 +30,7 @@
 #include <jack/types.h>
 #include <sigc++/signal.h>
 
-#include <pbd/statefuldestructible.h> 
+#include "pbd/statefuldestructible.h" 
 
 #include "editing.h"
 #include "canvas.h"
diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc
index 86ebe7a465..48bc7e7f4b 100644
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -17,9 +17,9 @@
 
 */
 
-#include <evoral/Curve.hpp>
-#include <ardour/audioregion.h>
-#include <pbd/memento_command.h>
+#include "evoral/Curve.hpp"
+#include "ardour/audioregion.h"
+#include "pbd/memento_command.h"
 
 #include "region_gain_line.h"
 #include "audio_region_view.h"
@@ -28,7 +28,7 @@
 #include "time_axis_view.h"
 #include "editor.h"
 
-#include <ardour/session.h>
+#include "ardour/session.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h
index af23fa37f3..6f446cabfc 100644
--- a/gtk2_ardour/region_gain_line.h
+++ b/gtk2_ardour/region_gain_line.h
@@ -20,7 +20,7 @@
 #ifndef __ardour_gtk_region_gain_line_h__
 #define __ardour_gtk_region_gain_line_h__
 
-#include <ardour/ardour.h>
+#include "ardour/ardour.h"
 #include <libgnomecanvasmm.h>
 
 #include "automation_line.h"
diff --git a/gtk2_ardour/region_selection.cc b/gtk2_ardour/region_selection.cc
index d1970138c5..76dfe33107 100644
--- a/gtk2_ardour/region_selection.cc
+++ b/gtk2_ardour/region_selection.cc
@@ -18,7 +18,7 @@
 
 #include <algorithm>
 
-#include <ardour/region.h>
+#include "ardour/region.h"
 
 #include "region_view.h"
 #include "region_selection.h"
diff --git a/gtk2_ardour/region_selection.h b/gtk2_ardour/region_selection.h
index 084345a76d..98d2a4eaab 100644
--- a/gtk2_ardour/region_selection.h
+++ b/gtk2_ardour/region_selection.h
@@ -22,7 +22,7 @@
 #include <set>
 #include <list>
 #include <sigc++/signal.h>
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 using std::list;
 using std::set;
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 1819df0401..d307eeaa95 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -24,12 +24,12 @@
 #include <gtkmm.h>
 
 #include <gtkmm2ext/gtk_ui.h>
-#include <pbd/stacktrace.h>
+#include "pbd/stacktrace.h"
 
-#include <ardour/playlist.h>
-#include <ardour/audioregion.h>
-#include <ardour/audiosource.h>
-#include <ardour/audio_diskstream.h>
+#include "ardour/playlist.h"
+#include "ardour/audioregion.h"
+#include "ardour/audiosource.h"
+#include "ardour/audio_diskstream.h"
 
 #include "ardour_ui.h"
 #include "streamview.h"
diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 0db41c24f9..fea5cd9588 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -24,8 +24,8 @@
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
 #include <sigc++/signal.h>
-#include <ardour/region.h>
-#include <ardour/beats_frames_converter.h>
+#include "ardour/region.h"
+#include "ardour/beats_frames_converter.h"
 
 #include "time_axis_view_item.h"
 #include "automation_line.h"
diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc
index 2f070f4ccd..ecad24e181 100644
--- a/gtk2_ardour/rhythm_ferret.cc
+++ b/gtk2_ardour/rhythm_ferret.cc
@@ -1,15 +1,15 @@
 #include <gtkmm/stock.h>
 #include <gtkmm2ext/utils.h>
 
-#include <pbd/memento_command.h>
-
-#include <ardour/transient_detector.h>
-#include <ardour/onset_detector.h>
-#include <ardour/audiosource.h>
-#include <ardour/audioregion.h>
-#include <ardour/playlist.h>
-#include <ardour/region_factory.h>
-#include <ardour/session.h>
+#include "pbd/memento_command.h"
+
+#include "ardour/transient_detector.h"
+#include "ardour/onset_detector.h"
+#include "ardour/audiosource.h"
+#include "ardour/audioregion.h"
+#include "ardour/playlist.h"
+#include "ardour/region_factory.h"
+#include "ardour/session.h"
 
 #include "rhythm_ferret.h"
 #include "audio_region_view.h"
diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index 30a939022e..37639a9985 100644
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -26,18 +26,18 @@
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/window_title.h>
 
-#include <ardour/session.h>
-#include <ardour/session_route.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/plugin.h>
-#include <ardour/plugin_manager.h>
-#include <ardour/ardour.h>
-#include <ardour/session.h>
-#include <ardour/route.h>
-#include <ardour/audio_track.h>
-#include <ardour/send.h>
-#include <ardour/plugin_insert.h>
-#include <ardour/port_insert.h>
+#include "ardour/session.h"
+#include "ardour/session_route.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/plugin.h"
+#include "ardour/plugin_manager.h"
+#include "ardour/ardour.h"
+#include "ardour/session.h"
+#include "ardour/route.h"
+#include "ardour/audio_track.h"
+#include "ardour/send.h"
+#include "ardour/plugin_insert.h"
+#include "ardour/port_insert.h"
 
 #include "route_params_ui.h"
 #include "keyboard.h"
diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h
index 484c4f28a8..0f9fe6423f 100644
--- a/gtk2_ardour/route_params_ui.h
+++ b/gtk2_ardour/route_params_ui.h
@@ -32,9 +32,9 @@
 #include <gtkmm/togglebutton.h>
 #include <gtkmm/treeview.h>
 
-#include <pbd/stateful.h>
+#include "pbd/stateful.h"
 
-#include <ardour/ardour.h>
+#include "ardour/ardour.h"
 
 #include "io_selector.h"
 #include "ardour_dialog.h"
diff --git a/gtk2_ardour/route_processor_selection.cc b/gtk2_ardour/route_processor_selection.cc
index 552de1b412..0b02a2837a 100644
--- a/gtk2_ardour/route_processor_selection.cc
+++ b/gtk2_ardour/route_processor_selection.cc
@@ -19,11 +19,11 @@
 
 #include <algorithm>
 #include <sigc++/bind.h>
-#include <pbd/error.h>
+#include "pbd/error.h"
 
-#include <ardour/playlist.h>
-#include <ardour/processor.h>
-#include <ardour/route.h>
+#include "ardour/playlist.h"
+#include "ardour/processor.h"
+#include "ardour/route.h"
 
 #include "route_processor_selection.h"
 
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 7895a25a8c..f3f27d5183 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -27,10 +27,10 @@
 
 #include <sigc++/bind.h>
 
-#include <pbd/error.h>
-#include <pbd/stl_delete.h>
-#include <pbd/whitespace.h>
-#include <pbd/memento_command.h>
+#include "pbd/error.h"
+#include "pbd/stl_delete.h"
+#include "pbd/whitespace.h"
+#include "pbd/memento_command.h"
 
 #include <gtkmm/menu.h>
 #include <gtkmm/menuitem.h>
@@ -40,21 +40,21 @@
 #include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/audioplaylist.h>
-#include <ardour/diskstream.h>
-#include <ardour/event_type_map.h>
-#include <ardour/ladspa_plugin.h>
-#include <ardour/location.h>
-#include <ardour/panner.h>
-#include <ardour/playlist.h>
-#include <ardour/playlist.h>
-#include <ardour/processor.h>
-#include <ardour/profile.h>
-#include <ardour/route_group.h>
-#include <ardour/session.h>
-#include <ardour/session_playlist.h>
-#include <ardour/utils.h>
-#include <evoral/Parameter.hpp>
+#include "ardour/audioplaylist.h"
+#include "ardour/diskstream.h"
+#include "ardour/event_type_map.h"
+#include "ardour/ladspa_plugin.h"
+#include "ardour/location.h"
+#include "ardour/panner.h"
+#include "ardour/playlist.h"
+#include "ardour/playlist.h"
+#include "ardour/processor.h"
+#include "ardour/profile.h"
+#include "ardour/route_group.h"
+#include "ardour/session.h"
+#include "ardour/session_playlist.h"
+#include "ardour/utils.h"
+#include "evoral/Parameter.hpp"
 
 #include "ardour_ui.h"
 #include "route_time_axis.h"
@@ -75,7 +75,7 @@
 #include "streamview.h"
 #include "utils.h"
 
-#include <ardour/track.h>
+#include "ardour/track.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index da1ee711d6..cf1e86c0b4 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -35,8 +35,8 @@
 #include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/slider_controller.h>
 
-#include <ardour/playlist.h>
-#include <ardour/types.h>
+#include "ardour/playlist.h"
+#include "ardour/types.h"
 
 #include "ardour_dialog.h"
 #include "route_ui.h"
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index cefe2ac517..facabd9779 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -25,11 +25,11 @@
 #include <gtkmm2ext/barcontroller.h>
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/route_group.h>
-#include <pbd/memento_command.h>
-#include <pbd/stacktrace.h>
-#include <pbd/shiva.h>
-#include <pbd/controllable.h>
+#include "ardour/route_group.h"
+#include "pbd/memento_command.h"
+#include "pbd/stacktrace.h"
+#include "pbd/shiva.h"
+#include "pbd/controllable.h"
 
 #include "route_ui.h"
 #include "keyboard.h"
@@ -40,14 +40,14 @@
 #include "latency_gui.h"
 #include "automation_time_axis.h"
 
-#include <ardour/route.h>
-#include <ardour/session.h>
-#include <ardour/audioengine.h>
-#include <ardour/audio_track.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/midi_track.h>
-#include <ardour/midi_diskstream.h>
-#include <ardour/profile.h>
+#include "ardour/route.h"
+#include "ardour/session.h"
+#include "ardour/audioengine.h"
+#include "ardour/audio_track.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/midi_track.h"
+#include "ardour/midi_diskstream.h"
+#include "ardour/profile.h"
 
 #include "i18n.h"
 using namespace sigc;
diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index c784b97668..4761acd61a 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -22,10 +22,10 @@
 
 #include <list>
 
-#include <pbd/xml++.h>
-#include <ardour/ardour.h>
-#include <ardour/route.h>
-#include <ardour/track.h>
+#include "pbd/xml++.h"
+#include "ardour/ardour.h"
+#include "ardour/route.h"
+#include "ardour/track.h"
 
 #include "axis_view.h"
 
diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 3f6c282d3a..da0047eefc 100644
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -19,10 +19,10 @@
 
 #include <algorithm>
 #include <sigc++/bind.h>
-#include <pbd/error.h>
-#include <pbd/stacktrace.h>
+#include "pbd/error.h"
+#include "pbd/stacktrace.h"
 
-#include <ardour/playlist.h>
+#include "ardour/playlist.h"
 
 #include "region_view.h"
 #include "selection.h"
diff --git a/gtk2_ardour/selection_templates.h b/gtk2_ardour/selection_templates.h
index 3ab8505b72..cc7933d879 100644
--- a/gtk2_ardour/selection_templates.h
+++ b/gtk2_ardour/selection_templates.h
@@ -25,7 +25,7 @@
    avoid multiplying dependencies.
 */
 
-#include <ardour/region.h>
+#include "ardour/region.h"
 
 #include "selection.h"
 #include "region_view.h"
diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index 3fb6e8af47..1014f5a07a 100644
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -19,8 +19,8 @@
 
 #include <gtkmm2ext/doi.h>
 
-#include <ardour/io.h>
-#include <ardour/send.h>
+#include "ardour/io.h"
+#include "ardour/send.h"
 
 #include "utils.h"
 #include "send_ui.h"
diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc
index 3776c3c04c..d6f2826abf 100644
--- a/gtk2_ardour/session_import_dialog.cc
+++ b/gtk2_ardour/session_import_dialog.cc
@@ -20,13 +20,13 @@
 
 #include "session_import_dialog.h"
 
-#include <pbd/failed_constructor.h>
+#include "pbd/failed_constructor.h"
 
-#include <ardour/audio_region_importer.h>
-#include <ardour/audio_playlist_importer.h>
-#include <ardour/audio_track_importer.h>
-#include <ardour/location_importer.h>
-#include <ardour/tempo_map_importer.h>
+#include "ardour/audio_region_importer.h"
+#include "ardour/audio_playlist_importer.h"
+#include "ardour/audio_track_importer.h"
+#include "ardour/location_importer.h"
+#include "ardour/tempo_map_importer.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/window_title.h>
diff --git a/gtk2_ardour/session_import_dialog.h b/gtk2_ardour/session_import_dialog.h
index 22cccd1262..e095dbaea0 100644
--- a/gtk2_ardour/session_import_dialog.h
+++ b/gtk2_ardour/session_import_dialog.h
@@ -28,9 +28,9 @@
 #include <boost/shared_ptr.hpp>
 #include <gtkmm.h>
 
-#include <pbd/xml++.h>
-#include <ardour/element_importer.h>
-#include <ardour/element_import_handler.h>
+#include "pbd/xml++.h"
+#include "ardour/element_importer.h"
+#include "ardour/element_import_handler.h"
 
 #include "ardour_dialog.h"
 
diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc
index 35920038be..6038b8b5ae 100644
--- a/gtk2_ardour/session_metadata_dialog.cc
+++ b/gtk2_ardour/session_metadata_dialog.cc
@@ -25,10 +25,10 @@
 #include <gtkmm2ext/window_title.h>
 
 #include "i18n.h"
-#include <pbd/xml++.h>
-#include <ardour/session.h>
-#include <ardour/session_directory.h>
-#include <ardour/session_utils.h>
+#include "pbd/xml++.h"
+#include "ardour/session.h"
+#include "ardour/session_directory.h"
+#include "ardour/session_utils.h"
 
 #define CALL_MEMBER_FN(object,ptrToMember)  ((object).*(ptrToMember))
 
diff --git a/gtk2_ardour/session_metadata_dialog.h b/gtk2_ardour/session_metadata_dialog.h
index ffbb7a0930..e06dbe010c 100644
--- a/gtk2_ardour/session_metadata_dialog.h
+++ b/gtk2_ardour/session_metadata_dialog.h
@@ -28,7 +28,7 @@
 #include <string>
 #include <list>
 
-#include <ardour/session_metadata.h>
+#include "ardour/session_metadata.h"
 
 using std::string;
 using Glib::ustring;
diff --git a/gtk2_ardour/sfdb_freesound_mootcher.cc b/gtk2_ardour/sfdb_freesound_mootcher.cc
index 7daecfc593..d84f34d7cb 100644
--- a/gtk2_ardour/sfdb_freesound_mootcher.cc
+++ b/gtk2_ardour/sfdb_freesound_mootcher.cc
@@ -39,12 +39,12 @@
 *************************************************************************************/

 #include "sfdb_freesound_mootcher.h"

 

-#include <pbd/xml++.h>

+#include "pbd/xml++.h"

 

 #include <sys/stat.h>

 #include <sys/types.h>

 

-#include <ardour/audio_library.h>

+#include "ardour/audio_library.h"

 

 #define TRUE 1

 

diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 0ee8935f1b..dcd041c44b 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -29,26 +29,26 @@
 #include <gtkmm/stock.h>
 #include <glibmm/fileutils.h>
 
-#include <pbd/convert.h>
-#include <pbd/tokenizer.h>
-#include <pbd/enumwriter.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/xml++.h>
+#include "pbd/convert.h"
+#include "pbd/tokenizer.h"
+#include "pbd/enumwriter.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/xml++.h"
 
 #include <gtkmm2ext/utils.h>
 
-#include <evoral/SMFReader.hpp>
-
-#include <ardour/audio_library.h>
-#include <ardour/auditioner.h>
-#include <ardour/audioregion.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/smf_source.h>
-#include <ardour/region_factory.h>
-#include <ardour/source_factory.h>
-#include <ardour/session.h>
-#include <ardour/session_directory.h>
-#include <ardour/profile.h>
+#include "evoral/SMFReader.hpp"
+
+#include "ardour/audio_library.h"
+#include "ardour/auditioner.h"
+#include "ardour/audioregion.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/smf_source.h"
+#include "ardour/region_factory.h"
+#include "ardour/source_factory.h"
+#include "ardour/session.h"
+#include "ardour/session_directory.h"
+#include "ardour/profile.h"
 
 #include "ardour_ui.h"
 #include "editing.h"
diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h
index 24cb08cc1b..52676c2d4b 100644
--- a/gtk2_ardour/sfdb_ui.h
+++ b/gtk2_ardour/sfdb_ui.h
@@ -37,8 +37,8 @@
 #include <gtkmm/frame.h>
 #include <gtkmm/label.h>
 
-#include <ardour/session.h>
-#include <ardour/audiofilesource.h>
+#include "ardour/session.h"
+#include "ardour/audiofilesource.h"
 
 #include "ardour_dialog.h"
 #include "editing.h"
diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index 8846c9f4e6..e81a987aa1 100644
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -1,9 +1,9 @@
 #include <string>
 
-#include <pbd/failed_constructor.h>
-#include <pbd/file_utils.h>
-#include <ardour/ardour.h>
-#include <ardour/filesystem_paths.h>
+#include "pbd/failed_constructor.h"
+#include "pbd/file_utils.h"
+#include "ardour/ardour.h"
+#include "ardour/filesystem_paths.h"
 
 #include "gui_thread.h"
 #include "splash.h"
diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index c211804fc4..8d36427a0b 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -22,11 +22,11 @@
 
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/playlist.h>
-#include <ardour/region.h>
-#include <ardour/source.h>
-#include <ardour/diskstream.h>
-#include <ardour/track.h>
+#include "ardour/playlist.h"
+#include "ardour/region.h"
+#include "ardour/source.h"
+#include "ardour/diskstream.h"
+#include "ardour/track.h"
 
 #include "streamview.h"
 #include "region_view.h"
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index fa5657f866..24a81f4847 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -22,7 +22,7 @@
 #include <list>
 #include <cmath>
 
-#include <ardour/location.h>
+#include "ardour/location.h"
 #include "enums.h"
 #include "simplerect.h"
 #include "canvas.h"
diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc
index 21bc41800e..f036ea455c 100644
--- a/gtk2_ardour/tape_region_view.cc
+++ b/gtk2_ardour/tape_region_view.cc
@@ -24,10 +24,10 @@
 
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/playlist.h>
-#include <ardour/audioregion.h>
-#include <ardour/audiosource.h>
-#include <ardour/audio_diskstream.h>
+#include "ardour/playlist.h"
+#include "ardour/audioregion.h"
+#include "ardour/audiosource.h"
+#include "ardour/audio_diskstream.h"
 
 #include "tape_region_view.h"
 #include "audio_time_axis.h"
diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index cbb237abb8..3cdc29a347 100644
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -30,8 +30,8 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/comboboxtext.h>
 
-#include <ardour/types.h>
-#include <ardour/tempo.h>
+#include "ardour/types.h"
+#include "ardour/tempo.h"
 
 #include "ardour_dialog.h"
 
diff --git a/gtk2_ardour/tempo_lines.h b/gtk2_ardour/tempo_lines.h
index d5040bd90f..275db7c85e 100644
--- a/gtk2_ardour/tempo_lines.h
+++ b/gtk2_ardour/tempo_lines.h
@@ -22,7 +22,7 @@
 #include <map>
 #include <boost/pool/pool.hpp>
 #include <boost/pool/pool_alloc.hpp>
-#include <ardour/tempo.h>
+#include "ardour/tempo.h"
 #include "canvas.h"
 #include "simpleline.h"
 
diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 0d13200513..8270c7bcb6 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -27,11 +27,11 @@
 #include <gtkmm2ext/window_title.h>
 #include <gtkmm/settings.h>
 
-#include <pbd/file_utils.h>
+#include "pbd/file_utils.h"
 
-#include <ardour/configuration.h>
-#include <ardour/filesystem_paths.h>
-#include <ardour/profile.h>
+#include "ardour/configuration.h"
+#include "ardour/filesystem_paths.h"
+#include "ardour/profile.h"
 
 #include "theme_manager.h"
 #include "rgb_macros.h"
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index be3c0655b8..056135e70c 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -27,17 +27,17 @@
 #include <libgnomecanvasmm/canvas.h>
 #include <libgnomecanvasmm/item.h>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/stop_signal.h>
 
-#include <ardour/session.h>
-#include <ardour/utils.h>
-#include <ardour/ladspa_plugin.h>
-#include <ardour/processor.h>
-#include <ardour/location.h>
+#include "ardour/session.h"
+#include "ardour/utils.h"
+#include "ardour/ladspa_plugin.h"
+#include "ardour/processor.h"
+#include "ardour/location.h"
 
 #include "ardour_ui.h"
 #include "public_editor.h"
diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 980ff2cdd8..6f0b3310eb 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -33,11 +33,11 @@
 
 #include <gtkmm2ext/focus_entry.h>
 
-#include <pbd/stateful.h>
+#include "pbd/stateful.h"
 
-#include <ardour/types.h>
-#include <ardour/region.h>
-#include <evoral/Parameter.hpp>
+#include "ardour/types.h"
+#include "ardour/region.h"
+#include "evoral/Parameter.hpp"
 
 #include "prompter.h"
 #include "axis_view.h"
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 8de294deb2..98c8b7cce9 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -17,11 +17,11 @@
 
 */
 
-#include <pbd/error.h>
-#include <pbd/stacktrace.h>
+#include "pbd/error.h"
+#include "pbd/stacktrace.h"
 
-#include <ardour/types.h>
-#include <ardour/ardour.h>
+#include "ardour/types.h"
+#include "ardour/ardour.h"
 
 #include <gtkmm2ext/utils.h>
 
diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc
index eac7bd70f5..f9e45f7f6b 100644
--- a/gtk2_ardour/time_selection.cc
+++ b/gtk2_ardour/time_selection.cc
@@ -19,8 +19,8 @@
 
 #include <algorithm>
 
-#include <pbd/error.h>
-#include <ardour/ardour.h>
+#include "pbd/error.h"
+#include "ardour/ardour.h"
 
 #include "time_selection.h"
 
diff --git a/gtk2_ardour/time_selection.h b/gtk2_ardour/time_selection.h
index 1783e16046..ba4250ad7f 100644
--- a/gtk2_ardour/time_selection.h
+++ b/gtk2_ardour/time_selection.h
@@ -21,7 +21,7 @@
 #define __ardour_gtk_time_selection_h__
 
 #include <list>
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 namespace ARDOUR {
 	class RouteGroup;
diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 8f8d586e1f..c6dd70c992 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -22,14 +22,14 @@
 
 #include <glibmm/miscutils.h>
 
-#include <pbd/failed_constructor.h>
-#include <pbd/xml++.h>
-#include <pbd/filesystem.h>
-#include <pbd/file_utils.h>
-#include <pbd/error.h>
-
-#include <ardour/ardour.h>
-#include <ardour/filesystem_paths.h>
+#include "pbd/failed_constructor.h"
+#include "pbd/xml++.h"
+#include "pbd/filesystem.h"
+#include "pbd/file_utils.h"
+#include "pbd/error.h"
+
+#include "ardour/ardour.h"
+#include "ardour/filesystem_paths.h"
 
 #include "ui_config.h"
 
diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index 5d4b72056d..e3b7d26cd3 100644
--- a/gtk2_ardour/ui_config.h
+++ b/gtk2_ardour/ui_config.h
@@ -24,8 +24,8 @@
 #include <ostream>
 #include <iostream>
 
-#include <pbd/stateful.h> 
-#include <pbd/xml++.h>
+#include "pbd/stateful.h" 
+#include "pbd/xml++.h"
 
 template<class T>
 class UIConfigVariable 
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 5b83cddbc9..9378b6727c 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -32,13 +32,13 @@
 #include <gtkmm/paned.h>
 #include <gtk/gtkpaned.h>
 
-#include <pbd/file_utils.h>
+#include "pbd/file_utils.h"
 
 #include <gtkmm2ext/utils.h>
-#include <ardour/configuration.h>
-#include <ardour/configuration.h>
+#include "ardour/configuration.h"
+#include "ardour/configuration.h"
 
-#include <ardour/filesystem_paths.h>
+#include "ardour/filesystem_paths.h"
 
 #include "ardour_ui.h"
 #include "keyboard.h"
diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index 42494c8f6b..b6ce0160ea 100644
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -23,7 +23,7 @@
 #include <string>
 #include <cmath>
 #include <vector>
-#include <ardour/types.h>
+#include "ardour/types.h"
 #include <libgnomecanvasmm/line.h>
 #include <gdkmm/types.h>
 #include <glibmm/ustring.h>
diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc
index 999f4c81f5..2b811e6c58 100644
--- a/gtk2_ardour/visual_time_axis.cc
+++ b/gtk2_ardour/visual_time_axis.cc
@@ -23,9 +23,9 @@
 #include <string>
 #include <vector>
 
-#include <pbd/error.h>
-#include <pbd/stl_delete.h>
-#include <pbd/whitespace.h>
+#include "pbd/error.h"
+#include "pbd/stl_delete.h"
+#include "pbd/whitespace.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/selector.h>
@@ -33,10 +33,10 @@
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/choice.h>
 
-#include <ardour/session.h>
-#include <ardour/utils.h>
-#include <ardour/processor.h>
-#include <ardour/location.h>
+#include "ardour/session.h"
+#include "ardour/utils.h"
+#include "ardour/processor.h"
+#include "ardour/location.h"
 
 #include "ardour_ui.h"
 #include "public_editor.h"
diff --git a/gtk2_ardour/vst_pluginui.cc b/gtk2_ardour/vst_pluginui.cc
index aba100a97c..299c2f5681 100644
--- a/gtk2_ardour/vst_pluginui.cc
+++ b/gtk2_ardour/vst_pluginui.cc
@@ -19,8 +19,8 @@
 
 #include <fst.h>
 #include <gtk/gtksocket.h>
-#include <ardour/processor.h>
-#include <ardour/vst_plugin.h>
+#include "ardour/processor.h"
+#include "ardour/vst_plugin.h"
 
 #include "plugin_ui.h"