#include "pbd/demangle.h"
#include "pbd/error.h"
-#include "pbd/boost_debug.h"
+#include "ardour/boost_debug.h"
#include "ardour/session.h"
#include "ardour/session_handle.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;