X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fbabeltrace.h;h=ce324694da86e1afc229b4233ba349fcf5e6dff0;hb=44e2e039eb4bea7100896f504f6e6a40b20b6a1e;hp=ed17a864b964b95263f0db990c6f2e1847fedba1;hpb=d23b766e7b7542ddff2211264b4ece1f3a347773;p=babeltrace.git

diff --git a/include/babeltrace2/babeltrace.h b/include/babeltrace2/babeltrace.h
index ed17a864..ce324694 100644
--- a/include/babeltrace2/babeltrace.h
+++ b/include/babeltrace2/babeltrace.h
@@ -72,7 +72,6 @@
 #include <babeltrace2/trace-ir/field-path-const.h>
 #include <babeltrace2/trace-ir/field.h>
 #include <babeltrace2/trace-ir/packet-const.h>
-#include <babeltrace2/trace-ir/packet-context-field.h>
 #include <babeltrace2/trace-ir/packet.h>
 #include <babeltrace2/trace-ir/stream-class-const.h>
 #include <babeltrace2/trace-ir/stream-class.h>
@@ -170,8 +169,16 @@
 #undef __BT_FUNC_STATUS_NOT_FOUND
 #undef __BT_FUNC_STATUS_OK
 #undef __BT_FUNC_STATUS_OVERFLOW_ERROR
+#undef __BT_FUNC_STATUS_USER_ERROR
 #undef __BT_IN_BABELTRACE_H
 #undef __BT_UPCAST
 #undef __BT_UPCAST_CONST
+#undef __BT_LOGGING_LEVEL_TRACE
+#undef __BT_LOGGING_LEVEL_DEBUG
+#undef __BT_LOGGING_LEVEL_INFO
+#undef __BT_LOGGING_LEVEL_WARNING
+#undef __BT_LOGGING_LEVEL_ERROR
+#undef __BT_LOGGING_LEVEL_FATAL
+#undef __BT_LOGGING_LEVEL_NONE
 
 #endif /* BABELTRACE2_BABELTRACE_H */