diff -uNr emacs-20.7.orig/configure emacs-20.7/configure
--- emacs-20.7.orig/configure	Mon Jun 12 16:05:56 2000
+++ emacs-20.7/configure	Tue Jun 13 14:10:43 2000
@@ -3699,7 +3699,7 @@
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
-#include <X11/Xaw/Simple.h>
+#include <X11/Xaw3d/Simple.h>
 int main() {
 
 ; return 0; }
diff -uNr emacs-20.7.orig/configure.in emacs-20.7/configure.in
--- emacs-20.7.orig/configure.in	Mon Jun  5 11:42:49 2000
+++ emacs-20.7/configure.in	Tue Jun 13 14:10:43 2000
@@ -1551,7 +1551,7 @@
     AC_CACHE_VAL(emacs_cv_x11_version_5_with_xaw,
     AC_TRY_LINK([
 #include <X11/Intrinsic.h>
-#include <X11/Xaw/Simple.h>],
+#include <X11/Xaw3d/Simple.h>],
       [],
       emacs_cv_x11_version_5_with_xaw=yes,
       emacs_cv_x11_version_5_with_xaw=no))
diff -uNr emacs-20.7.orig/src/Makefile.in emacs-20.7/src/Makefile.in
--- emacs-20.7.orig/src/Makefile.in	Mon Apr 26 01:19:42 1999
+++ emacs-20.7/src/Makefile.in	Tue Jun 13 14:10:43 2000
@@ -329,7 +329,7 @@
 #ifdef USE_X_TOOLKIT
 #define @X_TOOLKIT_TYPE@
 #if defined (LUCID) || defined (ATHENA)
-LIBW= -lXaw
+LIBW= -lXaw3d
 #endif
 #ifdef MOTIF
 #if defined (HAVE_MOTIF_2_1) && defined (HAVE_LIBXP)