#include <lttng/ust-error.h>
#include <lttng/ust-events.h>
#include <lttng/ust-version.h>
-#include <ust-fd.h>
-#include <usterr-signal-safe.h>
-#include "../libringbuffer/frontend_types.h"
-#include "../libringbuffer/frontend.h"
-#include "../libringbuffer/shm.h"
-#include "../libcounter/counter.h"
+#include "common/ust-fd.h"
+#include "common/logging.h"
+
+#include "common/ringbuffer/frontend_types.h"
+#include "common/ringbuffer/frontend.h"
+#include "common/ringbuffer/shm.h"
+#include "common/counter/counter.h"
#include "tracepoint-internal.h"
#include "lttng-tracer.h"
#include "string-utils.h"
#include "ust-events-internal.h"
#include "context-internal.h"
-#include "ust-helper.h"
+#include "common/macros.h"
#define OBJ_NAME_LEN 16