diff --git a/src/plugins/ctf/lttng-live/data-stream.c b/src/plugins/ctf/lttng-live/data-stream.c
index ce3049638..61777519e 100644
--- a/src/plugins/ctf/lttng-live/data-stream.c
+++ b/src/plugins/ctf/lttng-live/data-stream.c
@@ -28,16 +28,17 @@
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/DS"
 #include "logging/comp-logging.h"
 
+#include <inttypes.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>
+
 #include <glib.h>
-#include <inttypes.h>
-#include "compat/mman.h"
+
 #include <babeltrace2/babeltrace.h>
+
 #include "../common/msg-iter/msg-iter.h"
 #include "common/assert.h"
-
+#include "compat/mman.h"
 #include "data-stream.h"
 
 #define STREAM_NAME_PREFIX	"stream-"
diff --git a/src/plugins/ctf/lttng-live/data-stream.h b/src/plugins/ctf/lttng-live/data-stream.h
index 94943e2aa..1fcaced39 100644
--- a/src/plugins/ctf/lttng-live/data-stream.h
+++ b/src/plugins/ctf/lttng-live/data-stream.h
@@ -24,12 +24,12 @@
  */
 
 #include <stdio.h>
+#include <stdint.h>
+
 #include <glib.h>
-#include "common/macros.h"
-#include <babeltrace2/babeltrace.h>
 
-#include "lttng-live.h"
 #include "../common/msg-iter/msg-iter.h"
+#include "lttng-live.h"
 
 enum lttng_live_iterator_status lttng_live_lazy_msg_init(
 		struct lttng_live_session *session);
diff --git a/src/plugins/ctf/lttng-live/lttng-live.c b/src/plugins/ctf/lttng-live/lttng-live.c
index 87efe7a68..699c5c925 100644
--- a/src/plugins/ctf/lttng-live/lttng-live.c
+++ b/src/plugins/ctf/lttng-live/lttng-live.c
@@ -33,11 +33,12 @@
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE"
 #include "logging/comp-logging.h"
 
-#include <glib.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <unistd.h>
 
+#include <glib.h>
+
 #include "common/assert.h"
 #include <babeltrace2/babeltrace.h>
 #include "compat/compiler.h"
diff --git a/src/plugins/ctf/lttng-live/lttng-live.h b/src/plugins/ctf/lttng-live/lttng-live.h
index 511c0c486..bd5b317d9 100644
--- a/src/plugins/ctf/lttng-live/lttng-live.h
+++ b/src/plugins/ctf/lttng-live/lttng-live.h
@@ -30,13 +30,15 @@
  */
 
 #include <stdbool.h>
+#include <stdint.h>
+
+#include <glib.h>
 
-#include "common/macros.h"
 #include <babeltrace2/babeltrace.h>
 
+#include "common/macros.h"
 #include "../common/metadata/decoder.h"
 #include "../common/msg-iter/msg-iter.h"
-
 #include "viewer-connection.h"
 
 struct lttng_live_component;
diff --git a/src/plugins/ctf/lttng-live/lttng-viewer-abi.h b/src/plugins/ctf/lttng-live/lttng-viewer-abi.h
index 9f6154ba8..a58956a4f 100644
--- a/src/plugins/ctf/lttng-live/lttng-viewer-abi.h
+++ b/src/plugins/ctf/lttng-live/lttng-viewer-abi.h
@@ -25,6 +25,7 @@
  * SOFTWARE.
  */
 
+#include <stdint.h>
 #include "compat/limits.h"
 
 #define LTTNG_VIEWER_PATH_MAX		4096
diff --git a/src/plugins/ctf/lttng-live/metadata.h b/src/plugins/ctf/lttng-live/metadata.h
index 0731c33d9..6915753d5 100644
--- a/src/plugins/ctf/lttng-live/metadata.h
+++ b/src/plugins/ctf/lttng-live/metadata.h
@@ -23,10 +23,9 @@
  * SOFTWARE.
  */
 
+#include <stdint.h>
 #include <stdio.h>
-#include <glib.h>
-#include "common/macros.h"
-#include <babeltrace2/babeltrace.h>
+
 #include "lttng-live.h"
 
 int lttng_live_metadata_create_stream(struct lttng_live_session *session,
diff --git a/src/plugins/ctf/lttng-live/viewer-connection.c b/src/plugins/ctf/lttng-live/viewer-connection.c
index befffb30a..132591e78 100644
--- a/src/plugins/ctf/lttng-live/viewer-connection.c
+++ b/src/plugins/ctf/lttng-live/viewer-connection.c
@@ -26,15 +26,15 @@
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/VIEWER"
 #include "logging/comp-logging.h"
 
-#include <stdio.h>
+#include <fcntl.h>
+#include <stdbool.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
+#include <sys/types.h>
 #include <unistd.h>
+
 #include <glib.h>
-#include <inttypes.h>
-#include <sys/types.h>
-#include <fcntl.h>
 
 #include "compat/socket.h"
 #include "compat/endian.h"
diff --git a/src/plugins/ctf/lttng-live/viewer-connection.h b/src/plugins/ctf/lttng-live/viewer-connection.h
index c42c16b05..ca5883e84 100644
--- a/src/plugins/ctf/lttng-live/viewer-connection.h
+++ b/src/plugins/ctf/lttng-live/viewer-connection.h
@@ -24,9 +24,13 @@
  */
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
+
 #include <glib.h>
 
+#include <babeltrace2/babeltrace.h>
+
 #include "common/macros.h"
 #include "compat/socket.h"