From 0bd62df7291b54af68b5ebf012f77832b2a21dcc Mon Sep 17 00:00:00 2001
From: "seawood%netscape.com"
 <seawood%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 18 Dec 2001 09:14:29 +0000
Subject: [PATCH] Landing the rest of the win32 gmake changes: * Adds
 Makefile.ins to win32 specific dirs * Adds WINNT ifdefs to Makefile.ins *
 Causes NSPR to be compiled with --with-mozilla * Misc general Makefile.in
 cleanup

Bug #58981 r=mcafee


git-svn-id: svn://10.0.0.236/trunk@110703 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/Makefile.in                           |   4 +-
 mozilla/accessible/build/Makefile.in          |   6 +-
 mozilla/allmakefiles.sh                       |  29 ++++
 mozilla/caps/include/Makefile.in              |   2 -
 mozilla/caps/src/Makefile.in                  |   6 +-
 mozilla/config/config.mk                      |  35 ++---
 mozilla/config/rules.mk                       |  35 +++--
 mozilla/configure.in                          |  28 +++-
 mozilla/content/base/public/Makefile.in       |   2 -
 mozilla/content/base/src/Makefile.in          |   8 +
 mozilla/content/build/Makefile.in             |  14 +-
 mozilla/content/events/public/Makefile.in     |   4 +-
 mozilla/content/events/src/Makefile.in        |   8 +-
 .../content/html/content/public/Makefile.in   |   2 -
 mozilla/content/html/content/src/Makefile.in  |   8 +
 mozilla/content/html/document/src/Makefile.in |  10 +-
 mozilla/content/html/style/public/Makefile.in |   4 +-
 mozilla/content/html/style/src/Makefile.in    |  12 +-
 mozilla/content/shared/public/Makefile.in     |   2 -
 mozilla/content/shared/src/Makefile.in        |   8 +
 mozilla/content/xbl/builtin/Makefile.in       |  17 ++-
 mozilla/content/xbl/public/Makefile.in        |   2 -
 mozilla/content/xbl/src/Makefile.in           |  12 +-
 .../content/xml/content/public/Makefile.in    |   1 -
 .../content/xml/document/public/Makefile.in   |   2 -
 mozilla/content/xml/document/src/Makefile.in  |   6 +-
 mozilla/content/xsl/document/src/Makefile.in  |   9 +-
 .../content/xul/content/public/Makefile.in    |   2 -
 mozilla/content/xul/content/src/Makefile.in   |   6 +-
 .../content/xul/document/public/Makefile.in   |   2 -
 mozilla/content/xul/document/src/Makefile.in  |   6 +-
 .../content/xul/templates/public/Makefile.in  |   2 -
 mozilla/content/xul/templates/src/Makefile.in |   6 +-
 mozilla/db/mork/build/Makefile.in             |   3 +-
 mozilla/db/mork/src/Makefile.in               |   6 -
 mozilla/dbm/src/Makefile.in                   |   8 +-
 mozilla/docshell/build/Makefile.in            |   5 +-
 mozilla/dom/src/base/Makefile.in              |   4 +
 mozilla/dom/src/events/Makefile.in            |   6 +
 mozilla/dom/src/jsurl/Makefile.in             |   9 +-
 mozilla/editor/libeditor/build/Makefile.in    |   1 -
 mozilla/editor/txmgr/public/Makefile.in       |   2 -
 mozilla/editor/txmgr/src/Makefile.in          |   3 +-
 mozilla/editor/txmgr/tests/Makefile.in        |   2 +
 mozilla/editor/txtsvc/public/Makefile.in      |   2 -
 mozilla/editor/txtsvc/src/Makefile.in         |   5 +-
 mozilla/embedding/Makefile.in                 |   6 +
 mozilla/embedding/base/Makefile.in            |   5 +
 mozilla/embedding/browser/Makefile.in         |   5 +
 .../embedding/browser/activex/src/Makefile.in |  29 ++++
 .../browser/activex/src/control/Makefile.in   | 141 ++++++++++++++++++
 .../activex/src/control_kicker/Makefile.in    |  59 ++++++++
 mozilla/embedding/browser/build/Makefile.in   |   3 +-
 .../embedding/components/build/Makefile.in    |  11 +-
 mozilla/embedding/tests/Makefile.in           |  33 ++++
 mozilla/embedding/tests/mfcembed/Makefile.in  |  95 ++++++++++++
 .../tests/mfcembed/components/Makefile.in     |  61 ++++++++
 mozilla/embedding/tests/winEmbed/Makefile.in  |  69 +++++++++
 mozilla/expat/xmlparse/Makefile.in            |   2 -
 .../access-builtin/accessproxy/Makefile.in    |   9 --
 mozilla/extensions/cookie/Makefile.in         |  12 +-
 mozilla/extensions/cookie/tests/Makefile.in   |  10 ++
 mozilla/extensions/datetime/Makefile.in       |   5 +
 mozilla/extensions/finger/Makefile.in         |   5 +
 mozilla/extensions/inspector/Makefile.in      |   3 +
 .../extensions/inspector/base/src/Makefile.in |  10 ++
 .../inspector/base/src/win/Makefile.in        |  55 +++++++
 .../inspector/build/src/Makefile.in           |  10 +-
 .../extensions/transformiix/build/Makefile.in |   1 +
 .../universalchardet/src/Makefile.in          |   9 +-
 .../universalchardet/tests/Makefile.in        |   6 +-
 mozilla/extensions/wallet/build/Makefile.in   |   5 +
 mozilla/extensions/wallet/src/Makefile.in     |   3 +-
 .../webservices/schema/src/Makefile.in        |   7 +-
 .../webservices/soap/src/Makefile.in          |   8 +-
 .../webservices/wsdl/src/Makefile.in          |  16 +-
 mozilla/extensions/xmlextras/Makefile.in      |   2 +-
 .../extensions/xmlextras/base/src/Makefile.in |   6 +
 .../xmlextras/build/src/Makefile.in           |   9 +-
 .../xmlextras/schema/src/Makefile.in          |   7 +-
 .../extensions/xmlextras/soap/src/Makefile.in |   8 +-
 .../extensions/xmlextras/tests/Makefile.in    |   6 +
 .../extensions/xmlextras/wsdl/src/Makefile.in |  16 +-
 mozilla/gfx/public/Makefile.in                |   4 +-
 mozilla/gfx/src/Makefile.in                   |  17 ++-
 mozilla/gfx/src/windows/Makefile.in           | 104 +++++++++++++
 mozilla/gfx2/src/Makefile.in                  |   4 +
 mozilla/htmlparser/robot/test/Makefile.in     |   7 +
 mozilla/htmlparser/src/Makefile.in            |  15 +-
 mozilla/htmlparser/tests/outsinks/Makefile.in |   6 +-
 mozilla/intl/Makefile.in                      |   4 +
 mozilla/intl/chardet/Makefile.in              |   6 +
 mozilla/intl/chardet/public/Makefile.in       |   2 -
 mozilla/intl/chardet/src/Makefile.in          |   3 +
 mozilla/intl/chardet/tests/Makefile.in        |  12 +-
 mozilla/intl/compatibility/src/Makefile.in    |  10 ++
 mozilla/intl/locale/Makefile.in               |   4 -
 mozilla/intl/locale/public/Makefile.in        |   1 +
 mozilla/intl/locale/src/Makefile.in           |  11 +-
 mozilla/intl/locale/src/windows/Makefile.in   |  58 +++++++
 mozilla/intl/lwbrk/public/Makefile.in         |   2 -
 mozilla/intl/lwbrk/src/Makefile.in            |   4 +
 mozilla/intl/lwbrk/tests/Makefile.in          |   3 +-
 mozilla/intl/uconv/Makefile.in                |   8 +-
 mozilla/intl/uconv/public/Makefile.in         |   2 -
 mozilla/intl/uconv/src/Makefile.in            |  14 +-
 mozilla/intl/uconv/tests/Makefile.in          |  18 ++-
 mozilla/intl/uconv/ucvcn/Makefile.in          |   6 +-
 mozilla/intl/uconv/ucvibm/Makefile.in         |   5 +-
 mozilla/intl/uconv/ucvja/Makefile.in          |   2 -
 mozilla/intl/uconv/ucvko/Makefile.in          |   6 +-
 mozilla/intl/uconv/ucvlatin/Makefile.in       |   5 +-
 mozilla/intl/uconv/ucvmath/Makefile.in        |  27 +++-
 mozilla/intl/uconv/ucvtw/Makefile.in          |   5 +-
 mozilla/intl/uconv/ucvtw2/Makefile.in         |   6 +-
 mozilla/intl/unicharutil/public/Makefile.in   |   2 -
 mozilla/intl/unicharutil/src/Makefile.in      |   3 +
 mozilla/intl/unicharutil/tables/Makefile.in   |  16 +-
 mozilla/intl/unicharutil/tests/Makefile.in    |   3 +
 mozilla/jpeg/Makefile.in                      |  14 +-
 mozilla/js/jsd/Makefile.in                    |   6 +-
 mozilla/js/src/Makefile.in                    |  12 +-
 mozilla/js/src/liveconnect/Makefile.in        |   6 +-
 mozilla/js/src/xpconnect/public/Makefile.in   |   2 -
 mozilla/js/src/xpconnect/shell/Makefile.in    |   5 +-
 mozilla/js/src/xpconnect/src/Makefile.in      |   7 +-
 mozilla/js/src/xpconnect/tests/Makefile.in    |   9 +-
 .../xpconnect/tests/components/Makefile.in    |   4 +
 .../js/src/xpconnect/tools/src/Makefile.in    |  18 +--
 mozilla/layout/base/public/Makefile.in        |   2 -
 mozilla/layout/base/src/Makefile.in           |  10 +-
 mozilla/layout/base/tests/Makefile.in         |   6 +-
 mozilla/layout/build/Makefile.in              |  11 +-
 mozilla/layout/html/base/src/Makefile.in      |  12 +-
 mozilla/layout/html/document/src/Makefile.in  |  10 +-
 mozilla/layout/html/forms/public/Makefile.in  |   2 -
 mozilla/layout/html/forms/src/Makefile.in     |  11 +-
 mozilla/layout/html/style/src/Makefile.in     |  12 +-
 mozilla/layout/html/table/public/Makefile.in  |   2 -
 mozilla/layout/html/table/src/Makefile.in     |   8 +-
 mozilla/layout/html/tests/Makefile.in         |   1 +
 mozilla/layout/mathml/base/src/Makefile.in    |  32 ++--
 mozilla/layout/mathml/content/src/Makefile.in |   7 +-
 mozilla/layout/svg/base/src/Makefile.in       |   7 +-
 mozilla/layout/xul/base/public/Makefile.in    |   4 +-
 mozilla/layout/xul/base/src/Makefile.in       |  68 +++++----
 mozilla/mailnews/Makefile.in                  |   6 +-
 mozilla/mailnews/absync/build/Makefile.in     |  10 +-
 mozilla/mailnews/addrbook/build/Makefile.in   |   2 +-
 mozilla/mailnews/addrbook/src/Makefile.in     |  19 +++
 mozilla/mailnews/base/Makefile.in             |   2 +-
 mozilla/mailnews/base/build/Makefile.in       |  10 +-
 mozilla/mailnews/base/public/Makefile.in      |   6 +-
 mozilla/mailnews/base/search/src/Makefile.in  |   1 +
 mozilla/mailnews/base/src/Makefile.in         |   9 +-
 mozilla/mailnews/base/util/Makefile.in        |   5 +-
 mozilla/mailnews/compose/build/Makefile.in    |   3 +-
 mozilla/mailnews/db/msgdb/build/Makefile.in   |   3 +-
 mozilla/mailnews/db/msgdb/public/Makefile.in  |   2 +-
 .../extensions/smime/build/Makefile.in        |   3 +-
 mozilla/mailnews/imap/build/Makefile.in       |   9 +-
 mozilla/mailnews/import/Makefile.in           |   7 +
 mozilla/mailnews/import/eudora/Makefile.in    |  32 ++++
 .../mailnews/import/eudora/src/Makefile.in    |  82 ++++++++++
 mozilla/mailnews/import/oexpress/Makefile.in  |  67 +++++++++
 mozilla/mailnews/import/outlook/Makefile.in   |  32 ++++
 .../mailnews/import/outlook/src/Makefile.in   |  76 ++++++++++
 mozilla/mailnews/import/src/Makefile.in       |   4 +-
 mozilla/mailnews/import/text/src/Makefile.in  |  16 +-
 mozilla/mailnews/local/Makefile.in            |   2 +
 mozilla/mailnews/local/build/Makefile.in      |   5 +-
 mozilla/mailnews/makefiles                    |  11 ++
 mozilla/mailnews/mapi/Makefile.in             |  31 ++++
 mozilla/mailnews/mapi/resources/Makefile.in   |  31 ++++
 .../mapi/resources/content/Makefile.in        |  29 ++++
 .../mapi/resources/locale/Makefile.in         |  31 ++++
 .../mapi/resources/locale/en-US/Makefile.in   |  29 ++++
 mozilla/mailnews/mime/build/Makefile.in       |   7 +-
 .../mailnews/mime/cthandlers/glue/Makefile.in |   6 +-
 .../mime/cthandlers/smimestub/Makefile.in     |  10 +-
 .../mime/cthandlers/vcard/Makefile.in         |  10 +-
 .../mailnews/mime/emitters/src/Makefile.in    |   6 -
 mozilla/mailnews/mime/src/Makefile.in         |   6 -
 mozilla/mailnews/news/public/Makefile.in      |   4 +-
 mozilla/mailnews/news/src/Makefile.in         |  11 +-
 mozilla/modules/libimg/mng/Makefile.in        |   9 +-
 mozilla/modules/libimg/png/Makefile.in        |   8 +-
 mozilla/modules/libjar/Makefile.in            |  11 +-
 mozilla/modules/libjar/standalone/Makefile.in |  10 +-
 mozilla/modules/libpr0n/decoders/Makefile.in  |   4 +
 .../modules/libpr0n/decoders/gif/Makefile.in  |   2 +-
 .../modules/libpr0n/decoders/icon/Makefile.in |  65 ++++++++
 .../libpr0n/decoders/icon/win/Makefile.in     |  45 ++++++
 .../modules/libpr0n/decoders/jpeg/Makefile.in |   2 +-
 mozilla/modules/libpr0n/public/Makefile.in    |  18 ++-
 mozilla/modules/libpref/public/Makefile.in    |   1 -
 mozilla/modules/libpref/src/Makefile.in       |   6 +-
 mozilla/modules/libreg/include/Makefile.in    |   1 -
 mozilla/modules/libreg/src/Makefile.in        |   8 +-
 mozilla/modules/libreg/standalone/Makefile.in |   4 +
 .../mpfilelocprovider/public/Makefile.in      |   3 -
 mozilla/modules/oji/public/Makefile.in        |   2 -
 mozilla/modules/oji/src/Makefile.in           |   5 +-
 mozilla/modules/plugin/Makefile.in            |   4 +
 .../modules/plugin/base/public/Makefile.in    |   2 -
 mozilla/modules/plugin/base/src/Makefile.in   |  12 +-
 .../samples/default/windows/Makefile.in       |  59 ++++++++
 mozilla/modules/zlib/src/Makefile.in          |   7 +
 mozilla/modules/zlib/standalone/Makefile.in   |   4 +
 mozilla/netwerk/base/src/Makefile.in          |   5 +
 mozilla/netwerk/build/Makefile.in             |  13 +-
 mozilla/netwerk/cache/src/Makefile.in         |   4 +
 mozilla/netwerk/dns/src/Makefile.in           |   4 +
 mozilla/netwerk/mime/src/Makefile.in          |   5 +
 .../netwerk/protocol/about/src/Makefile.in    |   5 +
 mozilla/netwerk/protocol/data/src/Makefile.in |   4 +
 .../netwerk/protocol/datetime/src/Makefile.in |   5 +
 mozilla/netwerk/protocol/file/Makefile.in     |   2 +-
 mozilla/netwerk/protocol/file/src/Makefile.in |   4 +
 .../netwerk/protocol/finger/src/Makefile.in   |   5 +
 mozilla/netwerk/protocol/ftp/src/Makefile.in  |  10 ++
 .../netwerk/protocol/gopher/src/Makefile.in   |   5 +
 mozilla/netwerk/protocol/http/src/Makefile.in |   5 +
 mozilla/netwerk/protocol/jar/src/Makefile.in  |   4 +
 mozilla/netwerk/protocol/res/src/Makefile.in  |   4 +
 .../protocol/viewsource/src/Makefile.in       |   5 +
 .../netwerk/streamconv/converters/Makefile.in |   5 +
 mozilla/netwerk/streamconv/src/Makefile.in    |   4 +
 mozilla/netwerk/streamconv/test/Makefile.in   |  10 ++
 .../other-licenses/libart_lgpl/Makefile.in    |  12 +-
 mozilla/other-licenses/libart_lgpl/libart.def |   3 +
 mozilla/parser/expat/lib/Makefile.in          |   2 -
 .../parser/htmlparser/robot/test/Makefile.in  |   7 +
 mozilla/parser/htmlparser/src/Makefile.in     |  15 +-
 .../htmlparser/tests/outsinks/Makefile.in     |   6 +-
 mozilla/profile/defaults/Makefile.in          |   8 +-
 .../profile/pref-migrator/public/Makefile.in  |   2 -
 .../pref-migrator/resources/Makefile.in       |   2 +
 mozilla/profile/pref-migrator/src/Makefile.in |   4 +-
 mozilla/profile/public/Makefile.in            |   8 +
 mozilla/profile/resources/Makefile.in         |   2 +
 mozilla/profile/src/Makefile.in               |   2 +-
 mozilla/rdf/base/public/Makefile.in           |   2 -
 mozilla/rdf/build/Makefile.in                 |   5 +-
 .../rdf/chrome/tools/chromereg/Makefile.in    |   3 +-
 mozilla/rdf/datasource/public/Makefile.in     |   2 -
 mozilla/rdf/datasource/src/Makefile.in        |   1 +
 mozilla/rdf/tests/rdfcat/Makefile.in          |   7 +-
 mozilla/rdf/tests/rdfpoll/Makefile.in         |   3 +-
 mozilla/security/manager/Makefile.in          |  10 +-
 mozilla/security/manager/ssl/src/Makefile.in  |   4 +
 mozilla/string/obsolete/Makefile.in           |   4 +
 mozilla/string/src/Makefile.in                |   4 +
 mozilla/sun-java/stubs/include/Makefile.in    |   2 -
 mozilla/sun-java/stubs/jri/Makefile.in        |   1 -
 mozilla/uriloader/build/Makefile.in           |   7 +-
 mozilla/uriloader/exthandler/Makefile.in      |  19 ++-
 mozilla/view/public/Makefile.in               |   4 +-
 mozilla/view/src/Makefile.in                  |   2 +-
 mozilla/webshell/Makefile.in                  |   4 +
 mozilla/webshell/embed/Makefile.in            |   6 +
 .../webshell/embed/ngprefs/win/Makefile.in    |  54 +++++++
 mozilla/webshell/public/Makefile.in           |   6 +-
 mozilla/webshell/src/Makefile.in              |  16 +-
 mozilla/webshell/tests/ComFactory/Makefile.in |  42 ++++++
 .../tests/ComFactory/TestCOMFactory.cpp       |   2 +-
 mozilla/webshell/tests/Makefile.in            |   4 +
 mozilla/webshell/tests/viewer/Makefile.in     |  54 ++++---
 .../webshell/tests/viewer/windows/Makefile.in |  57 +++++++
 mozilla/widget/src/Makefile.in                |   7 +
 mozilla/widget/src/build/Makefile.in          |  42 ++++--
 mozilla/widget/src/windows/Makefile.in        |  94 ++++++++++++
 .../expose/ISimpleDOMDocument/Makefile.in     |  69 +++++++++
 .../windows/expose/ISimpleDOMNode/Makefile.in |  69 +++++++++
 mozilla/widget/src/windows/expose/Makefile.in |  33 ++++
 mozilla/widget/src/xpwidgets/Makefile.in      |   4 +-
 mozilla/xpcom/string/obsolete/Makefile.in     |   4 +
 mozilla/xpcom/string/src/Makefile.in          |   4 +
 mozilla/xpcom/tests/Makefile.in               |   1 -
 mozilla/xpcom/tests/windows/Makefile.in       |  44 ++++++
 mozilla/xpfe/appshell/public/Makefile.in      |   6 +-
 mozilla/xpfe/appshell/src/Makefile.in         |  13 +-
 mozilla/xpfe/bootstrap/Makefile.in            |  27 +++-
 mozilla/xpfe/browser/Makefile.in              |   2 +-
 .../browser/resources/content/Makefile.in     |   7 +-
 mozilla/xpfe/browser/src/Makefile.in          |   6 +-
 mozilla/xpfe/communicator/Makefile.in         |   2 +-
 .../resources/content/Makefile.in             |   2 +-
 .../resources/locale/en-US/Makefile.in        |   2 +-
 mozilla/xpfe/components/Makefile.in           |   8 +-
 .../xpfe/components/autocomplete/Makefile.in  |   4 -
 .../components/autocomplete/test/Makefile.in  |   7 -
 .../bookmarks/resources/Makefile.in           |   2 -
 mozilla/xpfe/components/build/Makefile.in     |  22 ++-
 .../xpfe/components/filepicker/Makefile.in    |   2 +-
 mozilla/xpfe/components/find/src/Makefile.in  |   3 +-
 mozilla/xpfe/components/intl/Makefile.in      |   4 -
 .../prefwindow/resources/content/Makefile.in  |   4 +
 .../resources/content/win/Makefile.in         |  30 ++++
 mozilla/xpfe/components/regviewer/Makefile.in |   4 +-
 .../components/search/datasets/Makefile.in    |   4 +-
 .../xpfe/components/shistory/src/Makefile.in  |   5 +-
 mozilla/xpfe/components/urlwidget/Makefile.in |  49 ++++++
 mozilla/xpfe/components/winhooks/Makefile.in  |  50 +++++++
 mozilla/xpfe/components/xfer/src/Makefile.in  |   4 +-
 mozilla/xpfe/global/Makefile.in               |   2 +-
 .../xpfe/global/resources/content/Makefile.in |   2 +-
 .../global/resources/locale/en-US/Makefile.in |  25 ----
 .../resources/locale/en-US/mac/Makefile.in    |   8 -
 .../resources/locale/en-US/unix/Makefile.in   |   9 --
 .../resources/locale/en-US/win/Makefile.in    |   8 -
 mozilla/xpinstall/Makefile.in                 |   5 +-
 mozilla/xpinstall/cleanup/Makefile.in         |  19 ++-
 mozilla/xpinstall/public/Makefile.in          |   4 +-
 mozilla/xpinstall/src/Makefile.in             |  21 +++
 .../xpinstall/wizard/libxpnet/src/Makefile.in |  10 ++
 .../wizard/libxpnet/test/Makefile.in          |   7 +-
 .../windows/GetShortPathName/Makefile.in      |  44 ++++++
 mozilla/xpinstall/wizard/windows/Makefile.in  |  45 ++++++
 .../xpinstall/wizard/windows/ds32/Makefile.in |  46 ++++++
 .../wizard/windows/nsinstall/Makefile.in      |  45 ++++++
 .../wizard/windows/nsztool/Makefile.in        |  47 ++++++
 .../wizard/windows/ren8dot3/Makefile.in       |  41 +++++
 .../wizard/windows/setup/Makefile.in          |  70 +++++++++
 .../wizard/windows/setuprsc/Makefile.in       |  46 ++++++
 .../wizard/windows/uninstall/Makefile.in      |  56 +++++++
 326 files changed, 3720 insertions(+), 709 deletions(-)
 create mode 100644 mozilla/embedding/browser/activex/src/Makefile.in
 create mode 100644 mozilla/embedding/browser/activex/src/control/Makefile.in
 create mode 100644 mozilla/embedding/browser/activex/src/control_kicker/Makefile.in
 create mode 100644 mozilla/embedding/tests/Makefile.in
 create mode 100644 mozilla/embedding/tests/mfcembed/Makefile.in
 create mode 100644 mozilla/embedding/tests/mfcembed/components/Makefile.in
 create mode 100644 mozilla/embedding/tests/winEmbed/Makefile.in
 create mode 100644 mozilla/extensions/inspector/base/src/win/Makefile.in
 create mode 100644 mozilla/gfx/src/windows/Makefile.in
 create mode 100644 mozilla/intl/locale/src/windows/Makefile.in
 create mode 100644 mozilla/mailnews/import/eudora/Makefile.in
 create mode 100644 mozilla/mailnews/import/eudora/src/Makefile.in
 create mode 100644 mozilla/mailnews/import/oexpress/Makefile.in
 create mode 100644 mozilla/mailnews/import/outlook/Makefile.in
 create mode 100644 mozilla/mailnews/import/outlook/src/Makefile.in
 create mode 100644 mozilla/mailnews/mapi/Makefile.in
 create mode 100644 mozilla/mailnews/mapi/resources/Makefile.in
 create mode 100644 mozilla/mailnews/mapi/resources/content/Makefile.in
 create mode 100644 mozilla/mailnews/mapi/resources/locale/Makefile.in
 create mode 100644 mozilla/mailnews/mapi/resources/locale/en-US/Makefile.in
 create mode 100644 mozilla/modules/libpr0n/decoders/icon/Makefile.in
 create mode 100644 mozilla/modules/libpr0n/decoders/icon/win/Makefile.in
 create mode 100644 mozilla/modules/plugin/samples/default/windows/Makefile.in
 create mode 100644 mozilla/webshell/embed/ngprefs/win/Makefile.in
 create mode 100644 mozilla/webshell/tests/ComFactory/Makefile.in
 create mode 100644 mozilla/webshell/tests/viewer/windows/Makefile.in
 create mode 100644 mozilla/widget/src/windows/Makefile.in
 create mode 100644 mozilla/widget/src/windows/expose/ISimpleDOMDocument/Makefile.in
 create mode 100644 mozilla/widget/src/windows/expose/ISimpleDOMNode/Makefile.in
 create mode 100644 mozilla/widget/src/windows/expose/Makefile.in
 create mode 100644 mozilla/xpcom/tests/windows/Makefile.in
 create mode 100644 mozilla/xpfe/components/prefwindow/resources/content/win/Makefile.in
 create mode 100644 mozilla/xpfe/components/urlwidget/Makefile.in
 create mode 100644 mozilla/xpfe/components/winhooks/Makefile.in
 create mode 100644 mozilla/xpinstall/wizard/windows/GetShortPathName/Makefile.in
 create mode 100644 mozilla/xpinstall/wizard/windows/Makefile.in
 create mode 100644 mozilla/xpinstall/wizard/windows/ds32/Makefile.in
 create mode 100644 mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in
 create mode 100644 mozilla/xpinstall/wizard/windows/nsztool/Makefile.in
 create mode 100644 mozilla/xpinstall/wizard/windows/ren8dot3/Makefile.in
 create mode 100644 mozilla/xpinstall/wizard/windows/setup/Makefile.in
 create mode 100644 mozilla/xpinstall/wizard/windows/setuprsc/Makefile.in
 create mode 100644 mozilla/xpinstall/wizard/windows/uninstall/Makefile.in

diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in
index 7e2b40993d6..733a3271b7a 100644
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@@ -119,8 +119,8 @@ ifndef MOZ_NATIVE_ZLIB
 tier_9_dirs	+= modules/zlib
 endif
 
-# Linux and Solaris installer needs standalone libjar, hence standalone zlib
-ifneq (,$(filter Linux SunOS,$(OS_ARCH)))
+# Installer needs standalone libjar, hence standalone zlib
+ifneq (,$(filter Linux SunOS WINNT,$(OS_ARCH)))
 tier_9_dirs	+= modules/zlib/standalone
 endif
 
diff --git a/mozilla/accessible/build/Makefile.in b/mozilla/accessible/build/Makefile.in
index 02fc21c7829..71fb01051fe 100644
--- a/mozilla/accessible/build/Makefile.in
+++ b/mozilla/accessible/build/Makefile.in
@@ -53,13 +53,13 @@ endif
 
 EXTRA_DSO_LIBS = \
     gkconshared_s \
+    gkgfx \
     $(NULL)
 
 EXTRA_DSO_LDOPTS =           \
-    $(MOZ_COMPONENT_LIBS)    \
-    -L$(DIST)/lib            \
+    $(LIBS_DIR)              \
     $(EXTRA_DSO_LIBS)        \
-    -lgkgfx                  \
+    $(MOZ_COMPONENT_LIBS)    \
     $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh
index 2b6681db2d3..4079fa8f43c 100755
--- a/mozilla/allmakefiles.sh
+++ b/mozilla/allmakefiles.sh
@@ -136,6 +136,7 @@ gfx/src/qt/Makefile
 gfx/src/xlib/Makefile
 gfx/src/os2/Makefile
 gfx/src/xlibrgb/Makefile
+gfx/src/windows/Makefile
 gfx/tests/Makefile
 "
 
@@ -174,6 +175,7 @@ intl/locale/idl/Makefile
 intl/locale/src/Makefile
 intl/locale/src/unix/Makefile
 intl/locale/src/os2/Makefile
+intl/locale/src/windows/Makefile
 intl/locale/tests/Makefile
 intl/lwbrk/Makefile
 intl/lwbrk/src/Makefile
@@ -505,6 +507,7 @@ webshell/tests/viewer/unix/gtk/Makefile
 webshell/tests/viewer/unix/qt/Makefile
 webshell/tests/viewer/unix/xlib/Makefile
 webshell/embed/Makefile
+webshell/embed/ngprefs/win/Makefile
 "
 
 MAKEFILES_widget="
@@ -523,6 +526,10 @@ widget/src/os2/Makefile
 widget/src/os2/res/Makefile
 widget/src/os2/tests/Makefile
 widget/src/qt/Makefile
+widget/src/windows/Makefile
+widget/src/windows/expose/Makefile
+widget/src/windows/expose/ISimpleDOMNode/Makefile
+widget/src/windows/expose/ISimpleDOMDocument/Makefile
 widget/src/xlibxtbin/Makefile
 widget/src/xpwidgets/Makefile
 widget/src/support/Makefile
@@ -584,6 +591,7 @@ MAKEFILES_xpcom_tests="
 xpcom/tests/Makefile
 xpcom/tests/dynamic/Makefile
 xpcom/tests/services/Makefile
+xpcom/tests/windows/Makefile
 "
 
 MAKEFILES_string="$MAKEFILES_xpcom"
@@ -599,6 +607,14 @@ xpinstall/wizard/libxpnet/Makefile
 xpinstall/wizard/libxpnet/src/Makefile
 xpinstall/wizard/libxpnet/test/Makefile
 xpinstall/wizard/unix/src2/Makefile
+xpinstall/wizard/windows/nsinstall/Makefile
+xpinstall/wizard/windows/nsztool/Makefile
+xpinstall/wizard/windows/uninstall/Makefile
+xpinstall/wizard/windows/setup/Makefile
+xpinstall/wizard/windows/setuprsc/Makefile
+xpinstall/wizard/windows/ren8dot3/Makefile
+xpinstall/wizard/windows/ds32/Makefile
+xpinstall/wizard/windows/GetShortPathName/Makefile
 "
 
 MAKEFILES_xpfe="
@@ -632,6 +648,7 @@ xpfe/components/prefwindow/Makefile
 xpfe/components/prefwindow/resources/Makefile
 xpfe/components/prefwindow/resources/content/Makefile
 xpfe/components/prefwindow/resources/content/unix/Makefile
+xpfe/components/prefwindow/resources/content/win/Makefile
 xpfe/components/prefwindow/resources/locale/Makefile
 xpfe/components/prefwindow/resources/locale/en-US/Makefile
 xpfe/components/prefwindow/resources/locale/en-US/unix/Makefile
@@ -658,6 +675,8 @@ xpfe/components/autocomplete/src/Makefile
 xpfe/components/urlbarhistory/Makefile
 xpfe/components/urlbarhistory/public/Makefile
 xpfe/components/urlbarhistory/src/Makefile
+xpfe/components/urlwidget/Makefile
+xpfe/components/winhooks/Makefile
 xpfe/components/console/Makefile
 xpfe/components/build/Makefile
 xpfe/appshell/Makefile
@@ -697,6 +716,9 @@ MAKEFILES_embedding="
 embedding/Makefile
 embedding/base/Makefile
 embedding/browser/Makefile
+embedding/browser/activex/src/Makefile
+embedding/browser/activex/src/control/Makefile
+embedding/browser/activex/src/control_kicker/Makefile
 embedding/browser/build/Makefile
 embedding/browser/chrome/Makefile
 embedding/browser/webBrowser/Makefile
@@ -714,6 +736,10 @@ embedding/components/windowwatcher/src/Makefile
 embedding/components/ui/Makefile
 embedding/components/ui/helperAppDlg/Makefile
 embedding/config/Makefile
+embedding/tests/Makefile
+embedding/tests/winEmbed/Makefile
+embedding/tests/mfcEmbed/Makefile
+embedding/tests/mfcEmbed/components/Makefile
 "
 
 MAKEFILES_psm2="
@@ -757,6 +783,7 @@ extensions/inspector/Makefile
 extensions/inspector/base/Makefile
 extensions/inspector/base/public/Makefile
 extensions/inspector/base/src/Makefile
+extensions/inspector/base/src/win/Makefile
 extensions/inspector/build/Makefile
 extensions/inspector/build/src/Makefile
 extensions/inspector/resources/Makefile
@@ -804,6 +831,8 @@ fi
         modules/libpr0n/decoders/jpeg/Makefile
         modules/libpr0n/decoders/bmp/Makefile
         modules/libpr0n/decoders/mng/Makefile
+        modules/libpr0n/decoders/icon/Makefile
+        modules/libpr0n/decoders/icon/win/Makefile
 "
 
     MAKEFILES_gfx2="
diff --git a/mozilla/caps/include/Makefile.in b/mozilla/caps/include/Makefile.in
index 14d203a40b9..1b7c9edda60 100644
--- a/mozilla/caps/include/Makefile.in
+++ b/mozilla/caps/include/Makefile.in
@@ -38,7 +38,5 @@ EXPORTS		= \
 		nsScriptSecurityManager.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/caps/src/Makefile.in b/mozilla/caps/src/Makefile.in
index e223710598a..6e0fa6dcc19 100644
--- a/mozilla/caps/src/Makefile.in
+++ b/mozilla/caps/src/Makefile.in
@@ -59,12 +59,10 @@ CPPSRCS		= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
+		$(LIBS_DIR) \
 		$(ZLIB_LIBS) \
