-#include <pbd/undo.h>
-#include <pbd/error.h>
-#include <glibmm/thread.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/memento_command.h>
-
-#include <midi++/mmc.h>
-#include <midi++/port.h>
-
-#include <ardour/ardour.h>
-#include <ardour/audioengine.h>
-#include <ardour/session.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/auditioner.h>
-#include <ardour/slave.h>
-#include <ardour/location.h>
+#include "pbd/undo.h"
+#include "pbd/error.h"
+#include "pbd/enumwriter.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/memento_command.h"
+
+#include "midi++/mmc.h"
+#include "midi++/port.h"
+
+#include "ardour/ardour.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/audioengine.h"
+#include "ardour/auditioner.h"
+#include "ardour/butler.h"
+#include "ardour/debug.h"
+#include "ardour/location.h"
+#include "ardour/session.h"
+#include "ardour/slave.h"