From: Simon Marchi <simon.marchi@efficios.com>
Date: Tue, 6 Feb 2024 19:50:42 +0000 (-0500)
Subject: lib: remove unused includes
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=5a3fec55322bf221441f86d5ffedeb049d08d200

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 dd624d9c..c8d04b63 100644
--- 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 53505387..b07bedd0 100644
--- 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 bca924e8..4868c48c 100644
--- 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 69f14713..5547a146 100644
--- 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 837bd416..77064005 100644
--- 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 5d185a49..39788185 100644
--- 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 98cc979b..7143da96 100644
--- 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 ae3e6871..4c37e617 100644
--- 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 1f22a067..c6a69e57 100644
--- 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 334f3e67..b779f7cc 100644
--- 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 99499ef2..fdc90f46 100644
--- 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 091ef1b8..83089191 100644
--- 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 7ed41fd9..2c4569c0 100644
--- 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 693162d3..c91ebda4 100644
--- 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 93546445..401cc385 100644
--- 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 dbc888e1..cc512e1f 100644
--- 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 3dc5e1e7..01dfaec6 100644
--- 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 f882d6c3..760affc7 100644
--- 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 581f9c1f..83bf73c8 100644
--- 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 50785695..0606aa72 100644
--- 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 af052d3f..98d4acf1 100644
--- 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 78f2fb9a..d6ba358a 100644
--- 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 2915712a..632aaeea 100644
--- 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 cbc36ae0..c90476db 100644
--- 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 96fb3686..57bf7ef0 100644
--- 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 6f907dbc..4a84db1c 100644
--- 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 82558067..a22e000f 100644
--- 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 88c9fef9..aa4fc5e5 100644
--- 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 2fbe7f02..6531394a 100644
--- 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 0ba19caa..7d663e20 100644
--- 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 7ab4170d..60db3aaa 100644
--- 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 a1807728..685568c7 100644
--- 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 8c9f1185..ca471672 100644
--- 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 8b259cc8..2920f383 100644
--- 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 aee031d5..10030155 100644
--- 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 210133b8..e2e90412 100644
--- 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 cb45d56e..a64a3b0b 100644
--- 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 942523b4..860b4200 100644
--- 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 261ae84a..67d93695 100644
--- 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 251d49ec..53130c4b 100644
--- 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 0c1c82ca..e862d325 100644
--- 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 159614a2..289f3b09 100644
--- 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 afe5324e..c80d6a30 100644
--- 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 f69cb87b..8110e58a 100644
--- 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 402fa4c2..87446b26 100644
--- 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 ff75619f..c22e7c9f 100644
--- 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 ecb75e99..6c60a57e 100644
--- 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 3ccd9331..a0df1cd5 100644
--- 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 54da5afe..08395849 100644
--- 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 a7a9c3b6..771a5899 100644
--- 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 ee120fe5..89d7bf73 100644
--- 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 24c8ddfd..648a2af8 100644
--- 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 09b07e20..8df87e97 100644
--- 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 9b6766db..294e8943 100644
--- 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 45a795aa..c37111f2 100644
--- 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 2c6884f7..f9c2f6e3 100644
--- 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 ff740bab..f635624c 100644
--- 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 76a480e8..34b7a40a 100644
--- 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;