From c555effe83f92c839995d9eaeccdadce41da996b Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@efficios.com>
Date: Tue, 28 Nov 2023 15:40:47 -0500
Subject: [PATCH] Remove unnecessary inclusions of "internal public" headers

I believe that these spots don't really need to include files from
babeltrace2 other than babeltrace.h.  In fact, given the presence of:

    #ifndef __BT_IN_BABELTRACE_H
    # error "Please include <babeltrace2/babeltrace.h> instead."
    #endif

in those "internal public" header files and the fact that the including
files don't define __BT_IN_BABELTRACE_H, I believe that those inclusions
don't have an effect.  It must be that the included file was already
included earlier, as part of babeltrace.h.

Change-Id: I9f88123f12f916dea8c90641dd7b32c531f5c707
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/11458
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
---
 src/cli/babeltrace2-cfg-cli-args-connect.h    | 1 -
 src/cli/babeltrace2-cfg-cli-args.h            | 2 --
 src/cli/babeltrace2-cfg.h                     | 2 --
 src/ctf-writer/clock-class.c                  | 1 -
 src/ctf-writer/event-class.c                  | 1 -
 src/ctf-writer/fields.h                       | 1 -
 src/ctf-writer/resolve.c                      | 1 -
 src/ctf-writer/trace.c                        | 1 -
 src/ctf-writer/trace.h                        | 1 -
 src/ctf-writer/values.c                       | 1 -
 src/ctfser/ctfser.h                           | 1 -
 src/plugins/ctf/lttng-live/lttng-live.cpp     | 1 -
 src/plugins/lttng-utils/debug-info/bin-info.c | 1 -
 13 files changed, 15 deletions(-)

diff --git a/src/cli/babeltrace2-cfg-cli-args-connect.h b/src/cli/babeltrace2-cfg-cli-args-connect.h
index 580a50cc..48a442e7 100644
--- a/src/cli/babeltrace2-cfg-cli-args-connect.h
+++ b/src/cli/babeltrace2-cfg-cli-args-connect.h
@@ -9,7 +9,6 @@
 
 #include <stdlib.h>
 #include <stdint.h>
-#include <babeltrace2/value.h>
 #include <glib.h>
 #include "babeltrace2-cfg.h"
 
diff --git a/src/cli/babeltrace2-cfg-cli-args.h b/src/cli/babeltrace2-cfg-cli-args.h
index 92f49995..1ceded7e 100644
--- a/src/cli/babeltrace2-cfg-cli-args.h
+++ b/src/cli/babeltrace2-cfg-cli-args.h
@@ -10,10 +10,8 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <babeltrace2/value.h>
 #include "lib/object.h"
 #include "compat/compiler.h"
-#include <babeltrace2/graph/component.h>
 #include <glib.h>
 
 #include "babeltrace2-cfg.h"
diff --git a/src/cli/babeltrace2-cfg.h b/src/cli/babeltrace2-cfg.h
index f9e0ce93..79e11610 100644
--- a/src/cli/babeltrace2-cfg.h
+++ b/src/cli/babeltrace2-cfg.h
@@ -12,10 +12,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include <babeltrace2/value.h>
 #include "lib/object.h"
 #include "compat/compiler.h"
