From 560b0b8c0b1e1777c3345af425d4a32354697c29 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 24 Mar 2011 22:32:39 +0000
Subject: [PATCH] libacl: 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: I67bb92abc985d1510d8b8a108f9b9e3a62525fd5
Reviewed-on: http://gerrit.openafs.org/4332
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 src/libacl/aclprocs.c     |  8 +-------
 src/libacl/netprocs.c     |  7 +------
 src/libacl/test/acltest.c | 10 ++--------
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/libacl/aclprocs.c b/src/libacl/aclprocs.c
index ebfdfc3b4..e11cc0ac0 100644
--- a/src/libacl/aclprocs.c
+++ b/src/libacl/aclprocs.c
@@ -18,17 +18,11 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <afs/ptclient.h>
 #include <afs/ptuser.h>
+
 #include "acl.h"
 
 #ifdef AFS_PTHREAD_ENV
diff --git a/src/libacl/netprocs.c b/src/libacl/netprocs.c
index 518305382..f41ad5573 100644
--- a/src/libacl/netprocs.c
+++ b/src/libacl/netprocs.c
@@ -18,15 +18,10 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <afs/ptclient.h>
+
 #include "acl.h"
 
 int
diff --git a/src/libacl/test/acltest.c b/src/libacl/test/acltest.c
index e7725623b..ffd4f6d01 100644
--- a/src/libacl/test/acltest.c
+++ b/src/libacl/test/acltest.c
@@ -15,21 +15,15 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <stdio.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <ptclient.h>
+
 #include "acl.h"
 #include "prs_fs.h"
 
-
 struct acl_accessList *aclstore[20];
 char *externalstore[20];
 
-- 
2.39.5