From 24173064d99d0c6ff37cab7b045d80c80d901144 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Fri, 25 Mar 2011 19:46:42 +0000
Subject: [PATCH] procmgmt: Tidy header includes

Remove headers which are provided by libroken, and reorder header
includes so that they're a bit a more legible.

Change-Id: I82fb06f8d531476cc89e53ec189be15cb7ebf5d7
Reviewed-on: http://gerrit.openafs.org/4402
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 src/procmgmt/afskill.c       |  9 +--------
 src/procmgmt/procmgmt_nt.c   | 12 +++---------
 src/procmgmt/procmgmt_unix.c |  6 +-----
 src/procmgmt/redirect_nt.c   |  8 +-------
 4 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/src/procmgmt/afskill.c b/src/procmgmt/afskill.c
index 951ff5843..c5b6fc796 100644
--- a/src/procmgmt/afskill.c
+++ b/src/procmgmt/afskill.c
@@ -14,18 +14,11 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-
 #include <afs/stds.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-
 #include "procmgmt.h"
 
+#include <roken.h>
 
 /* Define NULL-terminated array of signal name/number pairs */
 typedef struct {
diff --git a/src/procmgmt/procmgmt_nt.c b/src/procmgmt/procmgmt_nt.c
index c7d351b41..e4fa7ef97 100644
--- a/src/procmgmt/procmgmt_nt.c
+++ b/src/procmgmt/procmgmt_nt.c
@@ -9,25 +9,19 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include "procmgmt.h" /* Must be before roken */
 
-#include <afs/stds.h>
+#include <roken.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
 #include <windows.h>
 #include <pthread.h>
 #include <afs/errmap_nt.h>
 #include <afs/secutil_nt.h>
 
-#include "procmgmt.h"
 #include "pmgtprivate.h"
 
-
-
 /* Signal disposition table and associated definitions and locks */
 
 typedef struct {
diff --git a/src/procmgmt/procmgmt_unix.c b/src/procmgmt/procmgmt_unix.c
index 2d777713e..ab5763951 100644
--- a/src/procmgmt/procmgmt_unix.c
+++ b/src/procmgmt/procmgmt_unix.c
@@ -9,13 +9,9 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
-
 #include <afs/stds.h>
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <errno.h>
+#include <roken.h>
 
 #include "procmgmt.h"
 #include "pmgtprivate.h"
diff --git a/src/procmgmt/redirect_nt.c b/src/procmgmt/redirect_nt.c
index f8dacc44f..386faa24e 100644
--- a/src/procmgmt/redirect_nt.c
+++ b/src/procmgmt/redirect_nt.c
@@ -10,14 +10,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
 #include <windows.h>
 
 #include "pmgtprivate.h"
-- 
2.39.5