#include <midi++/types.h>
#include <midi++/port.h>
#include <midi++/manager.h>
-#include <pbd/error.h>
-#include <pbd/lockmonitor.h>
+
+#include <glibmm/thread.h>
+
#include <pbd/pthread_utils.h>
#include <ardour/configuration.h>
#include <ardour/audioengine.h>
#include <ardour/session.h>
#include <ardour/audio_track.h>
-#include <ardour/diskstream.h>
-#include <ardour/control_protocol.h>
+#include <ardour/audio_diskstream.h>
+#include <control_protocol/control_protocol.h>
#include "i18n.h"