(mac_draw_string_common): Remove arg MODE. New arg
[bpt/emacs.git] / src / makefile.w32-in
index 4208329..a94938a 100644 (file)
@@ -1,28 +1,32 @@
-#  Makefile for GNU Emacs on the Microsoft W32 API.
-#  Copyright (c) 1992-2000 Free Software Foundation, Inc.
+#  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
+#  Copyright (C) 2000, 2001, 2002, 2003, 2004,
+#                2005, 2006 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
-#  
+#
 #  GNU Emacs is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; either version 2, or (at your option)
 #  any later version.
-#  
+#
 #  GNU Emacs is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
-#  
+#
 #  You should have received a copy of the GNU General Public License
 #  along with GNU Emacs; see the file COPYING.  If not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
+#  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#  Boston, MA 02110-1301, USA.
 #
 
 ALL = emacs
 
 .PHONY: $(ALL)
 
+# 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.
@@ -39,6 +43,8 @@ TOBJ            = $(BLD)/firstfile.$(O)
 TRES           = $(BLD)/emacs.res
 TLASTLIB       = $(BLD)/lastfile.$(A)
 
+DOC            = $(OBJDIR)/etc/DOC-X
+
 FULL_LINK_FLAGS      = $(LINK_FLAGS) $(TEMACS_EXTRA_LINK)
 
 #
@@ -52,7 +58,6 @@ OBJ0 =  $(BLD)/emacs.$(O)
 
 OBJ1 =  $(BLD)/abbrev.$(O)                     \
        $(BLD)/alloc.$(O)                       \
-       $(BLD)/alloca.$(O)                      \
        $(BLD)/atimer.$(O)                      \
        $(BLD)/buffer.$(O)                      \
        $(BLD)/bytecode.$(O)                    \
@@ -79,8 +84,8 @@ OBJ1 =  $(BLD)/abbrev.$(O)                    \
        $(BLD)/lread.$(O)                       \
        $(BLD)/macros.$(O)                      \
        $(BLD)/marker.$(O)                      \
+       $(BLD)/md5.$(O)                         \
        $(BLD)/minibuf.$(O)                     \
-       $(BLD)/mocklisp.$(O)                    \
        $(BLD)/w32.$(O)                         \
        $(BLD)/w32heap.$(O)                     \
        $(BLD)/w32inevt.$(O)                    \
@@ -91,6 +96,7 @@ OBJ1 =  $(BLD)/abbrev.$(O)                    \
        $(BLD)/regex.$(O)                       \
        $(BLD)/scroll.$(O)                      \
        $(BLD)/search.$(O)                      \
+       $(BLD)/sound.$(O)                       \
        $(BLD)/syntax.$(O)                      \
        $(BLD)/sysdep.$(O)                      \
        $(BLD)/term.$(O)                        \
@@ -115,7 +121,9 @@ OBJ1 =  $(BLD)/abbrev.$(O)                  \
        $(BLD)/coding.$(O)                      \
        $(BLD)/category.$(O)                    \
        $(BLD)/ccl.$(O)                         \
-       $(BLD)/fontset.$(O)
+       $(BLD)/fontset.$(O)                     \
+       $(BLD)/fringe.$(O)                      \
+       $(BLD)/image.$(O)
 
 WIN32OBJ = $(BLD)/w32term.$(O)                 \
           $(BLD)/w32xfns.$(O)                  \
@@ -130,12 +138,14 @@ LIBS =  $(TLIB0)  \
        $(TLIB1)        \
        $(TLIBW32)      \
        $(TLASTLIB)     \
+       $(WINMM)    \
        $(ADVAPI32)     \
        $(GDI32)        \
        $(COMDLG32)     \
        $(USER32)       \
        $(MPR)          \
        $(SHELL32)      \
+       $(WINSPOOL)     \
        $(libc)
 
 #
@@ -148,7 +158,8 @@ all:            $(ALL)
 #
 emacs:          $(BLD) $(EMACS)
 $(EMACS):       $(DOC) $(TEMACS)
-               "./$(BLD)/temacs.exe" -batch -l loadup dump
+       "$(THISDIR)/$(BLD)/temacs.exe" -batch -l loadup dump
+       -"$(THISDIR)/$(BLD)/emacs.exe" -q -batch -f list-load-path-shadows
 
 #
 # The undumped executable
@@ -157,9 +168,13 @@ $(EMACS):       $(DOC) $(TEMACS)
 # (it is the preload heap size in MB).
 #
 temacs:         $(BLD) $(TEMACS)
-$(TEMACS):      $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES)
-               $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
-               "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 16
+$(TEMACS):      $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES) \
+                 ../nt/$(BLD)/addsection.exe
+       $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
+       "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 16
+       echo $(OBJ0) > $(BLD)/buildobj.lst
+       echo $(OBJ1) >> $(BLD)/buildobj.lst
+       echo $(WIN32OBJ) >> $(BLD)/buildobj.lst
 
 bootstrap: bootstrap-emacs
 
@@ -167,48 +182,50 @@ bootstrap: bootstrap-emacs
 # Build a temacs with a sufficiently large PURESIZE to load the
 # Lisp files from loadup.el in source form.
 #
-bootstrap-temacs: bootstrap-clean
-               $(MAKECMD) temacs CFLAGS="$(CFLAGS) -DPURESIZE=5000000"
+# 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:
+       $(MAKE) $(MFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS) -DPURESIZE=5000000$(ARGQUOTE)
 
 #
-# Dump an Emacs executable named bootstrap-emacs containing the 
+# Dump an Emacs executable named bootstrap-emacs containing the
 # files from loadup.el in source form.
 #
 bootstrap-emacs: bootstrap-temacs
