Move NT-specific include file to the NT include directory
[bpt/emacs.git] / src / makefile.w32-in
index 4c4ba7b..31dc94f 100644 (file)
@@ -1,6 +1,5 @@
-# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-#   2008, 2009, 2010, 2011, 2012  Free Software Foundation, Inc.
+# -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
+# Copyright (C) 2000-2012  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -25,11 +24,10 @@ ALL = emacs
 # Set EMACSLOADPATH correctly (in case already defined in environment).
 EMACSLOADPATH=$(CURDIR)/../lisp
 
-#
-# HAVE_CONFIG_H is required by some generic gnu sources stuck into
-# the emacs source tree.
-#
-LOCAL_FLAGS     = -Demacs=1 -DHAVE_CONFIG_H -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS)
+# Size in MBs of the static heap in temacs.exe.
+HEAPSIZE = 27
+
+LOCAL_FLAGS     = -Demacs=1 -I../lib -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS)
 
 SRC             = .
 EMACS           = $(BLD)/emacs.exe
@@ -37,10 +35,11 @@ TEMACS          = $(BLD)/temacs.exe
 TEMACS_TMP      = $(BLD)/temacs.bin
 TLIB0           = $(BLD)/temacs0.$(A)
 TLIB1           = $(BLD)/temacs1.$(A)
-TLIBW32         = $(BLD)/temacw32.$(A)
+TLIB2           = $(BLD)/temacs2.$(A)
 TOBJ            = $(BLD)/firstfile.$(O)
 TRES           = $(BLD)/emacs.res
 TLASTLIB       = $(BLD)/lastfile.$(A)
+GNULIB         = ../lib/$(BLD)/libgnu.$(A)
 
 DOC            = $(OBJDIR)/etc/DOC-X
 
@@ -62,7 +61,6 @@ OBJ1 =  $(BLD)/alloc.$(O)             \
        $(BLD)/callint.$(O)             \
        $(BLD)/callproc.$(O)            \
        $(BLD)/casefiddle.$(O)          \
-       $(BLD)/cm.$(O)                  \
        $(BLD)/cmds.$(O)                \
        $(BLD)/data.$(O)                \
        $(BLD)/dired.$(O)               \
@@ -73,7 +71,6 @@ OBJ1 =  $(BLD)/alloc.$(O)             \
        $(BLD)/eval.$(O)                \
        $(BLD)/fileio.$(O)              \
        $(BLD)/filelock.$(O)            \
-       $(BLD)/filemode.$(O)            \
        $(BLD)/fns.$(O)                 \
        $(BLD)/indent.$(O)              \
        $(BLD)/insdel.$(O)              \
@@ -82,7 +79,6 @@ OBJ1 =  $(BLD)/alloc.$(O)             \
        $(BLD)/lread.$(O)               \
        $(BLD)/macros.$(O)              \
        $(BLD)/marker.$(O)              \
-       $(BLD)/md5.$(O)                 \
        $(BLD)/minibuf.$(O)             \
        $(BLD)/w32.$(O)                 \
        $(BLD)/w32heap.$(O)             \
@@ -95,10 +91,10 @@ OBJ1 =  $(BLD)/alloc.$(O)           \
        $(BLD)/scroll.$(O)              \
        $(BLD)/search.$(O)              \
        $(BLD)/sound.$(O)               \
-       $(BLD)/syntax.$(O)              \
-       $(BLD)/sysdep.$(O)              \
+       $(BLD)/syntax.$(O)
+
+OBJ2 =  $(BLD)/sysdep.$(O)             \
        $(BLD)/term.$(O)                \
-       $(BLD)/termcap.$(O)             \
        $(BLD)/tparam.$(O)              \
        $(BLD)/undo.$(O)                \
        $(BLD)/unexw32.$(O)             \
@@ -108,13 +104,14 @@ OBJ1 =  $(BLD)/alloc.$(O)         \
        $(BLD)/floatfns.$(O)            \
        $(BLD)/frame.$(O)               \
        $(BLD)/gmalloc.$(O)             \
+       $(BLD)/gnutls.$(O)              \
        $(BLD)/intervals.$(O)           \
        $(BLD)/composite.$(O)           \
        $(BLD)/ralloc.$(O)              \
        $(BLD)/textprop.$(O)            \
        $(BLD)/vm-limit.$(O)            \
        $(BLD)/region-cache.$(O)        \
-       $(BLD)/strftime.$(O)            \
+       $(BLD)/bidi.$(O)                \
        $(BLD)/charset.$(O)             \
        $(BLD)/character.$(O)           \
        $(BLD)/chartab.$(O)             \
@@ -126,33 +123,35 @@ OBJ1 =  $(BLD)/alloc.$(O)         \
        $(BLD)/fringe.$(O)              \
        $(BLD)/image.$(O)               \
        $(BLD)/terminal.$(O)            \
-        $(BLD)/menu.$(O)
-
-WIN32OBJ = $(BLD)/w32term.$(O)         \
-          $(BLD)/w32xfns.$(O)          \
-          $(BLD)/w32fns.$(O)           \
-          $(BLD)/xfaces.$(O)           \
-          $(BLD)/w32select.$(O)        \
-          $(BLD)/w32menu.$(O)          \
-          $(BLD)/w32reg.$(O)
-
-FONTOBJ = $(BLD)/w32font.$(O) $(BLD)/w32uniscribe.$(O)
+       $(BLD)/menu.$(O)                \
+       $(BLD)/xml.$(O)                 \
+       $(BLD)/w32term.$(O)             \
+       $(BLD)/w32xfns.$(O)             \
+       $(BLD)/w32fns.$(O)              \
+       $(BLD)/xfaces.$(O)              \
+       $(BLD)/w32select.$(O)           \
+       $(BLD)/w32menu.$(O)             \
+       $(BLD)/w32reg.$(O)              \
+       $(BLD)/w32font.$(O)             \
+       $(BLD)/w32uniscribe.$(O)
 
 LIBS =  $(TLIB0)       \
        $(TLIB1)        \
-       $(TLIBW32)      \
+       $(TLIB2)        \
        $(TLASTLIB)     \
