diff --git a/src/gtx/X11windows.c b/src/gtx/X11windows.c
index 419655d00d..951a60737a 100644
--- a/src/gtx/X11windows.c
+++ b/src/gtx/X11windows.c
@@ -18,13 +18,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxX11win.h"		/*Interface definition */
-#include <stdio.h>		/*Standard I/O package */
 
-#if	!defined(NeXT)
-extern int errno;		/*System error number */
-#endif /* NeXT */
 int X11_debug;			/*Is debugging turned on? */
 static char mn[] = "gator_X11windows";	/*Module name */
 
diff --git a/src/gtx/cb_test.c b/src/gtx/cb_test.c
index 53868b21f3..1d0a032042 100644
--- a/src/gtx/cb_test.c
+++ b/src/gtx/cb_test.c
@@ -14,10 +14,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxtextcb.h"		/*Module interface */
 
-
 #include "AFS_component_version_number.c"
 
 main(argc, argv)
diff --git a/src/gtx/curses_test.c b/src/gtx/curses_test.c
index 4b3f32d3d2..808b628d01 100644
--- a/src/gtx/curses_test.c
+++ b/src/gtx/curses_test.c
@@ -14,6 +14,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
 #if defined(AFS_HPUX110_ENV) && !defined(__HP_CURSES)
 # define __HP_CURSES
 #endif
diff --git a/src/gtx/curseswindows.c b/src/gtx/curseswindows.c
index 1d28040137..7ac8fb15a7 100644
--- a/src/gtx/curseswindows.c
+++ b/src/gtx/curseswindows.c
@@ -18,18 +18,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-
-#include <sys/types.h>
-#include <sys/file.h>
 #if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD80_ENV)
 #include <sgtty.h>
 #endif
-#include <stdio.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 
 #include <lwp.h>
 
@@ -37,8 +30,6 @@
 #include "gtxobjects.h"
 #include "gtxframe.h"
 
-
-
 int curses_debug;		/*Is debugging turned on? */
 static char mn[] = "gator_curseswindows";	/*Module name */
 
diff --git a/src/gtx/dumbwindows.c b/src/gtx/dumbwindows.c
index 3237de4ff7..56af6cf0bd 100644
--- a/src/gtx/dumbwindows.c
+++ b/src/gtx/dumbwindows.c
@@ -16,10 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxdumbwin.h"		/*Interface definition */
-#include <stdio.h>		/*Standard I/O package */
-#include <errno.h>
 
 int dumb_debug;			/*Is debugging turned on? */
 static char mn[] = "gator_dumbwindows";	/*Module name */
diff --git a/src/gtx/frame.c b/src/gtx/frame.c
index 620be0a3b9..b755b5be36 100644
--- a/src/gtx/frame.c
+++ b/src/gtx/frame.c
@@ -11,16 +11,10 @@
 #include <afs/param.h>
 #include <afs/stds.h>
 
-#ifdef AFS_HPUX_ENV
-#include <sys/types.h>
-#endif
+#include <roken.h>
+
 #include <lwp.h>
 
-#include <string.h>
-#include <stdlib.h>
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
 #include "gtxobjects.h"
 #include "gtxwindows.h"
 #include "gtxcurseswin.h"
diff --git a/src/gtx/gtxtest.c b/src/gtx/gtxtest.c
index 29fabf58b8..fef37033b9 100644
--- a/src/gtx/gtxtest.c
+++ b/src/gtx/gtxtest.c
@@ -10,11 +10,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <string.h>
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
 #include "gtxwindows.h"
 #include "gtxobjects.h"
 #include "gtxtextobj.h"
diff --git a/src/gtx/input.c b/src/gtx/input.c
index 4fa7d33f5b..932ce857fe 100644
--- a/src/gtx/input.c
+++ b/src/gtx/input.c
@@ -10,12 +10,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#include <stdlib.h>
+#include <roken.h>
 
-#ifdef AFS_HPUX_ENV
-#include <sys/types.h>
-#endif
 #include <lwp.h>
+
 #include "gtxobjects.h"
 #include "gtxwindows.h"
 #include "gtxcurseswin.h"
diff --git a/src/gtx/keymap.c b/src/gtx/keymap.c
index 0cc8beb17d..db4a99d714 100644
--- a/src/gtx/keymap.c
+++ b/src/gtx/keymap.c
@@ -10,9 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include <string.h>
-#include <stdlib.h>
+#include <roken.h>
 
 #include "gtxkeymap.h"
 
