X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftrace-ir%2Fpacket.h;h=bc45a4eb3b45d0d305a6ebb65d6f8658dea2bb75;hb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;hp=07b92b7c5b05677f1abf1932f086497631ae0816;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git

diff --git a/include/babeltrace2/trace-ir/packet.h b/include/babeltrace2/trace-ir/packet.h
index 07b92b7c..bc45a4eb 100644
--- a/include/babeltrace2/trace-ir/packet.h
+++ b/include/babeltrace2/trace-ir/packet.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_TRACE_IR_PACKET_H
-#define BABELTRACE_TRACE_IR_PACKET_H
+#ifndef BABELTRACE2_TRACE_IR_PACKET_H
+#define BABELTRACE2_TRACE_IR_PACKET_H
 
 /*
  * Copyright 2016-2018 Philippe Proulx <pproulx@efficios.com>
@@ -26,16 +26,15 @@
  * http://www.efficios.com/ctf
  */
 
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
+
 #include <stdint.h>
 
 /* For bt_packet, bt_packet_context_field, bt_stream */
 #include <babeltrace2/types.h>
 
-/* For __BT_FUNC_STATUS_* */
-#define __BT_FUNC_STATUS_ENABLE
-#include <babeltrace2/func-status.h>
-#undef __BT_FUNC_STATUS_ENABLE
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -59,6 +58,4 @@ bt_packet_move_context_field_status bt_packet_move_context_field(
 }
 #endif
 
-#include <babeltrace2/undef-func-status.h>
-
-#endif /* BABELTRACE_TRACE_IR_PACKET_H */
+#endif /* BABELTRACE2_TRACE_IR_PACKET_H */