+       $(GNULIB)       \
        $(WINMM)        \
        $(ADVAPI32)     \
        $(GDI32)        \
        $(COMDLG32)     \
        $(USER32)       \
-       $(MPR)  \
+       $(MPR)          \
        $(SHELL32)      \
        $(WINSPOOL)     \
        $(OLE32)        \
        $(COMCTL32)     \
        $(UNISCRIBE)    \
+       $(USER_LIBS)    \
        $(libc)
 
 #
@@ -166,7 +165,7 @@ all:            $(ALL)
 emacs:          stamp_BLD $(EMACS)
 $(EMACS):       $(DOC) $(TEMACS)
        "$(THISDIR)/$(BLD)/temacs.exe" -batch -l loadup dump
-       -"$(THISDIR)/$(BLD)/emacs.exe" -q -batch -f list-load-path-shadows
+       -"$(THISDIR)/$(BLD)/emacs.exe" -batch -f list-load-path-shadows
 
 #
 # The undumped executable
@@ -175,10 +174,10 @@ $(EMACS):       $(DOC) $(TEMACS)
 # (it is the preload heap size in MB).
 #
 temacs:         stamp_BLD $(TEMACS)
-$(TEMACS):      $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES) \
-                 ../nt/$(BLD)/addsection.exe
+$(TEMACS):      $(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES) \
+                 ../nt/$(BLD)/addsection.exe $(GNULIB)
        $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
-       "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21
+       "$(THISDIR)/../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP $(HEAPSIZE)
 
 # These omit firstfile.${O}, but there's no documentation in there
 # anyways.
@@ -191,18 +190,53 @@ make-buildobj-CMD:
        echo #define BUILDOBJ ^"\> buildobj.h
        echo $(OBJ0)            \>> buildobj.h
        echo $(OBJ1)            \>> buildobj.h
-       echo $(WIN32OBJ)        \>> buildobj.h
-       echo $(FONTOBJ)         \>> buildobj.h
+       echo $(OBJ2)            \>> buildobj.h
        echo ^">> buildobj.h
 
+# "
+# The above line is here to countermand the single quote
+# on the last "echo" command above, wrt font-lock.
 make-buildobj-SH:
        echo '#define BUILDOBJ $(DQUOTE)\'  > buildobj.h
        echo $(OBJ0)                   '\' >> buildobj.h
        echo $(OBJ1)                   '\' >> buildobj.h
-       echo $(WIN32OBJ)               '\' >> buildobj.h
-       echo $(FONTOBJ)                '\' >> buildobj.h
+       echo $(OBJ2)                   '\' >> buildobj.h
        echo '$(DQUOTE)'                   >> buildobj.h
 
+GLOBAL_SOURCES =   dosfns.c msdos.c \
+       xterm.c xfns.c xmenu.c xselect.c xrdb.c xsmfns.c fringe.c image.c \
+       fontset.c menu.c dbusbind.c \
+       w32.c w32console.c w32fns.c w32heap.c w32inevt.c \
+       w32menu.c w32proc.c w32reg.c w32select.c w32term.c w32xfns.c \
+       font.c w32font.c w32uniscribe.c \
+       dispnew.c frame.c scroll.c xdisp.c window.c bidi.c \
+       charset.c coding.c category.c ccl.c character.c chartab.c \
+       cm.c term.c terminal.c xfaces.c \
+       emacs.c keyboard.c macros.c keymap.c sysdep.c \
+       buffer.c filelock.c insdel.c marker.c \
+       minibuf.c fileio.c dired.c \
+       cmds.c casetab.c casefiddle.c indent.c search.c regex.c undo.c \
+       alloc.c data.c doc.c editfns.c callint.c \
+       eval.c floatfns.c fns.c print.c lread.c \
+       syntax.c bytecode.c \
+       process.c callproc.c unexw32.c \
+       region-cache.c sound.c atimer.c \
+       doprnt.c intervals.c textprop.c composite.c \
+       gnutls.c xml.c
+SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
+       xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o dbusbind.o
+obj = $(GLOBAL_SOURCES:.c=.o)
+
+globals.h: gl-stamp
+       @cmd /c rem true
+
+gl-stamp: ../lib-src/$(BLD)/make-docfile.exe $(GLOBAL_SOURCES)
+       - $(DEL) gl-tmp
+       "$(THISDIR)/../lib-src/$(BLD)/make-docfile" -d . -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp
+       cmd /c "fc /b gl-tmp globals.h >nul 2>&1 || $(CP) gl-tmp globals.h"
+       - $(DEL) gl-tmp
+       echo timestamp > $@
+
 bootstrap: bootstrap-emacs
 
 #
@@ -211,9 +245,15 @@ bootstrap: bootstrap-emacs
 #
 # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
 #          this can break with GNU Make 3.81 and later if sh.exe is used.
-bootstrap-temacs:
+bootstrap-temacs-CMD:
+       $(MAKE) $(MFLAGS) $(XMFLAGS) temacs CFLAGS=$(ARGQUOTE)$(ESC_CFLAGS) -DPURESIZE=5000000$(ARGQUOTE)
+
+bootstrap-temacs-SH:
        $(MAKE) $(MFLAGS) $(XMFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS) -DPURESIZE=5000000$(ARGQUOTE)
 
+bootstrap-temacs:
+       $(MAKE) $(MFLAGS) bootstrap-temacs-$(SHELLTYPE)
+
 #
 # Dump an Emacs executable named bootstrap-emacs containing the
 # files from loadup.el in source form.
@@ -250,7 +290,7 @@ $(TLIB0):       $(OBJ0)
 $(TLIB1):       $(OBJ1)
        - $(DEL) $@
        $(AR) $(AR_OUT)$@ $(ALL_DEPS)
-$(TLIBW32):    $(WIN32OBJ) $(FONTOBJ)
+$(TLIB2):      $(OBJ2)
        - $(DEL) $@
        $(AR) $(AR_OUT)$@ $(ALL_DEPS)
 
@@ -279,7 +319,7 @@ clean:
        - $(DEL) "s/*.h~" "m/*.h~"
        - $(DEL) $(COMPILER_TEMP_FILES)
        - $(DEL_TREE) $(OBJDIR)
