#include <stdlib.h>
#include "context-internal.h"
-#include "ust-events-internal.h"
+#include "lib/lttng-ust/events.h"
#include "common/logging.h"
#include "lttng-tracer-core.h"
#include "lttng-rb-clients.h"
#include "lttng-counter-client.h"
-#include "jhash.h"
+#include "common/jhash.h"
static CDS_LIST_HEAD(lttng_transport_list);
static CDS_LIST_HEAD(lttng_counter_transport_list);