X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace-lib.c;h=ee34d283167cf89d975786297883286be0854872;hp=656bae868eac75b44177d4b88df83a2c298046a2;hb=70bd0a12b09ce7f233189cf07e090fda593ebc48;hpb=e7c058b4112fd7120ed4e63d7cd2033a98eead1d

diff --git a/converter/babeltrace-lib.c b/converter/babeltrace-lib.c
index 656bae86..ee34d283 100644
--- a/converter/babeltrace-lib.c
+++ b/converter/babeltrace-lib.c
@@ -22,14 +22,35 @@
 #include <errno.h>
 #include <stdio.h>
 #include <inttypes.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/format.h>
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf/metadata.h>
 #include <babeltrace/ctf-text/types.h>
 #include <babeltrace/prio_heap.h>
+#include <babeltrace/babeltrace.h>
+#include <babeltrace/types.h>
+#include <babeltrace/ctf/types.h>
+#include <babeltrace/ctf-ir/metadata.h>
 
-#include "babeltrace-api.h"
+/*
+ * struct babeltrace_iter: data structure representing an iterator on a trace
+ * collection.
+ */
+struct babeltrace_iter {
+	struct ptr_heap *stream_heap;
+	struct trace_collection *tc;
+};
+
+struct babeltrace_iter_pos {
+	GPtrArray *pos; /* struct babeltrace_iter_stream_pos */
+};
+
+struct babeltrace_iter_stream_pos {
+	struct stream_pos parent;
+	ssize_t offset;
+	size_t cur_index;
+};
 
 static int stream_read_event(struct ctf_file_stream *sin)
 {