-#include <common/common.h>
-#include <common/sessiond-comm/relayd.h>
-#include <common/compat/string.h>
-#include <lttng/constant.h>
+#include "cmd-2-1.hpp"
+#include "utils.hpp"
+
+#include <common/common.hpp>
+#include <common/compat/string.hpp>
+#include <common/sessiond-comm/relayd.hpp>