-               "./$(BLD)/temacs.exe" -batch -l loadup bootstrap
-               - mkdir "../bin"
-               $(CP) $(EMACS) ../bin
+       "$(THISDIR)/$(BLD)/temacs.exe" -batch -l loadup bootstrap
+       - mkdir "../bin"
+       $(CP) $(EMACS) ../bin
 
 #
 # Force recompile of files that depend on PURESIZE
 #
 bootstrap-clean:
-               - $(DEL) $(BLD)/alloc.$(O)
-               - $(DEL) $(BLD)/data.$(O)
-               - $(DEL) $(BLD)/intervals.$(O)
-               - $(DEL) $(BLD)/keyboard.$(O)
-               - $(DEL) $(BLD)/keymap.$(O)
+       - $(DEL) $(BLD)/alloc.$(O)
+       - $(DEL) $(BLD)/data.$(O)
+       - $(DEL) $(BLD)/intervals.$(O)
+       - $(DEL) $(BLD)/keyboard.$(O)
+       - $(DEL) $(BLD)/keymap.$(O)
 
 #
 # The resource file.  NT 3.10 requires the use of cvtres; even though
 # it is not necessary on later versions, it is still ok to use it.
 #
-$(TRES):       ../nt/emacs.rc
-               $(RC) $(RC_INCLUDE)../nt $(RC_OUT)$@ $(ALL_DEPS)
+$(TRES): ../nt/emacs.rc
+       $(RC) $(RC_INCLUDE)../nt $(RC_OUT)$@ $(ALL_DEPS)
 
 #
-# Build the library.  Split up the build into two phases...otherwise we 
+# Build the library.  Split up the build into two phases...otherwise we
 # run out of command line space.
 #
 $(TLIB0):       $(OBJ0)
-               - $(DEL) $@
-               $(AR) $(AR_OUT)$@ $(ALL_DEPS)
+       - $(DEL) $@
+       $(AR) $(AR_OUT)$@ $(ALL_DEPS)
 $(TLIB1):       $(OBJ1)
-               - $(DEL) $@
-               $(AR) $(AR_OUT)$@ $(ALL_DEPS)
+       - $(DEL) $@
+       $(AR) $(AR_OUT)$@ $(ALL_DEPS)
 $(TLIBW32):    $(WIN32OBJ)
-               - $(DEL) $@
-               $(AR) $(AR_OUT)$@ $(ALL_DEPS)
+       - $(DEL) $@
+       $(AR) $(AR_OUT)$@ $(ALL_DEPS)
 
 #
 # Place lastfile.$(O) in its own library so that it can be loaded after
@@ -216,69 +233,73 @@ $(TLIBW32):       $(WIN32OBJ)
 # the end of Emacs' data section portably across compilers and systems.
 #
 $(TLASTLIB):   $(BLD)/lastfile.$(O)
-               - $(DEL) $@
-               $(AR) $(AR_OUT)$@ $(ALL_DEPS)
+       - $(DEL) $@
+       $(AR) $(AR_OUT)$@ $(ALL_DEPS)
 
 #
 # Assuming INSTALL_DIR is defined, build and install emacs in it.
 #
 install:        $(ALL)
-               - mkdir "$(INSTALL_DIR)/bin"
-               $(CP) $(EMACS) $(INSTALL_DIR)/bin
+       - mkdir "$(INSTALL_DIR)/bin"
+       $(CP) $(EMACS) $(INSTALL_DIR)/bin
 
 #
 # Maintenance
-# 
-clean:;         - $(DEL) *~ "s/*~" "m/*~"
-               - $(DEL) *.pdb config.h epaths.h
-               - $(DEL_TREE) $(OBJDIR)
+#
+clean:
+       - $(DEL) *~ "s/*~" "m/*~"
+       - $(DEL) $(COMPILER_TEMP_FILES)
+       - $(DEL_TREE) $(OBJDIR)
+
+distclean:     clean
+       - $(DEL) config.h epaths.h
 
 cleanall:      clean
-               - $(DEL_TREE) obj
-               - $(DEL_TREE) obj-spd
-               - $(DEL_TREE) oo
-               - $(DEL_TREE) oo-spd
+       - $(DEL_TREE) obj
+       - $(DEL_TREE) obj-spd
+       - $(DEL_TREE) oo
+       - $(DEL_TREE) oo-spd
 
 ### DEPENDENCIES ###
 
 EMACS_ROOT     = ..
 SRC            = .
 
-$(BLD)/abbrev.obj : \
+$(BLD)/abbrev.$(O) : \
        $(SRC)/abbrev.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/commands.h \
        $(SRC)/buffer.h \
+       $(SRC)/charset.h \
+       $(SRC)/commands.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/syntax.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
        $(SRC)/window.h
 
-$(BLD)/alloc.obj : \
+$(BLD)/alloc.$(O) : \
        $(SRC)/alloc.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/buffer.h \
+       $(SRC)/charset.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/frame.h \
        $(SRC)/intervals.h \
-       $(SRC)/composite.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/process.h \
        $(SRC)/puresize.h \
-       $(SRC)/buffer.h \
-       $(SRC)/window.h \
-       $(SRC)/frame.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/syssignal.h
-
-$(BLD)/alloca.obj : \
-       $(SRC)/alloca.c \
-       $(EMACS_ROOT)/src/s/ms-w32.h \
-       $(EMACS_ROOT)/src/m/intel386.h \
-       $(EMACS_ROOT)/src/config.h \
-       $(SRC)/s/ms-w32.h \
-       $(SRC)/m/intel386.h \
-       $(SRC)/config.h \
-       $(SRC)/blockinput.h
+       $(SRC)/syssignal.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/atimer.obj : \
+$(BLD)/atimer.$(O) : \
        $(SRC)/atimer.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
