#include <babeltrace2/babeltrace.h>
#include "common/macros.h"
-#include "../common/metadata/decoder.hpp"
-#include "../common/msg-iter/msg-iter.hpp"
+#include "../common/src/metadata/tsdl/decoder.hpp"
+#include "../common/src/msg-iter/msg-iter.hpp"
#include "viewer-connection.hpp"
struct lttng_live_component;