From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Tue, 5 Sep 2017 23:58:22 +0000 (-0400)
Subject: Avoid unnecessary inclusions in public headers
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=9d408fcae74602e3591f66623ceb85f482d948ed;p=deliverable%2Fbabeltrace.git

Avoid unnecessary inclusions in public headers

Featured in this patch:

* In public headers, only include what is really needed by the
  declarations of the header itself. Copy forward declarations when
  possible instead of including just for the included file's forward
  declaration. Also indicate above each included header why it is
  included to justify it.

  This should prevent future bugs where we could, for example, remove an
  included header to replace it by a forward declaration, breaking some
  builds which relied on indirect inclusion (e.g. my project does not
  need to include <babeltrace/values.h> because it includes
  <babeltrace/ctf-ir/event-class.h>).

* Make all the plugin C source/header files include
  <babeltrace/babeltrace.h> instead of a bunch of public headers. This
  does not significantly increase the build time while making the source
  file much cleaner.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/include/babeltrace/ctf-ir/clock-class.h b/include/babeltrace/ctf-ir/clock-class.h
index 1fb918fd0..d399d1371 100644
--- a/include/babeltrace/ctf-ir/clock-class.h
+++ b/include/babeltrace/ctf-ir/clock-class.h
@@ -32,6 +32,8 @@
  */
 
 #include <stdint.h>
+
+/* For bt_bool */
 #include <babeltrace/types.h>
 
 #ifdef __cplusplus
diff --git a/include/babeltrace/ctf-ir/clock-value.h b/include/babeltrace/ctf-ir/clock-value.h
index e7b91a9c6..d0464d36d 100644
--- a/include/babeltrace/ctf-ir/clock-value.h
+++ b/include/babeltrace/ctf-ir/clock-value.h
@@ -32,7 +32,6 @@
  */
 
 #include <stdint.h>
-#include <babeltrace/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/babeltrace/ctf-ir/event-class.h b/include/babeltrace/ctf-ir/event-class.h
index 8a3b334bc..e4f587d57 100644
--- a/include/babeltrace/ctf-ir/event-class.h
+++ b/include/babeltrace/ctf-ir/event-class.h
@@ -32,12 +32,13 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <babeltrace/values.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct bt_value;
+
 /**
 @defgroup ctfireventclass CTF IR event class
 @ingroup ctfir
diff --git a/include/babeltrace/ctf-ir/event.h b/include/babeltrace/ctf-ir/event.h
index d42cc91d8..abd48d4b7 100644
--- a/include/babeltrace/ctf-ir/event.h
+++ b/include/babeltrace/ctf-ir/event.h
@@ -32,13 +32,14 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <babeltrace/values.h>
-#include <babeltrace/ctf-ir/clock-class.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct bt_value;
+struct bt_ctf_clock_class;
+
 /**
 @defgroup ctfirevent CTF IR event
 @ingroup ctfir
diff --git a/include/babeltrace/ctf-ir/field-path.h b/include/babeltrace/ctf-ir/field-path.h
index a9100a116..45f681fbd 100644
--- a/include/babeltrace/ctf-ir/field-path.h
+++ b/include/babeltrace/ctf-ir/field-path.h
@@ -29,12 +29,13 @@
  */
 
 #include <stdint.h>
-#include <babeltrace/ctf-ir/field-types.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct bt_ctf_field_type;
+
 /**
 @defgroup ctfirfieldpath CTF IR field path
 @ingroup ctfir
diff --git a/include/babeltrace/ctf-ir/field-types.h b/include/babeltrace/ctf-ir/field-types.h
index 29928986b..69a89e5c8 100644
--- a/include/babeltrace/ctf-ir/field-types.h
+++ b/include/babeltrace/ctf-ir/field-types.h
@@ -30,7 +30,9 @@
  * http://www.efficios.com/ctf
  */
 
+/* For bt_bool */
 #include <babeltrace/types.h>
+
 #include <stdint.h>
 #include <stddef.h>
 
diff --git a/include/babeltrace/ctf-ir/fields.h b/include/babeltrace/ctf-ir/fields.h
index 15468f4f0..f881e24a5 100644
--- a/include/babeltrace/ctf-ir/fields.h
+++ b/include/babeltrace/ctf-ir/fields.h
@@ -32,13 +32,16 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <babeltrace/ctf-ir/field-types.h>
+
+/* For bt_bool */
 #include <babeltrace/types.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct bt_ctf_field_type;
+
 /**
 @defgroup ctfirfields CTF IR fields
 @ingroup ctfir
diff --git a/include/babeltrace/ctf-ir/stream-class.h b/include/babeltrace/ctf-ir/stream-class.h
index 64400f520..96a2dee7c 100644
--- a/include/babeltrace/ctf-ir/stream-class.h
+++ b/include/babeltrace/ctf-ir/stream-class.h
@@ -31,6 +31,8 @@
  */
 
 #include <stdint.h>
+
+/* For bt_ctf_visitor */
 #include <babeltrace/ctf-ir/visitor.h>
 
 #ifdef __cplusplus
diff --git a/include/babeltrace/ctf-ir/stream.h b/include/babeltrace/ctf-ir/stream.h
index 140970c5a..e2aa3ef9e 100644
--- a/include/babeltrace/ctf-ir/stream.h
+++ b/include/babeltrace/ctf-ir/stream.h
@@ -30,13 +30,14 @@
  * http://www.efficios.com/ctf
  */
 
-#include <babeltrace/ctf-ir/stream-class.h>
 #include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct bt_ctf_stream_class;
+
 /**
 @defgroup ctfirstream CTF IR stream
 @ingroup ctfir
diff --git a/include/babeltrace/ctf-ir/trace.h b/include/babeltrace/ctf-ir/trace.h
index 34ba43762..09acda623 100644
--- a/include/babeltrace/ctf-ir/trace.h
+++ b/include/babeltrace/ctf-ir/trace.h
@@ -30,10 +30,10 @@
  * http://www.efficios.com/ctf
  */
 
-#include <babeltrace/ctf-ir/field-types.h>
+/* For bt_ctf_visitor */
 #include <babeltrace/ctf-ir/visitor.h>
-#include <babeltrace/values.h>
-#include <babeltrace/graph/notification.h>
+
+/* For bt_bool */
 #include <babeltrace/types.h>
 #include <stdint.h>
 