-#include <babeltrace2/graph/component-class.h>
 #include <glib.h>
 
 enum bt_config_command {
diff --git a/src/ctf-writer/clock-class.c b/src/ctf-writer/clock-class.c
index 4c056b86..94a5c8df 100644
--- a/src/ctf-writer/clock-class.c
+++ b/src/ctf-writer/clock-class.c
@@ -13,7 +13,6 @@
 #include <babeltrace2-ctf-writer/utils.h>
 #include <babeltrace2-ctf-writer/object.h>
 #include "compat/compiler.h"
-#include <babeltrace2/types.h>
 #include "compat/string.h"
 #include <stdbool.h>
 #include <inttypes.h>
diff --git a/src/ctf-writer/event-class.c b/src/ctf-writer/event-class.c
index 939d9fa7..22053f29 100644
--- a/src/ctf-writer/event-class.c
+++ b/src/ctf-writer/event-class.c
@@ -17,7 +17,6 @@
 #include <babeltrace2-ctf-writer/object.h>
 #include <babeltrace2-ctf-writer/stream-class.h>
 #include <babeltrace2-ctf-writer/utils.h>
-#include <babeltrace2/types.h>
 
 #include "common/assert.h"
 #include "compat/compiler.h"
diff --git a/src/ctf-writer/fields.h b/src/ctf-writer/fields.h
index 768be510..3c13c3ef 100644
--- a/src/ctf-writer/fields.h
+++ b/src/ctf-writer/fields.h
@@ -18,7 +18,6 @@
 #include <string.h>
 
 #include <babeltrace2-ctf-writer/fields.h>
-#include <babeltrace2/types.h>
 
 #include "common/macros.h"
 #include "common/common.h"
diff --git a/src/ctf-writer/resolve.c b/src/ctf-writer/resolve.c
index 578af1c5..1cd24489 100644
--- a/src/ctf-writer/resolve.c
+++ b/src/ctf-writer/resolve.c
@@ -18,7 +18,6 @@
 #include <babeltrace2-ctf-writer/field-types.h>
 #include <babeltrace2-ctf-writer/object.h>
 #include <babeltrace2-ctf-writer/stream-class.h>
-#include <babeltrace2/types.h>
 
 #include "common/macros.h"
 #include "common/assert.h"
diff --git a/src/ctf-writer/trace.c b/src/ctf-writer/trace.c
index ba0e0ed5..e2e9d4de 100644
--- a/src/ctf-writer/trace.c
+++ b/src/ctf-writer/trace.c
@@ -17,7 +17,6 @@
 #include <babeltrace2-ctf-writer/event.h>
 #include <babeltrace2-ctf-writer/object.h>
 #include <babeltrace2-ctf-writer/utils.h>
-#include <babeltrace2/types.h>
 
 #include "common/assert.h"
 #include "compat/compiler.h"
diff --git a/src/ctf-writer/trace.h b/src/ctf-writer/trace.h
index a12ff1e6..29df2f42 100644
--- a/src/ctf-writer/trace.h
+++ b/src/ctf-writer/trace.h
@@ -15,7 +15,6 @@
 #include <babeltrace2-ctf-writer/field-types.h>
 #include <babeltrace2-ctf-writer/fields.h>
 #include <babeltrace2-ctf-writer/trace.h>
-#include <babeltrace2/types.h>
 #include <glib.h>
 #include <sys/types.h>
 
diff --git a/src/ctf-writer/values.c b/src/ctf-writer/values.c
index a6ba5fc9..e1a98542 100644
--- a/src/ctf-writer/values.c
+++ b/src/ctf-writer/values.c
@@ -13,7 +13,6 @@
 #include <inttypes.h>
 
 #include <babeltrace2-ctf-writer/object.h>
-#include <babeltrace2/types.h>
 
 #include "common/assert.h"
 #include "common/common.h"
diff --git a/src/ctfser/ctfser.h b/src/ctfser/ctfser.h
index a152b146..33d48d20 100644
--- a/src/ctfser/ctfser.h
+++ b/src/ctfser/ctfser.h
@@ -24,7 +24,6 @@
 #include "compat/endian.h"
 #include "common/common.h"
 #include "common/mmap-align.h"
-#include <babeltrace2/types.h>
 #include "common/assert.h"
 #include "common/macros.h"
 #include "compat/bitfield.h"
diff --git a/src/plugins/ctf/lttng-live/lttng-live.cpp b/src/plugins/ctf/lttng-live/lttng-live.cpp
index 0ea15c76..826a1b53 100644
--- a/src/plugins/ctf/lttng-live/lttng-live.cpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.cpp
@@ -22,7 +22,6 @@
 #include "common/assert.h"
 #include <babeltrace2/babeltrace.h>
 #include "compat/compiler.h"
-#include <babeltrace2/types.h>
 
 #include "plugins/common/muxing/muxing.h"
 #include "plugins/common/param-validation/param-validation.h"
diff --git a/src/plugins/lttng-utils/debug-info/bin-info.c b/src/plugins/lttng-utils/debug-info/bin-info.c
index 5b579bc9..99127291 100644
--- a/src/plugins/lttng-utils/debug-info/bin-info.c
+++ b/src/plugins/lttng-utils/debug-info/bin-info.c
@@ -11,7 +11,6 @@
 #define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/BIN-INFO"
 #include "logging/comp-logging.h"
 
-#include <babeltrace2/logging.h>
 #include <dwarf.h>
 #include <errno.h>
 #include <fcntl.h>
-- 
2.34.1