#include <lttng/event-expr.h>
#include <lttng/event-field-value.h>
#include <lttng/event-rule/event-rule.h>
-#include <lttng/event-rule/kernel-probe.h>
-#include <lttng/event-rule/syscall.h>
+#include <lttng/event-rule/kernel-kprobe.h>
+#include <lttng/event-rule/kernel-syscall.h>
#include <lttng/event-rule/tracepoint.h>
-#include <lttng/event-rule/userspace-probe.h>
+#include <lttng/event-rule/kernel-tracepoint.h>
+#include <lttng/event-rule/kernel-uprobe.h>
#include <lttng/event.h>
#include <lttng/handle.h>
#include <lttng/health.h>