@@ -287,79 +308,128 @@ $(BLD)/atimer.obj : \
        $(SRC)/m/intel386.h \
        $(SRC)/config.h \
        $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/syssignal.h \
-       $(SRC)/systime.h \
-       $(SRC)/blockinput.h
+       $(SRC)/systime.h
 
-$(BLD)/buffer.obj : \
+$(BLD)/buffer.$(O) : \
        $(SRC)/buffer.c \
        $(EMACS_ROOT)/nt/inc/sys/param.h \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/intervals.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/buffer.h \
+       $(SRC)/charset.h \
+       $(SRC)/commands.h \
        $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
        $(SRC)/frame.h \
-       $(SRC)/window.h \
-       $(SRC)/commands.h \
-       $(SRC)/buffer.h \
        $(SRC)/indent.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/region-cache.h
+       $(SRC)/intervals.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/keymap.h \
+       $(SRC)/region-cache.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/bytecode.obj : \
+$(BLD)/bytecode.$(O) : \
        $(SRC)/bytecode.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
        $(SRC)/buffer.h \
-       $(SRC)/syntax.h
+       $(SRC)/charset.h \
+       $(SRC)/syntax.h \
+       $(SRC)/window.h
 
-$(BLD)/callint.obj : \
+$(BLD)/callint.$(O) : \
        $(SRC)/callint.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
        $(SRC)/buffer.h \
        $(SRC)/commands.h \
+       $(SRC)/dispextern.h \
        $(SRC)/keyboard.h \
-       $(SRC)/window.h \
-       $(SRC)/mocklisp.h
+       $(SRC)/keymap.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/callproc.obj : \
+$(BLD)/callproc.$(O) : \
        $(SRC)/callproc.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/msdos.h \
        $(EMACS_ROOT)/nt/inc/sys/param.h \
-       $(SRC)/commands.h \
+       $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
+       $(EMACS_ROOT)/nt/inc/sys/file.h \
        $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/commands.h \
+       $(SRC)/composite.h \
+       $(SRC)/epaths.h \
        $(SRC)/process.h \
        $(SRC)/syssignal.h \
-       $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(SRC)/systty.h
+       $(SRC)/systty.h \
+       $(SRC)/w32.h
 
-$(BLD)/casefiddle.obj : \
+$(BLD)/casefiddle.$(O) : \
        $(SRC)/casefiddle.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
        $(SRC)/buffer.h \
+       $(SRC)/charset.h \
        $(SRC)/commands.h \
+       $(SRC)/composite.h \
+       $(SRC)/keymap.h \
        $(SRC)/syntax.h
-       $(CC) $(CFLAGS) -Fo$@ casefiddle.c
 
-$(BLD)/casetab.obj : \
+$(BLD)/casetab.$(O) : \
        $(SRC)/casetab.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/buffer.h
+       $(SRC)/buffer.h \
+       $(SRC)/charset.h
+
+$(BLD)/category.$(O) : \
+       $(SRC)/category.c \
+       $(EMACS_ROOT)/src/s/ms-w32.h \
+       $(EMACS_ROOT)/src/m/intel386.h \
+       $(EMACS_ROOT)/src/config.h \
+       $(SRC)/buffer.h \
+       $(SRC)/category.h \
+       $(SRC)/charset.h \
+       $(SRC)/keymap.h
+
+$(BLD)/ccl.$(O) : \
+       $(SRC)/ccl.c \
+       $(EMACS_ROOT)/src/s/ms-w32.h \
+       $(EMACS_ROOT)/src/m/intel386.h \
+       $(EMACS_ROOT)/src/config.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h
+
+$(BLD)/charset.$(O) : \
+       $(SRC)/charset.c \
+       $(EMACS_ROOT)/src/s/ms-w32.h \
+       $(EMACS_ROOT)/src/m/intel386.h \
+       $(EMACS_ROOT)/src/config.h \
+       $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
+       $(SRC)/disptab.h
 
-$(BLD)/cm.obj : \
+$(BLD)/cm.$(O) : \
        $(SRC)/cm.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
@@ -367,173 +437,221 @@ $(BLD)/cm.obj : \
        $(SRC)/cm.h \
        $(SRC)/termhooks.h
 
-$(BLD)/cmds.obj : \
+$(BLD)/cmds.$(O) : \
        $(SRC)/cmds.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/commands.h \
        $(SRC)/buffer.h \
-       $(SRC)/syntax.h
+       $(SRC)/charset.h \
+       $(SRC)/commands.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/keymap.h \
+       $(SRC)/syntax.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/composite.obj : \
-       $(SRC)/composite.c \
+$(BLD)/coding.$(O) : \
+       $(SRC)/coding.c \
+       $(EMACS_ROOT)/src/s/ms-w32.h \
+       $(EMACS_ROOT)/src/m/intel386.h \
+       $(EMACS_ROOT)/src/config.h \
        $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
        $(SRC)/charset.h \
-       $(SRC)/intervals.h \
+       $(SRC)/coding.h \
        $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/intervals.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
+
+$(BLD)/composite.$(O) : \
+       $(SRC)/composite.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
-       $(EMACS_ROOT)/src/config.h
+       $(EMACS_ROOT)/src/config.h \
+       $(SRC)/buffer.h \
+       $(SRC)/charset.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/intervals.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h
 
-$(BLD)/data.obj : \
+$(BLD)/data.$(O) : \
        $(SRC)/data.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/puresize.h \
        $(SRC)/buffer.h \
+       $(SRC)/charset.h \
+       $(SRC)/frame.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/puresize.h \
        $(SRC)/syssignal.h
 
-$(BLD)/dired.obj : \
+$(BLD)/dired.$(O) : \
        $(SRC)/dired.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/vmsdir.h \
-       $(SRC)/ndir.h \
        $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/regex.h
