#include "lttng-ust-statedump.h"
#include "clock.h"
#include "lib/lttng-ust/getcpu.h"
-#include "getenv.h"
-#include "ust-events-internal.h"
+#include "common/getenv.h"
+#include "lib/lttng-ust/events.h"
#include "context-internal.h"
#include "common/align.h"
#include "lttng-counter-client.h"