--- a/browser/components/dirprovider/Makefile.in
+++ b/browser/components/dirprovider/Makefile.in
@@ -39,17 +39,17 @@ DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE               = browsercomps
 LIBRARY_NAME         = browserdirprovider
-ifneq ($(OS_ARCH),WINNT)
+ifeq (,$(filter WINNT WINCE,$(OS_ARCH)))
 SHORT_LIBNAME        = brwsrdir
 endif
 IS_COMPONENT         = 1
 MODULE_NAME          = BrowserDirProvider
 FORCE_SHARED_LIB     = 1
 
 # Because we are an application component, link against the CRT statically
 # (on Windows, but only if we're not building our own CRT for jemalloc)

--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -55,17 +55,17 @@ NO_PKG_FILES = \
 	xpt_link* \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 ifneq (,$(BUILD_STATIC_LIBS)$(MOZ_ENABLE_LIBXUL))
-ifeq (WINNT,$(OS_ARCH))
+ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
 MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static
 else
 ifneq (,$(filter-out OS2 Darwin,$(OS_ARCH)))
 MOZ_PKG_MANIFEST_P = $(srcdir)/unix/packages-static
 endif
 endif
 else
 define message

--- a/browser/installer/windows/packages-static
+++ b/browser/installer/windows/packages-static
@@ -37,24 +37,28 @@ bin\xpcom.dll
 bin\nspr4.dll
 #ifdef MOZ_ENABLE_LIBXUL
 bin\xul.dll
 #else
 bin\xpcom_core.dll
 bin\components\xpinstal.dll
 bin\components\jar50.dll
 #endif
+#ifdef WINCE
+bin\mozce_shunt.dll
+#else
 #ifndef MOZ_MEMORY
 bin\Microsoft.VC80.CRT.manifest
 bin\msvcm80.dll
 bin\msvcp80.dll
 bin\msvcr80.dll
 #else
 bin\mozcrt19.dll
 #endif
+#endif
 
 [browser]
 ; [Base Browser Files]
 bin\@MOZ_APP_NAME@.exe
 bin\application.ini
 bin\platform.ini
 bin\plugins\npnul32.dll
 bin\LICENSE
@@ -134,17 +138,19 @@ bin\components\jsdservice.xpt
 bin\components\layout_base.xpt
 bin\components\layout_printing.xpt
 bin\components\layout_xul.xpt
 bin\components\layout_xul_tree.xpt
 bin\components\inspector.xpt
 bin\components\locale.xpt
 bin\components\lwbrk.xpt
 bin\components\microsummaries.xpt
+#ifndef WINCE
 bin\components\migration.xpt
+#endif
 bin\components\mimetype.xpt
 bin\components\mozbrwsr.xpt
 bin\components\mozfind.xpt
 bin\components\necko.xpt
 bin\components\necko_cache.xpt
 bin\components\necko_cookie.xpt
 bin\components\necko_strconv.xpt
 bin\components\necko_about.xpt
@@ -362,13 +368,15 @@ bin\nssdbm3.dll
 bin\nssdbm3.chk
 bin\chrome\pippki.jar
 bin\chrome\pippki.manifest
 
 ; [Updater]
 ;
 bin\updater.exe
 
+#ifdef MOZ_CRASHREPORTER
 ; [Crash Reporter]
 bin\crashreporter.exe
 bin\crashreporter.ini
 bin\crashreporter-override.ini
+#endif
 

--- a/build/wince/shunt/Makefile.in
+++ b/build/wince/shunt/Makefile.in
@@ -92,8 +92,10 @@ CPPSRCS = \
 
 DEFINES += -DMOZCE_SHUNT_EXPORTS
 
 include $(topsrcdir)/config/rules.mk
 
 mozce_shunt.def: mozce_shunt.def.in
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $^ > $@
 
+.NOTPARALLEL:
+

--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -39,17 +39,17 @@
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= docshell
-ifeq ($(OS_ARCH),WINNT)
+ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
 XPIDL_MODULE	= docshell_base
 endif
 LIBRARY_NAME	= basedocshell_s
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 REQUIRES	= xpcom \
 		  string \

--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -43,39 +43,35 @@ include $(MOZILLA_DIR)/toolkit/mozapps/i
 # This is how we create the Unix binary packages we release to the public.
 # Currently the only format is tar.gz (TGZ), but it should be fairly easy
 # to add .rpm (RPM) and .deb (DEB) later.
 
 ifndef MOZ_PKG_FORMAT
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 MOZ_PKG_FORMAT  = DMG
 else
