diff --git a/samples/kernel/metairq_dispatch/src/main.c b/samples/kernel/metairq_dispatch/src/main.c
index 27e13975ae4..aa509d6f1d1 100644
--- a/samples/kernel/metairq_dispatch/src/main.c
+++ b/samples/kernel/metairq_dispatch/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr.h>
-#include "main.h"
+#include "msgdev.h"
 
 #include <logging/log.h>
 LOG_MODULE_REGISTER(main, LOG_LEVEL_INF);
diff --git a/samples/kernel/metairq_dispatch/src/msgdev.c b/samples/kernel/metairq_dispatch/src/msgdev.c
index 516f47069de..67a27964e5e 100644
--- a/samples/kernel/metairq_dispatch/src/msgdev.c
+++ b/samples/kernel/metairq_dispatch/src/msgdev.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <timeout_q.h>
-#include "main.h"
+#include "msgdev.h"
 
 /* This file implements a fake device that creates and enqueues
  * "struct msg" messages for handling by the rest of the test.  It's
diff --git a/samples/kernel/metairq_dispatch/src/main.h b/samples/kernel/metairq_dispatch/src/msgdev.h
similarity index 96%
rename from samples/kernel/metairq_dispatch/src/main.h
rename to samples/kernel/metairq_dispatch/src/msgdev.h
index 45425805f31..c21348622bf 100644
--- a/samples/kernel/metairq_dispatch/src/main.h
+++ b/samples/kernel/metairq_dispatch/src/msgdev.h
@@ -3,7 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef SAMPLE_METAIRQ_MAIN_H
+#ifndef __MSGDEV_H__
+#define __MSGDEV_H__
 
 /* Define this to enable logging of every event as it is processed to
  * carefully inspect behavior.  Note that at high event rates (see
@@ -67,4 +68,4 @@ void message_dev_init(void);
  */
 void message_dev_fetch(struct msg *m);
 
-#endif
+#endif /* __MSGDEV_H__ */