X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-ctl%2Fustctl.c;h=96107fe743bb31dba8cb2ec499347e7ed427b61d;hb=910dcd720731c190adbfb9bb50c67bb9c4235003;hp=725506532c599f574c2681421639fda8bfab892c;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-ctl/ustctl.c b/src/lib/lttng-ust-ctl/ustctl.c
index 72550653..96107fe7 100644
--- a/src/lib/lttng-ust-ctl/ustctl.c
+++ b/src/lib/lttng-ust-ctl/ustctl.c
@@ -25,10 +25,10 @@
 #include "common/ringbuffer/backend.h"
 #include "common/ringbuffer/frontend.h"
 #include "lib/lttng-ust/ust-events-internal.h"
-#include "lib/lttng-ust/wait.h"
+#include "common/wait.h"
 #include "lib/lttng-ust/lttng-rb-clients.h"
-#include "lib/lttng-ust/clock.h"
-#include "lib/lttng-ust/getenv.h"
+#include "common/clock.h"
+#include "common/getenv.h"
 #include "lib/lttng-ust/lttng-tracer-core.h"
 #include "lib/lttng-ust/lttng-counter-client.h"
 
@@ -2906,8 +2906,8 @@ void ustctl_init(void)
 static
 void ustctl_init(void)
 {
-	ust_err_init();
-	lttng_ust_getenv_init();	/* Needs ust_err_init() to be completed. */
+	lttng_ust_logging_init();
+	lttng_ust_getenv_init();	/* Needs lttng_ust_logging_init() to be completed. */
 	lttng_ust_clock_init();
 	lttng_ust_ring_buffer_clients_init();
 	lttng_ust_counter_clients_init();