-#undef TRACE_EVENT
-#undef TRACE_EVENT_FN
-#undef TRACE_EVENT_CONDITION
-#undef DEFINE_EVENT
-#undef DEFINE_EVENT_PRINT
-#undef DEFINE_EVENT_CONDITION
-#undef TRACE_EVENT_MAP
-#undef TRACE_EVENT_FN_MAP
-#undef TRACE_EVENT_CONDITION_MAP
-#undef DECLARE_EVENT_CLASS
-#undef DEFINE_EVENT_MAP
-#undef DEFINE_EVENT_PRINT_MAP
-#undef DEFINE_EVENT_CONDITION_MAP
+#undef LTTNG_TRACEPOINT_EVENT
+#undef LTTNG_TRACEPOINT_EVENT_FN
+#undef LTTNG_TRACEPOINT_EVENT_CONDITION
+#undef LTTNG_TRACEPOINT_EVENT_INSTANCE
+#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT
+#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_CONDITION
+#undef LTTNG_TRACEPOINT_EVENT_MAP
+#undef LTTNG_TRACEPOINT_EVENT_FN_MAP
+#undef LTTNG_TRACEPOINT_EVENT_CONDITION_MAP
+#undef LTTNG_TRACEPOINT_EVENT_CLASS
+#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP
+#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT_MAP
+#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_CONDITION_MAP
+#undef LTTNG_TRACEPOINT_EVENT_CODE
+#undef LTTNG_TRACEPOINT_EVENT_MAP_NOARGS
+#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS
+#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS