4 files changed, 19 insertions, 11 deletions
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index cc863f3d21f..94af056ea62 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -44,6 +44,7 @@ RANLIB=@RANLIB@
 AR = @AR@
 ARFLAGS = @ARFLAGS@
 MKDIR_P = @MKDIR_P@
+EXEEXT = @EXEEXT@
 
 LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o
 MOTIF_OBJS = lwlib-Xm.o
@@ -128,15 +129,17 @@ distclean: clean
 bootstrap-clean maintainer-clean: distclean
 	rm -f TAGS
 
+ETAGS = ../lib-src/etags${EXEEXT}
 
-ETAGS = ../lib-src/etags
+${ETAGS}: FORCE
+	${MAKE} -C ../lib-src $(notdir $@)
 
-ctagsfiles= $(srcdir)/*.[ch]
+ctagsfiles= $(wildcard ${srcdir}/*.[ch])
 
-TAGS: $(ctagsfiles)
-	"$(ETAGS)" $(ctagsfiles)
+FORCE:
+.PHONY: tags FORCE
 tags: TAGS
-.PHONY: tags
-
+TAGS: ${ETAGS} $(ctagsfiles)
+	${ETAGS} $(ctagsfiles)
 
 ### Makefile.in ends here
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index 9bd84ef167a..f153407c4c4 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -21,6 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <setjmp.h>
 
 #include <lisp.h>
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index c92edd2f9e3..45faff8673a 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -22,6 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <unistd.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <setjmp.h>
 
 #include <X11/StringDefs.h>
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index c68cf77c928..e66147f1fe3 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -26,6 +26,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <sys/types.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "lwlib-int.h"
 #include "lwlib-utils.h"
 #include <X11/StringDefs.h>
@@ -1042,11 +1043,13 @@ widget_value*
 lw_get_all_values (LWLIB_ID id)
 {
   widget_info* info = get_widget_info (id, False);
-  widget_value* val = info->val;
-  if (lw_get_some_values (id, val))
-    return val;
-  else
-    return NULL;
+  if (info)
+    {
+      widget_value* val = info->val;
+      if (lw_get_some_values (id, val))
+	return val;
+    }
+  return NULL;
 }
 
 /* internal function used by the library dependent implementation to get the