diff --git a/src/xstat/xstat_cm.c b/src/xstat/xstat_cm.c
index 761131a081..c7227d2249 100644
--- a/src/xstat/xstat_cm.c
+++ b/src/xstat/xstat_cm.c
@@ -16,13 +16,13 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+
 #include <roken.h>
 
 #include "xstat_cm.h"		/*Interface for this module */
 #include <lwp.h>		/*Lightweight process package */
 
 #include <afs/afsutil.h>
-#include <string.h>
 
 #define LWP_STACK_SIZE	(16 * 1024)
 
diff --git a/src/xstat/xstat_cm_test.c b/src/xstat/xstat_cm_test.c
index 75b6b31fff..256382a6ba 100644
--- a/src/xstat/xstat_cm_test.c
+++ b/src/xstat/xstat_cm_test.c
@@ -20,8 +20,6 @@
 
 #include "xstat_cm.h"		/*Interface for xstat_cm module */
 #include <afs/cmd.h>		/*Command line interpreter */
-#include <time.h>
-#include <string.h>
 #include <afs/afsutil.h>
 
 /*
diff --git a/src/xstat/xstat_fs.c b/src/xstat/xstat_fs.c
index f969e6c248..16ac29a44c 100644
--- a/src/xstat/xstat_fs.c
+++ b/src/xstat/xstat_fs.c
@@ -16,6 +16,7 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+
 #include <roken.h>
 
 #include "xstat_fs.h"		/*Interface for this module */
@@ -23,7 +24,6 @@
 
 #include <afs/afsutil.h>
 #include <afs/afscbint.h>
-#include <string.h>
 
 #define LWP_STACK_SIZE	(16 * 1024)
 
diff --git a/src/xstat/xstat_fs_callback.c b/src/xstat/xstat_fs_callback.c
index ed6646c3ec..35b6a7ca43 100644
--- a/src/xstat/xstat_fs_callback.c
+++ b/src/xstat/xstat_fs_callback.c
@@ -24,6 +24,7 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+
 #include <roken.h>
 
 #ifdef AFS_NT40_ENV
@@ -31,11 +32,6 @@
 #include <rpc.h>
 #endif
 
-
-#include <errno.h>
-#include <stdio.h>		/*Standard I/O stuff */
-#include <string.h>
-
 #include <afs/afscbint.h>	/*Callback interface defs */
 #include <afs/afsutil.h>
 
diff --git a/src/xstat/xstat_fs_test.c b/src/xstat/xstat_fs_test.c
index 79a3523d6e..672944a40d 100644
--- a/src/xstat/xstat_fs_test.c
+++ b/src/xstat/xstat_fs_test.c
@@ -15,13 +15,11 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-#include <roken.h>
 
+#include <roken.h>
 
 #include "xstat_fs.h"		/*Interface for xstat_fs module */
 #include <afs/cmd.h>		/*Command line interpreter */
-#include <time.h>
-#include <string.h>
 #include <afs/afsutil.h>
 
 /*