#include <limits.h>
#include <lttng/ust-utils.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
#include "ringbuffer-config.h"
#include "vatomic.h"
#include "backend.h"
#include "frontend.h"
-#include "smp.h"
+#include "common/smp.h"
#include "shm.h"
#include "common/align.h"