X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=4eb59858a84a9d562339c3e0782c288c481f7046;hp=46120fafe66de55e8e8e344038f42429c2f4c196;hb=3122e6f075647374e7a98ae9501d100de8d004a9;hpb=8c250d8758df3a8a4a5c6aafb63fe198bb21fe22

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 46120faf..4eb59858 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -21,30 +21,31 @@
  * all copies or substantial portions of the Software.
  */
 
-#include <babeltrace/types.h>
-#include <babeltrace/ctf/types.h>
+#include <babeltrace/list.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <glib.h>
 
+/* forward declaration */
+struct ctf_stream_pos;
+
 /* Parent trace descriptor */
 struct trace_descriptor {
 };
 
 struct mmap_stream {
 	int fd;
-	struct cds_list_head list;
+	struct bt_list_head list;
 };
 
 struct mmap_stream_list {
-	struct cds_list_head head;
+	struct bt_list_head head;
 };
 
 struct format {
 	GQuark name;
 
-	struct trace_descriptor *(*open_trace)(const char *collection_path,
-			const char *path, int flags,
+	struct trace_descriptor *(*open_trace)(const char *path, int flags,
 			void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
 				int whence), FILE *metadata_fp);
 	struct trace_descriptor *(*open_mmap_trace)(