X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fliblttng-ust-libc-wrapper%2Flttng-ust-malloc.c;h=a93c7c1a016742ef54a7b87eedb1bbb2bd9a2e50;hb=9d315d6d74aac2986b10d708c864d152a0febec7;hp=e1ff8e807f7a9fb22dc6f783230ce6f1b1693e4f;hpb=74e79a0da99992c182da26abf45447722eaa400d;p=lttng-ust.git

diff --git a/src/liblttng-ust-libc-wrapper/lttng-ust-malloc.c b/src/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
index e1ff8e80..a93c7c1a 100644
--- a/src/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
+++ b/src/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
@@ -10,7 +10,10 @@
  * circular dependency loop between this malloc wrapper, liburcu and
  * libc.
  */
-#include <ust-dlfcn.h>
+
+/* Has to be included first to override dlfcn.h */
+#include <common/compat/dlfcn.h>
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <assert.h>
@@ -24,8 +27,8 @@
 
 #include <lttng/ust-libc-wrapper.h>
 
-#include <ust-helper.h>
-#include "ust-compat.h"
+#include "common/macros.h"
+#include "common/align.h"
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_CREATE_PROBES