+       $(SRC)/ndir.h \
+       $(SRC)/regex.h \
+       $(SRC)/systime.h
 
-$(BLD)/dispnew.obj : \
+$(BLD)/dispnew.$(O) : \
        $(SRC)/dispnew.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/termchar.h \
-       $(SRC)/termopts.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/cm.h \
+       $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
+       $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
-       $(SRC)/frame.h \
-       $(SRC)/window.h \
+       $(SRC)/charset.h \
+       $(SRC)/cm.h \
        $(SRC)/commands.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
+       $(SRC)/frame.h \
        $(SRC)/indent.h \
-       $(SRC)/dispextern.h \
        $(SRC)/intervals.h \
-       $(SRC)/composite.h \
-       $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(SRC)/systty.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/process.h \
+       $(SRC)/syssignal.h \
+       $(SRC)/systime.h \
+       $(SRC)/termchar.h \
+       $(SRC)/termhooks.h \
+       $(SRC)/termopts.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
        $(SRC)/w32term.h \
-       $(SRC)/xterm.h \
-       $(SRC)/vmstime.h \
-       $(SRC)/systime.h
+       $(SRC)/window.h
 
-$(BLD)/doc.obj : \
+$(BLD)/doc.$(O) : \
        $(SRC)/doc.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
        $(SRC)/buffer.h \
-       $(SRC)/keyboard.h
+       $(SRC)/charset.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/keymap.h
 
-$(BLD)/doprnt.obj : \
+$(BLD)/doprnt.$(O) : \
        $(SRC)/doprnt.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
-       $(EMACS_ROOT)/src/config.h
-
-$(BLD)/dosfns.obj : \
-       $(SRC)/dosfns.c \
-       $(EMACS_ROOT)/src/s/ms-w32.h \
-       $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/buffer.h \
-       $(SRC)/termchar.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/frame.h \
-       $(SRC)/dosfns.h \
-       $(SRC)/msdos.h
+       $(SRC)/charset.c
 
-$(BLD)/editfns.obj : \
+$(BLD)/editfns.$(O) : \
        $(SRC)/editfns.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/uaf.h \
-       $(SRC)/vms-pwd.h \
        $(EMACS_ROOT)/nt/inc/pwd.h \
+       $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/frame.h \
        $(SRC)/intervals.h \
-       $(SRC)/composite.h \
-       $(SRC)/buffer.h \
-       $(SRC)/window.h \
-       $(SRC)/vmstime.h \
-       $(SRC)/systime.h
+       $(SRC)/systime.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/emacs.obj : \
+$(BLD)/emacs.$(O) : \
        $(SRC)/emacs.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
+       $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
+       $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/buffer.h \
        $(SRC)/commands.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/intervals.h \
-       $(SRC)/composite.h \
-       $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(SRC)/systty.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/keymap.h \
+       $(SRC)/process.h \
        $(SRC)/syssignal.h \
-       $(SRC)/process.h
+       $(SRC)/systime.h \
+       $(SRC)/systty.h \
+       $(SRC)/termhooks.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/w32heap.h \
+       $(SRC)/window.h
 
-$(BLD)/eval.obj : \
+$(BLD)/eval.$(O) : \
        $(SRC)/eval.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
+       $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/commands.h \
-       $(SRC)/keyboard.h
+       $(SRC)/dispextern.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/systime.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h
 
-$(BLD)/fileio.obj : \
+$(BLD)/fileio.$(O) : \
        $(SRC)/fileio.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/uaf.h \
-       $(SRC)/vms-pwd.h \
        $(EMACS_ROOT)/nt/inc/pwd.h \
-       $(SRC)/msdos.h \
        $(EMACS_ROOT)/nt/inc/sys/param.h \
-       $(SRC)/vmsdir.h \
+       $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/commands.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/intervals.h \
-       $(SRC)/composite.h \
-       $(SRC)/buffer.h \
-       $(SRC)/window.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(SRC)/vmstime.h \
-       $(SRC)/systime.h
+       $(SRC)/systime.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/filelock.obj : \
+$(BLD)/filelock.$(O) : \
        $(SRC)/filelock.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/uaf.h \
-       $(SRC)/vms-pwd.h \
        $(EMACS_ROOT)/nt/inc/pwd.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
        $(EMACS_ROOT)/src/epaths.h \
        $(SRC)/buffer.h \
-       $(SRC)/vmsdir.h \
-       $(SRC)/ndir.h
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/systime.h
 
-$(BLD)/filemode.obj : \
+$(BLD)/filemode.$(O) : \
        $(SRC)/filemode.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
@@ -542,318 +660,440 @@ $(BLD)/filemode.obj : \
        $(SRC)/m/intel386.h \
        $(SRC)/config.h
 
-$(BLD)/firstfile.obj : \
+$(BLD)/firstfile.$(O) : \
        $(SRC)/firstfile.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h
 
-$(BLD)/floatfns.obj : \
+$(BLD)/floatfns.$(O) : \
        $(SRC)/floatfns.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
        $(SRC)/syssignal.h
 
-$(BLD)/fns.obj : \
+$(BLD)/fns.$(O) : \
        $(SRC)/fns.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/commands.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
-       $(SRC)/keyboard.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/commands.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/frame.h \
        $(SRC)/intervals.h \
-       $(SRC)/composite.h
+       $(SRC)/keyboard.h \
+       $(SRC)/keymap.h \
+       $(SRC)/md5.h \
+       $(SRC)/systime.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/frame.obj : \
-       $(SRC)/frame.c \
+$(BLD)/fontset.$(O) : \
+       $(SRC)/fontset.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/frame.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/window.h \
        $(SRC)/buffer.h \
