diff --git a/utils/mctp-capture.h b/utils/mctp-capture.h
index 90feb66..e97d547 100644
--- a/utils/mctp-capture.h
+++ b/utils/mctp-capture.h
@@ -5,6 +5,7 @@
 
 #include "config.h"
 
+#include "compiler.h"
 #include "libmctp.h"
 
 #include <sys/types.h>
@@ -19,8 +20,6 @@
 #define CAPTURE_LINKTYPE_FIRST	147
 #define CAPTURE_LINKTYPE_LAST	162
 
-#define __unused __attribute__((unused))
-
 struct capture {
 	const char	*path;
 	int		linktype;
diff --git a/utils/mctp-demux-daemon.c b/utils/mctp-demux-daemon.c
index 968079f..d7ab9bc 100644
--- a/utils/mctp-demux-daemon.c
+++ b/utils/mctp-demux-daemon.c
@@ -3,6 +3,13 @@
 #define _GNU_SOURCE
 
 #include "config.h"
+
+#define SD_LISTEN_FDS_START 3
+
+#include "compiler.h"
+#include "libmctp.h"
+#include "libmctp-serial.h"
+#include "libmctp-astlpc.h"
 #include "utils/mctp-capture.h"
 
 #include <assert.h>
@@ -22,14 +29,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#define SD_LISTEN_FDS_START 3
-
-#include "libmctp.h"
-#include "libmctp-serial.h"
-#include "libmctp-astlpc.h"
-
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-#define __unused __attribute__((unused))
 
 #if HAVE_SYSTEMD_SD_DAEMON_H
 #include <systemd/sd-daemon.h>
diff --git a/utils/mctp-in.c b/utils/mctp-in.c
index c2792b6..eff4abf 100644
--- a/utils/mctp-in.c
+++ b/utils/mctp-in.c
@@ -1,5 +1,9 @@
 /* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */
 
+#include "compiler.h"
+#include "libmctp.h"
+#include "libmctp-serial.h"
+
 #include <assert.h>
 #include <err.h>
 #include <stdio.h>
@@ -8,9 +12,6 @@
 #include <sys/poll.h>
 #include <sys/socket.h>
 
-#include "libmctp.h"
-#include "libmctp-serial.h"
-
 static void rx_message(uint8_t eid, void *data, void *msg, size_t len)
 {
 	ssize_t rc;
diff --git a/utils/mctp-pipe.c b/utils/mctp-pipe.c
index 91389aa..ad466fb 100644
--- a/utils/mctp-pipe.c
+++ b/utils/mctp-pipe.c
@@ -1,5 +1,9 @@
 /* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */
 
+#include "compiler.h"
+#include "libmctp.h"
+#include "libmctp-serial.h"
+
 #include <assert.h>
 #include <err.h>
 #include <stdio.h>
@@ -8,9 +12,6 @@
 #include <sys/poll.h>
 #include <sys/socket.h>
 
-#include "libmctp.h"
-#include "libmctp-serial.h"
-
 static void rx_message(uint8_t eid, void *data, void *msg, size_t len)
 {
 	ssize_t rc;