diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst
index 2c728e8256..f917dccb73 100644
--- a/src/mac/carbon/files.lst
+++ b/src/mac/carbon/files.lst
@@ -168,7 +168,6 @@ ALL_SOURCES = \
 		common/wfstream.cpp \
 		common/wincmn.cpp \
 		common/wxchar.cpp \
-		common/wxexpr.cpp \
 		common/xpmdecod.cpp \
 		common/zipstrm.cpp \
 		common/zstream.cpp \
@@ -343,7 +342,6 @@ ALL_HEADERS = \
 		effects.h \
 		encconv.h \
 		event.h \
-		expr.h \
 		fdrepdlg.h \
 		features.h \
 		ffile.h \
@@ -508,7 +506,6 @@ ALL_HEADERS = \
 		wx_cw_cm.h \
 		wx_cw_d.h \
 		wxchar.h \
-		wxexpr.h \
 		wxhtml.h \
 		wxprec.h \
 		xpmdecod.h \
@@ -788,7 +785,6 @@ COMMONOBJS = \
 		wfstream.o \
 		wincmn.o \
 		wxchar.o \
-		wxexpr.o \
 		xpmdecod.o \
 		zipstrm.o \
 		zstream.o
diff --git a/src/mac/files.lst b/src/mac/files.lst
index 2c728e8256..f917dccb73 100644
--- a/src/mac/files.lst
+++ b/src/mac/files.lst
@@ -168,7 +168,6 @@ ALL_SOURCES = \
 		common/wfstream.cpp \
 		common/wincmn.cpp \
 		common/wxchar.cpp \
-		common/wxexpr.cpp \
 		common/xpmdecod.cpp \
 		common/zipstrm.cpp \
 		common/zstream.cpp \
@@ -343,7 +342,6 @@ ALL_HEADERS = \
 		effects.h \
 		encconv.h \
 		event.h \
-		expr.h \
 		fdrepdlg.h \
 		features.h \
 		ffile.h \
@@ -508,7 +506,6 @@ ALL_HEADERS = \
 		wx_cw_cm.h \
 		wx_cw_d.h \
 		wxchar.h \
-		wxexpr.h \
 		wxhtml.h \
 		wxprec.h \
 		xpmdecod.h \
@@ -788,7 +785,6 @@ COMMONOBJS = \
 		wfstream.o \
 		wincmn.o \
 		wxchar.o \
-		wxexpr.o \
 		xpmdecod.o \
 		zipstrm.o \
 		zstream.o
diff --git a/src/mgl/files.lst b/src/mgl/files.lst
index a7e69bf264..08258a4a1d 100644
--- a/src/mgl/files.lst
+++ b/src/mgl/files.lst
@@ -43,7 +43,6 @@ ALL_SOURCES = \
 		generic/tipdlg.cpp \
 		generic/tipwin.cpp \
 		generic/treectlg.cpp \
-		generic/treelay.cpp \
 		generic/wizard.cpp \
 		common/accesscmn.cpp \
 		common/appcmn.cpp \
@@ -727,7 +726,6 @@ GENERICOBJS = \
 		tipdlg.o \
 		tipwin.o \
 		treectlg.o \
-		treelay.o \
 		wizard.o
 
 GUI_LOWLEVEL_OBJS = \
diff --git a/src/motif/files.lst b/src/motif/files.lst
index 508bdee46c..66ceb1c044 100644
--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@@ -43,7 +43,6 @@ ALL_SOURCES = \
 		generic/tipdlg.cpp \
 		generic/tipwin.cpp \
 		generic/treectlg.cpp \
-		generic/treelay.cpp \
 		generic/wizard.cpp \
 		common/accesscmn.cpp \
 		common/appcmn.cpp \
@@ -799,7 +798,6 @@ GENERICOBJS = \
 		tipdlg.o \
 		tipwin.o \
 		treectlg.o \
-		treelay.o \
 		wizard.o
 
 GUIOBJS = \
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 5cf63a3db9..d18a607872 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -87,9 +87,6 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 		$(MSWDIR)\numdlgg.obj \
 		$(MSWDIR)\panelg.obj \
 		$(MSWDIR)\progdlgg.obj \
