Update dependencies in Makefile.in.

(alloc.o): Depend on termhooks.h.
(atimer.o): Depend on blockinput.h.
(buffer.o): Depend on indent.h, keyboard.h, coding.h, keymap.h, and frame.h.
(callint.o): Depend on systime.h, coding.h, and composite.h.
(callproc.o): Depend on buffer.h.
(casefiddle.o): Don't depend on charset.h.
(casetab.o): Depend on character.h.
(ccl.o): Depend on composite.h.
(chartab.o): Depend on ccl.h.
(cm.o): Depend on dispextern.h.
(cmds.o): Depend on systime.h, coding.h, frame.h, and composite.h.
(coding.o): Don't depend on $(INTERVALS_H).
(composite.o): Don't depend on dispextern.h explicitly (it's in
$(INTERVALS_H)).  Depend on ccl.h.
(data.o): Depend on systime.h, coding.h, composite.h, dispextern.h, font.h,
and ccl.h.
(dired.o): Depend on composite.h.
(dispnew.o): Depend on coding.h.  Don't depend explicitly on
composite.h (it's in $(INTERVALS_H)).
(doc.o): Depend on systime.h, coding.h, and composite.h.
(editfns.o): Don't depend explicitly on dispextern.h.
(emacs.o): Depend on frame.h and coding.h.
(eval.o): Depend on coding.h, composite.h, and xterm.h.
(fileio.o): Depend on frame.h and commands.h.  Don't depend
explicitly on dispextern.h.
(filelock.o): Don't depend on epaths.h and charset.h.  Depend on composite.h.
(fns.o): Don't depend on termhooks.h.
(font.o): Depend on buffer.h, composite.h, fontset.h, and xterm.h.
(fontset.o): Depend on blockinput.h, atimer.h, systime.h, coding.h,
$(INTERVALS_H), window.h, xterm.h.
(frame.o): Depend on coding.h, composite.h, termhooks.h, and ccl.h.
(fringe.o): Depend on blockinput.h, atimer.h, and systime.h.
(ftfont.o): Depend on blockinput.h, atimer.h, systime.h, coding.h,
fontset.h, ccl.h, and ftfont.h.
(ftxfont.o): Depend on atimer.h, systime.h, fontset.h, and ccl.h.
(gtkutil.o): Depend on dispextern.h and composite.h.
(image.o): Depend on epaths.h, character.h, coding.h, composite.h,
termhooks.h, and ccl.h.
(indent.o): Depend on systime.h, coding.h, and $(INTERVALS_H).
(intervals.o): Depend on systime.h and coding.h.
(keyboard.o): Depend on composite.h and coding.h.
(keymap.o): Depend on coding.h and frame.h.
(lread.o): Depend on systime.h, frame.h, blockinput.h, and atimer.h.
(macros.o): Depend on systime.h, coding.h, and composite.h.
(menu.o): Depend on systime.h, coding.h, composite.h, window.h, and atimer.h.
(minibuf.o): Depend on systime.h and coding.h.  Don't depend on
dispextern.h explicitly.
(print.o): Depend on termhooks.h, coding.h, and ccl.h.  Don't
depend explicitly on dispextern.h and composite.h.
(process.o): Depend on character.h, xgselect.h, and sysselect.h.
(regex.o): Don't depend on charset.h.
(scroll.o): Depend on systime.h, coding.h, composite.h, and window.h.
(search.o): Don't depend explicitly on composite.h.
(sound.o): Depend on atimer.h and systime.h.
(syntax.o): Don't depend explicitly on composite.h.
(sysdep.o): Depend on coding.h and composite.h.
(term.o): Depend on xterm.h and buffer.h.
(terminal.o): Depend on dispextern.h, composite.h, and systime.h.
(textprop.o): Don't depend on dispextern.h explicitly.
(undo.o): Depend on dispextern.h.
(window.o): Depend on coding.h and termhooks.h.  Don't depend on
dispextern.h and composite.h explicitly.
(xdisp.o): Depend on ccl.h.
(xfaces.o): Depend on coding.h and ccl.h.
(xfns.o): Depend on $(INTERVALS_H) and ccl.h.
(xfont.o): Depend on atimer.h, systime.h, fontset.h, and ccl.h.
(xftfont.o): Depend on atimer.h, systime.h, fontset.h, ccl.h, and ftfont.h.
(xgselect.o): New dependency.
(xmenu.o): Depend on composite.h, keymap.h, and sysselect.h.
(xselect.o): Depend on keyboard.h, coding.h, and composite.h.
(xsettings.o): Depend on dispextern.h, keyboard.h, systime.h,
coding.h, composite.h, blockinput.h, atimer.h, and termopts.h.
(xsmfns.o): Depend on frame.h and dispextern.h.
(xterm.o): Depend on intervals.h, keymap.h, xgselect.h, and sysselect.h.

2 files changed, 179 insertions, 81 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index efde5769673..873267fca49 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,87 @@
+2009-12-19  Eli Zaretskii  <eliz@gnu.org>
+
+        Update dependencies in Makefile.in.
+
+        * Makefile.in (alloc.o): Depend on termhooks.h.
+        (atimer.o): Depend on blockinput.h.
+        (buffer.o): Depend on indent.h, keyboard.h, coding.h, keymap.h,
+        and frame.h.
+        (callint.o): Depend on systime.h, coding.h, and composite.h.
+        (callproc.o): Depend on buffer.h.
+        (casefiddle.o): Don't depend on charset.h.
+        (casetab.o): Depend on character.h.
+        (ccl.o): Depend on composite.h.
+        (chartab.o): Depend on ccl.h.
+        (cm.o): Depend on dispextern.h.
+        (cmds.o): Depend on systime.h, coding.h, frame.h, and composite.h.
+        (coding.o): Don't depend on $(INTERVALS_H).
+        (composite.o): Don't depend on dispextern.h explicitly (it's in
+        $(INTERVALS_H)).  Depend on ccl.h.
+        (data.o): Depend on systime.h, coding.h, composite.h,
+        dispextern.h, font.h, and ccl.h.
+        (dired.o): Depend on composite.h.
+        (dispnew.o): Depend on coding.h.  Don't depend explicitly on
+        composite.h (it's in $(INTERVALS_H)).
+        (doc.o): Depend on systime.h, coding.h, and composite.h.
+        (editfns.o): Don't depend explicitly on dispextern.h.
+        (emacs.o): Depend on frame.h and coding.h.
+        (eval.o): Depend on coding.h, composite.h, and xterm.h.
+        (fileio.o): Depend on frame.h and commands.h.  Don't depend
+        explicitly on dispextern.h.
+        (filelock.o): Don't depend on epaths.h and charset.h.  Depend on
+        composite.h.
+        (fns.o): Don't depend on termhooks.h.
+        (font.o): Depend on buffer.h, composite.h, fontset.h, and xterm.h.
+        (fontset.o): Depend on blockinput.h, atimer.h, systime.h,
+        coding.h, $(INTERVALS_H), window.h, xterm.h.
+        (frame.o): Depend on coding.h, composite.h, termhooks.h, and ccl.h.
+        (fringe.o): Depend on blockinput.h, atimer.h, and systime.h.
+        (ftfont.o): Depend on blockinput.h, atimer.h, systime.h, coding.h,
+        fontset.h, ccl.h, and ftfont.h.
+        (ftxfont.o): Depend on atimer.h, systime.h, fontset.h, and ccl.h.
+        (gtkutil.o): Depend on dispextern.h and composite.h.
+        (image.o): Depend on epaths.h, character.h, coding.h, composite.h,
+        termhooks.h, and ccl.h.
+        (indent.o): Depend on systime.h, coding.h, and $(INTERVALS_H).
+        (intervals.o): Depend on systime.h and coding.h.
+        (keyboard.o): Depend on composite.h and coding.h.
+        (keymap.o): Depend on coding.h and frame.h.
+        (lread.o): Depend on systime.h, frame.h, blockinput.h, and atimer.h.
+        (macros.o): Depend on systime.h, coding.h, and composite.h.
+        (menu.o): Depend on systime.h, coding.h, composite.h, window.h,
+        and atimer.h.
+        (minibuf.o): Depend on systime.h and coding.h.  Don't depend on
+        dispextern.h explicitly.
+        (print.o): Depend on termhooks.h, coding.h, and ccl.h.  Don't
+        depend explicitly on dispextern.h and composite.h.
+        (process.o): Depend on character.h, xgselect.h, and sysselect.h.
+        (regex.o): Don't depend on charset.h.
+        (scroll.o): Depend on systime.h, coding.h, composite.h, and window.h.
+        (search.o): Don't depend explicitly on composite.h.
+        (sound.o): Depend on atimer.h and systime.h.
+        (syntax.o): Don't depend explicitly on composite.h.
+        (sysdep.o): Depend on coding.h and composite.h.
+        (term.o): Depend on xterm.h and buffer.h.
+        (terminal.o): Depend on dispextern.h, composite.h, and systime.h.
+        (textprop.o): Don't depend on dispextern.h explicitly.
+        (undo.o): Depend on dispextern.h.
+        (window.o): Depend on coding.h and termhooks.h.  Don't depend on
+        dispextern.h and composite.h explicitly.
+        (xdisp.o): Depend on ccl.h.
+        (xfaces.o): Depend on coding.h and ccl.h.
+        (xfns.o): Depend on $(INTERVALS_H) and ccl.h.
+        (xfont.o): Depend on atimer.h, systime.h, fontset.h, and ccl.h.
+        (xftfont.o): Depend on atimer.h, systime.h, fontset.h, ccl.h, and
+        ftfont.h.
+        (xgselect.o): New dependency.
+        (xmenu.o): Depend on composite.h, keymap.h, and sysselect.h.
+        (xselect.o): Depend on keyboard.h, coding.h, and composite.h.
+        (xsettings.o): Depend on dispextern.h, keyboard.h, systime.h,
+        coding.h, composite.h, blockinput.h, atimer.h, and termopts.h.
+        (xsmfns.o): Depend on frame.h and dispextern.h.
+        (xterm.o): Depend on intervals.h, keymap.h, xgselect.h, and
+        sysselect.h.
+
 2009-12-19  Andreas Schwab  <schwab@linux-m68k.org>
 
         * font.c (Fclear_font_cache): Pass correct cache argument to
diff --git a/src/Makefile.in b/src/Makefile.in
index 0f11cd8019a..9df39f4f23e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1050,98 +1050,104 @@ doc.o: buildobj.h
 
 #ifndef AUTO_DEPEND
 
-atimer.o: atimer.c atimer.h syssignal.h systime.h lisp.h $(config_h)
+atimer.o: atimer.c atimer.h syssignal.h systime.h lisp.h blockinput.h \
+ $(config_h)
 buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \
-   dispextern.h $(INTERVALS_H) blockinput.h atimer.h systime.h character.h \
-   lisp.h $(config_h)
+   $(INTERVALS_H) blockinput.h atimer.h systime.h character.h \
+   indent.h keyboard.h coding.h keymap.h frame.h lisp.h $(config_h)
 callint.o: callint.c window.h commands.h buffer.h keymap.h \
-   keyboard.h dispextern.h lisp.h $(config_h)
+   keyboard.h dispextern.h systime.h coding.h composite.h lisp.h $(config_h)
 callproc.o: callproc.c epaths.h buffer.h commands.h lisp.h $(config_h) \
         process.h systty.h syssignal.h character.h coding.h ccl.h msdos.h \
-        composite.h w32.h blockinput.h atimer.h systime.h frame.h termhooks.h
+        composite.h w32.h blockinput.h atimer.h systime.h frame.h termhooks.h \
+        buffer.h
 casefiddle.o: casefiddle.c syntax.h commands.h buffer.h character.h \
-   composite.h \
-        charset.h keymap.h lisp.h $(config_h)
-casetab.o: casetab.c buffer.h lisp.h $(config_h)
+   composite.h keymap.h lisp.h $(config_h)
+casetab.o: casetab.c buffer.h character.h lisp.h $(config_h)
 category.o: category.c category.h buffer.h charset.h keymap.h   \
         character.h lisp.h $(config_h)
-ccl.o: ccl.c ccl.h charset.h character.h coding.h lisp.h $(config_h)
+ccl.o: ccl.c ccl.h charset.h character.h coding.h composite.h lisp.h $(config_h)
 character.o: character.c character.h buffer.h charset.h composite.h disptab.h \
    lisp.h $(config_h)
 charset.o: charset.c charset.h character.h buffer.h coding.h composite.h \
    disptab.h lisp.h $(config_h)
-chartab.o: charset.h character.h lisp.h $(config_h)
-coding.o: coding.c coding.h ccl.h buffer.h character.h charset.h $(INTERVALS_H) composite.h \
+chartab.o: charset.h character.h ccl.h lisp.h $(config_h)
+coding.o: coding.c coding.h ccl.h buffer.h character.h charset.h composite.h \
         window.h dispextern.h frame.h termhooks.h lisp.h $(config_h)
-cm.o: cm.c frame.h cm.h termhooks.h termchar.h lisp.h $(config_h)
+cm.o: cm.c frame.h cm.h termhooks.h termchar.h dispextern.h lisp.h $(config_h)
 cmds.o: cmds.c syntax.h buffer.h character.h commands.h window.h lisp.h $(config_h) \
-        msdos.h dispextern.h keyboard.h keymap.h
+        msdos.h dispextern.h keyboard.h keymap.h systime.h coding.h frame.h \
+        composite.h
 pre-crt0.o: pre-crt0.c
 dbusbind.o: dbusbind.c termhooks.h frame.h keyboard.h lisp.h $(config_h)
 dired.o: dired.c commands.h buffer.h lisp.h $(config_h) character.h charset.h \
-   coding.h regex.h systime.h blockinput.h atimer.h
-dispnew.o: dispnew.c systime.h commands.h process.h frame.h \
-   window.h buffer.h dispextern.h termchar.h termopts.h termhooks.h cm.h \
+   coding.h regex.h systime.h blockinput.h atimer.h composite.h
+dispnew.o: dispnew.c systime.h commands.h process.h frame.h coding.h \
+   window.h buffer.h termchar.h termopts.h termhooks.h cm.h \
    disptab.h indent.h $(INTERVALS_H) \
-   xterm.h blockinput.h atimer.h character.h msdos.h composite.h keyboard.h \
+   xterm.h blockinput.h atimer.h character.h msdos.h keyboard.h \
    syssignal.h lisp.h $(config_h)
-doc.o: doc.c lisp.h $(config_h) epaths.h buffer.h keyboard.h keymap.h character.h
+doc.o: doc.c lisp.h $(config_h) epaths.h buffer.h keyboard.h keymap.h \
+   character.h systime.h coding.h composite.h
 doprnt.o: doprnt.c character.h lisp.h $(config_h)
 dosfns.o: buffer.h termchar.h termhooks.h frame.h blockinput.h window.h \
    msdos.h dosfns.h dispextern.h charset.h coding.h atimer.h systime.h \
    lisp.h $(config_h)
 editfns.o: editfns.c window.h buffer.h systime.h $(INTERVALS_H) character.h \
-   coding.h dispextern.h frame.h blockinput.h atimer.h lisp.h $(config_h)
+   coding.h frame.h blockinput.h atimer.h lisp.h $(config_h)
 emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \
    termhooks.h buffer.h atimer.h systime.h $(INTERVALS_H) lisp.h $(config_h) \
-   window.h dispextern.h keyboard.h keymap.h
+   window.h dispextern.h keyboard.h keymap.h frame.h coding.h
 fileio.o: fileio.c window.h buffer.h systime.h $(INTERVALS_H) character.h \
-   coding.h msdos.h dispextern.h blockinput.h atimer.h lisp.h $(config_h)
-filelock.o: filelock.c buffer.h character.h charset.h coding.h systime.h \
-   epaths.h lisp.h $(config_h)
-filemode.o: filemode.c  $(config_h)
+   coding.h msdos.h blockinput.h atimer.h lisp.h $(config_h) frame.h commands.h
+filelock.o: filelock.c buffer.h character.h coding.h systime.h composite.h \
+   lisp.h $(config_h)
+filemode.o: filemode.c $(config_h)
 frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \
    blockinput.h atimer.h systime.h buffer.h character.h fontset.h font.h    \
-   msdos.h dosfns.h dispextern.h w32term.h termchar.h    \
-   lisp.h $(config_h)
-fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhooks.h lisp.h $(config_h)
+   msdos.h dosfns.h dispextern.h w32term.h termchar.h coding.h composite.h \
+   lisp.h $(config_h) termhooks.h ccl.h
+fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhooks.h \
+   blockinput.h atimer.h systime.h lisp.h $(config_h)
 font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \
-   font.h lisp.h $(config_h)
+   font.h lisp.h $(config_h) buffer.h composite.h fontset.h xterm.h
 ftfont.o: dispextern.h frame.h character.h charset.h composite.h font.h \
-   lisp.h $(config_h)
-fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h character.h \
-   charset.h frame.h keyboard.h termhooks.h font.h lisp.h $(config_h)
+   lisp.h $(config_h) blockinput.h atimer.h systime.h coding.h fontset.h \
+   ccl.h ftfont.h
+fontset.o: fontset.c fontset.h ccl.h buffer.h character.h \
+   charset.h frame.h keyboard.h termhooks.h font.h lisp.h $(config_h) \
+   blockinput.h atimer.h systime.h coding.h $(INTERVALS_H) window.h xterm.h
 getloadavg.o: getloadavg.c $(config_h)
 gtkutil.o: gtkutil.c gtkutil.h xterm.h lisp.h frame.h lisp.h $(config_h) \
   blockinput.h window.h atimer.h systime.h termhooks.h keyboard.h \
-  charset.h coding.h syssignal.h
+  charset.h coding.h syssignal.h dispextern.h composite.h
 image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \
-   systime.h xterm.h w32term.h w32gui.h font.h \
-   nsterm.h nsgui.h lisp.h $(config_h)
+   systime.h xterm.h w32term.h w32gui.h font.h epaths.h character.h coding.h \
+   nsterm.h nsgui.h lisp.h $(config_h) composite.h termhooks.h ccl.h
 indent.o: indent.c frame.h window.h indent.h buffer.h lisp.h $(config_h) termchar.h \
-   termopts.h disptab.h region-cache.h character.h category.h composite.h \
-   dispextern.h keyboard.h
+   termopts.h disptab.h region-cache.h character.h category.h \
+   keyboard.h systime.h coding.h $(INTERVALS_H)
 insdel.o: insdel.c window.h buffer.h $(INTERVALS_H) blockinput.h character.h \
    dispextern.h atimer.h systime.h region-cache.h lisp.h $(config_h)
 keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h character.h \
    commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \
-   systime.h dispextern.h syntax.h $(INTERVALS_H) blockinput.h atimer.h     \
-   xterm.h puresize.h msdos.h keymap.h w32term.h nsterm.h \
+   systime.h syntax.h $(INTERVALS_H) blockinput.h atimer.h composite.h \
+   xterm.h puresize.h msdos.h keymap.h w32term.h nsterm.h coding.h \
    lisp.h $(config_h)
 keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \
    atimer.h systime.h puresize.h character.h charset.h $(INTERVALS_H) keymap.h window.h \
-   lisp.h $(config_h)
+   coding.h frame.h lisp.h $(config_h)
 lastfile.o: lastfile.c $(config_h)
 macros.o: macros.c window.h buffer.h commands.h macros.h keyboard.h \
-        dispextern.h lisp.h $(config_h)
+        dispextern.h lisp.h $(config_h) systime.h coding.h composite.h
 gmalloc.o: gmalloc.c $(config_h)
 ralloc.o: ralloc.c lisp.h $(config_h)
 vm-limit.o: vm-limit.c mem-limits.h lisp.h $(config_h)
 marker.o: marker.c buffer.h character.h lisp.h $(config_h)
 md5.o: md5.c md5.h $(config_h)
-minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h keyboard.h \
+minibuf.o: minibuf.c syntax.h frame.h window.h keyboard.h systime.h \
    buffer.h commands.h character.h msdos.h $(INTERVALS_H) keymap.h \
-   termhooks.h lisp.h $(config_h)
+   termhooks.h lisp.h $(config_h) coding.h
 mktime.o: mktime.c $(config_h)
 msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \
    termopts.h termchar.h character.h coding.h ccl.h disptab.h window.h \
@@ -1162,33 +1168,33 @@ nsselect.o: nsselect.m blockinput.h nsterm.h nsgui.h frame.h lisp.h $(config_h)
 process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \
    commands.h syssignal.h systime.h systty.h syswait.h frame.h dispextern.h \
    blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \
-   keyboard.h lisp.h $(config_h)
-regex.o: regex.c syntax.h buffer.h lisp.h $(config_h) regex.h category.h character.h \
-   charset.h
+   keyboard.h lisp.h $(config_h) character.h xgselect.h sysselect.h
+regex.o: regex.c syntax.h buffer.h lisp.h $(config_h) regex.h category.h character.h
 region-cache.o: region-cache.c buffer.h region-cache.h lisp.h $(config_h)
 scroll.o: scroll.c termchar.h dispextern.h frame.h msdos.h keyboard.h \
-   termhooks.h lisp.h $(config_h)
+   termhooks.h lisp.h $(config_h) systime.h coding.h composite.h window.h
 search.o: search.c regex.h commands.h buffer.h region-cache.h syntax.h \
    blockinput.h atimer.h systime.h category.h character.h charset.h \
-   composite.h $(INTERVALS_H) \
+   $(INTERVALS_H) \
    lisp.h $(config_h)
-sound.o: sound.c dispextern.h syssignal.h lisp.h $(config_h)
+sound.o: sound.c dispextern.h syssignal.h lisp.h $(config_h) atimer.h systime.h
 strftime.o: strftime.c $(config_h)
 syntax.o: syntax.c syntax.h buffer.h commands.h category.h character.h \
-   composite.h keymap.h regex.h $(INTERVALS_H) lisp.h $(config_h)
+   keymap.h regex.h $(INTERVALS_H) lisp.h $(config_h)
 sysdep.o: sysdep.c syssignal.h systty.h systime.h syswait.h blockinput.h \
-   process.h dispextern.h termhooks.h termchar.h termopts.h \
-   frame.h atimer.h window.h msdos.h dosfns.h keyboard.h cm.h lisp.h $(config_h)
+   process.h dispextern.h termhooks.h termchar.h termopts.h coding.h \
+   frame.h atimer.h window.h msdos.h dosfns.h keyboard.h cm.h lisp.h $(config_h) \
+   composite.h
 term.o: term.c termchar.h termhooks.h termopts.h lisp.h $(config_h) cm.h frame.h \
-   disptab.h dispextern.h keyboard.h character.h charset.h coding.h ccl.h \
+   disptab.h keyboard.h character.h charset.h coding.h ccl.h xterm.h \
    msdos.h window.h keymap.h blockinput.h atimer.h systime.h systty.h \
-   syssignal.h  $(INTERVALS_H)
+   syssignal.h $(INTERVALS_H) buffer.h
 termcap.o: termcap.c lisp.h $(config_h)
 terminal.o: terminal.c frame.h termchar.h termhooks.h charset.h coding.h \
-   keyboard.h lisp.h $(config_h)
+   keyboard.h lisp.h $(config_h) dispextern.h composite.h systime.h
 terminfo.o: terminfo.c lisp.h $(config_h)
 tparam.o: tparam.c lisp.h $(config_h)
-undo.o: undo.c buffer.h commands.h window.h lisp.h $(config_h)
+undo.o: undo.c buffer.h commands.h window.h dispextern.h lisp.h $(config_h)
 unexaix.o: unexaix.c lisp.h $(config_h)
 unexalpha.o: unexalpha.c $(config_h)
 unexcw.o: unexcw.c lisp.h $(config_h)
@@ -1203,71 +1209,79 @@ w16select.o: w16select.c dispextern.h frame.h blockinput.h atimer.h systime.h \
 widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \
    $(srcdir)/../lwlib/lwlib.h lisp.h $(config_h)
 window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \
-   disptab.h keyboard.h dispextern.h msdos.h composite.h \
+   disptab.h keyboard.h msdos.h coding.h termhooks.h \
    keymap.h blockinput.h atimer.h systime.h $(INTERVALS_H) \
    xterm.h w32term.h nsterm.h lisp.h $(config_h)
 xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h \
    coding.h termchar.h frame.h window.h disptab.h termhooks.h character.h     \
    charset.h lisp.h $(config_h) keyboard.h $(INTERVALS_H) region-cache.h xterm.h    \
-   w32term.h nsterm.h msdos.h composite.h fontset.h           \
+   w32term.h nsterm.h msdos.h composite.h fontset.h ccl.h \
    blockinput.h atimer.h systime.h keymap.h font.h
 xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h   \
    window.h character.h charset.h msdos.h dosfns.h composite.h atimer.h \
-   systime.h keyboard.h fontset.h w32term.h nsterm.h    \
+   systime.h keyboard.h fontset.h w32term.h nsterm.h coding.h ccl.h \
    $(INTERVALS_H) termchar.h termhooks.h font.h lisp.h $(config_h)
 xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \
    $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \
    character.h charset.h coding.h gtkutil.h lisp.h $(config_h) termhooks.h \
-   fontset.h termchar.h font.h xsettings.h
+   fontset.h termchar.h font.h xsettings.h $(INTERVALS_H) ccl.h
 xfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \
-   font.h lisp.h $(config_h)
+   font.h lisp.h $(config_h) atimer.h systime.h fontset.h ccl.h
 xftfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \
-   font.h lisp.h $(config_h)
+   font.h lisp.h $(config_h) atimer.h systime.h fontset.h ccl.h ftfont.h
 ftxfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \
-   font.h lisp.h $(config_h)
+   font.h lisp.h $(config_h) atimer.h systime.h fontset.h ccl.h
 menu.o: menu.c lisp.h keyboard.h keymap.h frame.h termhooks.h blockinput.h \
    dispextern.h $(srcdir)/../lwlib/lwlib.h xterm.h gtkutil.h menu.h \
-   lisp.h $(config_h)
+   lisp.h $(config_h) systime.h coding.h composite.h window.h atimer.h
 xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \
    charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \
-   systime.h gtkutil.h msdos.h coding.h menu.h lisp.h $(config_h)
+   systime.h gtkutil.h msdos.h coding.h menu.h lisp.h $(config_h) composite.h \
+   keymap.h sysselect.h
 xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \
    dispextern.h frame.h disptab.h blockinput.h atimer.h systime.h syssignal.h \
    keyboard.h emacs-icon.h character.h charset.h ccl.h fontset.h composite.h \
-   coding.h process.h gtkutil.h font.h fontset.h lisp.h $(config_h) xsettings.h
+   coding.h process.h gtkutil.h font.h fontset.h lisp.h $(config_h) \
+   xsettings.h intervals.h keymap.h xgselect.h sysselect.h
 xselect.o: xselect.c process.h dispextern.h frame.h xterm.h blockinput.h \
-  buffer.h atimer.h systime.h termhooks.h lisp.h $(config_h)
+  buffer.h atimer.h systime.h termhooks.h lisp.h $(config_h) keyboard.h \
+  coding.h composite.h
+xgselect.o: xgselect.h systime.h sysselect.h lisp.h $(config_h)
 xrdb.o: xrdb.c lisp.h $(config_h) epaths.h
 xsmfns.o: xsmfns.c lisp.h $(config_h) systime.h sysselect.h termhooks.h xterm.h \
-  lisp.h termopts.h
-xsettings.o: xterm.h xsettings.h lisp.h frame.h termhooks.h $(config_h) 
+  lisp.h termopts.h frame.h dispextern.h
+xsettings.o: xterm.h xsettings.h lisp.h frame.h termhooks.h $(config_h) \
+  dispextern.h keyboard.h systime.h coding.h composite.h blockinput.h atimer.h \
+  termopts.h
 /* The files of Lisp proper */
 
-alloc.o: alloc.c process.h frame.h window.h buffer.h  puresize.h syssignal.h keyboard.h \
- blockinput.h atimer.h systime.h character.h dispextern.h lisp.h $(config_h) \
- $(INTERVALS_H)
+alloc.o: alloc.c process.h frame.h window.h buffer.h  puresize.h syssignal.h \
+ keyboard.h blockinput.h atimer.h systime.h character.h lisp.h $(config_h) \
+ $(INTERVALS_H) termhooks.o
 bytecode.o: bytecode.c buffer.h syntax.h character.h window.h dispextern.h \
   frame.h xterm.h lisp.h $(config_h)
 data.o: data.c buffer.h puresize.h character.h syssignal.h keyboard.h frame.h \
-   termhooks.h lisp.h $(config_h)
+   termhooks.h systime.h coding.h composite.h dispextern.h font.h ccl.h \
+   lisp.h $(config_h)
 eval.o: eval.c commands.h keyboard.h blockinput.h atimer.h systime.h \
-  dispextern.h lisp.h $(config_h)
+  dispextern.h lisp.h $(config_h) coding.h composite.h xterm.h
 floatfns.o: floatfns.c syssignal.h lisp.h $(config_h)
 fns.o: fns.c commands.h lisp.h $(config_h) frame.h buffer.h character.h keyboard.h \
- keymap.h frame.h window.h dispextern.h $(INTERVALS_H) coding.h md5.h \
- blockinput.h atimer.h systime.h xterm.h termhooks.h
+ keymap.h window.h dispextern.h $(INTERVALS_H) coding.h md5.h \
+ blockinput.h atimer.h systime.h xterm.h
 print.o: print.c process.h frame.h window.h buffer.h keyboard.h character.h \
-   lisp.h $(config_h) dispextern.h termchar.h $(INTERVALS_H) msdos.h composite.h \
-   blockinput.h atimer.h systime.h font.h charset.h
+   lisp.h $(config_h) termchar.h $(INTERVALS_H) msdos.h termhooks.h \
+   blockinput.h atimer.h systime.h font.h charset.h coding.h ccl.h
 lread.o: lread.c commands.h keyboard.h buffer.h epaths.h character.h \
- charset.h lisp.h $(config_h) $(INTERVALS_H) termhooks.h coding.h msdos.h
+ charset.h lisp.h $(config_h) $(INTERVALS_H) termhooks.h coding.h msdos.h \
+ systime.h frame.h blockinput.h atimer.h
 
 /* Text properties support */
-composite.o: composite.c buffer.h character.h coding.h dispextern.h font.h \
+composite.o: composite.c buffer.h character.h coding.h font.h ccl.h \
          frame.h termhooks.h $(INTERVALS_H) window.h lisp.h $(config_h)
 intervals.o: intervals.c buffer.h $(INTERVALS_H) keyboard.h puresize.h \
-        keymap.h lisp.h $(config_h)
-textprop.o: textprop.c buffer.h window.h dispextern.h $(INTERVALS_H) \
+        keymap.h lisp.h $(config_h) systime.h coding.h
+textprop.o: textprop.c buffer.h window.h $(INTERVALS_H) \
         lisp.h $(config_h)
 
 #endif /* ! AUTO_DEPEND */