diff --git a/src/gtx/lightobject.c b/src/gtx/lightobject.c
index 71df8b2228..cc51f2b4ef 100644
--- a/src/gtx/lightobject.c
+++ b/src/gtx/lightobject.c
@@ -16,12 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxlightobj.h"	/*Interface for this module */
-#include <stdio.h>		/*Standard I/O stuff */
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 
 /*Externally-advertised array of light onode operations*/
 struct onodeops gator_light_ops = {
diff --git a/src/gtx/objdict.c b/src/gtx/objdict.c
index c2ded9c427..da39db76d7 100644
--- a/src/gtx/objdict.c
+++ b/src/gtx/objdict.c
@@ -16,9 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxobjdict.h"		/*Interface for this module */
-#include <stdio.h>		/*Standard I/O package */
 
 static char mn[] = "gator_objdict";	/*Module name */
 static int objdict_debug;	/*Is debugging turned on? */
diff --git a/src/gtx/object_test.c b/src/gtx/object_test.c
index e06c34464d..95beaa5d29 100644
--- a/src/gtx/object_test.c
+++ b/src/gtx/object_test.c
@@ -14,6 +14,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <afs/cmd.h>		/*Command interpretation library */
 
 #include "gtxscreenobj.h"	/*Gator screen object interface */
 #include "gtxtextobj.h"		/*Gator text object interface */
@@ -22,9 +25,6 @@
 #include "gtxcurseswin.h"	/*Gator curses window package */
 #include "gtxdumbwin.h"		/*Gator dumb terminal window package */
 #include "gtxX11win.h"		/*Gator X11 window package */
-#include <errno.h>
-#include <stdio.h>		/*Standard I/O stuff */
-#include <cmd.h>		/*Command interpretation library */
 
 
 /*
diff --git a/src/gtx/objects.c b/src/gtx/objects.c
index 1dfcf95293..4023a7062c 100644
--- a/src/gtx/objects.c
+++ b/src/gtx/objects.c
@@ -16,16 +16,12 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxobjects.h"		/*Interface for this module */
 #include "gtxtextobj.h"		/*Text object interface */
 #include "gtxlightobj.h"	/*Light object interface */
 #include "gtxobjdict.h"		/*Object dictionary module */
-#include <stdio.h>		/*Standard I/O stuff */
-#include <errno.h>
-
-#include <string.h>
-#include <stdlib.h>
 
 /*
  * Number of known gator object types.
diff --git a/src/gtx/screen_test.c b/src/gtx/screen_test.c
index ac9c858f02..f94e650a5a 100644
--- a/src/gtx/screen_test.c
+++ b/src/gtx/screen_test.c
@@ -14,13 +14,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <afs/cmd.h>		/*Command interpretation library */
 
 #include "gtxwindows.h"		/*Generalized window interface */
 #include "gtxcurseswin.h"	/*Curses window interface */
 #include "gtxdumbwin.h"		/*Dumb terminal window interface */
 #include "gtxX11win.h"		/*X11 window interface */
-#include <cmd.h>		/*Command interpretation library */
-#include <errno.h>
 
 
 /*
diff --git a/src/gtx/textcb.c b/src/gtx/textcb.c
index 0f15d7292f..857e153aa1 100644
--- a/src/gtx/textcb.c
+++ b/src/gtx/textcb.c
@@ -16,12 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxtextcb.h"		/*Module interface */
-#include <stdio.h>		/*Standard I/O stuff */
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 
 static int gator_textcb_debug;	/*Is debugging output turned on? */
 
diff --git a/src/gtx/textobject.c b/src/gtx/textobject.c
index ffe0042944..e7464fde44 100644
--- a/src/gtx/textobject.c
+++ b/src/gtx/textobject.c
@@ -14,16 +14,13 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include "gtxtextobj.h"		/*Interface for this module */
 #include "gtxwindows.h"		/*Gator window interface */
 #include "gtxcurseswin.h"	/*Gator curses window interface */
 #include "gtxdumbwin.h"		/*Gator dumb terminal window interface */
 #include "gtxX11win.h"		/*Gator X11 window interface */
-#include <stdio.h>		/*Standard I/O stuff */
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 
 /*Externally-advertised array of text onode operations*/
 struct onodeops gator_text_ops = {
diff --git a/src/gtx/windows.c b/src/gtx/windows.c
index 45c391eda2..b9fd4e9715 100644
--- a/src/gtx/windows.c
+++ b/src/gtx/windows.c
@@ -18,6 +18,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 /* On DUX "IN" is a variable in curses.h, so this can be a bit of a problem */
 #ifdef IN