X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fcommon%2Fcommon.h;h=0fdad32fcd54cad9a1498fa0b2b06a44c51bb9c7;hp=ca1b1399a6144e3579ad421fc37e23705b3ccdd1;hb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;hpb=924dc299c8a893e92fcd985fa05c245b591ef314

diff --git a/src/common/common.h b/src/common/common.h
index ca1b1399..0fdad32f 100644
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -33,15 +33,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <babeltrace2/trace-ir/event-class-const.h>
-#include <babeltrace2/trace-ir/field-class-const.h>
-#include <babeltrace2/trace-ir/field-path-const.h>
-#include <babeltrace2/logging.h>
-#include <babeltrace2/value.h>
+#include <babeltrace2/babeltrace.h>
 
-#define __BT_FUNC_STATUS_ENABLE
+#define __BT_IN_BABELTRACE_H
 #include <babeltrace2/func-status.h>
-#undef __BT_FUNC_STATUS_ENABLE
 
 #include "common/assert.h"
 #include "common/macros.h"
@@ -721,6 +716,4 @@ end:
 	return ret;
 }
 
-#include <babeltrace2/undef-func-status.h>
-
 #endif /* BABELTRACE_COMMON_INTERNAL_H */