-       $(SRC)/commands.h \
-       $(SRC)/keyboard.h
-
-$(BLD)/getloadavg.obj : \
-       $(SRC)/getloadavg.c \
-       $(EMACS_ROOT)/nt/inc/sys/param.h \
-       $(EMACS_ROOT)/src/s/ms-w32.h \
-       $(EMACS_ROOT)/src/m/intel386.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/fontset.h \
+       $(SRC)/frame.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
+
+$(BLD)/frame.$(O) : \
+       $(SRC)/frame.c \
+       $(EMACS_ROOT)/src/s/ms-w32.h \
+       $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/s/ms-w32.h \
-       $(SRC)/m/intel386.h \
-       $(SRC)/config.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/buffer.h \
+       $(SRC)/charset.h \
+       $(SRC)/commands.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/fontset.h \
+       $(SRC)/frame.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/systime.h \
+       $(SRC)/termhooks.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/w32term.h \
+       $(SRC)/window.h
 
-$(BLD)/gmalloc.obj : \
+$(BLD)/fringe.$(O) : \
+       $(SRC)/fringe.c \
+       $(EMACS_ROOT)/src/s/ms-w32.h \
+       $(EMACS_ROOT)/src/m/intel386.h \
+       $(EMACS_ROOT)/src/config.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/buffer.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/frame.h \
+       $(SRC)/systime.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
+
+$(BLD)/gmalloc.$(O) : \
        $(SRC)/gmalloc.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
        $(EMACS_ROOT)/nt/inc/sys/param.h \
        $(SRC)/getpagesize.h
-       $(CC) $(CFLAGS) -D__STDC__ -Fo$@ gmalloc.c
 
-$(BLD)/hftctl.obj : \
-       $(SRC)/hftctl.c \
+$(BLD)/image.$(O): \
+       $(SRC)/image.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(EMACS_ROOT)/nt/inc/sys/ioctl.h
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/epaths.h \
+       $(SRC)/frame.h \
+       $(SRC)/systime.h \
+       $(SRC)/termhooks.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/w32heap.h \
+       $(SRC)/w32term.h \
+       $(SRC)/window.h
 
-$(BLD)/indent.obj : \
+$(BLD)/indent.$(O) : \
        $(SRC)/indent.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
        $(SRC)/buffer.h \
-       $(SRC)/indent.h \
-       $(SRC)/frame.h \
-       $(SRC)/window.h \
-       $(SRC)/termchar.h \
-       $(SRC)/termopts.h \
-       $(SRC)/disptab.h \
+       $(SRC)/category.h \
+       $(SRC)/charset.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)/composite.h
+       $(SRC)/termchar.h \
+       $(SRC)/termopts.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/insdel.obj : \
+$(BLD)/insdel.$(O) : \
        $(SRC)/insdel.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/buffer.h \
+       $(SRC)/charset.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/intervals.h \
-       $(SRC)/composite.h \
-       $(SRC)/buffer.h \
-       $(SRC)/window.h \
-       $(SRC)/blockinput.h
+       $(SRC)/region-cache.h \
+       $(SRC)/systime.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/intervals.obj : \
+$(BLD)/intervals.$(O) : \
        $(SRC)/intervals.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
+       $(SRC)/buffer.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/intervals.h \
-       $(SRC)/composite.h \
        $(SRC)/keyboard.h \
-       $(SRC)/buffer.h \
-       $(SRC)/puresize.h
+       $(SRC)/keymap.h \
+       $(SRC)/puresize.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h
 
-$(BLD)/keyboard.obj : \
+$(BLD)/keyboard.$(O) : \
        $(SRC)/keyboard.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/termchar.h \
-       $(SRC)/termopts.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/macros.h \
-       $(SRC)/frame.h \
-       $(SRC)/window.h \
-       $(SRC)/commands.h \
+       $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
+       $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
-       $(SRC)/disptab.h \
-       $(SRC)/keyboard.h \
+       $(SRC)/charset.h \
+       $(SRC)/commands.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/disptab.h \
+       $(SRC)/frame.h \
        $(SRC)/intervals.h \
-       $(SRC)/composite.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/msdos.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/keymap.h \
+       $(SRC)/macros.h \
+       $(SRC)/puresize.h \
+       $(SRC)/syntax.h \
        $(SRC)/syssignal.h \
-       $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(SRC)/systime.h \
        $(SRC)/systty.h \
+       $(SRC)/termchar.h \
+       $(SRC)/termhooks.h \
+       $(SRC)/termopts.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
        $(SRC)/w32term.h \
-       $(SRC)/xterm.h \
-       $(SRC)/vmstime.h \
-       $(SRC)/systime.h \
-       $(SRC)/atimer.h
+       $(SRC)/window.h
 
-$(BLD)/keymap.obj : \
+$(BLD)/keymap.$(O) : \
        $(SRC)/keymap.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/commands.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
+       $(SRC)/charset.h \
+       $(SRC)/commands.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
+       $(SRC)/keymap.h \
+       $(SRC)/puresize.h \
+       $(SRC)/systime.h \
        $(SRC)/termhooks.h \
-       $(SRC)/blockinput.h
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h
 
-$(BLD)/lastfile.obj : \
+$(BLD)/lastfile.$(O) : \
        $(SRC)/lastfile.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h
 
-$(BLD)/lread.obj : \
+$(BLD)/lread.$(O) : \
        $(SRC)/lread.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(SRC)/buffer.h \
        $(EMACS_ROOT)/src/epaths.h \
+       $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
        $(SRC)/termhooks.h \
-       $(SRC)/msdos.h
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h
 
-$(BLD)/macros.obj : \
+$(BLD)/macros.$(O) : \
        $(SRC)/macros.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/macros.h \
-       $(SRC)/commands.h \
        $(SRC)/buffer.h \
