#include <urcu/arch.h>
#include <limits.h>
-#include <lttng/align.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ust-align.h>
+#include <lttng/ringbuffer-context.h>
+
+#include "ringbuffer-config.h"
#include "vatomic.h"
#include "backend.h"
#include "frontend.h"