--- a/src/Makefile.in.in	Mon Aug 13 10:10:03 2007 +0200
+++ b/src/Makefile.in.in	Mon Aug 13 10:10:54 2007 +0200
@@ -112,7 +112,7 @@
 $(lwlib_libs) :
 	cd ../lwlib && $(RECURSIVE_MAKE)
 
-## a seperate offix lib which merges with non-Xt event systems (TkStep, XEmacs)
+## a separate offix lib which merges with non-Xt event systems (TkStep, XEmacs)
 OFFIX_O = @OFFIX_O@
 
 x_objs=balloon_help.o balloon-x.o console-x.o device-x.o event-Xt.o frame-x.o\
@@ -231,7 +231,7 @@
 #    else
 motif_other_files = libextcli_Xm.a
 #    endif
-#endif
+#endif /* LWLIB_USES_MOTIF */
 
 #  ifdef EXTW_LINK
 shared_other_files = libextcli_Xt.so.1 libextcli_Xlib.so.1
@@ -439,11 +439,11 @@
 	$(PURECOV_PROG) $(LD) $(temacs_link_args)
 
 
-TopLevelEmacsShell.o : ${srcdir}/EmacsShell-sub.c
+TopLevelEmacsShell.o : ${srcdir}/EmacsShell-sub.c config.h xintrinsicp.h EmacsShellP.h
 	$(CC) -c $(cflags) -DDEFINE_TOP_LEVEL_EMACS_SHELL ${srcdir}/EmacsShell-sub.c
 	mv EmacsShell-sub.o TopLevelEmacsShell.o
 
-TransientEmacsShell.o : ${srcdir}/EmacsShell-sub.c TopLevelEmacsShell.o
+TransientEmacsShell.o : ${srcdir}/EmacsShell-sub.c TopLevelEmacsShell.o config.h xintrinsicp.h EmacsShellP.h
 	$(CC) -c $(cflags) -DDEFINE_TRANSIENT_EMACS_SHELL ${srcdir}/EmacsShell-sub.c
 	mv EmacsShell-sub.o TransientEmacsShell.o
 
@@ -647,6 +647,7 @@
 #endif /* GCC */
 
 ## Dependency processing using makedepend
+## This hasn't been used in over a year as of December 10, 1997.
 
 depend:
 	: > depend.tmp
@@ -731,7 +732,10 @@
 unexmips.o: config.h
 unexsunos4.o: config.h
 
-## Dependencies generated by 'make depend'
+## Dependencies (formerly) generated by 'make depend'
+
+## This has been hand-maintained since (at least) some time in 1996
+## Note:  We deliberately do not include a dependency on lisp.h
 
 #ifdef MULE
 EmacsFrame.o: mule-charset.h
@@ -880,10 +884,18 @@
 
 #ifdef HAVE_OFFIX_DND
 device-x.o: offix.h
-event-Xt.o: offix.h
+device-x.o: offix-types.h
+device-x.o: xintrinsic.h
+event-Xt.o: offix.h offix-types.h xintrinsic.h
+event-Xt.o: offix-types.h
+event-Xt.o: xintrinsic.h
 frame-x.o: offix.h
+frame-x.o: offix-types.h
+frame-x.o: xintrinsic.h
 offix.o: offix-cursors.h
 offix.o: offix.h
+offix.o: offix-types.h
+offix.o: xintrinsic.h
 #endif
 
 EmacsFrame.o: $(LWLIB_SRCDIR)/lwlib.h
@@ -1894,6 +1906,10 @@
 libsst.o: config.h
 libsst.o: dynarr.h
 libsst.o: libsst.h
+line-number.o: config.h
+line-number.o: buffer.h
+line-number.o: insdel.h
+line-number.o: line-number.h
 linuxplay.o: blocktype.h
 linuxplay.o: config.h
 linuxplay.o: dynarr.h
@@ -2456,7 +2472,6 @@
 vm-limit.o: dynarr.h
 vm-limit.o: mem-limits.h
 widget.o: config.h
-widget.o: lisp.h
 widget.o: buffer.h
 widget.o: insdel.h
 window.o: blocktype.h