X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-ctl.h;h=a6e180235203e6611a7b5d3601188ac2ea17e988;hb=251c9f75028bda8453a048978ec221b70a652153;hp=39952fa30db7fa9ee6a679d0ebcbfe3d7fd8d57f;hpb=9f5ade14faf36df6429d9c6e1d0360854a5669d0;p=lttng-ust.git

diff --git a/include/lttng/ust-ctl.h b/include/lttng/ust-ctl.h
index 39952fa3..a6e18023 100644
--- a/include/lttng/ust-ctl.h
+++ b/include/lttng/ust-ctl.h
@@ -15,6 +15,7 @@
 #include <sys/types.h>
 
 #include <lttng/ust-abi.h>
+#include <lttng/ust-utils.h>
 
 #ifndef LTTNG_UST_UUID_LEN
 #define LTTNG_UST_UUID_LEN	16
@@ -23,7 +24,7 @@
 /* Default unix socket path */
 #define LTTNG_UST_SOCK_FILENAME					\
 	"lttng-ust-sock-"					\
-	__ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
+	lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
 
 /*
  * Shared memory files path are automatically related to shm root, e.g.
@@ -31,10 +32,7 @@
  */
 #define LTTNG_UST_WAIT_FILENAME					\
 	"lttng-ust-wait-"					\
-	__ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
-
-struct lttng_ust_shm_handle;
-struct lttng_ust_lib_ring_buffer;
+	lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
 
 struct ustctl_consumer_channel_attr {
 	enum lttng_ust_abi_chan_type type;