cleanup: LTTNG_METADATA_TIMEOUT_MSEC defined twice

[lttng-ust.git] / src / lib / lttng-ust / lttng-events.c

diff --git a/src/lib/lttng-ust/lttng-events.c b/src/lib/lttng-ust/lttng-events.c
index 13becb9111f13090606c9bdefef5679e7c9a42d7..1981726f4eaac3d40b8bb6a1f1381b2a8a575a81 100644 (file)
--- a/src/lib/lttng-ust/lttng-events.c
+++ b/src/lib/lttng-ust/lttng-events.c
@@ -39,11 +39,10 @@
 #include "common/ust-fd.h"
 #include "common/dynamic-type.h"
 #include "common/ust-context-provider.h"
-#include "error.h"
 #include "lttng-ust-uuid.h"
 
-#include "tracepoint-internal.h"
-#include "string-utils.h"
+#include "common/tracepoint.h"
+#include "common/strutils.h"
 #include "lttng-bytecode.h"
 #include "lttng-tracer.h"
 #include "lttng-tracer-core.h"
@@ -55,7 +54,7 @@
 #include "common/ringbuffer/frontend_types.h"
 #include "common/ringbuffer/frontend.h"
 #include "common/counter/counter.h"
-#include "jhash.h"
+#include "common/jhash.h"
 #include <lttng/ust-abi.h>
 #include "context-provider-internal.h"