-/*
- * babeltrace_iter_add_callback: Add a callback to iterator.
- *
- * @iter: trace collection iterator (input)
- * @event: event to target. 0 for all events.
- * @private_data: private data pointer to pass to the callback
- * @flags: specific flags controlling the behavior of this callback
- * (or'd).
- *
- * @callback: function pointer to call
- * @depends: struct bt_dependency detailing the required computation results.
- * Ends with 0.
- * @weak_depends: struct bt_dependency detailing the optional computation
- * results that can be optionally consumed by this
- * callback.
- * @provides: struct bt_dependency detailing the computation results
- * provided by this callback.
- * Ends with 0.
- *
- * "depends", "weak_depends" and "provides" memory is handled by the
- * babeltrace library after this call succeeds or fails. These objects
- * can still be used by the caller until the babeltrace iterator is
- * destroyed, but they belong to the babeltrace library.
- *
- * (note to implementor: we need to keep a gptrarray of struct
- * bt_dependencies to "garbage collect" in struct babeltrace_iter, and
- * dependencies need to have a refcount to handle the case where they
- * would be passed to more than one iterator. Upon iterator detroy, we
- * iterate on all the gc ptrarray and decrement the refcounts, freeing
- * if we reach 0.)
- * (note to implementor: we calculate the dependency graph when
- * babeltrace_iter_read_event() is executed after a
- * babeltrace_iter_add_callback(). Beware that it is valid to create/add
- * callbacks/read/add more callbacks/read some more.)
- */
-int babeltrace_iter_add_callback(struct babeltrace_iter *iter,
- bt_event_name event, void *private_data, int flags,
- enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
- void *caller_data),
- struct bt_dependencies *depends,
- struct bt_dependencies *weak_depends,
- struct bt_dependencies *provides);
-
-/*
- * For flags parameter above.
- */
-enum {
- BT_FLAGS_FREE_PRIVATE_DATA = (1 << 0),
-};
+/* Graph, component, and notification API */
+#include <babeltrace/graph/component-class-filter.h>
+#include <babeltrace/graph/component-class-sink.h>
+#include <babeltrace/graph/component-class-source.h>
+#include <babeltrace/graph/component-class.h>
+#include <babeltrace/graph/component-filter.h>
+#include <babeltrace/graph/component-sink.h>
+#include <babeltrace/graph/component-source.h>
+#include <babeltrace/graph/component-status.h>
+#include <babeltrace/graph/component.h>
+#include <babeltrace/graph/connection.h>
+#include <babeltrace/graph/graph.h>
+#include <babeltrace/graph/notification-event.h>
+#include <babeltrace/graph/notification-inactivity.h>
+#include <babeltrace/graph/notification-iterator.h>
+#include <babeltrace/graph/notification-packet.h>
+#include <babeltrace/graph/notification-stream.h>
+#include <babeltrace/graph/notification.h>
+#include <babeltrace/graph/output-port-notification-iterator.h>
+#include <babeltrace/graph/port.h>
+#include <babeltrace/graph/private-component-filter.h>
+#include <babeltrace/graph/private-component-sink.h>
+#include <babeltrace/graph/private-component-source.h>
+#include <babeltrace/graph/private-component.h>
+#include <babeltrace/graph/private-connection-notification-iterator.h>
+#include <babeltrace/graph/private-connection-private-notification-iterator.h>
+#include <babeltrace/graph/private-connection.h>
+#include <babeltrace/graph/private-port.h>
+#include <babeltrace/graph/query-executor.h>