From a66b31faf71b526617ede668677bdabade00cd11 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Sun, 23 Oct 2016 22:05:10 -0400
Subject: [PATCH] Python build fix
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 bindings/python/babeltrace/python-complements.c  | 4 ++--
 formats/ctf/ir/packet.c                          | 1 -
 formats/ctf/ir/stream.c                          | 1 -
 include/babeltrace/ctf-ir/event-class-internal.h | 1 -
 include/babeltrace/ctf-ir/event-internal.h       | 1 -
 include/babeltrace/ctf-ir/packet-internal.h      | 1 -
 include/babeltrace/ctf-ir/stream-internal.h      | 1 -
 include/babeltrace/ctf-writer/stream.h           | 3 ++-
 8 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/bindings/python/babeltrace/python-complements.c b/bindings/python/babeltrace/python-complements.c
index b9a11f14..d0daf34b 100644
--- a/bindings/python/babeltrace/python-complements.c
+++ b/bindings/python/babeltrace/python-complements.c
@@ -19,8 +19,8 @@
  */
 
 #include "python-complements.h"
-#include <babeltrace/ctf-writer/event-types-internal.h>
-#include <babeltrace/ctf-writer/event-fields-internal.h>
+#include <babeltrace/ctf-ir/field-types-internal.h>
+#include <babeltrace/ctf-ir/fields-internal.h>
 #include <babeltrace/iterator.h>
 #include <babeltrace/ctf/iterator.h>
 #include <babeltrace/ctf/events-internal.h>
diff --git a/formats/ctf/ir/packet.c b/formats/ctf/ir/packet.c
index 22948b3b..0fd1853d 100644
--- a/formats/ctf/ir/packet.c
+++ b/formats/ctf/ir/packet.c
@@ -31,7 +31,6 @@
 #include <babeltrace/ctf-ir/trace.h>
 #include <babeltrace/ctf-ir/stream-class-internal.h>
 #include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/stream-internal.h>
 #include <babeltrace/ctf-ir/trace-internal.h>
 #include <babeltrace/object-internal.h>
diff --git a/formats/ctf/ir/stream.c b/formats/ctf/ir/stream.c
index 9cba9c5d..44cfb8bb 100644
--- a/formats/ctf/ir/stream.c
+++ b/formats/ctf/ir/stream.c
@@ -32,7 +32,6 @@
 #include <babeltrace/ctf-ir/event-internal.h>
 #include <babeltrace/ctf-ir/field-types-internal.h>
 #include <babeltrace/ctf-ir/fields-internal.h>
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/stream-internal.h>
 #include <babeltrace/ctf-ir/stream-class-internal.h>
 #include <babeltrace/ctf-ir/trace-internal.h>
diff --git a/include/babeltrace/ctf-ir/event-class-internal.h b/include/babeltrace/ctf-ir/event-class-internal.h
index 61b289e0..76210460 100644
--- a/include/babeltrace/ctf-ir/event-class-internal.h
+++ b/include/babeltrace/ctf-ir/event-class-internal.h
@@ -33,7 +33,6 @@
 #include <babeltrace/values.h>
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/object-internal.h>
 #include <glib.h>
 
diff --git a/include/babeltrace/ctf-ir/event-internal.h b/include/babeltrace/ctf-ir/event-internal.h
index cdbaef10..c3243f52 100644
--- a/include/babeltrace/ctf-ir/event-internal.h
+++ b/include/babeltrace/ctf-ir/event-internal.h
@@ -33,7 +33,6 @@
 #include <babeltrace/values.h>
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/packet.h>
 #include <babeltrace/object-internal.h>
 #include <glib.h>
diff --git a/include/babeltrace/ctf-ir/packet-internal.h b/include/babeltrace/ctf-ir/packet-internal.h
index 275524ba..fb355cce 100644
--- a/include/babeltrace/ctf-ir/packet-internal.h
+++ b/include/babeltrace/ctf-ir/packet-internal.h
@@ -26,7 +26,6 @@
  */
 
 #include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/object-internal.h>
 #include <babeltrace/babeltrace-internal.h>
 
diff --git a/include/babeltrace/ctf-ir/stream-internal.h b/include/babeltrace/ctf-ir/stream-internal.h
index d7d77e6b..c5cdeb32 100644
--- a/include/babeltrace/ctf-ir/stream-internal.h
+++ b/include/babeltrace/ctf-ir/stream-internal.h
@@ -27,7 +27,6 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/object-internal.h>
 #include <babeltrace/ctf-writer/clock.h>
 #include <babeltrace/ctf-writer/event-fields.h>
diff --git a/include/babeltrace/ctf-writer/stream.h b/include/babeltrace/ctf-writer/stream.h
index 73515b90..c9244caf 100644
--- a/include/babeltrace/ctf-writer/stream.h
+++ b/include/babeltrace/ctf-writer/stream.h
@@ -30,9 +30,10 @@
  * http://www.efficios.com/ctf
  */
 
-#include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-writer/stream-class.h>
 
+struct bt_ctf_stream;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
-- 
2.34.1