#include "common/macros.h"
#include "lttng-tracer-core.h"
#include "lttng-ust-statedump.h"
-#include "jhash.h"
+#include "common/jhash.h"
#include "common/getenv.h"
-#include "ust-events-internal.h"
+#include "lib/lttng-ust/events.h"
#define TRACEPOINT_DEFINE
#include "ust_lib.h" /* Only define. */