Fix angle bracket project-local include paths.

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

33 files changed, 129 insertions, 128 deletions

diff --git a/libs/ardour/mtdm.cc b/libs/ardour/mtdm.cc
index 4e208a56f7..dceb4f8406 100644
--- a/libs/ardour/mtdm.cc
+++ b/libs/ardour/mtdm.cc
@@ -16,7 +16,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <ardour/mtdm.h>
+#include "ardour/mtdm.h"
 
 MTDM::MTDM (void)
 	: _cnt (0)
diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc
index c0ead577d7..af457fe5a4 100644
--- a/libs/surfaces/control_protocol/basic_ui.cc
+++ b/libs/surfaces/control_protocol/basic_ui.cc
@@ -18,12 +18,12 @@
 
 */
 
-#include <pbd/pthread_utils.h>
+#include "pbd/pthread_utils.h"
 
-#include <ardour/session.h>
-#include <ardour/location.h>
+#include "ardour/session.h"
+#include "ardour/location.h"
 
-#include <control_protocol/basic_ui.h>
+#include "control_protocol/basic_ui.h"
 
 #include "i18n.h"
 
diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index c907b6f301..cae9c23ae9 100644
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -24,7 +24,7 @@
 #include <string>
 
 #include <jack/types.h>
-#include <control_protocol/timecode.h>
+#include "control_protocol/timecode.h"
 
 namespace ARDOUR {
 	class Session;
diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
index 9efb4b299c..e0d55d9eaa 100644
--- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h
+++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
@@ -27,7 +27,7 @@
 #include <boost/shared_ptr.hpp>
 #include <sigc++/sigc++.h>
 #include <pbd/stateful.h>
-#include <control_protocol/basic_ui.h>
+#include "control_protocol/basic_ui.h"
 
 namespace ARDOUR {
 
diff --git a/libs/surfaces/frontier/tranzport/interface.cc b/libs/surfaces/frontier/tranzport/interface.cc
index f6d0dc8206..bb8ef71e6c 100644
--- a/libs/surfaces/frontier/tranzport/interface.cc
+++ b/libs/surfaces/frontier/tranzport/interface.cc
@@ -1,4 +1,4 @@
-#include <control_protocol/control_protocol.h>
+#include "control_protocol/control_protocol.h"
 #include "tranzport_control_protocol.h"
 
 using namespace ARDOUR;
diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc
index 5b413273ea..e002775d56 100644
--- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc
+++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc
@@ -52,14 +52,14 @@
 #include <sys/time.h>
 #include <errno.h>
 
-#include <pbd/pthread_utils.h>
+#include "pbd/pthread_utils.h"
 
-#include <ardour/route.h>
-#include <ardour/audio_track.h>
-#include <ardour/session.h>
-#include <ardour/tempo.h>
-#include <ardour/location.h>
-#include <ardour/dB.h>
+#include "ardour/route.h"
+#include "ardour/audio_track.h"
+#include "ardour/session.h"
+#include "ardour/tempo.h"
+#include "ardour/location.h"
+#include "ardour/dB.h"
 
 #include "tranzport_control_protocol.h"
 
@@ -70,7 +70,7 @@ using namespace PBD;
 
 #include "i18n.h"
 
-#include <pbd/abstract_ui.cc>
+#include "pbd/abstract_ui.cc"
 
 BaseUI::RequestType LEDChange = BaseUI::new_request_type ();
 BaseUI::RequestType Print = BaseUI::new_request_type ();
diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h
index f13e4a3a44..4e37da9916 100644
--- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h
+++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.h
@@ -10,9 +10,9 @@
 
 #include <glibmm/thread.h>
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 
-#include <control_protocol/control_protocol.h>
+#include "control_protocol/control_protocol.h"
 
 class TranzportControlProtocol : public ARDOUR::ControlProtocol
 {
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index af82471a90..9cd5f8a934 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -22,14 +22,14 @@
 
 #include <algorithm>
 
-#include <pbd/error.h>
-#include <pbd/failed_constructor.h>
+#include "pbd/error.h"
+#include "pbd/failed_constructor.h"
 
-#include <midi++/port.h>
-#include <midi++/manager.h>
+#include "midi++/port.h"
+#include "midi++/manager.h"
 
-#include <ardour/route.h>
-#include <ardour/session.h>
+#include "ardour/route.h"
+#include "ardour/session.h"
 
 #include "generic_midi_control_protocol.h"
 #include "midicontrollable.h"
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.h b/libs/surfaces/generic_midi/generic_midi_control_protocol.h
index 6473a869ae..828bb4e6be 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.h
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.h
@@ -3,9 +3,9 @@
 
 #include <set>
 #include <glibmm/thread.h>
-#include <ardour/types.h>
+#include "ardour/types.h"
 
-#include <control_protocol/control_protocol.h>
+#include "control_protocol/control_protocol.h"
 
 namespace MIDI {
 	class Port;
diff --git a/libs/surfaces/generic_midi/interface.cc b/libs/surfaces/generic_midi/interface.cc
index c017e53d4c..a62ca2a34b 100644
--- a/libs/surfaces/generic_midi/interface.cc
+++ b/libs/surfaces/generic_midi/interface.cc
@@ -1,6 +1,6 @@
 #include <pbd/failed_constructor.h>
 
-#include <control_protocol/control_protocol.h>
+#include "control_protocol/control_protocol.h"
 #include "generic_midi_control_protocol.h"
 
 using namespace ARDOUR;
diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc
index c16a0bdefd..92000a6dee 100644
--- a/libs/surfaces/generic_midi/midicontrollable.cc
+++ b/libs/surfaces/generic_midi/midicontrollable.cc
@@ -19,11 +19,11 @@
 
 #include <cstdio> /* for sprintf, sigh */
 #include <climits>
-#include <pbd/error.h>
-#include <pbd/xml++.h>
-#include <midi++/port.h>
-#include <midi++/channel.h>
-#include <ardour/automation_control.h>
+#include "pbd/error.h"
+#include "pbd/xml++.h"
+#include "midi++/port.h"
+#include "midi++/channel.h"
+#include "ardour/automation_control.h"
 
 #include "midicontrollable.h"
 
diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h
index f0b973f0f0..4aabd696b0 100644
--- a/libs/surfaces/generic_midi/midicontrollable.h
+++ b/libs/surfaces/generic_midi/midicontrollable.h
@@ -24,10 +24,10 @@
 
 #include <sigc++/sigc++.h>
 
-#include <midi++/types.h>
-#include <pbd/controllable.h>
-#include <pbd/stateful.h>
-#include <ardour/types.h>
+#include "midi++/types.h"
+#include "pbd/controllable.h"
+#include "pbd/stateful.h"
+#include "ardour/types.h"
 
 namespace MIDI {
 
diff --git a/libs/surfaces/mackie/interface.cc b/libs/surfaces/mackie/interface.cc
index ec42557c37..60f5752a58 100644
--- a/libs/surfaces/mackie/interface.cc
+++ b/libs/surfaces/mackie/interface.cc
@@ -15,7 +15,7 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include <control_protocol/control_protocol.h>
+#include "control_protocol/control_protocol.h"
 #include "mackie_control_protocol.h"
 
 #include <pbd/error.h>
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 1a147b84bf..aba0cd565a 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -32,21 +32,21 @@
 
 #include <boost/shared_array.hpp>
 
-#include <midi++/types.h>
-#include <midi++/port.h>
-#include <midi++/manager.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/error.h>
-#include <pbd/memento_command.h>
-#include <pbd/convert.h>
-
-#include <ardour/route.h>
-#include <ardour/session.h>
-#include <ardour/location.h>
-#include <ardour/dB.h>
-#include <ardour/panner.h>
-#include <ardour/tempo.h>
-#include <ardour/types.h>
+#include "midi++/types.h"
+#include "midi++/port.h"
+#include "midi++/manager.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/error.h"
+#include "pbd/memento_command.h"
+#include "pbd/convert.h"
+
+#include "ardour/route.h"
+#include "ardour/session.h"
+#include "ardour/location.h"
+#include "ardour/dB.h"
+#include "ardour/panner.h"
+#include "ardour/tempo.h"
+#include "ardour/types.h"
 
 #include "mackie_control_protocol.h"
 
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 617d09a086..1a6412667a 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -25,11 +25,11 @@
 
 #include <glibmm/thread.h>
 
-#include <ardour/types.h>
-#include <ardour/session.h>
-#include <midi++/types.h>
+#include "ardour/types.h"
+#include "ardour/session.h"
+#include "midi++/types.h"
 
-#include <control_protocol/control_protocol.h>
+#include "control_protocol/control_protocol.h"
 #include "midi_byte_array.h"
 #include "controls.h"
 #include "dummy_port.h"
diff --git a/libs/surfaces/mackie/mackie_port.cc b/libs/surfaces/mackie/mackie_port.cc
index e3a302fe65..85e05fd1b4 100644
--- a/libs/surfaces/mackie/mackie_port.cc
+++ b/libs/surfaces/mackie/mackie_port.cc
@@ -25,11 +25,12 @@
 
 #include <glibmm/main.h>
 
-#include <midi++/types.h>
-#include <midi++/port.h>
-#include <sigc++/sigc++.h>
 #include <boost/shared_array.hpp>
-#include <ardour/configuration.h>
+
+#include "midi++/types.h"
+#include "midi++/port.h"
+#include "sigc++/sigc++.h"
+#include "ardour/configuration.h"
 
 #include "i18n.h"
 
diff --git a/libs/surfaces/mackie/route_signal.cc b/libs/surfaces/mackie/route_signal.cc
index d76a8c896b..af99e5d91b 100644
--- a/libs/surfaces/mackie/route_signal.cc
+++ b/libs/surfaces/mackie/route_signal.cc
@@ -17,9 +17,9 @@
 */
 #include "route_signal.h"
 
-#include <ardour/route.h>
-#include <ardour/track.h>
-#include <ardour/panner.h>
+#include "ardour/route.h"
+#include "ardour/track.h"
+#include "ardour/panner.h"
 
 #include "mackie_control_protocol.h"
 
diff --git a/libs/surfaces/mackie/scripts/signals.rb b/libs/surfaces/mackie/scripts/signals.rb
index 8182e562a3..6128bfb06b 100644
--- a/libs/surfaces/mackie/scripts/signals.rb
+++ b/libs/surfaces/mackie/scripts/signals.rb
@@ -111,8 +111,8 @@ erb.run
 impl_def = <<EOF
 #include "route_signal.h"
 
-#include <ardour/route.h>
-#include <ardour/panner.h>
+#include "ardour/route.h"
+#include "ardour/panner.h"
 
 #include "mackie_control_protocol.h"
 
diff --git a/libs/surfaces/osc/interface.cc b/libs/surfaces/osc/interface.cc
index c8c559738e..1d313eeaa6 100644
--- a/libs/surfaces/osc/interface.cc
+++ b/libs/surfaces/osc/interface.cc
@@ -17,7 +17,7 @@
  *  
  *   */
 
-#include <control_protocol/control_protocol.h>
+#include "control_protocol/control_protocol.h"
 #include "osc.h"
 
 using namespace ARDOUR;
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 9a6c19225b..d5a28a38ce 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -35,12 +35,12 @@
 #include <pbd/filesystem.h>
 #include <pbd/failed_constructor.h>
 
-#include <ardour/session.h>
-#include <ardour/route.h>
-#include <ardour/audio_track.h>
-#include <ardour/midi_track.h>
-#include <ardour/dB.h>
-#include <ardour/filesystem_paths.h>
+#include "ardour/session.h"
+#include "ardour/route.h"
+#include "ardour/audio_track.h"
+#include "ardour/midi_track.h"
+#include "ardour/dB.h"
+#include "ardour/filesystem_paths.h"
 
 #include "osc.h"
 #include "osc_controllable.h"
diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index d0bc509f17..6cc0598520 100644
--- a/libs/surfaces/osc/osc.h
+++ b/libs/surfaces/osc/osc.h
@@ -31,9 +31,9 @@
 
 #include <sigc++/sigc++.h>
 
-#include <ardour/types.h>
-#include <ardour/session.h>
-#include <control_protocol/control_protocol.h>
+#include "ardour/types.h"
+#include "ardour/session.h"
+#include "control_protocol/control_protocol.h"
 
 class OSCControllable;
 
diff --git a/libs/surfaces/osc/osc_controllable.cc b/libs/surfaces/osc/osc_controllable.cc
index ed805466b0..df3facfa8c 100644
--- a/libs/surfaces/osc/osc_controllable.cc
+++ b/libs/surfaces/osc/osc_controllable.cc
@@ -19,10 +19,10 @@
 
 #include <cstdio> /* for sprintf, sigh */
 #include <climits>
-#include <pbd/error.h>
-#include <pbd/xml++.h>
+#include "pbd/error.h"
+#include "pbd/xml++.h"
 
-#include <ardour/route.h>
+#include "ardour/route.h"
 
 #include "osc_controllable.h"
 
diff --git a/libs/surfaces/osc/osc_controllable.h b/libs/surfaces/osc/osc_controllable.h
index bb80874e5e..750cd12509 100644
--- a/libs/surfaces/osc/osc_controllable.h
+++ b/libs/surfaces/osc/osc_controllable.h
@@ -25,9 +25,9 @@
 #include <sigc++/sigc++.h>
 #include <lo/lo.h>
 
-#include <pbd/controllable.h>
-#include <pbd/stateful.h>
-#include <ardour/types.h>
+#include "pbd/controllable.h"
+#include "pbd/stateful.h"
+#include "ardour/types.h"
 
 namespace ARDOUR {
 
diff --git a/libs/surfaces/tranzport/interface.cc b/libs/surfaces/tranzport/interface.cc
index f9b82fa651..16ff22687a 100644
--- a/libs/surfaces/tranzport/interface.cc
+++ b/libs/surfaces/tranzport/interface.cc
@@ -18,7 +18,7 @@
  *  
  *   */
 
-#include <control_protocol/control_protocol.h>
+#include "control_protocol/control_protocol.h"
 #include "tranzport_control_protocol.h"
 
 using namespace ARDOUR;
diff --git a/libs/surfaces/tranzport/show.cc b/libs/surfaces/tranzport/show.cc
index 2df6191ead..cefe5f2dd1 100644
--- a/libs/surfaces/tranzport/show.cc
+++ b/libs/surfaces/tranzport/show.cc
@@ -28,16 +28,16 @@
 #include <sys/time.h>
 #include <errno.h>
 
-#include <pbd/pthread_utils.h>
+#include "pbd/pthread_utils.h"
 
-#include <ardour/route.h>
-#include <ardour/audio_track.h>
-#include <ardour/session.h>
-#include <ardour/tempo.h>
-#include <ardour/location.h>
-#include <ardour/dB.h>
+#include "ardour/route.h"
+#include "ardour/audio_track.h"
+#include "ardour/session.h"
+#include "ardour/tempo.h"
+#include "ardour/location.h"
+#include "ardour/dB.h"
 
-#include <tranzport_control_protocol.h>
+#include "tranzport_control_protocol.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -46,7 +46,7 @@ using namespace PBD;
 
 #include "i18n.h"
 
-#include <pbd/abstract_ui.cc>
+#include "pbd/abstract_ui.cc"
 
 float
 log_meter (float db)
diff --git a/libs/surfaces/tranzport/state.cc b/libs/surfaces/tranzport/state.cc
index 1cb55b4fc3..7995e1aa02 100644
--- a/libs/surfaces/tranzport/state.cc
+++ b/libs/surfaces/tranzport/state.cc
@@ -27,11 +27,11 @@
 #include <float.h>
 #include <sys/time.h>
 #include <errno.h>
-#include <ardour/route.h>
-#include <ardour/audio_track.h>
-#include <ardour/session.h>
-#include <ardour/location.h>
-#include <ardour/dB.h>
+#include "ardour/route.h"
+#include "ardour/audio_track.h"
+#include "ardour/session.h"
+#include "ardour/location.h"
+#include "ardour/dB.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -40,7 +40,7 @@ using namespace PBD;
 
 #include "i18n.h"
 
-#include <pbd/abstract_ui.cc>
+#include "pbd/abstract_ui.cc"
 
 #include "tranzport_control_protocol.h"
 
diff --git a/libs/surfaces/tranzport/tranzport_common.h b/libs/surfaces/tranzport/tranzport_common.h
index 06b07bd62a..a7beb8f943 100644
--- a/libs/surfaces/tranzport/tranzport_common.h
+++ b/libs/surfaces/tranzport/tranzport_common.h
@@ -32,13 +32,13 @@
 #include <sys/time.h>
 #include <errno.h>
 
-#include <pbd/pthread_utils.h>
+#include "pbd/pthread_utils.h"
 
-#include <ardour/route.h>
-#include <ardour/audio_track.h>
-#include <ardour/session.h>
-#include <ardour/tempo.h>
-#include <ardour/location.h>
-#include <ardour/dB.h>
+#include "ardour/route.h"
+#include "ardour/audio_track.h"
+#include "ardour/session.h"
+#include "ardour/tempo.h"
+#include "ardour/location.h"
+#include "ardour/dB.h"
 
 #endif /* ardour_tranzport_common */
diff --git a/libs/surfaces/tranzport/tranzport_control_protocol.h b/libs/surfaces/tranzport/tranzport_control_protocol.h
index 6d231dd778..4cb61348fe 100644
--- a/libs/surfaces/tranzport/tranzport_control_protocol.h
+++ b/libs/surfaces/tranzport/tranzport_control_protocol.h
@@ -34,9 +34,9 @@
 #endif
 
 #include <glibmm/thread.h>
-#include <ardour/types.h>
+#include "ardour/types.h"
 
-#include <control_protocol/control_protocol.h>
+#include "control_protocol/control_protocol.h"
 
 class TranzportControlProtocol : public ARDOUR::ControlProtocol
 {
diff --git a/libs/surfaces/tranzport/wheel.cc b/libs/surfaces/tranzport/wheel.cc
index bc9683e6d7..87b935da4b 100644
--- a/libs/surfaces/tranzport/wheel.cc
+++ b/libs/surfaces/tranzport/wheel.cc
@@ -27,11 +27,11 @@
 #include <float.h>
 #include <sys/time.h>
 #include <errno.h>
-#include <ardour/route.h>
-#include <ardour/audio_track.h>
-#include <ardour/session.h>
-#include <ardour/location.h>
-#include <ardour/dB.h>
+#include "ardour/route.h"
+#include "ardour/audio_track.h"
+#include "ardour/session.h"
+#include "ardour/location.h"
+#include "ardour/dB.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -40,14 +40,14 @@ using namespace PBD;
 
 #include "i18n.h"
 
-#include <pbd/abstract_ui.cc>
+#include "pbd/abstract_ui.cc"
 
 BaseUI::RequestType LEDChange = BaseUI::new_request_type ();
 BaseUI::RequestType Print = BaseUI::new_request_type ();
 BaseUI::RequestType SetCurrentTrack = BaseUI::new_request_type ();
 
 
-#include <tranzport_control_protocol.h>
+#include "tranzport_control_protocol.h"
 
 void
 TranzportControlProtocol::datawheel ()
diff --git a/libs/surfaces/tranzport/wheel_modes.cc b/libs/surfaces/tranzport/wheel_modes.cc
index 06b3ae03b3..6a4e113222 100644
--- a/libs/surfaces/tranzport/wheel_modes.cc
+++ b/libs/surfaces/tranzport/wheel_modes.cc
@@ -33,16 +33,16 @@
 #include <poll.h>
 #endif
 
-#include <pbd/pthread_utils.h>
+#include "pbd/pthread_utils.h"
 
-#include <ardour/route.h>
-#include <ardour/audio_track.h>
-#include <ardour/session.h>
-#include <ardour/tempo.h>
-#include <ardour/location.h>
-#include <ardour/dB.h>
+#include "ardour/route.h"
+#include "ardour/audio_track.h"
+#include "ardour/session.h"
+#include "ardour/tempo.h"
+#include "ardour/location.h"
+#include "ardour/dB.h"
 
-#include <tranzport_control_protocol.h>
+#include "tranzport_control_protocol.h"
 
 using namespace ARDOUR;
 using namespace std;
diff --git a/libs/surfaces/wiimote/interface.cc b/libs/surfaces/wiimote/interface.cc
index 0ef301dd6c..5f622d5c09 100644
--- a/libs/surfaces/wiimote/interface.cc
+++ b/libs/surfaces/wiimote/interface.cc
@@ -1,9 +1,9 @@
 #include <pbd/failed_constructor.h>
 
-#include <control_protocol/control_protocol.h>
+#include "control_protocol/control_protocol.h"
 #include "wiimote.h"
 
-#include <ardour/session.h>
+#include "ardour/session.h"
 
 using namespace ARDOUR;
 
diff --git a/libs/surfaces/wiimote/wiimote.cc b/libs/surfaces/wiimote/wiimote.cc
index af3bbc369d..8864a5019f 100644
--- a/libs/surfaces/wiimote/wiimote.cc
+++ b/libs/surfaces/wiimote/wiimote.cc
@@ -3,8 +3,8 @@
 #include <iostream>
 #include <sigc++/bind.h>
 
-#include <pbd/xml++.h>
-#include <ardour/session.h>
+#include "pbd/xml++.h"
+#include "ardour/session.h"
 
 #include "i18n.h"
 
diff --git a/libs/surfaces/wiimote/wiimote.h b/libs/surfaces/wiimote/wiimote.h
index a6680edd2e..c7c2cd59c9 100644
--- a/libs/surfaces/wiimote/wiimote.h
+++ b/libs/surfaces/wiimote/wiimote.h
@@ -1,12 +1,12 @@
 #ifndef ardour_wiimote_control_protocol_h
 #define ardour_wiimote_control_protocol_h
 
-#include <ardour/types.h>
-#include <control_protocol/control_protocol.h>
+#include "ardour/types.h"
+#include "control_protocol/control_protocol.h"
 
 #include <glibmm/thread.h>
 
-#include <pbd/abstract_ui.h>
+#include "pbd/abstract_ui.h"
 
 #include <cwiid.h>