diff --git a/cde/configure.ac b/cde/configure.ac
index 17d8eddcc..f16acd90f 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -378,7 +378,10 @@ AC_PATH_PROG(KSH, ksh)
 if test -z "$ac_cv_path_KSH"; then
    AC_PATH_PROG(KSH, ksh93)
    if test -z "$ac_cv_path_KSH"; then
-      MISSING_PROGS="[ksh or ksh93] ${MISSING_PROGS}"
+      AC_PATH_PROG(KSH, mksh)
+      if test -z "$ac_cv_path_KSH"; then
+        MISSING_PROGS="[ksh or ksh93] ${MISSING_PROGS}"
+      fi
    fi
 fi
 
diff --git a/cde/programs/dtksh/dtkcmds.c b/cde/programs/dtksh/dtkcmds.c
index 48d547fa7..dd7b55c85 100644
--- a/cde/programs/dtksh/dtkcmds.c
+++ b/cde/programs/dtksh/dtkcmds.c
@@ -33,6 +33,8 @@
 
 #include "name.h"
 #include "shell.h"
+#undef access
+#include <X11/Xauth.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <X11/X.h>
diff --git a/cde/programs/dtksh/dtkcvt.c b/cde/programs/dtksh/dtkcvt.c
index 81064051e..9479ab3f4 100644
--- a/cde/programs/dtksh/dtkcvt.c
+++ b/cde/programs/dtksh/dtkcvt.c
@@ -33,6 +33,8 @@
 /* X includes */
 
 #include "shell.h"
+#undef access
+#include <X11/Xauth.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <X11/X.h>
diff --git a/cde/programs/dtksh/widget.c b/cde/programs/dtksh/widget.c
index 364c96e97..12d025b52 100644
--- a/cde/programs/dtksh/widget.c
+++ b/cde/programs/dtksh/widget.c
@@ -32,6 +32,8 @@
 
 #include "name.h"
 #include "shell.h"
+#undef access
+#include <X11/Xauth.h>
 #include <string.h>
 #include <dlfcn.h>
 #include <X11/Intrinsic.h>
diff --git a/cde/programs/dtksh/xmcmds.c b/cde/programs/dtksh/xmcmds.c
index f3d0e7712..20be6f70f 100644
--- a/cde/programs/dtksh/xmcmds.c
+++ b/cde/programs/dtksh/xmcmds.c
@@ -30,6 +30,8 @@
 /*	actual or intended publication of such source code.     */
 
 #include "shell.h"
+#undef access
+#include <X11/Xauth.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/cde/programs/dtksh/xmcvt.c b/cde/programs/dtksh/xmcvt.c
index f178b6a0b..01a7b1cce 100644
--- a/cde/programs/dtksh/xmcvt.c
+++ b/cde/programs/dtksh/xmcvt.c
@@ -32,6 +32,8 @@
 
 
 #include "shell.h"
+#undef access
+#include <X11/Xauth.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <X11/X.h>
diff --git a/cde/programs/dtksh/xmwidgets.c b/cde/programs/dtksh/xmwidgets.c
index de08d8fb3..a02cc3053 100644
--- a/cde/programs/dtksh/xmwidgets.c
+++ b/cde/programs/dtksh/xmwidgets.c
@@ -32,6 +32,8 @@
 
 #include	"name.h" 
 #include	"shell.h" 
+#undef access
+#include <X11/Xauth.h>
 #include <X11/Intrinsic.h>
 #include <X11/Shell.h>
 #include <X11/StringDefs.h>