+       $(SRC)/commands.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/macros.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
        $(SRC)/window.h
 
-$(BLD)/marker.obj : \
+$(BLD)/marker.$(O) : \
        $(SRC)/marker.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/buffer.h
+       $(SRC)/buffer.h \
+       $(SRC)/charset.h
+
+$(BLD)/md5.$(O) : \
+       $(SRC)/md5.c \
+       $(SRC)/md5.h
 
-$(BLD)/minibuf.obj : \
+$(BLD)/minibuf.$(O) : \
        $(SRC)/minibuf.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/commands.h \
        $(SRC)/buffer.h \
+       $(SRC)/charset.h \
+       $(SRC)/commands.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/frame.h \
-       $(SRC)/window.h \
-       $(SRC)/syntax.h
-
-$(BLD)/mocklisp.obj : \
-       $(SRC)/mocklisp.c \
-       $(EMACS_ROOT)/src/s/ms-w32.h \
-       $(EMACS_ROOT)/src/m/intel386.h \
-       $(EMACS_ROOT)/src/config.h \
-       $(SRC)/buffer.h
+       $(SRC)/intervals.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/keymap.h \
+       $(SRC)/syntax.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/w32.obj : \
+$(BLD)/w32.$(O) : \
        $(SRC)/w32.c \
-       $(SRC)/w32.h \
+       $(EMACS_ROOT)/nt/inc/pwd.h \
        $(SRC)/s/ms-w32.h \
        $(SRC)/m/intel386.h \
        $(SRC)/config.h \
-       $(EMACS_ROOT)/nt/inc/pwd.h \
+       $(SRC)/ndir.h \
+       $(SRC)/systime.h \
+       $(SRC)/w32.h \
        $(SRC)/w32heap.h
 
-$(BLD)/w32heap.obj : \
+$(BLD)/w32heap.$(O) : \
        $(SRC)/w32heap.c \
-       $(SRC)/w32heap.h \
        $(SRC)/s/ms-w32.h \
        $(SRC)/m/intel386.h \
-       $(SRC)/config.h
+       $(SRC)/config.h \
+       $(SRC)/w32heap.h
 
-$(BLD)/w32inevt.obj : \
+$(BLD)/w32inevt.$(O) : \
        $(SRC)/w32inevt.c \
        $(SRC)/s/ms-w32.h \
        $(SRC)/m/intel386.h \
        $(SRC)/config.h \
-       $(SRC)/frame.h \
+       $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
+       $(SRC)/frame.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/systime.h \
        $(SRC)/termhooks.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
        $(SRC)/w32term.h
 
-$(BLD)/w32proc.obj : \
+$(BLD)/w32proc.$(O) : \
        $(SRC)/w32proc.c \
        $(SRC)/s/ms-w32.h \
        $(SRC)/m/intel386.h \
        $(SRC)/config.h \
+       $(SRC)/process.h \
+       $(SRC)/syssignal.h \
+       $(SRC)/systime.h \
+       $(SRC)/syswait.h \
        $(SRC)/w32.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
-       $(SRC)/vmstime.h \
-       $(SRC)/systime.h
+       $(SRC)/w32term.h
 
-$(BLD)/w32console.obj : \
+$(BLD)/w32console.$(O) : \
        $(SRC)/w32console.c \
        $(SRC)/s/ms-w32.h \
        $(SRC)/m/intel386.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/config.h \
-       $(SRC)/frame.h \
+       $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
+       $(SRC)/frame.h \
        $(SRC)/termhooks.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
        $(SRC)/w32inevt.h
 
-$(BLD)/prefix-args.obj : \
-       $(SRC)/prefix-args.c
-
-$(BLD)/print.obj : \
+$(BLD)/print.$(O) : \
        $(SRC)/print.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
        $(SRC)/buffer.h \
+       $(SRC)/charset.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
        $(SRC)/frame.h \
-       $(SRC)/window.h \
+       $(SRC)/intervals.h \
+       $(SRC)/keyboard.h \
        $(SRC)/process.h \
        $(SRC)/termchar.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/intervals.h \
-       $(SRC)/composite.h
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/process.obj : \
+$(BLD)/process.$(O) : \
        $(SRC)/process.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(SRC)/systty.h \
-       $(SRC)/window.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
-       $(SRC)/process.h \
-       $(SRC)/termhooks.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
        $(SRC)/frame.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/process.h \
+       $(SRC)/sysselect.h \
        $(SRC)/syssignal.h \
-       $(SRC)/vmsproc.h \
-       $(SRC)/syswait.h \
-       $(SRC)/vmstime.h \
        $(SRC)/systime.h \
+       $(SRC)/systty.h \
+       $(SRC)/syswait.h \
+       $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
-       $(SRC)/composite.h \
-       $(SRC)/atimer.h
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/ralloc.obj : \
+$(BLD)/ralloc.$(O) : \
        $(SRC)/ralloc.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
+       $(EMACS_ROOT)/nt/inc/sys/param.h \
        $(SRC)/s/ms-w32.h \
        $(SRC)/m/intel386.h \
        $(SRC)/config.h \
-       $(EMACS_ROOT)/nt/inc/sys/param.h \
        $(SRC)/getpagesize.h
 
-$(BLD)/regex.obj : \
+$(BLD)/regex.$(O) : \
        $(SRC)/regex.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
        $(SRC)/s/ms-w32.h \
        $(SRC)/m/intel386.h \
-       $(SRC)/config.h \
        $(SRC)/buffer.h \
-       $(SRC)/syntax.h \
-       $(SRC)/regex.h
+       $(SRC)/category.h \
+       $(SRC)/charset.h \
+       $(SRC)/config.h \
+       $(SRC)/regex.h \
+       $(SRC)/syntax.h
 
