X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fliblttng-ust-dl%2Flttng-ust-dl.c;h=6444e3fbc0a76bef294ad16c7821c610ce994dde;hb=9d315d6d74aac2986b10d708c864d152a0febec7;hp=1394ce1963fce5e31ec53dc41e1b39ebf21237c3;hpb=9d4c8b2d907edb9ebc9bfde55602598e7ba0832e;p=lttng-ust.git

diff --git a/src/liblttng-ust-dl/lttng-ust-dl.c b/src/liblttng-ust-dl/lttng-ust-dl.c
index 1394ce19..6444e3fb 100644
--- a/src/liblttng-ust-dl/lttng-ust-dl.c
+++ b/src/liblttng-ust-dl/lttng-ust-dl.c
@@ -7,17 +7,20 @@
  */
 
 #define _LGPL_SOURCE
+
+/* Has to be included first to override dlfcn.h */
+#include <common/compat/dlfcn.h>
+
 #include <limits.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <ust-dlfcn.h>
-#include <ust-elf.h>
+#include "common/elf.h"
 #include <lttng/ust-events.h>
-#include <ust-helper.h>
-#include "usterr-signal-safe.h"
+#include "common/macros.h"
+#include "common/logging.h"
 
 #include "../liblttng-ust/ust-events-internal.h"