lib: remove unused includes

Remove some includes that clangd reports as unused.  Add a few includes
to make up for includes that were used transitively, that were removed.

Change-Id: I5b38ab8af317198cd9043943cd955e3a4eeb2d19
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/11752
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/src/lib/assert-cond-base.h b/src/lib/assert-cond-base.h
index dd624d9cd43e0f3cde9eb79b566d26219a8878ce..c8d04b63ea6dbc6fbfc61023e64eec7273183700 100644 (file)
--- a/src/lib/assert-cond-base.h
+++ b/src/lib/assert-cond-base.h
@@ -24,9 +24,6 @@
 #endif
 
 #include <stdbool.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include "common/common.h"
 #include "common/macros.h"
 
 /*

diff --git a/src/lib/assert-cond.c b/src/lib/assert-cond.c
index 53505387cb603fcac50e9d3b3b4ae9d7cc6b4d05..b07bedd0c0267540441f4e4f4f2232942eebf026 100644 (file)
--- a/src/lib/assert-cond.c
+++ b/src/lib/assert-cond.c
@@ -11,6 +11,7 @@
 #include <stdarg.h>
 #include <glib.h>
 #include "common/assert.h"
+#include "common/common.h"
 #include "assert-cond-base.h"
 
 static

diff --git a/src/lib/assert-cond.h b/src/lib/assert-cond.h
index bca924e8c029f22254683c53c79d44171e3a6969..4868c48c07fd3738912b8a1d6afaf3c02a698b86 100644 (file)
--- a/src/lib/assert-cond.h
+++ b/src/lib/assert-cond.h
@@ -10,6 +10,8 @@
 
 #include "assert-cond-base.h"
 
+#include <inttypes.h>
+
 /*
  * Asserts that a given variable `_obj` named `_obj_name` (capitalized)
  * and having the ID `_obj_id` (within the function's context) is not

diff --git a/src/lib/current-thread.c b/src/lib/current-thread.c
index 69f1471339f56dd0526016c75a99b62def66e7f6..5547a146b5e4b156b422b0767f954c1678db35f7 100644 (file)
--- a/src/lib/current-thread.c
+++ b/src/lib/current-thread.c
@@ -12,7 +12,6 @@
 #include <stdarg.h>
 
 #include "error.h"
-#include "common/assert.h"
 #include "lib/assert-cond.h"
 #include "lib/func-status.h"
 

diff --git a/src/lib/error.c b/src/lib/error.c
index 837bd41699738a2da649a42b0a8f4afcfb417344..77064005dc3ddfcc24e3ac1b6830635bbb0a8591 100644 (file)
--- a/src/lib/error.c
+++ b/src/lib/error.c
@@ -16,6 +16,7 @@
 #include "graph/component-class.h"
 #include "graph/iterator.h"
 #include "common/assert.h"
+#include "common/common.h"
 #include "lib/assert-cond.h"
 #include "lib/func-status.h"
 

diff --git a/src/lib/error.h b/src/lib/error.h
index 5d185a496952dbf55d8aa91dc1a4be3c1cf176cf..39788185629eb90a9df65c1fa69f967765394366 100644 (file)
--- a/src/lib/error.h
+++ b/src/lib/error.h
@@ -10,8 +10,6 @@
 #include <stdarg.h>
 #include <glib.h>
 #include <babeltrace2/babeltrace.h>
-#include "lib/object.h"
-#include "common/macros.h"
 
 struct bt_error_cause {
        enum bt_error_cause_actor_type actor_type;

diff --git a/src/lib/graph/component-class-sink-simple.h b/src/lib/graph/component-class-sink-simple.h
index 98cc979b13515bf5d073a351dd8631a98448ade3..7143da96d84153785655c0ff7788e5c6f0cccf37 100644 (file)
--- a/src/lib/graph/component-class-sink-simple.h
+++ b/src/lib/graph/component-class-sink-simple.h
@@ -7,7 +7,6 @@
 #ifndef BABELTRACE_GRAPH_COMPONENT_CLASS_SINK_SIMPLE_H
 #define BABELTRACE_GRAPH_COMPONENT_CLASS_SINK_SIMPLE_H
 
-#include <stdint.h>
 #include <babeltrace2/types.h>
 #include <babeltrace2/graph/message.h>
 

diff --git a/src/lib/graph/component-class.c b/src/lib/graph/component-class.c
index ae3e68715cfccec7754dcdbc0976607d713a5878..4c37e617a1ac6242cd9365578a55319d0b019731 100644 (file)
--- a/src/lib/graph/component-class.c
+++ b/src/lib/graph/component-class.c
@@ -9,6 +9,7 @@
 #include "lib/logging.h"
 
 #include "common/assert.h"
+#include "common/common.h"
 #include "lib/assert-cond.h"
 #include "compat/compiler.h"
 #include <babeltrace2/graph/component-class.h>

diff --git a/src/lib/graph/component-class.h b/src/lib/graph/component-class.h
index 1f22a06768c95ae7475f9b4da6b3f46fc67dbdb3..c6a69e5746514cd0917b4d1834213947907d5c33 100644 (file)
--- a/src/lib/graph/component-class.h
+++ b/src/lib/graph/component-class.h
@@ -10,7 +10,6 @@
 
 #include <babeltrace2/graph/component-class.h>
 #include <babeltrace2/graph/component.h>
-#include "common/macros.h"
 #include "lib/object.h"
 #include "common/list.h"
 #include <babeltrace2/types.h>

diff --git a/src/lib/graph/component-descriptor-set.c b/src/lib/graph/component-descriptor-set.c
index 334f3e673bb291c8aa260312c0440d0072846e7f..b779f7cce7e106e2548b91c6b51f5c6dfb24b1b7 100644 (file)
--- a/src/lib/graph/component-descriptor-set.c
+++ b/src/lib/graph/component-descriptor-set.c
@@ -10,6 +10,7 @@
 
 #include "common/assert.h"
 #include "lib/assert-cond.h"
+#include "lib/func-status.h"
 #include "compat/compiler.h"
 #include "common/common.h"
 #include <babeltrace2/types.h>

diff --git a/src/lib/graph/component-descriptor-set.h b/src/lib/graph/component-descriptor-set.h
index 99499ef22320a1b6c10e7394fd94b57882e993aa..fdc90f461864e50cae204287581eebe51c1fe897 100644 (file)
--- a/src/lib/graph/component-descriptor-set.h
+++ b/src/lib/graph/component-descriptor-set.h
@@ -10,18 +10,9 @@
 
 #include <babeltrace2/graph/graph.h>
 #include <babeltrace2/graph/component-descriptor-set.h>
-#include "common/macros.h"
 #include "lib/object.h"
-#include "common/assert.h"
-#include "common/common.h"
-#include <stdlib.h>
 #include <glib.h>
 
-#include "component.h"
-#include "component-sink.h"
-#include "connection.h"
-#include "lib/func-status.h"
-
 /*
  * This structure describes an eventual component instance.
  */