-ifeq (,$(filter-out OS2 WINNT BeOS, $(OS_ARCH)))
+ifeq (,$(filter-out OS2 WINNT WINCE BeOS, $(OS_ARCH)))
 MOZ_PKG_FORMAT  = ZIP
 ifeq ($(OS_ARCH),OS2)
 INSTALLER_DIR   = os2
 else
-ifeq ($(OS_ARCH), WINNT)
+ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
 INSTALLER_DIR   = windows
 endif
 endif
 else
 ifeq (,$(filter-out SunOS, $(OS_ARCH)))
 MOZ_PKG_FORMAT  = BZ2
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 MOZ_PKG_FORMAT  = BZ2
 else
-ifeq (,$(filter-out WINCE, $(OS_ARCH)))
-MOZ_PKG_FORMAT  = ZIP
-else
 MOZ_PKG_FORMAT  = TGZ
 endif
 endif
-endif
 INSTALLER_DIR   = unix
 endif
 endif
 endif # MOZ_PKG_FORMAT
 
 PACKAGE       = $(PKG_PATH)$(PKG_BASENAME)$(PKG_SUFFIX)
 
 # By default, the SDK uses the same packaging type as the main bundle,
@@ -287,17 +283,17 @@ STRIP_FLAGS	= -g
 PLATFORM_EXCLUDE_LIST = ! -name "*.stub" ! -name "$(MOZ_PKG_APPNAME)-bin"
 endif
 ifeq ($(OS_ARCH),OS2)
 STRIP		= $(MOZILLA_DIR)/toolkit/mozapps/installer/os2/strip.cmd
 STRIP_FLAGS	=
 PLATFORM_EXCLUDE_LIST = ! -name "*.ico" ! -name "$(MOZ_PKG_APPNAME).exe"
 endif
 
-ifneq (,$(filter WINNT OS2,$(OS_ARCH)))
+ifneq (,$(filter WINNT WINCE OS2,$(OS_ARCH)))
 PKGCP_OS = dos
 else
 PKGCP_OS = unix
 endif
 
 # The following target stages files into three directories: one directory for
 # locale-independent files, one for locale-specific files, and one for optional
 # extensions based on the information in the MOZ_PKG_MANIFEST file and the
@@ -414,17 +410,17 @@ make-package: stage-package $(PACKAGE_XU
 # The install target will install the application to prefix/lib/appname-version
 # In addition if INSTALL_SDK is set, it will install the development headers,
 # libraries, and IDL files as follows:
 # dist/include -> prefix/include/appname-version
 # dist/idl -> prefix/share/idl/appname-version
 # dist/sdk/lib -> prefix/lib/appname-devel-version/lib
 # prefix/lib/appname-devel-version/* symlinks to the above directories
 install:: stage-package
-ifneq (,$(filter WINNT,$(OS_ARCH)))
+ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
 	$(error "make install" is not supported on this platform. Use "make package" instead.)
 endif
 ifeq (bundle,$(MOZ_FS_LAYOUT))
 	$(error "make install" is not supported on this platform. Use "make package" instead.)
 endif
 	$(NSINSTALL) -D $(DESTDIR)$(installdir)
 	(cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
 	  (cd $(DESTDIR)$(installdir) && tar -xf -)

--- a/xpcom/proxy/public/Makefile.in
+++ b/xpcom/proxy/public/Makefile.in
@@ -38,17 +38,17 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
-ifeq ($(OS_ARCH),WINNT)
+ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
 XPIDL_MODULE	= proxyObject
 else
 XPIDL_MODULE	= proxyObjInst
 endif
 
 EXPORTS		= \
 		nsProxiedService.h \
 		$(NULL)

--- a/xpcom/threads/Makefile.in
+++ b/xpcom/threads/Makefile.in
@@ -38,17 +38,17 @@
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
-ifeq ($(OS_ARCH),WINNT)
+ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
 XPIDL_MODULE	= xpcom_thread
 else
 XPIDL_MODULE	= xpcom_threads
 endif
 LIBRARY_NAME	= xpcomthreads_s
 GRE_MODULE	= 1
 MOZILLA_INTERNAL_API = 1