From d1c83df1cce4084fad72a4fedfa5ad77d28ec05a Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 24 Mar 2011 20:50:21 +0000
Subject: [PATCH] com_err: Tidy header includes

Since we adopted libroken, we get a lot of header includes automatically
from roken.h. Use these, instead of including lots of things multiple
times.

Change-Id: I167b0fa7f48d7dd71efb43a4f137655b38137314
Reviewed-on: http://gerrit.openafs.org/4325
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 src/comerr/com_err.c    |  3 +--
 src/comerr/compile_et.c | 16 ++--------------
 src/comerr/error_msg.c  | 10 +++++-----
 src/comerr/et_name.c    |  4 +++-
 4 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/comerr/com_err.c b/src/comerr/com_err.c
index 65af193bd..27571a55f 100644
--- a/src/comerr/com_err.c
+++ b/src/comerr/com_err.c
@@ -7,10 +7,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "internal.h"
-#include <stdio.h>
-#include <stdarg.h>
 #include "error_table.h"
 #include "com_err.h"
 
diff --git a/src/comerr/compile_et.c b/src/comerr/compile_et.c
index b90238a49..666ea6d03 100644
--- a/src/comerr/compile_et.c
+++ b/src/comerr/compile_et.c
@@ -10,22 +10,10 @@
 #undef MEMORYLEAK
 #include <afsconfig.h>
 #include <afs/param.h>
-#include <afs/afsutil.h>
-
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifndef AFS_NT40_ENV
-#include <sys/file.h>
-#include <sys/param.h>
-#endif
+#include <roken.h>
 
-#include <errno.h>
-#include <string.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
+#include <afs/afsutil.h>
 #include "mit-sipb-cr.h"
 #include "internal.h"
 #include "compiler.h"
diff --git a/src/comerr/error_msg.c b/src/comerr/error_msg.c
index fe4874877..e09cce3b5 100644
--- a/src/comerr/error_msg.c
+++ b/src/comerr/error_msg.c
@@ -12,19 +12,19 @@
 
 #include <roken.h>
 
-#include "internal.h"
-#include <stdio.h>
-#include "error_table.h"
-#include "mit-sipb-cr.h"
 #ifdef HAVE_LIBINTL
 #include <libintl.h>
 #endif
 #ifdef AFS_DARWIN_ENV
 #include <CoreFoundation/CoreFoundation.h>
 #endif
+
 #include <afs/errors.h>
 #include <afs/afsutil.h>
-#include <string.h>
+
+#include "internal.h"
+#include "error_table.h"
+#include "mit-sipb-cr.h"
 #include "com_err.h"
 
 static const char copyright[] =
diff --git a/src/comerr/et_name.c b/src/comerr/et_name.c
index 002217d82..fcd73f705 100644
--- a/src/comerr/et_name.c
+++ b/src/comerr/et_name.c
@@ -6,8 +6,10 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-#include <afs/afsutil.h>
 
+#include <roken.h>
+
+#include <afs/afsutil.h>
 
 #include "error_table.h"
 #include "mit-sipb-cr.h"
-- 
2.39.5