-$(BLD)/region-cache.obj : \
+$(BLD)/region-cache.$(O) : \
        $(SRC)/region-cache.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
@@ -861,126 +1101,146 @@ $(BLD)/region-cache.obj : \
        $(SRC)/buffer.h \
        $(SRC)/region-cache.h
 
-$(BLD)/scroll.obj : \
+$(BLD)/scroll.$(O) : \
        $(SRC)/scroll.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/termchar.h \
        $(SRC)/dispextern.h \
-       $(SRC)/frame.h
+       $(SRC)/frame.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/termchar.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/search.obj : \
+$(BLD)/search.$(O) : \
        $(SRC)/search.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/syntax.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
+       $(SRC)/category.h \
+       $(SRC)/charset.h \
        $(SRC)/commands.h \
-       $(SRC)/blockinput.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/intervals.h \
        $(SRC)/regex.h \
        $(SRC)/region-cache.h \
-       $(SRC)/composite.h
+       $(SRC)/syntax.h \
+       $(SRC)/systime.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h
+
+$(BLD)/sound.$(O) : \
+       $(SRC)/sound.c \
+       $(SRC)/lisp.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/atimer.h \
+       $(SRC)/syssignal.h
 
-$(BLD)/strftime.obj : \
+$(BLD)/strftime.$(O) : \
        $(SRC)/strftime.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h
 
-$(BLD)/sunfns.obj : \
-       $(SRC)/sunfns.c \
-       $(EMACS_ROOT)/src/s/ms-w32.h \
-       $(EMACS_ROOT)/src/m/intel386.h \
-       $(EMACS_ROOT)/src/config.h \
-       $(SRC)/window.h \
-       $(SRC)/buffer.h \
-       $(SRC)/termhooks.h
-
-$(BLD)/syntax.obj : \
+$(BLD)/syntax.$(O) : \
        $(SRC)/syntax.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/commands.h \
        $(SRC)/buffer.h \
+       $(SRC)/category.h \
+       $(SRC)/charset.h \
+       $(SRC)/commands.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/intervals.h \
+       $(SRC)/keymap.h \
        $(SRC)/syntax.h \
-       $(SRC)/composite.h
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h
 
-$(BLD)/sysdep.obj : \
+$(BLD)/sysdep.$(O) : \
        $(SRC)/sysdep.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/dosfns.h \
-       $(SRC)/msdos.h \
        $(EMACS_ROOT)/nt/inc/sys/param.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(SRC)/systty.h \
-       $(SRC)/vmsproc.h \
-       $(SRC)/syswait.h \
-       $(SRC)/frame.h \
-       $(SRC)/window.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/termchar.h \
-       $(SRC)/termopts.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/dispextern.h \
-       $(SRC)/process.h \
-       $(SRC)/vmsdir.h \
+       $(SRC)/frame.h \
+       $(SRC)/keyboard.h \
        $(SRC)/ndir.h \
+       $(SRC)/process.h \
+       $(SRC)/sysselect.h \
        $(SRC)/syssignal.h \
-       $(SRC)/vmstime.h \
        $(SRC)/systime.h \
-       $(SRC)/uaf.h \
-       $(SRC)/vms-pwd.h \
-       $(EMACS_ROOT)/src/acldef.h \
-       $(EMACS_ROOT)/src/chpdef.h
+       $(SRC)/systty.h \
+       $(SRC)/syswait.h \
+       $(SRC)/termchar.h \
+       $(SRC)/termhooks.h \
+       $(SRC)/termopts.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/term.obj : \
+$(BLD)/term.$(O) : \
        $(SRC)/term.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/termchar.h \
-       $(SRC)/termopts.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
        $(SRC)/cm.h \
-       $(SRC)/frame.h \
+       $(SRC)/coding.h \
+       $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
+       $(SRC)/frame.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/keymap.h \
+       $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
-       $(SRC)/keyboard.h
+       $(SRC)/termopts.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
-$(BLD)/termcap.obj : \
+$(BLD)/termcap.$(O) : \
        $(SRC)/termcap.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h
 
-$(BLD)/terminfo.obj : \
-       $(SRC)/terminfo.c
-
-$(BLD)/textprop.obj : \
+$(BLD)/textprop.$(O) : \
        $(SRC)/textprop.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
+       $(SRC)/buffer.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/intervals.h \
-       $(SRC)/composite.h \
-       $(SRC)/buffer.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
        $(SRC)/window.h
 
-$(BLD)/tparam.obj : \
+$(BLD)/tparam.$(O) : \
        $(SRC)/tparam.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h
 
-$(BLD)/undo.obj : \
+$(BLD)/undo.$(O) : \
        $(SRC)/undo.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
@@ -988,179 +1248,237 @@ $(BLD)/undo.obj : \
        $(SRC)/buffer.h \
        $(SRC)/commands.h
 
-$(BLD)/unexw32.obj : \
+$(BLD)/unexw32.$(O) : \
        $(SRC)/unexw32.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
        $(SRC)/w32heap.h
 
-$(BLD)/vm-limit.obj : \
+$(BLD)/vm-limit.$(O) : \
        $(SRC)/vm-limit.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/mem-limits.h     
-
-$(BLD)/widget.obj : \
-       $(SRC)/widget.c \
-       $(EMACS_ROOT)/src/s/ms-w32.h \
-       $(EMACS_ROOT)/src/m/intel386.h \
-       $(EMACS_ROOT)/src/config.h \
-       $(SRC)/xterm.h \
-       $(SRC)/frame.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/widget.h \
-       $(SRC)/widgetprv.h
+       $(SRC)/mem-limits.h
 
-$(BLD)/window.obj : \
+$(BLD)/window.$(O) : \
        $(SRC)/window.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