-		$(XPCOM_LIBS) \
 		$(MOZ_JS_LIBS) \
-		$(NSPR_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 CHROME_DIR = locales/en-US
diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index 8a0a596b0c9..e795144c87d 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -162,23 +162,20 @@ FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names
 # NSS libs needed for final link in static build
 # 
 NSS_LIBS	= \
-	$(DIST)/lib/libsmime.$(LIB_SUFFIX) \
-	$(DIST)/lib/libcrmf.$(LIB_SUFFIX) \
-	$(DIST)/lib/libssl.$(LIB_SUFFIX) \
-	$(DIST)/lib/libnss.$(LIB_SUFFIX) \
-	$(DIST)/lib/libssl.$(LIB_SUFFIX) \
-	$(DIST)/lib/libpkcs12.$(LIB_SUFFIX) \
-	$(DIST)/lib/libpkcs7.$(LIB_SUFFIX) \
-	$(DIST)/lib/libcerthi.$(LIB_SUFFIX) \
-	$(DIST)/lib/libpk11wrap.$(LIB_SUFFIX) \
-	$(DIST)/lib/libcryptohi.$(LIB_SUFFIX) \
-	$(DIST)/lib/libcerthi.$(LIB_SUFFIX) \
-	$(DIST)/lib/libpk11wrap.$(LIB_SUFFIX) \
-	$(DIST)/lib/libsoftoken.$(LIB_SUFFIX) \
-	$(DIST)/lib/libcertdb.$(LIB_SUFFIX) \
-	$(DIST)/lib/libfreebl.$(LIB_SUFFIX) \
-	$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
-	$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)softoken.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
 	$(NULL)
 
 MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
@@ -563,8 +560,6 @@ endif
 endif
 endif
 
-ifneq ($(OS_ARCH),WINNT)
-
 ifdef MOZ_NATIVE_MAKEDEPEND
 MKDEPEND_DIR	=
 MKDEPEND	= $(MOZ_NATIVE_MAKEDEPEND)
@@ -578,8 +573,6 @@ endif
 endif
 endif
 
-endif
-
 #
 # Include any personal overrides the user might think are needed.
 #
diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk
index 86012c615cb..5dbed554f43 100644
--- a/mozilla/config/rules.mk
+++ b/mozilla/config/rules.mk
@@ -188,19 +188,11 @@ endif
 
 ifeq ($(OS_ARCH),WINNT)
 
-ifdef LIBRARY_NAME
-PDBFILE=$(LIBRARY_NAME).pdb
-ifdef MOZ_DEBUG
-MAPFILE=$(LIBRARY_NAME).map
-CODFILE=$(LIBRARY_NAME).cod
-endif
-else
 PDBFILE=$*.pdb
 ifdef MOZ_DEBUG
 MAPFILE=$*.map
 CODFILE=$*.cod
 endif
-endif # LIBRARY_NAME
 
 ifdef DEFFILE
 CFLAGS += /DEF:$(DEFFILE)
@@ -830,7 +822,7 @@ ifneq ($(OS_ARCH),OS2)
 # that are built using other static libraries.  Confused...?
 #
 ifdef SHARED_LIBRARY_LIBS
-ifneq (,$(filter OSF1 BSD_OS FreeBSD NetBSD OpenBSD SunOS Darwin,$(OS_ARCH)))
+ifneq (,$(filter OSF1 BSD_OS FreeBSD NetBSD OpenBSD SunOS Darwin WINNT,$(OS_ARCH)))
 CLEANUP1	:= | egrep -v '(________64ELEL_|__.SYMDEF)'
 CLEANUP2	:= rm -f ________64ELEL_ __.SYMDEF
 else
@@ -839,6 +831,12 @@ endif
 SUB_LOBJS	= $(shell for lib in $(SHARED_LIBRARY_LIBS); do $(AR_LIST) $${lib} $(CLEANUP1); done;)
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+ifdef SHARED_LIBRARY_LIBS
+SUB_LOBJS	= $(SHARED_LIBRARY_LIBS)
+endif
+endif
+
 $(LIBRARY): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) Makefile Makefile.in
 	rm -f $@
 ifdef SHARED_LIBRARY_LIBS
@@ -1358,9 +1356,13 @@ else
 _JAR_REGCHROME_DISABLE_JAR=0
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+_NO_FLOCK=-l
+endif
+
 libs:: $(CHROME_DEPS)
-	@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(srcdir) < $(JAR_MANIFEST); fi
-	@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl $(DIST)/bin/chrome $(JAR_MANIFEST); fi
+	@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl $(_NO_FLOCK) -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(srcdir) < $(JAR_MANIFEST); fi
+	@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl $(DIST)/bin/chrome $(JAR_MANIFEST) $(_NO_FLOCK); fi
 
 REGCHROME = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl $(DIST)/bin/chrome/installed-chrome.txt $(_JAR_REGCHROME_DISABLE_JAR)
 
@@ -1425,7 +1427,9 @@ else # ! COMPILER_DEPEND
 
 ifndef MOZ_NATIVE_MAKEDEPEND
 $(MKDEPEND_BUILTIN):
+ifneq ($(OS_ARCH),WINNT)
 	$(MAKE) -C $(DEPTH)/config nsinstall$(BIN_SUFFIX)
+endif
 	$(MAKE) -C $(MKDEPEND_DIR) mkdepend
 endif
 
@@ -1439,13 +1443,16 @@ define MAKE_DEPS_NOAUTO
 endef
 
 $(MDDEPDIR)/%.pp: %.c
-	$(MAKE_DEPS_NOAUTO)
+	$(REPORT_BUILD)
+	@$(MAKE_DEPS_NOAUTO)
 
 $(MDDEPDIR)/%.pp: %.cpp
-	$(MAKE_DEPS_NOAUTO)
+	$(REPORT_BUILD)
+	@$(MAKE_DEPS_NOAUTO)
 
 $(MDDEPDIR)/%.pp: %.s
-	$(MAKE_DEPS_NOAUTO)
+	$(REPORT_BUILD)
+	@$(MAKE_DEPS_NOAUTO)
 
 ifneq (,$(OBJS))
 depend:: $(SUBMAKEFILES) $(MAKE_DIRS) $(MKDEPEND_BUILTIN) $(MDDEPFILES)
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 700107f3982..740f977f33b 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -928,7 +928,7 @@ case "$target" in
         MOZ_DEBUG_LDFLAGS='/DEBUG /DEBUGTYPE:CV'
     	MOZ_OPTIMIZE_FLAGS='-O1'
         MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.lib'
-        MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib'
+        MOZ_ZLIB_LIBS='$(DIST)/lib/zlib.lib'
         MOZ_PNG_LIBS='$(DIST)/lib/mozpng.lib'
         MOZ_MNG_LIBS='$(DIST)/lib/mozmng.lib'
         MOZ_JS_LIBS='$(DIST)/lib/mozjs.lib'
@@ -954,6 +954,7 @@ case "$target" in
     dnl Hardcode to win95 for now - cls
     TARGET_NSPR_MDCPUCFG='\"md/_win95.cfg\"'
     no_x=yes
+    AC_DEFINE(NO_X11)
 
     dnl Remove cygwinism from MOZ_BUILD_ROOT
     if test `echo $MOZ_BUILD_ROOT | grep -c ^/cygdrive/` != 0; then
@@ -1594,8 +1595,9 @@ dnl Checks for X libraries.
 dnl Ordering is important.
 dnl Xt is dependent upon SM as of X11R6
 dnl ========================================================
-if test "$no_x" != "yes"
-then
+if test "$no_x" = "yes"; then
+    AC_DEFINE(NO_X11)
+else
     AC_DEFINE_UNQUOTED(FUNCPROTO,15)
 	XLIBS="-lX11 $XLIBS"
 	_SAVE_LDFLAGS="$LDFLAGS"
@@ -2391,7 +2393,7 @@ if test -z "$MOZ_NATIVE_NSPR"; then
     if test "$VACPP" = "yes"; then
         NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '$_PTHREAD_LDFLAGS''
     elif test "$_WIN32_MSVC"; then
