#include "common/ust-fd.h"
#include "common/dynamic-type.h"
#include "common/ust-context-provider.h"
-#include "error.h"
#include "lttng-ust-uuid.h"
#include "tracepoint-internal.h"
#include "lttng-tracer-core.h"
#include "lttng-ust-statedump.h"
#include "context-internal.h"
-#include "ust-events-internal.h"
+#include "lib/lttng-ust/events.h"
#include "wait.h"
#include "common/ringbuffer/shm.h"
#include "common/ringbuffer/frontend_types.h"
#include "common/ringbuffer/frontend.h"
#include "common/counter/counter.h"
-#include "jhash.h"
+#include "common/jhash.h"
#include <lttng/ust-abi.h>
#include "context-provider-internal.h"