diff --git a/tools/regression/mqueue/mqtest1/mqtest1.c b/tools/regression/mqueue/mqtest1/mqtest1.c
index 8551b9f9858..25fc1ba881e 100644
--- a/tools/regression/mqueue/mqtest1/mqtest1.c
+++ b/tools/regression/mqueue/mqtest1/mqtest1.c
@@ -1,10 +1,11 @@
 /* $FreeBSD$ */
 
-#include <stdio.h>
-#include <mqueue.h>
-#include <fcntl.h>
-#include <signal.h>
+#include <err.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <mqueue.h>
+#include <signal.h>
+#include <stdio.h>
 
 #define MQNAME	"/mytstqueue1"
 
diff --git a/tools/regression/mqueue/mqtest2/mqtest2.c b/tools/regression/mqueue/mqtest2/mqtest2.c
index f37af20c3ec..bfe6d97fc7d 100644
--- a/tools/regression/mqueue/mqtest2/mqtest2.c
+++ b/tools/regression/mqueue/mqtest2/mqtest2.c
@@ -1,8 +1,13 @@
 /* $FreeBSD$ */
-#include <stdio.h>
-#include <mqueue.h>
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <err.h>
 #include <fcntl.h>
+#include <mqueue.h>
 #include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #define MQNAME	"/mytstqueue2"
diff --git a/tools/regression/mqueue/mqtest3/mqtest3.c b/tools/regression/mqueue/mqtest3/mqtest3.c
index e2d8a9ef35a..aa47ffac309 100644
--- a/tools/regression/mqueue/mqtest3/mqtest3.c
+++ b/tools/regression/mqueue/mqtest3/mqtest3.c
@@ -1,10 +1,15 @@
 /* $FreeBSD$ */
-#include <stdio.h>
-#include <mqueue.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
+
+#include <sys/types.h>
 #include <sys/select.h>
+#include <sys/wait.h>
+#include <err.h>
+#include <fcntl.h>
+#include <mqueue.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #define MQNAME	"/mytstqueue3"
 #define LOOPS	1000
diff --git a/tools/regression/mqueue/mqtest4/mqtest4.c b/tools/regression/mqueue/mqtest4/mqtest4.c
index a49c210a229..80a7f88d9ed 100644
--- a/tools/regression/mqueue/mqtest4/mqtest4.c
+++ b/tools/regression/mqueue/mqtest4/mqtest4.c
@@ -1,11 +1,16 @@
 /* $FreeBSD$ */
-#include <stdio.h>
-#include <mqueue.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
-#include <sys/select.h>
+
+#include <sys/types.h>
 #include <sys/event.h>
+#include <sys/select.h>
+#include <sys/wait.h>
+#include <err.h>
+#include <fcntl.h>
+#include <mqueue.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #define MQNAME	"/mytstqueue4"
 #define LOOPS	1000
diff --git a/tools/regression/mqueue/mqtest5/mqtest5.c b/tools/regression/mqueue/mqtest5/mqtest5.c
index adf54dcc65a..354a7bb30ce 100644
--- a/tools/regression/mqueue/mqtest5/mqtest5.c
+++ b/tools/regression/mqueue/mqtest5/mqtest5.c
@@ -1,12 +1,16 @@
 /* $FreeBSD$ */
-#include <stdio.h>
-#include <mqueue.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
-#include <sys/select.h>
+
+#include <sys/types.h>
 #include <sys/event.h>
+#include <sys/select.h>
+#include <sys/wait.h>
+#include <err.h>
+#include <fcntl.h>
+#include <mqueue.h>
 #include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #define MQNAME	"/mytstqueue5"
 #define LOOPS	1000