diff --git a/mozilla/content/html/content/makefile.win b/mozilla/content/html/content/makefile.win
index d7edb135b7f..6ebbe536493 100644
--- a/mozilla/content/html/content/makefile.win
+++ b/mozilla/content/html/content/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..\..
DIRS=src public
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/content/html/content/public/makefile.win b/mozilla/content/html/content/public/makefile.win
index e9d612947ce..25324f5e049 100644
--- a/mozilla/content/html/content/public/makefile.win
+++ b/mozilla/content/html/content/public/makefile.win
@@ -21,5 +21,5 @@ EXPORTS=nsIFormControl.h nsIForm.h
MODULE=raptor
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/content/html/content/src/makefile.win b/mozilla/content/html/content/src/makefile.win
index faa54098d51..65acd5bf92e 100644
--- a/mozilla/content/html/content/src/makefile.win
+++ b/mozilla/content/html/content/src/makefile.win
@@ -167,7 +167,7 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
diff --git a/mozilla/content/xml/content/makefile.win b/mozilla/content/xml/content/makefile.win
index d7edb135b7f..6ebbe536493 100644
--- a/mozilla/content/xml/content/makefile.win
+++ b/mozilla/content/xml/content/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..\..
DIRS=src public
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/content/xml/content/public/makefile.win b/mozilla/content/xml/content/public/makefile.win
index 6a16cc79c6c..6f79b99b81d 100644
--- a/mozilla/content/xml/content/public/makefile.win
+++ b/mozilla/content/xml/content/public/makefile.win
@@ -23,5 +23,5 @@ EXPORTS = \
MODULE=raptor
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/content/xml/content/src/makefile.win b/mozilla/content/xml/content/src/makefile.win
index a376b32db0a..2bc0c041c61 100644
--- a/mozilla/content/xml/content/src/makefile.win
+++ b/mozilla/content/xml/content/src/makefile.win
@@ -46,7 +46,7 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
diff --git a/mozilla/content/xml/document/makefile.win b/mozilla/content/xml/document/makefile.win
index d7edb135b7f..6ebbe536493 100644
--- a/mozilla/content/xml/document/makefile.win
+++ b/mozilla/content/xml/document/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..\..
DIRS=src public
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/content/xml/document/public/makefile.win b/mozilla/content/xml/document/public/makefile.win
index bc22d00b189..baaa0b47ec5 100644
--- a/mozilla/content/xml/document/public/makefile.win
+++ b/mozilla/content/xml/document/public/makefile.win
@@ -24,5 +24,5 @@ EXPORTS = \
MODULE=raptor
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/content/xml/document/src/makefile.win b/mozilla/content/xml/document/src/makefile.win
index 1d64f34bbc0..aff70f39bec 100644
--- a/mozilla/content/xml/document/src/makefile.win
+++ b/mozilla/content/xml/document/src/makefile.win
@@ -47,7 +47,7 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
diff --git a/mozilla/content/xml/makefile.win b/mozilla/content/xml/makefile.win
index bc336703ff6..caaf925466f 100644
--- a/mozilla/content/xml/makefile.win
+++ b/mozilla/content/xml/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..
DIRS = content document
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/dom/src/build/makefile.win b/mozilla/dom/src/build/makefile.win
index 8aee7b9a2b7..dbf3563c401 100644
--- a/mozilla/dom/src/build/makefile.win
+++ b/mozilla/dom/src/build/makefile.win
@@ -77,7 +77,7 @@ LLIBS= \
$(DIST)\lib\libplc21.lib \
$(LIBNSPR)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
diff --git a/mozilla/layout/base/makefile.win b/mozilla/layout/base/makefile.win
index 9526eb16178..e71c54a8d08 100644
--- a/mozilla/layout/base/makefile.win
+++ b/mozilla/layout/base/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..
DIRS=public src tests
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/base/public/makefile.win b/mozilla/layout/base/public/makefile.win
index 7555c2b179f..ed13abc2fad 100644
--- a/mozilla/layout/base/public/makefile.win
+++ b/mozilla/layout/base/public/makefile.win
@@ -55,5 +55,5 @@ EXPORTS = \
MODULE=raptor
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/base/src/makefile.win b/mozilla/layout/base/src/makefile.win
index ce78177e89a..c2b17234375 100644
--- a/mozilla/layout/base/src/makefile.win
+++ b/mozilla/layout/base/src/makefile.win
@@ -98,7 +98,7 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
diff --git a/mozilla/layout/base/tests/makefile.win b/mozilla/layout/base/tests/makefile.win
index 1acdd2adde4..e8334b0c378 100644
--- a/mozilla/layout/base/tests/makefile.win
+++ b/mozilla/layout/base/tests/makefile.win
@@ -31,7 +31,7 @@ LLIBS= \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
install:: $(PROGRAMS)
$(MAKE_INSTALL) $(PROG1) $(DIST)\bin
diff --git a/mozilla/layout/build/makefile.win b/mozilla/layout/build/makefile.win
index 44cd2a33298..301d0be73e2 100644
--- a/mozilla/layout/build/makefile.win
+++ b/mozilla/layout/build/makefile.win
@@ -92,7 +92,7 @@ LLIBS= \
!endif
$(LIBNSPR)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
diff --git a/mozilla/layout/html/base/makefile.win b/mozilla/layout/html/base/makefile.win
index 5620ead1bde..fb97ad48d6a 100644
--- a/mozilla/layout/html/base/makefile.win
+++ b/mozilla/layout/html/base/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..\..
DIRS=src
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/html/base/src/makefile.win b/mozilla/layout/html/base/src/makefile.win
index 1bc06bbf450..8bc1a6e2f80 100644
--- a/mozilla/layout/html/base/src/makefile.win
+++ b/mozilla/layout/html/base/src/makefile.win
@@ -120,7 +120,7 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
diff --git a/mozilla/layout/html/content/makefile.win b/mozilla/layout/html/content/makefile.win
index d7edb135b7f..6ebbe536493 100644
--- a/mozilla/layout/html/content/makefile.win
+++ b/mozilla/layout/html/content/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..\..
DIRS=src public
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/html/content/public/makefile.win b/mozilla/layout/html/content/public/makefile.win
index e9d612947ce..25324f5e049 100644
--- a/mozilla/layout/html/content/public/makefile.win
+++ b/mozilla/layout/html/content/public/makefile.win
@@ -21,5 +21,5 @@ EXPORTS=nsIFormControl.h nsIForm.h
MODULE=raptor
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/html/content/src/makefile.win b/mozilla/layout/html/content/src/makefile.win
index faa54098d51..65acd5bf92e 100644
--- a/mozilla/layout/html/content/src/makefile.win
+++ b/mozilla/layout/html/content/src/makefile.win
@@ -167,7 +167,7 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
diff --git a/mozilla/layout/html/document/makefile.win b/mozilla/layout/html/document/makefile.win
index 26d2a92d4ee..2d512750d1d 100644
--- a/mozilla/layout/html/document/makefile.win
+++ b/mozilla/layout/html/document/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..\..
DIRS=src
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/html/document/src/makefile.win b/mozilla/layout/html/document/src/makefile.win
index 1ab7be78c7d..0ee28a2b1d9 100644
--- a/mozilla/layout/html/document/src/makefile.win
+++ b/mozilla/layout/html/document/src/makefile.win
@@ -60,7 +60,7 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
diff --git a/mozilla/layout/html/forms/makefile.win b/mozilla/layout/html/forms/makefile.win
index f0ca52f8de3..b44f9dc72e0 100644
--- a/mozilla/layout/html/forms/makefile.win
+++ b/mozilla/layout/html/forms/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..\..
DIRS=public src
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/html/forms/public/makefile.win b/mozilla/layout/html/forms/public/makefile.win
index 1a7c21314ed..793c7f1d928 100644
--- a/mozilla/layout/html/forms/public/makefile.win
+++ b/mozilla/layout/html/forms/public/makefile.win
@@ -24,5 +24,5 @@ EXPORTS=nsIFormManager.h \
MODULE=raptor
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/html/forms/src/makefile.win b/mozilla/layout/html/forms/src/makefile.win
index 0f09a5c27f4..d5a60d8026e 100644
--- a/mozilla/layout/html/forms/src/makefile.win
+++ b/mozilla/layout/html/forms/src/makefile.win
@@ -69,7 +69,7 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
diff --git a/mozilla/layout/html/makefile.win b/mozilla/layout/html/makefile.win
index 80470763315..1aff5744fad 100644
--- a/mozilla/layout/html/makefile.win
+++ b/mozilla/layout/html/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..
DIRS = base content document forms style table tests
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/html/style/makefile.win b/mozilla/layout/html/style/makefile.win
index f0ca52f8de3..b44f9dc72e0 100644
--- a/mozilla/layout/html/style/makefile.win
+++ b/mozilla/layout/html/style/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..\..
DIRS=public src
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/html/style/public/makefile.win b/mozilla/layout/html/style/public/makefile.win
index f7c2a4ea1e1..8d2692f55e8 100644
--- a/mozilla/layout/html/style/public/makefile.win
+++ b/mozilla/layout/html/style/public/makefile.win
@@ -20,5 +20,5 @@ DEPTH=..\..\..\..
EXPORTS=nsCSSAtoms.h nsICSSParser.h nsICSSStyleSheet.h nsStyleUtil.h
MODULE=raptor
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/html/style/src/makefile.win b/mozilla/layout/html/style/src/makefile.win
index 60b16969449..07c831a0971 100644
--- a/mozilla/layout/html/style/src/makefile.win
+++ b/mozilla/layout/html/style/src/makefile.win
@@ -88,7 +88,7 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
diff --git a/mozilla/layout/html/table/makefile.win b/mozilla/layout/html/table/makefile.win
index f0ca52f8de3..b44f9dc72e0 100644
--- a/mozilla/layout/html/table/makefile.win
+++ b/mozilla/layout/html/table/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..\..
DIRS=public src
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/html/table/src/makefile.win b/mozilla/layout/html/table/src/makefile.win
index 5f2cfa9edb6..e231f57220c 100644
--- a/mozilla/layout/html/table/src/makefile.win
+++ b/mozilla/layout/html/table/src/makefile.win
@@ -54,7 +54,7 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
diff --git a/mozilla/layout/html/tests/makefile.win b/mozilla/layout/html/tests/makefile.win
index 7d2dc769ecc..76169b3a73c 100644
--- a/mozilla/layout/html/tests/makefile.win
+++ b/mozilla/layout/html/tests/makefile.win
@@ -62,7 +62,7 @@ LLIBS= \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
install:: $(PROGRAMS)
$(MAKE_INSTALL) $(PROG1) $(DIST)\bin
diff --git a/mozilla/layout/makefile.win b/mozilla/layout/makefile.win
index bdbe2e20b6b..4c581d3387b 100644
--- a/mozilla/layout/makefile.win
+++ b/mozilla/layout/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..
DIRS=base html xml xul events build
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/xml/content/makefile.win b/mozilla/layout/xml/content/makefile.win
index d7edb135b7f..6ebbe536493 100644
--- a/mozilla/layout/xml/content/makefile.win
+++ b/mozilla/layout/xml/content/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..\..
DIRS=src public
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/xml/content/public/makefile.win b/mozilla/layout/xml/content/public/makefile.win
index 6a16cc79c6c..6f79b99b81d 100644
--- a/mozilla/layout/xml/content/public/makefile.win
+++ b/mozilla/layout/xml/content/public/makefile.win
@@ -23,5 +23,5 @@ EXPORTS = \
MODULE=raptor
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/xml/content/src/makefile.win b/mozilla/layout/xml/content/src/makefile.win
index a376b32db0a..2bc0c041c61 100644
--- a/mozilla/layout/xml/content/src/makefile.win
+++ b/mozilla/layout/xml/content/src/makefile.win
@@ -46,7 +46,7 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
diff --git a/mozilla/layout/xml/document/makefile.win b/mozilla/layout/xml/document/makefile.win
index d7edb135b7f..6ebbe536493 100644
--- a/mozilla/layout/xml/document/makefile.win
+++ b/mozilla/layout/xml/document/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..\..
DIRS=src public
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/xml/document/public/makefile.win b/mozilla/layout/xml/document/public/makefile.win
index bc22d00b189..baaa0b47ec5 100644
--- a/mozilla/layout/xml/document/public/makefile.win
+++ b/mozilla/layout/xml/document/public/makefile.win
@@ -24,5 +24,5 @@ EXPORTS = \
MODULE=raptor
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/xml/document/src/makefile.win b/mozilla/layout/xml/document/src/makefile.win
index 1d64f34bbc0..aff70f39bec 100644
--- a/mozilla/layout/xml/document/src/makefile.win
+++ b/mozilla/layout/xml/document/src/makefile.win
@@ -47,7 +47,7 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
diff --git a/mozilla/layout/xml/makefile.win b/mozilla/layout/xml/makefile.win
index bc336703ff6..caaf925466f 100644
--- a/mozilla/layout/xml/makefile.win
+++ b/mozilla/layout/xml/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..
DIRS = content document
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/xul/base/makefile.win b/mozilla/layout/xul/base/makefile.win
index c60dddaa76c..340e052abfb 100644
--- a/mozilla/layout/xul/base/makefile.win
+++ b/mozilla/layout/xul/base/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..\..
DIRS=src
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/xul/base/src/makefile.win b/mozilla/layout/xul/base/src/makefile.win
index 364ffa220c4..c21bf002727 100644
--- a/mozilla/layout/xul/base/src/makefile.win
+++ b/mozilla/layout/xul/base/src/makefile.win
@@ -56,7 +56,7 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
diff --git a/mozilla/layout/xul/content/makefile.win b/mozilla/layout/xul/content/makefile.win
index c60dddaa76c..340e052abfb 100644
--- a/mozilla/layout/xul/content/makefile.win
+++ b/mozilla/layout/xul/content/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..\..
DIRS=src
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/layout/xul/content/src/makefile.win b/mozilla/layout/xul/content/src/makefile.win
index 6ee10e77130..729ba216750 100644
--- a/mozilla/layout/xul/content/src/makefile.win
+++ b/mozilla/layout/xul/content/src/makefile.win
@@ -44,7 +44,7 @@ LCFLAGS = \
$(DEFINES) \
$(NULL)
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
diff --git a/mozilla/layout/xul/makefile.win b/mozilla/layout/xul/makefile.win
index 13dcd1096d9..55be2a0e7eb 100644
--- a/mozilla/layout/xul/makefile.win
+++ b/mozilla/layout/xul/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..\..
DIRS = base content
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/modules/zlib/src/makefile.win b/mozilla/modules/zlib/src/makefile.win
index 3791d619a64..73b6718a9df 100644
--- a/mozilla/modules/zlib/src/makefile.win
+++ b/mozilla/modules/zlib/src/makefile.win
@@ -48,7 +48,7 @@ MAKE_OBJ_TYPE=DLL
#//
#//------------------------------------------------------------------------
DLLNAME=$(ZIPDLL)
-PDBFILE=$(MOD_ZIP).pdb
+#PDBFILE=$(MOD_ZIP).pdb
MAPFILE=$(MOD_ZIP).map
!if "$(MOZ_BITS)" == "16"
DEFFILE=zip16.def
diff --git a/mozilla/tools/tests/launchviewer.bat b/mozilla/tools/tests/launchviewer.bat
index 8c57f03336e..8b8048d3e91 100755
--- a/mozilla/tools/tests/launchviewer.bat
+++ b/mozilla/tools/tests/launchviewer.bat
@@ -12,7 +12,7 @@ rem out the interesting information. She can be contacted at
rem bsharma@netscape.com
@echo off
-y:\x86Rel\viewer.exe -v -d 15 -f y:\url.txt > y:\smoke.status.txt
+y:\recover\mozilla\dist\WIN32_D.OBJ\bin\viewer.exe -v -d 15 -f y:\url.txt > y:\smoke.status.txt
diff --git a/mozilla/widget/src/makefile.win b/mozilla/widget/src/makefile.win
index b953c92128a..c5e77f02672 100644
--- a/mozilla/widget/src/makefile.win
+++ b/mozilla/widget/src/makefile.win
@@ -18,4 +18,4 @@ DEPTH=..\..
DIRS=xpwidgets windows build
-include <$(DEPTH)\layout\config\rules.mak>
\ No newline at end of file
+include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/xpfe/makefile.win b/mozilla/xpfe/makefile.win
index 963883b02f7..8e922513bdb 100644
--- a/mozilla/xpfe/makefile.win
+++ b/mozilla/xpfe/makefile.win
@@ -19,4 +19,4 @@ DEPTH=..
DIRS=appshell AppCores bootstrap browser
-include <$(DEPTH)\layout\config\rules.mak>
+include <$(DEPTH)\config\rules.mak>