-		$(MSWDIR)\prop.obj \
-		$(MSWDIR)\propform.obj \
-		$(MSWDIR)\proplist.obj \
 		$(MSWDIR)\sashwin.obj \
 		$(MSWDIR)\scrlwing.obj \
 		$(MSWDIR)\spinctlg.obj \
@@ -242,9 +239,6 @@ GENERICUNIVOBJS= $(MSWDIR)\accel.obj \
 		$(MSWDIR)\printps.obj \
 		$(MSWDIR)\prntdlgg.obj \
 		$(MSWDIR)\progdlgg.obj \
-		$(MSWDIR)\prop.obj \
-		$(MSWDIR)\propform.obj \
-		$(MSWDIR)\proplist.obj \
 		$(MSWDIR)\sashwin.obj \
 		$(MSWDIR)\scrlwing.obj \
 		$(MSWDIR)\spinctlg.obj \
@@ -508,7 +502,6 @@ COMMONOBJS = \
 		$(MSWDIR)\wfstream.obj \
 		$(MSWDIR)\wincmn.obj \
 		$(MSWDIR)\wxchar.obj \
-		$(MSWDIR)\wxexpr.obj \
 		$(MSWDIR)\xpmdecod.obj \
 		$(MSWDIR)\zipstrm.obj \
 		$(MSWDIR)\zstream.obj
@@ -570,6 +563,8 @@ dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\includ
 version.res:
     brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
 
+# $(OBJECTS):   $(WXDIR)\include\wx\setup.h
+
 !if "$(WXUSINGUNIV)" == "1"
 ########################################################
 # MSW objects (compile Native or UNIV) - UNIV
@@ -1270,8 +1265,6 @@ $(MSWDIR)\wincmn.obj: $(COMMDIR)\wincmn.$(SRCSUFF)
 
 $(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF)
 
-$(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF)
-
 $(MSWDIR)\xpmdecod.obj: $(COMMDIR)\xpmdecod.$(SRCSUFF)
 
 $(MSWDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)