@@ -41,6 +41,9 @@
 extern "C" {
 #endif
 
+struct bt_ctf_field_type;
+struct bt_value;
+
 /**
 @defgroup ctfirtraceclass CTF IR trace class
 @ingroup ctfir
diff --git a/include/babeltrace/ctf-ir/utils.h b/include/babeltrace/ctf-ir/utils.h
index d94b215d6..a209c5f5b 100644
--- a/include/babeltrace/ctf-ir/utils.h
+++ b/include/babeltrace/ctf-ir/utils.h
@@ -30,6 +30,7 @@
  * http://www.efficios.com/ctf
  */
 
+/* For bt_bool */
 #include <babeltrace/types.h>
 
 #ifdef __cplusplus
diff --git a/include/babeltrace/graph/clock-class-priority-map.h b/include/babeltrace/graph/clock-class-priority-map.h
index d03b1ea9f..949f49de5 100644
--- a/include/babeltrace/graph/clock-class-priority-map.h
+++ b/include/babeltrace/graph/clock-class-priority-map.h
@@ -28,13 +28,13 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <babeltrace/values.h>
-#include <babeltrace/ctf-ir/clock-class.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct bt_ctf_clock_class;
+
 /**
 @defgroup graphclockclassprioritymap Clock class priority map
 @ingroup graph
diff --git a/include/babeltrace/graph/component-class-filter.h b/include/babeltrace/graph/component-class-filter.h
index b7e28c123..b27eb3763 100644
--- a/include/babeltrace/graph/component-class-filter.h
+++ b/include/babeltrace/graph/component-class-filter.h
@@ -25,7 +25,8 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/graph/component.h>
+/* For component class method type definitions */
+#include <babeltrace/graph/component-class.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/babeltrace/graph/component-class-sink.h b/include/babeltrace/graph/component-class-sink.h
index fcfd0c502..6e06e1e5f 100644
--- a/include/babeltrace/graph/component-class-sink.h
+++ b/include/babeltrace/graph/component-class-sink.h
@@ -25,13 +25,15 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/graph/private-component.h>
+/* For component class method type definitions */
+#include <babeltrace/graph/component-class.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct bt_component_class;
+struct bt_private_component;
 
 typedef enum bt_component_status (*bt_component_class_sink_consume_method)(
 	struct bt_private_component *private_component);
diff --git a/include/babeltrace/graph/component-class-source.h b/include/babeltrace/graph/component-class-source.h
index dc69f03f8..e0c7ecce1 100644
--- a/include/babeltrace/graph/component-class-source.h
+++ b/include/babeltrace/graph/component-class-source.h
@@ -25,7 +25,8 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/graph/component.h>
+/* For component class method type definitions */
+#include <babeltrace/graph/component-class.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/babeltrace/graph/component-class.h b/include/babeltrace/graph/component-class.h
index a8498ee30..acad8eec1 100644
--- a/include/babeltrace/graph/component-class.h
+++ b/include/babeltrace/graph/component-class.h
@@ -26,9 +26,17 @@
  */
 
 #include <stdint.h>
+
+/* For enum bt_component_status */
 #include <babeltrace/graph/component-status.h>
+
+/* For enum bt_notification_iterator_status */
 #include <babeltrace/graph/notification-iterator.h>
+
+/* For enum bt_query_status */
 #include <babeltrace/graph/query-executor.h>
+
+/* For bt_bool */
 #include <babeltrace/types.h>
 
 #ifdef __cplusplus
diff --git a/include/babeltrace/graph/component-filter.h b/include/babeltrace/graph/component-filter.h
index 428e39ac3..28f4f33bb 100644
--- a/include/babeltrace/graph/component-filter.h
+++ b/include/babeltrace/graph/component-filter.h
@@ -28,7 +28,6 @@
  */
 
 #include <stdint.h>
-#include <babeltrace/graph/component.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/babeltrace/graph/component-sink.h b/include/babeltrace/graph/component-sink.h
index 207c6c812..a89aa4240 100644
--- a/include/babeltrace/graph/component-sink.h
+++ b/include/babeltrace/graph/component-sink.h
@@ -28,14 +28,12 @@
  */
 
 #include <stdint.h>
-#include <babeltrace/graph/component.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct bt_component;
-struct bt_notification;
 
 extern int64_t bt_component_sink_get_input_port_count(
 		struct bt_component *component);
diff --git a/include/babeltrace/graph/component-source.h b/include/babeltrace/graph/component-source.h
index a86d69073..9f7ceccfc 100644
--- a/include/babeltrace/graph/component-source.h
+++ b/include/babeltrace/graph/component-source.h
@@ -28,14 +28,12 @@
  */
 
 #include <stdint.h>
-#include <babeltrace/graph/component.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct bt_component;
-struct bt_notification_iterator;
 
 extern int64_t bt_component_source_get_output_port_count(
 		struct bt_component *component);
diff --git a/include/babeltrace/graph/component.h b/include/babeltrace/graph/component.h
index e9ee50936..7423e92a5 100644
--- a/include/babeltrace/graph/component.h
+++ b/include/babeltrace/graph/component.h
@@ -27,10 +27,10 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/graph/component-status.h>
+/* For BT_COMPONENT_CLASS_TYPE_* */
 #include <babeltrace/graph/component-class.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/values.h>
+
+/* For bt_bool */
 #include <babeltrace/types.h>
 
 #ifdef __cplusplus
diff --git a/include/babeltrace/graph/connection.h b/include/babeltrace/graph/connection.h
index 566d51829..bf10eb5d3 100644
--- a/include/babeltrace/graph/connection.h
+++ b/include/babeltrace/graph/connection.h
@@ -27,6 +27,7 @@
  * SOFTWARE.
  */
 
+/* For bt_bool */
 #include <babeltrace/types.h>
 
 #ifdef __cplusplus
diff --git a/include/babeltrace/graph/graph.h b/include/babeltrace/graph/graph.h
index f85597845..bb3d84cbd 100644
--- a/include/babeltrace/graph/graph.h
+++ b/include/babeltrace/graph/graph.h
@@ -27,7 +27,7 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/graph/component.h>
+/* For bt_bool */
 #include <babeltrace/types.h>
 
 #ifdef __cplusplus
@@ -36,6 +36,8 @@ extern "C" {
 
 struct bt_port;
 struct bt_connection;
+struct bt_component;
+struct bt_component_class;
 
 enum bt_graph_status {
 	BT_GRAPH_STATUS_COMPONENT_REFUSES_PORT_CONNECTION = 111,
diff --git a/include/babeltrace/graph/notification-heap.h b/include/babeltrace/graph/notification-heap.h
index df912c193..3efb541ee 100644
--- a/include/babeltrace/graph/notification-heap.h
+++ b/include/babeltrace/graph/notification-heap.h
@@ -27,9 +27,16 @@
  */
 
 #include <stddef.h>
-#include <babeltrace/graph/notification.h>
+
+/* For bt_bool */
 #include <babeltrace/types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct bt_notification;
+
 /**
  * bt_notification_time_compare - Compare two notifications' timestamps
  *
@@ -89,4 +96,8 @@ extern struct bt_notification *bt_notification_heap_peek(
 extern struct bt_notification *bt_notification_heap_pop(
 		struct bt_notification_heap *heap);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* BABELTRACE_GRAPH_NOTIFICATION_HEAP_H */
diff --git a/include/babeltrace/graph/notification-packet.h b/include/babeltrace/graph/notification-packet.h
index 99749e48a..3a9809101 100644
--- a/include/babeltrace/graph/notification-packet.h
+++ b/include/babeltrace/graph/notification-packet.h
@@ -27,12 +27,11 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/graph/notification.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct bt_notification;
 struct bt_ctf_packet;
 
 extern struct bt_notification *bt_notification_packet_begin_create(
diff --git a/include/babeltrace/graph/notification-stream.h b/include/babeltrace/graph/notification-stream.h
index 1c377c26b..c022343b2 100644
--- a/include/babeltrace/graph/notification-stream.h
+++ b/include/babeltrace/graph/notification-stream.h
@@ -27,13 +27,13 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/ctf-ir/stream.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct bt_ctf_notification;
+struct bt_ctf_stream;
+
 extern struct bt_notification *bt_notification_stream_begin_create(
 		struct bt_ctf_stream *stream);
 
diff --git a/include/babeltrace/graph/output-port-notification-iterator.h b/include/babeltrace/graph/output-port-notification-iterator.h
index 4253f9d35..0fb4c5bc7 100644
--- a/include/babeltrace/graph/output-port-notification-iterator.h
+++ b/include/babeltrace/graph/output-port-notification-iterator.h
@@ -23,6 +23,9 @@
  * SOFTWARE.
  */
 
+/* For enum bt_notification_type */
+#include <babeltrace/graph/notification.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/babeltrace/graph/port.h b/include/babeltrace/graph/port.h
index d08e27478..63b057a49 100644
--- a/include/babeltrace/graph/port.h
+++ b/include/babeltrace/graph/port.h
@@ -28,6 +28,8 @@
  */
 
 #include <stdint.h>
+
+/* For bt_bool */
 #include <babeltrace/types.h>
 
 #ifdef __cplusplus
diff --git a/include/babeltrace/graph/private-component-filter.h b/include/babeltrace/graph/private-component-filter.h
index 3ebc0e9c6..b9cee60b8 100644
--- a/include/babeltrace/graph/private-component-filter.h
+++ b/include/babeltrace/graph/private-component-filter.h
@@ -24,13 +24,15 @@
  */
 
 #include <stdint.h>
-#include <babeltrace/graph/component.h>
+
+/* For enum bt_component_status */
 #include <babeltrace/graph/component-status.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct bt_component;
 struct bt_private_component;
 struct bt_private_port;
 
diff --git a/include/babeltrace/graph/private-component-sink.h b/include/babeltrace/graph/private-component-sink.h
index b122b5b93..853cff267 100644
--- a/include/babeltrace/graph/private-component-sink.h
+++ b/include/babeltrace/graph/private-component-sink.h
@@ -24,13 +24,15 @@
  */
 
 #include <stdint.h>
-#include <babeltrace/graph/component.h>
+
+/* For enum bt_component_status */
 #include <babeltrace/graph/component-status.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct bt_component;
 struct bt_private_component;
 struct bt_private_port;
 
diff --git a/include/babeltrace/graph/private-component-source.h b/include/babeltrace/graph/private-component-source.h
index 702a539fc..29ed0b967 100644
--- a/include/babeltrace/graph/private-component-source.h
+++ b/include/babeltrace/graph/private-component-source.h
@@ -24,13 +24,15 @@
  */
 
 #include <stdint.h>
-#include <babeltrace/graph/component.h>
+
+/* For enum bt_component_status */
 #include <babeltrace/graph/component-status.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct bt_component;
 struct bt_private_component;
 struct bt_private_port;
 
diff --git a/include/babeltrace/graph/private-component.h b/include/babeltrace/graph/private-component.h
index 583e7e363..cde10e083 100644
--- a/include/babeltrace/graph/private-component.h
+++ b/include/babeltrace/graph/private-component.h
@@ -23,12 +23,11 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/graph/component.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct bt_component;
 struct bt_private_component;
 
 extern struct bt_component *bt_component_from_private_component(
diff --git a/include/babeltrace/graph/private-connection.h b/include/babeltrace/graph/private-connection.h
index e5a907fd4..b64559ecf 100644
--- a/include/babeltrace/graph/private-connection.h
+++ b/include/babeltrace/graph/private-connection.h
@@ -23,16 +23,18 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/graph/connection.h>
+/* For enum bt_notification_type */
 #include <babeltrace/graph/notification.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct bt_notification;
 struct bt_connection;
 struct bt_private_port;
 struct bt_private_connection;
+struct bt_notification_iterator;
 
 extern struct bt_connection *bt_connection_from_private_connection(
 		struct bt_private_connection *private_connection);
diff --git a/include/babeltrace/graph/query-executor.h b/include/babeltrace/graph/query-executor.h
index f2187dd6d..28a8776ef 100644
--- a/include/babeltrace/graph/query-executor.h
+++ b/include/babeltrace/graph/query-executor.h
@@ -25,6 +25,7 @@
  * SOFTWARE.
  */
 
+/* For bt_bool */
 #include <babeltrace/types.h>
 
 #ifdef __cplusplus
diff --git a/include/babeltrace/logging.h b/include/babeltrace/logging.h
index 0e1d663a5..7139a1263 100644
--- a/include/babeltrace/logging.h
+++ b/include/babeltrace/logging.h
@@ -28,7 +28,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <babeltrace/ref.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/babeltrace/plugin/plugin-dev.h b/include/babeltrace/plugin/plugin-dev.h
index f99dca029..786566ea5 100644
--- a/include/babeltrace/plugin/plugin-dev.h
+++ b/include/babeltrace/plugin/plugin-dev.h
@@ -32,7 +32,11 @@
  */
 
 #include <stdint.h>
+
+/* For enum bt_plugin_status */
 #include <babeltrace/plugin/plugin.h>
+
+/* For component class method type definitions */
 #include <babeltrace/graph/component-class.h>
 #include <babeltrace/graph/component-class-source.h>
 #include <babeltrace/graph/component-class-filter.h>
diff --git a/include/babeltrace/plugin/plugin.h b/include/babeltrace/plugin/plugin.h
index b9be67436..ae7b7c7ad 100644
--- a/include/babeltrace/plugin/plugin.h
+++ b/include/babeltrace/plugin/plugin.h
@@ -30,9 +30,13 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <babeltrace/graph/component-class.h>
+
+/* For bt_bool */
 #include <babeltrace/types.h>
 
+/* For enum bt_component_class_type */
+#include <babeltrace/graph/component-class.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/babeltrace/values.h b/include/babeltrace/values.h
index d4a2214b1..58aa99e20 100644
--- a/include/babeltrace/values.h
+++ b/include/babeltrace/values.h
@@ -28,7 +28,8 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <babeltrace/ref.h>
+
+/* For bt_bool */
 #include <babeltrace/types.h>
 
 #ifdef __cplusplus
diff --git a/include/babeltrace/version.h b/include/babeltrace/version.h
index 20854d539..9afd5d0f6 100644
--- a/include/babeltrace/version.h
+++ b/include/babeltrace/version.h
@@ -23,9 +23,17 @@
  * SOFTWARE.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern int bt_version_get_major(void);
 extern int bt_version_get_minor(void);
 extern int bt_version_get_patch(void);
 extern const char *bt_version_get_extra(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* BABELTRACE_VERSION_H */
diff --git a/lib/ctf-ir/attributes.c b/lib/ctf-ir/attributes.c
index ac9797242..44e0e2302 100644
--- a/lib/ctf-ir/attributes.c
+++ b/lib/ctf-ir/attributes.c
@@ -28,6 +28,7 @@
 #define BT_LOG_TAG "ATTRS"
 #include <babeltrace/lib-logging-internal.h>
 
+#include <babeltrace/ref.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/values.h>
 #include <inttypes.h>
diff --git a/lib/graph/component-class-sink-colander.c b/lib/graph/component-class-sink-colander.c
index 0df9ed4e6..25176ea35 100644
--- a/lib/graph/component-class-sink-colander.c
+++ b/lib/graph/component-class-sink-colander.c
@@ -23,10 +23,13 @@
 #define BT_LOG_TAG "COLANDER"
 #include <babeltrace/lib-logging-internal.h>
 
+#include <babeltrace/ref.h>
+#include <babeltrace/graph/connection.h>
 #include <babeltrace/graph/component-class-sink.h>
 #include <babeltrace/graph/private-component-sink.h>
 #include <babeltrace/graph/private-port.h>
 #include <babeltrace/graph/private-connection.h>
+#include <babeltrace/graph/private-component.h>
 #include <babeltrace/graph/component-class-sink-colander-internal.h>
 #include <glib.h>
 #include <assert.h>
diff --git a/lib/graph/notification/packet.c b/lib/graph/notification/packet.c
index 712d1c410..d0286eecb 100644
--- a/lib/graph/notification/packet.c
+++ b/lib/graph/notification/packet.c
@@ -30,6 +30,7 @@
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/ctf-ir/packet.h>
 #include <babeltrace/ctf-ir/packet-internal.h>
+#include <babeltrace/ctf-ir/stream-class.h>
 #include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/stream-internal.h>
 #include <babeltrace/graph/notification-packet-internal.h>
diff --git a/lib/graph/notification/stream.c b/lib/graph/notification/stream.c
index 40c245b53..9908c9703 100644
--- a/lib/graph/notification/stream.c
+++ b/lib/graph/notification/stream.c
@@ -29,6 +29,7 @@
 
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/ctf-ir/stream-internal.h>
+#include <babeltrace/ctf-ir/stream-class.h>
 #include <babeltrace/graph/notification-stream-internal.h>
 #include <inttypes.h>
 
diff --git a/plugins/ctf/common/btr/btr.c b/plugins/ctf/common/btr/btr.c
index 93c233fc5..c0f0ac790 100644
--- a/plugins/ctf/common/btr/btr.c
+++ b/plugins/ctf/common/btr/btr.c
@@ -35,7 +35,7 @@
 #include <assert.h>
 #include <string.h>
 #include <babeltrace/bitfield-internal.h>
-#include <babeltrace/ctf-ir/field-types.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/ctf-ir/field-types-internal.h>
 #include <babeltrace/ref.h>
 #include <babeltrace/align-internal.h>
diff --git a/plugins/ctf/common/btr/btr.h b/plugins/ctf/common/btr/btr.h
index af2a65694..4b5e7bc78 100644
--- a/plugins/ctf/common/btr/btr.h
+++ b/plugins/ctf/common/btr/btr.h
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <babeltrace/ctf-ir/field-types.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/babeltrace-internal.h>
 
 /**
diff --git a/plugins/ctf/common/metadata/ast.h b/plugins/ctf/common/metadata/ast.h
index 74bcde9f0..6d9e43bf0 100644
--- a/plugins/ctf/common/metadata/ast.h
+++ b/plugins/ctf/common/metadata/ast.h
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include <babeltrace/list-internal.h>
-#include <babeltrace/ctf-ir/trace.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/babeltrace-internal.h>
 
 #include "decoder.h"
diff --git a/plugins/ctf/common/metadata/decoder.c b/plugins/ctf/common/metadata/decoder.c
index 694de8113..814da165e 100644
--- a/plugins/ctf/common/metadata/decoder.c
+++ b/plugins/ctf/common/metadata/decoder.c
@@ -23,7 +23,7 @@
 #include <assert.h>
 #include <babeltrace/compat/uuid-internal.h>
 #include <babeltrace/compat/memstream-internal.h>
-#include <babeltrace/ctf-ir/trace.h>
+#include <babeltrace/babeltrace.h>
 #include <glib.h>
 #include <string.h>
 
diff --git a/plugins/ctf/common/metadata/visitor-generate-ir.c b/plugins/ctf/common/metadata/visitor-generate-ir.c
index a2ced0cbe..c7c6f10d3 100644
--- a/plugins/ctf/common/metadata/visitor-generate-ir.c
+++ b/plugins/ctf/common/metadata/visitor-generate-ir.c
@@ -42,14 +42,8 @@
 #include <errno.h>
 #include <babeltrace/compat/uuid-internal.h>
 #include <babeltrace/endian-internal.h>
-#include <babeltrace/ref.h>
-#include <babeltrace/ctf-ir/trace.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/ctf-ir/event-class.h>
-#include <babeltrace/ctf-ir/field-types.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/ctf-ir/field-types-internal.h>
-#include <babeltrace/ctf-ir/clock-class.h>
 
 #include "scanner.h"
 #include "parser.h"
diff --git a/plugins/ctf/common/notif-iter/notif-iter.c b/plugins/ctf/common/notif-iter/notif-iter.c
index 6789fc541..8bb79db8f 100644
--- a/plugins/ctf/common/notif-iter/notif-iter.c
+++ b/plugins/ctf/common/notif-iter/notif-iter.c
@@ -33,21 +33,9 @@
 #include <stdbool.h>
 #include <assert.h>
 #include <string.h>
-#include <babeltrace/ctf-ir/field-types.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/ctf-ir/field-types-internal.h>
-#include <babeltrace/ctf-ir/field-path.h>
 #include <babeltrace/ctf-ir/field-path-internal.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/event-class.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-stream.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
-#include <babeltrace/ref.h>
 #include <glib.h>
 #include <stdlib.h>
 
diff --git a/plugins/ctf/common/notif-iter/notif-iter.h b/plugins/ctf/common/notif-iter/notif-iter.h
index 444b94540..5cc8ff8bf 100644
--- a/plugins/ctf/common/notif-iter/notif-iter.h
+++ b/plugins/ctf/common/notif-iter/notif-iter.h
@@ -29,10 +29,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stddef.h>
-#include <babeltrace/ctf-ir/trace.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/babeltrace-internal.h>
 
 /**
diff --git a/plugins/ctf/common/utils/utils.h b/plugins/ctf/common/utils/utils.h
index 2e9e23ef3..1a32d1ced 100644
--- a/plugins/ctf/common/utils/utils.h
+++ b/plugins/ctf/common/utils/utils.h
@@ -25,9 +25,7 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-ir/trace.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/babeltrace-internal.h>
 
 struct bt_ctf_stream_class *ctf_utils_stream_class_from_packet_header(
diff --git a/plugins/ctf/fs-sink/write.c b/plugins/ctf/fs-sink/write.c
index 4b6f6e9ac..eec76c7ed 100644
--- a/plugins/ctf/fs-sink/write.c
+++ b/plugins/ctf/fs-sink/write.c
@@ -29,15 +29,7 @@
 #define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-WRITE"
 #include "logging.h"
 
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/event-class.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-writer/stream-class.h>
-#include <babeltrace/ctf-writer/stream.h>
+#include <babeltrace/babeltrace.h>
 #include <assert.h>
 #include <glib.h>
 
diff --git a/plugins/ctf/fs-sink/writer.c b/plugins/ctf/fs-sink/writer.c
index fd2c1632d..01dbc1849 100644
--- a/plugins/ctf/fs-sink/writer.c
+++ b/plugins/ctf/fs-sink/writer.c
@@ -29,20 +29,7 @@
 #define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-WRITER"
 #include "logging.h"
 
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/component-sink.h>
-#include <babeltrace/graph/private-component-sink.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/notification-stream.h>
+#include <babeltrace/babeltrace.h>
 #include <plugins-common.h>
 #include <stdio.h>
 #include <stdbool.h>
diff --git a/plugins/ctf/fs-sink/writer.h b/plugins/ctf/fs-sink/writer.h
index 33403dc69..07e8674af 100644
--- a/plugins/ctf/fs-sink/writer.h
+++ b/plugins/ctf/fs-sink/writer.h
@@ -29,8 +29,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/ctf-writer/writer.h>
+#include <babeltrace/babeltrace.h>
 
 struct writer_component {
 	GString *base_path;
diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c
index 39c2530e8..ec10a0335 100644
--- a/plugins/ctf/fs-src/data-stream-file.c
+++ b/plugins/ctf/fs-src/data-stream-file.c
@@ -31,11 +31,7 @@
 #include <inttypes.h>
 #include <babeltrace/compat/mman-internal.h>
 #include <babeltrace/endian-internal.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/notification-stream.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-packet.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/common-internal.h>
 #include "file.h"
 #include "metadata.h"
diff --git a/plugins/ctf/fs-src/data-stream-file.h b/plugins/ctf/fs-src/data-stream-file.h
index 8c859e774..32027566a 100644
--- a/plugins/ctf/fs-src/data-stream-file.h
+++ b/plugins/ctf/fs-src/data-stream-file.h
@@ -27,7 +27,7 @@
 #include <stdbool.h>
 #include <glib.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-ir/trace.h>
+#include <babeltrace/babeltrace.h>
 
 #include "../common/notif-iter/notif-iter.h"
 #include "lttng-index.h"
diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c
index c97013eae..fe978fc2e 100644
--- a/plugins/ctf/fs-src/fs.c
+++ b/plugins/ctf/fs-src/fs.c
@@ -26,17 +26,7 @@
  */
 
 #include <babeltrace/common-internal.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-component-source.h>
-#include <babeltrace/graph/private-connection-private-notification-iterator.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
+#include <babeltrace/babeltrace.h>
 #include <plugins-common.h>
 #include <glib.h>
 #include <assert.h>
diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h
index f5eaabb8f..33b588482 100644
--- a/plugins/ctf/fs-src/fs.h
+++ b/plugins/ctf/fs-src/fs.h
@@ -30,8 +30,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
+#include <babeltrace/babeltrace.h>
 #include "data-stream-file.h"
 #include "metadata.h"
 
diff --git a/plugins/ctf/fs-src/metadata.c b/plugins/ctf/fs-src/metadata.c
index cdc38debb..231d946ce 100644
--- a/plugins/ctf/fs-src/metadata.c
+++ b/plugins/ctf/fs-src/metadata.c
@@ -31,6 +31,7 @@
 #include <glib.h>
 #include <babeltrace/compat/uuid-internal.h>
 #include <babeltrace/compat/memstream-internal.h>
+#include <babeltrace/babeltrace.h>
 
 #include "fs.h"
 #include "file.h"
diff --git a/plugins/ctf/fs-src/metadata.h b/plugins/ctf/fs-src/metadata.h
index d77ca6a40..496a5ca95 100644
--- a/plugins/ctf/fs-src/metadata.h
+++ b/plugins/ctf/fs-src/metadata.h
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-ir/trace.h>
+#include <babeltrace/babeltrace.h>
 
 #define CTF_FS_METADATA_FILENAME	"metadata"
 
diff --git a/plugins/ctf/fs-src/query.c b/plugins/ctf/fs-src/query.c
index 2b5171af9..c5e2be8ca 100644
--- a/plugins/ctf/fs-src/query.c
+++ b/plugins/ctf/fs-src/query.c
@@ -31,7 +31,7 @@
 #include "../common/metadata/decoder.h"
 #include <babeltrace/common-internal.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-ir/stream.h>
+#include <babeltrace/babeltrace.h>
 #include "fs.h"
 
 #define BT_LOG_TAG "PLUGIN-CTF-FS-QUERY-SRC"
diff --git a/plugins/ctf/fs-src/query.h b/plugins/ctf/fs-src/query.h
index 5db579dee..ff89fa36d 100644
--- a/plugins/ctf/fs-src/query.h
+++ b/plugins/ctf/fs-src/query.h
@@ -25,9 +25,8 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/values.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component-class.h>
+#include <babeltrace/babeltrace.h>
 
 BT_HIDDEN
 struct bt_component_class_query_method_return metadata_info_query(
diff --git a/plugins/ctf/lttng-live/data-stream.c b/plugins/ctf/lttng-live/data-stream.c
index f6832cab9..10613c848 100644
--- a/plugins/ctf/lttng-live/data-stream.c
+++ b/plugins/ctf/lttng-live/data-stream.c
@@ -32,7 +32,7 @@
 #include <glib.h>
 #include <inttypes.h>
 #include <babeltrace/compat/mman-internal.h>
-#include <babeltrace/ctf-ir/stream.h>
+#include <babeltrace/babeltrace.h>
 #include "../common/notif-iter/notif-iter.h"
 #include <assert.h>
 
diff --git a/plugins/ctf/lttng-live/data-stream.h b/plugins/ctf/lttng-live/data-stream.h
index 73e588cc5..4ca73c381 100644
--- a/plugins/ctf/lttng-live/data-stream.h
+++ b/plugins/ctf/lttng-live/data-stream.h
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-ir/trace.h>
+#include <babeltrace/babeltrace.h>
 
 #include "lttng-live-internal.h"
 #include "../common/notif-iter/notif-iter.h"
diff --git a/plugins/ctf/lttng-live/lttng-live-internal.h b/plugins/ctf/lttng-live/lttng-live-internal.h
index dcbc9853f..486cc5db7 100644
--- a/plugins/ctf/lttng-live/lttng-live-internal.h
+++ b/plugins/ctf/lttng-live/lttng-live-internal.h
@@ -31,10 +31,7 @@
 #include <stdbool.h>
 
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
-#include <babeltrace/types.h>
+#include <babeltrace/babeltrace.h>
 #include "viewer-connection.h"
 
 //TODO: this should not be used by plugins. Should copy code into plugin
diff --git a/plugins/ctf/lttng-live/lttng-live.c b/plugins/ctf/lttng-live/lttng-live.c
index c882ce951..b40934b7a 100644
--- a/plugins/ctf/lttng-live/lttng-live.c
+++ b/plugins/ctf/lttng-live/lttng-live.c
@@ -30,20 +30,7 @@
 #define BT_LOG_TAG "PLUGIN-CTF-LTTNG-LIVE-SRC"
 #include "logging.h"
 
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/graph/component-source.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/port.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-component-source.h>
-#include <babeltrace/graph/private-connection-private-notification-iterator.h>
-#include <babeltrace/graph/notification-stream.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-heap.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/notification-inactivity.h>
-#include <babeltrace/graph/graph.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/types.h>
 #include <inttypes.h>
diff --git a/plugins/ctf/lttng-live/metadata.c b/plugins/ctf/lttng-live/metadata.c
index 7fec74add..3aa2f3839 100644
--- a/plugins/ctf/lttng-live/metadata.c
+++ b/plugins/ctf/lttng-live/metadata.c
@@ -33,7 +33,7 @@
 #include <glib.h>
 #include <babeltrace/compat/uuid-internal.h>
 #include <babeltrace/compat/memstream-internal.h>
-#include <babeltrace/graph/graph.h>
+#include <babeltrace/babeltrace.h>
 
 #include "metadata.h"
 #include "../common/metadata/decoder.h"
diff --git a/plugins/ctf/lttng-live/metadata.h b/plugins/ctf/lttng-live/metadata.h
index 47e4fbb27..4ce171dfc 100644
--- a/plugins/ctf/lttng-live/metadata.h
+++ b/plugins/ctf/lttng-live/metadata.h
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-ir/trace.h>
+#include <babeltrace/babeltrace.h>
 #include "lttng-live-internal.h"
 
 int lttng_live_metadata_create_stream(struct lttng_live_session *session,
diff --git a/plugins/ctf/lttng-live/viewer-connection.c b/plugins/ctf/lttng-live/viewer-connection.c
index 2955b9384..55bc6bb0e 100644
--- a/plugins/ctf/lttng-live/viewer-connection.c
+++ b/plugins/ctf/lttng-live/viewer-connection.c
@@ -37,7 +37,7 @@
 #include <babeltrace/endian-internal.h>
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/common-internal.h>
-#include <babeltrace/graph/graph.h>
+#include <babeltrace/babeltrace.h>
 
 #include "lttng-live-internal.h"
 #include "viewer-connection.h"
diff --git a/plugins/ctf/plugin.c b/plugins/ctf/plugin.c
index 0f00b5612..cb894ddd0 100644
--- a/plugins/ctf/plugin.c
+++ b/plugins/ctf/plugin.c
@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-dev.h>
+#include <babeltrace/babeltrace.h>
 #include "fs-src/fs.h"
 #include "fs-sink/writer.h"
 #include "lttng-live/lttng-live-internal.h"
diff --git a/plugins/libctfcopytrace/clock-fields.c b/plugins/libctfcopytrace/clock-fields.c
index 5d312a811..78560f0e2 100644
--- a/plugins/libctfcopytrace/clock-fields.c
+++ b/plugins/libctfcopytrace/clock-fields.c
@@ -29,15 +29,7 @@
 #define BT_LOG_TAG "PLUGIN-CTFCOPYTRACE-LIB-CLOCK-FIELDS"
 #include "logging.h"
 
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/event-class.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-writer/stream.h>
-#include <babeltrace/ctf-ir/field-types.h>
+#include <babeltrace/babeltrace.h>
 #include <assert.h>
 #include <stdio.h>
 
diff --git a/plugins/libctfcopytrace/clock-fields.h b/plugins/libctfcopytrace/clock-fields.h
index 32cb9ca26..bb0283592 100644
--- a/plugins/libctfcopytrace/clock-fields.h
+++ b/plugins/libctfcopytrace/clock-fields.h
@@ -29,7 +29,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-writer/writer.h>
+#include <babeltrace/babeltrace.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/libctfcopytrace/ctfcopytrace.c b/plugins/libctfcopytrace/ctfcopytrace.c
index bfa893987..6debd71ce 100644
--- a/plugins/libctfcopytrace/ctfcopytrace.c
+++ b/plugins/libctfcopytrace/ctfcopytrace.c
@@ -29,14 +29,7 @@
 #define BT_LOG_TAG "PLUGIN-CTFCOPYTRACE-LIB"
 #include "logging.h"
 
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/event-class.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-writer/stream.h>
+#include <babeltrace/babeltrace.h>
 #include <assert.h>
 
 #include "ctfcopytrace.h"
diff --git a/plugins/libctfcopytrace/ctfcopytrace.h b/plugins/libctfcopytrace/ctfcopytrace.h
index 74460f132..9a103e91f 100644
--- a/plugins/libctfcopytrace/ctfcopytrace.h
+++ b/plugins/libctfcopytrace/ctfcopytrace.h
@@ -29,8 +29,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/ctf-writer/writer.h>
+#include <babeltrace/babeltrace.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/lttng-utils/copy.c b/plugins/lttng-utils/copy.c
index 3bbc0a178..a2ab8bd52 100644
--- a/plugins/lttng-utils/copy.c
+++ b/plugins/lttng-utils/copy.c
@@ -31,15 +31,7 @@
 
 #include <inttypes.h>
 #include <assert.h>
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/event-class.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-writer/stream-class.h>
-#include <babeltrace/ctf-writer/stream.h>
+#include <babeltrace/babeltrace.h>
 
 #include <ctfcopytrace.h>
 #include "debug-info.h"
diff --git a/plugins/lttng-utils/copy.h b/plugins/lttng-utils/copy.h
index 240b51b15..48c076364 100644
--- a/plugins/lttng-utils/copy.h
+++ b/plugins/lttng-utils/copy.h
@@ -29,8 +29,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-writer/writer.h>
-#include <babeltrace/ctf-ir/packet.h>
+#include <babeltrace/babeltrace.h>
 
 BT_HIDDEN
 struct bt_ctf_event *debug_info_output_event(struct debug_info_iterator *debug_it,
diff --git a/plugins/lttng-utils/debug-info.h b/plugins/lttng-utils/debug-info.h
index ea5a499d1..f1b6df2d5 100644
--- a/plugins/lttng-utils/debug-info.h
+++ b/plugins/lttng-utils/debug-info.h
@@ -30,10 +30,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/ctf-ir/trace.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-ir/event-class.h>
+#include <babeltrace/babeltrace.h>
 
 enum debug_info_stream_state {
 	/*
diff --git a/plugins/lttng-utils/plugin.c b/plugins/lttng-utils/plugin.c
index f7f42f430..355384369 100644
--- a/plugins/lttng-utils/plugin.c
+++ b/plugins/lttng-utils/plugin.c
@@ -29,19 +29,7 @@
 #define BT_LOG_TAG "PLUGIN-CTF-LTTNG-UTILS-DEBUG-INFO-FLT"
 #include "logging.h"
 
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/private-connection-private-notification-iterator.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-stream.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/component-filter.h>
-#include <babeltrace/graph/private-component-filter.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/plugin/plugin-dev.h>
+#include <babeltrace/babeltrace.h>
 #include <plugins-common.h>
 #include <assert.h>
 #include "debug-info.h"
diff --git a/plugins/text/dmesg/dmesg.h b/plugins/text/dmesg/dmesg.h
index 07258d440..e85a89060 100644
--- a/plugins/text/dmesg/dmesg.h
+++ b/plugins/text/dmesg/dmesg.h
@@ -25,8 +25,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
+#include <babeltrace/babeltrace.h>
 
 BT_HIDDEN
 enum bt_component_status dmesg_init(struct bt_private_component *priv_comp,
diff --git a/plugins/text/plugin.c b/plugins/text/plugin.c
index dcd5db3b4..58a7f8f75 100644
--- a/plugins/text/plugin.c
+++ b/plugins/text/plugin.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-dev.h>
+#include <babeltrace/babeltrace.h>
 #include "pretty/pretty.h"
 #include "dmesg/dmesg.h"
 
diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c
index 4ac6ad6d5..ad76d8237 100644
--- a/plugins/text/pretty/pretty.c
+++ b/plugins/text/pretty/pretty.c
@@ -27,18 +27,7 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-component-sink.h>
-#include <babeltrace/graph/component-sink.h>
-#include <babeltrace/graph/port.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/notification-event.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/values.h>
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/common-internal.h>
diff --git a/plugins/text/pretty/pretty.h b/plugins/text/pretty/pretty.h
index 2394e042d..a5d9cb888 100644
--- a/plugins/text/pretty/pretty.h
+++ b/plugins/text/pretty/pretty.h
@@ -29,10 +29,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/ctf-ir/event.h>
+#include <babeltrace/babeltrace.h>
 
 enum pretty_default {
 	PRETTY_DEFAULT_UNSET,
diff --git a/plugins/text/pretty/print.c b/plugins/text/pretty/print.c
index 11cd18831..75edcc7ee 100644
--- a/plugins/text/pretty/print.c
+++ b/plugins/text/pretty/print.c
@@ -27,19 +27,7 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/ctf-ir/event-class.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/field-types.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-ir/trace.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-discarded-events.h>
-#include <babeltrace/graph/notification-discarded-packets.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/bitfield-internal.h>
 #include <babeltrace/common-internal.h>
 #include <babeltrace/compat/time-internal.h>
diff --git a/plugins/utils/counter/counter.c b/plugins/utils/counter/counter.c
index a1c1cd4b3..9ef22372d 100644
--- a/plugins/utils/counter/counter.c
+++ b/plugins/utils/counter/counter.c
@@ -20,22 +20,9 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-component-sink.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/port.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/component-sink.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-discarded-events.h>
-#include <babeltrace/graph/notification-discarded-packets.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/common-internal.h>
-#include <babeltrace/values.h>
 #include <plugins-common.h>
 #include <assert.h>
 #include <inttypes.h>
diff --git a/plugins/utils/counter/counter.h b/plugins/utils/counter/counter.h
index 33dda03e7..6915532be 100644
--- a/plugins/utils/counter/counter.h
+++ b/plugins/utils/counter/counter.h
@@ -24,9 +24,7 @@
  */
 
 #include <glib.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/port.h>
+#include <babeltrace/babeltrace.h>
 #include <stdbool.h>
 #include <stdint.h>
 
diff --git a/plugins/utils/dummy/dummy.c b/plugins/utils/dummy/dummy.c
index 5e6987934..a6e9769b9 100644
--- a/plugins/utils/dummy/dummy.c
+++ b/plugins/utils/dummy/dummy.c
@@ -20,17 +20,7 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-component-sink.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/port.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/component-sink.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/notification.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <plugins-common.h>
 #include <assert.h>
diff --git a/plugins/utils/dummy/dummy.h b/plugins/utils/dummy/dummy.h
index aa654132b..0468bc01f 100644
--- a/plugins/utils/dummy/dummy.h
+++ b/plugins/utils/dummy/dummy.h
@@ -24,10 +24,7 @@
  */
 
 #include <glib.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/port.h>
+#include <babeltrace/babeltrace.h>
 #include <stdbool.h>
 
 struct dummy {
diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c
index 6546ab2fb..8722e27ff 100644
--- a/plugins/utils/muxer/muxer.c
+++ b/plugins/utils/muxer/muxer.c
@@ -25,27 +25,11 @@
 
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/compat/uuid-internal.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
-#include <babeltrace/graph/component-filter.h>
-#include <babeltrace/graph/component.h>
+#include <babeltrace/babeltrace.h>
+#include <babeltrace/values-internal.h>
 #include <babeltrace/graph/component-internal.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-inactivity.h>
-#include <babeltrace/graph/notification-iterator.h>
 #include <babeltrace/graph/notification-iterator-internal.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/port.h>
-#include <babeltrace/graph/private-component-filter.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/private-connection-private-notification-iterator.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/connection.h>
 #include <babeltrace/graph/connection-internal.h>
-#include <babeltrace/values-internal.h>
 #include <plugins-common.h>
 #include <glib.h>
 #include <stdbool.h>
diff --git a/plugins/utils/plugin.c b/plugins/utils/plugin.c
index e28dd66bb..50dabf5cc 100644
--- a/plugins/utils/plugin.c
+++ b/plugins/utils/plugin.c
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-dev.h>
+#include <babeltrace/babeltrace.h>
 #include "dummy/dummy.h"
 #include "counter/counter.h"
 #include "trimmer/trimmer.h"
diff --git a/plugins/utils/trimmer/copy.c b/plugins/utils/trimmer/copy.c
index b92521892..e7156efbb 100644
--- a/plugins/utils/trimmer/copy.c
+++ b/plugins/utils/trimmer/copy.c
@@ -30,15 +30,7 @@
 #include "logging.h"
 
 #include <assert.h>
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/event-class.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-writer/stream-class.h>
-#include <babeltrace/ctf-writer/stream.h>
+#include <babeltrace/babeltrace.h>
 
 #include <ctfcopytrace.h>
 #include "iterator.h"
diff --git a/plugins/utils/trimmer/copy.h b/plugins/utils/trimmer/copy.h
index fc66d0a09..3a0340319 100644
--- a/plugins/utils/trimmer/copy.h
+++ b/plugins/utils/trimmer/copy.h
@@ -29,9 +29,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-writer/writer.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/graph/component.h>
+#include <babeltrace/babeltrace.h>
 
 BT_HIDDEN
 struct bt_ctf_event *trimmer_output_event(struct trimmer_iterator *trim_it,
diff --git a/plugins/utils/trimmer/iterator.c b/plugins/utils/trimmer/iterator.c
index 32a99c88e..f7094c90d 100644
--- a/plugins/utils/trimmer/iterator.c
+++ b/plugins/utils/trimmer/iterator.c
@@ -31,25 +31,7 @@
 
 #include <babeltrace/compat/time-internal.h>
 #include <babeltrace/compat/utc-internal.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/private-connection-private-notification-iterator.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-stream.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/component-filter.h>
-#include <babeltrace/graph/private-component-filter.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/trace.h>
-#include <babeltrace/ctf-ir/fields.h>
+#include <babeltrace/babeltrace.h>
 #include <assert.h>
 #include <plugins-common.h>
 
diff --git a/plugins/utils/trimmer/iterator.h b/plugins/utils/trimmer/iterator.h
index 1ba08825e..65a74f444 100644
--- a/plugins/utils/trimmer/iterator.h
+++ b/plugins/utils/trimmer/iterator.h
@@ -28,10 +28,7 @@
  */
 
 #include "trimmer.h"
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-port.h>
+#include <babeltrace/babeltrace.h>
 
 struct trimmer_iterator {
 	/* Input iterator associated with this output iterator. */
diff --git a/plugins/utils/trimmer/trimmer.c b/plugins/utils/trimmer/trimmer.c
index 54a166707..d02d50535 100644
--- a/plugins/utils/trimmer/trimmer.c
+++ b/plugins/utils/trimmer/trimmer.c
@@ -30,15 +30,7 @@
 #include "logging.h"
 
 #include <babeltrace/compat/utc-internal.h>
-#include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/component-filter.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/private-connection-private-notification-iterator.h>
-#include <babeltrace/graph/private-component-filter.h>
-#include <babeltrace/graph/notification-event.h>
+#include <babeltrace/babeltrace.h>
 #include <plugins-common.h>
 #include "trimmer.h"
 #include "iterator.h"
diff --git a/plugins/utils/trimmer/trimmer.h b/plugins/utils/trimmer/trimmer.h
index 165d7c8b3..1f151cb91 100644
--- a/plugins/utils/trimmer/trimmer.h
+++ b/plugins/utils/trimmer/trimmer.h
@@ -29,8 +29,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/values.h>
-#include <babeltrace/graph/private-component.h>
+#include <babeltrace/babeltrace.h>
 
 #define NSEC_PER_SEC	1000000000LL
 
diff --git a/tests/lib/test_bt_ctf_field_type_validation.c b/tests/lib/test_bt_ctf_field_type_validation.c
index 7e4a7eed8..ad92e801f 100644
--- a/tests/lib/test_bt_ctf_field_type_validation.c
+++ b/tests/lib/test_bt_ctf_field_type_validation.c
@@ -19,6 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <babeltrace/ref.h>
 #include <babeltrace/ctf-ir/field-types.h>
 #include <babeltrace/ctf-ir/field-path.h>
 #include <babeltrace/ctf-ir/event.h>
diff --git a/tests/lib/test_bt_values.c b/tests/lib/test_bt_values.c
index e56af8024..bd8f22d54 100644
--- a/tests/lib/test_bt_values.c
+++ b/tests/lib/test_bt_values.c
@@ -20,6 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <babeltrace/ref.h>
 #include <babeltrace/values.h>
 #include <assert.h>
 #include <string.h>
diff --git a/tests/lib/test_cc_prio_map.c b/tests/lib/test_cc_prio_map.c
index 7ff5a0ebd..7a371e848 100644
--- a/tests/lib/test_cc_prio_map.c
+++ b/tests/lib/test_cc_prio_map.c
@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <babeltrace/ref.h>
 #include <babeltrace/graph/clock-class-priority-map.h>
 #include <babeltrace/ctf-ir/clock-class.h>
 #include <assert.h>
diff --git a/tests/lib/test_graph_topo.c b/tests/lib/test_graph_topo.c
index 6f81bdb88..580648b24 100644
--- a/tests/lib/test_graph_topo.c
+++ b/tests/lib/test_graph_topo.c
@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <babeltrace/ref.h>
 #include <babeltrace/graph/component-class.h>
 #include <babeltrace/graph/component-class-source.h>
 #include <babeltrace/graph/component-class-sink.h>
diff --git a/tests/lib/test_ir_visit.c b/tests/lib/test_ir_visit.c
index 2886dc940..fbbdb7456 100644
--- a/tests/lib/test_ir_visit.c
+++ b/tests/lib/test_ir_visit.c
@@ -20,6 +20,7 @@
  */
 
 #include "tap/tap.h"
+#include <babeltrace/ref.h>
 #include <babeltrace/ctf-ir/event-class.h>
 #include <babeltrace/ctf-ir/field-types.h>
 #include <babeltrace/ctf-ir/stream-class.h>
diff --git a/tests/plugins/test-utils-muxer.c b/tests/plugins/test-utils-muxer.c
index 7e9c98e2d..6a94a5478 100644
--- a/tests/plugins/test-utils-muxer.c
+++ b/tests/plugins/test-utils-muxer.c
@@ -22,37 +22,7 @@
 #include <inttypes.h>
 #include <string.h>
 #include <assert.h>
-#include <babeltrace/ctf-ir/event-class.h>
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/ctf-ir/field-types.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/trace.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
-#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.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/port.h>
-#include <babeltrace/graph/private-component-source.h>
-#include <babeltrace/graph/private-component-sink.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/private-connection-private-notification-iterator.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/plugin/plugin.h>
-#include <babeltrace/ref.h>
+#include <babeltrace/babeltrace.h>
 #include <glib.h>
 
 #include "tap/tap.h"