From 050dd63950efb32bc79cdb68866792d4f808a1b0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Wed, 24 Feb 2021 14:59:49 -0500
Subject: [PATCH] Clean-up: lttng: only include lttng.h
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I88d56768136895d5a6ad2ffc94f36f9ca36e2fa1
---
 src/bin/lttng/commands/clear.c            | 3 +--
 src/bin/lttng/commands/create.c           | 3 +--
 src/bin/lttng/commands/disable_rotation.c | 2 +-
 src/bin/lttng/commands/enable_events.c    | 1 -
 src/bin/lttng/commands/enable_rotation.c  | 2 +-
 src/bin/lttng/commands/list.c             | 3 +--
 src/bin/lttng/commands/load.c             | 2 +-
 src/bin/lttng/commands/rotate.c           | 3 +--
 src/bin/lttng/commands/save.c             | 2 +-
 src/bin/lttng/commands/snapshot.c         | 2 +-
 src/bin/lttng/commands/track-untrack.c    | 9 ++++-----
 11 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/bin/lttng/commands/clear.c b/src/bin/lttng/commands/clear.c
index b3974837f..61879d61d 100644
--- a/src/bin/lttng/commands/clear.c
+++ b/src/bin/lttng/commands/clear.c
@@ -14,8 +14,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdbool.h>
-#include <lttng/clear.h>
-#include <lttng/clear-handle.h>
+#include <lttng/lttng.h>
 
 #include "../command.h"
 
diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 379ca0a66..22d1790f7 100644
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -29,8 +29,7 @@
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/uri.h>
 #include <common/utils.h>
-#include <lttng/snapshot.h>
-#include <lttng/session-descriptor.h>
+#include <lttng/lttng.h>
 
 static char *opt_output_path;
 static char *opt_session_name;
diff --git a/src/bin/lttng/commands/disable_rotation.c b/src/bin/lttng/commands/disable_rotation.c
index f5c197f9b..ff5749c97 100644
--- a/src/bin/lttng/commands/disable_rotation.c
+++ b/src/bin/lttng/commands/disable_rotation.c
@@ -20,7 +20,7 @@
 #include <common/mi-lttng.h>
 
 #include "../command.h"
-#include <lttng/rotation.h>
+#include <lttng/lttng.h>
 
 static char *opt_session_name;
 static struct mi_writer *writer;
diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 3286defc3..9d05a9a26 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -22,7 +22,6 @@
 #include <common/string-utils/string-utils.h>
 #include <common/utils.h>
 
-#include <lttng/constant.h>
 /* Mi dependancy */
 #include <common/mi-lttng.h>
 
diff --git a/src/bin/lttng/commands/enable_rotation.c b/src/bin/lttng/commands/enable_rotation.c
index ce69d34e1..c10c6a2d7 100644
--- a/src/bin/lttng/commands/enable_rotation.c
+++ b/src/bin/lttng/commands/enable_rotation.c
@@ -21,7 +21,7 @@
 #include <common/utils.h>
 
 #include "../command.h"
-#include <lttng/rotation.h>
+#include <lttng/lttng.h>
 
 static char *opt_session_name;
 static struct mi_writer *writer;
diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index e96fe35dc..454017794 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -18,8 +18,7 @@
 #include <common/mi-lttng.h>
 #include <common/time.h>
 #include <common/tracker.h>
-#include <lttng/constant.h>
-#include <lttng/tracker.h>
+#include <lttng/lttng.h>
 
 #include "../command.h"
 
diff --git a/src/bin/lttng/commands/load.c b/src/bin/lttng/commands/load.c
index 002ec4958..aa4771a11 100644
--- a/src/bin/lttng/commands/load.c
+++ b/src/bin/lttng/commands/load.c
@@ -15,7 +15,7 @@
 
 #include <common/mi-lttng.h>
 #include <common/config/session-config.h>
-#include <lttng/load.h>
+#include <lttng/lttng.h>
 
 #include "../command.h"
 
diff --git a/src/bin/lttng/commands/rotate.c b/src/bin/lttng/commands/rotate.c
index 4873e5495..ec8163157 100644
--- a/src/bin/lttng/commands/rotate.c
+++ b/src/bin/lttng/commands/rotate.c
@@ -21,8 +21,7 @@
 #include <common/mi-lttng.h>
 
 #include "../command.h"
-#include <lttng/rotation.h>
-#include <lttng/location.h>
+#include <lttng/lttng.h>
 
 static char *opt_session_name;
 static int opt_no_wait;
diff --git a/src/bin/lttng/commands/save.c b/src/bin/lttng/commands/save.c
index 59cd71568..7d09a42a2 100644
--- a/src/bin/lttng/commands/save.c
+++ b/src/bin/lttng/commands/save.c
@@ -16,7 +16,7 @@
 #include <common/mi-lttng.h>
 
 #include "../command.h"
-#include <lttng/save.h>
+#include <lttng/lttng.h>
 
 static char *opt_output_path;
 static bool opt_force;
diff --git a/src/bin/lttng/commands/snapshot.c b/src/bin/lttng/commands/snapshot.c
index d35798310..22531e8f2 100644
--- a/src/bin/lttng/commands/snapshot.c
+++ b/src/bin/lttng/commands/snapshot.c
@@ -19,7 +19,7 @@
 
 #include <common/utils.h>
 #include <common/mi-lttng.h>
-#include <lttng/snapshot.h>
+#include <lttng/lttng.h>
 
 #include "../command.h"
 
diff --git a/src/bin/lttng/commands/track-untrack.c b/src/bin/lttng/commands/track-untrack.c
index d28f8a7e1..8a892ef66 100644
--- a/src/bin/lttng/commands/track-untrack.c
+++ b/src/bin/lttng/commands/track-untrack.c
@@ -7,11 +7,6 @@
  *
  */
 
-#include "common/dynamic-buffer.h"
-#include "common/tracker.h"
-#include "lttng/domain.h"
-#include "lttng/lttng-error.h"
-#include "lttng/tracker.h"
 #define _LGPL_SOURCE
 #include <ctype.h>
 #include <popt.h>
@@ -29,6 +24,10 @@
 #include <common/dynamic-array.h>
 #include <common/mi-lttng.h>
 #include <common/optional.h>
+#include <common/dynamic-buffer.h>
+#include <common/tracker.h>
+
+#include <lttng/lttng.h>
 
 #include "../command.h"
 
-- 
2.34.1