Remove unused ringbuffer-abi.h public header

[lttng-ust.git] / src / lib / lttng-ust-ctl / ustctl.c

diff --git a/src/lib/lttng-ust-ctl/ustctl.c b/src/lib/lttng-ust-ctl/ustctl.c
index d585c71dd21c30799dbddb74beb83ca9daba30c6..7c169fe16c7a24b4578d994de12ceb44bc776917 100644 (file)
--- a/src/lib/lttng-ust-ctl/ustctl.c
+++ b/src/lib/lttng-ust-ctl/ustctl.c
@@ -22,19 +22,18 @@
 #include "common/macros.h"
 #include "common/align.h"
 
-#include "libringbuffer/backend.h"
-#include "libringbuffer/frontend.h"
-#include "liblttng-ust/ust-events-internal.h"
-#include "liblttng-ust/wait.h"
-#include "liblttng-ust/lttng-rb-clients.h"
-#include "liblttng-ust/clock.h"
-#include "liblttng-ust/getenv.h"
-#include "liblttng-ust/lttng-tracer-core.h"
-#include "liblttng-ust/lttng-counter-client.h"
-
-#include "libcounter/shm.h"
-#include "libcounter/smp.h"
-#include "libcounter/counter.h"
+#include "common/ringbuffer/backend.h"
+#include "common/ringbuffer/frontend.h"
+#include "common/events.h"
+#include "common/wait.h"
+#include "lib/lttng-ust/lttng-rb-clients.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"
+
+#include "common/counter/smp.h"
+#include "common/counter/counter.h"
 
 /*
  * Number of milliseconds to retry before failing metadata writes on
@@ -2907,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();