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>

diff --git a/src/cli/babeltrace2-cfg-cli-args-connect.h b/src/cli/babeltrace2-cfg-cli-args-connect.h
index 580a50cc0f6d2af1fc62a6914ce99a54fa411843..48a442e7ea26f5d531617dbe9dd990c6e5c182b1 100644 (file)
--- 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 92f499950a7b72d4919275b6cd92bab2af4ad340..1ceded7e56254f1cb76225ccbd904408eb74e206 100644 (file)
--- 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 f9e0ce937ed5928f7968408787d29be6f8ee9113..79e1161064c44bc86ddc7b5a7323a2a3b2fe9a5f 100644 (file)
--- 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 4c056b8696922e768e982ee56e59477a2bed1167..94a5c8df77c9adc7a5d720eb22816fd68378f2fb 100644 (file)
--- 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 939d9fa7e8842803454bcbb769ca2929dc379cdd..22053f296a283fb165e8c0a2874b12d786987fb1 100644 (file)
--- 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 768be510e578c9584d0229fb18c0b3e9beaf9bb4..3c13c3efa215636229cd7f35a83e05134f0fb4e2 100644 (file)
--- 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 578af1c5322a2845c2587e5e185ba87c70189f0f..1cd244899a49713df748df91e65bb6f0db5f4f47 100644 (file)
--- 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 ba0e0ed5228ce34060b47efd89ce4e34815bbf31..e2e9d4deaba3239902d803f0d991875e065b94e3 100644 (file)
--- 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 a12ff1e6cf9f44f846204cb9e850b132f3f5e268..29df2f4290eee5de3c53274f44bfeadb2ec21184 100644 (file)
--- 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 a6ba5fc90046d0f3692b32b103b6a12168d6255a..e1a9854203ceb40136c8851a39f70df102b94415 100644 (file)
--- 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 a152b1463eee411ee3610698bcbbb397f1ad325d..33d48d2042d6cc915faf0dc76e6f148b5832709b 100644 (file)
--- 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 0ea15c7613467565c398912020f6609e279ff522..826a1b532996e1fddc9fb988bf8c2fbeff99b09b 100644 (file)
--- 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 5b579bc958c421d73281233242cb3168bcc05674..99127291591d75888c7b843dd84a7e24aaf3bd29 100644 (file)
--- 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>