X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fbabeltrace.h;h=fd0bb7fa68ae0a28cde561d586d157ae6f9279cb;hb=c6fe8c4012c19ba7ab7fc16853a464e0381d6290;hp=e0db1254e4a5551db646a1312cb7196275c7d1c3;hpb=9b4f9b425f2efce9a6ccc25f7ae062ebc1116a7d;p=babeltrace.git

diff --git a/include/babeltrace2/babeltrace.h b/include/babeltrace2/babeltrace.h
index e0db1254..fd0bb7fa 100644
--- a/include/babeltrace2/babeltrace.h
+++ b/include/babeltrace2/babeltrace.h
@@ -111,7 +111,6 @@
 
 /* Message iterator API */
 #include <babeltrace2/graph/message-iterator.h>
-#include <babeltrace2/graph/port-output-message-iterator.h>
 #include <babeltrace2/graph/self-component-port-input-message-iterator.h>
 #include <babeltrace2/graph/self-message-iterator.h>
 
@@ -136,16 +135,20 @@
 #include <babeltrace2/graph/message-stream-end.h>
 
 /* Graph API */
+#include <babeltrace2/graph/component-descriptor-set-const.h>
+#include <babeltrace2/graph/component-descriptor-set.h>
 #include <babeltrace2/graph/connection-const.h>
 #include <babeltrace2/graph/graph-const.h>
 #include <babeltrace2/graph/graph.h>
 #include <babeltrace2/graph/interrupter-const.h>
 #include <babeltrace2/graph/interrupter.h>
+#include <babeltrace2/graph/mip.h>
 #include <babeltrace2/graph/port-const.h>
 #include <babeltrace2/graph/port-input-const.h>
 #include <babeltrace2/graph/port-output-const.h>
 
 /* Query executor API */
+#include <babeltrace2/graph/private-query-executor.h>
 #include <babeltrace2/graph/query-executor-const.h>
 #include <babeltrace2/graph/query-executor.h>
 
@@ -159,14 +162,13 @@
 /* Cancel private definitions */
 #undef __BT_FUNC_STATUS_AGAIN
 #undef __BT_FUNC_STATUS_END
-#undef __BT_FUNC_STATUS_END
-#undef __BT_FUNC_STATUS_ERROR
 #undef __BT_FUNC_STATUS_ERROR
 #undef __BT_FUNC_STATUS_INTERRUPTED
-#undef __BT_FUNC_STATUS_INVALID_OBJECT
+#undef __BT_FUNC_STATUS_UNKNOWN_OBJECT
 #undef __BT_FUNC_STATUS_MEMORY_ERROR
 #undef __BT_FUNC_STATUS_NOT_FOUND
 #undef __BT_FUNC_STATUS_OK
+#undef __BT_FUNC_STATUS_OVERFLOW_ERROR
 #undef __BT_IN_BABELTRACE_H
 #undef __BT_UPCAST
 #undef __BT_UPCAST_CONST