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 1fb918fd011d3e60488e13841b99a394410bc931..d399d137108f15d16ad00d07a5e7001ebe86efe6 100644 (file)
--- 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 e7b91a9c631d5910f3d3bc607cec27d6f3caf604..d0464d36d0295da132d45a2859ef14c044b43a79 100644 (file)
--- 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 8a3b334bc5651f7e7216e8140d12c59a1176eb84..e4f587d578ec5c4b6e9f65ad320c3c9563b54724 100644 (file)
--- 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 d42cc91d88233bd91fed716f8717b077cd5bc318..abd48d4b78a2e37be8c0c3db9501a844a38d554b 100644 (file)
--- 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 a9100a1161e2002c713936558f143ddd76a6bc2e..45f681fbd63a3a71c1ccbaf9cd91fe40338ea076 100644 (file)
--- 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 29928986b809fb052d1e1f8e9584d803d5a83806..69a89e5c8f00de0bd92f1be487d921d159e27214 100644 (file)
--- 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 15468f4f014c5763ed091710f3afb15e7c27aafe..f881e24a59341f1ef0fef13d0ee3233abb6fad6b 100644 (file)
--- 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 64400f5201e794bf17c300ae6f66f60a4f664c3d..96a2dee7cea698cea561a89842022a472a1fae36 100644 (file)
--- 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 140970c5aed86924216a7da48c52d64b9009b625..e2aa3ef9ec1e1f958e5db11779ab97489c498e39 100644 (file)
--- 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 34ba437622313b7a7c1cf1d8436e0a777ba81c11..09acda6237e934a1e2daeafd0af596a9e3f585e6 100644 (file)
--- 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 d94b215d605fd689735b4c476896e22918c225fc..a209c5f5b283d5940ef05bb7bf48d3edb1849b15 100644 (file)
--- 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 d03b1ea9fdfc450fedad24430f6f4cb702053c65..949f49de55339a47168f5f1242be58411c61edd7 100644 (file)
--- 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 b7e28c123b9403638bbc8071ef2418a8182eb406..b27eb37633fb4e652a20fb22a545928f4ba78e58 100644 (file)
--- 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 fcfd0c502c7c0f013561e28e19b8703cddae59e0..6e06e1e5f51f792081bd2e0f42df9f9095711080 100644 (file)
--- 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 dc69f03f853d848a6ffe9394b0109df00878bf30..e0c7ecce19ee1ee1c0f17cf4ed77310d6c11bf3a 100644 (file)
--- 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 a8498ee303d4c8ebd0b35ffdb1938ebd1ec1e156..acad8eec14389191a247a275fb1d1d020615707c 100644 (file)
--- 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 428e39ac398cd982b45d67c6967d790c54d681f2..28f4f33bba30292a8a10f865a5ebbf5f588590f7 100644 (file)
--- 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 207c6c81280f2775e2c4464046763aa4112522ab..a89aa424038225be19af5dd7f3a244adc94a2428 100644 (file)
--- 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 a86d69073b535b71edabdc49c836a616a00b8285..9f7ceccfce139cb33625630f3b946d5af266795a 100644 (file)
--- 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 e9ee509360c979336c1e5a6f22582cd313639529..7423e92a5fa3861c83360e7316adbd8187a84597 100644 (file)
--- 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 566d5182964d6d89862a90181b22111e7a621046..bf10eb5d30c7eb60561492c953ceb066869fca33 100644 (file)
--- 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 f85597845e718d871b30772a377b10fb565927aa..bb3d84cbd1322daca2686185b1723890c55ddb18 100644 (file)
--- 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 df912c193096bcd0eee9ae2785387eb91558135d..3efb541ee3ad1e89adc4f69a8ddff151e11ada93 100644 (file)
--- 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 99749e48a84f9d6ca7429a72922ef1c82a3d7006..3a98091018c32c7f66c79443a355ec120b270959 100644 (file)
--- 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 1c377c26b575358e8fcc8c7961772b031ad602ca..c022343b246911c31affe0ba0d6211e9b92bcd46 100644 (file)
--- 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 4253f9d35b24dc6f4cb2dc9af22fca05668594b9..0fb4c5bc7111be257fe60cd97e6cccc6797ce113 100644 (file)
--- 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 d08e27478ba9578bf71b2ba8a42402a7b569b185..63b057a496d4808e61dab4e6fc9d80e573718fc5 100644 (file)
--- 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 3ebc0e9c671adbf19cb189d8d3aedd4abfc2add6..b9cee60b8fdab0d2acb5b733d360c0854af069d0 100644 (file)
--- 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 b122b5b931ac869a056880cabaaa30861ee5efbf..853cff26723ab41299a2db81d6c57b25958f7802 100644 (file)
--- 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 702a539fc17b26d903c81d57263bed2b2c205059..29ed0b967f3396a3847bf8db28bd8a80807ceebd 100644 (file)
--- 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 583e7e363bfb7e4595ceb59f16b69d39c3a74670..cde10e08318a84db0e3d0514b3e8c0a75332c860 100644 (file)
--- 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 e5a907fd4183987e5fca406b070095c7e1b49d5e..b64559ecf2a44a7aeba98ae37c23a848a9c5e920 100644 (file)
--- 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 f2187dd6db030dc3b191d01de0a579833280ef48..28a8776efa3bf504f849e3bbac8abfbf4a307076 100644 (file)
--- 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 0e1d663a56cac0d75b7399a9d9b60db67be2ec44..7139a1263dc309c8ddd5d8282652422c0dd8b38a 100644 (file)
--- 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 f99dca02931cbbe9923d8355011599ac8d6b000d..786566ea51207e0496d77addcf703c0e48cb9ffb 100644 (file)
--- 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 b9be67436b08bd386ab30f6f3fb9b840e6f78394..ae7b7c7ad3d94a71c62680eb938ed43e3be3d769 100644 (file)
--- 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 d4a2214b1f35ff355ceeebadefa0f33a381c3c23..58aa99e202418468aec1294c42f927fe78e1fe5d 100644 (file)
--- 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 20854d539b9be29ef3ef2cc8f69bf546a1b2b432..9afd5d0f6888e8c0899ebe58758f2c8bc61ff2e0 100644 (file)
--- 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 ac97972429e40323cd2361d4c61ac93fb73bf64c..44e0e230243a641238b82ce339f49fb7dcb4e8c6 100644 (file)
--- 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 0df9ed4e6016a0bf3a6c0e5abc783e3301a0a857..25176ea35a8e183527b3be3b5963ac548dcbf344 100644 (file)
--- 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 712d1c410de426c414257ff7cb91c3d6989d25e1..d0286eecb212b9aefec856890aca8f4c07f6b6fb 100644 (file)
--- 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 40c245b53b7d4e231bfa446de8aff130433f1b43..9908c9703a7a3c41ca16e0356e809372fb1cc086 100644 (file)
--- 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 93c233fc5aa5fc865947a647ce7d213573e2329d..c0f0ac79041b538ac1801b59ddca10c1e33f3391 100644 (file)
--- 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 af2a65694a5c90788cb83764d4360a6d70f042e4..4b5e7bc78b814f22f46d1527a590bb3f27bbf55c 100644 (file)
--- 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 74bcde9f00d3d1adf8ecd63de3dbc837ee276901..6d9e43bf0056781b8dd25b9e5244be80e068f6fa 100644 (file)
--- 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 694de8113bc4275edfd70d6ef28f259f63ac2137..814da165eb316f0db73c8803d66b37e4de63b7c9 100644 (file)
--- 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 a2ced0cbed197266ecaddae2f885b24c5049f163..c7c6f10d3bc7e015f91949c9f2e17d4ebda9b121 100644 (file)
--- 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 6789fc5413bd8b3bf5bd047b8e16f1f1891622f1..8bb79db8f3ba64980b5081fcd0066b9280dfa9f0 100644 (file)
--- 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 444b945403e6594b38d21873def188201c307f4f..5cc8ff8bf3bcf7bc5ad02ef3e006067f5d368dd2 100644 (file)
--- 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 2e9e23ef37bc584470f928aaca59627a24642973..1a32d1ced7fa03b8be643363f4922895fd7b9513 100644 (file)
--- 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 4b6f6e9ac2e28553afee26b8d4961ad648ba13c6..eec76c7ed3ba680f7958fc45edfbd9cb5c76b6ce 100644 (file)
--- 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 fd2c1632df961b8b729874d17ba0d396d3d2e02c..01dbc1849f01caa3b49d03722e744c5187ecc65d 100644 (file)
--- 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 33403dc69e3dd99a65876f1e39c5df342d4ec7bc..07e8674affe9eaae2595140bf8ea47061b8a8e58 100644 (file)
--- 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 39c2530e82987307176658dc8ae67ef2c734de1e..ec10a03359d3c99bb020a9d28beebf8443550b99 100644 (file)
--- 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 8c859e77472312a9edfa102824fdfd03bbb8aae2..32027566ace7b1c9d6eaad86d249ff6ed11e2a43 100644 (file)
--- 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 c97013eae7b3eb76a4719c5e2c44c40700e73b1a..fe978fc2e643a945301e4d57d37e9d5737c50b83 100644 (file)
--- 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 f5eaabb8f739cfc5d6912f42e90eb1ea8e7298cc..33b5884829546c3fd8d5423051417e46f93c70f7 100644 (file)
--- 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 cdc38debbaf4b2fd27bdaef2d0c546911be08ae8..231d946ce791d15222bff4fa5b0d429057ae805d 100644 (file)
--- 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 d77ca6a4099d5fd9d637c1372a88dc09ff2b7efb..496a5ca95de72ec49d1f8485e2ee6537cfec7e50 100644 (file)
--- 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 2b5171af992953361d98d301e36648b161bb31d2..c5e2be8ca333def9329cdec299bcafabb69c8803 100644 (file)
--- 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 5db579dee1618074ff1786f935a50672e3fbc388..ff89fa36dc607d1155f7701bc0e59c3ee64197ff 100644 (file)
--- 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 f6832cab967443e71b5a15e5cdbb1364b936760d..10613c8485fbbaf6691c3fe8e715bf21f9671f5b 100644 (file)
--- 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 73e588cc5a57cdf16967f3d5e8429e0af72411f6..4ca73c38106ced6bac526c0a7e86f059e0c1e1f8 100644 (file)
--- 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 dcbc9853f35206833e2214a05b59dc2986524a0b..486cc5db7654fdf53c8f02079b2188134ebf8867 100644 (file)
--- 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 c882ce9513344ec85177483d07afc93acec13aa0..b40934b7afe64c70c91b8dbd83ae28aeb2ecd68d 100644 (file)
--- 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 7fec74add2bdb2e2bba8a63c222512a503081d4e..3aa2f3839bb099061bf8c4fa067a25b1fab30771 100644 (file)
--- 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 47e4fbb27edc8eba11c69a24d8114de731683ae6..4ce171dfc2ce5692377be1ef90ae46d361c1f0e4 100644 (file)
--- 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 2955b938442a56096aa4a5ef2e56ee9f832c86ba..55bc6bb0ecb9068f0cd2dc21b4f9e2b54dacc954 100644 (file)
--- 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 0f00b56126ec97407186a691c6c1b3b576a92f5d..cb894ddd0e9c55f93646b9935bf6532864900c4a 100644 (file)
--- 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 5d312a81125730c800d3d37163933d5f93baaf06..78560f0e2bec698dd8ec59e507a9bf40a518cc34 100644 (file)
--- 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 32cb9ca2687d265c5dda583e4cbb30a0384c8cc1..bb0283592b36a4e68bd1b4b80ea9decc74447669 100644 (file)
--- 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 bfa89398790c610e662cd193401a953abf2ec99d..6debd71ced1901ec0da6a7db56a8c99f384d164e 100644 (file)
--- 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 74460f13212c7aca97f49f4176dcb2411c5db014..9a103e91fe745f1173e96d8c5e90357a142cdc88 100644 (file)
--- 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 3bbc0a178c674469c2ff0d66cb42959f66dbcdd6..a2ab8bd52ed861dddd3de8908f3a72aaee343ab9 100644 (file)
--- 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 240b51b1525f87c9bdd78a5057ff10794a8b205f..48c07636485753dd07c3274a2ffd9787ff550a98 100644 (file)
--- 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 ea5a499d17d8798735c755abf935065c05a12124..f1b6df2d59f44938ddde840f6b630b5b9a87313b 100644 (file)
--- 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 f7f42f430bca7f7bbdbf3b8848b39aa4900f69ea..355384369c00c6c83d0bb7a533cd335c4380808c 100644 (file)
--- 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 07258d440452ec10dd6a2ad6c0cdf48f14da2886..e85a890603b5ddcfcc438a217afd2a99fe5852f2 100644 (file)
--- 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 dcd5db3b46cbb52fb355edda002676d4b7966057..58a7f8f75f46172a154fbd77fd45dad478e122ae 100644 (file)
--- 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 4ac6ad6d5c20c5558483d3e5540019313e36c67b..ad76d8237fe503e0cb931e8575bbc744f7319ee1 100644 (file)
--- 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 2394e042d86c55f4faa36d0a627c21339dbbc66d..a5d9cb888399dcc36cb11aa6777022fa555cea4a 100644 (file)
--- 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 11cd18831ab67fecdfa821a7f53418238a0553de..75edcc7eed7541fa46354401ae597b8250d494b9 100644 (file)
--- 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 a1c1cd4b314a3abe3f4be4929ee3f9b6b91a4f50..9ef22372d617216e984f72b81a49f907f98cedf3 100644 (file)
--- 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 33dda03e78788d05dbc64225cb9cfafca22b370e..6915532bebc39703f629affd3ff24a913f777558 100644 (file)
--- 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 5e6987934c614cc0f600ef3a43fd747d39206aba..a6e9769b9a4c009bd6cf20933774e0b45f6ff4c8 100644 (file)
--- 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 aa654132be5828109f78ecdee1681ddac8aae080..0468bc01f9ab84da2da598efd8265887441fbe39 100644 (file)
--- 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 6546ab2fb04b92c7f27642bb9926440de5aab0d1..8722e27ffa33e8e84510d16d2eea54252b76cefa 100644 (file)
--- 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 e28dd66bbc8beb334b5553ec2efbd18f0f5d78d6..50dabf5cc3b2771d6f23b40b2d99ad1ff55990f6 100644 (file)
--- 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 b925218920748411db47c22cba1dacd815067d43..e7156efbbd2937975d7c25d6f50d909bfcd153d6 100644 (file)
--- 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 fc66d0a09bf89b981a59477c86359ae0790fca16..3a0340319d67460802ff08353bdad27df0d72660 100644 (file)
--- 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 32a99c88e9df654e794cc5192cfcd36651d57c8d..f7094c90d8ebd21b841546512491983e2bd09d53 100644 (file)
--- 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 1ba08825ea0e0419b0e01ee226fe46e7727d9a07..65a74f444a66240eb6b59830bc53f2048c80e7fc 100644 (file)
--- 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 54a1667070dc0937d7dcb59ebdc71437f537a0f5..d02d505354a53c2f2644df28976b71421a738949 100644 (file)
--- 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 165d7c8b3b77b2aefc05166d0ed0459069c27c3d..1f151cb9178ce8c23c63c84f3136a0eb418026c4 100644 (file)
--- 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 7e4a7eed8d9f1c27d007b81a7a303a2579cc1352..ad92e801f0846810f4e03fb8e35735cde2f8a200 100644 (file)
--- 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 e56af8024fb9d970d3b37c745b09d9cb460c5a19..bd8f22d54e5c54f69ae21566b705cb4b561fd8cb 100644 (file)
--- 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 7ff5a0ebdcfa8d6b9cac415b11ee56632cfd5f96..7a371e848f1aa1253c643b6dffc84b2c7c72d4f2 100644 (file)
--- 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 6f81bdb885e2220815ccbb5e4f3748308c9854f0..580648b24f053863bd4f26d21f66b6c4721ddf58 100644 (file)
--- 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 2886dc9409f9922941658545a46ee07b2b2f1af0..fbbdb74563fc0950b8520b86dd3bdffe7225d31b 100644 (file)
--- 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 7e9c98e2d9b52d94ada1a35fbff09fd1dbea6b9c..6a94a5478ffaac444501595b1e235cf835f79773 100644 (file)
--- 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"