--- a/mailnews/Makefile.in
+++ b/mailnews/Makefile.in
@@ -61,17 +61,17 @@ PARALLEL_DIRS	+= \
 ifdef ENABLE_TESTS
 PARALLEL_DIRS += \
   test/performance/bloat \
   $(NULL)
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
-TOOL_DIRS += mapi/mapiDLL mapi/mapihook
+PARALLEL_DIRS += mapi/mapiDLL mapi/mapihook
 endif
 endif
 
 ifdef MOZ_STATIC_MAIL_BUILD
 DIRS += build
 else
 DIRS += base/build
 endif

--- a/suite/makefiles.sh
+++ b/suite/makefiles.sh
@@ -42,17 +42,16 @@ add_makefiles "
   suite/browser/Makefile
   suite/build/Makefile
   suite/debugQA/Makefile
   suite/debugQA/locales/Makefile
   suite/common/Makefile
   suite/common/public/Makefile
   suite/common/src/Makefile
   suite/common/tests/Makefile
-  suite/components/Makefile
   suite/feeds/public/Makefile
   suite/feeds/src/Makefile
   suite/installer/Makefile
   suite/installer/windows/Makefile
   suite/locales/Makefile
   suite/mailnews/Makefile
   suite/modules/Makefile
   suite/modules/test/Makefile