@@ -1343,12 +1336,6 @@ $(MSWDIR)\prntdlgg.obj: $(GENDIR)\prntdlgg.$(SRCSUFF)
 
 $(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
 
-$(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)
-
-$(MSWDIR)\propform.obj: $(GENDIR)\propform.$(SRCSUFF)
-
-$(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF)
-
 $(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
 
 $(MSWDIR)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
@@ -1411,12 +1398,6 @@ $(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
 
 $(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
 
-$(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)
-
-$(MSWDIR)\propform.obj: $(GENDIR)\propform.$(SRCSUFF)
-
-$(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF)
-
 $(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
 
 $(MSWDIR)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
@@ -1598,20 +1579,15 @@ docs:   allhlp allhtml allpdfrtf
 alldocs: docs
 hlp:    wxhlp portinghlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
-prophlp: $(DOCDIR)/winhelp/prop.hlp
 refhlp: $(DOCDIR)/winhelp/techref.hlp
 rtf:    $(DOCDIR)/winhelp/wx.rtf
-proprtf: $(DOCDIR)/winhelp/prop.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
-proppdfrtf: $(DOCDIR)/pdf/prop.rtf
 refpdfrtf: $(DOCDIR)/pdf/techref.rtf
 html:   wxhtml portinghtml
 wxhtml: $(DOCDIR)\html\wx\wx.htm
 htmlhelp: $(DOCDIR)\html\wx\wx.chm
-prophtml: $(DOCDIR)\html\proplist\prop.htm
 ps:     wxps referencps
 wxps:   $(WXDIR)\docs\ps\wx.ps
-propps: $(WXDIR)\docs\ps\prop.ps
 referencps: $(WXDIR)\docs\ps\referenc.ps
 
 portinghtml: $(DOCDIR)\html\porting\port.htm
@@ -1620,7 +1596,7 @@ portinghlp: $(DOCDIR)/winhelp/porting.hlp
 portingpdfrtf: $(DOCDIR)/pdf/porting.rtf
 portingps:  $(WXDIR)\docs\ps\porting.ps
 
-allhlp: wxhlp portinghlp prophlp
+allhlp: wxhlp portinghlp
         cd $(WXDIR)\utils\dialoged\src
         ${MAKE} -f makefile.b32 hlp
         cd $(THISDIR)
@@ -1640,7 +1616,7 @@ allhlp: wxhlp portinghlp prophlp
 #        cd $(WXDIR)\utils\wxgrid\src
 #        ${MAKE} -f makefile.b32 hlp
 
-allhtml: wxhtml portinghtml prophtml
+allhtml: wxhtml portinghtml
         cd $(WXDIR)\utils\dialoged\src
         ${MAKE} -f makefile.b32 html
         cd $(THISDIR)
@@ -1661,12 +1637,12 @@ allhtml: wxhtml portinghtml prophtml
 #        cd $(WXDIR)\utils\wxtree\src
 #        ${MAKE} -f makefile.b32 html
 
-allps: wxps referencps portingps propps
+allps: wxps referencps portingps
         cd $(WXDIR)\utils\dialoged\src
         ${MAKE} -f makefile.b32 ps
         cd $(THISDIR)
 
-allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
+allpdfrtf: pdfrtf portingpdfrtf
         cd $(WXDIR)\utils\dialoged\src
         ${MAKE} -f makefile.b32 pdfrtf
         cd $(THISDIR)
@@ -1699,14 +1675,6 @@ $(DOCDIR)/winhelp/porting.hlp:         $(DOCDIR)/latex/porting/porting.rtf $(DOC
         move porting.cnt $(DOCDIR)\winhelp\porting.cnt
         cd $(THISDIR)
 
-$(DOCDIR)/winhelp/prop.hlp:         $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/latex/proplist/prop.hpj
-        cd $(DOCDIR)/latex/proplist
-        -erase prop.ph
-        hc prop
-        move prop.hlp $(DOCDIR)\winhelp\prop.hlp
-        move prop.cnt $(DOCDIR)\winhelp\prop.cnt
-        cd $(THISDIR)
-
 $(DOCDIR)/winhelp/techref.hlp:         $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
         cd $(DOCDIR)/latex/techref
         -erase techref.ph
@@ -1725,11 +1693,6 @@ $(DOCDIR)/latex/porting/porting.rtf:         $(DOCDIR)/latex/porting/porting.tex
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.rtf -twice -winhelp
         cd $(THISDIR)
 
-$(DOCDIR)/latex/proplist/prop.rtf:         $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex
-        cd $(DOCDIR)\latex\proplist
-        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/prop.rtf -twice -winhelp
-        cd $(THISDIR)
-
 $(DOCDIR)/latex/techref/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
         cd $(DOCDIR)\latex\techref
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp
@@ -1749,13 +1712,6 @@ $(DOCDIR)/pdf/porting.rtf:         $(DOCDIR)/latex/porting/porting.tex
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf
         cd $(THISDIR)
 
-$(DOCDIR)/pdf/prop.rtf:         $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex
-        cd $(DOCDIR)\latex\proplist
-        -copy *.wmf $(DOCDIR)\pdf
-        -copy *.bmp $(DOCDIR)\pdf
-        -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf
-        cd $(THISDIR)
-
 $(DOCDIR)/pdf/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
         cd $(DOCDIR)\latex\techref
         -copy *.wmf $(DOCDIR)\pdf
@@ -1789,16 +1745,6 @@ $(DOCDIR)\html\porting\port.htm:         $(DOCDIR)\latex\porting\porting.tex
         -erase $(DOCDIR)\latex\porting\*.ref
         cd $(THISDIR)
 
-$(DOCDIR)\html\proplist\prop.htm:         $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\latex\proplist\body.tex $(DOCDIR)\latex\proplist\classes.tex $(DOCDIR)\latex\proplist\changes.tex
-        cd $(DOCDIR)\latex\proplist
-        -mkdir $(DOCDIR)\html\proplist
-        -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html
-        -erase $(DOCDIR)\html\proplist\*.con
-        -erase $(DOCDIR)\html\proplist\*.ref
-        -erase $(DOCDIR)\latex\proplist\*.con
-        -erase $(DOCDIR)\latex\proplist\*.ref
-        cd $(THISDIR)
-
 $(WXDIR)\docs\latex\wx\manual.dvi:  $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
     cd $(WXDIR)\docs\latex\wx
         -latex manual
diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 61951b6e5a..7886cdd29e 100644
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -319,6 +319,8 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 
+# $(OBJECTS):	$(WXDIR)\include\wx\setup.h
+
 $(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF)
 
 $(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 19ad4255c7..9a8dd5e954 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -171,7 +171,6 @@ COMMONOBJS2 = \
 		$(COMMDIR)\quantize.obj \
 		$(COMMDIR)\radiocmn.obj \
 		$(COMMDIR)\regex.obj \
-		$(COMMDIR)\resource.obj \
 		$(COMMDIR)\rgncmn.obj \
 		$(COMMDIR)\settcmn.obj \
 		$(COMMDIR)\sizer.obj \
@@ -198,7 +197,6 @@ COMMONOBJS2 = \
 		$(COMMDIR)\wfstream.obj \
 		$(COMMDIR)\wincmn.obj \
 		$(COMMDIR)\wxchar.obj \
-		$(COMMDIR)\wxexpr.obj \
 		$(COMMDIR)\xpmdecod.obj \
 		$(COMMDIR)\zipstrm.obj \
 		$(COMMDIR)\zstream.obj
@@ -1202,11 +1200,6 @@ $(COMMDIR)/regex.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/resource.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(COMMDIR)/rgncmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1337,11 +1330,6 @@ $(COMMDIR)/wxchar.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/wxexpr.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(COMMDIR)/xpmdecod.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 46714230b5..e7982f8b92 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -615,36 +615,6 @@ $(REGEXLIB):
 
 $(OBJECTS):	$(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h
 
-# Replace lex with flex if you run into compilation
-# problems with lex_yy.c. See also note about LEX_SCANNER
-# above.
-# $(COMMDIR)/lex_yy.c:	$(COMMDIR)/lexer.l
-#	$(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
-#
-# Try one of these if the above line doesn't work.
-# Alternative syntax (1)
-#	$(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
-# Alternative syntax (2)
-#	$(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
-#
-#	sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
-#	sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
-#       sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c
-#	rm -f lex.yy.c
-#
-# Replace yacc with bison if you run into compilation
-# problems with y_tab.c.
-#
-# $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
-#	$(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
-#
-# If you use e.g. gcc on Unix, uncomment these lines
-# and comment out the above.
-#
-# $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
-#	$(YACC) $(COMMDIR)/parser.y
-#	mv y.tab.c $(COMMDIR)/y_tab.c
-
 clean:
 	-$(RM) *.o
 	-$(RM) ole/*.o
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 24e324c8a8..33c2e01354 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,4 +1,3 @@
-;    Last change:  JS   30 Mar 103   10:30 pm
 
 
 # This file was automatically generated by tmake 
@@ -55,6 +54,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\wizard.obj
 
 COMMONOBJS = \
+		$(COMMDIR)\y_tab.obj \
 		$(COMMDIR)\accesscmn.obj \
 		$(COMMDIR)\appcmn.obj \
 		$(COMMDIR)\artprov.obj \
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 0bb17c2a3d..b5015ab57a 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -132,6 +132,7 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
 		$(GENDIR)\$D\tabg.obj
 
 COMMONOBJS = \
+		$(COMMDIR)\$D\y_tab.obj \
 		$(COMMDIR)\$D\accesscmn.obj \
 		$(COMMDIR)\$D\appcmn.obj \
 		$(COMMDIR)\$D\artprov.obj \
@@ -227,7 +228,6 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\quantize.obj \
 		$(COMMDIR)\$D\radiocmn.obj \
 		$(COMMDIR)\$D\regex.obj \
-		$(COMMDIR)\$D\resource.obj \
 		$(COMMDIR)\$D\rgncmn.obj \
 		$(COMMDIR)\$D\sckaddr.obj \
 		$(COMMDIR)\$D\sckfile.obj \
@@ -260,7 +260,6 @@ COMMONOBJS = \
 		$(COMMDIR)\$D\wfstream.obj \
 		$(COMMDIR)\$D\wincmn.obj \
 		$(COMMDIR)\$D\wxchar.obj \
-		$(COMMDIR)\$D\wxexpr.obj \
 		$(COMMDIR)\$D\xpmdecod.obj \
 		$(COMMDIR)\$D\zipstrm.obj \
 		$(COMMDIR)\$D\zstream.obj
@@ -578,6 +577,9 @@ $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\gridsel.obj /c /Tp $(GENDIR)\gridsel.cpp
 <<
 	cl @<<
 $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp
+<<
+	cl @<<
+$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\proplist.obj /c /Tp $(GENDIR)\proplist.cpp
 <<
 	cl @<<
 $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\clipbrd.obj /c /Tp $(MSWDIR)\clipbrd.cpp
@@ -607,6 +609,17 @@ $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp
 $(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp
 <<
 
+$(COMMDIR)\$D\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+        cl @<<
+$(CPPFLAGS2) /c $(COMMDIR)\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
+<<
+
+$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
+        copy "$(COMMDIR)"\dosyacc.c "$(COMMDIR)"\y_tab.c
+
+$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
+    copy "$(COMMDIR)"\doslex.c "$(COMMDIR)"\lex_yy.c
+
 $(OBJECTS):	$(SETUP_H)
 
 $(COMMDIR)\$D\unzip.obj:     $(COMMDIR)\unzip.c
@@ -694,6 +707,8 @@ clean: $(PERIPH_CLEAN_TARGET)
         -erase $(COMMDIR)\$D\*.obj
         -erase $(COMMDIR)\$D\*.pdb
         -erase $(COMMDIR)\$D\*.sbr
+        -erase $(COMMDIR)\y_tab.c
+        -erase $(COMMDIR)\lex_yy.c
         -erase $(MSWDIR)\$D\*.obj
         -erase $(MSWDIR)\$D\*.sbr
         -erase $(MSWDIR)\$D\*.pdb
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 158f7d4b90..9c4de8cf64 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -40,9 +40,6 @@ GENERICOBJS= $(OUTPUTDIR)\busyinfo.obj &
 	$(OUTPUTDIR)\numdlgg.obj &
 	$(OUTPUTDIR)\panelg.obj &
 	$(OUTPUTDIR)\progdlgg.obj &
-	$(OUTPUTDIR)\prop.obj &
-	$(OUTPUTDIR)\propform.obj &
-	$(OUTPUTDIR)\proplist.obj &
 	$(OUTPUTDIR)\sashwin.obj &
 	$(OUTPUTDIR)\scrlwing.obj &
 	$(OUTPUTDIR)\spinctlg.obj &
@@ -54,7 +51,6 @@ GENERICOBJS= $(OUTPUTDIR)\busyinfo.obj &
 	$(OUTPUTDIR)\tipdlg.obj &
 	$(OUTPUTDIR)\tipwin.obj &
 	$(OUTPUTDIR)\treectlg.obj &
-	$(OUTPUTDIR)\treelay.obj &
 	$(OUTPUTDIR)\wizard.obj
 
 # These are generic things that don't need to be compiled on MSW,
@@ -176,7 +172,6 @@ COMMONOBJS = &
 	$(OUTPUTDIR)\quantize.obj &
 	$(OUTPUTDIR)\radiocmn.obj &
 	$(OUTPUTDIR)\regex.obj &
-	$(OUTPUTDIR)\resource.obj &
 	$(OUTPUTDIR)\rgncmn.obj &
 	$(OUTPUTDIR)\sckaddr.obj &
 	$(OUTPUTDIR)\sckfile.obj &
@@ -998,9 +993,6 @@ $(OUTPUTDIR)\radiocmn.obj:     $(COMMDIR)\radiocmn.cpp
 $(OUTPUTDIR)\regex.obj:     $(COMMDIR)\regex.cpp
   *$(CXX) $(CXXFLAGS) $<
 
-$(OUTPUTDIR)\resource.obj:     $(COMMDIR)\resource.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
 $(OUTPUTDIR)\rgncmn.obj:     $(COMMDIR)\rgncmn.cpp
   *$(CXX) $(CXXFLAGS) $<
 
@@ -1107,6 +1099,7 @@ $(OUTPUTDIR)\zstream.obj:     $(COMMDIR)\zstream.cpp
   *$(CXX) $(CXXFLAGS) $<
 
 
+
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)
@@ -1189,9 +1182,6 @@ $(OUTPUTDIR)\tipwin.obj:     $(GENDIR)\tipwin.cpp
 $(OUTPUTDIR)\treectlg.obj:     $(GENDIR)\treectlg.cpp
   *$(CXX) $(CXXFLAGS) $<
 
-$(OUTPUTDIR)\treelay.obj:     $(GENDIR)\treelay.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
 $(OUTPUTDIR)\wizard.obj:     $(GENDIR)\wizard.cpp
   *$(CXX) $(CXXFLAGS) $<