#include <lttng/tracepoint.h>
#include <lttng/ust-events.h>
-#include <usterr-signal-safe.h>
-#include <ust-helper.h>
+#include "common/logging.h"
+#include "common/macros.h"
#include <lttng/ust-ctl.h>
-#include <ust-comm.h>
-#include <ust-fd.h>
-#include <ust-dynamic-type.h>
-#include <ust-context-provider.h>
+#include "common/ustcomm.h"
+#include "common/ust-fd.h"
+#include "common/dynamic-type.h"
+#include "common/ust-context-provider.h"
#include "error.h"
#include "compat.h"
#include "lttng-ust-uuid.h"
#include "context-internal.h"
#include "ust-events-internal.h"
#include "wait.h"
-#include "../libringbuffer/shm.h"
-#include "../libringbuffer/frontend_types.h"
-#include "../libringbuffer/frontend.h"
-#include "../libcounter/counter.h"
+#include "common/ringbuffer/shm.h"
+#include "common/ringbuffer/frontend_types.h"
+#include "common/ringbuffer/frontend.h"
+#include "common/counter/counter.h"
#include "jhash.h"
#include <lttng/ust-abi.h>
#include "context-provider-internal.h"
lttng_ust_unlock_fd_tracker();
cds_list_del(&event_notifier_group->node);
-
+ lttng_destroy_context(event_notifier_group->ctx);
free(event_notifier_group);
}