diff --git a/src/uss/uss.c b/src/uss/uss.c
index b1bfee0fa1..b1463a861f 100644
--- a/src/uss/uss.c
+++ b/src/uss/uss.c
@@ -14,16 +14,17 @@
 /*
  * --------------------- Required definitions ---------------------
  */
-#include <stdlib.h>
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
-
-#include <string.h>
+#include <afs/cmd.h>		/*Command line parsing */
+#include <afs/cellconfig.h>	/*Cell config defs */
+#include <afs/kautils.h>	/*MAXKTCREALMLEN & MAXKTCNAMELEN */
+#include <afs/pterror.h>
+#include <afs/vlserver.h>
+#include <ubik.h>
 
 #include "uss_common.h"		/*Common uss definitions, globals */
 #include "uss_procs.h"		/*Main uss operations */
@@ -32,12 +33,6 @@
 #include "uss_ptserver.h"
 #include "uss_vol.h"
 #include "uss_acl.h"
-#include <afs/cmd.h>		/*Command line parsing */
-#include <afs/cellconfig.h>	/*Cell config defs */
-#include <afs/kautils.h>	/*MAXKTCREALMLEN & MAXKTCNAMELEN */
-#include <afs/pterror.h>
-#include <afs/vlserver.h>
-#include <ubik.h>
 
 extern int yylex(void);
 extern int yyparse (void);
diff --git a/src/uss/uss_acl.c b/src/uss/uss_acl.c
index 9ed9aebe4d..f14561fe01 100644
--- a/src/uss/uss_acl.c
+++ b/src/uss/uss_acl.c
@@ -18,17 +18,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include "uss_acl.h"
-#include "uss_common.h"
-#include "uss_fs.h"
-#include <rx/xdr.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <netdb.h>
-#include <errno.h>
-
-#include <string.h>
+#include <roken.h>
 
 #undef VIRTUE
 #undef VICE
@@ -36,6 +26,11 @@
 #include <afs/prs_fs.h>
 #include <afs/com_err.h>
 #include <afs/afs_consts.h>
+#include <rx/xdr.h>
+
+#include "uss_acl.h"
+#include "uss_common.h"
+#include "uss_fs.h"
 
 #define MAXNAME 100
 
diff --git a/src/uss/uss_common.c b/src/uss/uss_common.c
index afaab191d4..d547b47b70 100644
--- a/src/uss/uss_common.c
+++ b/src/uss/uss_common.c
@@ -18,12 +18,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include "uss_common.h"		/*Interface definitions */
 #include <afs/kautils.h>	/*MAXKTCREALMLEN & MAXKTCNAMELEN */
 
-#include <string.h>
-
+#include "uss_common.h"		/*Interface definitions */
 
 /*
  * ---------------------- Exported variables ----------------------
diff --git a/src/uss/uss_fs.c b/src/uss/uss_fs.c
index 2030a928c8..77cdb2bf14 100644
--- a/src/uss/uss_fs.c
+++ b/src/uss/uss_fs.c
@@ -18,24 +18,18 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include "uss_fs.h"		/*Interface to this module */
-#include <sys/types.h>
-#include <errno.h>
-#include <sys/socket.h>
 #ifdef	AFS_SUN5_ENV
 #include <sys/ioccom.h>
 #endif
-#include <netinet/in.h>
-
-#include <string.h>
-#include <unistd.h>
 
 #include <afs/venus.h>
 #include <rx/rx.h>
 #include <afs/sys_prototypes.h>
-#include "uss_common.h"
 
+#include "uss_common.h"
+#include "uss_fs.h"		/*Interface to this module */
 
 /*
  * ---------------------- Private definitions ---------------------
diff --git a/src/uss/uss_kauth.c b/src/uss/uss_kauth.c
index c077c9eda1..da956bd947 100644
--- a/src/uss/uss_kauth.c
+++ b/src/uss/uss_kauth.c
@@ -18,18 +18,16 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include "uss_kauth.h"		/*Module interface */
-#include "uss_common.h"		/*Common defs & operations */
-#include <errno.h>
-#include <pwd.h>
-
-#include <string.h>
+#include <roken.h>
 
 #include <afs/com_err.h>
 #include <afs/kautils.h> /*MAXKTCREALMLEN*/
 #include <afs/kaport.h>		/* pack_long */
 #include <afs/kauth.h>
+
+#include "uss_kauth.h"		/*Module interface */
+#include "uss_common.h"		/*Common defs & operations */
+
 #define uss_kauth_MAX_SIZE	2048
 #undef USS_KAUTH_DB
 /*
diff --git a/src/uss/uss_procs.c b/src/uss/uss_procs.c
index 225fee9466..a5be915c03 100644
--- a/src/uss/uss_procs.c
+++ b/src/uss/uss_procs.c
@@ -18,23 +18,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <afs/kautils.h> /*MAXKTCREALMLEN*/
 
 #include "uss_procs.h"		/*Module interface */
 #include "uss_common.h"		/*Common defs & operations */
 #include "uss_acl.h"		/*ACL-related operations */
-#include <errno.h>		/*Unix error codes */
-#include <pwd.h>		/*Password info */
-#include <sys/stat.h>		/*Stat defs */
-#include <dirent.h>		/*Directory package */
-#include <sys/file.h>		/*O_EXCL, O_CREAT, etc */
-#ifdef	AFS_SUN5_ENV
-#include <fcntl.h>
-#endif
 
-#include <string.h>
-#include <stdarg.h>
-
-#include <afs/kautils.h> /*MAXKTCREALMLEN*/
 #undef USS_PROCS_DB
 #undef USS_PROCS_DB_INSTANCE
 #undef USS_PROCS_DB_BUILDDIR
diff --git a/src/uss/uss_ptserver.c b/src/uss/uss_ptserver.c
index 31b0d3dc51..68a4932242 100644
--- a/src/uss/uss_ptserver.c
+++ b/src/uss/uss_ptserver.c
@@ -18,13 +18,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include "uss_ptserver.h"	/*Module interface */
 #include <afs/ptclient.h>	/*Protection Server client interface */
 #include <afs/pterror.h>	/*Protection Server error codes */
 #include <afs/ptuser.h>
 #include <afs/com_err.h>	/*Error code xlation */
 
+#include "uss_ptserver.h"	/*Module interface */
 
 #undef USS_PTSERVER_DB
 
diff --git a/src/uss/uss_vol.c b/src/uss/uss_vol.c
index 3090c7c310..3a5f3f73ce 100644
--- a/src/uss/uss_vol.c
+++ b/src/uss/uss_vol.c
@@ -18,18 +18,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include "uss_vol.h"		/*Interface to this module */
-#include "uss_common.h"		/*Common definitions */
-#include "uss_procs.h"		/*Defs from procs module */
-#include "uss_fs.h"		/*CacheManager ops */
-#include "uss_acl.h"
-#include <sys/stat.h>
-#include <pwd.h>
-#include <netdb.h>
-#include <errno.h>
-
-#include <string.h>
+#include <roken.h>
 
 #include <afs/com_err.h>
 #include <afs/vlserver.h>
@@ -44,6 +33,12 @@
 #include <afs/afsutil.h>
 #include <ubik.h>
 
+#include "uss_vol.h"		/*Interface to this module */
+#include "uss_common.h"		/*Common definitions */
+#include "uss_procs.h"		/*Defs from procs module */
+#include "uss_fs.h"		/*CacheManager ops */
+#include "uss_acl.h"
+
 extern int line;
 
 /*