#include <urcu/system.h>
#include <urcu/arch.h>
#include <urcu/rculist.h>
-#include <helper.h>
+#include <ust-helper.h>
#include <urcu/ref.h>
#include <usterr-signal-safe.h>
#include <signal.h>
#include <urcu/tls-compat.h>
#include "perf_event.h"
+
+#include "context-internal.h"
#include "lttng-tracer-core.h"
+#include "ust-events-internal.h"
/*
* We use a global perf counter key and iterate on per-thread RCU lists