-       $(SRC)/frame.h \
-       $(SRC)/window.h \
        $(SRC)/commands.h \
-       $(SRC)/indent.h \
-       $(SRC)/termchar.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
+       $(SRC)/frame.h \
+       $(SRC)/indent.h \
+       $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
-       $(SRC)/composite.h
+       $(SRC)/keymap.h \
+       $(SRC)/systime.h \
+       $(SRC)/termchar.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/w32term.h \
+       $(SRC)/window.h
 
-$(BLD)/xdisp.obj : \
+$(BLD)/xdisp.$(O) : \
        $(SRC)/xdisp.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/frame.h \
-       $(SRC)/window.h \
-       $(SRC)/termchar.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
-       $(SRC)/indent.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
-       $(SRC)/macros.h \
-       $(SRC)/disptab.h \
-       $(SRC)/termhooks.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/disptab.h \
+       $(SRC)/fontset.h \
+       $(SRC)/frame.h \
+       $(SRC)/indent.h \
        $(SRC)/intervals.h \
-       $(SRC)/composite.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)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/w32term.h \
+       $(SRC)/window.h
 
-$(BLD)/xfaces.obj: \
+$(BLD)/xfaces.$(O): \
+       $(SRC)/xfaces.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/xfaces.c \
-       $(SRC)/charset.h \
-       $(SRC)/fontset.h \
-       $(SRC)/w32term.h \
-       $(SRC)/w32gui.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
+       $(SRC)/charset.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/fontset.h \
        $(SRC)/frame.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/window.h \
        $(SRC)/intervals.h \
-       $(SRC)/composite.h
+       $(SRC)/keyboard.h \
+       $(SRC)/systime.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/w32term.h \
+       $(SRC)/window.h
 
-$(BLD)/w32fns.obj: \
+$(BLD)/w32fns.$(O): \
+       $(SRC)/w32fns.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/w32fns.c \
-       $(SRC)/x-list-font.c \
-       $(SRC)/w32term.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/frame.h \
-       $(SRC)/window.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
        $(SRC)/charset.h \
        $(SRC)/coding.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/blockinput.h \
        $(SRC)/epaths.h \
+       $(SRC)/fontset.h \
+       $(SRC)/frame.h \
+       $(SRC)/intervals.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/systime.h \
+       $(SRC)/termhooks.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
-       $(SRC)/termhooks.h
+       $(SRC)/w32term.h \
+       $(SRC)/window.h
 
-$(BLD)/w32menu.obj: \
+$(BLD)/w32menu.$(O): \
+       $(SRC)/w32menu.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/w32menu.c \
-       $(SRC)/termhooks.h \
-       $(SRC)/frame.h \
-       $(SRC)/window.h \
-       $(SRC)/keyboard.h \
+       $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
        $(SRC)/charset.h \
-       $(SRC)/coding.h
+       $(SRC)/coding.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/frame.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/keymap.h \
+       $(SRC)/systime.h \
+       $(SRC)/termhooks.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/w32term.h \
+       $(SRC)/window.h
 
-$(BLD)/w32term.obj: \
+$(BLD)/w32term.$(O): \
+       $(SRC)/w32term.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/w32term.c \
+       $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
-       $(SRC)/w32heap.h \
-       $(SRC)/w32term.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/systty.h \
-       $(SRC)/systime.h \
-       $(SRC)/frame.h \
+       $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/termopts.h \
-       $(SRC)/termchar.h \
-       $(SRC)/gnu.h \
        $(SRC)/disptab.h \
-       $(SRC)/buffer.h \
-       $(SRC)/window.h \
-       $(SRC)/keyboard.h \
+       $(SRC)/fontset.h \
+       $(SRC)/frame.h \
+       $(SRC)/gnu.h \
        $(SRC)/intervals.h \
-       $(SRC)/composite.h \
-       $(SRC)/atimer.h
+       $(SRC)/keyboard.h \
+       $(SRC)/keymap.h \
+       $(SRC)/systime.h \
+       $(SRC)/systty.h \
+       $(SRC)/termchar.h \
+       $(SRC)/termhooks.h \
+       $(SRC)/termopts.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/w32heap.h \
+       $(SRC)/w32term.h \
+       $(SRC)/window.h
 
-$(BLD)/w32select.obj: \
+$(BLD)/w32select.$(O): \
+       $(SRC)/w32select.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/w32select.c \
-       $(SRC)/w32term.h \
-       $(SRC)/w32gui.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
+       $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/frame.h \
-       $(SRC)/blockinput.h
+       $(SRC)/keyboard.h \
+       $(SRC)/systime.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/w32heap.h \
+       $(SRC)/w32term.h
 
-$(BLD)/w32reg.obj: \
+$(BLD)/w32reg.$(O): \
+       $(SRC)/w32reg.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/w32reg.c \
-       $(SRC)/w32term.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/systime.h \
+       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
-       $(SRC)/blockinput.h
+       $(SRC)/w32term.h
 
-$(BLD)/w32xfns.obj: \
+$(BLD)/w32xfns.$(O): \
+       $(SRC)/w32xfns.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/w32xfns.c \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/charset.h \
+       $(SRC)/fontset.h \
+       $(SRC)/frame.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/systime.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/w32term.h
 
-$(BLD)/w32bdf.obj: \
+$(BLD)/w32bdf.$(O): \
+       $(SRC)/w32bdf.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
-       $(SRC)/w32bdf.c \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/charset.h \
-       $(SRC)/frame.h \
        $(SRC)/dispextern.h \
        $(SRC)/fontset.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h \
-       $(SRC)/w32bdf.h \
-       $(SRC)/w32.h \
        $(SRC)/frame.h \
-       $(SRC)/blockinput.h
+       $(SRC)/keyboard.h \
+       $(SRC)/systime.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/w32term.h