-       - $(DEL) stamp_BLD
+       - $(DEL) stamp_BLD gl-stamp globals.h
        - $(DEL) buildobj.h
 
 distclean:     cleanall
@@ -294,454 +334,512 @@ cleanall:       clean
        - $(DEL_TREE) oo
        - $(DEL_TREE) oo-spd
 
+## Arrange to make a tags table TAGS-LISP for ../lisp,
+## plus TAGS for the C files, which includes ../lisp/TAGS by reference.
+##
+## This works only with GNU Make.
+
+TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/../nt/inc/ms-w32.h
+       $(MAKE) $(MFLAGS) TAGS-$(MAKETYPE)
+
+TAGS-LISP: $(OBJ0) $(OBJ1) $(OBJ2)
+       $(MAKE) $(MFLAGS) TAGS-LISP-$(MAKETYPE)
+
+TAGS-gmake:
+       ../lib-src/$(BLD)/etags.exe --include=TAGS-LISP --include=../nt/TAGS \
+         --regex=@../nt/emacs-src.tags \
+         $(OBJ0_c)
+       ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
+         $(OBJ1_c)
+       ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
+         $(OBJ2_c) \
+         $(CURDIR)/*.h $(CURDIR)/../nt/inc/ms-w32.h
+
+TAGS-nmake:
+       echo This target is not supported with NMake
+       exit -1
+
+frc:
+TAGS-LISP-gmake: frc
+       $(MAKE) $(MFLAGS) -C ../lisp TAGS-LISP DEST=../src
+
+TAGS-LISP-nmake:
+       echo This target is not supported with NMake
+       exit -1
+
+../nt/TAGS: frc
+       $(MAKE) $(MFLAGS) nt-TAGS-$(MAKETYPE)
+
+nt-TAGS-gmake:
+       $(MAKE) $(MFLAGS) -C ../nt TAGS
+
+nt-TAGS-nmake:
+       echo This target is not supported with NMake
+       exit -1
+
+full-tags: TAGS TAGS-LISP ../nt/TAGS
+.PHONY: full-tags
+
 ### DEPENDENCIES ###
 
 EMACS_ROOT = ..
-CONFIG_H   = $(EMACS_ROOT)/src/s/ms-w32.h \
-            $(EMACS_ROOT)/src/m/intel386.h \
-            $(EMACS_ROOT)/src/config.h \
-            $(EMACS_ROOT)/nt/inc/sys/stat.h
+GNU_LIB = $(EMACS_ROOT)/lib
+NT_INC = $(EMACS_ROOT)/nt/inc
+
+SYSTIME_H      = $(SRC)/systime.h \
+                $(NT_INC)/sys/time.h \
+                $(GNU_LIB)/timespec.h
+ATIMER_H       = $(SRC)/atimer.h \
+                $(SYSTIME_H)
+BLOCKINPUT_H   = $(SRC)/blockinput.h \
+                $(ATIMER_H)
+BUFFER_H       = $(SRC)/buffer.h \
+                $(SYSTIME_H)
+CAREADLINKAT_H = $(GNU_LIB)/careadlinkat.h \
+                $(NT_INC)/unistd.h
+CHARACTER_H    = $(SRC)/character.h \
+                $(GNU_LIB)/verify.h
+CHARSET_H      = $(SRC)/charset.h \
+                $(GNU_LIB)/verify.h
+CODING_H       = $(SRC)/coding.h \
+                $(SRC)/composite.h
+MS_W32_H       = $(NT_INC)/ms-w32.h \
+                $(NT_INC)/sys/stat.h
+CONF_POST_H    = $(SRC)/conf_post.h \
+                $(MS_W32_H)
+CONFIG_H       = $(SRC)/config.h \
+                $(CONF_POST_H)
+DIR_H          = $(NT_INC)/sys/dir.h \
+                $(SRC)/ndir.h
+W32GUI_H       = $(SRC)/w32gui.h \
+                $(SYSTIME_H)
+DISPEXTERN_H   = $(SRC)/dispextern.h \
+                $(GNU_LIB)/c-strcase.h \
+                $(SYSTIME_H) \
+                $(W32GUI_H)
+FILEMODE_H     = $(GNU_LIB)/filemode.h \
+                $(NT_INC)/sys/stat.h
+FONT_H         = $(SRC)/font.h \
+                $(SRC)/ccl.h
+FRAME_H        = $(SRC)/frame.h \
+                $(DISPEXTERN_H)
+FTOASTR_H      = $(GNU_LIB)/ftoastr.h \
+                $(GNU_LIB)/intprops.h
+GRP_H          = $(NT_INC)/grp.h \
+                $(NT_INC)/pwd.h
+INTERVALS_H    = $(SRC)/intervals.h \
+                $(SRC)/composite.h \
+                $(DISPEXTERN_H)
+INTTYPES_H     = $(NT_INC)/inttypes.h \
+                $(NT_INC)/stdint.h
+KEYBOARD_H     = $(SRC)/keyboard.h \
+                $(CODING_H) \
+                $(SYSTIME_H)
+LANGINFO_H     = $(NT_INC)/langinfo.h \
+                $(NT_INC)/nl_types.h
+LISP_H         = $(SRC)/lisp.h \
+                $(SRC)/globals.h \
+                $(GNU_LIB)/intprops.h \
+                $(INTTYPES_H) \
+                $(NT_INC)/stdalign.h
+MD5_H          = $(GNU_LIB)/md5.h \
+                $(NT_INC)/stdint.h
+MENU_H         = $(SRC)/menu.h \
+                $(SYSTIME_H)
+PROCESS_H      = $(SRC)/process.h \
+                $(SRC)/gnutls.h \
+                $(NT_INC)/unistd.h
+SHA1_H         = $(GNU_LIB)/sha1.h \
+                $(NT_INC)/stdint.h
+SHA256_H       = $(GNU_LIB)/sha256.h \
+                $(NT_INC)/stdint.h
+U64_H          = $(GNU_LIB)/u64.h \
+                $(NT_INC)/stdint.h
+SHA512_H       = $(GNU_LIB)/sha512.h \
+                $(U64_H)
+SOCKET_H       = $(NT_INC)/sys/socket.h \
+                $(SRC)/w32.h
+STAT_TIME_H    = $(GNU_LIB)/stat-time.h \
+                $(NT_INC)/sys/stat.h
+SYSTTY_H       = $(SRC)/systty.h \
+                $(NT_INC)/sys/ioctl.h \
+                $(NT_INC)/unistd.h
+TERMHOOKS_H    = $(SRC)/termhooks.h \
+                $(SYSTIME_H)
+W32TERM_H      = $(SRC)/w32term.h \
+                $(W32GUI_H)
+WINDOW_H       = $(SRC)/window.h \
+                $(DISPEXTERN_H)
 
 $(BLD)/alloc.$(O) : \
        $(SRC)/alloc.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/process.h \
        $(SRC)/puresize.h \
        $(SRC)/syssignal.h \
-       $(SRC)/systime.h \
-       $(SRC)/termhooks.h \
        $(SRC)/w32.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(NT_INC)/unistd.h \
+       $(GNU_LIB)/verify.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(PROCESS_H) \
+       $(TERMHOOKS_H) \
+       $(WINDOW_H)
 
 $(BLD)/atimer.$(O) : \
        $(SRC)/atimer.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
        $(SRC)/syssignal.h \
-       $(SRC)/systime.h
+       $(NT_INC)/unistd.h \
+       $(ATIMER_H) \
+       $(BLOCKINPUT_H) \
+       $(CONFIG_H) \
+       $(LISP_H) \
+       $(SYSTIME_H)
+
+$(BLD)/bidi.$(O) : \
+       $(SRC)/bidi.c \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(LISP_H)
 
 $(BLD)/buffer.$(O) : \
        $(SRC)/buffer.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/param.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
        $(SRC)/indent.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/region-cache.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(NT_INC)/sys/param.h \
+       $(NT_INC)/sys/stat.h \
+       $(NT_INC)/unistd.h \
+       $(GNU_LIB)/verify.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(WINDOW_H)
 
 $(BLD)/bytecode.$(O) : \
        $(SRC)/bytecode.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/dispextern.h \
        $(SRC)/syntax.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(LISP_H) \
+       $(WINDOW_H)
 
 $(BLD)/callint.$(O) : \
        $(SRC)/callint.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(WINDOW_H)
 
 $(BLD)/callproc.$(O) : \
        $(SRC)/callproc.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
        $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
        $(SRC)/epaths.h \
-       $(SRC)/frame.h \
-       $(SRC)/process.h \
        $(SRC)/syssignal.h \
-       $(SRC)/systime.h \
-       $(SRC)/systty.h \
-       $(SRC)/termhooks.h \
        $(SRC)/w32.h \
-       $(SRC)/w32gui.h
+       $(NT_INC)/sys/file.h \
+       $(NT_INC)/unistd.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(FRAME_H) \
+       $(LISP_H) \
+       $(PROCESS_H) \
+       $(SYSTTY_H) \
+       $(TERMHOOKS_H)
 
 $(BLD)/casefiddle.$(O) : \
        $(SRC)/casefiddle.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/keymap.h \
-       $(SRC)/syntax.h
+       $(SRC)/syntax.h \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(LISP_H)
 
 $(BLD)/casetab.$(O) : \
        $(SRC)/casetab.c \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
        $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h
+       $(LISP_H)
 
 $(BLD)/category.$(O) : \
        $(SRC)/category.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
        $(SRC)/category.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/keymap.h
+       $(SRC)/keymap.h \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CONFIG_H) \
+       $(LISP_H)
 
 $(BLD)/ccl.$(O) : \
        $(SRC)/ccl.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
        $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(LISP_H)
 
 $(BLD)/character.$(O) : \
        $(SRC)/character.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/composite.h \
-       $(SRC)/disptab.h
+       $(SRC)/disptab.h \
+       $(GNU_LIB)/intprops.h \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CONFIG_H) \
+       $(LISP_H)
 
 $(BLD)/charset.$(O) : \
        $(SRC)/charset.c \
+       $(SRC)/disptab.h \
+       $(NT_INC)/unistd.h \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CODING_H) \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/disptab.h
+       $(LISP_H)
 
 $(BLD)/chartab.$(O) : \
        $(SRC)/chartab.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
        $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h
-
-$(BLD)/cm.$(O) : \
-       $(SRC)/cm.c \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
        $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/cm.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h
+       $(LISP_H)
 
 $(BLD)/cmds.$(O) : \
        $(SRC)/cmds.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/syntax.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(WINDOW_H)
 
 $(BLD)/coding.$(O) : \
        $(SRC)/coding.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
        $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
        $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(FRAME_H) \
+       $(LISP_H) \
+       $(TERMHOOKS_H) \
+       $(WINDOW_H)
 
 $(BLD)/composite.$(O) : \
        $(SRC)/composite.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/font.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FONT_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(LISP_H) \
+       $(TERMHOOKS_H) \
+       $(WINDOW_H)
 
 $(BLD)/data.$(O) : \
        $(SRC)/data.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/font.h \
-       $(SRC)/frame.h \
-       $(SRC)/keyboard.h \
+       $(SRC)/keymap.h \
        $(SRC)/puresize.h \
        $(SRC)/syssignal.h \
-       $(SRC)/systime.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h
+       $(GNU_LIB)/intprops.h \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(FONT_H) \
+       $(FRAME_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(TERMHOOKS_H)
 
 $(BLD)/dired.$(O) : \
        $(SRC)/dired.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/grp.h \
-       $(EMACS_ROOT)/nt/inc/pwd.h \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/dir.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/ndir.h \
        $(SRC)/regex.h \
-       $(SRC)/systime.h
+       $(NT_INC)/pwd.h \
+       $(NT_INC)/sys/stat.h \
+       $(NT_INC)/unistd.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(DIR_H) \
+       $(FILEMODE_H) \
+       $(GRP_H) \
+       $(LISP_H) \
+       $(STAT_TIME_H) \
+       $(SYSTIME_H)
 
 $(BLD)/dispnew.$(O) : \
        $(SRC)/dispnew.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
        $(SRC)/cm.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
-       $(SRC)/frame.h \
        $(SRC)/indent.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/process.h \
        $(SRC)/syssignal.h \
-       $(SRC)/systime.h \
        $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h \
-       $(SRC)/window.h
+       $(NT_INC)/unistd.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(PROCESS_H) \
+       $(SYSTIME_H) \
+       $(TERMHOOKS_H) \
+       $(W32TERM_H) \
+       $(WINDOW_H)
 
 $(BLD)/doc.$(O) : \
        $(SRC)/doc.c \
-       $(CONFIG_H) \
-       buildobj.h \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/keyboard.h \
+       $(SRC)/buildobj.h \
        $(SRC)/keymap.h \
-       $(SRC)/systime.h
+       $(NT_INC)/sys/file.h \
+       $(NT_INC)/unistd.h \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H)
 
 $(BLD)/doprnt.$(O) : \
        $(SRC)/doprnt.c \
+       $(NT_INC)/unistd.h \
+       $(CHARACTER_H) \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(SRC)/lisp.h \
-       $(SRC)/character.h
+       $(LISP_H)
 
 $(BLD)/editfns.$(O) : \
        $(SRC)/editfns.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/pwd.h \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(NT_INC)/pwd.h \
+       $(NT_INC)/unistd.h \
+       $(GNU_LIB)/intprops.h \
+       $(GNU_LIB)/strftime.h \
+       $(GNU_LIB)/verify.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(LISP_H) \
+       $(SYSTIME_H) \
+       $(WINDOW_H)
 
 $(BLD)/emacs.$(O) : \
        $(SRC)/emacs.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
+       $(SRC)/gnutls.h \
        $(SRC)/keymap.h \
-       $(SRC)/process.h \
        $(SRC)/syssignal.h \
-       $(SRC)/systime.h \
-       $(SRC)/systty.h \
-       $(SRC)/termhooks.h \
+       $(SRC)/unexec.h \
        $(SRC)/w32.h \
-       $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
-       $(SRC)/window.h
+       $(NT_INC)/sys/file.h \
+       $(NT_INC)/unistd.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(PROCESS_H) \
+       $(SYSTTY_H) \
+       $(TERMHOOKS_H) \
+       $(WINDOW_H)
 
 $(BLD)/eval.$(O) : \
        $(SRC)/eval.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h
+       $(BLOCKINPUT_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H)
 
 $(BLD)/fileio.$(O) : \
        $(SRC)/fileio.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/pwd.h \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(NT_INC)/pwd.h \
+       $(NT_INC)/sys/stat.h \
+       $(NT_INC)/unistd.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(LISP_H) \
+       $(STAT_TIME_H) \
+       $(SYSTIME_H) \
+       $(WINDOW_H)
 
 $(BLD)/filelock.$(O) : \
        $(SRC)/filelock.c \
+       $(NT_INC)/pwd.h \
+       $(NT_INC)/sys/file.h \
+       $(NT_INC)/sys/stat.h \
+       $(NT_INC)/unistd.h \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CODING_H) \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/pwd.h \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/systime.h
-
-$(BLD)/filemode.$(O) : \
-       $(SRC)/filemode.c \
-       $(CONFIG_H)
+       $(LISP_H) \
+       $(SYSTIME_H)
 
 $(BLD)/firstfile.$(O) : \
        $(SRC)/firstfile.c \
@@ -749,256 +847,223 @@ $(BLD)/firstfile.$(O) : \
 
 $(BLD)/floatfns.$(O) : \
        $(SRC)/floatfns.c \
+       $(SRC)/syssignal.h \
        $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/syssignal.h
+       $(LISP_H)
 
 $(BLD)/fns.$(O) : \
        $(SRC)/fns.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/langinfo.h \
-       $(EMACS_ROOT)/nt/inc/nl_types.h \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
-       $(SRC)/md5.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(NT_INC)/unistd.h \
+       $(GNU_LIB)/intprops.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LANGINFO_H) \
+       $(LISP_H) \
+       $(MD5_H) \
+       $(SHA1_H) \
+       $(SHA256_H) \
+       $(SHA512_H) \
+       $(WINDOW_H)
 
 $(BLD)/font.$(O) : \
        $(SRC)/font.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/font.h \
        $(SRC)/fontset.h \
-       $(SRC)/frame.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h \
-       $(SRC)/window.h
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FONT_H) \
+       $(FRAME_H) \
+       $(LISP_H) \
+       $(W32TERM_H) \
+       $(WINDOW_H)
 
 $(BLD)/fontset.$(O) : \
        $(SRC)/fontset.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
        $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/font.h \
        $(SRC)/fontset.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/systime.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h \
-       $(SRC)/window.h
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FONT_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(TERMHOOKS_H) \
+       $(W32TERM_H) \
+       $(WINDOW_H)
 
 $(BLD)/frame.$(O) : \
        $(SRC)/frame.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/font.h \
        $(SRC)/fontset.h \
-       $(SRC)/frame.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/systime.h \
        $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h \
-       $(SRC)/window.h
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FONT_H) \
+       $(FRAME_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(TERMHOOKS_H) \
+       $(W32TERM_H) \
+       $(WINDOW_H)
 
 $(BLD)/fringe.$(O) : \
        $(SRC)/fringe.c \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/systime.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(LISP_H) \
+       $(TERMHOOKS_H) \
+       $(WINDOW_H)
 
 $(BLD)/gmalloc.$(O) : \
        $(SRC)/gmalloc.c \
+       $(NT_INC)/stdint.h \
+       $(NT_INC)/unistd.h \
+       $(CONFIG_H)
+
+$(BLD)/gnutls.$(O) : \
+       $(SRC)/gnutls.c \
+       $(SRC)/w32.h \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(SRC)/getpagesize.h
+       $(LISP_H) \
+       $(PROCESS_H)
+
+$(BLD)/xml.$(O) : \
+       $(SRC)/xml.c \
+       $(SRC)/w32.h \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(LISP_H)
 
 $(BLD)/image.$(O) : \
        $(SRC)/image.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
        $(SRC)/epaths.h \
-       $(SRC)/font.h \
-       $(SRC)/frame.h \
-       $(SRC)/systime.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h \
-       $(SRC)/window.h
+       $(SRC)/w32.h \
+       $(NT_INC)/unistd.h \
+       $(BLOCKINPUT_H) \
+       $(CHARACTER_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FONT_H) \
+       $(FRAME_H) \
+       $(LISP_H) \
+       $(SYSTIME_H) \
+       $(TERMHOOKS_H) \
+       $(W32TERM_H) \
+       $(WINDOW_H)
 
 $(BLD)/indent.$(O) : \
        $(SRC)/indent.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
        $(SRC)/category.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
        $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
-       $(SRC)/frame.h \
        $(SRC)/indent.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
        $(SRC)/region-cache.h \
-       $(SRC)/systime.h \
        $(SRC)/termchar.h \
        $(SRC)/termopts.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(WINDOW_H)
 
 $(BLD)/insdel.$(O) : \
        $(SRC)/insdel.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/intervals.h \
        $(SRC)/region-cache.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(GNU_LIB)/intprops.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(INTERVALS_H) \
+       $(LISP_H) \
+       $(WINDOW_H)
 
 $(BLD)/intervals.$(O) : \
        $(SRC)/intervals.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/puresize.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h
+       $(GNU_LIB)/intprops.h \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H)
 
 $(BLD)/keyboard.$(O) : \
        $(SRC)/keyboard.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/macros.h \
        $(SRC)/puresize.h \
        $(SRC)/syntax.h \
        $(SRC)/syssignal.h \
-       $(SRC)/systime.h \
        $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h \
-       $(SRC)/window.h
+       $(NT_INC)/sys/ioctl.h \
+       $(NT_INC)/unistd.h \
+       $(ATIMER_H) \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(PROCESS_H) \
+       $(SYSTIME_H) \
+       $(TERMHOOKS_H) \
+       $(W32TERM_H) \
+       $(WINDOW_H)
 
 $(BLD)/keymap.$(O) : \
        $(SRC)/keymap.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/puresize.h \
-       $(SRC)/systime.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CONFIG_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(TERMHOOKS_H) \
+       $(WINDOW_H)
 
 $(BLD)/lastfile.$(O) : \
        $(SRC)/lastfile.c \
@@ -1006,708 +1071,577 @@ $(BLD)/lastfile.$(O) : \
 
 $(BLD)/lread.$(O) : \
        $(SRC)/lread.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
        $(SRC)/epaths.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/systime.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h
+       $(NT_INC)/sys/file.h \
+       $(NT_INC)/sys/stat.h \
+       $(NT_INC)/unistd.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(STAT_TIME_H) \
+       $(TERMHOOKS_H)
 
 $(BLD)/macros.$(O) : \
        $(SRC)/macros.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/keyboard.h \
        $(SRC)/macros.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(WINDOW_H)
 
 $(BLD)/marker.$(O) : \
        $(SRC)/marker.c \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
        $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h
-
-$(BLD)/md5.$(O) : \
-       $(SRC)/md5.c \
-       $(CONFIG_H) \
-       $(SRC)/md5.h
+       $(LISP_H)
 
 $(BLD)/menu.$(O) : \
        $(SRC)/menu.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
-       $(SRC)/menu.h \
-       $(SRC)/systime.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h \
-       $(SRC)/window.h
+       $(BLOCKINPUT_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(MENU_H) \
+       $(TERMHOOKS_H) \
+       $(W32TERM_H) \
+       $(WINDOW_H)
 
 $(BLD)/minibuf.$(O) : \
        $(SRC)/minibuf.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/syntax.h \
-       $(SRC)/systime.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(TERMHOOKS_H) \
+       $(WINDOW_H)
 
 $(BLD)/w32.$(O) : \
        $(SRC)/w32.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/grp.h \
-       $(EMACS_ROOT)/nt/inc/pwd.h \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(EMACS_ROOT)/nt/inc/sys/socket.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
        $(SRC)/ndir.h \
-       $(SRC)/process.h \
-       $(SRC)/systime.h \
        $(SRC)/w32.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32heap.h
+       $(SRC)/w32heap.h \
+       $(NT_INC)/pwd.h \
+       $(NT_INC)/sys/file.h \
+       $(NT_INC)/sys/time.h \
+       $(GNU_LIB)/allocator.h \
+       $(CAREADLINKAT_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(GRP_H) \
+       $(LISP_H) \
+       $(PROCESS_H) \
+       $(SOCKET_H) \
+       $(SYSTIME_H)
 
 $(BLD)/w32heap.$(O) : \
        $(SRC)/w32heap.c \
+       $(SRC)/w32heap.h \
        $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/w32heap.h
+       $(LISP_H)
 
 $(BLD)/w32inevt.$(O) : \
        $(SRC)/w32inevt.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/systime.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
+       $(SRC)/termchar.h \
        $(SRC)/w32heap.h \
-       $(SRC)/w32term.h
+       $(SRC)/w32inevt.h \
+       $(BLOCKINPUT_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(TERMHOOKS_H) \
+       $(W32TERM_H) \
+       $(WINDOW_H)
 
 $(BLD)/w32proc.$(O) : \
        $(SRC)/w32proc.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/langinfo.h \
-       $(EMACS_ROOT)/nt/inc/nl_types.h \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/process.h \
        $(SRC)/syssignal.h \
-       $(SRC)/systime.h \
        $(SRC)/syswait.h \
        $(SRC)/w32.h \
-       $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
-       $(SRC)/w32term.h
+       $(NT_INC)/nl_types.h \
+       $(NT_INC)/sys/file.h \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(LANGINFO_H) \
+       $(LISP_H) \
+       $(PROCESS_H) \
+       $(SYSTIME_H) \
+       $(W32TERM_H)
 
 $(BLD)/w32console.$(O) : \
        $(SRC)/w32console.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
-       $(SRC)/frame.h \
        $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32inevt.h
+       $(SRC)/w32heap.h \
+       $(SRC)/w32inevt.h \
+       $(CHARACTER_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(LISP_H) \
+       $(TERMHOOKS_H) \
+       $(WINDOW_H)
 
 $(BLD)/print.$(O) : \
        $(SRC)/print.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/font.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/process.h \
-       $(SRC)/systime.h \
        $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FONT_H) \
+       $(FRAME_H) \
+       $(FTOASTR_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(PROCESS_H) \
+       $(TERMHOOKS_H) \
+       $(WINDOW_H)
 
 $(BLD)/process.$(O) : \
        $(SRC)/process.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/netdb.h \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/arpa/inet.h \
-       $(EMACS_ROOT)/nt/inc/netinet/in.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(EMACS_ROOT)/nt/inc/sys/socket.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/process.h \
+       $(SRC)/gnutls.h \
        $(SRC)/sysselect.h \
        $(SRC)/syssignal.h \
-       $(SRC)/systime.h \
-       $(SRC)/systty.h \
        $(SRC)/syswait.h \
-       $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
-       $(SRC)/w32.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(NT_INC)/arpa/inet.h \
+       $(NT_INC)/netdb.h \
+       $(NT_INC)/netinet/in.h \
+       $(NT_INC)/sys/file.h \
+       $(NT_INC)/sys/ioctl.h \
+       $(NT_INC)/sys/stat.h \
+       $(NT_INC)/unistd.h \
+       $(ATIMER_H) \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(PROCESS_H) \
+       $(SOCKET_H) \
+       $(SYSTIME_H) \
+       $(SYSTTY_H) \
+       $(TERMHOOKS_H) \
+       $(WINDOW_H)
 
 $(BLD)/ralloc.$(O) : \
        $(SRC)/ralloc.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
        $(SRC)/getpagesize.h \
-       $(SRC)/systime.h
+       $(NT_INC)/unistd.h \
+       $(BLOCKINPUT_H) \
+       $(CONFIG_H) \
+       $(LISP_H)
 
 $(BLD)/regex.$(O) : \
        $(SRC)/regex.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
        $(SRC)/category.h \
-       $(SRC)/character.h \
        $(SRC)/regex.h \
-       $(SRC)/syntax.h
+       $(SRC)/syntax.h \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(LISP_H)
 
 $(BLD)/region-cache.$(O) : \
        $(SRC)/region-cache.c \
+       $(SRC)/region-cache.h \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
        $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/region-cache.h
+       $(LISP_H)
 
 $(BLD)/scroll.$(O) : \
        $(SRC)/scroll.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/systime.h \
        $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(TERMHOOKS_H) \
+       $(WINDOW_H)
 
 $(BLD)/search.$(O) : \
        $(SRC)/search.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
        $(SRC)/category.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/intervals.h \
        $(SRC)/regex.h \
        $(SRC)/region-cache.h \
        $(SRC)/syntax.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CONFIG_H) \
+       $(INTERVALS_H) \
+       $(LISP_H)
 
 $(BLD)/sound.$(O) : \
        $(SRC)/sound.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/dispextern.h \
        $(SRC)/syssignal.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h
-
-$(BLD)/strftime.$(O) : \
-       $(SRC)/strftime.c \
+       $(NT_INC)/unistd.h \
+       $(ATIMER_H) \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h
+       $(DISPEXTERN_H) \
+       $(LISP_H)
 
 $(BLD)/syntax.$(O) : \
        $(SRC)/syntax.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
        $(SRC)/category.h \
-       $(SRC)/character.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/intervals.h \
        $(SRC)/keymap.h \
        $(SRC)/regex.h \
        $(SRC)/syntax.h \
-       $(SRC)/w32gui.h
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(INTERVALS_H) \
+       $(LISP_H)
 
 $(BLD)/sysdep.$(O) : \
        $(SRC)/sysdep.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/grp.h \
-       $(EMACS_ROOT)/nt/inc/netdb.h \
-       $(EMACS_ROOT)/nt/inc/pwd.h \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-       $(EMACS_ROOT)/nt/inc/sys/socket.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
        $(SRC)/cm.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/process.h \
+       $(SRC)/sysselect.h \
        $(SRC)/syssignal.h \
-       $(SRC)/systime.h \
-       $(SRC)/systty.h \
        $(SRC)/syswait.h \
        $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
-       $(SRC)/w32.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(NT_INC)/netdb.h \
+       $(NT_INC)/pwd.h \
+       $(NT_INC)/sys/file.h \
+       $(NT_INC)/sys/stat.h \
+       $(NT_INC)/unistd.h \
+       $(GNU_LIB)/allocator.h \
+       $(GNU_LIB)/ignore-value.h \
+       $(GNU_LIB)/utimens.h \
+       $(BLOCKINPUT_H) \
+       $(CAREADLINKAT_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(GRP_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(PROCESS_H) \
+       $(SOCKET_H) \
+       $(SYSTIME_H) \
+       $(SYSTTY_H) \
+       $(TERMHOOKS_H) \
+       $(WINDOW_H)
 
 $(BLD)/term.$(O) : \
        $(SRC)/term.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/cm.h \
-       $(SRC)/coding.h \
        $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/syssignal.h \
-       $(SRC)/systime.h \
-       $(SRC)/systty.h \
        $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
-
-$(BLD)/termcap.$(O) : \
-       $(SRC)/termcap.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(SRC)/lisp.h
+       $(SRC)/tparam.h \
+       $(NT_INC)/sys/file.h \
+       $(NT_INC)/sys/time.h \
+       $(NT_INC)/unistd.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(SYSTTY_H) \
+       $(TERMHOOKS_H) \
+       $(WINDOW_H)
 
 $(BLD)/terminal.$(O) : \
        $(SRC)/terminal.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/systime.h \
        $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h
+       $(CHARSET_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(FRAME_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(TERMHOOKS_H)
 
 $(BLD)/textprop.$(O) : \
        $(SRC)/textprop.c \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
        $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/intervals.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(INTERVALS_H) \
+       $(LISP_H) \
+       $(WINDOW_H)
 
 $(BLD)/tparam.$(O) : \
        $(SRC)/tparam.c \
+       $(SRC)/tparam.h \
        $(CONFIG_H) \
-       $(SRC)/lisp.h
+       $(LISP_H)
 
 $(BLD)/undo.$(O) : \
        $(SRC)/undo.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/buffer.h \
        $(SRC)/commands.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(LISP_H) \
+       $(WINDOW_H)
 
 $(BLD)/unexw32.$(O) : \
        $(SRC)/unexw32.c \
-       $(CONFIG_H) \
-       $(SRC)/w32heap.h
+       $(SRC)/unexec.h \
+       $(SRC)/w32heap.h \
+       $(CONFIG_H)
 
 $(BLD)/vm-limit.$(O) : \
        $(SRC)/vm-limit.c \
+       $(SRC)/mem-limits.h \
        $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/mem-limits.h
+       $(LISP_H)
 
 $(BLD)/window.$(O) : \
        $(SRC)/window.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
-       $(SRC)/frame.h \
        $(SRC)/indent.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
-       $(SRC)/systime.h \
        $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h \
-       $(SRC)/window.h
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(TERMHOOKS_H) \
+       $(W32TERM_H) \
+       $(WINDOW_H)
 
 $(BLD)/xdisp.$(O) : \
        $(SRC)/xdisp.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
-       $(SRC)/font.h \
        $(SRC)/fontset.h \
-       $(SRC)/frame.h \
        $(SRC)/indent.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/macros.h \
-       $(SRC)/process.h \
        $(SRC)/region-cache.h \
-       $(SRC)/systime.h \
        $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h \
-       $(SRC)/window.h
+       $(SRC)/termopts.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FONT_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(PROCESS_H) \
+       $(TERMHOOKS_H) \
+       $(W32TERM_H) \
+       $(WINDOW_H)
 
 $(BLD)/xfaces.$(O) : \
        $(SRC)/xfaces.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/font.h \
        $(SRC)/fontset.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/systime.h \
        $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h \
-       $(SRC)/window.h
+       $(NT_INC)/sys/stat.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FONT_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(TERMHOOKS_H) \
+       $(W32TERM_H) \
+       $(WINDOW_H)
 
 $(BLD)/w32fns.$(O) : \
        $(SRC)/w32fns.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
        $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
        $(SRC)/epaths.h \
-       $(SRC)/font.h \
        $(SRC)/fontset.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/systime.h \
-       $(SRC)/termhooks.h \
        $(SRC)/w32.h \
        $(SRC)/w32font.h \
-       $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
-       $(SRC)/w32term.h \
-       $(SRC)/window.h
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FONT_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(SYSTIME_H) \
+       $(TERMHOOKS_H) \
+       $(W32TERM_H) \
+       $(WINDOW_H)
 
 $(BLD)/w32menu.$(O) : \
        $(SRC)/w32menu.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
-       $(SRC)/menu.h \
-       $(SRC)/systime.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h \
-       $(SRC)/window.h
+       $(SRC)/w32heap.h \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FRAME_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(MENU_H) \
+       $(TERMHOOKS_H) \
+       $(W32TERM_H) \
+       $(WINDOW_H)
 
 $(BLD)/w32term.$(O) : \
        $(SRC)/w32term.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/unistd.h \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
        $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
-       $(SRC)/font.h \
        $(SRC)/fontset.h \
-       $(SRC)/frame.h \
-       $(SRC)/intervals.h \
-       $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
-       $(SRC)/process.h \
-       $(SRC)/systime.h \
-       $(SRC)/systty.h \
        $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
        $(SRC)/w32font.h \
-       $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
-       $(SRC)/w32term.h \
-       $(SRC)/window.h
+       $(NT_INC)/sys/stat.h \
+       $(ATIMER_H) \
+       $(BLOCKINPUT_H) \
+       $(BUFFER_H) \
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FONT_H) \
+       $(FRAME_H) \
+       $(INTERVALS_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(PROCESS_H) \
+       $(SYSTIME_H) \
+       $(SYSTTY_H) \
+       $(TERMHOOKS_H) \
+       $(W32TERM_H) \
+       $(WINDOW_H)
 
 $(BLD)/w32select.$(O) : \
        $(SRC)/w32select.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
        $(SRC)/composite.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
-       $(SRC)/w32term.h
+       $(BLOCKINPUT_H) \
+       $(CHARSET_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(LISP_H) \
+       $(W32TERM_H)
 
 $(BLD)/w32reg.$(O) : \
        $(SRC)/w32reg.c \
+       $(BLOCKINPUT_H) \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h
+       $(LISP_H) \
+       $(W32TERM_H)
 
 $(BLD)/w32xfns.$(O) : \
        $(SRC)/w32xfns.c \
-       $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/time.h \
-       $(SRC)/lisp.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
        $(SRC)/fontset.h \
-       $(SRC)/frame.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h
+       $(BLOCKINPUT_H) \
+       $(CHARSET_H) \
+       $(CONFIG_H) \
+       $(FRAME_H) \
+       $(KEYBOARD_H) \
+       $(LISP_H) \
+       $(W32TERM_H)
 
 $(BLD)/w32font.$(O) : \
        $(SRC)/w32font.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/coding.h \
-       $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/font.h \
        $(SRC)/fontset.h \
-       $(SRC)/frame.h \
        $(SRC)/w32font.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CODING_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FONT_H) \
+       $(FRAME_H) \
+       $(LISP_H) \
+       $(W32TERM_H)
 
 $(BLD)/w32uniscribe.$(O) : \
        $(SRC)/w32uniscribe.c \
-       $(CONFIG_H) \
-       $(SRC)/lisp.h \
-       $(SRC)/ccl.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/font.h \
        $(SRC)/fontset.h \
-       $(SRC)/frame.h \
        $(SRC)/w32font.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h
+       $(CHARACTER_H) \
+       $(CHARSET_H) \
+       $(CONFIG_H) \
+       $(DISPEXTERN_H) \
+       $(FONT_H) \
+       $(FRAME_H) \
+       $(LISP_H) \
+       $(W32TERM_H)
 
 # Each object file depends on stamp_BLD, because in parallel builds we must
 # make sure $(BLD) exists before starting compilations.
 #
-$(OBJ0) $(OBJ1) $(WIN32OBJ) $(FONTOBJ) $(BLD)/lastfile.$(O) $(BLD)/firstfile.$(O): stamp_BLD
+$(OBJ0) $(OBJ1) $(OBJ2) $(BLD)/lastfile.$(O) $(BLD)/firstfile.$(O): stamp_BLD