--- Xaw3d/Imakefile	Fri Oct 11 09:43:07 2002
+++ Xaw3d/Imakefile.orig	Fri Oct 11 09:42:54 2002
@@ -32,7 +32,7 @@
 #endif
 
 #ifdef SharedXawReqs
-REQUIREDLIBS = SharedXawReqs
+REQUIREDLIBS = -L/usr/X11R6/lib SharedXawReqs
 #endif
 
 DEFINES = XawI18nDefines
@@ -41,7 +41,7 @@
 
 #  EXTRA_DEFINES = -DARROW_SCROLLBAR -DUSEGRAY
 
-#  EXTRA_INCLUDES = -I.
+EXTRA_INCLUDES = -I.
 
 HEADERS = \
 	AllWidgets.h \
--- Xaw3d/XawI18n.h.orig	Mon Apr 12 06:46:44 2004
+++ Xaw3d/XawI18n.h	Mon Apr 12 06:48:11 2004
@@ -29,6 +29,8 @@
 
 #ifdef HAS_WCTYPE_H
 #include <wctype.h>
+#endif
+#ifndef NO_WIDEC_H
 #include <widec.h>
 #define wcslen(c) wslen(c)
 #define wcscpy(d,s) wscpy(d,s)