diff --git a/src/lib/graph/component-filter.h b/src/lib/graph/component-filter.h
index 091ef1b8b4c6f59c92e502f2eb5e7fad648d3612..8308919182c7fba87bd4a5ff578ba65c0cc3b5a3 100644 (file)
--- a/src/lib/graph/component-filter.h
+++ b/src/lib/graph/component-filter.h
@@ -8,10 +8,8 @@
 #ifndef BABELTRACE_GRAPH_COMPONENT_FILTER_INTERNAL_H
 #define BABELTRACE_GRAPH_COMPONENT_FILTER_INTERNAL_H
 
-#include "common/macros.h"
 #include <babeltrace2/graph/component.h>
 
-#include "component-class.h"
 #include "component.h"
 
 struct bt_component_filter {

diff --git a/src/lib/graph/component-sink.h b/src/lib/graph/component-sink.h
index 7ed41fd93d8e849d130b2f5a9a99fa85e9f8ce0d..2c4569c061d3af6f2e5a4a6f20ba4808590019a6 100644 (file)
--- a/src/lib/graph/component-sink.h
+++ b/src/lib/graph/component-sink.h
@@ -10,11 +10,9 @@
 
 #include <stdbool.h>
 
-#include "common/macros.h"
 #include "compat/compiler.h"
 #include <babeltrace2/graph/component.h>
 
-#include "component-class.h"
 #include "component.h"
 
 struct bt_component_sink {

diff --git a/src/lib/graph/component-source.h b/src/lib/graph/component-source.h
index 693162d3e5710dff19dfa5f9c0fe5e448c7990c3..c91ebda45861c0e964c5cd02e91c036ee5b0efee 100644 (file)
--- a/src/lib/graph/component-source.h
+++ b/src/lib/graph/component-source.h
@@ -8,9 +8,6 @@
 #ifndef BABELTRACE_GRAPH_COMPONENT_SOURCE_INTERNAL_H
 #define BABELTRACE_GRAPH_COMPONENT_SOURCE_INTERNAL_H
 
-#include "common/macros.h"
-
-#include "component-class.h"
 #include "component.h"
 
 struct bt_component_source {

diff --git a/src/lib/graph/component.h b/src/lib/graph/component.h
index 93546445d0dbdd45e9cd6a127cb8df90957d0801..401cc38591b27873933eeaa3ad03f82bde680bf0 100644 (file)
--- a/src/lib/graph/component.h
+++ b/src/lib/graph/component.h
@@ -8,7 +8,6 @@
 #ifndef BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
 #define BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
 
-#include "common/macros.h"
 #include <babeltrace2/graph/component.h>
 #include <babeltrace2/graph/component-class.h>
 #include "lib/object.h"
@@ -17,7 +16,6 @@
 #include "common/assert.h"
 #include <glib.h>
 #include <stdbool.h>
-#include <stdio.h>
 
 #include "component-class.h"
 #include "port.h"

diff --git a/src/lib/graph/connection.h b/src/lib/graph/connection.h
index dbc888e1a646c161f7ba9278415847ed2aab68ed..cc512e1f1361a941d97ff3219bd93ce617332749 100644 (file)
--- a/src/lib/graph/connection.h
+++ b/src/lib/graph/connection.h
@@ -11,7 +11,6 @@
 #include <babeltrace2/graph/connection.h>
 #include "lib/object.h"
 #include "common/assert.h"
-#include "common/macros.h"
 #include <stdbool.h>
 
 #include "iterator.h"

diff --git a/src/lib/graph/graph.h b/src/lib/graph/graph.h
index 3dc5e1e730131da2407a0eccc99fe857cfc564a7..01dfaec6a8df300cccde917a897560cb2fd31d4e 100644 (file)
--- a/src/lib/graph/graph.h
+++ b/src/lib/graph/graph.h
@@ -15,19 +15,15 @@
 
 #include <babeltrace2/graph/graph.h>
 #include <babeltrace2/graph/message.h>
-#include "common/macros.h"
 #include "lib/object.h"
 #include "lib/object-pool.h"
 #include "common/assert.h"
-#include "common/common.h"
 #include <stdbool.h>
-#include <stdlib.h>
 #include <glib.h>
 
 #include "component.h"
 #include "component-sink.h"
 #include "connection.h"
-#include "lib/func-status.h"
 
 /* Protection: this file uses BT_LIB_LOG*() macros directly */
 #ifndef BT_LIB_LOG_SUPPORTED

diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c
index f882d6c3cf77e9221d6f6af4b4d637d0877b95a6..760affc7ddcae8dfe501883f87598478f2955d5e 100644 (file)
--- a/src/lib/graph/iterator.c
+++ b/src/lib/graph/iterator.c
@@ -18,6 +18,7 @@
 #include <babeltrace2/trace-ir/packet.h>
 #include "lib/trace-ir/packet.h"
 #include "lib/trace-ir/stream.h"
+#include "lib/trace-ir/stream-class.h"
 #include <babeltrace2/trace-ir/clock-class.h>
 #include <babeltrace2/trace-ir/stream-class.h>
 #include <babeltrace2/trace-ir/stream.h>

diff --git a/src/lib/graph/iterator.h b/src/lib/graph/iterator.h
index 581f9c1f8d5e667c1b0cb1e93989a2316323366c..83bf73c8af198373805b799a2bda5edc080187fe 100644 (file)
--- a/src/lib/graph/iterator.h
+++ b/src/lib/graph/iterator.h
@@ -13,7 +13,6 @@
 #include <babeltrace2/graph/connection.h>
 #include <babeltrace2/graph/message.h>
 #include <babeltrace2/types.h>
-#include "common/assert.h"
 #include <stdbool.h>
 #include "common/uuid.h"
 

diff --git a/src/lib/graph/message-iterator-class.h b/src/lib/graph/message-iterator-class.h
index 507856952bf8dfa06ac6a481fbb496bbac54eb82..0606aa72b6fe1dfbc20bfe39286d9314f777e678 100644 (file)
--- a/src/lib/graph/message-iterator-class.h
+++ b/src/lib/graph/message-iterator-class.h
@@ -10,7 +10,6 @@
 
 #include <babeltrace2/graph/message-iterator-class.h>
 #include <babeltrace2/types.h>
-#include "common/macros.h"
 #include "lib/object.h"
 #include <stdbool.h>
 #include <glib.h>

diff --git a/src/lib/graph/message/event.h b/src/lib/graph/message/event.h
index af052d3f914ea82284fc413b1e2d96f554674770..98d4acf1d6211315d435c1e61306380b9520f2e6 100644 (file)
--- a/src/lib/graph/message/event.h
+++ b/src/lib/graph/message/event.h
@@ -11,8 +11,6 @@
 #include "compat/compiler.h"
 #include <babeltrace2/trace-ir/event-class.h>
 #include <babeltrace2/trace-ir/event.h>
-#include "common/assert.h"
-#include "common/macros.h"
 
 #include "message.h"
 

diff --git a/src/lib/graph/message/message.h b/src/lib/graph/message/message.h
index 78f2fb9a93c394e9af151733679aca50cedd251c..d6ba358a945c05b06720b2755c1723c0b781afae 100644 (file)
--- a/src/lib/graph/message/message.h
+++ b/src/lib/graph/message/message.h
@@ -13,7 +13,6 @@
 # error Please include "lib/logging.h" before including this file.
 #endif
 
-#include "common/macros.h"
 #include "lib/object.h"
 #include "common/assert.h"
 #include <babeltrace2/graph/graph.h>

diff --git a/src/lib/graph/message/packet.h b/src/lib/graph/message/packet.h
index 2915712a03a46e1ec5a95c3c069107ab8658841a..632aaeea9bde57491d1276a67022f026095029d6 100644 (file)
--- a/src/lib/graph/message/packet.h
+++ b/src/lib/graph/message/packet.h
@@ -11,8 +11,6 @@
 #include "compat/compiler.h"
 #include <babeltrace2/trace-ir/packet.h>
 #include "lib/trace-ir/clock-snapshot.h"
-#include "common/assert.h"
-#include "common/macros.h"
 
 #include "message.h"
 

diff --git a/src/lib/graph/message/stream.h b/src/lib/graph/message/stream.h
index cbc36ae0cc843167083859e279910ee6ea16f435..c90476db06919e671a9e484e6bbf1a6f95112cde 100644 (file)
--- a/src/lib/graph/message/stream.h
+++ b/src/lib/graph/message/stream.h
@@ -13,7 +13,6 @@
 #include "compat/compiler.h"
 #include "lib/trace-ir/stream.h"
 #include "lib/trace-ir/clock-snapshot.h"
-#include "common/assert.h"
 
 #include "message.h"
 

diff --git a/src/lib/graph/mip.c b/src/lib/graph/mip.c
index 96fb368636f76fe906dd093c1882986a8562c136..57bf7ef07cfa6de2746b1302121fb6b47106ecb8 100644 (file)
--- a/src/lib/graph/mip.c
+++ b/src/lib/graph/mip.c
@@ -16,6 +16,8 @@
 #include "common/assert.h"
 #include "compat/compiler.h"
 #include "common/common.h"
+#include "lib/func-status.h"
+#include "lib/graph/component-class.h"
 #include "lib/value.h"
 #include "component-descriptor-set.h"
 #include "lib/integer-range-set.h"

diff --git a/src/lib/graph/port.h b/src/lib/graph/port.h
index 6f907dbc4e52a2535eceabc5c8cacf1a23e031bf..4a84db1c6803911bd1aca2d6f5bad9d98ef844a3 100644 (file)
--- a/src/lib/graph/port.h
+++ b/src/lib/graph/port.h
@@ -9,7 +9,6 @@
 #define BABELTRACE_GRAPH_PORT_INTERNAL_H
 
 #include <babeltrace2/graph/port.h>
-#include "common/macros.h"
 
 struct bt_port {
        struct bt_object base;

diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c
index 82558067bfb2e5b78b9ed9272a6506edcd76b434..a22e000f0ee3f56ca0b6140e1446768c5cc29600 100644 (file)
--- a/src/lib/lib-logging.c
+++ b/src/lib/lib-logging.c
@@ -21,7 +21,6 @@
 #include <babeltrace2/babeltrace.h>
 
 #include "logging.h"
-#include "assert-cond.h"
 #include "value.h"
 #include "integer-range-set.h"
 #include "object-pool.h"

diff --git a/src/lib/logging.h b/src/lib/logging.h
index 88c9fef9146a90500c2fa73edfceb57ec5da7eaf..aa4fc5e501e7748ae6b578d2bf0268907b3aed58 100644 (file)
--- a/src/lib/logging.h
+++ b/src/lib/logging.h
@@ -7,7 +7,6 @@
 #ifndef BABELTRACE_LIB_LOGGING_INTERNAL_H
 #define BABELTRACE_LIB_LOGGING_INTERNAL_H
 
-#include "common/macros.h"
 #include <stdarg.h>
 
 #ifndef BT_LOG_TAG

diff --git a/src/lib/object.h b/src/lib/object.h
index 2fbe7f02a2d275f0cdcaa9f373ff008e31dbd0b6..6531394a831484c13ce9a521e31a4e56bd89e61b 100644 (file)
--- a/src/lib/object.h
+++ b/src/lib/object.h
@@ -8,7 +8,6 @@
 #ifndef BABELTRACE_OBJECT_INTERNAL_H
 #define BABELTRACE_OBJECT_INTERNAL_H
 
-#include "common/macros.h"
 #include "common/assert.h"
 #include <stdbool.h>
 

diff --git a/src/lib/plugin/plugin-so.h b/src/lib/plugin/plugin-so.h
index 0ba19caa861931b4945812846e8b5f4552799e5c..7d663e2061be3321cf09c43e91a25209abb94a16 100644 (file)
--- a/src/lib/plugin/plugin-so.h
+++ b/src/lib/plugin/plugin-so.h
@@ -12,7 +12,6 @@
 #include <gmodule.h>
 #include <stdbool.h>
 #include <babeltrace2/types.h>
-#include "common/macros.h"
 
 struct bt_plugin;
 struct bt_component_class;

diff --git a/src/lib/plugin/plugin.h b/src/lib/plugin/plugin.h
index 7ab4170dfa97e445dc8c87f0d811db22b8715135..60db3aaaf2d22b2ee69c676441dc04671815cf3d 100644 (file)
--- a/src/lib/plugin/plugin.h
+++ b/src/lib/plugin/plugin.h
@@ -8,7 +8,6 @@
 #ifndef BABELTRACE_PLUGIN_PLUGIN_INTERNAL_H
 #define BABELTRACE_PLUGIN_PLUGIN_INTERNAL_H
 
-#include "common/macros.h"
 #include "common/common.h"
 #include "lib/graph/component-class.h"
 #include <babeltrace2/plugin/plugin-loading.h>

diff --git a/src/lib/property.h b/src/lib/property.h
index a1807728c0dbe9c1ec9eea8f48b67a08e4504025..685568c79ca927dee11c91457616bff537848779 100644 (file)
--- a/src/lib/property.h
+++ b/src/lib/property.h
@@ -11,7 +11,6 @@
 #include <babeltrace2/babeltrace.h>
 #include <glib.h>
 #include <stdint.h>
-#include <string.h>
 
 struct bt_property {
        enum bt_property_availability avail;

diff --git a/src/lib/trace-ir/attributes.c b/src/lib/trace-ir/attributes.c
index 8c9f11856af2c4aa3852fdd459507326ac34b771..ca47167221cd8f9ebd7a453b69fa2671a7fcc00f 100644 (file)
--- a/src/lib/trace-ir/attributes.c
+++ b/src/lib/trace-ir/attributes.c
@@ -14,7 +14,6 @@
 #include "lib/value.h"
 #include "attributes.h"
 #include <inttypes.h>
-#include "compat/string.h"
 #include "common/assert.h"
 
 #define BT_ATTR_NAME_INDEX             0

diff --git a/src/lib/trace-ir/attributes.h b/src/lib/trace-ir/attributes.h
index 8b259cc868402a01f5a283fae5aaf96be70fc893..2920f383fc394b3d2792bc3d154c74b22b0d12af 100644 (file)
--- a/src/lib/trace-ir/attributes.h
+++ b/src/lib/trace-ir/attributes.h
@@ -13,7 +13,6 @@ extern "C" {
 #endif
 
 #include <stdint.h>
-#include "common/macros.h"
 #include <babeltrace2/value.h>
 
 struct bt_value *bt_attributes_create(void);

diff --git a/src/lib/trace-ir/clock-class.c b/src/lib/trace-ir/clock-class.c
index aee031d5ceff3f888cfcec4489c2344e8733fc9e..10030155b5c1ece5ad791f803bfae618c0d13f99 100644 (file)
--- a/src/lib/trace-ir/clock-class.c
+++ b/src/lib/trace-ir/clock-class.c
@@ -16,7 +16,6 @@
 #include "utils.h"
 #include "compat/compiler.h"
 #include <babeltrace2/types.h>
-#include "compat/string.h"
 #include <inttypes.h>
 #include <stdbool.h>
 #include "lib/object.h"

diff --git a/src/lib/trace-ir/clock-class.h b/src/lib/trace-ir/clock-class.h
index 210133b85399e9b2a57b74ded96126e5b91852c0..e2e90412c797f53e01cb5f279a8ac2f83b673b21 100644 (file)
--- a/src/lib/trace-ir/clock-class.h
+++ b/src/lib/trace-ir/clock-class.h
@@ -10,12 +10,10 @@
 
 #include <babeltrace2/trace-ir/clock-class.h>
 #include "lib/object.h"
-#include "common/macros.h"
 #include "common/common.h"
 #include "lib/object-pool.h"
 #include "common/uuid.h"
 #include <babeltrace2/types.h>
-#include "lib/property.h"
 #include "common/assert.h"
 #include <stdbool.h>
 #include <stdint.h>

diff --git a/src/lib/trace-ir/clock-snapshot.c b/src/lib/trace-ir/clock-snapshot.c
index cb45d56e0aacdc28d8844036c6a18ed3ae643f73..a64a3b0b34ddcf951303b159017c0a8a5245dbb2 100644 (file)
--- a/src/lib/trace-ir/clock-snapshot.c
+++ b/src/lib/trace-ir/clock-snapshot.c
@@ -13,7 +13,6 @@
 #include <babeltrace2/trace-ir/clock-snapshot.h>
 #include "compat/compiler.h"
 #include <babeltrace2/types.h>
-#include "compat/string.h"
 #include "lib/object.h"
 #include "common/assert.h"
 #include "lib/func-status.h"

diff --git a/src/lib/trace-ir/clock-snapshot.h b/src/lib/trace-ir/clock-snapshot.h
index 942523b440ebf531b57ed2d26a40ec8b42d15765..860b4200d4e205ec11e7df7ba9643c7b05f25bd3 100644 (file)
--- a/src/lib/trace-ir/clock-snapshot.h
+++ b/src/lib/trace-ir/clock-snapshot.h
@@ -7,7 +7,6 @@
 #ifndef BABELTRACE_TRACE_IR_CLOCK_SNAPSHOT_INTERNAL_H
 #define BABELTRACE_TRACE_IR_CLOCK_SNAPSHOT_INTERNAL_H
 
-#include "common/macros.h"
 #include "lib/object.h"
 #include <stdbool.h>
 #include <stdint.h>

diff --git a/src/lib/trace-ir/event-class.h b/src/lib/trace-ir/event-class.h
index 261ae84a9bcc7f10c79046b7b1273da53a1b832c..67d93695e84711c271c1a5fd012396fb8651ca19 100644 (file)
--- a/src/lib/trace-ir/event-class.h
+++ b/src/lib/trace-ir/event-class.h
@@ -8,10 +8,8 @@
 #ifndef BABELTRACE_TRACE_IR_EVENT_CLASS_INTERNAL_H
 #define BABELTRACE_TRACE_IR_EVENT_CLASS_INTERNAL_H
 
-#include "lib/assert-cond.h"
 #include <babeltrace2/trace-ir/field-class.h>
 #include <babeltrace2/trace-ir/field.h>
-#include "common/macros.h"
 #include <babeltrace2/value.h>
 #include <babeltrace2/trace-ir/stream-class.h>
 #include <babeltrace2/trace-ir/stream.h>
@@ -23,8 +21,6 @@
 #include <glib.h>
 #include <stdbool.h>
 
-#include "trace.h"
-
 struct bt_event_class {
        struct bt_object base;
        struct bt_field_class *specific_context_fc;

diff --git a/src/lib/trace-ir/event.h b/src/lib/trace-ir/event.h
index 251d49ec83173c66a2f19700aa5595e1eb43f992..53130c4ba52c5dfb9157b592d9118485b514b1cd 100644 (file)
--- a/src/lib/trace-ir/event.h
+++ b/src/lib/trace-ir/event.h
@@ -14,7 +14,6 @@
 #endif
 
 #include "lib/assert-cond.h"
-#include "common/macros.h"
 #include <babeltrace2/value.h>
 #include <babeltrace2/trace-ir/stream-class.h>
 #include <babeltrace2/trace-ir/stream.h>
@@ -27,7 +26,6 @@
 
 #include "event-class.h"
 #include "field.h"
-#include "field-wrapper.h"
 #include "packet.h"
 #include "stream.h"
 

diff --git a/src/lib/trace-ir/field-class.c b/src/lib/trace-ir/field-class.c
index 0c1c82ca5f70e22d48855b1a7ff5b69958732100..e862d3252a292b732bf875421d2434f31718bb97 100644 (file)
--- a/src/lib/trace-ir/field-class.c
+++ b/src/lib/trace-ir/field-class.c
@@ -16,6 +16,7 @@
 #include "compat/compiler.h"
 #include "compat/endian.h"
 #include "common/assert.h"
+#include "common/common.h"
 #include "compat/glib.h"
 #include <inttypes.h>
 #include <stdbool.h>

diff --git a/src/lib/trace-ir/field-class.h b/src/lib/trace-ir/field-class.h
index 159614a250905489687a92e885d9d0ce041120e4..289f3b0978bd752484ba94c2d160437cdae3632a 100644 (file)
--- a/src/lib/trace-ir/field-class.h
+++ b/src/lib/trace-ir/field-class.h
@@ -8,11 +8,9 @@
 #ifndef BABELTRACE_TRACE_IR_FIELD_CLASSES_INTERNAL_H
 #define BABELTRACE_TRACE_IR_FIELD_CLASSES_INTERNAL_H
 
-#include "lib/assert-cond.h"
 #include <babeltrace2/trace-ir/clock-class.h>
 #include <babeltrace2/trace-ir/field-class.h>
 #include "common/macros.h"
-#include "common/common.h"
 #include "lib/object.h"
 #include <babeltrace2/types.h>
 #include <stdbool.h>

diff --git a/src/lib/trace-ir/field-wrapper.h b/src/lib/trace-ir/field-wrapper.h
index afe5324e2c6c2c933598833a619692464ccab8b1..c80d6a30a84094f48b529fc4387313cafe010cee 100644 (file)
--- a/src/lib/trace-ir/field-wrapper.h
+++ b/src/lib/trace-ir/field-wrapper.h
@@ -7,7 +7,6 @@
 #ifndef BABELTRACE_TRACE_IR_FIELD_WRAPPER_INTERNAL_H
 #define BABELTRACE_TRACE_IR_FIELD_WRAPPER_INTERNAL_H
 
-#include "common/macros.h"
 #include "lib/object-pool.h"
 #include "lib/object.h"
 

diff --git a/src/lib/trace-ir/field.c b/src/lib/trace-ir/field.c
index f69cb87bf41d9195456ed7c9697ed48ae211b39f..8110e58acc80749adfb8352acec7768fd87860a2 100644 (file)
--- a/src/lib/trace-ir/field.c
+++ b/src/lib/trace-ir/field.c
@@ -20,6 +20,7 @@
 #include "field.h"
 #include "field-class.h"
 #include "lib/func-status.h"
+#include "utils.h"
 
 #define BT_ASSERT_PRE_DEV_FIELD_HOT(_field)                            \
        BT_ASSERT_PRE_DEV_HOT("field",                                  \

diff --git a/src/lib/trace-ir/field.h b/src/lib/trace-ir/field.h
index 402fa4c2d90ae8e603d84130de9fc271a9e2bdc2..87446b26fc1b782baa1572ebb5234daae7372344 100644 (file)
--- a/src/lib/trace-ir/field.h
+++ b/src/lib/trace-ir/field.h
@@ -8,19 +8,13 @@
 #ifndef BABELTRACE_TRACE_IR_FIELDS_INTERNAL_H
 #define BABELTRACE_TRACE_IR_FIELDS_INTERNAL_H
 
-#include "lib/assert-cond.h"
-#include "common/common.h"
 #include "lib/object.h"
-#include "common/macros.h"
 #include <babeltrace2/types.h>
 #include <stdint.h>
-#include <string.h>
-#include <inttypes.h>
 #include <stdbool.h>
 #include <glib.h>
 
 #include "field-class.h"
-#include "utils.h"
 
 struct bt_field;
 

diff --git a/src/lib/trace-ir/packet.h b/src/lib/trace-ir/packet.h
index ff75619f75d21441258b6f9d814a5139a1872549..c22e7c9f47beaf4083cea89b870a3b7e53e24247 100644 (file)
--- a/src/lib/trace-ir/packet.h
+++ b/src/lib/trace-ir/packet.h
@@ -8,14 +8,11 @@
 #define BABELTRACE_TRACE_IR_PACKET_INTERNAL_H
 
 #include <stdbool.h>
-#include "common/assert.h"
 #include <babeltrace2/trace-ir/clock-snapshot.h>
 #include <babeltrace2/trace-ir/packet.h>
 #include <babeltrace2/trace-ir/field.h>
 #include <babeltrace2/trace-ir/stream.h>
 #include "lib/object.h"
-#include "common/macros.h"
-#include "lib/property.h"
 
 #include "field-wrapper.h"
 

diff --git a/src/lib/trace-ir/resolve-field-path.c b/src/lib/trace-ir/resolve-field-path.c
index ecb75e99685b5f14452cad11dfc5af0969a473d4..6c60a57e7c4dfeedf76f204b60c7a168f4490ad5 100644 (file)
--- a/src/lib/trace-ir/resolve-field-path.c
+++ b/src/lib/trace-ir/resolve-field-path.c
@@ -17,6 +17,7 @@
 #include "field-class.h"
 #include "field-path.h"
 #include "resolve-field-path.h"
+#include "common/common.h"
 
 static
 bool find_field_class_recursive(struct bt_field_class *fc,

diff --git a/src/lib/trace-ir/resolve-field-path.h b/src/lib/trace-ir/resolve-field-path.h
index 3ccd9331bdb20b1aa1715f348229ff5c94a41fe0..a0df1cd5d47e7ae5409272db48fa14f6eb3481d7 100644 (file)
--- a/src/lib/trace-ir/resolve-field-path.h
+++ b/src/lib/trace-ir/resolve-field-path.h
@@ -10,8 +10,6 @@
 #ifndef BABELTRACE_TRACE_IR_RESOLVE_FIELD_PATH_INTERNAL
 #define BABELTRACE_TRACE_IR_RESOLVE_FIELD_PATH_INTERNAL
 
-#include "common/macros.h"
-#include "lib/object.h"
 #include <babeltrace2/trace-ir/field-class.h>
 #include <babeltrace2/trace-ir/field-path.h>
 #include <glib.h>

diff --git a/src/lib/trace-ir/stream-class.c b/src/lib/trace-ir/stream-class.c
index 54da5afed0643347537da0f9f81d9ed1efda2498..08395849b03c9331fde5cfe8b7422d00ccb6f077 100644 (file)
--- a/src/lib/trace-ir/stream-class.c
+++ b/src/lib/trace-ir/stream-class.c
@@ -25,6 +25,7 @@
 #include "stream-class.h"
 #include "lib/value.h"
 #include "lib/func-status.h"
+#include "trace-class.h"
 
 #define BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(_sc)                                \
        BT_ASSERT_PRE_DEV_HOT("stream-class", (_sc), "Stream class",    \

diff --git a/src/lib/trace-ir/stream-class.h b/src/lib/trace-ir/stream-class.h
index a7a9c3b6bc48b6367b9860794ef770c22b038f1a..771a5899197d22161e0098f7f95b4e4de05f25c5 100644 (file)
--- a/src/lib/trace-ir/stream-class.h
+++ b/src/lib/trace-ir/stream-class.h
@@ -9,17 +9,13 @@
 #define BABELTRACE_TRACE_IR_STREAM_CLASS_INTERNAL_H
 
 #include "common/assert.h"
-#include "common/common.h"
 #include <babeltrace2/trace-ir/stream-class.h>
 #include "lib/object.h"
 #include "lib/object-pool.h"
-#include "common/macros.h"
 #include <glib.h>
-#include <inttypes.h>
 #include <stdbool.h>
 
 #include "field-class.h"
-#include "utils.h"
 
 struct bt_stream_class {
        struct bt_object base;

diff --git a/src/lib/trace-ir/stream.h b/src/lib/trace-ir/stream.h
index ee120fe576cf9a554039e9c48d334575cc17bbff..89d7bf73afd47e3018e16d2290981f69f82abc10 100644 (file)
--- a/src/lib/trace-ir/stream.h
+++ b/src/lib/trace-ir/stream.h
@@ -11,12 +11,9 @@
 #include <babeltrace2/trace-ir/stream.h>
 #include "lib/object.h"
 #include "lib/object-pool.h"
-#include "common/macros.h"
 #include <glib.h>
 #include <stdbool.h>
 
-#include "utils.h"
-
 struct bt_stream_class;
 struct bt_stream;
 

diff --git a/src/lib/trace-ir/trace-class.c b/src/lib/trace-ir/trace-class.c
index 24c8ddfdff570be1c3d7c63ec4807761ddef9649..648a2af8095c3d1fcdbfe7162cc7597ff571551b 100644 (file)
--- a/src/lib/trace-ir/trace-class.c
+++ b/src/lib/trace-ir/trace-class.c
@@ -17,7 +17,6 @@
 #include <babeltrace2/types.h>
 #include "compat/endian.h"
 #include "common/assert.h"
-#include "compat/glib.h"
 #include <inttypes.h>
 #include <stdint.h>
 #include <string.h>

diff --git a/src/lib/trace-ir/trace-class.h b/src/lib/trace-ir/trace-class.h
index 09b07e201790a7fce8d43d02c946df7be0636534..8df87e970629ca458a3a8ebf5a4ee171185ccb39 100644 (file)
--- a/src/lib/trace-ir/trace-class.h
+++ b/src/lib/trace-ir/trace-class.h
@@ -8,23 +8,16 @@
 #ifndef BABELTRACE_TRACE_IR_TRACE_CLASS_INTERNAL_H
 #define BABELTRACE_TRACE_IR_TRACE_CLASS_INTERNAL_H
 
-#include "lib/assert-cond.h"
 #include <babeltrace2/trace-ir/trace-class.h>
 #include <babeltrace2/trace-ir/field-class.h>
 #include <babeltrace2/trace-ir/field.h>
 #include "lib/object.h"
-#include "lib/object-pool.h"
-#include "common/macros.h"
 #include <babeltrace2/value.h>
 #include <babeltrace2/types.h>
 #include <glib.h>
 #include <sys/types.h>
 #include <stdbool.h>
 
-#include "stream-class.h"
-#include "attributes.h"
-#include "clock-class.h"
-
 struct bt_trace_class {
        struct bt_object base;
 

diff --git a/src/lib/trace-ir/trace.h b/src/lib/trace-ir/trace.h
index 9b6766db10c7bcdb245cd844b2666de69bf6be34..294e8943cd2ffb5933cb7a14888092e435f2b7a7 100644 (file)
--- a/src/lib/trace-ir/trace.h
+++ b/src/lib/trace-ir/trace.h
@@ -8,13 +8,10 @@
 #ifndef BABELTRACE_TRACE_IR_TRACE_INTERNAL_H
 #define BABELTRACE_TRACE_IR_TRACE_INTERNAL_H
 
-#include "lib/assert-cond.h"
 #include <babeltrace2/trace-ir/trace.h>
 #include <babeltrace2/trace-ir/field-class.h>
 #include <babeltrace2/trace-ir/field.h>
 #include "lib/object.h"
-#include "lib/object-pool.h"
-#include "common/macros.h"
 #include <babeltrace2/value.h>
 #include <babeltrace2/types.h>
 #include <glib.h>
@@ -22,8 +19,6 @@
 #include <sys/types.h>
 #include "common/uuid.h"
 
-#include "attributes.h"
-#include "clock-class.h"
 #include "stream-class.h"
 #include "trace-class.h"
 

diff --git a/src/lib/trace-ir/utils.c b/src/lib/trace-ir/utils.c
index 45a795aa9c7f3c25c9c885d1a8693b6085a23c07..c37111f280fe87aa5e7249864d91036f061151ba 100644 (file)
--- a/src/lib/trace-ir/utils.c
+++ b/src/lib/trace-ir/utils.c
@@ -8,9 +8,5 @@
 #define BT_LOG_TAG "LIB/TRACE-IR-UTILS"
 #include "lib/logging.h"
 
-#include <stdlib.h>
 #include <glib.h>
 #include <babeltrace2/trace-ir/clock-class.h>
-#include "common/assert.h"
-
-#include "field-class.h"

diff --git a/src/lib/trace-ir/utils.h b/src/lib/trace-ir/utils.h
index 2c6884f72f0e531c41e8ff1f57b984f9f4e5507c..f9c2f6e3a4ba4ba8f4a700a244676e8b949addd7 100644 (file)
--- a/src/lib/trace-ir/utils.h
+++ b/src/lib/trace-ir/utils.h
@@ -7,7 +7,6 @@
 #ifndef BABELTRACE_TRACE_IR_UTILS_INTERNAL_H
 #define BABELTRACE_TRACE_IR_UTILS_INTERNAL_H
 
-#include "common/macros.h"
 #include <babeltrace2/trace-ir/field-class.h>
 #include <stdbool.h>
 #include <stdint.h>

diff --git a/src/lib/util.c b/src/lib/util.c
index ff740bab0516d5a1d76b911c0878396615eb21fd..f635624ca15b7d757f8a2e76657f5c484d8d7c67 100644 (file)
--- a/src/lib/util.c
+++ b/src/lib/util.c
@@ -9,8 +9,6 @@
 
 #include "lib/assert-cond.h"
 #include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
 #include <inttypes.h>
 #include <babeltrace2/babeltrace.h>
 #include "lib/trace-ir/utils.h"

diff --git a/src/lib/value.h b/src/lib/value.h
index 76a480e885cf1712fb4b12ecf7c22c4dedfca5d9..34b7a40ad89957ff411b062dab1db35dfaaf5cd2 100644 (file)
--- a/src/lib/value.h
+++ b/src/lib/value.h
@@ -11,7 +11,6 @@
 #include <babeltrace2/babeltrace.h>
 
 #include "lib/object.h"
-#include "common/macros.h"
 
 struct bt_value {
        struct bt_object base;