From 580e0a2b7ab7273f868e7f4f9cbe96662b67a700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Mon, 22 Oct 2001 02:02:00 +0000
Subject: [PATCH] #include <sys/proc.h> where needed (for the stop event
 definitions) and reorder includes everywhere to conform to style(9).

---
 usr.bin/truss/alpha-fbsd.c    | 13 ++++++++-----
 usr.bin/truss/amd64-fbsd32.c  | 13 ++++++++-----
 usr.bin/truss/amd64-linux32.c | 11 +++++++----
 usr.bin/truss/i386-fbsd.c     | 13 ++++++++-----
 usr.bin/truss/i386-linux.c    | 11 +++++++----
 usr.bin/truss/main.c          |  7 +++++--
 usr.bin/truss/setup.c         | 10 ++++++----
 7 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/usr.bin/truss/alpha-fbsd.c b/usr.bin/truss/alpha-fbsd.c
index 6b58e22dd578..d6ff912b1ef7 100644
--- a/usr.bin/truss/alpha-fbsd.c
+++ b/usr.bin/truss/alpha-fbsd.c
@@ -44,6 +44,14 @@ static const char rcsid[] =
  * This file is almost nothing more than a slightly-edited i386-fbsd.c.
  */
 
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/pioctl.h>
+#include <sys/syscall.h>
+
+#include <machine/reg.h>
+#include <machine/psl.h>
+
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -52,11 +60,6 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/pioctl.h>
-#include <machine/reg.h>
-#include <machine/psl.h>
-#include <sys/syscall.h>
 
 #include "syscall.h"
 
diff --git a/usr.bin/truss/amd64-fbsd32.c b/usr.bin/truss/amd64-fbsd32.c
index 065c90b84f9d..57641c33abc3 100644
--- a/usr.bin/truss/amd64-fbsd32.c
+++ b/usr.bin/truss/amd64-fbsd32.c
@@ -42,6 +42,14 @@ static const char rcsid[] =
  * names used for the various structures are confusing, I sadly admit.
  */
 
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/pioctl.h>
+#include <sys/syscall.h>
+
+#include <machine/reg.h>
+#include <machine/psl.h>
+
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -49,11 +57,6 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/pioctl.h>
-#include <machine/reg.h>
-#include <machine/psl.h>
-#include <sys/syscall.h>
 
 #include "syscall.h"
 
diff --git a/usr.bin/truss/amd64-linux32.c b/usr.bin/truss/amd64-linux32.c
index d95c644000c7..158bc95cc8cc 100644
--- a/usr.bin/truss/amd64-linux32.c
+++ b/usr.bin/truss/amd64-linux32.c
@@ -40,6 +40,13 @@ static const char rcsid[] =
  * it in support routines that can be used by any personality support.
  */
 
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/pioctl.h>
+
+#include <machine/reg.h>
+#include <machine/psl.h>
+
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -47,10 +54,6 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/pioctl.h>
-#include <machine/reg.h>
-#include <machine/psl.h>
 
 #include "syscall.h"
 
diff --git a/usr.bin/truss/i386-fbsd.c b/usr.bin/truss/i386-fbsd.c
index 065c90b84f9d..57641c33abc3 100644
--- a/usr.bin/truss/i386-fbsd.c
+++ b/usr.bin/truss/i386-fbsd.c
@@ -42,6 +42,14 @@ static const char rcsid[] =
  * names used for the various structures are confusing, I sadly admit.
  */
 
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/pioctl.h>
+#include <sys/syscall.h>
+
+#include <machine/reg.h>
+#include <machine/psl.h>
+
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -49,11 +57,6 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/pioctl.h>
-#include <machine/reg.h>
-#include <machine/psl.h>
-#include <sys/syscall.h>
 
 #include "syscall.h"
 
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index d95c644000c7..158bc95cc8cc 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -40,6 +40,13 @@ static const char rcsid[] =
  * it in support routines that can be used by any personality support.
  */
 
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/pioctl.h>
+
+#include <machine/reg.h>
+#include <machine/psl.h>
+
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -47,10 +54,6 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/pioctl.h>
-#include <machine/reg.h>
-#include <machine/psl.h>
 
 #include "syscall.h"
 
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index 7ea0dd0f3be0..bf475b26a699 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -40,6 +40,11 @@ static const char rcsid[] =
  * do a lot of the work :).
  */
 
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#include <sys/pioctl.h>
+#include <sys/proc.h>
+
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -48,8 +53,6 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/pioctl.h>
 
 extern int setup_and_wait(char **);
 extern int start_tracing(int, int);
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index 5af1fabbf01d..3f00df08d129 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -39,6 +39,12 @@ static const char rcsid[] =
  * I'm afraid.
  */
 
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#include <sys/pioctl.h>
+#include <sys/proc.h>
+#include <sys/wait.h>
+
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -47,10 +53,6 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/pioctl.h>
-#include <sys/types.h>
-#include <sys/wait.h>
 
 static int evflags = 0;