diff --git a/src/comerr/com_err.c b/src/comerr/com_err.c
index 65af193bd8..27571a55fc 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 b90238a498..666ea6d03b 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 <roken.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 <errno.h>
-#include <string.h>
-#ifdef	AFS_AIX32_ENV
-#include <signal.h>
-#endif
 #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 fe4874877f..e09cce3b51 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 002217d825..fcd73f7059 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"