-            NSPR_LIBS='$(DIST)/lib/libnspr'$NSPR_VERSION'.lib $(DIST)/lib/libplc'$NSPR_VERSION'.lib $(DIST)/lib/libplds'$NSPR_VERSION'.lib '
+            NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '
             NSPR_CFLAGS='-I$(DIST)/include/nspr'
     else
         NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`'
@@ -3058,6 +3060,13 @@ dnl http://bugzilla.mozilla.org/show_bug.cgi?id=18352
 MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help transformiix venkman inspector"
 MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin ctl" 
 
+dnl universalchardet is only built on win32 (bug XXXXXX)
+case "$target_os" in
+msvc*|mksnt*|mingw*|cygwin*)
+    MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT universalchardet irc"
+    ;;
+esac
+
 dnl Check if Thai Rendering Extension needs to be enabled
 if test -n "$SUNCTL"; then
   MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT ctl"
@@ -4059,7 +4068,14 @@ if test "$MOZ_SVG"; then
     dnl libart's configure hasn't been run yet, but we know what the
     dnl answer should be anyway
     MOZ_LIBART_CFLAGS='-I${DIST}/include/libart_lgpl'
-    MOZ_LIBART_LIBS='-lmoz_art_lgpl -lm'
+    case "$target_os" in
+    msvc*|mksnt*|cygwin*|mingw*)
+        MOZ_LIBART_LIBS='$(DIST)/lib/$(LIB_PREFIX)moz_art_lgpl.$(LIB_SUFFIX)' 
+        ;;
+    *)
+        MOZ_LIBART_LIBS='-lmoz_art_lgpl -lm'
+        ;;
+    esac
   else
 dnl Disable system libart until the pixel format changes are merged upstream
     AC_MSG_ERROR([SVG requires a modified version of libart. To pull and build
@@ -4473,7 +4489,7 @@ unset MAKEFILES
 unset CONFIG_FILES
 
 if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist"
+    ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
     if test -n "$HAVE_64BIT_OS"; then
         ac_configure_args="$ac_configure_args --enable-64bit"
     fi
diff --git a/mozilla/content/base/public/Makefile.in b/mozilla/content/base/public/Makefile.in
index 71625b4f3f3..15fbab9a2e4 100644
--- a/mozilla/content/base/public/Makefile.in
+++ b/mozilla/content/base/public/Makefile.in
@@ -70,7 +70,5 @@ XPIDLSRCS	= \
 		nsIScriptLoaderObserver.idl  \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/content/base/src/Makefile.in b/mozilla/content/base/src/Makefile.in
index 49b7795b049..6bea81448c2 100644
--- a/mozilla/content/base/src/Makefile.in
+++ b/mozilla/content/base/src/Makefile.in
@@ -100,6 +100,14 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_LAYOUT
 
+ifdef XP_NEW_SELECTION
+DEFINES		+= -DXP_NEW_SELECTION
+endif
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
 INCLUDES	+= \
 		-I$(srcdir)/../../events/src \
 		-I$(srcdir)/../../html/base/src \
diff --git a/mozilla/content/build/Makefile.in b/mozilla/content/build/Makefile.in
index 32132294ea0..7687aed7fe4 100644
--- a/mozilla/content/build/Makefile.in
+++ b/mozilla/content/build/Makefile.in
@@ -35,6 +35,9 @@ SHORT_LIBNAME	= gkcontnt
 IS_COMPONENT	= 1
 MODULE_NAME	= nsContentModule
 EXTRA_DSO_LIBS	= gkgfx
+ifdef MOZ_PERF_METRICS
+EXTRA_DSO_LIBS += mozutil_s
+endif
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
@@ -90,14 +93,8 @@ SHARED_LIBRARY_LIBS += \
 		$(NULL)
 endif
 
-ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS += \
-		$(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
-		$(NULL)
-endif
-
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
@@ -118,7 +115,7 @@ endif
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= -I$(srcdir)/../base/src \
+LOCAL_INCLUDES	= -I$(srcdir)/../base/src \
 		   -I$(srcdir)/../html/base/src \
 		   -I$(srcdir)/../html/style/src \
 		   -I$(srcdir)/../xul/content/src \
@@ -137,3 +134,4 @@ $(BUILD_DATE): gbdate.pl
 	$(RM) $@
 	$(PERL) $(srcdir)/gbdate.pl > $@
 
+
diff --git a/mozilla/content/events/public/Makefile.in b/mozilla/content/events/public/Makefile.in
index cc7c2caf759..0f06546ca0b 100644
--- a/mozilla/content/events/public/Makefile.in
+++ b/mozilla/content/events/public/Makefile.in
@@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= content
 
 EXPORTS		= \
-    nsMutationEvent.h \
+		nsMutationEvent.h \
 		nsIEventListenerManager.h \
 		nsIEventStateManager.h \
 		nsIPrivateDOMEvent.h \
@@ -38,7 +38,5 @@ EXPORTS		= \
 		nsIPrivateCompositionEvent.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/content/events/src/Makefile.in b/mozilla/content/events/src/Makefile.in
index 7d6d4612fb6..904d141a3cb 100644
--- a/mozilla/content/events/src/Makefile.in
+++ b/mozilla/content/events/src/Makefile.in
@@ -56,8 +56,6 @@ CPPSRCS		= \
 		nsPrivateTextRange.cpp \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
@@ -65,7 +63,11 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= -I$(srcdir)/../../html/base/src \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+LOCAL_INCLUDES	= -I$(srcdir)/../../html/base/src \
              -I$(srcdir)/../../xul/content/src \
              $(NULL)
 
diff --git a/mozilla/content/html/content/public/Makefile.in b/mozilla/content/html/content/public/Makefile.in
index d41a5f2328c..e6ca6a31f93 100644
--- a/mozilla/content/html/content/public/Makefile.in
+++ b/mozilla/content/html/content/public/Makefile.in
@@ -39,7 +39,5 @@ EXPORTS		= \
 		nsIScriptElement.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/content/html/content/src/Makefile.in b/mozilla/content/html/content/src/Makefile.in
index 41882e8a077..39d06e8db9a 100644
--- a/mozilla/content/html/content/src/Makefile.in
+++ b/mozilla/content/html/content/src/Makefile.in
@@ -129,6 +129,14 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+ifdef XP_NEW_SELECTION
+DEFINES		+= -DXP_NEW_SELECTION
+endif
+
 INCLUDES	+= \
 		-I$(srcdir)/../../style/src \
 		-I$(srcdir)/../../../base/src \
diff --git a/mozilla/content/html/document/src/Makefile.in b/mozilla/content/html/document/src/Makefile.in
index 2707468bba2..2c4777acea5 100644
--- a/mozilla/content/html/document/src/Makefile.in
+++ b/mozilla/content/html/document/src/Makefile.in
@@ -73,8 +73,6 @@ EXPORTS		= \
 		nsIHTMLContentContainer.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
@@ -82,6 +80,14 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+ifdef XP_NEW_SELECTION
+DEFINES		+= -DXP_NEW_SELECTION
+endif
+
 INCLUDES	+= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../../base/src \
diff --git a/mozilla/content/html/style/public/Makefile.in b/mozilla/content/html/style/public/Makefile.in
index 5837525ab86..1a85323076a 100644
--- a/mozilla/content/html/style/public/Makefile.in
+++ b/mozilla/content/html/style/public/Makefile.in
@@ -35,10 +35,8 @@ EXPORTS		= \
 		nsICSSStyleSheet.h \
 		nsICSSLoaderObserver.h \
 		nsIComputedDOMStyle.h \
-    nsIMediaList.h \
+		nsIMediaList.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/content/html/style/src/Makefile.in b/mozilla/content/html/style/src/Makefile.in
index 53ace368829..3f69f939ae9 100644
--- a/mozilla/content/html/style/src/Makefile.in
+++ b/mozilla/content/html/style/src/Makefile.in
@@ -85,8 +85,6 @@ EXPORTS		= \
 		nsIHTMLAttributes.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
@@ -94,7 +92,11 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../content/src \
@@ -104,13 +106,13 @@ INCLUDES	+= \
 		$(NULL)
 
 ifdef MOZ_MATHML
-INCLUDES += \
+LOCAL_INCLUDES += \
         -I$(srcdir)/../../../mathml/content/src \
         -I$(srcdir)/../../../mathml/base/src
 endif
 
 ifdef MOZ_SVG
-INCLUDES += \
+LOCAL_INCLUDES += \
         -I$(srcdir)/../../../svg/content/src \
         -I$(srcdir)/../../../svg/base/src
 endif
diff --git a/mozilla/content/shared/public/Makefile.in b/mozilla/content/shared/public/Makefile.in
index 0ddebd849b2..eb9daeab36c 100644
--- a/mozilla/content/shared/public/Makefile.in
+++ b/mozilla/content/shared/public/Makefile.in
@@ -58,7 +58,5 @@ ifdef MOZ_SVG
 EXPORTS += nsSVGAtomList.h nsSVGAtoms.h
 endif
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/content/shared/src/Makefile.in b/mozilla/content/shared/src/Makefile.in
index c7338421c66..970cb64d97e 100644
--- a/mozilla/content/shared/src/Makefile.in
+++ b/mozilla/content/shared/src/Makefile.in
@@ -70,3 +70,11 @@ FORCE_STATIC_LIB = 1
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_LAYOUT
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+ifdef XP_NEW_SELECTION
+DEFINES		+= -DXP_NEW_SELECTION
+endif
diff --git a/mozilla/content/xbl/builtin/Makefile.in b/mozilla/content/xbl/builtin/Makefile.in
index 22c0ff034bc..692fca35dcd 100644
--- a/mozilla/content/xbl/builtin/Makefile.in
+++ b/mozilla/content/xbl/builtin/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(OS_ARCH),OS2)
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 DIRS		= win
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
@@ -38,5 +38,16 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-libs:: $(TARGETS)
-	$(INSTALL) $(srcdir)/htmlBindings.xml $(DIST)/bin/res/builtin
+_BUILTINS = htmlBindings.xml
+
+ifeq ($(OS_ARCH),WINNT)
+_BUILTINS += \
+	buttonBindings.xml \
+	selectBindings.xml \
+	checkboxBindings.xml \
+	fieldsetBindings.xml \
+	$(NULL)
+endif
+
+libs:: $(_BUILTINS)
+	$(INSTALL) $^ $(DIST)/bin/res/builtin
diff --git a/mozilla/content/xbl/public/Makefile.in b/mozilla/content/xbl/public/Makefile.in
index 6acdb572ed2..c59ad44c494 100644
--- a/mozilla/content/xbl/public/Makefile.in
+++ b/mozilla/content/xbl/public/Makefile.in
@@ -39,7 +39,5 @@ EXPORTS		= \
     nsIXBLService.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/content/xbl/src/Makefile.in b/mozilla/content/xbl/src/Makefile.in
index 6aaa7862024..0c29cee6275 100644
--- a/mozilla/content/xbl/src/Makefile.in
+++ b/mozilla/content/xbl/src/Makefile.in
@@ -96,13 +96,17 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../html/style/src \
 		-I$(srcdir)/../../html/base/src \
-    -I$(srcdir)/../../html/document/src \
-    -I$(srcdir)/../../xml/document/src \
-    -I$(srcdir)/../../xsl/document/src \
-    -I$(srcdir)/../../xul/content/src \
+		-I$(srcdir)/../../html/document/src \
+		-I$(srcdir)/../../xml/document/src \
+		-I$(srcdir)/../../xsl/document/src \
+		-I$(srcdir)/../../xul/content/src \
 		$(NULL)
 
diff --git a/mozilla/content/xml/content/public/Makefile.in b/mozilla/content/xml/content/public/Makefile.in
index 974d5d02543..70b68f1d2dc 100644
--- a/mozilla/content/xml/content/public/Makefile.in
+++ b/mozilla/content/xml/content/public/Makefile.in
@@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= content
 
 EXPORTS		= nsIXMLContent.h
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/content/xml/document/public/Makefile.in b/mozilla/content/xml/document/public/Makefile.in
index 5d1e9babffd..cc447e88fc9 100644
--- a/mozilla/content/xml/document/public/Makefile.in
+++ b/mozilla/content/xml/document/public/Makefile.in
@@ -33,7 +33,5 @@ EXPORTS		= \
 		nsIXMLDocument.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/content/xml/document/src/Makefile.in b/mozilla/content/xml/document/src/Makefile.in
index 2954813f55c..e25b7b24995 100644
--- a/mozilla/content/xml/document/src/Makefile.in
+++ b/mozilla/content/xml/document/src/Makefile.in
@@ -64,7 +64,11 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../xsl/document/src \
 		-I$(srcdir)/../../../html/base/src \
diff --git a/mozilla/content/xsl/document/src/Makefile.in b/mozilla/content/xsl/document/src/Makefile.in
index db402ed73e9..87115a00656 100755
--- a/mozilla/content/xsl/document/src/Makefile.in
+++ b/mozilla/content/xsl/document/src/Makefile.in
@@ -40,6 +40,10 @@ include $(topsrcdir)/config/config.mk
 
 DEFINES += -D_IMPL_NS_HTML
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES	+= -DWIN32_LEAN_AND_MEAN
+endif
+
 XPIDLSRCS=				\
 	nsIDocumentTransformer.idl 	\
        $(NULL)
@@ -53,15 +57,12 @@ EXPORTS = \
 	nsITransformMediator.h			\
 	$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
 LOCAL_INCLUDES = 				\
 	-I$(srcdir)/../../../xml/document/src	\
 	$(NULL)
 
-MKSHLIB :=
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/content/xul/content/public/Makefile.in b/mozilla/content/xul/content/public/Makefile.in
index b430b6edb50..9fdbd250db3 100644
--- a/mozilla/content/xul/content/public/Makefile.in
+++ b/mozilla/content/xul/content/public/Makefile.in
@@ -33,7 +33,5 @@ EXPORTS		= \
 		nsIXULContent.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/content/xul/content/src/Makefile.in b/mozilla/content/xul/content/src/Makefile.in
index 2acafccf0b7..4aab305f8dd 100644
--- a/mozilla/content/xul/content/src/Makefile.in
+++ b/mozilla/content/xul/content/src/Makefile.in
@@ -64,7 +64,11 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+LOCAL_INCLUDES	= \
 	-I$(srcdir) \
 	-I$(srcdir)/../../document/src \
 	-I$(srcdir)/../../../xml/content/src \
diff --git a/mozilla/content/xul/document/public/Makefile.in b/mozilla/content/xul/document/public/Makefile.in
index cecb8af1c66..1768d304574 100644
--- a/mozilla/content/xul/document/public/Makefile.in
+++ b/mozilla/content/xul/document/public/Makefile.in
@@ -41,7 +41,5 @@ EXPORTS		= \
 		nsIXULPrototypeDocument.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/content/xul/document/src/Makefile.in b/mozilla/content/xul/document/src/Makefile.in
index 69bd148f3e9..938772b808b 100644
--- a/mozilla/content/xul/document/src/Makefile.in
+++ b/mozilla/content/xul/document/src/Makefile.in
@@ -75,7 +75,11 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= -I$(srcdir)/../../../base/src \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		   -I$(srcdir)/../../content/src \
 		   -I$(srcdir)/../../templates/src \
 		   $(NULL)
diff --git a/mozilla/content/xul/templates/public/Makefile.in b/mozilla/content/xul/templates/public/Makefile.in
index a9e0500950d..a8ec26db6e0 100644
--- a/mozilla/content/xul/templates/public/Makefile.in
+++ b/mozilla/content/xul/templates/public/Makefile.in
@@ -37,7 +37,5 @@ EXPORTS		= \
                 nsIRDFContentModelBuilder.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/content/xul/templates/src/Makefile.in b/mozilla/content/xul/templates/src/Makefile.in
index a6fd7a63f36..9ce2051be5b 100644
--- a/mozilla/content/xul/templates/src/Makefile.in
+++ b/mozilla/content/xul/templates/src/Makefile.in
@@ -80,7 +80,11 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= -I$(srcdir)/../../../base/src \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		   -I$(srcdir)/../../content/src \
 		   $(NULL)
 
diff --git a/mozilla/db/mork/build/Makefile.in b/mozilla/db/mork/build/Makefile.in
index e7a38afd75b..0ec065c1b55 100644
--- a/mozilla/db/mork/build/Makefile.in
+++ b/mozilla/db/mork/build/Makefile.in
@@ -44,8 +44,7 @@ EXPORTS		= \
 SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)msgmork_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
+		$(LIBS_DIR) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/db/mork/src/Makefile.in b/mozilla/db/mork/src/Makefile.in
index c66d1f3f34f..13c39294f16 100644
--- a/mozilla/db/mork/src/Makefile.in
+++ b/mozilla/db/mork/src/Makefile.in
@@ -77,11 +77,5 @@ CPPSRCS		= \
 		morkZone.cpp \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
-		$(NSPR_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/dbm/src/Makefile.in b/mozilla/dbm/src/Makefile.in
index 216faa43968..a83a586d886 100644
--- a/mozilla/dbm/src/Makefile.in
+++ b/mozilla/dbm/src/Makefile.in
@@ -44,13 +44,17 @@ CSRCS		= \
 		nsres.c \
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+CSRCS		+= memmove.c snprintf.c
+else
 ifeq (,$(filter -DHAVE_MEMMOVE=1,$(DEFS)))
-CSRC += memmove.c
+CSRCS += memmove.c
 endif
 
 ifeq (,$(filter -DHAVE_SNPRINTF=1,$(DEFS)))
-CSRC += snprintf.c
+CSRCS += snprintf.c
 endif
+endif # WINNT
 
 LOCAL_INCLUDES	= -I$(srcdir)/../include
 
diff --git a/mozilla/docshell/build/Makefile.in b/mozilla/docshell/build/Makefile.in
index 2a62055fc70..4bf726e5795 100644
--- a/mozilla/docshell/build/Makefile.in
+++ b/mozilla/docshell/build/Makefile.in
@@ -59,15 +59,14 @@ SHARED_LIBRARY_LIBS= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS= \
-		-L$(DIST)/bin \
-		$(EXTRA_DSO_LIBS) \
+		$(LIBS_DIR) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= \
+LOCAL_INCLUDES	= \
 		-I$(srcdir)			\
 		-I$(srcdir)/../base		\
 		$(NULL)
diff --git a/mozilla/dom/src/base/Makefile.in b/mozilla/dom/src/base/Makefile.in
index b52b351ef8f..e48e27148f8 100644
--- a/mozilla/dom/src/base/Makefile.in
+++ b/mozilla/dom/src/base/Makefile.in
@@ -92,3 +92,7 @@ ifdef NS_TRACE_MALLOC
 DEFINES		+= -DNS_TRACE_MALLOC
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
diff --git a/mozilla/dom/src/events/Makefile.in b/mozilla/dom/src/events/Makefile.in
index 6df31b95737..ee93659a037 100644
--- a/mozilla/dom/src/events/Makefile.in
+++ b/mozilla/dom/src/events/Makefile.in
@@ -49,3 +49,9 @@ include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/../base
 
+DEFINES		+= -D_IMPL_NS_DOM
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
diff --git a/mozilla/dom/src/jsurl/Makefile.in b/mozilla/dom/src/jsurl/Makefile.in
index 40678cb708b..173ad04c55a 100644
--- a/mozilla/dom/src/jsurl/Makefile.in
+++ b/mozilla/dom/src/jsurl/Makefile.in
@@ -52,7 +52,14 @@ CPPSRCS		= nsJSProtocolHandler.cpp
 
 EXPORTS		= $(srcdir)/nsJSProtocolHandler.h
 
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(MOZ_JS_LIBS)
+EXTRA_DSO_LDOPTS = \
+		$(MOZ_COMPONENT_LIBS) \
+		$(MOZ_JS_LIBS) \
+		$(NULL)
+
+ifdef BUILD_DEBUG_GC
+DEFINES		+= -DDEBUG_GC
+endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/editor/libeditor/build/Makefile.in b/mozilla/editor/libeditor/build/Makefile.in
index 3144691df9d..fbcb668ac58 100644
--- a/mozilla/editor/libeditor/build/Makefile.in
+++ b/mozilla/editor/libeditor/build/Makefile.in
@@ -35,7 +35,6 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsEditorModule
 
 EXTRA_DSO_LDOPTS = \
-		$(MOZ_NECKO_UTIL_LIBS)   \
 		$(MOZ_UNICHARUTIL_LIBS)  \
 		$(MOZ_COMPONENT_LIBS)    \
 		$(MOZ_JS_LIBS)           \
diff --git a/mozilla/editor/txmgr/public/Makefile.in b/mozilla/editor/txmgr/public/Makefile.in
index 25714e5d2db..56a5a56adf0 100644
--- a/mozilla/editor/txmgr/public/Makefile.in
+++ b/mozilla/editor/txmgr/public/Makefile.in
@@ -32,7 +32,5 @@ EXPORTS		= \
 		nsTransactionManagerCID.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/editor/txmgr/src/Makefile.in b/mozilla/editor/txmgr/src/Makefile.in
index 7bf4b9af7f4..ec2c2dc18a0 100644
--- a/mozilla/editor/txmgr/src/Makefile.in
+++ b/mozilla/editor/txmgr/src/Makefile.in
@@ -44,8 +44,7 @@ CPPSRCS		= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(XPCOM_LIBS) \
-		$(NSPR_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/editor/txmgr/tests/Makefile.in b/mozilla/editor/txmgr/tests/Makefile.in
index 7ab89c16d86..0bc011e4db5 100644
--- a/mozilla/editor/txmgr/tests/Makefile.in
+++ b/mozilla/editor/txmgr/tests/Makefile.in
@@ -36,5 +36,7 @@ CPPSRCS		= TestTXMgr.cpp
 
 LIBS		= $(MOZ_COMPONENT_LIBS)
 
+DEFINES		+= -DUSE_NSREG
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/editor/txtsvc/public/Makefile.in b/mozilla/editor/txtsvc/public/Makefile.in
index fc8b09462b5..f804915c8f3 100644
--- a/mozilla/editor/txtsvc/public/Makefile.in
+++ b/mozilla/editor/txtsvc/public/Makefile.in
@@ -39,7 +39,5 @@ XPIDLSRCS	= \
 		nsIFindAndReplace.idl \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/editor/txtsvc/src/Makefile.in b/mozilla/editor/txtsvc/src/Makefile.in
index eac830b507a..278c566c901 100644
--- a/mozilla/editor/txtsvc/src/Makefile.in
+++ b/mozilla/editor/txtsvc/src/Makefile.in
@@ -51,11 +51,8 @@ CPPSRCS		= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
 		$(MOZ_UNICHARUTIL_LIBS) \
-		$(XPCOM_LIBS) \
-		$(NSPR_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/embedding/Makefile.in b/mozilla/embedding/Makefile.in
index 99721215955..f674bc50f06 100644
--- a/mozilla/embedding/Makefile.in
+++ b/mozilla/embedding/Makefile.in
@@ -27,4 +27,10 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS = base components browser
 
+ifeq ($(OS_ARCH),WINNT)
+ifneq (,$(ENABLE_TESTS)$(MOZILLA_OFFICIAL))
+DIRS += tests
+endif
+endif
+
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/embedding/base/Makefile.in b/mozilla/embedding/base/Makefile.in
index 323e71d9485..6f3fa52100a 100644
--- a/mozilla/embedding/base/Makefile.in
+++ b/mozilla/embedding/base/Makefile.in
@@ -38,6 +38,7 @@ REQUIRES	= xpcom \
 		  gfx \
 		  intl \
 		  embedcomponents \
+		  timer \
 		  $(NULL)
 
 EXPORTS         = \
@@ -52,6 +53,10 @@ CPPSRCS         = \
                 nsEmbedAPI.cpp \
                 $(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS		+= nsEmbedWin32.cpp
+endif
+
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
diff --git a/mozilla/embedding/browser/Makefile.in b/mozilla/embedding/browser/Makefile.in
index c0f618763b5..07f235f235a 100644
--- a/mozilla/embedding/browser/Makefile.in
+++ b/mozilla/embedding/browser/Makefile.in
@@ -35,5 +35,10 @@ ifdef MOZ_ENABLE_PHOTON
 DIRS += photon
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+ifndef MOZ_NO_ACTIVEX_SUPPORT
+DIRS += activex/src
+endif
+endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/embedding/browser/activex/src/Makefile.in b/mozilla/embedding/browser/activex/src/Makefile.in
new file mode 100644
index 00000000000..cda6a2fdd38
--- /dev/null
+++ b/mozilla/embedding/browser/activex/src/Makefile.in
@@ -0,0 +1,29 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS=control control_kicker
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/embedding/browser/activex/src/control/Makefile.in b/mozilla/embedding/browser/activex/src/control/Makefile.in
new file mode 100644
index 00000000000..1ca29512936
--- /dev/null
+++ b/mozilla/embedding/browser/activex/src/control/Makefile.in
@@ -0,0 +1,141 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME	= mozctl
+RESFILE		= MozillaControl.res
+DEFFILE		= L_mozctl.def
+EXPORT_LIBRARY	= 1
+
+REQUIRES = \
+	xpcom \
+	string \
+	js \
+	widget \
+	gfx \
+	view \
+	cookie \
+	necko \
+	pref \
+	webbrwsr \
+	docshell \
+	dom \
+	uriloader \
+	layout \
+	content \
+	editor \
+	webshell \
+	profile \
+	embed_base \
+	necko \
+	windowwatcher \
+        webbrowserpersist \
+	$(NULL)
+
+CPPSRCS =                              \
+    StdAfx.cpp             \
+    ControlSite.cpp        \
+    ControlSiteIPFrame.cpp \
+    ItemContainer.cpp      \
+    PropertyBag.cpp        \
+    MozillaControl.cpp     \
+    MozillaBrowser.cpp     \
+    WebBrowserContainer.cpp  \
+    IEHtmlNode.cpp         \
+    IEHtmlElementCollection.cpp \
+    IEHtmlElement.cpp      \
+    IEHtmlDocument.cpp     \
+    DropTarget.cpp         \
+    PropertyDlg.cpp        \
+    PromptService.cpp      \
+    WindowCreator.cpp      \
+    guids.cpp              \
+    $(NULL)
+
+EXTRA_DSO_LDOPTS = \
+	$(DIST)/lib/$(LIB_PREFIX)embed_base_s.$(LIB_SUFFIX) \
+	$(XPCOM_LIBS) \
+	$(NSPR_LIBS) \
+	$(NULL)
+
+OS_LIBS	+= \
+	comdlg32.lib \
+	ole32.lib \
+	oleaut32.lib \
+	uuid.lib \
+	shell32.lib \
+	$(NULL)
+
+GARBAGE	+= $(DEFFILE)
+
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS += /D "WIN32" /GX /U "ClientWallet"
+LDFLAGS += -SUBSYSTEM:windows /DLL
+
+ifdef MOZ_NO_DEBUG_RTL
+DEFINES	+= -DMOZ_NO_DEBUG_RTL
+endif
+
+DEFINES += -DMOZ_ACTIVEX_CONTROL_SUPPORT
+
+libs:: MozillaControl.html
+	$(INSTALL) $^ $(DIST)/bin/res
+
+export:: $(DEFFILE)
+
+$(DEFFILE): mkctldef.bat
+	$(srcdir)/mkctldef.bat $@
+
+MozillaControl_i.c MozillaControl.h: MozillaControl.idl
+	midl /Oicf /h MozillaControl.h /iid MozillaControl_i.c MozillaControl.idl
+
+PropertyDlg.cpp: StdAfx.h resource.h
+
+ControlSite.cpp \
+ControlSiteIPFrame.cpp \
+PropertyBag.cpp : StdAfx.h PropertyBag.h ControlSite.h ControlSiteIPFrame.h
+
+ItemContainer.cpp: StdAfx.h ItemContainer.h
+
+MozillaControl.cpp \
+StdAfx.cpp: StdAfx.h MozillaControl_i.c MozillaControl.h MozillaBrowser.h WebBrowserContainer.h
+
+IEHtmlNode.cpp : StdAfx.h IEHtmlNode.h
+
+IEHtmlElementCollection.cpp : StdAfx.h IEHtmlElementCollection.h
+
+IEHtmlElement.cpp : StdAfx.h IEHtmlNode.h IEHtmlElement.h
+
+IEHtmlDocument.cpp : StdAfx.h IEHtmlNode.h IEHtmlDocument.h
+
+DropTarget.cpp: StdAfx.h DropTarget.h
+
+MozillaControl.cpp \
+MozillaBrowser.cpp \
+WebBrowserContainer.cpp \
+StdAfx.cpp: StdAfx.h MozillaControl.h MozillaBrowser.h WebBrowserContainer.h IOleCommandTargetImpl.h
+
+guids.cpp: StdAfx.h guids.h
diff --git a/mozilla/embedding/browser/activex/src/control_kicker/Makefile.in b/mozilla/embedding/browser/activex/src/control_kicker/Makefile.in
new file mode 100644
index 00000000000..b6c952b92ac
--- /dev/null
+++ b/mozilla/embedding/browser/activex/src/control_kicker/Makefile.in
@@ -0,0 +1,59 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME	= mozctlx
+DEFFILE		= $(srcdir)/mozctlx.def
+EXPORT_LIBRARY	= 1
+
+
+CPPSRCS = \
+	StdAfx.cpp \
+	control_kicker.cpp \
+	$(NULL)
+
+OS_LIBS	+= \
+	comdlg32.lib \
+	ole32.lib \
+	oleaut32.lib \
+	uuid.lib \
+	shell32.lib \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS += /D "WIN32" /GX /GF /MT /O1
+
+libs::
+ifdef MOZ_ACTIVEX_REGISTRATION
+ifneq ($(OS_TARGET),WIN98)
+	-regsvr32 /s /c $(DIST)/bin/$(SHARED_LIBRARY)
+endif
+endif
+
+clean clobber clobber_all realclean distclean::
+	-regsvr32 /s /c /u $(DIST)/bin/$(SHARED_LIBRARY)
+
+control_kicker.cpp StdAfx.cpp: StdAfx.h
diff --git a/mozilla/embedding/browser/build/Makefile.in b/mozilla/embedding/browser/build/Makefile.in
index 9cf148dc279..eb867712713 100644
--- a/mozilla/embedding/browser/build/Makefile.in
+++ b/mozilla/embedding/browser/build/Makefile.in
@@ -56,8 +56,7 @@ SHARED_LIBRARY_LIBS= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS= \
-		-L$(DIST)/bin \
-		$(EXTRA_DSO_LIBS) \
+		$(LIBS_DIR) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
diff --git a/mozilla/embedding/components/build/Makefile.in b/mozilla/embedding/components/build/Makefile.in
index 538b87e4928..81318fa4102 100644
--- a/mozilla/embedding/components/build/Makefile.in
+++ b/mozilla/embedding/components/build/Makefile.in
@@ -29,6 +29,10 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= embedcmp
 IS_COMPONENT	= 1
 MODULE_NAME	= embedcomponents
+ifdef MOZ_PERF_METRICS
+EXTRA_DSO_LIBS	= mozutil_s
+endif
+
 REQUIRES	= js \
 		  xpcom \
 		  string \
@@ -55,10 +59,6 @@ SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)webbrowserpersist_s.$(LIB_SUFFIX) \
 	$(NULL)
 
-ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS	+= $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
-endif
-
 LOCAL_INCLUDES	= \
 	-I$(srcdir)/../windowwatcher/src  \
 	-I$(srcdir)/../appstartup/src  \
@@ -75,3 +75,6 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES	+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/embedding/tests/Makefile.in b/mozilla/embedding/tests/Makefile.in
new file mode 100644
index 00000000000..9945264999b
--- /dev/null
+++ b/mozilla/embedding/tests/Makefile.in
@@ -0,0 +1,33 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = winEmbed
+
+ifndef NO_MFC
+DIRS += mfcembed/components mfcembed
+endif
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/embedding/tests/mfcembed/Makefile.in b/mozilla/embedding/tests/mfcembed/Makefile.in
new file mode 100644
index 00000000000..f17f9d53211
--- /dev/null
+++ b/mozilla/embedding/tests/mfcembed/Makefile.in
@@ -0,0 +1,95 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+PROGRAM		= mfcEmbed$(BIN_SUFFIX)
+RESFILE		= mfcEmbed.res
+
+REQUIRES = \
+	xpcom \
+	string \
+	necko \
+	webbrwsr \
+	widget \
+	docshell \
+	dom \
+	uriloader \
+	embed_base \
+	webshell \
+	shistory \
+	pref \
+	profile \
+	find \
+	gfx \
+	windowwatcher \
+	layout \
+	webbrowserpersist \
+	$(NULL)
+
+CPPSRCS		= \
+		MfcEmbed.cpp     \
+		BrowserFrm.cpp   \
+		BrowserFrameGlue.cpp   \
+		BrowserView.cpp \
+		BrowserImpl.cpp \
+		BrowserImplWebPrgrsLstnr.cpp \
+		BrowserImplCtxMenuLstnr.cpp \
+		Dialogs.cpp       \
+		ProfileMgr.cpp \
+		ProfilesDlg.cpp \
+		winEmbedFileLocProvider.cpp \
+		MostRecentUrls.cpp \
+		PrintProgressDialog.cpp       \
+		Preferences.cpp \
+		nsPrintSettingsImpl.cpp       \
+		PrintSetupDialog.cpp       \
+		StdAfx.cpp       \
+		$(NULL)
+
+EXTRA_DSO_LIBS	= embed_base_s gkgfx mfcEmbedComponents
+
+LIBS		= \
+		$(EXTRA_DSO_LIBS) \
+		$(XPCOM_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
+
+OS_LIBS		+= \
+		ole32.lib \
+		comdlg32.lib \
+		shell32.lib \
+		version.lib \
+		$(NULL)
+
+LOCAL_INCLUDES	= -I$(srcdir)/components
+
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS	+= /D "_AFXDLL" /D "USE_SINGLE_SIGN_ON"
+LDFLAGS		+= -SUBSYSTEM:windows
+
+libs:: mfcembed.htm
+	$(INSTALL) $^ $(DIST)/bin
diff --git a/mozilla/embedding/tests/mfcembed/components/Makefile.in b/mozilla/embedding/tests/mfcembed/components/Makefile.in
new file mode 100644
index 00000000000..1362d502e2d
--- /dev/null
+++ b/mozilla/embedding/tests/mfcembed/components/Makefile.in
@@ -0,0 +1,61 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME	= mfcEmbedComponents
+RESFILE		= Dialogs.res
+
+REQUIRES = \
+	xpcom \
+	string \
+	dom \
+	webbrwsr \
+	windowwatcher \
+	exthandler \
+	helperAppDlg \
+	uriloader \
+	necko \
+	mimetype \
+	$(NULL)
+
+CPPSRCS	= \
+	Dialogs.cpp \
+	PromptService.cpp \
+	HelperAppDlg.cpp \
+	$(NULL)
+
+EXTRA_DSO_LDOPTS += \
+	$(EXTRA_DSO_LIBS) \
+	$(XPCOM_LIBS) \
+	$(NSPR_LIBS) \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS	+= /D "WIN32_LEAN_AND_MEAN" /D "_AFXDLL" /D "USE_SINGLE_SIGN_ON" /D "_USRDLL" /D "_WINDLL"
+LDFLAGS		+= -SUBSYSTEM:windows
+
+Dialogs.res: Dialogs.rc resource.h
+
diff --git a/mozilla/embedding/tests/winEmbed/Makefile.in b/mozilla/embedding/tests/winEmbed/Makefile.in
new file mode 100644
index 00000000000..077690c48ef
--- /dev/null
+++ b/mozilla/embedding/tests/winEmbed/Makefile.in
@@ -0,0 +1,69 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+PROGRAM		= winEmbed$(BIN_SUFFIX)
+RESFILE		= winEmbed.res
+
+REQUIRES	= xpcom \
+		  string \
+		  embed_base \
+		  webbrwsr \
+		  webshell \
+		  windowwatcher \
+		  profile \
+		  necko \
+		  docshell \
+		  dom \
+		  widget \
+		  layout \
+		  uriloader \
+		  shistory \
+		  webbrowserpersist \
+		  $(NULL)
+
+CPPSRCS		= \
+		winEmbed.cpp \
+		WebBrowserChrome.cpp \
+		WindowCreator.cpp \
+		StdAfx.cpp \
+		$(NULL)
+
+EXTRA_DSO_LIBS	= embed_base_s gkgfx
+
+LIBS		= \
+		$(EXTRA_DSO_LIBS) \
+		$(XPCOM_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
+
+OS_LIBS		+= \
+		ole32.lib \
+		comdlg32.lib \
+		shell32.lib \
+		version.lib \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/expat/xmlparse/Makefile.in b/mozilla/expat/xmlparse/Makefile.in
index fbaea9958aa..aae4495a21f 100644
--- a/mozilla/expat/xmlparse/Makefile.in
+++ b/mozilla/expat/xmlparse/Makefile.in
@@ -51,8 +51,6 @@ CSRCS		= \
 
 EXPORTS		= xmlparse.h
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 LOCAL_INCLUDES	= -I$(srcdir)/../xmltok
 
 # We want only the static lib, not the shared lib
diff --git a/mozilla/extensions/access-builtin/accessproxy/Makefile.in b/mozilla/extensions/access-builtin/accessproxy/Makefile.in
index b204adb58ba..2e537aaf6ae 100644
--- a/mozilla/extensions/access-builtin/accessproxy/Makefile.in
+++ b/mozilla/extensions/access-builtin/accessproxy/Makefile.in
@@ -59,16 +59,7 @@ CPPSRCS =   \
 
 XPIDLSRCS	= nsIAccessProxy.idl
 
-include $(topsrcdir)/config/config.mk
-
-LIBS += \
-  $(XPCOM_LIBS) \
-  $(NSPR_LIBS) \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
-libs:: $(TARGETS)
-
diff --git a/mozilla/extensions/cookie/Makefile.in b/mozilla/extensions/cookie/Makefile.in
index 5c8e3c650a4..fb7867a8bf4 100644
--- a/mozilla/extensions/cookie/Makefile.in
+++ b/mozilla/extensions/cookie/Makefile.in
@@ -75,16 +75,18 @@ EXPORTS		= \
 		nsCookieHTTPNotify.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		$(XPCOM_LIBS) \
-		$(NSPR_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_COOKIE
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
 libs::
 	@$(REGCHROME) content cookie comm.jar
 	@$(REGCHROME) locale en-US/cookie en-US.jar
diff --git a/mozilla/extensions/cookie/tests/Makefile.in b/mozilla/extensions/cookie/tests/Makefile.in
index 58f54b0b553..4d98e3c2aaa 100644
--- a/mozilla/extensions/cookie/tests/Makefile.in
+++ b/mozilla/extensions/cookie/tests/Makefile.in
@@ -38,5 +38,15 @@ CPPSRCS		= TestCookie.cpp
 
 LIBS		= $(XPCOM_LIBS) $(NSPR_LIBS)
 
+ifeq ($(OS_ARCH),WINNT)
+MAPFILE		= TestCookie.map
+endif
+
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_COOKIE
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
diff --git a/mozilla/extensions/datetime/Makefile.in b/mozilla/extensions/datetime/Makefile.in
index c24519dfe0e..2ebfeb7323b 100644
--- a/mozilla/extensions/datetime/Makefile.in
+++ b/mozilla/extensions/datetime/Makefile.in
@@ -43,3 +43,8 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/extensions/finger/Makefile.in b/mozilla/extensions/finger/Makefile.in
index 5ef4920c89d..eb6a99772be 100644
--- a/mozilla/extensions/finger/Makefile.in
+++ b/mozilla/extensions/finger/Makefile.in
@@ -43,3 +43,8 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/extensions/inspector/Makefile.in b/mozilla/extensions/inspector/Makefile.in
index d400ed907fa..5d41af7f0f2 100644
--- a/mozilla/extensions/inspector/Makefile.in
+++ b/mozilla/extensions/inspector/Makefile.in
@@ -35,6 +35,9 @@ libs::
 	$(INSTALL) $(srcdir)/resources/content/res/viewer-registry.rdf $(DIST)/bin/res/inspector
 	$(INSTALL) $(srcdir)/resources/content/res/search-registry.rdf $(DIST)/bin/res/inspector
 	$(INSTALL) $(srcdir)/resources/content/prefs/inspector.js $(DIST)/bin/defaults/pref
+ifeq ($(OS_ARCH),WINNT)
+	$(INSTALL) $(srcdir)/resources/content/res/winInspectorMain.ico $(DIST)/bin/chrome/icons/default
+endif
 
 libs::
 	$(REGCHROME) content inspector inspector.jar
diff --git a/mozilla/extensions/inspector/base/src/Makefile.in b/mozilla/extensions/inspector/base/src/Makefile.in
index 0010524fe6e..6d387edf217 100644
--- a/mozilla/extensions/inspector/base/src/Makefile.in
+++ b/mozilla/extensions/inspector/base/src/Makefile.in
@@ -65,6 +65,16 @@ CPPSRCS= \
   inPNGEncoder.cpp \
 	$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+DIRS		+= win
+endif
+
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/extensions/inspector/base/src/win/Makefile.in b/mozilla/extensions/inspector/base/src/win/Makefile.in
new file mode 100644
index 00000000000..724c5e266f1
--- /dev/null
+++ b/mozilla/extensions/inspector/base/src/win/Makefile.in
@@ -0,0 +1,55 @@
+
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH=../../../../..
+topsrcdir=@top_srcdir@
+srcdir=@srcdir@
+VPATH=@srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE=inspector
+LIBRARY_NAME=inscreencap_s
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  layout \
+		  widget \
+		  content \
+		  locale \
+		  dom \
+		  necko \
+		  $(NULL)
+
+CPPSRCS = inScreenCapturer.cpp 
+
+LOCAL_INCLUDES	= -I$(srcdir)/..
+
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/extensions/inspector/build/src/Makefile.in b/mozilla/extensions/inspector/build/src/Makefile.in
index 79418f50621..57a68b32120 100644
--- a/mozilla/extensions/inspector/build/src/Makefile.in
+++ b/mozilla/extensions/inspector/build/src/Makefile.in
@@ -49,19 +49,23 @@ CPPSRCS 	= \
 		nsInspectorModule.cpp \
 		$(NULL)
 
-LOCAL_INCLUDES += -I$(srcdir)/../../base/src
+LOCAL_INCLUDES = -I$(srcdir)/../../base/src
 
 # Linking against a part of another library is evil.  It also currently
 # prevents building on Mac OS X (DARWIN).
 EXTRA_DSO_LIBS = rdfutil_s gkgfx gkconshared_s
 
+ifeq ($(OS_ARCH),WINNT)
+LOCAL_INCLUDES += -I$(srcdir)/../../base/src/win
+EXTRA_DSO_LIBS += inscreencap_s
+endif
+
 SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/$(LIB_PREFIX)inspector_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS += \
-	-L$(DIST)/bin \
-	-L$(DIST)/lib \
+	$(LIBS_DIR) \
 	$(EXTRA_DSO_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(PNG_LIBS) \
diff --git a/mozilla/extensions/transformiix/build/Makefile.in b/mozilla/extensions/transformiix/build/Makefile.in
index b05abf5d081..e9293464b95 100644
--- a/mozilla/extensions/transformiix/build/Makefile.in
+++ b/mozilla/extensions/transformiix/build/Makefile.in
@@ -144,6 +144,7 @@ LOBJS =../source/base/ArrayList.$(OBJ_SUFFIX) \
 EXTRA_DSO_LDOPTS += \
   $(MOZ_UNICHARUTIL_LIBS) \
   $(MOZ_COMPONENT_LIBS) \
+  $(MOZ_UNICHARUTIL_LIBS) \
   $(MOZ_JS_LIBS) \
   $(NULL)
 
diff --git a/mozilla/extensions/universalchardet/src/Makefile.in b/mozilla/extensions/universalchardet/src/Makefile.in
index 8087a5918f0..043b273f19c 100644
--- a/mozilla/extensions/universalchardet/src/Makefile.in
+++ b/mozilla/extensions/universalchardet/src/Makefile.in
@@ -45,7 +45,6 @@ CPPSRCS = \
 		LangCyrillicModel.cpp \
 		LangGreekModel.cpp \
 		LangHungarianModel.cpp \
-		LangThaiModel.cpp \
 		nsBig5Prober.cpp \
 		nsEUCJPProber.cpp \
 		nsEUCKRProber.cpp \
@@ -63,9 +62,17 @@ CPPSRCS = \
 		nsUniversalDetector.cpp \
 		$(NULL)
 
+# Not built on win32. Not sure why not
+ifneq ($(OS_ARCH),WINNT)
+CPPSRCS	+= LangThaiModel.cpp
+endif
+
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN -D__STDC__
+endif
diff --git a/mozilla/extensions/universalchardet/tests/Makefile.in b/mozilla/extensions/universalchardet/tests/Makefile.in
index a7da858669f..0afd826644f 100644
--- a/mozilla/extensions/universalchardet/tests/Makefile.in
+++ b/mozilla/extensions/universalchardet/tests/Makefile.in
@@ -37,10 +37,14 @@ CPPSRCS		= \
 
 SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
+DEFINES		+= -DUSE_NSREG
+
 include $(topsrcdir)/config/config.mk
 
 LIBS		+= \
-		$(MOZ_COMPONENT_LIBS) \
+		$(LIBS_DIR) \
+		$(XPCOM_LIBS) \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/extensions/wallet/build/Makefile.in b/mozilla/extensions/wallet/build/Makefile.in
index 628c93fe21b..472631c830b 100644
--- a/mozilla/extensions/wallet/build/Makefile.in
+++ b/mozilla/extensions/wallet/build/Makefile.in
@@ -53,5 +53,10 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+OS_LIBS		+= shell32.lib
+endif
+
 include $(topsrcdir)/config/rules.mk
 
+
diff --git a/mozilla/extensions/wallet/src/Makefile.in b/mozilla/extensions/wallet/src/Makefile.in
index f2e6b00079b..0d2c76c9472 100644
--- a/mozilla/extensions/wallet/src/Makefile.in
+++ b/mozilla/extensions/wallet/src/Makefile.in
@@ -70,8 +70,7 @@ DEFAULTS_FILES	= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
+		$(LIBS_DIRS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
diff --git a/mozilla/extensions/webservices/schema/src/Makefile.in b/mozilla/extensions/webservices/schema/src/Makefile.in
index 934a9f8bb77..aa1caea39d0 100644
--- a/mozilla/extensions/webservices/schema/src/Makefile.in
+++ b/mozilla/extensions/webservices/schema/src/Makefile.in
@@ -57,5 +57,8 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= \
-		$(NULL)
+DEFINES		+= -D_IMPL_NS_HTML
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/extensions/webservices/soap/src/Makefile.in b/mozilla/extensions/webservices/soap/src/Makefile.in
index 24bc28d74c2..59f32df2a10 100644
--- a/mozilla/extensions/webservices/soap/src/Makefile.in
+++ b/mozilla/extensions/webservices/soap/src/Makefile.in
@@ -47,7 +47,11 @@ CPPSRCS	= 				\
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
-#override NO_SHARED_LIB=1
-#override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/extensions/webservices/wsdl/src/Makefile.in b/mozilla/extensions/webservices/wsdl/src/Makefile.in
index 13ce00959ec..57d1cd7a699 100644
--- a/mozilla/extensions/webservices/wsdl/src/Makefile.in
+++ b/mozilla/extensions/webservices/wsdl/src/Makefile.in
@@ -45,12 +45,22 @@ CPPSRCS	= 				\
 		nsWSDLDefinitions.cpp	\
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS	+=	nsWSDLInterfaceInfo.cpp 
+endif
+
+LOCAL_INCLUDES	= \
+		-I$(srcdir)/../../schema/src \
+		$(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= \
-		-I$(srcdir)/../../schema/src \
-		$(NULL)
+DEFINES		+= -D_IMPL_NS_HTML
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/extensions/xmlextras/Makefile.in b/mozilla/extensions/xmlextras/Makefile.in
index 9a8540319f4..fe9d7f51981 100644
--- a/mozilla/extensions/xmlextras/Makefile.in
+++ b/mozilla/extensions/xmlextras/Makefile.in
@@ -32,7 +32,7 @@ ifdef MOZ_SOAP
 DIRS += schema soap wsdl
 endif
 
-DIRS += build
+DIRS += build/src
 
 ifdef ENABLE_TESTS
 DIRS += tests
diff --git a/mozilla/extensions/xmlextras/base/src/Makefile.in b/mozilla/extensions/xmlextras/base/src/Makefile.in
index 613c36aff53..7e29425d3cc 100644
--- a/mozilla/extensions/xmlextras/base/src/Makefile.in
+++ b/mozilla/extensions/xmlextras/base/src/Makefile.in
@@ -57,3 +57,9 @@ CPPSRCS	= 				\
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/extensions/xmlextras/build/src/Makefile.in b/mozilla/extensions/xmlextras/build/src/Makefile.in
index 01c3c4dfeae..aae243e3783 100644
--- a/mozilla/extensions/xmlextras/build/src/Makefile.in
+++ b/mozilla/extensions/xmlextras/build/src/Makefile.in
@@ -52,8 +52,12 @@ SHARED_LIBRARY_LIBS = \
 
 
 ifdef MOZ_SOAP
-SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)xmlextrasschema_s.$(LIB_SUFFIX) $(DIST)/lib/$(LIB_PREFIX)xmlextraswsdl_s.$(LIB_SUFFIX) $(DIST)/lib/$(LIB_PREFIX)xmlextrassoap_s.$(LIB_SUFFIX)
-DEFINES = -DMOZ_SOAP
+SHARED_LIBRARY_LIBS += \
+	$(DIST)/lib/$(LIB_PREFIX)xmlextrasschema_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)xmlextraswsdl_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)xmlextrassoap_s.$(LIB_SUFFIX) \
+	$(NULL)
+DEFINES += -DMOZ_SOAP
 endif
 
 LOCAL_INCLUDES	= \
@@ -64,6 +68,7 @@ LOCAL_INCLUDES	= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
+		$(LIBS_DIR) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(ZLIB_LIBS) \
 		$(MOZ_JS_LIBS) \
diff --git a/mozilla/extensions/xmlextras/schema/src/Makefile.in b/mozilla/extensions/xmlextras/schema/src/Makefile.in
index 934a9f8bb77..aa1caea39d0 100644
--- a/mozilla/extensions/xmlextras/schema/src/Makefile.in
+++ b/mozilla/extensions/xmlextras/schema/src/Makefile.in
@@ -57,5 +57,8 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= \
-		$(NULL)
+DEFINES		+= -D_IMPL_NS_HTML
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/extensions/xmlextras/soap/src/Makefile.in b/mozilla/extensions/xmlextras/soap/src/Makefile.in
index 24bc28d74c2..59f32df2a10 100644
--- a/mozilla/extensions/xmlextras/soap/src/Makefile.in
+++ b/mozilla/extensions/xmlextras/soap/src/Makefile.in
@@ -47,7 +47,11 @@ CPPSRCS	= 				\
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
-#override NO_SHARED_LIB=1
-#override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/extensions/xmlextras/tests/Makefile.in b/mozilla/extensions/xmlextras/tests/Makefile.in
index 04167661da2..110a1a3b983 100644
--- a/mozilla/extensions/xmlextras/tests/Makefile.in
+++ b/mozilla/extensions/xmlextras/tests/Makefile.in
@@ -44,6 +44,7 @@ SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 include $(topsrcdir)/config/config.mk
 
 LIBS		= \
+		$(LIBS_DIR) \
 		$(MOZ_JS_LIBS) \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
@@ -52,3 +53,8 @@ LIBS		= \
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG
+
+ifeq ($(OS_ARCH),WINNT)
+CXXFLAGS	+= -GX
+endif
+
diff --git a/mozilla/extensions/xmlextras/wsdl/src/Makefile.in b/mozilla/extensions/xmlextras/wsdl/src/Makefile.in
index 13ce00959ec..57d1cd7a699 100644
--- a/mozilla/extensions/xmlextras/wsdl/src/Makefile.in
+++ b/mozilla/extensions/xmlextras/wsdl/src/Makefile.in
@@ -45,12 +45,22 @@ CPPSRCS	= 				\
 		nsWSDLDefinitions.cpp	\
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS	+=	nsWSDLInterfaceInfo.cpp 
+endif
+
+LOCAL_INCLUDES	= \
+		-I$(srcdir)/../../schema/src \
+		$(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= \
-		-I$(srcdir)/../../schema/src \
-		$(NULL)
+DEFINES		+= -D_IMPL_NS_HTML
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/gfx/public/Makefile.in b/mozilla/gfx/public/Makefile.in
index 499e045bc5c..7e02d07970f 100644
--- a/mozilla/gfx/public/Makefile.in
+++ b/mozilla/gfx/public/Makefile.in
@@ -43,7 +43,7 @@ EXPORTS		= \
 		nsMargin.h \
 		nsTransform2D.h \
 		nsIRenderingContext.h \
-        nsRenderingContextImpl.h \
+		nsRenderingContextImpl.h \
 		nsIFontMetrics.h \
 		nsIDeviceContext.h \
 		nsIImage.h \
@@ -62,7 +62,5 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
 EXPORTS		+= nsIPrintingContext.h
 endif
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in
index 7d266925e49..75fa9d2b9b8 100644
--- a/mozilla/gfx/src/Makefile.in
+++ b/mozilla/gfx/src/Makefile.in
@@ -42,13 +42,13 @@ REQUIRES    = xpcom \
           unicharutil \
           $(NULL)
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+ifneq (,$(filter os2 windows,$(MOZ_WIDGET_TOOLKIT)))
 DIRS        =
 else
 DIRS        = ps
 endif
 
-ifneq (,$(filter beos os2 mac,$(MOZ_GFX_TOOLKIT)))
+ifneq (,$(filter beos os2 mac windows,$(MOZ_GFX_TOOLKIT)))
 DIRS        += $(MOZ_GFX_TOOLKIT)
 endif
 
@@ -82,7 +82,6 @@ CPPSRCS = \
         nsBlender.cpp \
         nsColor.cpp \
         nsColorNames.cpp \
-        nsCompressedCharMap.cpp \
         nsDeviceContext.cpp \
         nsFont.cpp \
         nsFontList.cpp \
@@ -94,6 +93,10 @@ CPPSRCS = \
         nsPrintOptionsImpl.cpp \
         $(NULL)
 
+ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
+CPPSRCS += nsCompressedCharMap.cpp
+endif
+
 ifneq (,$(filter gtk xlib os2,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += \
         nsRegion.cpp \
@@ -111,11 +114,8 @@ CPPSRCS += \
         $(NULL)
 endif
 
-SHARED_LIBRARY_LIBS = \
-        $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
-        $(NULL)
-
 EXTRA_DSO_LDOPTS = \
+        $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
         $(MOZ_UNICHARUTIL_LIBS) \
         $(MOZ_COMPONENT_LIBS) \
         $(NULL)
@@ -129,6 +129,9 @@ endif
 include $(topsrcdir)/config/rules.mk
 
 DEFINES     += -D_IMPL_NS_GFX
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
 
 libs:: icon_0.gif icon_1.gif
 	$(INSTALL) -m 555 $^ $(DIST)/bin/res/gfx
diff --git a/mozilla/gfx/src/windows/Makefile.in b/mozilla/gfx/src/windows/Makefile.in
new file mode 100644
index 00000000000..85c2c4e5e87
--- /dev/null
+++ b/mozilla/gfx/src/windows/Makefile.in
@@ -0,0 +1,104 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= gfxwin
+LIBRARY_NAME	= gfxwin
+EXPORT_LIBRARY = 1
+IS_COMPONENT	= 1
+MODULE_NAME	= nsGfxModule
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  widget \
+		  intl \
+		  view \
+		  pref \
+		  uconv \
+		  unicharutil \
+		  locale \
+		  necko \
+		  $(NULL)
+
+CPPSRCS		= \
+		nsDeviceContextWin.cpp \
+		nsDrawingSurfaceWin.cpp \
+		nsRenderingContextWin.cpp \
+		nsFontMetricsWin.cpp \
+		nsImageWin.cpp \
+		nsRegionWin.cpp \
+		nsDeviceContextSpecWin.cpp \
+		nsDeviceContextSpecFactoryW.cpp \
+		nsScreenWin.cpp \
+		nsScreenManagerWin.cpp \
+		nsPrintOptionsWin.cpp \
+		nsGfxFactoryWin.cpp \
+		nsCompressedCharMap.cpp \
+		$(NULL)
+
+EXPORTS	= nsIRenderingContextWin.h nsIDrawingSurfaceWin.h
+
+EXTRA_DSO_LIBS	= gkgfx mozutil_s
+
+LOCAL_INCLUDES	= \
+		-I$(srcdir)/. \
+		-I$(srcdir)/.. \
+		$(NULL)
+
+OS_LIBS		+= comdlg32.lib
+
+GARBAGE		+= nsCompressedCharMap.cpp
+
+include $(topsrcdir)/config/rules.mk
+
+export:: ../nsCompressedCharMap.cpp
+	$(INSTALL) $(srcdir)/../nsCompressedCharMap.cpp .
+
+libs:: fontEncoding.properties
+	$(INSTALL) $^ $(DIST)/bin/res/fonts
+
+DEFINES	+= -D_IMPL_NS_GFXNONXP -DWIN32_LEAN_AND_MEAN -DSTRICT 
+
+EXTRA_DSO_LDOPTS += \
+		$(EXTRA_DSO_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(MOZ_UNICHARUTIL_LIBS) \
+		$(MOZ_JS_LIBS) \
+		$(NULL)
+
+ifdef NGLAYOUT_DDRAW
+DEFINES	+= DNGLAYOUT_DDRAW
+ifeq ($(MOZ_VCVER),50)
+LOCAL_INCLUDES += -I$(NGLAYOUT_DDRAW)/include
+else
+LOCAL_INCLUDES += -I$(NGLAYOUT_DDRAW)/inc
+endif
+EXTRA_DSO_LDOPTS += $(NGLAYOUT_DDRAW/lib/ddraw.lib
+OS_LIBS	+= ole32.lib
+endif
+
+
diff --git a/mozilla/gfx2/src/Makefile.in b/mozilla/gfx2/src/Makefile.in
index 247b57617c8..c1f64f79211 100644
--- a/mozilla/gfx2/src/Makefile.in
+++ b/mozilla/gfx2/src/Makefile.in
@@ -52,3 +52,7 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
diff --git a/mozilla/htmlparser/robot/test/Makefile.in b/mozilla/htmlparser/robot/test/Makefile.in
index b59dab3ce41..18378a5ce22 100644
--- a/mozilla/htmlparser/robot/test/Makefile.in
+++ b/mozilla/htmlparser/robot/test/Makefile.in
@@ -53,3 +53,10 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG
 
+ifdef ($(OS_ARCH),WINNT)
+ifdef GNU_CC
+LDFLAGS		+= -SUBSYSTEM:CONSOLE
+OS_LIBS		+= shell32.lib
+endif
+endif
+
diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in
index c353082334d..a2e00f9267a 100644
--- a/mozilla/htmlparser/src/Makefile.in
+++ b/mozilla/htmlparser/src/Makefile.in
@@ -52,7 +52,7 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
+EXTRA_DSO_LIBS	+= mozutil_s
 endif
 
 CPPSRCS = \
@@ -84,12 +84,17 @@ CPPSRCS += \
 		$(NULL)
 endif
 
-EXPORTS  := $(addprefix $(srcdir)/, $(EXPORTS))
-
-
-EXTRA_DSO_LDOPTS += $(MOZ_UNICHARUTIL_LIBS) $(MOZ_COMPONENT_LIBS)
+EXTRA_DSO_LDOPTS += \
+		$(LIBS_DIR) \
+		$(EXTRA_DSO_LIBS) \
+		$(MOZ_UNICHARUTIL_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTMLPARS -DXML_DTD
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/htmlparser/tests/outsinks/Makefile.in b/mozilla/htmlparser/tests/outsinks/Makefile.in
index 910ddebbc92..82c517ffdb9 100644
--- a/mozilla/htmlparser/tests/outsinks/Makefile.in
+++ b/mozilla/htmlparser/tests/outsinks/Makefile.in
@@ -43,7 +43,6 @@ CPPSRCS		= \
 
 LIBS		= \
 		$(XPCOM_LIBS) \
-		$(MOZ_JS_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
@@ -75,3 +74,8 @@ libs::
 	$(INSTALL) -m 555 $(srcdir)/TestOutSinks.pl $(DIST)/bin
 	$(INSTALL) $(addprefix $(srcdir)/, $(TEST_FILES)) $(DIST)/bin/OutTestData
 
+ifeq ($(OS_ARCH),WINNT)
+ifndef GNU_CC
+LDFLAGS		+= -SUBSYSTEM:CONSOLE
+endif
+endif
diff --git a/mozilla/intl/Makefile.in b/mozilla/intl/Makefile.in
index 3fd48120130..7413c414b88 100644
--- a/mozilla/intl/Makefile.in
+++ b/mozilla/intl/Makefile.in
@@ -28,5 +28,9 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= unicharutil uconv locale strres lwbrk chardet
 
+ifeq ($(OS_ARCH),WINNT)
+DIRS		+= compatibility
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/intl/chardet/Makefile.in b/mozilla/intl/chardet/Makefile.in
index c7532e842eb..9882db34db3 100644
--- a/mozilla/intl/chardet/Makefile.in
+++ b/mozilla/intl/chardet/Makefile.in
@@ -28,5 +28,11 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= public src
 
+ifeq ($(OS_ARCH),WINNT)
+ifdef ENABLE_TESTS
+DIRS		+= tests
+endif
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/intl/chardet/public/Makefile.in b/mozilla/intl/chardet/public/Makefile.in
index 07f5674dee9..002e5f8c01a 100644
--- a/mozilla/intl/chardet/public/Makefile.in
+++ b/mozilla/intl/chardet/public/Makefile.in
@@ -47,7 +47,5 @@ EXPORTS		= \
 		nsXMLEncodingCID.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/intl/chardet/src/Makefile.in b/mozilla/intl/chardet/src/Makefile.in
index 493522e1e03..787e7d1f3a9 100644
--- a/mozilla/intl/chardet/src/Makefile.in
+++ b/mozilla/intl/chardet/src/Makefile.in
@@ -60,3 +60,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(MOZ_UNICHARUTIL_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -D__STDC__ -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/intl/chardet/tests/Makefile.in b/mozilla/intl/chardet/tests/Makefile.in
index 830db5493e2..02cb0f40657 100644
--- a/mozilla/intl/chardet/tests/Makefile.in
+++ b/mozilla/intl/chardet/tests/Makefile.in
@@ -26,7 +26,13 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-PROGRAM		= DetectCharset
+REQUIRES	= \
+		xpcom \
+		string \
+		chardet \
+		$(NULL)
+
+PROGRAM		= DetectCharset$(BIN_SUFFIX)
 
 CPPSRCS		= DetectCharset.cpp
 
@@ -34,5 +40,7 @@ LIBS		= $(XPCOM_LIBS) $(NSPR_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= -I$(srcdir)/../public -I$(PUBLIC)
+DEFINES		+= -DUSE_NSREG
+INCLUDES	+= -I$(srcdir)/../public
+
 
diff --git a/mozilla/intl/compatibility/src/Makefile.in b/mozilla/intl/compatibility/src/Makefile.in
index 81e36c53e02..0b1761ffeec 100644
--- a/mozilla/intl/compatibility/src/Makefile.in
+++ b/mozilla/intl/compatibility/src/Makefile.in
@@ -32,12 +32,22 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= I18nCompatibility
 
+REQUIRES	= \
+		xpcom \
+		string \
+		$(NULL)
+
 CPPSRCS		= \
 		nsI18nCompatibility.cpp \
 		nsCSIDtoCharsetName.cpp \
 		$(NULL)
 
+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I..
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -D__STDC__ -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/intl/locale/Makefile.in b/mozilla/intl/locale/Makefile.in
index e4c73a6a1a9..abfefd7e77c 100644
--- a/mozilla/intl/locale/Makefile.in
+++ b/mozilla/intl/locale/Makefile.in
@@ -28,9 +28,5 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= public idl src
 
-#ifdef ENABLE_TESTS
-#DIRS		+= tests
-#endif
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/intl/locale/public/Makefile.in b/mozilla/intl/locale/public/Makefile.in
index 613776a8332..38bb6fa628b 100644
--- a/mozilla/intl/locale/public/Makefile.in
+++ b/mozilla/intl/locale/public/Makefile.in
@@ -35,6 +35,7 @@ EXPORTS		= \
 		nsIDateTimeFormat.h \
 		nsIPosixLocale.h \
 		nsIOS2Locale.h \
+		nsIWin32Locale.h \
 		nsLocaleCID.h \
 		$(NULL)
 
diff --git a/mozilla/intl/locale/src/Makefile.in b/mozilla/intl/locale/src/Makefile.in
index 4532624b1a5..b6f6468c786 100644
--- a/mozilla/intl/locale/src/Makefile.in
+++ b/mozilla/intl/locale/src/Makefile.in
@@ -38,9 +38,12 @@ REQUIRES	= xpcom \
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 DIRS		= os2
 else
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+DIRS		= windows
+else
 DIRS		= unix
 endif
-
+endif
 
 CPPSRCS		= \
 		nsCollation.cpp \
@@ -67,3 +70,9 @@ include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res
+
+DEFINES	+= -D_IMPL_NS_INTL
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES	+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/intl/locale/src/windows/Makefile.in b/mozilla/intl/locale/src/windows/Makefile.in
new file mode 100644
index 00000000000..43aad837890
--- /dev/null
+++ b/mozilla/intl/locale/src/windows/Makefile.in
@@ -0,0 +1,58 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= locale
+LIBRARY_NAME	= nslocale
+EXPORT_LIBRARY = 1
+IS_COMPONENT	= 1
+MODULE_NAME	= nsLocaleModule
+REQUIRES	= xpcom \
+		  string \
+		  unicharutil \
+		  uconv \
+		  $(NULL)
+
+SHARED_LIBRARY_LIBS = ../$(LIB_PREFIX)nslocale_s.$(LIB_SUFFIX)
+
+CPPSRCS		= \
+		nsCollationWin.cpp \
+		nsDateTimeFormatWin.cpp \
+		nsLocaleDLL.cpp \
+		nsIWin32LocaleImpl.cpp \
+		$(NULL)
+
+EXTRA_DSO_LDOPTS += \
+		$(MOZ_UNICHARUTIL_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+INCLUDES	+= -I$(srcdir)/..
+
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
diff --git a/mozilla/intl/lwbrk/public/Makefile.in b/mozilla/intl/lwbrk/public/Makefile.in
index 900608d5007..ec1fc211222 100644
--- a/mozilla/intl/lwbrk/public/Makefile.in
+++ b/mozilla/intl/lwbrk/public/Makefile.in
@@ -39,7 +39,5 @@ EXPORTS		= \
 		nsLWBrkCIID.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/intl/lwbrk/src/Makefile.in b/mozilla/intl/lwbrk/src/Makefile.in
index 674876642a0..d8a0dc209ff 100644
--- a/mozilla/intl/lwbrk/src/Makefile.in
+++ b/mozilla/intl/lwbrk/src/Makefile.in
@@ -57,3 +57,7 @@ ifeq (,$(filter AIX OpenVMS QNX,$(OS_ARCH)))
 CFLAGS		+= -D__STDC__
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
diff --git a/mozilla/intl/lwbrk/tests/Makefile.in b/mozilla/intl/lwbrk/tests/Makefile.in
index 7f21095b13c..3b11df5acb5 100644
--- a/mozilla/intl/lwbrk/tests/Makefile.in
+++ b/mozilla/intl/lwbrk/tests/Makefile.in
@@ -37,5 +37,6 @@ LIBS		= $(XPCOM_LIBS) $(NSPR_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= -I$(srcdir)/../public
+DEFINES		+= -DUSE_NSREG
+LOCAL_INCLUDES	= -I$(srcdir)/../public
 
diff --git a/mozilla/intl/uconv/Makefile.in b/mozilla/intl/uconv/Makefile.in
index 064c94b2ac5..824941ecc34 100644
--- a/mozilla/intl/uconv/Makefile.in
+++ b/mozilla/intl/uconv/Makefile.in
@@ -44,9 +44,11 @@ ifdef MOZ_MATHML
 DIRS           += ucvmath
 endif
 
-#ifdef ENABLE_TESTS
-#DIRS		+= tests
-#endif
+ifeq ($(OS_ARCH),WINNT)
+ifdef ENABLE_TESTS
+DIRS		+= tests
+endif
+endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/intl/uconv/public/Makefile.in b/mozilla/intl/uconv/public/Makefile.in
index ed0e2c34e9b..919c0c19f95 100644
--- a/mozilla/intl/uconv/public/Makefile.in
+++ b/mozilla/intl/uconv/public/Makefile.in
@@ -42,7 +42,5 @@ EXPORTS		= \
 		uconvutil.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/intl/uconv/src/Makefile.in b/mozilla/intl/uconv/src/Makefile.in
index aea5c1d6884..d9eb821186f 100644
--- a/mozilla/intl/uconv/src/Makefile.in
+++ b/mozilla/intl/uconv/src/Makefile.in
@@ -79,6 +79,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 CPPSRCS			+= nsOS2Charset.cpp
 EXPORT_RESOURCE		+= os2charset.properties
 else
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+CPPSRCS			+= nsWinCharset.cpp
+EXPORT_RESOURCE		+= wincharset.properties
+else
 CPPSRCS			+= nsUNIXCharset.cpp
 EXPORT_RESOURCE		+= unixcharset.properties
 # add platform charset remapping properties files here if necessary
@@ -86,6 +90,7 @@ EXPORT_RESOURCE		+= unixcharset.properties
 # eg: if we needed a charset remap for OSARCH=Linux then add the following line:
 #EXPORT_RESOURCE		+= unixcharset.Linux.properties
 endif
+endif
 
 EXTRA_DSO_LDOPTS = $(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
@@ -100,12 +105,9 @@ OS_LIBS += -llibuni
 endif
 endif
 
-#LOCAL_INCLUDES	= -I$(srcdir)/../ucvlatin -I$(srcdir)/../ucvja
-LOCAL_INCLUDES	= 
-
 include $(topsrcdir)/config/rules.mk
 
-CFLAGS		+= -DUSE_NSREG
+CFLAGS		+= -DUSE_NSREG -D_IMPL_NS_INTL
 
 # Reserved name __STDC__ cannot be defined as a macro name on AIX or OpenVMS.
 # QNX simply objects to the way it's being redefined.
@@ -120,6 +122,10 @@ ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_XOPEN_SOURCE=500
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
 libs:: $(EXPORT_RESOURCE)
 	$(INSTALL) $^ $(DIST)/bin/res
 
diff --git a/mozilla/intl/uconv/tests/Makefile.in b/mozilla/intl/uconv/tests/Makefile.in
index 9bb5a40e9ea..863b6c60476 100644
--- a/mozilla/intl/uconv/tests/Makefile.in
+++ b/mozilla/intl/uconv/tests/Makefile.in
@@ -26,22 +26,36 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+REQUIRES	= \
+		string \
+		xpcom \
+		uconv \
+		locale \
+		$(NULL)
+
 CPPSRCS		= \
+		convperf.cpp \
 		nsTestUConv.cpp \
 		nsconv.cpp \
 		plattest.cpp \
 		$(NULL)
 
-SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -DUSE_NSREG
+
 INCLUDES	+= \
 		-I$(srcdir)/../ucvlatin \
 		-I$(srcdir)/../ucvja \
 		$(NULL)
 
-LIBS		+= -L$(DIST)/bin $(XPCOM_LIBS) $(NSPR_LIBS)
+LIBS		+= \
+		$(LIBS_DIR) \
+		$(XPCOM_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 # needed for mac linux
 ifeq ($(OS_ARCH),Linux)
diff --git a/mozilla/intl/uconv/ucvcn/Makefile.in b/mozilla/intl/uconv/ucvcn/Makefile.in
index 42371284817..98fa9dc06b3 100644
--- a/mozilla/intl/uconv/ucvcn/Makefile.in
+++ b/mozilla/intl/uconv/ucvcn/Makefile.in
@@ -55,9 +55,13 @@ CPPSRCS		= \
 		$(NULL)
 
 EXPORTS		= nsUCvCnCID.h
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_INTL
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/intl/uconv/ucvibm/Makefile.in b/mozilla/intl/uconv/ucvibm/Makefile.in
index 9391ad25de4..c208a783a71 100644
--- a/mozilla/intl/uconv/ucvibm/Makefile.in
+++ b/mozilla/intl/uconv/ucvibm/Makefile.in
@@ -67,7 +67,6 @@ CPPSRCS		= \
 		$(NULL)
 
 EXPORTS		= nsUCvIBMCID.h
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
@@ -81,3 +80,7 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES	+= -D_IMPL_NS_INTL
+ifeq ($(OS_ARCH),WINNT)
+DEFINES += -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/intl/uconv/ucvja/Makefile.in b/mozilla/intl/uconv/ucvja/Makefile.in
index ca910a98a6e..0e849ae76c1 100644
--- a/mozilla/intl/uconv/ucvja/Makefile.in
+++ b/mozilla/intl/uconv/ucvja/Makefile.in
@@ -55,8 +55,6 @@ EXPORTS		= \
 		nsUCVJA2CID.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/intl/uconv/ucvko/Makefile.in b/mozilla/intl/uconv/ucvko/Makefile.in
index 39139b37317..73b16b24bb0 100644
--- a/mozilla/intl/uconv/ucvko/Makefile.in
+++ b/mozilla/intl/uconv/ucvko/Makefile.in
@@ -53,9 +53,13 @@ CPPSRCS		= \
 		$(NULL)
 
 EXPORTS		= nsUCvKOCID.h
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_INTL
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
diff --git a/mozilla/intl/uconv/ucvlatin/Makefile.in b/mozilla/intl/uconv/ucvlatin/Makefile.in
index e5f2cab954d..1efe1d03b99 100644
--- a/mozilla/intl/uconv/ucvlatin/Makefile.in
+++ b/mozilla/intl/uconv/ucvlatin/Makefile.in
@@ -166,9 +166,12 @@ CPPSRCS		= \
 		$(NULL)
 
 EXPORTS		= nsUCvLatinCID.h
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_INTL
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/intl/uconv/ucvmath/Makefile.in b/mozilla/intl/uconv/ucvmath/Makefile.in
index 33d45aed4a4..74dabb32596 100644
--- a/mozilla/intl/uconv/ucvmath/Makefile.in
+++ b/mozilla/intl/uconv/ucvmath/Makefile.in
@@ -37,10 +37,6 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 CPPSRCS		= \
-		nsUnicodeToTeXCMRt1.cpp \
-		nsUnicodeToTeXCMMIt1.cpp \
-		nsUnicodeToTeXCMSYt1.cpp \
-		nsUnicodeToTeXCMEXt1.cpp \
 		nsUnicodeToMathematica1.cpp \
 		nsUnicodeToMathematica2.cpp \
 		nsUnicodeToMathematica3.cpp \
@@ -51,9 +47,30 @@ CPPSRCS		= \
 		nsUCvMathModule.cpp \
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS		+= \
+		nsUnicodeToTeXCMRttf.cpp \
+		nsUnicodeToTeXCMMIttf.cpp \
+		nsUnicodeToTeXCMSYttf.cpp \
+		nsUnicodeToTeXCMEXttf.cpp \
+		$(NULL)
+else
+CPPSRCS		+= \
+		nsUnicodeToTeXCMRt1.cpp \
+		nsUnicodeToTeXCMMIt1.cpp \
+		nsUnicodeToTeXCMSYt1.cpp \
+		nsUnicodeToTeXCMEXt1.cpp \
+		$(NULL)
+endif
+
+
 EXPORTS		= nsUCvMathCID.h
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_INTL
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/intl/uconv/ucvtw/Makefile.in b/mozilla/intl/uconv/ucvtw/Makefile.in
index dc81e2d3877..214d1806760 100644
--- a/mozilla/intl/uconv/ucvtw/Makefile.in
+++ b/mozilla/intl/uconv/ucvtw/Makefile.in
@@ -50,9 +50,12 @@ CPPSRCS		= \
 		$(NULL)
 
 EXPORTS		= nsUCvTWCID.h
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_INTL
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/intl/uconv/ucvtw2/Makefile.in b/mozilla/intl/uconv/ucvtw2/Makefile.in
index f9e8d06479a..8b00a3628c0 100644
--- a/mozilla/intl/uconv/ucvtw2/Makefile.in
+++ b/mozilla/intl/uconv/ucvtw2/Makefile.in
@@ -51,9 +51,13 @@ CPPSRCS		= \
 		$(NULL)
 
 EXPORTS		= nsUCvTW2CID.h
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_INTL
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
diff --git a/mozilla/intl/unicharutil/public/Makefile.in b/mozilla/intl/unicharutil/public/Makefile.in
index 618725974ad..7793fbd9224 100644
--- a/mozilla/intl/unicharutil/public/Makefile.in
+++ b/mozilla/intl/unicharutil/public/Makefile.in
@@ -41,7 +41,5 @@ EXPORTS		= \
 		nsIBidi.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/intl/unicharutil/src/Makefile.in b/mozilla/intl/unicharutil/src/Makefile.in
index 90f9466c80b..3cc9be82a5c 100644
--- a/mozilla/intl/unicharutil/src/Makefile.in
+++ b/mozilla/intl/unicharutil/src/Makefile.in
@@ -61,3 +61,6 @@ EXTRA_DSO_LDOPTS =\
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -D__STDC__ -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/intl/unicharutil/tables/Makefile.in b/mozilla/intl/unicharutil/tables/Makefile.in
index 69f25a52931..436e4e35f91 100644
--- a/mozilla/intl/unicharutil/tables/Makefile.in
+++ b/mozilla/intl/unicharutil/tables/Makefile.in
@@ -28,10 +28,14 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
-libs::
-	$(INSTALL) $(srcdir)/htmlEntityVersions.properties $(DIST)/bin/res/entityTables
-	$(INSTALL) $(srcdir)/html40Latin1.properties $(DIST)/bin/res/entityTables
-	$(INSTALL) $(srcdir)/html40Symbols.properties $(DIST)/bin/res/entityTables
-	$(INSTALL) $(srcdir)/html40Special.properties $(DIST)/bin/res/entityTables 
-	$(INSTALL) $(srcdir)/transliterate.properties $(DIST)/bin/res/entityTables 
+_PROP_TABLES = \
+	htmlEntityVersions.properties \
+	html40Latin1.properties \
+	html40Symbols.properties \
+	html40Special.properties \
+	transliterate.properties \
+	$(NULL)
+
+libs:: $(_PROP_TABLES)
+	$(INSTALL) $^ $(DIST)/bin/res/entityTables
 
diff --git a/mozilla/intl/unicharutil/tests/Makefile.in b/mozilla/intl/unicharutil/tests/Makefile.in
index c78c16a5b11..1d452fc298c 100644
--- a/mozilla/intl/unicharutil/tests/Makefile.in
+++ b/mozilla/intl/unicharutil/tests/Makefile.in
@@ -45,3 +45,6 @@ include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/../public
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DUSE_NSREG
+endif
diff --git a/mozilla/jpeg/Makefile.in b/mozilla/jpeg/Makefile.in
index 0f194275714..1a61ec0f28f 100644
--- a/mozilla/jpeg/Makefile.in
+++ b/mozilla/jpeg/Makefile.in
@@ -30,6 +30,9 @@ MODULE		= jpeg
 LIBRARY_NAME	= mozjpeg
 EXPORT_LIBRARY = 1
 
+ifeq ($(OS_ARCH),WINNT)
+MAPFILE=$(LIBRARY_NAME).map
+endif
 
 CSRCS		= \
 		jdapimin.c \
@@ -74,9 +77,7 @@ EXPORTS		= \
 		jos2fig.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+ifneq (,$(filter os2 windows,$(MOZ_WIDGET_TOOLKIT)))
 CSRCS		+= \
 		jcapimin.c \
 		jcparam.c \
@@ -101,3 +102,10 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+ifndef GNU_CC
+#//  -Zi -GM needed to compile mmx functions in assembly.
+CFLAGS	+= -Zi -GM
+endif
+endif
+
diff --git a/mozilla/js/jsd/Makefile.in b/mozilla/js/jsd/Makefile.in
index 81f4d4564ba..48cce66ddee 100644
--- a/mozilla/js/jsd/Makefile.in
+++ b/mozilla/js/jsd/Makefile.in
@@ -37,10 +37,10 @@ REQUIRES	= js
 ifndef JSD_STANDALONE
 REQUIRES += \
 		  string \
-          xpcom \
+		  xpcom \
 		  xpconnect \
 		  widget \
-          dom \
+		  dom \
 		  $(NULL)
 endif
 
@@ -78,3 +78,5 @@ MODULE_NAME	= JavaScript_Debugger
 endif
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -DEXPORT_JSD_API
diff --git a/mozilla/js/src/Makefile.in b/mozilla/js/src/Makefile.in
index 94c2e9daf8d..282fa498572 100644
--- a/mozilla/js/src/Makefile.in
+++ b/mozilla/js/src/Makefile.in
@@ -132,6 +132,10 @@ EXPORTS		= \
 		jsstddef.h \
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+EXPORTS		+= jscpucfg.h
+endif
+
 FDLIBM_LIBRARY	= fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
 JSMATH_PRELINK	= jsmathtemp.o
 JS_SAFE_ARENA	= 1
@@ -140,7 +144,7 @@ DASH_R		= -r
 
 include $(topsrcdir)/config/config.mk
 
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS)
+EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
 
 ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
 SHARED_LIBRARY_LIBS += $(FDLIBM_LIBRARY)
@@ -272,11 +276,7 @@ ifneq ($(OS_ARCH),OS2)
 jsmath.o: jsmath.c $(FDLIBM_LIBRARY) Makefile.in
 	$(REPORT_BUILD)
 	@$(MAKE_DEPS)
-ifeq ($(OS_ARCH),WINNT)
-	$(ELOG) $(CC) -Fo$(JSMATH_PRELINK) -c $(CFLAGS) $<
-else
-	$(ELOG) $(CC) -o $(JSMATH_PRELINK) -c $(COMPILE_CFLAGS) $<
-endif
+	$(ELOG) $(CC) $(OUTOPTION)$(JSMATH_PRELINK) -c $(COMPILE_CFLAGS) $<
 ifeq ($(OS_ARCH),QNX)
 ifneq ($(OS_TARGET),NTO)
 	@cp $(JSMATH_PRELINK) $@
diff --git a/mozilla/js/src/liveconnect/Makefile.in b/mozilla/js/src/liveconnect/Makefile.in
index 180a27f0f17..e83f265394f 100644
--- a/mozilla/js/src/liveconnect/Makefile.in
+++ b/mozilla/js/src/liveconnect/Makefile.in
@@ -41,6 +41,9 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= java
 LIBRARY_NAME	= jsj
 EXPORT_LIBRARY = 1
+ifeq ($(OS_ARCH),WINNT)
+MAPFILE		= $(LIBRARY_NAME).map
+endif
 REQUIRES	= js \
 		  xpcom \
 		  xpconnect \
@@ -69,7 +72,6 @@ EXPORTS		= \
 		$(srcdir)/$(JNI_GEN_DIR)/netscape_javascript_JSException.h \
 		$(NULL)
 
-LLIBS		= $(NSPR_LIBS) $(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib
 
 include $(topsrcdir)/config/config.mk
 
@@ -85,8 +87,6 @@ CPPSRCS		= \
 		nsCLiveconnectFactory.cpp \
 		$(NULL)
 
-LLIBS		+= $(DIST)/lib/xpcom32.lib
-
 EXPORTS		+= \
 		$(srcdir)/nsILiveconnect.h \
 		$(srcdir)/nsISecureLiveconnect.h \
diff --git a/mozilla/js/src/xpconnect/public/Makefile.in b/mozilla/js/src/xpconnect/public/Makefile.in
index 2faa040a74d..aa7fb713ea1 100644
--- a/mozilla/js/src/xpconnect/public/Makefile.in
+++ b/mozilla/js/src/xpconnect/public/Makefile.in
@@ -44,6 +44,4 @@ EXPORTS		= \
 		xpc_map_end.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/js/src/xpconnect/shell/Makefile.in b/mozilla/js/src/xpconnect/shell/Makefile.in
index 9dde4cc74d6..2b223647b80 100644
--- a/mozilla/js/src/xpconnect/shell/Makefile.in
+++ b/mozilla/js/src/xpconnect/shell/Makefile.in
@@ -56,10 +56,13 @@ LIBS		= \
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -DJS_THREADSAFE
+DEFINES		+= -DJS_THREADSAFE -DUSE_NSREG
 ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_BSD_SOURCE
 endif
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
 
 #
 # Line editing support.  If your OS supplies the readline library, define
diff --git a/mozilla/js/src/xpconnect/src/Makefile.in b/mozilla/js/src/xpconnect/src/Makefile.in
index da7b30211af..b25e3a2897e 100644
--- a/mozilla/js/src/xpconnect/src/Makefile.in
+++ b/mozilla/js/src/xpconnect/src/Makefile.in
@@ -97,10 +97,15 @@ EXTRA_DSO_LDOPTS += \
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -DJSFILE -DJS_THREADSAFE 
+DEFINES		+= -DJSFILE -DJS_THREADSAFE -DEXPORT_XPC_API
 
 ifdef MOZ_XPCTOOLS
 DEFINES         +=  -DXPC_TOOLS_SUPPORT
 REQUIRES	+= xpctools
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+# use pre-compiled headers
+CXXFLAGS	+= -YX -Fp$(LIBRARY_NAME).pch
+endif
diff --git a/mozilla/js/src/xpconnect/tests/Makefile.in b/mozilla/js/src/xpconnect/tests/Makefile.in
index 4ebdd880957..970d95bbfbe 100644
--- a/mozilla/js/src/xpconnect/tests/Makefile.in
+++ b/mozilla/js/src/xpconnect/tests/Makefile.in
@@ -52,13 +52,14 @@ DIRS		= idl components
 CPPSRCS		= TestXPC.cpp
 
 LIBS		= \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
+		$(LIBS_DIR) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -DJS_THREADSAFE
-
+DEFINES		+= -DJS_THREADSAFE -DUSE_NSREG -DJSFILE
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/js/src/xpconnect/tests/components/Makefile.in b/mozilla/js/src/xpconnect/tests/components/Makefile.in
index 17097c34a2d..839dcded995 100644
--- a/mozilla/js/src/xpconnect/tests/components/Makefile.in
+++ b/mozilla/js/src/xpconnect/tests/components/Makefile.in
@@ -49,6 +49,7 @@ REQUIRES	= xpconnect \
 		  string \
 		  js \
 		  xpconnect_tests \
+		  timer \
 		  $(NULL)
 
 CPPSRCS		= \
@@ -77,3 +78,6 @@ EXTRA_DSO_LDOPTS += \
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/js/src/xpconnect/tools/src/Makefile.in b/mozilla/js/src/xpconnect/tools/src/Makefile.in
index 339cd6ab24b..c24200b7d39 100644
--- a/mozilla/js/src/xpconnect/tools/src/Makefile.in
+++ b/mozilla/js/src/xpconnect/tools/src/Makefile.in
@@ -41,7 +41,6 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpctools
 LIBRARY_NAME	= xpctools
-SHORT_LIBNAME	= xpctools
 REQUIRES	= xpcom \
 		  xpconnect \
 		  js \
@@ -51,21 +50,13 @@ MODULE_NAME	= xpctools
 IS_COMPONENT	= 1
 
 CPPSRCS		= \
-        	nsXPCToolsCompiler.o \
-        	nsXPCToolsProfiler.o \
-        	nsXPCToolsModule.o \
+		nsXPCToolsCompiler.cpp \
+		nsXPCToolsProfiler.cpp \
+		nsXPCToolsModule.cpp \
 		$(NULL)
 
 include $(topsrcdir)/config/config.mk
 
-# this is automatically discovered under BeOS
-ifneq ($(OS_ARCH),BeOS)
-LIBS		+= \
-		$(MOZ_JS_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-endif
-
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
@@ -74,4 +65,7 @@ EXTRA_DSO_LDOPTS += \
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DJSFILE -DJS_THREADSAFE
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
 
diff --git a/mozilla/layout/base/public/Makefile.in b/mozilla/layout/base/public/Makefile.in
index 8db7631ecb8..4eb9eb19464 100644
--- a/mozilla/layout/base/public/Makefile.in
+++ b/mozilla/layout/base/public/Makefile.in
@@ -81,7 +81,5 @@ XPIDLSRCS	= \
 		nsIPrintListener.idl        \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/layout/base/src/Makefile.in b/mozilla/layout/base/src/Makefile.in
index b7b4dcb46fa..15ebf28a1ed 100644
--- a/mozilla/layout/base/src/Makefile.in
+++ b/mozilla/layout/base/src/Makefile.in
@@ -82,7 +82,15 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_LAYOUT
 
-INCLUDES	+= \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+ifdef XP_NEW_SELECTION
+DEFINES		+= -DXP_NEW_SELECTION
+endif
+
+LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../events/src \
 		-I$(srcdir)/../../html/base/src \
 		-I$(srcdir)/../../html/style/src \
diff --git a/mozilla/layout/base/tests/Makefile.in b/mozilla/layout/base/tests/Makefile.in
index d01e198db7f..52431e16c94 100644
--- a/mozilla/layout/base/tests/Makefile.in
+++ b/mozilla/layout/base/tests/Makefile.in
@@ -40,13 +40,13 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../src \
 		$(NULL)
 
-EXTRA_DSO_LIBS	= gkgfx
+EXTRA_DSO_LIBS	= gkgfx gkbase_s
 
 LIBS		+= \
-		$(DIST)/lib/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \
+		$(LIBS_DIR) \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
-		$(EXTRA_DSO_LIBS) \
 		$(TK_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in
index f37c45792b1..54a53d3dd4b 100644
--- a/mozilla/layout/build/Makefile.in
+++ b/mozilla/layout/build/Makefile.in
@@ -33,6 +33,9 @@ SHORT_LIBNAME	= gkhtml
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLayoutModule
 EXTRA_DSO_LIBS	= gkgfx
+ifdef MOZ_PERF_METRICS
+EXTRA_DSO_LIBS	+= mozutil_s
+endif
 
 REQUIRES	= xpcom \
 		  string \
@@ -66,12 +69,6 @@ SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/$(LIB_PREFIX)gkxulgrid_s.$(LIB_SUFFIX) \
 		$(NULL)
 
-ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS += \
-		$(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
-		$(NULL)
-endif
-
 ifdef MOZ_MATHML
 SHARED_LIBRARY_LIBS += \
                 $(DIST)/lib/$(LIB_PREFIX)gkmathmlcon_s.$(LIB_SUFFIX) \
@@ -86,7 +83,7 @@ SHARED_LIBRARY_LIBS += \
 endif
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
diff --git a/mozilla/layout/html/base/src/Makefile.in b/mozilla/layout/html/base/src/Makefile.in
index 6c1138b9c75..1d21b2fe853 100644
--- a/mozilla/layout/html/base/src/Makefile.in
+++ b/mozilla/layout/html/base/src/Makefile.in
@@ -118,8 +118,6 @@ EXPORTS		+= \
 		$(NULL)
 endif
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 RESOURCES_HTML =					\
 		$(srcdir)/gopher-audio.gif	\
 		$(srcdir)/gopher-binary.gif	\
@@ -145,7 +143,15 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+ifdef XP_NEW_SELECTION
+DEFINES		+= -DXP_NEW_SELECTION
+endif
+
+LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../../xul/base/src \
 		-I$(srcdir)/../../../xul/content/src \
 		-I$(srcdir)/../../style/src \
diff --git a/mozilla/layout/html/document/src/Makefile.in b/mozilla/layout/html/document/src/Makefile.in
index 0c3d2d77515..b105beddefc 100644
--- a/mozilla/layout/html/document/src/Makefile.in
+++ b/mozilla/layout/html/document/src/Makefile.in
@@ -61,7 +61,15 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+ifdef XP_NEW_SELECTION
+DEFINES		+= -DXP_NEW_SELECTION
+endif
+
+LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../content/src \
diff --git a/mozilla/layout/html/forms/public/Makefile.in b/mozilla/layout/html/forms/public/Makefile.in
index f8c8a958849..6668dcf0246 100644
--- a/mozilla/layout/html/forms/public/Makefile.in
+++ b/mozilla/layout/html/forms/public/Makefile.in
@@ -42,7 +42,5 @@ EXPORTS		= \
 		nsIGfxTextControlFrame.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/layout/html/forms/src/Makefile.in b/mozilla/layout/html/forms/src/Makefile.in
index 5ad12204ee3..79ca31d3c81 100644
--- a/mozilla/layout/html/forms/src/Makefile.in
+++ b/mozilla/layout/html/forms/src/Makefile.in
@@ -79,16 +79,15 @@ CPPSRCS		= \
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
-CHROME_DIR	= locales/en-US
-CHROME_L10N_DIR	= communicator/locale/layout
-CHROME_L10N	= ./HtmlForm.properties
-CHROME_L10N = ./ImageDocument.properties
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../style/src \
diff --git a/mozilla/layout/html/style/src/Makefile.in b/mozilla/layout/html/style/src/Makefile.in
index 7c236ba2d1f..b896a2eb86c 100644
--- a/mozilla/layout/html/style/src/Makefile.in
+++ b/mozilla/layout/html/style/src/Makefile.in
@@ -58,8 +58,6 @@ EXPORTS		= \
 		nsICSSFrameConstructor.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
@@ -67,7 +65,11 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../table/src \
@@ -79,12 +81,12 @@ INCLUDES	+= \
 		$(NULL)
 
 ifdef MOZ_MATHML
-INCLUDES += \
+LOCAL_INCLUDES += \
         -I$(srcdir)/../../../mathml/content/src \
         -I$(srcdir)/../../../mathml/base/src
 endif
 
 ifdef MOZ_SVG
-INCLUDES += \
+LOCAL_INCLUDES += \
         -I$(srcdir)/../../../svg/base/src
 endif
diff --git a/mozilla/layout/html/table/public/Makefile.in b/mozilla/layout/html/table/public/Makefile.in
index eb41d091963..9c92ca3f105 100644
--- a/mozilla/layout/html/table/public/Makefile.in
+++ b/mozilla/layout/html/table/public/Makefile.in
@@ -33,7 +33,5 @@ EXPORTS		= \
 		nsITableLayout.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/layout/html/table/src/Makefile.in b/mozilla/layout/html/table/src/Makefile.in
index b1019ba0b20..9d813f37a55 100644
--- a/mozilla/layout/html/table/src/Makefile.in
+++ b/mozilla/layout/html/table/src/Makefile.in
@@ -39,7 +39,7 @@ REQUIRES	= xpcom \
 		  view \
 		  accessibility \
 		  necko \
-      webbrwsr \
+		  webbrwsr \
 		  $(NULL)
 
 CPPSRCS		= \
@@ -63,7 +63,11 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML -DDEBUG_TABLE_REFLOW_off
 
-INCLUDES	+= \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../style/src \
 		-I$(srcdir)/../../content/src \
diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in
index 4500692846c..faa9fcc2b8e 100644
--- a/mozilla/layout/html/tests/Makefile.in
+++ b/mozilla/layout/html/tests/Makefile.in
@@ -42,6 +42,7 @@ LOCAL_INCLUDES	= -I$(srcdir)/../style/src
 EXTRA_DSO_LIBS += gkgfx
 
 LIBS		= \
+		$(LIBS_DIR) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconhtmlcon_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconhtmldoc_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkhtmlforms_s.$(LIB_SUFFIX) \
diff --git a/mozilla/layout/mathml/base/src/Makefile.in b/mozilla/layout/mathml/base/src/Makefile.in
index 5a6997e9451..79e772c816e 100644
--- a/mozilla/layout/mathml/base/src/Makefile.in
+++ b/mozilla/layout/mathml/base/src/Makefile.in
@@ -80,21 +80,29 @@ CPPSRCS =         nsMathMLChar.cpp		        \
 
 include $(topsrcdir)/config/config.mk
 
-MKSHLIB :=
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 # do we still want this? - DJF
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-libs::
-	$(INSTALL) $(srcdir)/mathfont.properties $(DIST)/bin/res/fonts
-	$(INSTALL) $(srcdir)/mathfontPUA.properties $(DIST)/bin/res/fonts
-	$(INSTALL) $(srcdir)/mathfontCMSY10.properties $(DIST)/bin/res/fonts
-	$(INSTALL) $(srcdir)/mathfontCMEX10.properties $(DIST)/bin/res/fonts
-	$(INSTALL) $(srcdir)/mathfontMTExtra.properties $(DIST)/bin/res/fonts
-	$(INSTALL) $(srcdir)/mathfontMath1.properties $(DIST)/bin/res/fonts
-	$(INSTALL) $(srcdir)/mathfontMath2.properties $(DIST)/bin/res/fonts
-	$(INSTALL) $(srcdir)/mathfontMath4.properties $(DIST)/bin/res/fonts
-	$(INSTALL) $(srcdir)/mathfontSymbol.properties $(DIST)/bin/res/fonts
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+_PROPERTIES 	= \
+	mathfont.properties \
+	mathfontPUA.properties \
+	mathfontCMSY10.properties \
+	mathfontCMEX10.properties \
+	mathfontMTExtra.properties \
+	mathfontMath1.properties \
+	mathfontMath2.properties \
+	mathfontMath4.properties \
+	mathfontSymbol.properties \
+	$(NULL)
+
+libs:: $(_PROPERTIES)
+	$(INSTALL) $^ $(DIST)/bin/res/fonts
+
+
diff --git a/mozilla/layout/mathml/content/src/Makefile.in b/mozilla/layout/mathml/content/src/Makefile.in
index 774a625460e..dabb864a00e 100644
--- a/mozilla/layout/mathml/content/src/Makefile.in
+++ b/mozilla/layout/mathml/content/src/Makefile.in
@@ -41,14 +41,15 @@ include $(topsrcdir)/config/config.mk
 
 DEFINES += -D_IMPL_NS_HTML
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
 CPPSRCS =				\
 	nsMathMLAtoms.cpp  \
         nsMathMLOperators.cpp \
 	$(NULL)
 
-
-MKSHLIB :=
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
diff --git a/mozilla/layout/svg/base/src/Makefile.in b/mozilla/layout/svg/base/src/Makefile.in
index 93e9a1a2cee..b2238c744a0 100644
--- a/mozilla/layout/svg/base/src/Makefile.in
+++ b/mozilla/layout/svg/base/src/Makefile.in
@@ -71,10 +71,13 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-CFLAGS		+= $(MOZ_LIBART_CFLAGS)
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
 CXXFLAGS	+= $(MOZ_LIBART_CFLAGS)
 
-INCLUDES	+= \
+LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../html/table/src \
 		-I$(srcdir)/../../../html/style/src \
diff --git a/mozilla/layout/xul/base/public/Makefile.in b/mozilla/layout/xul/base/public/Makefile.in
index 4bd53c803cb..6e309fd42bc 100644
--- a/mozilla/layout/xul/base/public/Makefile.in
+++ b/mozilla/layout/xul/base/public/Makefile.in
@@ -30,7 +30,7 @@ MODULE		= layout
 XPIDL_MODULE	= layout_xul
 
 EXPORTS		= \
-    nsPIBoxObject.h \
+		nsPIBoxObject.h \
 		nsIMenuFrame.h \
 		nsIPopupSetFrame.h \
 		nsITreeFrame.h \
@@ -49,7 +49,5 @@ XPIDLSRCS=      nsIBoxObject.idl                  \
                 nsIEditorBoxObject.idl \
                 $(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/layout/xul/base/src/Makefile.in b/mozilla/layout/xul/base/src/Makefile.in
index c32a72b5ee4..22edefbc5a6 100644
--- a/mozilla/layout/xul/base/src/Makefile.in
+++ b/mozilla/layout/xul/base/src/Makefile.in
@@ -53,36 +53,36 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 CPPSRCS		= \
-       nsScrollBoxObject.cpp \
-       nsScrollBoxFrame.cpp \
-       nsTreeLayout.cpp \
-       nsXULTreeCellFrame.cpp \
-       nsXULTreeFrame.cpp \
-       nsXULTreeSliceFrame.cpp \
-       nsXULTreeGroupFrame.cpp \
-       nsXULTreeOuterGroupFrame.cpp \
-       nsBrowserBoxObject.cpp \
-       nsIFrameBoxObject.cpp \
-       nsEditorBoxObject.cpp \
-       nsMenuBoxObject.cpp \
-       nsTreeBoxObject.cpp \
-       nsPopupBoxObject.cpp \
-       nsBoxObject.cpp \
-       nsImageBoxFrame.cpp \
-       nsRootBoxFrame.cpp \
-       nsDocElementBoxFrame.cpp \
+		nsScrollBoxObject.cpp \
+		nsScrollBoxFrame.cpp \
+		nsTreeLayout.cpp \
+		nsXULTreeCellFrame.cpp \
+		nsXULTreeFrame.cpp \
+		nsXULTreeSliceFrame.cpp \
+		nsXULTreeGroupFrame.cpp \
+		nsXULTreeOuterGroupFrame.cpp \
+		nsBrowserBoxObject.cpp \
+		nsIFrameBoxObject.cpp \
+		nsEditorBoxObject.cpp \
+		nsMenuBoxObject.cpp \
+		nsTreeBoxObject.cpp \
+		nsPopupBoxObject.cpp \
+		nsBoxObject.cpp \
+		nsImageBoxFrame.cpp \
+		nsRootBoxFrame.cpp \
+		nsDocElementBoxFrame.cpp \
 		nsBox.cpp \
-        nsBoxLayoutState.cpp \
-        nsBoxToBlockAdaptor.cpp \
-        nsButtonBoxFrame.cpp \
-        nsContainerBox.cpp \
-        nsLeafBoxFrame.cpp \
-        nsSprocketLayout.cpp \
-        nsBoxLayout.cpp \
-        nsStackLayout.cpp \
-        nsTextBoxFrame.cpp \
-        nsStackFrame.cpp \
-        nsSpringFrame.cpp \
+		nsBoxLayoutState.cpp \
+		nsBoxToBlockAdaptor.cpp \
+		nsButtonBoxFrame.cpp \
+		nsContainerBox.cpp \
+		nsLeafBoxFrame.cpp \
+		nsSprocketLayout.cpp \
+		nsBoxLayout.cpp \
+		nsStackLayout.cpp \
+		nsTextBoxFrame.cpp \
+		nsStackFrame.cpp \
+		nsSpringFrame.cpp \
 		nsGroupBoxFrame.cpp \
 		nsFrameNavigator.cpp \
 		nsSplitterFrame.cpp \
@@ -91,7 +91,7 @@ CPPSRCS		= \
 		nsBoxFrame.cpp \
 		nsProgressMeterFrame.cpp \
 		nsTreeIndentationFrame.cpp \
-    nsTreeItemDragCapturer.cpp \
+		nsTreeItemDragCapturer.cpp \
 		nsScrollbarFrame.cpp \
 		nsScrollbarButtonFrame.cpp \
 		nsSliderFrame.cpp \
@@ -105,7 +105,7 @@ CPPSRCS		= \
 		nsRepeatService.cpp \
 		nsTitleBarFrame.cpp \
 		nsResizerFrame.cpp \
-  nsXULTooltipListener.cpp \
+		nsXULTooltipListener.cpp \
 		$(NULL)
 
 include $(topsrcdir)/config/config.mk
@@ -117,8 +117,12 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
 LOCAL_INCLUDES	= \
-    -I$(srcdir) \
+		-I$(srcdir) \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../html/style/src \
 		-I$(srcdir)/../../../html/base/src \
diff --git a/mozilla/mailnews/Makefile.in b/mozilla/mailnews/Makefile.in
index 6b5246efb98..4905122f13b 100644
--- a/mozilla/mailnews/Makefile.in
+++ b/mozilla/mailnews/Makefile.in
@@ -26,7 +26,11 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public base db news local mime compose imap addrbook import absync extensions
+DIRS		= public base db/msgdb news local mime compose imap addrbook import absync extensions
+
+ifeq ($(OS_ARCH),WINNT)
+DIRS		+= mapi
+endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/absync/build/Makefile.in b/mozilla/mailnews/absync/build/Makefile.in
index 65f1ec04b24..1a07deff113 100644
--- a/mozilla/mailnews/absync/build/Makefile.in
+++ b/mozilla/mailnews/absync/build/Makefile.in
@@ -58,13 +58,11 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(XPCOM_LIBS) \
-		$(MOZ_JS_LIBS) \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
-		$(NSPR_LIBS) \
+		$(MOZ_UNICHARUTIL_LIBS) \
+		$(MOZ_JS_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/addrbook/build/Makefile.in b/mozilla/mailnews/addrbook/build/Makefile.in
index dc46e0cbaa8..3ee0ddc1871 100644
--- a/mozilla/mailnews/addrbook/build/Makefile.in
+++ b/mozilla/mailnews/addrbook/build/Makefile.in
@@ -62,8 +62,8 @@ SHARED_LIBRARY_LIBS = \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS = \
+	$(LIBS_DIR) \
 	$(DIST)/lib/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
-	-L$(DIST)/bin \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(NULL)
diff --git a/mozilla/mailnews/addrbook/src/Makefile.in b/mozilla/mailnews/addrbook/src/Makefile.in
index b8d1b4a851c..bb875490ce1 100644
--- a/mozilla/mailnews/addrbook/src/Makefile.in
+++ b/mozilla/mailnews/addrbook/src/Makefile.in
@@ -114,6 +114,25 @@ EXPORTS		= \
                 nsAbDirectoryRDFResource.h \
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+EXPORTS		+= \
+		nsAbOutlookCard.h \
+		nsAbOutlookDirFactory.h \
+		nsAbOutlookDirectory.h \
+		$(NULL)
+
+CPPSRCS		+= \
+		nsAbOutlookCard.cpp \
+		nsAbOutlookDirFactory.cpp \
+		nsAbOutlookDirectory.cpp \
+		nsAbQueryStringToExpression.cpp \
+		nsAbWinHelper.cpp \
+		nsMapiAddressBook.cpp \
+		nsWabAddressBook.cpp \
+		$(NULL)
+
+endif
+
 ifdef MOZ_LDAP_XPCOM
 REQUIRES	+= mozldap
 
diff --git a/mozilla/mailnews/base/Makefile.in b/mozilla/mailnews/base/Makefile.in
index a467f241461..d3d7ecc6229 100644
--- a/mozilla/mailnews/base/Makefile.in
+++ b/mozilla/mailnews/base/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src util search build resources
+DIRS		= public src util search build
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/base/build/Makefile.in b/mozilla/mailnews/base/build/Makefile.in
index 22e4317f60d..68d1e05c2eb 100644
--- a/mozilla/mailnews/base/build/Makefile.in
+++ b/mozilla/mailnews/base/build/Makefile.in
@@ -64,6 +64,7 @@ EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
+EXTRA_DSO_LIBS += rdfutil_s
 
 CPPSRCS		= nsMsgFactory.cpp
 EXPORTS		= nsMsgBaseCID.h
@@ -74,17 +75,14 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/lib	\
-		$(DIST)/lib/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
-		-L$(DIST)/bin \
+		$(LIBS_DIR)	\
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(NULL)
 
+LOCAL_INCLUDES = -I$(srcdir)/../src
+
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES += -I$(srcdir)/../src \
-	$(NULL)
-
diff --git a/mozilla/mailnews/base/public/Makefile.in b/mozilla/mailnews/base/public/Makefile.in
index 6a4afc18b96..354ca8d8463 100644
--- a/mozilla/mailnews/base/public/Makefile.in
+++ b/mozilla/mailnews/base/public/Makefile.in
@@ -75,9 +75,9 @@ XPIDLSRCS	= \
 		nsIMsgPrintEngine.idl \
 		nsISubscribableServer.idl \
 		nsIMsgDBView.idl \
-    nsIMsgOfflineManager.idl \
-    nsIMsgProgress.idl \
-	nsIMessengerOSIntegration.idl \
+		nsIMsgOfflineManager.idl \
+		nsIMsgProgress.idl \
+		nsIMessengerOSIntegration.idl \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/base/search/src/Makefile.in b/mozilla/mailnews/base/search/src/Makefile.in
index ef0308af2f6..207be229123 100644
--- a/mozilla/mailnews/base/search/src/Makefile.in
+++ b/mozilla/mailnews/base/search/src/Makefile.in
@@ -70,6 +70,7 @@ EXPORTS		= nsMsgFilterService.h \
 				nsMsgFilterDelegateFactory.h \
 				$(NULL)
 
+DEFINES		+= -D_IMPL_NS_HTML
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
diff --git a/mozilla/mailnews/base/src/Makefile.in b/mozilla/mailnews/base/src/Makefile.in
index 5874954fc04..cedc3569bc3 100644
--- a/mozilla/mailnews/base/src/Makefile.in
+++ b/mozilla/mailnews/base/src/Makefile.in
@@ -65,6 +65,7 @@ REQUIRES	= xpcom \
 		  mime \
 		  mimetype \
 		  windowwatcher \
+		  profile \
 		  $(NULL)
 
 CPPSRCS		= \
@@ -97,10 +98,14 @@ CPPSRCS		= \
 		nsMsgThreadedDBView.cpp \
 		nsMsgSpecialViews.cpp \
 		nsMsgSearchDBView.cpp \
-    nsMsgOfflineManager.cpp \
-    nsMsgProgress.cpp \
+		nsMsgOfflineManager.cpp \
+		nsMsgProgress.cpp \
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS		+= nsMessengerWinIntegration.cpp 
+endif
+
 EXPORTS		= \
 		nsMessenger.h \
 		nsMessengerBootstrap.h \
diff --git a/mozilla/mailnews/base/util/Makefile.in b/mozilla/mailnews/base/util/Makefile.in
index 255c66516ac..9438225d10b 100644
--- a/mozilla/mailnews/base/util/Makefile.in
+++ b/mozilla/mailnews/base/util/Makefile.in
@@ -104,12 +104,13 @@ EXPORTS		= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-	-L$(DIST)/bin \
-	-L$(DIST)/lib \
+	$(LIBS_DIR) \
 	$(DIST)/lib/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(NULL)
 
+DEFINES		+= -D_IMPL_NS_MSG_BASE
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/compose/build/Makefile.in b/mozilla/mailnews/compose/build/Makefile.in
index 7bae679559e..00f7cc19eb5 100644
--- a/mozilla/mailnews/compose/build/Makefile.in
+++ b/mozilla/mailnews/compose/build/Makefile.in
@@ -66,8 +66,7 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
diff --git a/mozilla/mailnews/db/msgdb/build/Makefile.in b/mozilla/mailnews/db/msgdb/build/Makefile.in
index 5aa4a1a41cc..7f344305ce1 100644
--- a/mozilla/mailnews/db/msgdb/build/Makefile.in
+++ b/mozilla/mailnews/db/msgdb/build/Makefile.in
@@ -55,8 +55,7 @@ EXPORTS		= nsMsgDBCID.h
 SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)msgdb_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
diff --git a/mozilla/mailnews/db/msgdb/public/Makefile.in b/mozilla/mailnews/db/msgdb/public/Makefile.in
index 7c16dfab472..ec813a779a8 100644
--- a/mozilla/mailnews/db/msgdb/public/Makefile.in
+++ b/mozilla/mailnews/db/msgdb/public/Makefile.in
@@ -44,7 +44,7 @@ XPIDLSRCS	= \
 		nsIDBChangeAnnouncer.idl \
 		nsIMsgDatabase.idl \
 		nsINewsDatabase.idl \
-    nsIMsgOfflineImapOperation.idl \
+		nsIMsgOfflineImapOperation.idl \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/extensions/smime/build/Makefile.in b/mozilla/mailnews/extensions/smime/build/Makefile.in
index d68d932eab6..61e72638259 100644
--- a/mozilla/mailnews/extensions/smime/build/Makefile.in
+++ b/mozilla/mailnews/extensions/smime/build/Makefile.in
@@ -56,8 +56,7 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
diff --git a/mozilla/mailnews/imap/build/Makefile.in b/mozilla/mailnews/imap/build/Makefile.in
index cd73473e196..55e4c7bc2de 100644
--- a/mozilla/mailnews/imap/build/Makefile.in
+++ b/mozilla/mailnews/imap/build/Makefile.in
@@ -55,21 +55,20 @@ else
 EXTRA_DSO_LIBS	= msgbaseutil
 endif
 
+EXTRA_DSO_LIBS	+= rdfutil_s
+
 CPPSRCS		= nsImapFactory.cpp
 EXPORTS		= nsMsgImapCID.h
 
 SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/$(LIB_PREFIX)msgimap_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
-		$(XPCOM_LIBS) \
-		$(NSPR_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/import/Makefile.in b/mozilla/mailnews/import/Makefile.in
index 8eedaa99e42..3c0f791dfd6 100644
--- a/mozilla/mailnews/import/Makefile.in
+++ b/mozilla/mailnews/import/Makefile.in
@@ -28,5 +28,12 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= public src text
 
+ifeq ($(OS_ARCH),WINNT)
+DIRS		+= eudora
+ifneq ($(_MSC_VER),1100)
+DIRS		+= oexpress outlook
+endif
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/import/eudora/Makefile.in b/mozilla/mailnews/import/eudora/Makefile.in
new file mode 100644
index 00000000000..98b173732b5
--- /dev/null
+++ b/mozilla/mailnews/import/eudora/Makefile.in
@@ -0,0 +1,32 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= src
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/mailnews/import/eudora/src/Makefile.in b/mozilla/mailnews/import/eudora/src/Makefile.in
new file mode 100644
index 00000000000..327a9e226a3
--- /dev/null
+++ b/mozilla/mailnews/import/eudora/src/Makefile.in
@@ -0,0 +1,82 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= impEudra
+LIBRARY_NAME	= impEudra
+EXPORT_LIBRARY	= 1
+IS_COMPONENT	= 1
+META_COMPONENT	= mail
+MODULE_NAME	= nsEudoraImportModule
+
+REQUIRES	= xpcom \
+		  string \
+		  import \
+		  intl \
+		  necko \
+		  addrbook \
+		  mork \
+		  msgcompose \
+		  msgbase \
+		  editor \
+		  dom \
+		  uriloader \
+		  mailnews \
+		  msgdb \
+		  msgbaseutil \
+		  msglocal \
+		  mimetype \
+		  unicharutil \
+		  pref \
+		  $(NULL)
+
+CPPSRCS		= \
+		nsEudoraFactory.cpp \
+		nsEudoraStringBundle.cpp \
+		nsEudoraImport.cpp \
+		nsEudoraMailbox.cpp \
+		nsEudoraWin32.cpp \
+		nsEudoraSettings.cpp \
+		nsEudoraCompose.cpp \
+		nsEudoraAddress.cpp \
+		$(NULL)
+
+ifeq ($(USE_SHORT_LIBNAME),1)
+EXTRA_DSO_LIBS = msgbsutl
+else
+EXTRA_DSO_LIBS = msgbaseutil
+endif
+
+EXTRA_DSO_LDOPTS = \
+		$(LIBS_DIR) \
+		$(EXTRA_DSO_LIBS) \
+		$(MOZ_UNICHARUTIL_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/mailnews/import/oexpress/Makefile.in b/mozilla/mailnews/import/oexpress/Makefile.in
new file mode 100644
index 00000000000..b70f0932efc
--- /dev/null
+++ b/mozilla/mailnews/import/oexpress/Makefile.in
@@ -0,0 +1,67 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= importOE
+LIBRARY_NAME	= importOE
+EXPORT_LIBRARY	= 1
+IS_COMPONENT	= 1
+META_COMPONENT	= mail
+MODULE_NAME	= nsOEImport
+
+REQUIRES	= xpcom \
+		  string \
+		  import \
+		  addrbook \
+		  mork \
+		  intl \
+		  msgbase \
+		  mailnews \
+		  necko \
+		  msgdb \
+		  msgbaseutil \
+		  msgcompose \
+		  msglocal \
+		  $(NULL)
+
+CPPSRCS		= \
+		nsOEImport.cpp			\
+		nsOEFactory.cpp  		\
+		nsOEScanBoxes.cpp		\
+		nsOEMailbox.cpp			\
+		nsOEAddressIterator.cpp		\
+		WabObject.cpp			\
+		nsOERegUtil.cpp			\
+		nsOE5File.cpp			\
+		nsOESettings.cpp		\
+		nsOEStringBundle.cpp		\
+		$(NULL)
+
+EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/mailnews/import/outlook/Makefile.in b/mozilla/mailnews/import/outlook/Makefile.in
new file mode 100644
index 00000000000..98b173732b5
--- /dev/null
+++ b/mozilla/mailnews/import/outlook/Makefile.in
@@ -0,0 +1,32 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= src
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/mailnews/import/outlook/src/Makefile.in b/mozilla/mailnews/import/outlook/src/Makefile.in
new file mode 100644
index 00000000000..e3de1a621bc
--- /dev/null
+++ b/mozilla/mailnews/import/outlook/src/Makefile.in
@@ -0,0 +1,76 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= impOutlk
+LIBRARY_NAME	= impOutlk
+EXPORT_LIBRARY	= 1
+IS_COMPONENT	= 1
+META_COMPONENT	= mail
+MODULE_NAME	= nsOutlookImport
+
+REQUIRES	= xpcom \
+		  string \
+		  import \
+		  intl \
+		  necko \
+		  addrbook \
+		  mork \
+		  msgcompose \
+		  msgbase \
+		  editor \
+		  dom \
+		  uriloader \
+		  mailnews \
+		  msgbaseutil \
+		  msgdb \
+		  msglocal \
+		  mimetype \
+		  unicharutil \
+		  $(NULL)
+
+CPPSRCS		= \
+		nsOutlookFactory.cpp  		\
+		nsOutlookRegUtil.cpp		\
+		nsOutlookStringBundle.cpp	\
+		nsOutlookImport.cpp		\
+		nsOutlookSettings.cpp		\
+		MapiApi.cpp			\
+		nsOutlookMail.cpp		\
+		MapiMessage.cpp			\
+		MapiMimeTypes.cpp		\
+		nsOutlookCompose.cpp		\
+		$(NULL)
+
+EXTRA_DSO_LDOPTS = \
+	$(LIBS_DIR) \
+	$(MOZ_UNICHARUTIL_LIBS) \
+	$(MOZ_COMPONENT_LIBS) \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/mailnews/import/src/Makefile.in b/mozilla/mailnews/import/src/Makefile.in
index 80f91a21f90..ceb3a181f34 100644
--- a/mozilla/mailnews/import/src/Makefile.in
+++ b/mozilla/mailnews/import/src/Makefile.in
@@ -74,9 +74,9 @@ CPPSRCS		= 	\
 include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += \
-	-L$(DIST)/bin \
-	$(MOZ_COMPONENT_LIBS) \
+	$(LIBS_DIR) \
 	$(EXTRA_DSO_LIBS) \
+	$(MOZ_COMPONENT_LIBS) \
 	$(NULL)
 
 
diff --git a/mozilla/mailnews/import/text/src/Makefile.in b/mozilla/mailnews/import/text/src/Makefile.in
index 3a36082be6e..e1415823268 100644
--- a/mozilla/mailnews/import/text/src/Makefile.in
+++ b/mozilla/mailnews/import/text/src/Makefile.in
@@ -42,17 +42,15 @@ REQUIRES	= xpcom \
 		  mork \
 		  $(NULL)
 
-CPPSRCS		= 	nsTextFactory.cpp 				\
-        		nsTextStringBundle.cpp			\
-        		nsTextImport.cpp				\
-        		nsTextAddress.cpp 				\
-			$(NULL)
-			
+CPPSRCS		= \
+		nsTextFactory.cpp 				\
+		nsTextStringBundle.cpp			\
+		nsTextImport.cpp				\
+		nsTextAddress.cpp 				\
+		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-	-L$(DIST)/bin \
-	$(NSPR_LIBS) \
-	$(XPCOM_LIBS) \
+	$(MOZ_COMPONENT_LIBS) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/local/Makefile.in b/mozilla/mailnews/local/Makefile.in
index 4b3b329cfc7..80176305df5 100644
--- a/mozilla/mailnews/local/Makefile.in
+++ b/mozilla/mailnews/local/Makefile.in
@@ -28,5 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= public src build
 
+# win32 thinks it needs resources/ but it doesn't
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/local/build/Makefile.in b/mozilla/mailnews/local/build/Makefile.in
index 6b179c7bfda..de11575b482 100644
--- a/mozilla/mailnews/local/build/Makefile.in
+++ b/mozilla/mailnews/local/build/Makefile.in
@@ -54,6 +54,7 @@ EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
+EXTRA_DSO_LIBS	+= rdfutil_s
 
 CPPSRCS		= nsMsgLocalFactory.cpp
 EXPORTS		= nsMsgLocalCID.h
@@ -63,9 +64,7 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/lib \
-		$(DIST)/lib/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
diff --git a/mozilla/mailnews/makefiles b/mozilla/mailnews/makefiles
index c14bf7fc466..5e1d591ece5 100644
--- a/mozilla/mailnews/makefiles
+++ b/mozilla/mailnews/makefiles
@@ -56,6 +56,12 @@ mailnews/import/public/Makefile
 mailnews/import/src/Makefile
 mailnews/import/text/Makefile
 mailnews/import/text/src/Makefile
+mailnews/import/eudora/Makefile
+mailnews/import/eudora/src/Makefile
+mailnews/import/oexpress/Makefile
+mailnews/import/outlook/Makefile
+mailnews/import/outlook/src/Makefile
+mailnews/extensions/Makefile
 mailnews/extensions/smime/Makefile
 mailnews/extensions/smime/build/Makefile
 mailnews/extensions/smime/src/Makefile
@@ -63,3 +69,8 @@ mailnews/extensions/smime/public/Makefile
 mailnews/extensions/smoketest/Makefile
 mailnews/extensions/smoketest/resources/Makefile
 mailnews/extensions/smoketest/resources/content/Makefile
+mailnews/mapi/Makefile
+mailnews/mapi/resources/content/Makefile
+mailnews/mapi/resources/locale/en-US/Makefile
+mailnews/mapi/resources/locale/Makefile
+mailnews/mapi/resources/Makefile
diff --git a/mozilla/mailnews/mapi/Makefile.in b/mozilla/mailnews/mapi/Makefile.in
new file mode 100644
index 00000000000..6f251d991e2
--- /dev/null
+++ b/mozilla/mailnews/mapi/Makefile.in
@@ -0,0 +1,31 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS	= resources
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/mapi/resources/Makefile.in b/mozilla/mailnews/mapi/resources/Makefile.in
new file mode 100644
index 00000000000..17bdcd60d16
--- /dev/null
+++ b/mozilla/mailnews/mapi/resources/Makefile.in
@@ -0,0 +1,31 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS	= content locale
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/mapi/resources/content/Makefile.in b/mozilla/mailnews/mapi/resources/content/Makefile.in
new file mode 100644
index 00000000000..b4d1820f763
--- /dev/null
+++ b/mozilla/mailnews/mapi/resources/content/Makefile.in
@@ -0,0 +1,29 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/mapi/resources/locale/Makefile.in b/mozilla/mailnews/mapi/resources/locale/Makefile.in
new file mode 100644
index 00000000000..94eb91f1ce2
--- /dev/null
+++ b/mozilla/mailnews/mapi/resources/locale/Makefile.in
@@ -0,0 +1,31 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS	= en-US
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/mapi/resources/locale/en-US/Makefile.in b/mozilla/mailnews/mapi/resources/locale/en-US/Makefile.in
new file mode 100644
index 00000000000..4931bd2a67e
--- /dev/null
+++ b/mozilla/mailnews/mapi/resources/locale/en-US/Makefile.in
@@ -0,0 +1,29 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/mime/build/Makefile.in b/mozilla/mailnews/mime/build/Makefile.in
index 1e7de1afd41..311896c6212 100644
--- a/mozilla/mailnews/mime/build/Makefile.in
+++ b/mozilla/mailnews/mime/build/Makefile.in
@@ -54,10 +54,9 @@ SHARED_LIBRARY_LIBS = \
                 $(NULL)
 
 EXTRA_DSO_LDOPTS = \
-                -L$(DIST)/bin \
-                -L$(DIST)/lib \
-		        $(EXTRA_DSO_LIBS) \
-				$(MOZ_UNICHARUTIL_LIBS) \
+		$(LIBS_DIR) \
+	        $(EXTRA_DSO_LIBS) \
+		$(MOZ_UNICHARUTIL_LIBS) \
                 $(MOZ_COMPONENT_LIBS) \
                 $(NULL)
 
diff --git a/mozilla/mailnews/mime/cthandlers/glue/Makefile.in b/mozilla/mailnews/mime/cthandlers/glue/Makefile.in
index 69e2f78e76e..93881277af9 100644
--- a/mozilla/mailnews/mime/cthandlers/glue/Makefile.in
+++ b/mozilla/mailnews/mime/cthandlers/glue/Makefile.in
@@ -43,11 +43,7 @@ CPPSRCS		= \
 		nsMimeContentTypeHandler.cpp \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
+DEFINES		+= -D_IMPL_NS_HTML
 
 # glue lib should be static
 FORCE_STATIC_LIB = 1
diff --git a/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.in b/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.in
index c84115cadd1..8de85629e16 100644
--- a/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.in
+++ b/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.in
@@ -42,16 +42,22 @@ REQUIRES	= xpcom \
 		  intl \
 		  $(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+MAPFILE		= smimestb.map
+DEFFILE		= $(srcdir)/smime.def
+endif
+
 EXTRA_DSO_LIBS	= mimecthglue_s
 
+DEFINES		+= -D_IMPL_NS_HTML
+
 CPPSRCS		= \
 		nsSMIMEStub.cpp \
 		nsSMIMEStubFactory.cpp \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
diff --git a/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in b/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in
index 580f4ae1b09..94be947665c 100644
--- a/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in
+++ b/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in
@@ -45,6 +45,11 @@ REQUIRES	= xpcom \
 		  msgdb \
 		  $(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+MAPFILE		= vcard.map
+DEFFILE		= $(srcdir)/vcard.def
+endif
+
 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS = msgbsutl
 else
@@ -53,6 +58,8 @@ endif
 
 EXTRA_DSO_LIBS += mimecthglue_s
 
+DEFINES		+= -D_IMPL_NS_HTML
+
 CPPSRCS		= \
 		mimevcrd.cpp \
 		nsVCard.cpp \
@@ -61,8 +68,7 @@ CPPSRCS		= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
diff --git a/mozilla/mailnews/mime/emitters/src/Makefile.in b/mozilla/mailnews/mime/emitters/src/Makefile.in
index fd4fa46e3c5..43d1c77e5f2 100644
--- a/mozilla/mailnews/mime/emitters/src/Makefile.in
+++ b/mozilla/mailnews/mime/emitters/src/Makefile.in
@@ -66,12 +66,6 @@ CPPSRCS		= \
 		nsMimeXULEmitter.cpp \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
-		$(XPCOM_LIBS) \
-		$(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
diff --git a/mozilla/mailnews/mime/src/Makefile.in b/mozilla/mailnews/mime/src/Makefile.in
index 54a4af3fc18..053d8be29e8 100644
--- a/mozilla/mailnews/mime/src/Makefile.in
+++ b/mozilla/mailnews/mime/src/Makefile.in
@@ -67,9 +67,6 @@ REQUIRES += \
             msgsmime
 endif
                   
-REQUIRES += \
-		  $(NULL)
-
 CPPSRCS		= \
 		nsMimeObjectClassAccess.cpp \
 		nsMimeConverter.cpp \
@@ -118,9 +115,6 @@ CPPSRCS += \
                 mimemcms.cpp
 endif
 
-CPPSRCS += \
-		$(NULL)
-
 EXPORTS		= \
 		nsMimeObjectClassAccess.h \
 		nsMimeStringResources.h \
diff --git a/mozilla/mailnews/news/public/Makefile.in b/mozilla/mailnews/news/public/Makefile.in
index 3d02fff83bb..cc652842a6b 100644
--- a/mozilla/mailnews/news/public/Makefile.in
+++ b/mozilla/mailnews/news/public/Makefile.in
@@ -37,8 +37,8 @@ XPIDLSRCS	= \
 		nsINntpService.idl \
 		nsINNTPNewsgroupPost.idl \
 		nsINntpUrl.idl \
-        nsIMsgNewsFolder.idl \
-        nsINewsDownloadDialogArgs.idl \
+		nsIMsgNewsFolder.idl \
+		nsINewsDownloadDialogArgs.idl \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/news/src/Makefile.in b/mozilla/mailnews/news/src/Makefile.in
index 71aa4d86f55..574073963c3 100644
--- a/mozilla/mailnews/news/src/Makefile.in
+++ b/mozilla/mailnews/news/src/Makefile.in
@@ -64,8 +64,8 @@ CPPSRCS		= \
 		nsNewsFolder.cpp \
 		nsNntpIncomingServer.cpp \
 		nsNewsUtils.cpp \
-        nsNewsDownloadDialogArgs.cpp \
-        nsNewsDownloader.cpp \
+		nsNewsDownloadDialogArgs.cpp \
+		nsNewsDownloader.cpp \
 		$(NULL)
 
 EXPORTS		= \
@@ -79,14 +79,11 @@ EXPORTS		= \
 		nsNewsFolder.h \
 		nsNntpIncomingServer.h \
 		nsNewsUtils.h \
-        nsNewsDownloadDialogArgs.h \
+		nsNewsDownloadDialogArgs.h \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		$(XPCOM_LIBS) \
-		-lmsgbaseutil \
-		$(NSPR_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
diff --git a/mozilla/modules/libimg/mng/Makefile.in b/mozilla/modules/libimg/mng/Makefile.in
index f90476f0928..7cb7583f3ae 100644
--- a/mozilla/modules/libimg/mng/Makefile.in
+++ b/mozilla/modules/libimg/mng/Makefile.in
@@ -57,11 +57,16 @@ CSRCS		= \
 
 EXPORTS		= libmng.h libmng_conf.h libmng_types.h
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 LOCAL_INCLUDES	= -I$(srcdir)
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DZLIB_DLL
+ifdef BUILD_DEBUG_GC
+DEFINES		+= -DDEBUG_GC
+endif
+endif
+
diff --git a/mozilla/modules/libimg/png/Makefile.in b/mozilla/modules/libimg/png/Makefile.in
index 6ba6583d1be..0008ab58bb2 100644
--- a/mozilla/modules/libimg/png/Makefile.in
+++ b/mozilla/modules/libimg/png/Makefile.in
@@ -53,11 +53,15 @@ CSRCS		= \
 
 EXPORTS		= png.h pngconf.h
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 LOCAL_INCLUDES	= -I$(srcdir)
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DZLIB_DLL
+ifdef BUILD_DEBUG_GC
+DEFINES		+= -DDEBUG_GC
+endif
+endif
diff --git a/mozilla/modules/libjar/Makefile.in b/mozilla/modules/libjar/Makefile.in
index ad24814f0d3..deedd0ba866 100644
--- a/mozilla/modules/libjar/Makefile.in
+++ b/mozilla/modules/libjar/Makefile.in
@@ -35,7 +35,7 @@ BUILD_STATIC_LIBS=
 BUILD_SHARED_LIBS=1
 
 # Linux and Solaris installer needs standalone libjar
-ifneq (,$(filter Linux SunOS,$(OS_ARCH)))
+ifneq (,$(filter Linux SunOS WINNT,$(OS_ARCH)))
 DIRS		= standalone
 endif
 
@@ -62,10 +62,13 @@ ifeq ($(OS_ARCH), Linux)
 DEFINES		+= -D_BSD_SOURCE
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DZLIB_DLL=1
+endif
+
 EXTRA_DSO_LDOPTS += \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
 		$(ZLIB_LIBS) \
-		$(XPCOM_LIBS) \
-		$(NSPR_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/modules/libjar/standalone/Makefile.in b/mozilla/modules/libjar/standalone/Makefile.in
index ea5db88b006..f95c2e4d0b2 100644
--- a/mozilla/modules/libjar/standalone/Makefile.in
+++ b/mozilla/modules/libjar/standalone/Makefile.in
@@ -43,12 +43,16 @@ CPPSRCS		= $(MODULES_LIBJAR_LCPPSRCS)
 
 FORCE_STATIC_LIB = 1
 
-#ifndef MOZ_NATIVE_ZLIB
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libmozz_s.$(LIB_SUFFIX)
-#endif
+ifneq ($(OS_ARCH),WINNT)
+SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)mozz_s.$(LIB_SUFFIX)
+endif
 
 GARBAGE		+= $(MODULES_LIBJAR_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
 
+ifeq ($(OS_ARCH),WINNT)
+USE_NON_MT_LIBS=1
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH), Linux)
diff --git a/mozilla/modules/libpr0n/decoders/Makefile.in b/mozilla/modules/libpr0n/decoders/Makefile.in
index e7db281d744..f4d9eedf332 100644
--- a/mozilla/modules/libpr0n/decoders/Makefile.in
+++ b/mozilla/modules/libpr0n/decoders/Makefile.in
@@ -28,5 +28,9 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= ppm png gif jpeg bmp mng
 
+ifeq ($(OS_ARCH),WINNT)
+DIRS		+= icon/win icon
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/libpr0n/decoders/gif/Makefile.in b/mozilla/modules/libpr0n/decoders/gif/Makefile.in
index a621f4ede80..0043740eda6 100644
--- a/mozilla/modules/libpr0n/decoders/gif/Makefile.in
+++ b/mozilla/modules/libpr0n/decoders/gif/Makefile.in
@@ -40,7 +40,7 @@ REQUIRES	= xpcom \
 
 CPPSRCS		= GIF2.cpp nsGIFDecoder2.cpp nsGIFModule.cpp
 
-EXTRA_DSO_LDOPTS = $(GIF_LIBS) $(ZLIB_LIBS) \
+EXTRA_DSO_LDOPTS = $(GIF_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/modules/libpr0n/decoders/icon/Makefile.in b/mozilla/modules/libpr0n/decoders/icon/Makefile.in
new file mode 100644
index 00000000000..72361258b07
--- /dev/null
+++ b/mozilla/modules/libpr0n/decoders/icon/Makefile.in
@@ -0,0 +1,65 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= imgicon
+LIBRARY_NAME	= imgicon
+EXPORT_LIBRARY = 1
+IS_COMPONENT	= 1
+MODULE_NAME	= nsIconDecoderModule
+
+DIRS		= win
+
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  gfx2 \
+		  imglib2 \
+		  necko \
+		  $(NULL)
+
+CPPSRCS		= \
+		nsIconURI.cpp \
+		nsIconDecoder.cpp \
+		nsIconModule.cpp \
+		nsIconProtocolHandler.cpp \
+		$(NULL)
+
+XPIDLSRCS	= nsIIconURI.idl
+
+SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)imgiconwin_s.$(LIB_SUFFIX)
+
+EXTRA_DSO_LDOPTS = \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
+
+LOCAL_INCLUDES	= -I$(srcdir)/win
+
+OS_LIBS		+= shell32.lib
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/modules/libpr0n/decoders/icon/win/Makefile.in b/mozilla/modules/libpr0n/decoders/icon/win/Makefile.in
new file mode 100644
index 00000000000..653a4b4b874
--- /dev/null
+++ b/mozilla/modules/libpr0n/decoders/icon/win/Makefile.in
@@ -0,0 +1,45 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= imgicon
+LIBRARY_NAME	= imgiconwin_s
+
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  mimetype \
+		  exthandler \
+		  $(NULL)
+
+CPPSRCS		= nsIconChannel.cpp
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/modules/libpr0n/decoders/jpeg/Makefile.in b/mozilla/modules/libpr0n/decoders/jpeg/Makefile.in
index fce15455d48..24d9b06948a 100644
--- a/mozilla/modules/libpr0n/decoders/jpeg/Makefile.in
+++ b/mozilla/modules/libpr0n/decoders/jpeg/Makefile.in
@@ -42,7 +42,7 @@ REQUIRES	= xpcom \
 
 CPPSRCS		= nsJPEGDecoder.cpp nsJPEGFactory.cpp
 
-EXTRA_DSO_LDOPTS = $(JPEG_LIBS) $(ZLIB_LIBS) \
+EXTRA_DSO_LDOPTS = $(JPEG_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/modules/libpr0n/public/Makefile.in b/mozilla/modules/libpr0n/public/Makefile.in
index f36a068cacf..5429129b227 100644
--- a/mozilla/modules/libpr0n/public/Makefile.in
+++ b/mozilla/modules/libpr0n/public/Makefile.in
@@ -30,14 +30,16 @@ MODULE		= imglib2
 
 EXPORTS		= ImageErrors.h ImageLogging.h
 
-XPIDLSRCS	= imgICache.idl             \
-						imgIContainer.idl         \
-						imgIContainerObserver.idl \
-						imgIDecoder.idl           \
-						imgIDecoderObserver.idl	  \
-						imgILoad.idl              \
-						imgILoader.idl            \
-						imgIRequest.idl
+XPIDLSRCS	= \
+		imgICache.idl             \
+		imgIContainer.idl         \
+		imgIContainerObserver.idl \
+		imgIDecoder.idl           \
+		imgIDecoderObserver.idl	  \
+		imgILoad.idl              \
+		imgILoader.idl            \
+		imgIRequest.idl		  \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/libpref/public/Makefile.in b/mozilla/modules/libpref/public/Makefile.in
index 5d82623f15d..b9c7813c0df 100644
--- a/mozilla/modules/libpref/public/Makefile.in
+++ b/mozilla/modules/libpref/public/Makefile.in
@@ -39,7 +39,6 @@ XPIDLSRCS	= \
               $(NULL)
 
 EXPORTS		= prefldap.h
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/libpref/src/Makefile.in b/mozilla/modules/libpref/src/Makefile.in
index 3f8903fb38a..267ccc20ec7 100644
--- a/mozilla/modules/libpref/src/Makefile.in
+++ b/mozilla/modules/libpref/src/Makefile.in
@@ -62,6 +62,9 @@ PREF_JS_EXPORTS	= \
 ifdef MOZ_DEBUG
 PREF_JS_EXPORTS	+= $(srcdir)/debug-developer.js
 endif
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+PREF_JS_EXPORTS += $(srcdir)/win/winpref.js
+else
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 PREF_JS_EXPORTS	+= $(srcdir)/os2/os2pref.js
 else
@@ -74,13 +77,14 @@ endif
 PREF_JS_EXPORTS	+= $(srcdir)/unix/unix.js
 endif
 endif
+endif
 
 ifeq ($(OS_ARCH),OpenVMS)
 PREF_JS_EXPORTS	+= $(srcdir)/unix/openvms.js
 endif
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
diff --git a/mozilla/modules/libreg/include/Makefile.in b/mozilla/modules/libreg/include/Makefile.in
index 0ae0e29d7c7..37fdd198711 100644
--- a/mozilla/modules/libreg/include/Makefile.in
+++ b/mozilla/modules/libreg/include/Makefile.in
@@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= libreg
 
 EXPORTS		= VerReg.h NSReg.h
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/libreg/src/Makefile.in b/mozilla/modules/libreg/src/Makefile.in
index f49a7b716de..59bf030aaa6 100644
--- a/mozilla/modules/libreg/src/Makefile.in
+++ b/mozilla/modules/libreg/src/Makefile.in
@@ -35,7 +35,7 @@ ifeq ($(OS_ARCH),Darwin)
 REQUIRES = macmorefiles
 endif
 
-CSRCS		= reg.c VerReg.c vr_stubs.c nr_bufio.c
+CSRCS		= $(MODULES_LIBREG_SRC_LCSRCS) nr_bufio.c
 
 BIN_SRCS	= VerReg.c reg.c vr_stubs.c
 PROGOBJS        = $(addprefix R_,$(BIN_SRCS:.c=.o))
@@ -58,9 +58,5 @@ DEFINES         += -DUSE_BUFFERED_REGISTRY_IO
 include $(topsrcdir)/config/rules.mk
 
 R_%.o: %.c
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-	$(CC) -Fo$@ -c $(COMPILE_CFLAGS) -DSTANDALONE_REGISTRY $<
-else
-	$(CC) -o $@ -c $(COMPILE_CFLAGS) -DSTANDALONE_REGISTRY $<
-endif
+	$(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) -DSTANDALONE_REGISTRY $<
 
diff --git a/mozilla/modules/libreg/standalone/Makefile.in b/mozilla/modules/libreg/standalone/Makefile.in
index 99b1b2e6a4f..55bf3f9279a 100644
--- a/mozilla/modules/libreg/standalone/Makefile.in
+++ b/mozilla/modules/libreg/standalone/Makefile.in
@@ -36,6 +36,10 @@ ifeq ($(OS_ARCH),Darwin)
 REQUIRES = macmorefiles
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+USE_NON_MT_LIBS = 1
+endif
+
 CSRCS		= $(MODULES_LIBREG_SRC_LCSRCS)
 
 FORCE_STATIC_LIB = 1
diff --git a/mozilla/modules/mpfilelocprovider/public/Makefile.in b/mozilla/modules/mpfilelocprovider/public/Makefile.in
index 57f44451b86..6bf62b6f56b 100755
--- a/mozilla/modules/mpfilelocprovider/public/Makefile.in
+++ b/mozilla/modules/mpfilelocprovider/public/Makefile.in
@@ -31,9 +31,6 @@ EXPORTS		= \
 		nsMPFileLocProvider.h   \
 		$(NULL)
 
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
 
diff --git a/mozilla/modules/oji/public/Makefile.in b/mozilla/modules/oji/public/Makefile.in
index bcd440ddbb8..b0ead965b6b 100644
--- a/mozilla/modules/oji/public/Makefile.in
+++ b/mozilla/modules/oji/public/Makefile.in
@@ -49,7 +49,5 @@ EXPORTS		= \
 		nsILiveConnectManager.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/oji/src/Makefile.in b/mozilla/modules/oji/src/Makefile.in
index 2f7a4edd1a4..bd2ce23f048 100644
--- a/mozilla/modules/oji/src/Makefile.in
+++ b/mozilla/modules/oji/src/Makefile.in
@@ -27,7 +27,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= oji
-XPIDL_MODULE	= ojiimpl
 IS_COMPONENT	= 1
 MODULE_NAME	= nsCJVMManagerModule
 REQUIRES	= xpcom \
@@ -74,7 +73,6 @@ EXPORTS		= \
 		nsJVMPluginTagInfo.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 endif
 
 EXTRA_DSO_LDOPTS = \
@@ -86,5 +84,4 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-CFLAGS		+= -DJSJDLL=\"$(JSJDLL)\"
-
+DEFINES		+= -DJSJDLL=\"$(JSJDLL)\"
diff --git a/mozilla/modules/plugin/Makefile.in b/mozilla/modules/plugin/Makefile.in
index 17492b3e5b2..01a26ba182b 100644
--- a/mozilla/modules/plugin/Makefile.in
+++ b/mozilla/modules/plugin/Makefile.in
@@ -39,6 +39,10 @@ DIRS		+= samples/simple
 endif
 
 endif
+
+ifeq ($(OS_ARCH),WINNT)
+DIRS		+= samples/default/windows
+endif
  
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/plugin/base/public/Makefile.in b/mozilla/modules/plugin/base/public/Makefile.in
index 886d92d4892..a4a6bdc99d2 100644
--- a/mozilla/modules/plugin/base/public/Makefile.in
+++ b/mozilla/modules/plugin/base/public/Makefile.in
@@ -72,7 +72,5 @@ XPIDLSRCS 	= \
 		nsIPluginViewer.idl  \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in
index 1b1da477646..cceddce2a51 100644
--- a/mozilla/modules/plugin/base/src/Makefile.in
+++ b/mozilla/modules/plugin/base/src/Makefile.in
@@ -72,12 +72,16 @@ CPPSRCS		= \
 ifeq ($(OS_ARCH), BeOS)
 	CPPSRCS += nsPluginsDirBeOS.cpp
 else
+ifeq ($(OS_ARCH),WINNT)
+	CPPSRCS += nsPluginsDirWin.cpp
+else
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 	CPPSRCS += nsPluginsDirOS2.cpp
 else
 	CPPSRCS += nsPluginsDirUnix.cpp
 endif
 endif
+endif
 
 EXPORTS		= \
 		nsPluginsCID.h \
@@ -85,8 +89,6 @@ EXPORTS		= \
 		nsIPluginInstanceOwner.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 EXTRA_DSO_LIBS  += gkgfx
 
 EXTRA_DSO_LDOPTS = \
@@ -98,6 +100,12 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_PLUGIN
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+CXXFLAGS	+= -GX
+OS_LIBS		+= version.lib
+endif
+
 ifdef MOZ_ENABLE_GTK
 CXXFLAGS        += $(MOZ_GTK_CFLAGS)
 CFLAGS          += $(MOZ_GTK_CFLAGS)
diff --git a/mozilla/modules/plugin/samples/default/windows/Makefile.in b/mozilla/modules/plugin/samples/default/windows/Makefile.in
new file mode 100644
index 00000000000..2079bddf510
--- /dev/null
+++ b/mozilla/modules/plugin/samples/default/windows/Makefile.in
@@ -0,0 +1,59 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= plugin
+LIBRARY_NAME	= npnul32
+RESFILE		= npnul32.res
+DEFFILE		= $(srcdir)/npnul32.def
+REQUIRES	= java
+
+CPPSRCS		= \
+		maindll.cpp \
+		plugin.cpp \
+		dbg.cpp \
+		dialogs.cpp \
+		npshell.cpp \
+		npwin.cpp \
+		utils.cpp \
+		$(NULL)
+
+DEFINES		+= -D_IMPL_NS_PLUGIN -DWIN32_LEAN_AND_MEAN
+
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS	+= -GX
+OS_LIBS		+= version.lib
+
+install-plugin: $(SHARED_LIBRARY)
+ifdef SHARED_LIBRARY
+	$(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/plugins
+endif
+
+libs:: install-plugin
+
+
diff --git a/mozilla/modules/zlib/src/Makefile.in b/mozilla/modules/zlib/src/Makefile.in
index 9ab446ed147..5ffedc74787 100644
--- a/mozilla/modules/zlib/src/Makefile.in
+++ b/mozilla/modules/zlib/src/Makefile.in
@@ -31,6 +31,13 @@ MODULE		= zlib
 LIBRARY_NAME	= mozz
 EXPORT_LIBRARY = 1
 
+ifeq ($(OS_ARCH),WINNT)
+MAPFILE	= $(LIBRARY_NAME).map
+DEFFILE	= $(srcdir)/zlib.def
+DEFINES	+= -DZLIB_DLL=1
+LIBRARY_NAME = zlib
+endif
+
 CSRCS		= $(MODULES_ZLIB_SRC_LCSRCS)
 
 EXPORTS		= $(MODULES_ZLIB_SRC_LEXPORTS)
diff --git a/mozilla/modules/zlib/standalone/Makefile.in b/mozilla/modules/zlib/standalone/Makefile.in
index 4e13a3a8d69..3882b4b84f7 100644
--- a/mozilla/modules/zlib/standalone/Makefile.in
+++ b/mozilla/modules/zlib/standalone/Makefile.in
@@ -38,6 +38,10 @@ ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
 FORCE_STATIC_LIB = 1
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+USE_NON_MT_LIBS=1
+endif
+
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS)
 
 GARBAGE		+= $(MODULES_ZLIB_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
diff --git a/mozilla/netwerk/base/src/Makefile.in b/mozilla/netwerk/base/src/Makefile.in
index 97f7f08da0a..33dca59d4d6 100644
--- a/mozilla/netwerk/base/src/Makefile.in
+++ b/mozilla/netwerk/base/src/Makefile.in
@@ -80,10 +80,15 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES += -D_IMPL_NS_NET
+
 # For fruncate
 ifeq ($(OS_ARCH),Linux)
 DEFINES += -D_BSD_SOURCE
 endif
+ifeq ($(OS_ARCH),WINNT)
+DEFINES += -DWIN32_LEAN_AND_MEAN
+endif
 
 libs::
 	$(INSTALL) $(JSFILES) $(DIST)/bin/components
diff --git a/mozilla/netwerk/build/Makefile.in b/mozilla/netwerk/build/Makefile.in
index a7e94c3dd87..053a834c3e7 100644
--- a/mozilla/netwerk/build/Makefile.in
+++ b/mozilla/netwerk/build/Makefile.in
@@ -80,16 +80,21 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../protocol/keyword/src \
 		$(NULL)
 
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+EXTRA_DSO_LIBS	+= mozdbm_s
+endif
+
+ifdef MOZ_PERF_METRICS
+EXTRA_DSO_LIBS	+= mozutil_s
+endif
+
 EXTRA_DSO_LDOPTS = \
+		$(LIBS_DIR) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(ZLIB_LIBS) \
 		$(NULL)
 
-ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS	+= $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES                += -D_IMPL_NS_NET
diff --git a/mozilla/netwerk/cache/src/Makefile.in b/mozilla/netwerk/cache/src/Makefile.in
index 226fd2c7db6..cb00dceb793 100644
--- a/mozilla/netwerk/cache/src/Makefile.in
+++ b/mozilla/netwerk/cache/src/Makefile.in
@@ -70,3 +70,7 @@ EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/netwerk/dns/src/Makefile.in b/mozilla/netwerk/dns/src/Makefile.in
index b3af402c8ce..a066c47878c 100644
--- a/mozilla/netwerk/dns/src/Makefile.in
+++ b/mozilla/netwerk/dns/src/Makefile.in
@@ -40,3 +40,7 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/netwerk/mime/src/Makefile.in b/mozilla/netwerk/mime/src/Makefile.in
index 49bdb4cad7e..f246eba0743 100644
--- a/mozilla/netwerk/mime/src/Makefile.in
+++ b/mozilla/netwerk/mime/src/Makefile.in
@@ -46,3 +46,8 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
diff --git a/mozilla/netwerk/protocol/about/src/Makefile.in b/mozilla/netwerk/protocol/about/src/Makefile.in
index 4a12cb2b3ec..1c9e26d93ae 100644
--- a/mozilla/netwerk/protocol/about/src/Makefile.in
+++ b/mozilla/netwerk/protocol/about/src/Makefile.in
@@ -51,3 +51,8 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/netwerk/protocol/data/src/Makefile.in b/mozilla/netwerk/protocol/data/src/Makefile.in
index 1bbbcb5aa9d..9dff153e43b 100644
--- a/mozilla/netwerk/protocol/data/src/Makefile.in
+++ b/mozilla/netwerk/protocol/data/src/Makefile.in
@@ -43,3 +43,7 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/netwerk/protocol/datetime/src/Makefile.in b/mozilla/netwerk/protocol/datetime/src/Makefile.in
index c24519dfe0e..2ebfeb7323b 100644
--- a/mozilla/netwerk/protocol/datetime/src/Makefile.in
+++ b/mozilla/netwerk/protocol/datetime/src/Makefile.in
@@ -43,3 +43,8 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/netwerk/protocol/file/Makefile.in b/mozilla/netwerk/protocol/file/Makefile.in
index 8e79579887a..0b4d2a90ab5 100644
--- a/mozilla/netwerk/protocol/file/Makefile.in
+++ b/mozilla/netwerk/protocol/file/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src
+DIRS		= src
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/netwerk/protocol/file/src/Makefile.in b/mozilla/netwerk/protocol/file/src/Makefile.in
index 9a8b10fd133..ab52b1af6e6 100644
--- a/mozilla/netwerk/protocol/file/src/Makefile.in
+++ b/mozilla/netwerk/protocol/file/src/Makefile.in
@@ -45,3 +45,7 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/netwerk/protocol/finger/src/Makefile.in b/mozilla/netwerk/protocol/finger/src/Makefile.in
index 5ef4920c89d..eb6a99772be 100644
--- a/mozilla/netwerk/protocol/finger/src/Makefile.in
+++ b/mozilla/netwerk/protocol/finger/src/Makefile.in
@@ -43,3 +43,8 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/netwerk/protocol/ftp/src/Makefile.in b/mozilla/netwerk/protocol/ftp/src/Makefile.in
index 9fb730fcd67..d93c608d031 100644
--- a/mozilla/netwerk/protocol/ftp/src/Makefile.in
+++ b/mozilla/netwerk/protocol/ftp/src/Makefile.in
@@ -58,3 +58,13 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+ifndef MOZ_DEBUG
+ifndef NO_LOGGING
+DEFINES		+= -DFORCE_PR_LOG
+endif
+endif
+endif # WINNT
+
diff --git a/mozilla/netwerk/protocol/gopher/src/Makefile.in b/mozilla/netwerk/protocol/gopher/src/Makefile.in
index d8ada83d9aa..901ddfe7789 100644
--- a/mozilla/netwerk/protocol/gopher/src/Makefile.in
+++ b/mozilla/netwerk/protocol/gopher/src/Makefile.in
@@ -43,3 +43,8 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/netwerk/protocol/http/src/Makefile.in b/mozilla/netwerk/protocol/http/src/Makefile.in
index 22c4354b09d..f1057b6fe70 100644
--- a/mozilla/netwerk/protocol/http/src/Makefile.in
+++ b/mozilla/netwerk/protocol/http/src/Makefile.in
@@ -60,3 +60,8 @@ LOCAL_INCLUDES=-I$(srcdir)/../../../streamconv/converters
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/netwerk/protocol/jar/src/Makefile.in b/mozilla/netwerk/protocol/jar/src/Makefile.in
index 9db7bec7585..a9a819bfaeb 100644
--- a/mozilla/netwerk/protocol/jar/src/Makefile.in
+++ b/mozilla/netwerk/protocol/jar/src/Makefile.in
@@ -51,3 +51,7 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/netwerk/protocol/res/src/Makefile.in b/mozilla/netwerk/protocol/res/src/Makefile.in
index 4920125979a..663c625ad10 100644
--- a/mozilla/netwerk/protocol/res/src/Makefile.in
+++ b/mozilla/netwerk/protocol/res/src/Makefile.in
@@ -48,6 +48,10 @@ LOCAL_INCLUDES =                        \
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
 ifeq ($(OS_ARCH), Linux)
 DEFINES		+= -D_BSD_SOURCE
 endif
diff --git a/mozilla/netwerk/protocol/viewsource/src/Makefile.in b/mozilla/netwerk/protocol/viewsource/src/Makefile.in
index 2a324a6f23f..62069543725 100644
--- a/mozilla/netwerk/protocol/viewsource/src/Makefile.in
+++ b/mozilla/netwerk/protocol/viewsource/src/Makefile.in
@@ -44,3 +44,8 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/netwerk/streamconv/converters/Makefile.in b/mozilla/netwerk/streamconv/converters/Makefile.in
index 379fddb12a3..4d726380caf 100644
--- a/mozilla/netwerk/streamconv/converters/Makefile.in
+++ b/mozilla/netwerk/streamconv/converters/Makefile.in
@@ -66,3 +66,8 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN -DZLIB_DLL
+endif
+
diff --git a/mozilla/netwerk/streamconv/src/Makefile.in b/mozilla/netwerk/streamconv/src/Makefile.in
index c9435e91fa4..19f1f8dddf7 100644
--- a/mozilla/netwerk/streamconv/src/Makefile.in
+++ b/mozilla/netwerk/streamconv/src/Makefile.in
@@ -42,3 +42,7 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/netwerk/streamconv/test/Makefile.in b/mozilla/netwerk/streamconv/test/Makefile.in
index 3c5a53e145b..7741873b3b5 100644
--- a/mozilla/netwerk/streamconv/test/Makefile.in
+++ b/mozilla/netwerk/streamconv/test/Makefile.in
@@ -47,3 +47,13 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG
 
+ifeq ($(OS_ARCH),WINNT)
+LDFLAGS		+= -SUBSYSTEM:CONSOLE
+ifdef MOZ_NO_DEBUG_RTL
+DEFINES		+= -MOZ_NO_DEBUG_RTL
+endif
+ifdef NGPREFS
+DEFINES		+= -DNGPREFS
+endif
+endif # WINNT
+
diff --git a/mozilla/other-licenses/libart_lgpl/Makefile.in b/mozilla/other-licenses/libart_lgpl/Makefile.in
index d8dbea46d8c..ccf541d1ff6 100644
--- a/mozilla/other-licenses/libart_lgpl/Makefile.in
+++ b/mozilla/other-licenses/libart_lgpl/Makefile.in
@@ -9,6 +9,10 @@ include $(DEPTH)/config/autoconf.mk
 MODULE	= libart_lgpl
 LIBRARY_NAME = moz_art_lgpl
 
+ifeq ($(OS_ARCH),WINNT)
+DEFFILE	= $(srcdir)/libart.def
+endif
+
 CSRCS  = \
 	art_affine.c \
 	art_alphagamma.c \
@@ -99,7 +103,7 @@ EXPORTS = \
 	$(NULL)
 
 ifdef ENABLE_TESTS
-SIMPLE_PROGRAMS	= testart testuta
+SIMPLE_PROGRAMS	= testart$(BIN_SUFFIX) testuta$(BIN_SUFFIX)
 endif
 
 include $(topsrcdir)/config/config.mk
@@ -110,7 +114,11 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES	+= -DLIBART_COMPILATION
 
+ifeq ($(OS_ARCH),WINNT)
+LIBS += $(IMPORT_LIBRARY)
+else
 LIBS += -L. -l$(LIBRARY_NAME)
+endif
 
-$(SIMPLE_PROGRAMS): $(SHARED_LIBRARY)
+$(SIMPLE_PROGRAMS): %$(BIN_SUFFIX): %.$(OBJ_SUFFIX) $(SHARED_LIBRARY)
 
diff --git a/mozilla/other-licenses/libart_lgpl/libart.def b/mozilla/other-licenses/libart_lgpl/libart.def
index 1f5e50b47df..30d9b4c20c5 100644
--- a/mozilla/other-licenses/libart_lgpl/libart.def
+++ b/mozilla/other-licenses/libart_lgpl/libart.def
@@ -71,6 +71,7 @@ EXPORTS
  art_svp_free
  art_svp_from_vpath
  art_svp_intersect
+ art_svp_intersector
  art_svp_point_dist
  art_svp_point_wind
  art_svp_render_aa
@@ -80,6 +81,8 @@ EXPORTS
  art_svp_union
  art_svp_vpath_stroke
  art_svp_vpath_stroke_raw
+ art_svp_writer_rewind_new
+ art_svp_writer_rewind_reap
  art_uta_add_line
  art_uta_free
  art_uta_from_irect
diff --git a/mozilla/parser/expat/lib/Makefile.in b/mozilla/parser/expat/lib/Makefile.in
index fbaea9958aa..aae4495a21f 100644
--- a/mozilla/parser/expat/lib/Makefile.in
+++ b/mozilla/parser/expat/lib/Makefile.in
@@ -51,8 +51,6 @@ CSRCS		= \
 
 EXPORTS		= xmlparse.h
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 LOCAL_INCLUDES	= -I$(srcdir)/../xmltok
 
 # We want only the static lib, not the shared lib
diff --git a/mozilla/parser/htmlparser/robot/test/Makefile.in b/mozilla/parser/htmlparser/robot/test/Makefile.in
index b59dab3ce41..18378a5ce22 100644
--- a/mozilla/parser/htmlparser/robot/test/Makefile.in
+++ b/mozilla/parser/htmlparser/robot/test/Makefile.in
@@ -53,3 +53,10 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG
 
+ifdef ($(OS_ARCH),WINNT)
+ifdef GNU_CC
+LDFLAGS		+= -SUBSYSTEM:CONSOLE
+OS_LIBS		+= shell32.lib
+endif
+endif
+
diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in
index c353082334d..a2e00f9267a 100644
--- a/mozilla/parser/htmlparser/src/Makefile.in
+++ b/mozilla/parser/htmlparser/src/Makefile.in
@@ -52,7 +52,7 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
+EXTRA_DSO_LIBS	+= mozutil_s
 endif
 
 CPPSRCS = \
@@ -84,12 +84,17 @@ CPPSRCS += \
 		$(NULL)
 endif
 
-EXPORTS  := $(addprefix $(srcdir)/, $(EXPORTS))
-
-
-EXTRA_DSO_LDOPTS += $(MOZ_UNICHARUTIL_LIBS) $(MOZ_COMPONENT_LIBS)
+EXTRA_DSO_LDOPTS += \
+		$(LIBS_DIR) \
+		$(EXTRA_DSO_LIBS) \
+		$(MOZ_UNICHARUTIL_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTMLPARS -DXML_DTD
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/parser/htmlparser/tests/outsinks/Makefile.in b/mozilla/parser/htmlparser/tests/outsinks/Makefile.in
index 910ddebbc92..82c517ffdb9 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/Makefile.in
+++ b/mozilla/parser/htmlparser/tests/outsinks/Makefile.in
@@ -43,7 +43,6 @@ CPPSRCS		= \
 
 LIBS		= \
 		$(XPCOM_LIBS) \
-		$(MOZ_JS_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
@@ -75,3 +74,8 @@ libs::
 	$(INSTALL) -m 555 $(srcdir)/TestOutSinks.pl $(DIST)/bin
 	$(INSTALL) $(addprefix $(srcdir)/, $(TEST_FILES)) $(DIST)/bin/OutTestData
 
+ifeq ($(OS_ARCH),WINNT)
+ifndef GNU_CC
+LDFLAGS		+= -SUBSYSTEM:CONSOLE
+endif
+endif
diff --git a/mozilla/profile/defaults/Makefile.in b/mozilla/profile/defaults/Makefile.in
index 38d4c7f3c19..10ba75b271d 100644
--- a/mozilla/profile/defaults/Makefile.in
+++ b/mozilla/profile/defaults/Makefile.in
@@ -38,8 +38,6 @@ FILES := \
 	mimeTypes.rdf \
 	$(NULL)
 
-FILES := $(addprefix $(srcdir)/, $(FILES))
-
-libs::
-	$(INSTALL) $(FILES) $(DIST)/bin/defaults/profile
-	$(INSTALL) $(FILES) $(DIST)/bin/defaults/profile/US
+libs:: $(FILES)
+	$(INSTALL) $^ $(DIST)/bin/defaults/profile
+	$(INSTALL) $^ $(DIST)/bin/defaults/profile/US
diff --git a/mozilla/profile/pref-migrator/public/Makefile.in b/mozilla/profile/pref-migrator/public/Makefile.in
index a306d880126..d16af4d7367 100644
--- a/mozilla/profile/pref-migrator/public/Makefile.in
+++ b/mozilla/profile/pref-migrator/public/Makefile.in
@@ -35,7 +35,5 @@ XPIDLSRCS	= \
 		nsIPrefMigrationProgress.idl \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/profile/pref-migrator/resources/Makefile.in b/mozilla/profile/pref-migrator/resources/Makefile.in
index de9b7afe02f..d588fae3919 100644
--- a/mozilla/profile/pref-migrator/resources/Makefile.in
+++ b/mozilla/profile/pref-migrator/resources/Makefile.in
@@ -26,4 +26,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+# Placeholder for jar.mn
+
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/profile/pref-migrator/src/Makefile.in b/mozilla/profile/pref-migrator/src/Makefile.in
index 1c0970a4034..6281569873e 100644
--- a/mozilla/profile/pref-migrator/src/Makefile.in
+++ b/mozilla/profile/pref-migrator/src/Makefile.in
@@ -56,13 +56,15 @@ EXPORTS		= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_DOM
+
 # XXX os/2's gcc crashes on nsPrefMigration.cpp ("virtual memory exhausted")
 ifeq ($(MOZ_OS2_TOOLS),EMX)
 CXXFLAGS	:= $(filter-out -g,$(CXXFLAGS))
diff --git a/mozilla/profile/public/Makefile.in b/mozilla/profile/public/Makefile.in
index 10c8ad642ba..cc2f4cc2707 100644
--- a/mozilla/profile/public/Makefile.in
+++ b/mozilla/profile/public/Makefile.in
@@ -35,5 +35,13 @@ XPIDLSRCS	= \
                   nsIProfileChangeStatus.idl \
                   $(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+EXPORTS		= \
+		nsIAccount.h \
+		dialshr.h \
+		resource.h \
+		$(NULL)
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/profile/resources/Makefile.in b/mozilla/profile/resources/Makefile.in
index 203e6c01a91..d4641a5e9f1 100644
--- a/mozilla/profile/resources/Makefile.in
+++ b/mozilla/profile/resources/Makefile.in
@@ -26,4 +26,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+# Placeholder for jar.mn
+
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/profile/src/Makefile.in b/mozilla/profile/src/Makefile.in
index 3f5e23fb48d..553050ef2d8 100644
--- a/mozilla/profile/src/Makefile.in
+++ b/mozilla/profile/src/Makefile.in
@@ -56,7 +56,7 @@ CPPSRCS		= 	nsProfile.cpp	\
 			$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
 		$(XPCOM_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(NSPR_LIBS) \
diff --git a/mozilla/rdf/base/public/Makefile.in b/mozilla/rdf/base/public/Makefile.in
index de756f70315..362bf0c4f41 100644
--- a/mozilla/rdf/base/public/Makefile.in
+++ b/mozilla/rdf/base/public/Makefile.in
@@ -33,7 +33,5 @@ EXPORTS		= \
 		nsIRDFContentSink.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/rdf/build/Makefile.in b/mozilla/rdf/build/Makefile.in
index d6f1e0d7948..362990aab86 100644
--- a/mozilla/rdf/build/Makefile.in
+++ b/mozilla/rdf/build/Makefile.in
@@ -44,7 +44,6 @@ CPPSRCS		= \
 		$(NULL)
 
 EXPORTS		= nsRDFCID.h
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 # XXX Note dependencies on implementation headers for factory functions
 
@@ -55,7 +54,7 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
@@ -63,7 +62,7 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= \
+LOCAL_INCLUDES	= \
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../content/src \
 		-I$(srcdir)/../datasource/src \
diff --git a/mozilla/rdf/chrome/tools/chromereg/Makefile.in b/mozilla/rdf/chrome/tools/chromereg/Makefile.in
index 0dc1b066f53..4cf3a807172 100644
--- a/mozilla/rdf/chrome/tools/chromereg/Makefile.in
+++ b/mozilla/rdf/chrome/tools/chromereg/Makefile.in
@@ -36,8 +36,9 @@ CPPSRCS		= regchrome.cpp
 SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
 LIBS		= \
-		$(MOZ_COMPONENT_LIBS) \
+		$(LIBS_DIR) \
 		$(XPCOM_LIBS) \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/rdf/datasource/public/Makefile.in b/mozilla/rdf/datasource/public/Makefile.in
index 3cdef7e958e..e62bce7add4 100644
--- a/mozilla/rdf/datasource/public/Makefile.in
+++ b/mozilla/rdf/datasource/public/Makefile.in
@@ -33,7 +33,5 @@ EXPORTS		= \
 		nsIRDFFileSystem.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/rdf/datasource/src/Makefile.in b/mozilla/rdf/datasource/src/Makefile.in
index dd6a07d2823..807dcb8e689 100644
--- a/mozilla/rdf/datasource/src/Makefile.in
+++ b/mozilla/rdf/datasource/src/Makefile.in
@@ -31,6 +31,7 @@ LIBRARY_NAME	= rdfdatasource_s
 REQUIRES	= xpcom \
 		  string \
 		  necko \
+		  uconv \
 		  $(NULL)
 
 CPPSRCS		= \
diff --git a/mozilla/rdf/tests/rdfcat/Makefile.in b/mozilla/rdf/tests/rdfcat/Makefile.in
index 97922dd287d..578c105228c 100644
--- a/mozilla/rdf/tests/rdfcat/Makefile.in
+++ b/mozilla/rdf/tests/rdfcat/Makefile.in
@@ -40,12 +40,15 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 LIBS		= \
-		$(MOZ_JS_LIBS) \
+		$(LIBS_DIR) \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
-		$(TK_LIBS) \
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+MAPFILE=rdfcat.map
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
diff --git a/mozilla/rdf/tests/rdfpoll/Makefile.in b/mozilla/rdf/tests/rdfpoll/Makefile.in
index 2114c8579ac..1e58660d5b9 100644
--- a/mozilla/rdf/tests/rdfpoll/Makefile.in
+++ b/mozilla/rdf/tests/rdfpoll/Makefile.in
@@ -38,9 +38,8 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 LIBS		= \
-		$(MOZ_JS_LIBS) \
+		$(LIBS_DIR) \
 		$(XPCOM_LIBS) \
-		$(TK_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/security/manager/Makefile.in b/mozilla/security/manager/Makefile.in
index 0c932ffa036..2da0828cc0b 100644
--- a/mozilla/security/manager/Makefile.in
+++ b/mozilla/security/manager/Makefile.in
@@ -58,6 +58,14 @@ endif
 ifdef HAVE_64BIT_OS
 DEFAULT_GMAKE_FLAGS += USE_64=1
 endif
+ifeq ($(OS_ARCH),WINNT)
+DEFAULT_GMAKE_FLAGS += OS_TARGET=WIN95
+ifdef MOZ_DEBUG
+ifndef MOZ_NO_DEBUG_RTL
+DEFAULT_GMAKE_FLAGS += USE_DEBUG_RTL=1
+endif
+endif
+endif # WINNT
 
 SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile
 
@@ -70,7 +78,7 @@ depend dependclean export::
 
 libs::
 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
-	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) libdbm.$(LIB_SUFFIX)
+	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
 	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
 ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
diff --git a/mozilla/security/manager/ssl/src/Makefile.in b/mozilla/security/manager/ssl/src/Makefile.in
index bc3d493ffd2..bca1cf1a9a9 100644
--- a/mozilla/security/manager/ssl/src/Makefile.in
+++ b/mozilla/security/manager/ssl/src/Makefile.in
@@ -100,6 +100,10 @@ EXTRA_LIBS = $(NSS_LIBS)
 
 EXTRA_DEPS = $(EXTRA_LIBS)
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DNSS_USE_STATIC_LIBS
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 # Use local includes because they are inserted before INCLUDES
diff --git a/mozilla/string/obsolete/Makefile.in b/mozilla/string/obsolete/Makefile.in
index 32b30c0a2ce..7baa1bf7043 100644
--- a/mozilla/string/obsolete/Makefile.in
+++ b/mozilla/string/obsolete/Makefile.in
@@ -58,3 +58,7 @@ FORCE_USE_PIC	= 1
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/string/src/Makefile.in b/mozilla/string/src/Makefile.in
index 671374f3c60..9b96d1b8383 100644
--- a/mozilla/string/src/Makefile.in
+++ b/mozilla/string/src/Makefile.in
@@ -63,3 +63,7 @@ FORCE_USE_PIC	= 1
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/sun-java/stubs/include/Makefile.in b/mozilla/sun-java/stubs/include/Makefile.in
index 653dd7c5339..35ccc0021fd 100644
--- a/mozilla/sun-java/stubs/include/Makefile.in
+++ b/mozilla/sun-java/stubs/include/Makefile.in
@@ -49,7 +49,5 @@ EXPORTS		= \
 		zip.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/sun-java/stubs/jri/Makefile.in b/mozilla/sun-java/stubs/jri/Makefile.in
index 08925ddba3e..62cda5e2d6a 100644
--- a/mozilla/sun-java/stubs/jri/Makefile.in
+++ b/mozilla/sun-java/stubs/jri/Makefile.in
@@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= java
 
 EXPORTS		= java_lang_String.h jdk_java_lang_String.h
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/uriloader/build/Makefile.in b/mozilla/uriloader/build/Makefile.in
index 7900009aa4f..ad80e6bb2d5 100644
--- a/mozilla/uriloader/build/Makefile.in
+++ b/mozilla/uriloader/build/Makefile.in
@@ -50,12 +50,15 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/lib	\
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+OS_LIBS		+= shell32.lib
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/uriloader/exthandler/Makefile.in b/mozilla/uriloader/exthandler/Makefile.in
index 0488258c3f3..070263989f6 100644
--- a/mozilla/uriloader/exthandler/Makefile.in
+++ b/mozilla/uriloader/exthandler/Makefile.in
@@ -26,10 +26,16 @@ srcdir		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-VPATH		= @srcdir@;@srcdir@/os2
+OSDIR		= os2
 else
-VPATH		= @srcdir@:@srcdir@/unix
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+OSDIR		= win
+else
+OSDIR		= unix
 endif
+endif
+
+VPATH		:= @srcdir@ @srcdir@/$(OSDIR)
 
 MODULE = exthandler
 LIBRARY_NAME    = exthandler_s
@@ -47,12 +53,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  $(NULL)
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-OSDIR	= os2
-else
-OSDIR	= unix
-endif
-
 OSHELPER	= nsOSHelperAppService.cpp
 
 EXPORTS = 	nsExternalHelperAppService.h \
@@ -73,6 +73,9 @@ CPPSRCS	= \
 	$(OSHELPER) \
 	$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+OS_LIBS		+= shell32.lib
+endif
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
diff --git a/mozilla/view/public/Makefile.in b/mozilla/view/public/Makefile.in
index f4a7a45079d..3490eaa5656 100644
--- a/mozilla/view/public/Makefile.in
+++ b/mozilla/view/public/Makefile.in
@@ -36,11 +36,9 @@ EXPORTS		= \
 		nsIViewObserver.h \
 		nsIScrollPositionListener.h \
 		nsICompositeListener.h \
-    nsIEventProcessor.h \
+		nsIEventProcessor.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_UI
diff --git a/mozilla/view/src/Makefile.in b/mozilla/view/src/Makefile.in
index e3335a4fba7..e64fe963e34 100644
--- a/mozilla/view/src/Makefile.in
+++ b/mozilla/view/src/Makefile.in
@@ -55,7 +55,7 @@ CPPSRCS		= \
 
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
diff --git a/mozilla/webshell/Makefile.in b/mozilla/webshell/Makefile.in
index 9b6d399fe66..fc8db3a8aa9 100644
--- a/mozilla/webshell/Makefile.in
+++ b/mozilla/webshell/Makefile.in
@@ -32,6 +32,10 @@ ifdef ENABLE_TESTS
 DIRS += tests
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+DIRS += embed
+endif
+
 # XXX Export the viewer samples from here 
 # XXX so that we have them in our release builds. 
 # XXX move these back to tests/viewer when we stop shipping with debug menus
diff --git a/mozilla/webshell/embed/Makefile.in b/mozilla/webshell/embed/Makefile.in
index 8fa61e72b13..2561decf521 100644
--- a/mozilla/webshell/embed/Makefile.in
+++ b/mozilla/webshell/embed/Makefile.in
@@ -30,5 +30,11 @@ ifdef MOZ_ENABLE_XLIB
 DIRS		= xlib
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+ifdef NGPREFS
+DIRS		+= ngprefs/win
+endif
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/webshell/embed/ngprefs/win/Makefile.in b/mozilla/webshell/embed/ngprefs/win/Makefile.in
new file mode 100644
index 00000000000..e28be80d32d
--- /dev/null
+++ b/mozilla/webshell/embed/ngprefs/win/Makefile.in
@@ -0,0 +1,54 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = ngprefs
+LIBRARY_NAME = ngprefs
+EXPORT_LIBRARY = 1
+DEFFILE	= $(srcdir)/ngprefs.def
+
+CPPSRCS	= \
+	dllmain.cpp \
+	ngprefs.cpp \
+	factory.cpp \
+	$(NULL)
+
+DEFINES	+= \
+	-D_IMPL_NS_COM \
+	-DUSE_NSREG \
+	-DWIN32_LEAN_AND_MEAN \
+	$(NULL)
+
+EXTRA_DSO_LDOPTS += \
+	$(DIST)/lib/$(LIB_PREFIX)xppref32.lib \
+	$(NSPR_LIBS) \
+	$(NULL)
+
+OS_LIBS	+= ole32.lib uuid.lib
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/webshell/public/Makefile.in b/mozilla/webshell/public/Makefile.in
index e14f6009a0a..ee3552b57b4 100644
--- a/mozilla/webshell/public/Makefile.in
+++ b/mozilla/webshell/public/Makefile.in
@@ -40,11 +40,9 @@ EXPORTS		= \
 		nsIDocStreamLoaderFactory.h \
 		nsILinkHandler.h \
 		nsIWebShell.h \
-        nsIContentViewerFile.h \
-        nsIWebShellServices.h \
+		nsIContentViewerFile.h \
+		nsIWebShellServices.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/webshell/src/Makefile.in b/mozilla/webshell/src/Makefile.in
index 7c980480d07..091f11261ad 100644
--- a/mozilla/webshell/src/Makefile.in
+++ b/mozilla/webshell/src/Makefile.in
@@ -31,6 +31,10 @@ LIBRARY_NAME	= webshell
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= gkweb
 EXTRA_DSO_LIBS	= jsdom docshell
+ifdef MOZ_PERF_METRICS
+EXTRA_DSO_LIBS	+= mozutil_s
+endif
+DEFFILE		= $(srcdir)/webshell.def
 
 ifeq ($(OS_ARCH),Darwin)
 IS_COMPONENT	= 1
@@ -43,20 +47,20 @@ CPPSRCS		= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
-ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS += $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_WEB
-INCLUDES	+= \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+OS_LIBS		+= ole32.lib
+endif
+LOCAL_INCLUDES	= \
 		-I$(topsrcdir)/docshell/base \
 		$(NULL)
 
diff --git a/mozilla/webshell/tests/ComFactory/Makefile.in b/mozilla/webshell/tests/ComFactory/Makefile.in
new file mode 100644
index 00000000000..e3d49b0ef9a
--- /dev/null
+++ b/mozilla/webshell/tests/ComFactory/Makefile.in
@@ -0,0 +1,42 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH			= ../../..
+topsrcdir		= @top_srcdir@
+srcdir			= @srcdir@
+VPATH			= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MAPFILE = TestCOMFactory.map
+PROGRAM	= TestCOMFactory$(BIN_SUFFIX)
+
+CPPSRCS	= TestCOMFactory.cpp
+
+LIBS	= $(XPCOM_LIBS)
+
+REQUIRES	= xpcom \
+		  webshell \
+		  $(NULL)
+
+OS_LIBS	+= ole32.lib
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/webshell/tests/ComFactory/TestCOMFactory.cpp b/mozilla/webshell/tests/ComFactory/TestCOMFactory.cpp
index 9a557a50aba..dca5d4b9cf0 100644
--- a/mozilla/webshell/tests/ComFactory/TestCOMFactory.cpp
+++ b/mozilla/webshell/tests/ComFactory/TestCOMFactory.cpp
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
 
         webShell->Release();
     } else if (REGDB_E_CLASSNOTREG == hr) {
-        printf("Error: No registry entry.  Try running REGSVR32 raptorweb.dll\n");
+        printf("Error: No registry entry.  Try running REGSVR32 webshell.dll\n");
     } else {
         printf("Error: CoCreateInstance(...) failed.\n");
     }
diff --git a/mozilla/webshell/tests/Makefile.in b/mozilla/webshell/tests/Makefile.in
index c67a9ecc0fd..5cd75361f63 100644
--- a/mozilla/webshell/tests/Makefile.in
+++ b/mozilla/webshell/tests/Makefile.in
@@ -30,5 +30,9 @@ include $(topsrcdir)/config/config.mk
 
 DIRS		= viewer
 
+ifeq ($(OS_ARCH),WINNT)
+DIRS		+= ComFactory
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in
index 8e5a134c9e4..177d851e27f 100644
--- a/mozilla/webshell/tests/viewer/Makefile.in
+++ b/mozilla/webshell/tests/viewer/Makefile.in
@@ -52,6 +52,7 @@ REQUIRES	= xpcom \
 		  cookie \
 		  windowwatcher \
 		  xpconnect \
+		  js \
 		  $(NULL)
 
 PROGRAM			:= viewer$(BIN_SUFFIX)
@@ -74,9 +75,9 @@ CPPSRCS			= \
 			nsWindowCreator.cpp \
 			$(NULL)
 
-ifeq (,$(filter beos os2 photon mac,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (,$(filter beos os2 photon mac windows,$(MOZ_WIDGET_TOOLKIT)))
 DIRS			+= unix
-UNIX_VIEWER_TK_LIBS	= unix/$(MOZ_WIDGET_TOOLKIT)/libviewer_$(MOZ_WIDGET_TOOLKIT)_s.a
+VIEWER_TK_LIBS	= unix/$(MOZ_WIDGET_TOOLKIT)/libviewer_$(MOZ_WIDGET_TOOLKIT)_s.a
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
 BEOS_PROGRAM_RESOURCE	= $(srcdir)/viewer-beos.rsrc
@@ -91,42 +92,36 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
 TOOLKIT_CPPSRCS		= nsMacMain.cpp
 endif
-endif
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+TOOLKIT_CPPSRCS		= nsWinMain.cpp JSConsole.cpp nsWidgetSupport.cpp 
+DIRS			+= windows
+VIEWER_TK_LIBS		= windows/$(LIB_PREFIX)viewer_windows_s.$(LIB_SUFFIX)
+endif # windows
+endif # unix
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
 GTK_GLUE		= -lgtksuperwin
 endif
 
+EXTRA_DSO_LIBS		= gkgfx
 ifdef MOZ_OJI
-JSJ_LIB			= -ljsj
+EXTRA_DSO_LIBS		+= jsj
 endif
 
 XP_DIST_LIBS		= \
+			$(EXTRA_DSO_LIBS) \
 			$(MOZ_JS_LIBS) \
 			$(XPCOM_LIBS) \
-			$(JSJ_LIB) \
 			$(NULL)
 
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-XP_DIST_LIBS		+= $(DIST)/lib/gkgfx.lib
-else
-XP_DIST_LIBS		+= -lgkgfx
-endif
-
-XP_NS_UNDERBAR_CRAP	= \
+XP_LIBS			= \
 			$(MOZ_WIDGET_SUPPORT_LIBS) \
-			$(NULL)
-
-XP_LIBS			=
-
-XP_LIBS			+= \
-			$(XP_NS_UNDERBAR_CRAP) \
 			$(XP_DIST_LIBS) \
 			$(NSPR_LIBS) \
 			$(NULL)
 
 LIBS			= \
-			$(UNIX_VIEWER_TK_LIBS) \
+			$(VIEWER_TK_LIBS) \
 			$(GTK_GLUE) \
 			$(XP_LIBS) \
 			$(TK_LIBS) \
@@ -141,13 +136,13 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP)
 XP_DIST_DEP_LIBS    := $(patsubst -l%,$(DIST)/lib/%.lib,$(XP_DIST_LIBS))
 else
 XP_DIST_DEP_LIBS	:= $(filter-out -L$(DIST)/bin -L$(DIST)/lib, $(XP_DIST_LIBS))
-XP_DIST_DEP_LIBS	:= $(wildcard $(addprefix $(DIST)/,$(patsubst -l%,bin/lib%$(DLL_SUFFIX),$(XP_DIST_DEP_LIBS:-l%_s=lib/lib%_s)))*)
+XP_DIST_DEP_LIBS	:= $(wildcard $(addprefix $(DIST)/,$(patsubst -l%,bin/$(LIB_PREFIX)%$(DLL_SUFFIX),$(XP_DIST_DEP_LIBS:-l%_s=lib/lib%_s)))*)
 endif
 
 EXTRA_DEPS		= \
 			$(XP_DIST_DEP_LIBS) \
-			$(UNIX_VIEWER_TK_LIBS) \
-			$(XP_NS_UNDERBAR_CRAP) \
+			$(VIEWER_TK_LIBS) \
+			$(MOZ_WIDGET_SUPPORT_LIBS) \
 			$(NULL)
 
 include $(topsrcdir)/config/config.mk
@@ -166,6 +161,21 @@ CXXFLAGS		+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
 
 GARBAGE			+= $(PROGRAM)_gtk $(PROGRAM)_qt $(PROGRAM)_xlib
 
+ifeq ($(OS_ARCH),WINNT)
+RESFILE		= viewer.res
+OS_LIBS		+= shell32.lib ole32.lib oleaut32.lib oleacc.lib \
+	imm32.lib uuid.lib comdlg32.lib
+LDFLAGS		+= -SUBSYSTEM:CONSOLE
+EXTRA_DSO_LIBS	+= xpwidgets_s
+
+ifdef MOZ_NO_DEBUG_RTL
+CXXFLAGS	+= -DMOZ_NO_DEBUG_RTL
+endif
+ifdef NGPREFS
+CXXFLAGS	+= -DNGPREFS
+endif
+endif
+
 libs:: $(PROGRAM) $(srcdir)/mozilla-viewer.sh
 ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
 	$(INSTALL) $(srcdir)/mozilla-viewer.sh $(DIST)/bin
diff --git a/mozilla/webshell/tests/viewer/windows/Makefile.in b/mozilla/webshell/tests/viewer/windows/Makefile.in
new file mode 100644
index 00000000000..fb17e6638be
--- /dev/null
+++ b/mozilla/webshell/tests/viewer/windows/Makefile.in
@@ -0,0 +1,57 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= webshell_tests
+LIBRARY_NAME	= viewer_windows_s
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  accessibility \
+		  widget \
+		  gfx \
+		  $(NULL)
+
+CPPSRCS		= \
+		nsButton.cpp \
+		nsCheckButton.cpp \
+		nsTextWidget.cpp \
+		nsTextHelper.cpp \
+		nsLabel.cpp \
+		$(NULL)
+
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+
+LOCAL_INCLUDES	= \
+		-I$(topsrcdir)/widget/src/windows \
+		-I$(topsrcdir)/widget/src/xpwidgets \
+		$(NULL)
+
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/widget/src/Makefile.in b/mozilla/widget/src/Makefile.in
index cd0ce96a001..b12e86c8cd7 100644
--- a/mozilla/widget/src/Makefile.in
+++ b/mozilla/widget/src/Makefile.in
@@ -32,6 +32,13 @@ ifneq (,$(filter beos os2 mac,$(MOZ_WIDGET_TOOLKIT)))
 DIRS		+= $(MOZ_WIDGET_TOOLKIT)
 endif
 
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+ifdef ACCESSIBILITY
+DIRS		+= windows/expose
+endif
+DIRS		+= windows build
+endif
+
 #
 # Dont build the DSO under the 'build' directory as windows does.
 #
diff --git a/mozilla/widget/src/build/Makefile.in b/mozilla/widget/src/build/Makefile.in
index 05eea0f4287..37b67a381a0 100644
--- a/mozilla/widget/src/build/Makefile.in
+++ b/mozilla/widget/src/build/Makefile.in
@@ -13,7 +13,7 @@
 #
 # The Initial Developer of the Original Code is Netscape
 # Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
+# Copyright (C) 2001 Netscape Communications Corporation. All
 # Rights Reserved.
 #
 # Contributor(s): 
@@ -26,32 +26,46 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= widget_$(MOZ_WIDGET_TOOLKIT)
-EXPORT_LIBRARY = 1
-SHORT_LIBNAME	= wdgt$(MOZ_WIDGET_TOOLKIT)
+MODULE		= widget
+LIBRARY_NAME	= gkwidget
+EXPORT_LIBRARY	= 1
+IS_COMPONENT	= 1
+RESFILE		= widget.res
+MODULE_NAME	= nsWidgetModule
 
-CPPSRCS		= nsWidgetSupport.cpp
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  uconv \
+		  gfx \
+		  dom \
+		  timer \
+		  accessibility \
+		  $(NULL)
+
+CPPSRCS		= nsWinWidgetFactory.cpp
+
+EXTRA_DSO_LIBS	= gkgfx
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../xpwidgets \
-		-I$(srcdir)/../$(MOZ_WIDGET_TOOLKIT) \
-		-I$(srcdir) \
+		-I$(srcdir)/../windows \
 		$(NULL)
 
+OS_LIBS		+= comctl32.lib comdlg32.lib uuid.lib ole32.lib shell32.lib oleaut32.lib
+
 SHARED_LIBRARY_LIBS = \
-		$(addprefix $(DIST)/lib/libwidget,$(addsuffix _s.$(LIB_SUFFIX),$(MOZ_WIDGET_TOOLKIT))) \
-		$(DIST)/lib/libxpwidgets_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)widget_windows.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(TOOLKIT_LIBS) \
-		$(XLDFLAGS) \
-		$(XLIBS) \
+		$(EXTRA_DSO_LIBS) \
+		$(XPCOM_LIBS) \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-CXXFLAGS	+= $(TK_CFLAGS)
-
 DEFINES		+= -D_IMPL_NS_WIDGET
 
diff --git a/mozilla/widget/src/windows/Makefile.in b/mozilla/widget/src/windows/Makefile.in
new file mode 100644
index 00000000000..f2a05757c7a
--- /dev/null
+++ b/mozilla/widget/src/windows/Makefile.in
@@ -0,0 +1,94 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= widget
+LIBRARY_NAME	= widget_windows
+
+REQUIRES	= xpcom \
+			string \
+			dom \
+			accessibility \
+			content \
+			content_xul \
+			gfx \
+			gfxwin \
+			necko \
+			pref \
+			plugin \
+			timer \
+			uconv \
+			intl \
+			locale \
+			webshell \
+			docshell \
+			layout \
+			xuldoc \
+			$(NULL)
+
+CPPSRCS		= \
+	nsNativeDragTarget.cpp  \
+	nsNativeDragSource.cpp  \
+	nsDragService.cpp  \
+	L_Ienumfe.cpp  \
+	nsDataObj.cpp  \
+	nsDataObjCollection.cpp  \
+	nsClipboard.cpp  \
+	nsWindow.cpp         \
+	nsFilePicker.cpp     \
+	nsScrollbar.cpp      \
+	nsAppShell.cpp       \
+	nsLookAndFeel.cpp    \
+	nsToolkit.cpp        \
+	nsSound.cpp          \
+	nsImageClipboard.cpp \
+	nsBidiKeyboard.cpp   \
+	$(NULL)
+
+ifdef ACCESSIBILITY
+CPPSRCS	+= \
+	Accessible.cpp  \
+	SimpleDOMNode.cpp  \
+	$(NULL)
+endif
+
+DEFINES		+= -D_IMPL_NS_WIDGET -DMOZ_AIMM
+
+EXPORTS		= nsdefs.h
+
+LOCAL_INCLUDES	= -I$(srcdir)/../xpwidgets -I$(srcdir)
+
+FORCE_STATIC_LIB = 1
+
+GARBAGE		+= L_Ienumfe.cpp
+
+include $(topsrcdir)/config/rules.mk
+
+# Silly case-insensitive fs
+L_Ienumfe.cpp: IENUMFE.CPP
+	cp $< $@
+
diff --git a/mozilla/widget/src/windows/expose/ISimpleDOMDocument/Makefile.in b/mozilla/widget/src/windows/expose/ISimpleDOMDocument/Makefile.in
new file mode 100644
index 00000000000..22ec730ee76
--- /dev/null
+++ b/mozilla/widget/src/windows/expose/ISimpleDOMDocument/Makefile.in
@@ -0,0 +1,69 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= ISimpleDOMDocumentMarshall
+LIBRARY_NAME	= ISimpleDOMDocumentMarshall
+DEFFILE		= $(srcdir)/ISimpleDOMDocument.def
+
+DEFINES		+= -DREGISTER_PROXY_DLL -D_WIN32_WINNT=0x400
+
+CPPSRCS		= \
+		dlldata.cpp \
+		ISimpleDOMDocument_p.cpp \
+		ISimpleDOMDocument_i.cpp \
+		$(NULL)
+
+OS_LIBS		+= \
+		kernel32.lib \
+		rpcndr.lib \
+		rpcns4.lib \
+		rpcrt4.lib \
+		oleaut32.lib \
+		$(NULL)
+
+MIDL_GENERATED_FILES = \
+		../../ISimpleDOMDocument.h \
+		../../ISimpleDOMDocument_iid.h \
+		ISimpleDOMDocument_p.c \
+		ISimpleDOMDocument_i.c \
+		dlldata.c \
+		$(NULL)
+
+GARBAGE += $(MIDL_GENERATED_FILES)
+
+include $(topsrcdir)/config/rules.mk
+
+$(MIDL_GENERATED_FILES):
+	midl ISimpleDOMDocument.idl
+	cp ISimpleDOMDocument.h ../..
+	cp ISimpleDOMDocument_i.c ../../ISimpleDOMDocument_iid.h
+
+export:: $(MIDL_GENERATED_FILES)
+
+libs::
+	regsvr32 /s $(DIST)/bin/$(SHARED_LIBRARY)
diff --git a/mozilla/widget/src/windows/expose/ISimpleDOMNode/Makefile.in b/mozilla/widget/src/windows/expose/ISimpleDOMNode/Makefile.in
new file mode 100644
index 00000000000..4c961192994
--- /dev/null
+++ b/mozilla/widget/src/windows/expose/ISimpleDOMNode/Makefile.in
@@ -0,0 +1,69 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= ISimpleDOMNodeMarshall
+LIBRARY_NAME	= ISimpleDOMNodeMarshall
+DEFFILE		= $(srcdir)/ISimpleDOMNode.def
+
+DEFINES		+= -DREGISTER_PROXY_DLL -D_WIN32_WINNT=0x400
+
+CPPSRCS		= \
+		dlldata.cpp \
+		ISimpleDOMNode_p.cpp \
+		ISimpleDOMNode_i.cpp \
+		$(NULL)
+
+OS_LIBS		+= \
+		kernel32.lib \
+		rpcndr.lib \
+		rpcns4.lib \
+		rpcrt4.lib \
+		oleaut32.lib \
+		$(NULL)
+
+MIDL_GENERATED_FILES = \
+		../../ISimpleDOMNode.h \
+		../../ISimpleDOMNode_iid.h \
+		ISimpleDOMNode_p.c \
+		ISimpleDOMNode_i.c \
+		dlldata.c \
+		$(NULL)
+
+GARBAGE += $(MIDL_GENERATED_FILES)
+
+include $(topsrcdir)/config/rules.mk
+
+$(MIDL_GENERATED_FILES):
+	midl ISimpleDOMNode.idl
+	cp ISimpleDOMNode.h ../..
+	cp ISimpleDOMNode_i.c ../../ISimpleDOMNode_iid.h
+
+export:: $(MIDL_GENERATED_FILES)
+
+libs::
+	regsvr32 /s $(DIST)/bin/$(SHARED_LIBRARY)
diff --git a/mozilla/widget/src/windows/expose/Makefile.in b/mozilla/widget/src/windows/expose/Makefile.in
new file mode 100644
index 00000000000..9fe12f7ab96
--- /dev/null
+++ b/mozilla/widget/src/windows/expose/Makefile.in
@@ -0,0 +1,33 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS=ISimpleDOMNode ISimpleDOMDocument
+
+include $(topsrcdir)/config/rules.mk
+
+
diff --git a/mozilla/widget/src/xpwidgets/Makefile.in b/mozilla/widget/src/xpwidgets/Makefile.in
index 82d024c462a..80755fb8bf1 100644
--- a/mozilla/widget/src/xpwidgets/Makefile.in
+++ b/mozilla/widget/src/xpwidgets/Makefile.in
@@ -42,7 +42,7 @@ REQUIRES	= xpcom \
 		  unicharutil \
 		  $(NULL)
 
-DEFINES		+= -DUSE_TLS_FOR_TOOLKIT
+DEFINES		+= -D_IMPL_NS_WIDGET -DUSE_TLS_FOR_TOOLKIT
 
 CPPSRCS		= \
 		nsBaseWidget.cpp \
@@ -59,7 +59,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
 CPPSRCS += nsWidgetAtoms.cpp
 endif
 
-ifneq (,$(filter beos os2 mac,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter beos os2 mac windows,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsBaseFilePicker.cpp
 REQUIRES += docshell view intl
 endif
diff --git a/mozilla/xpcom/string/obsolete/Makefile.in b/mozilla/xpcom/string/obsolete/Makefile.in
index 32b30c0a2ce..7baa1bf7043 100644
--- a/mozilla/xpcom/string/obsolete/Makefile.in
+++ b/mozilla/xpcom/string/obsolete/Makefile.in
@@ -58,3 +58,7 @@ FORCE_USE_PIC	= 1
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/xpcom/string/src/Makefile.in b/mozilla/xpcom/string/src/Makefile.in
index 671374f3c60..9b96d1b8383 100644
--- a/mozilla/xpcom/string/src/Makefile.in
+++ b/mozilla/xpcom/string/src/Makefile.in
@@ -63,3 +63,7 @@ FORCE_USE_PIC	= 1
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in
index 30324317f3f..3db691014b6 100644
--- a/mozilla/xpcom/tests/Makefile.in
+++ b/mozilla/xpcom/tests/Makefile.in
@@ -40,7 +40,6 @@ CPPSRCS		= \
 		FilesTest.cpp \
 		nsIFileEnumerator.cpp \
 		nsIFileTest.cpp \
-		PropertiesTest.cpp \
 		TestArray.cpp \
 		TestAtoms.cpp \
 		TestAutoLock.cpp \
diff --git a/mozilla/xpcom/tests/windows/Makefile.in b/mozilla/xpcom/tests/windows/Makefile.in
new file mode 100644
index 00000000000..f02b8965a51
--- /dev/null
+++ b/mozilla/xpcom/tests/windows/Makefile.in
@@ -0,0 +1,44 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 2001 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= xpcom
+
+REQUIRES	= string
+
+CPPSRCS		= TestCOM.cpp 
+#TestHelloXPLoop.cpp nsStringTest.cpp
+
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
+
+OS_LIBS = rpcrt4.lib uuid.lib
+
+LIBS = $(XPCOM_LIBS) $(NSPR_LIBS)
diff --git a/mozilla/xpfe/appshell/public/Makefile.in b/mozilla/xpfe/appshell/public/Makefile.in
index 615a0b393ac..097cdad2f91 100644
--- a/mozilla/xpfe/appshell/public/Makefile.in
+++ b/mozilla/xpfe/appshell/public/Makefile.in
@@ -49,9 +49,11 @@ XPIDLSRCS	= \
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
 XPIDLSRCS	+= nsIInternetConfigService.idl
+else
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+XPIDLSRCS	+= nsINativeAppSupportWin.idl
+endif
 endif
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpfe/appshell/src/Makefile.in b/mozilla/xpfe/appshell/src/Makefile.in
index 303779251d8..094af4b46cf 100644
--- a/mozilla/xpfe/appshell/src/Makefile.in
+++ b/mozilla/xpfe/appshell/src/Makefile.in
@@ -75,14 +75,23 @@ CPPSRCS		= \
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 CPPSRCS	+= nsUserInfoOS2.cpp
 else
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS += nsUserInfoWin.cpp
+else
 CPPSRCS	+= nsUserInfoUnix.cpp
 endif
+endif
+
+DEFINES		+= -D_IMPL_NS_APPSHELL
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(NULL)
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index 45496bf6fbf..a51fec3176a 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -59,11 +59,14 @@ REQUIRES	+= \
 		  profile \
 		  $(NULL)
 endif
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+REQUIRES	+= intl profile appcomps
+endif
 
 ifeq ($(USE_SHORT_LIBNAME),1)
 PROGRAM		= mozilla$(BIN_SUFFIX)
 else
-PROGRAM		= mozilla-bin
+PROGRAM		= mozilla-bin$(BIN_SUFFIX)
 endif
 
 ifdef BUILD_STATIC_LIBS
@@ -79,6 +82,9 @@ _COMPONENT_LIST := $(shell cat $(FINAL_LINK_COMP_NAMES))
 endif
 else
 EXTRA_DSO_LIBS = gkgfx mpfilelocprovider_s
+ifdef MOZ_OJI
+EXTRA_DSO_LIBS += jsj
+endif
 endif
 
 
@@ -144,7 +150,6 @@ endif
 
 XP_LIBS		+= \
 		$(XPCOM_LIBS) \
-		$(OJI_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
@@ -160,10 +165,6 @@ ifdef MOZ_JPROF
 XP_LIBS         += -ljprof
 endif
 
-ifdef MOZ_OJI
-OJI_LIBS	= -ljsj
-endif
-
 LIBS		= $(XP_LIBS)
 
 ifdef GC_LEAK_DETECTOR
@@ -193,6 +194,12 @@ CPPSRCS += nsNativeAppSupportGtk.cpp \
 LIBS += $(MOZ_GTK_LDFLAGS)
 endif
 
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+DEFINES	+= -DWIN32_LEAN_AND_MEAN
+CPPSRCS += nsNativeAppSupportWin.cpp nsNativeAppSupportBase.cpp
+OS_LIBS += comctl32.lib comdlg32.lib uuid.lib shell32.lib ole32.lib oleaut32.lib version.lib
+endif
+
 XP_DIST_DEP_LIBS := $(filter-out -L$(DIST)/bin -L$(DIST)/lib, $(XP_DIST_LIBS))
 
 ifeq ($(OS_ARCH),OS2)
@@ -231,13 +238,19 @@ ifeq ($(MOZ_WINCONSOLE),1)
 ifeq ($(MOZ_OS2_TOOLS),EMX)
 BIN_FLAGS	:= -Zlinker /PM:VIO -Zlinker /Stack:0x30000
 endif
-else
+ifeq ($(OS_ARCH),WINNT)
+LDFLAGS		+= /SUBSYSTEM:CONSOLE
+endif
+else # MOZ_WINCONSOLE
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 LDFLAGS += /PM:PM
 endif
 ifeq ($(MOZ_OS2_TOOLS),EMX)
 BIN_FLAGS	:= -Zlinker /PM:PM -Zlinker /Stack:0x30000
 endif
+ifeq ($(OS_ARCH),WINNT)
+LDFLAGS		+= /SUBSYSTEM:WINDOWS
+endif
 endif
 
 ifdef BUILD_STATIC_LIBS
diff --git a/mozilla/xpfe/browser/Makefile.in b/mozilla/xpfe/browser/Makefile.in
index 5748a1534de..1ae855a3e36 100644
--- a/mozilla/xpfe/browser/Makefile.in
+++ b/mozilla/xpfe/browser/Makefile.in
@@ -33,7 +33,7 @@ include $(topsrcdir)/config/rules.mk
 ifeq (mac,$(MOZ_WIDGET_TOOLKIT))
 CHROME_PLATFORM = mac
 else
-ifeq ($(OS_ARCH),OS2)
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 CHROME_PLATFORM = win
 else
 CHROME_PLATFORM = unix
diff --git a/mozilla/xpfe/browser/resources/content/Makefile.in b/mozilla/xpfe/browser/resources/content/Makefile.in
index fdcc076b516..f074d582cbe 100644
--- a/mozilla/xpfe/browser/resources/content/Makefile.in
+++ b/mozilla/xpfe/browser/resources/content/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(OS_ARCH), OS2)
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 DIRS		= win
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
@@ -38,9 +38,4 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-# the need for this stuff got whacked when smfr removed the build id
-# from viewSource.xul (yay!). Can someone remove the garbage? :-)
-# GARBAGE	+= viewSource.xul.out
-# for some reason puma decided to create a directory viewSource.xul.out
-GARBAGE_DIRS	+= viewSource.xul.out
 
diff --git a/mozilla/xpfe/browser/src/Makefile.in b/mozilla/xpfe/browser/src/Makefile.in
index 9e37713609f..836eade0c8b 100644
--- a/mozilla/xpfe/browser/src/Makefile.in
+++ b/mozilla/xpfe/browser/src/Makefile.in
@@ -56,11 +56,13 @@ REQUIRES	= xpcom \
 CPPSRCS		= nsBrowserInstance.cpp
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
+		$(LIBS_DIR) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/xpfe/communicator/Makefile.in b/mozilla/xpfe/communicator/Makefile.in
index 60906a5e5c9..b2fcf7f6b8c 100644
--- a/mozilla/xpfe/communicator/Makefile.in
+++ b/mozilla/xpfe/communicator/Makefile.in
@@ -33,7 +33,7 @@ include $(topsrcdir)/config/rules.mk
 ifeq (mac,$(MOZ_WIDGET_TOOLKIT))
 CHROME_PLATFORM = mac
 else
-ifeq ($(OS_ARCH),OS2)
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 CHROME_PLATFORM = win
 else
 CHROME_PLATFORM = unix
diff --git a/mozilla/xpfe/communicator/resources/content/Makefile.in b/mozilla/xpfe/communicator/resources/content/Makefile.in
index 28e94820202..cdad6ddea21 100644
--- a/mozilla/xpfe/communicator/resources/content/Makefile.in
+++ b/mozilla/xpfe/communicator/resources/content/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+ifneq (,$(filter os2 windows,$(MOZ_WIDGET_TOOLKIT)))
 DIRS 		= win
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
diff --git a/mozilla/xpfe/communicator/resources/locale/en-US/Makefile.in b/mozilla/xpfe/communicator/resources/locale/en-US/Makefile.in
index cf8ca719ee1..f1aa82f7463 100644
--- a/mozilla/xpfe/communicator/resources/locale/en-US/Makefile.in
+++ b/mozilla/xpfe/communicator/resources/locale/en-US/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+ifneq (,$(filter os2 windows,$(MOZ_WIDGET_TOOLKIT)))
 DIRS 		= win
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
diff --git a/mozilla/xpfe/components/Makefile.in b/mozilla/xpfe/components/Makefile.in
index e6c88d991d7..d8fdcfa3583 100644
--- a/mozilla/xpfe/components/Makefile.in
+++ b/mozilla/xpfe/components/Makefile.in
@@ -26,11 +26,17 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= bookmarks directory filepicker find history search sidebar related regviewer xfer prefwindow shistory console autocomplete urlbarhistory intl build
+DIRS		= bookmarks directory filepicker find history search sidebar related regviewer xfer prefwindow shistory console autocomplete urlbarhistory intl
 
 ifdef MOZ_ENABLE_XREMOTE
 DIRS		+= xremote
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+DIRS		+= winhooks urlwidget
+endif
+
+DIRS		+= build
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpfe/components/autocomplete/Makefile.in b/mozilla/xpfe/components/autocomplete/Makefile.in
index f1879b578d7..10987f4eb9e 100644
--- a/mozilla/xpfe/components/autocomplete/Makefile.in
+++ b/mozilla/xpfe/components/autocomplete/Makefile.in
@@ -28,10 +28,6 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= public src
 
-ifdef ENABLE_TESTS
-DIRS		+= test
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 
diff --git a/mozilla/xpfe/components/autocomplete/test/Makefile.in b/mozilla/xpfe/components/autocomplete/test/Makefile.in
index 43b379b817e..5cae73e665b 100644
--- a/mozilla/xpfe/components/autocomplete/test/Makefile.in
+++ b/mozilla/xpfe/components/autocomplete/test/Makefile.in
@@ -27,13 +27,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= appcomps
-REQUIRES	= xpcom \
-		  gfx \
-		  layout \
-		  content \
-		  dom \
-		  js \
-		  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpfe/components/bookmarks/resources/Makefile.in b/mozilla/xpfe/components/bookmarks/resources/Makefile.in
index 785e430add3..a3168e544c9 100644
--- a/mozilla/xpfe/components/bookmarks/resources/Makefile.in
+++ b/mozilla/xpfe/components/bookmarks/resources/Makefile.in
@@ -26,7 +26,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= 
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpfe/components/build/Makefile.in b/mozilla/xpfe/components/build/Makefile.in
index 25162e650ad..aff68c1598a 100644
--- a/mozilla/xpfe/components/build/Makefile.in
+++ b/mozilla/xpfe/components/build/Makefile.in
@@ -55,6 +55,10 @@ REQUIRES	+= mozldap
 DEFINES		+= -DMOZ_LDAP_XPCOM
 endif
 
+ifdef MOZ_PERF_METRICS
+EXTRA_DSO_LIBS	+= mozutil_s
+endif
+
 SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)autocomplete_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
@@ -66,10 +70,6 @@ SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)urlbarhistory_s.$(LIB_SUFFIX) \
 	$(NULL)
 
-ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS	+= $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
-endif
-
 LOCAL_INCLUDES	= \
 	-I$(srcdir)/../autocomplete/src  \
 	-I$(srcdir)/../bookmarks/src     \
@@ -80,6 +80,19 @@ LOCAL_INCLUDES	= \
 	-I$(srcdir)/../urlbarhistory/src \
 	$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+SHARED_LIBRARY_LIBS += \
+	$(DIST)/lib/$(LIB_PREFIX)urlwidgt_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)winhooks_s.$(LIB_SUFFIX) \
+	$(NULL)
+OS_LIBS		+= ole32.lib
+LOCAL_INCLUDES	+= \
+	-I$(srcdir)/../urlwidget \
+	-I$(srcdir)/../winhooks \
+	$(NULL)
+endif
+
 EXTRA_DSO_LDOPTS = \
 	$(EXTRA_DSO_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
@@ -89,3 +102,4 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
+ 
diff --git a/mozilla/xpfe/components/filepicker/Makefile.in b/mozilla/xpfe/components/filepicker/Makefile.in
index 6ac5cd85872..a7049207b8b 100644
--- a/mozilla/xpfe/components/filepicker/Makefile.in
+++ b/mozilla/xpfe/components/filepicker/Makefile.in
@@ -28,7 +28,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq (,$(filter beos os2 mac,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (,$(filter beos os2 mac windows,$(MOZ_WIDGET_TOOLKIT)))
 DIRS = public src
 endif
 
diff --git a/mozilla/xpfe/components/find/src/Makefile.in b/mozilla/xpfe/components/find/src/Makefile.in
index 932b709a671..e0925bdd7ed 100644
--- a/mozilla/xpfe/components/find/src/Makefile.in
+++ b/mozilla/xpfe/components/find/src/Makefile.in
@@ -52,8 +52,7 @@ CPPSRCS		= \
             $(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
+		$(LIBS_DIR) \
 		$(XPCOM_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(NSPR_LIBS) \
diff --git a/mozilla/xpfe/components/intl/Makefile.in b/mozilla/xpfe/components/intl/Makefile.in
index 83dfe69a298..e21b7796a7b 100644
--- a/mozilla/xpfe/components/intl/Makefile.in
+++ b/mozilla/xpfe/components/intl/Makefile.in
@@ -50,10 +50,6 @@ CPPSRCS= \
 	nsFontPackageHandler.cpp \
 	$(NULL)
 
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
 FORCE_STATIC_LIB=1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in b/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in
index 61bcc797830..fd7d6d36eb8 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in
+++ b/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in
@@ -26,7 +26,11 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DIRS		= win
+else
 DIRS		= unix
+endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/win/Makefile.in b/mozilla/xpfe/components/prefwindow/resources/content/win/Makefile.in
new file mode 100644
index 00000000000..5470317e2d1
--- /dev/null
+++ b/mozilla/xpfe/components/prefwindow/resources/content/win/Makefile.in
@@ -0,0 +1,30 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/regviewer/Makefile.in b/mozilla/xpfe/components/regviewer/Makefile.in
index 535f8793a35..357cb35c26c 100644
--- a/mozilla/xpfe/components/regviewer/Makefile.in
+++ b/mozilla/xpfe/components/regviewer/Makefile.in
@@ -42,9 +42,7 @@ XPIDLSRCS	= nsIRegistryDataSource.idl
 CPPSRCS		= nsRegistryDataSource.cpp
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		$(XPCOM_LIBS) \
-		$(NSPR_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpfe/components/search/datasets/Makefile.in b/mozilla/xpfe/components/search/datasets/Makefile.in
index 0a87c16cef4..556ed3d26c8 100644
--- a/mozilla/xpfe/components/search/datasets/Makefile.in
+++ b/mozilla/xpfe/components/search/datasets/Makefile.in
@@ -43,6 +43,6 @@ FILES		= \
 
 include $(topsrcdir)/config/rules.mk
 
-libs::
-	$(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/searchplugins
+libs:: $(FILES)
+	$(INSTALL) $^ $(DIST)/bin/searchplugins
 
diff --git a/mozilla/xpfe/components/shistory/src/Makefile.in b/mozilla/xpfe/components/shistory/src/Makefile.in
index e1aa8980a85..7358b84fea4 100644
--- a/mozilla/xpfe/components/shistory/src/Makefile.in
+++ b/mozilla/xpfe/components/shistory/src/Makefile.in
@@ -47,10 +47,7 @@ CPPSRCS		= nsSHEntry.cpp        \
             $(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
-		$(XPCOM_LIBS) \
-		$(NSPR_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpfe/components/urlwidget/Makefile.in b/mozilla/xpfe/components/urlwidget/Makefile.in
new file mode 100644
index 00000000000..c545b7382bb
--- /dev/null
+++ b/mozilla/xpfe/components/urlwidget/Makefile.in
@@ -0,0 +1,49 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= appcomps
+XPIDL_MODULE	= urlwidgt
+LIBRARY_NAME	= urlwidgt_s
+
+CPPSRCS		= nsUrlWidget.cpp
+
+XPIDLSRCS	= nsIUrlWidget.idl
+
+REQUIRES	= \
+		  xpcom \
+		  string \
+		  docshell \
+		  dom \
+		  widget \
+		  gfx \
+		  $(NULL)
+
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/winhooks/Makefile.in b/mozilla/xpfe/components/winhooks/Makefile.in
new file mode 100644
index 00000000000..dc7d119b5cf
--- /dev/null
+++ b/mozilla/xpfe/components/winhooks/Makefile.in
@@ -0,0 +1,50 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= appcomps
+XPIDL_MODULE	= winhooks
+LIBRARY_NAME	= winhooks_s
+
+XPIDLSRCS	= nsIWindowsHooks.idl
+
+CPPSRCS		= nsWindowsHooks.cpp
+
+REQUIRES	= \
+		  xpcom \
+		  string \
+		  dom \
+		  windowwatcher \
+		  intl \
+		  appshell \
+		  necko \
+		  $(NULL)
+
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpfe/components/xfer/src/Makefile.in b/mozilla/xpfe/components/xfer/src/Makefile.in
index d10baab719f..3063049b087 100644
--- a/mozilla/xpfe/components/xfer/src/Makefile.in
+++ b/mozilla/xpfe/components/xfer/src/Makefile.in
@@ -47,10 +47,8 @@ CPPSRCS		= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		$(XPCOM_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
-		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpfe/global/Makefile.in b/mozilla/xpfe/global/Makefile.in
index 2d0f600c8b7..e805471381f 100644
--- a/mozilla/xpfe/global/Makefile.in
+++ b/mozilla/xpfe/global/Makefile.in
@@ -35,7 +35,7 @@ include $(topsrcdir)/config/rules.mk
 ifeq (mac,$(MOZ_WIDGET_TOOLKIT))
 CHROME_PLATFORM = mac
 else
-ifeq ($(OS_ARCH),OS2)
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 CHROME_PLATFORM = win
 else
 CHROME_PLATFORM = unix
diff --git a/mozilla/xpfe/global/resources/content/Makefile.in b/mozilla/xpfe/global/resources/content/Makefile.in
index 69b996df9d3..1bde5905858 100644
--- a/mozilla/xpfe/global/resources/content/Makefile.in
+++ b/mozilla/xpfe/global/resources/content/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+ifneq (,$(filter os2 windows,$(MOZ_WIDGET_TOOLKIT)))
 DIRS		= win
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
diff --git a/mozilla/xpfe/global/resources/locale/en-US/Makefile.in b/mozilla/xpfe/global/resources/locale/en-US/Makefile.in
index 87ef0846a78..81e12b15b02 100644
--- a/mozilla/xpfe/global/resources/locale/en-US/Makefile.in
+++ b/mozilla/xpfe/global/resources/locale/en-US/Makefile.in
@@ -28,30 +28,5 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= unix win mac
 
-CHROME_DIR=locales/en-US
-CHROME_L10N_DIR=global/locale
-
-CHROME_L10N = \
-		about.html \
-		intl.css \
-		globalOverlay.dtd \
-		dialogOverlay.dtd \
-		builtinURLs.rdf \
-		commonDialog.dtd \
-		charsetOverlay.dtd \
-		charsetDetectorsOverlay.dtd \
-		brand.properties \
-		brand.dtd \
-		wizardManager.properties \
-		wizardOverlay.dtd \
-		about.dtd \
-		accept2locale.properties \
-		languageNames.properties \
-		regionNames.properties \
-		commonDialogs.properties \
-		plugins.properties \
-		printdialog.dtd \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpfe/global/resources/locale/en-US/mac/Makefile.in b/mozilla/xpfe/global/resources/locale/en-US/mac/Makefile.in
index e12e5f19a88..55a20662fcd 100644
--- a/mozilla/xpfe/global/resources/locale/en-US/mac/Makefile.in
+++ b/mozilla/xpfe/global/resources/locale/en-US/mac/Makefile.in
@@ -26,12 +26,4 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CHROME_DIR=locales/en-US
-CHROME_L10N_DIR=global/locale
-
-CHROME_L10N = \
-		platformGlobalOverlay.dtd \
-		platformDialogOverlay.dtd \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpfe/global/resources/locale/en-US/unix/Makefile.in b/mozilla/xpfe/global/resources/locale/en-US/unix/Makefile.in
index 069a7234c6d..992c24df448 100644
--- a/mozilla/xpfe/global/resources/locale/en-US/unix/Makefile.in
+++ b/mozilla/xpfe/global/resources/locale/en-US/unix/Makefile.in
@@ -27,14 +27,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CHROME_DIR=locales/en-US
-CHROME_L10N_DIR=global/locale
-
-CHROME_L10N = \
-		platformGlobalOverlay.dtd \
-		platformDialogOverlay.dtd \
-		printjoboptions.dtd \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpfe/global/resources/locale/en-US/win/Makefile.in b/mozilla/xpfe/global/resources/locale/en-US/win/Makefile.in
index e12e5f19a88..55a20662fcd 100644
--- a/mozilla/xpfe/global/resources/locale/en-US/win/Makefile.in
+++ b/mozilla/xpfe/global/resources/locale/en-US/win/Makefile.in
@@ -26,12 +26,4 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CHROME_DIR=locales/en-US
-CHROME_L10N_DIR=global/locale
-
-CHROME_L10N = \
-		platformGlobalOverlay.dtd \
-		platformDialogOverlay.dtd \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpinstall/Makefile.in b/mozilla/xpinstall/Makefile.in
index d373faaab72..af107c5b703 100644
--- a/mozilla/xpinstall/Makefile.in
+++ b/mozilla/xpinstall/Makefile.in
@@ -32,11 +32,14 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= public res src stub cleanup
 
-ifneq (,$(filter Linux SunOS,$(OS_ARCH)))
+ifneq (,$(filter Linux SunOS WINNT,$(OS_ARCH)))
 DIRS		+= wizard/libxpnet
 ifdef MOZ_ENABLE_GTK
 DIRS		+= wizard/unix/src2
 endif
+ifeq ($(OS_ARCH),WINNT)
+DIRS		+= wizard/windows
+endif
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpinstall/cleanup/Makefile.in b/mozilla/xpinstall/cleanup/Makefile.in
index 3ea9b1e6023..03a78460cfb 100644
--- a/mozilla/xpinstall/cleanup/Makefile.in
+++ b/mozilla/xpinstall/cleanup/Makefile.in
@@ -40,17 +40,22 @@ CPPSRCS		= \
 EXPORTS        = InstallCleanupDefines.h \
 	$(NULL)
 
-libs::
-	$(INSTALL) $(srcdir)/cmessage.txt $(DIST)/bin/res
-
 ifeq ($(OS_ARCH),OS2)
 CPPSRCS += InstallCleanupOS2.cpp
 else
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS += InstallCleanupWin.cpp
+MOZ_WINCONSOLE = 0
+USE_NON_MT_LIBS = 1
+else
 CPPSRCS += InstallCleanupUnix.cpp
 endif
+endif
+
+EXTRA_DSO_LIBS = mozregsa_s
 
 LIBS        = \
-        -lmozregsa_s \
+	$(EXTRA_DSO_LIBS) \
         $(NULL)
 
 DEFINES += -DSTANDALONE_REGISTRY
@@ -62,4 +67,10 @@ LIBS += -lmacmorefiles_s
 LDFLAGS += $(TK_LIBS)
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES	+= -DWIN32_LEAN_AND_MEAN
+LDFLAGS += /SUBSYSTEM:WINDOWS
+endif
 
+libs::
+	$(INSTALL) $(srcdir)/cmessage.txt $(DIST)/bin/res
diff --git a/mozilla/xpinstall/public/Makefile.in b/mozilla/xpinstall/public/Makefile.in
index 4d06869dc3d..aa65491d145 100644
--- a/mozilla/xpinstall/public/Makefile.in
+++ b/mozilla/xpinstall/public/Makefile.in
@@ -34,7 +34,7 @@ MODULE		= xpinstall
 XPIDLSRCS	= \
 		nsIXPINotifier.idl \
 		nsIXPIProgressDlg.idl \
-        nsPIXPIProxy.idl \
+		nsPIXPIProxy.idl \
 		nsPIXPIStubHook.idl \
 		nsPIXPIManagerCallbacks.idl \
 		$(NULL)
@@ -46,8 +46,6 @@ EXPORTS		= \
 		nsISoftwareUpdate.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 PREF_JS_EXPORTS	= $(srcdir)/xpinstall.js
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpinstall/src/Makefile.in b/mozilla/xpinstall/src/Makefile.in
index 125c95bfc5a..c087bad9934 100644
--- a/mozilla/xpinstall/src/Makefile.in
+++ b/mozilla/xpinstall/src/Makefile.in
@@ -94,6 +94,21 @@ CPPSRCS		= \
 		nsInstallBitwise.cpp \
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS		+= \
+		nsWinReg.cpp \
+		nsJSWinReg.cpp \
+		nsWinRegItem.cpp \
+		nsWinRegValue.cpp \
+		nsWinProfile.cpp \
+		nsJSWinProfile.cpp \
+		nsWinProfileItem.cpp \
+		nsWinShortcut.cpp \
+		$(NULL)
+
+OS_LIBS		+= ole32.lib version.lib
+endif	
+
 LOCAL_INCLUDES	= -I$(srcdir)/../public
 
 EXTRA_DSO_LDOPTS = \
@@ -106,3 +121,9 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_DOM
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN -DZLIB_DLL
+endif
+
diff --git a/mozilla/xpinstall/wizard/libxpnet/src/Makefile.in b/mozilla/xpinstall/wizard/libxpnet/src/Makefile.in
index 37d4986fade..f3d6768eaaf 100644
--- a/mozilla/xpinstall/wizard/libxpnet/src/Makefile.in
+++ b/mozilla/xpinstall/wizard/libxpnet/src/Makefile.in
@@ -31,6 +31,12 @@ include $(DEPTH)/config/autoconf.mk
 MODULE			= xpnet
 LIBRARY_NAME	= xpnet_s
 
+EXPORTS		= \
+		nsFTPConn.h \
+		nsHTTPConn.h \
+		nsSocket.h \
+		$(NULL)
+
 CPPSRCS			= \
 				nsSocket.cpp \
 				nsFTPConn.cpp \
@@ -39,5 +45,9 @@ CPPSRCS			= \
 
 FORCE_STATIC_LIB = 1
 
+ifeq ($(OS_ARCH),WINNT)
+USE_NON_MT_LIBS=1
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpinstall/wizard/libxpnet/test/Makefile.in b/mozilla/xpinstall/wizard/libxpnet/test/Makefile.in
index 7f338449ee4..02ddff82594 100644
--- a/mozilla/xpinstall/wizard/libxpnet/test/Makefile.in
+++ b/mozilla/xpinstall/wizard/libxpnet/test/Makefile.in
@@ -34,7 +34,12 @@ SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
 LIBS			= -lxpnet_s
 
+ifeq ($(OS_ARCH),WINNT)
+MAPFILE			= TestLibxpnet.map
+USE_NON_MT_LIBS		= 1
+endif
+
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES		+= -I$(srcdir)/../src
+LOCAL_INCLUDES		= -I$(srcdir)/../src
 
diff --git a/mozilla/xpinstall/wizard/windows/GetShortPathName/Makefile.in b/mozilla/xpinstall/wizard/windows/GetShortPathName/Makefile.in
new file mode 100644
index 00000000000..0dd1337a8a8
--- /dev/null
+++ b/mozilla/xpinstall/wizard/windows/GetShortPathName/Makefile.in
@@ -0,0 +1,44 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+PROGRAM		= GetShortPathName$(BIN_SUFFIX)
+
+USE_NON_MT_LIBS = 1
+
+CPPSRCS		= GetShortPathName.cpp
+
+include $(topsrcdir)/config/rules.mk
+
+#ifdef MOZ_TOOLS
+#libs:: $(PROGRAM)
+#	$(INSTALL) -D $(MOZ_TOOLS)/bin
+#	$(INSTALL) $(PROGRAM) $(MOZ_TOOLS)/bin
+#
+#clean clobber realclean clobber_all::
+#	$(RM) $(MOZ_TOOLS)/bin/$(PROGRAM)
+#endif
diff --git a/mozilla/xpinstall/wizard/windows/Makefile.in b/mozilla/xpinstall/wizard/windows/Makefile.in
new file mode 100644
index 00000000000..f9c8f2f81d5
--- /dev/null
+++ b/mozilla/xpinstall/wizard/windows/Makefile.in
@@ -0,0 +1,45 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS	= nsinstall
+
+ifeq ($(OS_TARGET),WINNT)
+DIRS	+= nsztool
+endif
+
+DIRS	+= \
+	uninstall \
+	setuprsc \
+	setup \
+	ren8dot3 \
+	ds32 \
+	GetShortPathName \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpinstall/wizard/windows/ds32/Makefile.in b/mozilla/xpinstall/wizard/windows/ds32/Makefile.in
new file mode 100644
index 00000000000..c6f2a2c784e
--- /dev/null
+++ b/mozilla/xpinstall/wizard/windows/ds32/Makefile.in
@@ -0,0 +1,46 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+PROGRAM		= ds32$(BIN_SUFFIX)
+RESFILE		= ds32.res
+
+USE_NON_MT_LIBS = 1
+
+CPPSRCS		= ds32.cpp
+
+include $(topsrcdir)/config/rules.mk
+
+#ifdef MOZ_TOOLS
+#libs:: $(PROGRAM)
+#	$(INSTALL) -D $(MOZ_TOOLS)/bin
+#	copy.exe $(PROGRAM) $(MOZ_TOOLS)/bin
+#
+#clean clobber realclean clobber_all::
+#	$(RM) $(MOZ_TOOLS)/bin/$(PROGRAM)
+#endif
+
diff --git a/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in b/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in
new file mode 100644
index 00000000000..dc073a45d13
--- /dev/null
+++ b/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in
@@ -0,0 +1,45 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+PROGRAM		= nsinstall$(BIN_SUFFIX)
+RESFILE		= nsinstall.res
+REQUIRES	= $(ZLIB_REQUIRES)
+EXTRA_DSO_LIBS	= mozz_s
+USE_NON_MT_LIBS = 1
+
+CPPSRCS		= nsinstall.cpp 
+
+LIBS		= $(EXTRA_DSO_LIBS)
+
+include $(topsrcdir)/config/rules.mk
+
+libs:: $(PROGRAM)
+	$(INSTALL) $(PROGRAM) $(DIST)/install
+
+clean clobber realclean clobber_all::
+	$(RM) $(DIST)/install/$(PROGRAM)
diff --git a/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in b/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in
new file mode 100644
index 00000000000..a8eb47006bb
--- /dev/null
+++ b/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in
@@ -0,0 +1,47 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+PROGRAM		= nsztool$(BIN_SUFFIX)
+REQUIRES	= $(ZLIB_REQUIRES)
+EXTRA_DSO_LIBS	= mozz_s
+USE_NON_MT_LIBS = 1
+
+CPPSRCS		= nsztool.cpp 
+
+LIBS		= $(EXTRA_DSO_LIBS)
+
+include $(topsrcdir)/config/rules.mk
+
+LDFLAGS		+= /SUBSYSTEM:WINDOWS /MACHINE:i386
+
+libs:: $(PROGRAM)
+	$(INSTALL) $(PROGRAM) $(DIST)/install
+	$(DIST)/install/$(PROGRAM) -g $(DIST)/install/nszip$(BIN_SUFFIX) $(DIST)/install/nsinstall$(BIN_SUFFIX)
+
+clean clobber clobber_all realclean::
+	$(RM) $(DIST)/install/$(PROGRAM)
diff --git a/mozilla/xpinstall/wizard/windows/ren8dot3/Makefile.in b/mozilla/xpinstall/wizard/windows/ren8dot3/Makefile.in
new file mode 100644
index 00000000000..5c77a6b8c0e
--- /dev/null
+++ b/mozilla/xpinstall/wizard/windows/ren8dot3/Makefile.in
@@ -0,0 +1,41 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+PROGRAM		= ren8dot3$(BIN_SUFFIX)
+
+USE_NON_MT_LIBS = 1
+
+CPPSRCS		= ren8dot3.cpp
+
+include $(topsrcdir)/config/rules.mk
+
+libs:: $(PROGRAM)
+	$(INSTALL) $(PROGRAM) $(DIST)/install
+
+clean clobber realclean clobber_all::
+	$(RM) $(DIST)/install/$(PROGRAM)
diff --git a/mozilla/xpinstall/wizard/windows/setup/Makefile.in b/mozilla/xpinstall/wizard/windows/setup/Makefile.in
new file mode 100644
index 00000000000..33c1731a8fc
--- /dev/null
+++ b/mozilla/xpinstall/wizard/windows/setup/Makefile.in
@@ -0,0 +1,70 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+PROGRAM		= setup$(BIN_SUFFIX)
+RESFILE		= setup.res
+REQUIRES	= \
+		setuprsc \
+		uninstall \
+		xpnet \
+		$(NULL)
+
+EXTRA_DSO_LIBS	= \
+		mozregsa_s \
+		jar50_s \
+		mozz_s \
+		xpnet_s \
+		$(NULL)
+
+USE_NON_MT_LIBS = 1
+
+CSRCS		= \
+		dialogs.c \
+		extra.c \
+		ifuncns.c \
+		setup.c \
+		xpi.c \
+		logging.c \
+
+CPPSRCS		= \
+		shortcut.cpp \
+		xpnetHook.cpp \
+		nsEscape.cpp \
+		$(NULL)
+
+LIBS		= $(EXTRA_DSO_LIBS)
+
+include $(topsrcdir)/config/rules.mk
+
+OS_LIBS		+= ole32.lib comdlg32.lib shell32.lib version.lib
+
+libs:: $(PROGRAM)
+	$(INSTALL) $(PROGRAM) $(DIST)/install
+
+clean clobber realclean clobber_all::
+	$(RM) $(DIST)/install/$(PROGRAM)
diff --git a/mozilla/xpinstall/wizard/windows/setuprsc/Makefile.in b/mozilla/xpinstall/wizard/windows/setuprsc/Makefile.in
new file mode 100644
index 00000000000..47fdb4349f7
--- /dev/null
+++ b/mozilla/xpinstall/wizard/windows/setuprsc/Makefile.in
@@ -0,0 +1,46 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= setuprsc
+#LIBRARY_NAME	= setuprsc
+#RESFILE		= setuprsc.res
+
+USE_NON_MT_LIBS = 1
+
+EXPORTS		= setuprsc.h
+
+CPPSRCS		= setuprsc.cpp
+
+include $(topsrcdir)/config/rules.mk
+
+#libs:: $(SHARED_LIBRARY)
+#	$(INSTALL) $< $(DIST)/install
+
+clean clobber clobber_all realclean::
+	$(RM) $(DIST)/install/$(SHARED_LIBRARY)
+
diff --git a/mozilla/xpinstall/wizard/windows/uninstall/Makefile.in b/mozilla/xpinstall/wizard/windows/uninstall/Makefile.in
new file mode 100644
index 00000000000..a088f9de7fd
--- /dev/null
+++ b/mozilla/xpinstall/wizard/windows/uninstall/Makefile.in
@@ -0,0 +1,56 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= uninstall
+PROGRAM		= uninstall$(BIN_SUFFIX)
+RESFILE		= uninstall.res
+REQUIRES	= $(ZLIB_REQUIRES)
+EXTRA_DSO_LIBS	= mozz_s
+USE_NON_MT_LIBS = 1
+
+EXPORTS		= logkeys.h
+
+CPPSRCS		= \
+		uninstall.cpp \
+		extra.cpp \
+		dialogs.cpp \
+		parser.cpp \
+		ifuncns.cpp \
+		rdi.cpp \
+		$(NULL)
+
+OS_LIBS		+= shell32.lib version.lib
+
+include $(topsrcdir)/config/rules.mk
+
+libs:: $(PROGRAM)
+	$(INSTALL) $(PROGRAM) $(DIST)/install
+
+clean clobber realclean clobber_all::
+	$(RM) $(DIST)/install/$(PROGRAM)
+