--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@@ -44,17 +44,16 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = accessibility
 LIBRARY_NAME = accessibility_html_s
 LIBXUL_LIBRARY = 1
 
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-REQUIRES += editor
 endif
 
 CPPSRCS = \
   nsHTMLAreaAccessible.cpp \
   nsHTMLFormControlAccessible.cpp \
   nsHTMLImageAccessible.cpp \
   nsHTMLLinkAccessible.cpp \
   nsHTMLSelectAccessible.cpp \

--- a/accessible/src/xforms/Makefile.in
+++ b/accessible/src/xforms/Makefile.in
@@ -44,17 +44,16 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = accessibility
 LIBRARY_NAME = accessibility_xforms_s
 LIBXUL_LIBRARY = 1
 
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-REQUIRES += editor
 endif
 
 CPPSRCS = \
   nsXFormsAccessible.cpp \
   nsXFormsFormControlsAccessible.cpp \
   nsXFormsWidgetsAccessible.cpp \
   $(NULL)
 

--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@@ -44,17 +44,16 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = accessibility
 LIBRARY_NAME = accessibility_xul_s
 LIBXUL_LIBRARY = 1
 
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-REQUIRES += editor
 endif
 
 CPPSRCS = \
   nsXULAlertAccessible.cpp \
   nsXULColorPickerAccessible.cpp \
   nsXULFormControlAccessible.cpp \
   nsXULMenuAccessible.cpp \
   nsXULSelectAccessible.cpp \

--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -87,20 +87,16 @@ else
 # Build a binary bootstrapping with XRE_main
 
 ifeq ($(USE_SHORT_LIBNAME), 1)
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
-REQUIRES = \
-	xpcom \
-	string \
-	$(NULL)
 
 CPPSRCS = nsBrowserApp.cpp
 
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 
 ifdef BUILD_STATIC_LIBS
 ifdef _MSC_VER
 STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(DEPTH)/staticlib

--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -53,17 +53,16 @@ ifneq (,$(filter windows mac cocoa gtk2,
 SHARED_LIBRARY_LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
 endif
 
 EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib)
 
 # migration requires mozreg, which doesn't build on WINCE; only include
 # it on non-CE
 ifndef WINCE
-REQUIRES += migration
 LOCAL_INCLUDES += -I$(srcdir)/../migration/src
 SHARED_LIBRARY_LIBS += ../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX)
 EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
 endif
 
 # This has to come after the above chunk, because mozreg_s has dependencies on
 # stuff in MOZ_COMPONENT_LIBS.
 EXTRA_DSO_LDOPTS += \

--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@@ -47,19 +47,16 @@ FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
 ifndef MOZ_MEMORY
 USE_STATIC_LIBS = 1
 endif
 
 
 ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
 CPPSRCS = nsWindowsShellService.cpp
-REQUIRES	+= \
-		browsercomps \
-		$(NULL)
 else
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS = nsMacShellService.cpp
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 CPPSRCS = nsGNOMEShellService.cpp
 REQUIRES	+= \
 		mozgnome \

--- a/build/pymake/pymake/parserdata.py
+++ b/build/pymake/pymake/parserdata.py
@@ -488,9 +488,10 @@ class StatementList(list):
         fd = StringIO()
         self.dump(fd, '')
         return fd.getvalue()
 
 def iterstatements(stmts):
     for s in stmts:
         yield s
         if isinstance(s, ConditionBlock):
-            for c, ss in iterstatements(s): yield ss
+            for c, sl in iterstatements(s):
+                for s2 in sl: yield s2

--- a/build/wince/shunt/Makefile.in
+++ b/build/wince/shunt/Makefile.in
@@ -67,17 +67,16 @@ EXPORTS_mozce_shunt = \
   include/mozce_shunt.h \
   include/process.h \
   include/signal.h \
   $(NULL)
 
 DIRS += include/sys
 
 ifdef MOZ_MEMORY
-REQUIRES = jemalloc 
 CFLAGS += -DMOZ_MEMORY
 CXXFLAGS += -DMOZ_MEMORY
 EXPORTS_mozce_shunt += $(topsrcdir)/memory/jemalloc/jemalloc.h
 
 # We have to include the obj file directly, because we want to export
 # some of its symbols through our def file
 EXTRA_LIBS += $(OBJDIR)/memory/jemalloc/jemalloc.obj
 endif

--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -43,17 +43,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkconbase_s
 LIBXUL_LIBRARY	= 1
 
 
 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif
 
 EXPORTS		= \
 		nsAtomListUtils.h \
 		nsAttrName.h \
 		nsContentList.h \
 		nsGkAtomList.h \
 		nsGkAtoms.h \

--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@@ -43,28 +43,16 @@ VPATH           = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = transformiix
 LIBRARY_NAME = txbase_s
 LIBXUL_LIBRARY = 1
 
 
 ifndef MOZ_XSLT_STANDALONE
-REQUIRES	+= unicharutil \
-		  dom \
-		  content \
-		  layout \
-		  pref \
-		  widget \
-		  necko \
-		  caps \
-		  xpconnect \
-		  js \
-		  htmlparser \
-		  $(NULL)
 endif
 
 CPPSRCS	= txDouble.cpp \
 	txList.cpp \
 	txExpandedNameMap.cpp \
 	txNamespaceMap.cpp \
 	txURIUtils.cpp
 

--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/xml/Makefile.in
@@ -43,31 +43,17 @@ VPATH           = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = transformiix
 LIBRARY_NAME = txxml_s
 LIBXUL_LIBRARY = 1
 
 
 ifndef MOZ_XSLT_STANDALONE
-REQUIRES += \
-		  js \
-		  xpconnect \
-		  dom \
-		  content \
-		  layout \
-		  pref \
-		  widget \
-		  unicharutil \
-		  necko \
-		  htmlparser \
-		  caps \
-		  $(NULL)
 else
-REQUIRES += expat
 endif
 
 CPPSRCS	= \
 	txXMLUtils.cpp \
 	txXMLParser.cpp \
 	$(NULL)
 
 ifdef MOZ_XSLT_STANDALONE

--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/xpath/Makefile.in
@@ -43,27 +43,16 @@ VPATH           = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = transformiix
 LIBRARY_NAME = txxpath_s
 LIBXUL_LIBRARY = 1
 
 
 ifndef MOZ_XSLT_STANDALONE
-REQUIRES +=	  dom \
-		  content \
-		  widget \
-		  xpconnect \
-		  js \
-		  unicharutil \
-		  layout \
-		  necko \
-		  htmlparser \
-		  pref \
-		  $(NULL)
 endif
 
 CPPSRCS = \
         txBooleanExpr.cpp \
         txBooleanResult.cpp \
         txCoreFunctionCall.cpp \
         txExpr.cpp \
         txExprLexer.cpp \

--- a/content/xslt/src/xslt/Makefile.in
+++ b/content/xslt/src/xslt/Makefile.in
@@ -43,41 +43,17 @@ VPATH           = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = transformiix
 LIBRARY_NAME = txxslt_s
 LIBXUL_LIBRARY = 1
 
 
 ifndef MOZ_XSLT_STANDALONE
-REQUIRES += \
-		  dom \
-		  content \
-		  widget \
-		  necko \
-		  unicharutil \
-		  xpconnect \
-		  js \
-		  htmlparser \
-		  webshell \
-		  docshell \
-		  layout \
-		  uconv \
-		  caps \
-		  windowwatcher \
-		  mimetype \
-		  intl \
-		  locale \
-		  htmlparser \
-		  pref \
-		  $(NULL)
 else
-REQUIRES += \
-		  expat \
-		  $(NULL)
 endif
 
 CPPSRCS = \
         txNodeSorter.cpp \
         txXPathResultComparator.cpp \
         txBufferingHandler.cpp \
         txExecutionState.cpp \
         txEXSLTFunctions.cpp \

--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@@ -43,17 +43,16 @@ VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE         = dom
 LIBRARY_NAME   = jsdomstorage_s
 LIBXUL_LIBRARY = 1
 
 
 ifdef MOZ_STORAGE
-REQUIRES += storage
 endif
 
 CPPSRCS =                  \
        nsDOMStorage.cpp    \
        $(NULL)
 
 ifdef MOZ_STORAGE
 CPPSRCS += nsDOMStorageDBWrapper.cpp nsDOMStoragePersistentDB.cpp nsDOMStorageMemoryDB.cpp

--- a/embedding/browser/activex/src/plugin/Makefile.in
+++ b/embedding/browser/activex/src/plugin/Makefile.in
@@ -58,20 +58,16 @@ else
 RESFILE         = MozActiveX.res
 endif
 
 DEFFILE         = npmozax.def
 GRE_MODULE	= 1
 
 
 ifdef XPC_IDISPATCH_SUPPORT
-REQUIRES += \
-	caps \
-	string \
-	$(NULL)
 endif
 XPIFILE         = mozactivex.xpi
 
 FORCE_SHARED_LIB = 1
 NO_DIST_INSTALL	= 1
 NO_INSTALL = 1
 
 # Path to the Mozilla ActiveX common dir (some files are copied from there)

--- a/embedding/browser/gtk/src/Makefile.in
+++ b/embedding/browser/gtk/src/Makefile.in
@@ -46,17 +46,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= gtkembedmoz
 LIBRARY_NAME	= gtkembedmoz
 LIBXUL_LIBRARY	= 1
 FORCE_STATIC_LIB = 1
 DEFINES += -DIMPL_XREAPI
 
 
 ifdef ACCESSIBILITY
-REQUIRES        += accessibility
 endif
 
 CPPSRCS		= \
 		gtkmozembed2.cpp \
 		EmbedPrivate.cpp \
 		EmbedWindow.cpp \
 		EmbedProgress.cpp \
 		EmbedContentListener.cpp \

--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@@ -46,17 +46,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= webbrwsr
 XPIDL_MODULE	= webBrowser_core
 LIBRARY_NAME	= nsWebBrowser_s
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 
 ifdef MOZ_PHOENIX
-REQUIRES	+= toolkitcomps
 endif
 
 EXPORTS         = \
                 nsCTooltipTextProvider.h \
                 $(NULL)
 
 SDK_XPIDLSRCS   = \
 		nsIContextMenuListener.idl  \

--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -58,17 +58,16 @@ include $(topsrcdir)/config/config.mk
 
 CPPSRCS          = nsReadConfig.cpp    \
                    nsAutoConfig.cpp    \
                    nsConfigFactory.cpp \
                    nsJSConfigTriggers.cpp \
                    $(NULL)
 
 ifdef MOZ_LDAP_XPCOM
-REQUIRES         += mozldap 
 DEFINES          += -DMOZ_LDAP_XPCOM
 CPPSRCS          += nsLDAPSyncQuery.cpp
 endif
 
 
 EXTRA_DSO_LDOPTS = \
                    $(LIBS_DIR) \
                    $(MOZ_JS_LIBS) \

--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -60,17 +60,16 @@ CPPSRCS = \
         nsFont.cpp \
         nsRect.cpp \
         nsRegion.cpp \
         nsTransform2D.cpp \
         nsScriptableRegion.cpp \
         $(NULL)
 
 ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
-REQUIRES += uconv
 endif
 
 EXTRA_DSO_LDOPTS = \
         $(DEPTH)/modules/libutil/src/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
         $(MOZ_UNICHARUTIL_LIBS) \
         $(MOZ_COMPONENT_LIBS) \
         $(MOZ_JS_LIBS) \
         $(NULL)

--- a/gfx/src/thebes/Makefile.in
+++ b/gfx/src/thebes/Makefile.in
@@ -50,17 +50,16 @@ endif
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = nsGfxModule
 GRE_MODULE = 1
 LIBXUL_LIBRARY = 1
 
 
 ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
-REQUIRES += uconv
 endif
 
 CPPSRCS		= \
 		nsThebesDeviceContext.cpp \
 		nsThebesRegion.cpp \
 		nsThebesGfxFactory.cpp \
 		nsThebesRenderingContext.cpp \
 		nsThebesFontMetrics.cpp \
@@ -78,20 +77,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 CPPSRCS		+= nsSystemFontsGTK2.cpp
 
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS		+= nsSystemFontsWin.cpp \
 		   $(NULL)
 
-REQUIRES	+= \
-		cairo \
-		qcms \
-		$(NULL)
 
 _OS_LIBS	= usp10
 OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))
 
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 CPPSRCS		+= nsSystemFontsOS2.cpp \

--- a/gfx/thebes/src/Makefile.in
+++ b/gfx/thebes/src/Makefile.in
@@ -74,32 +74,30 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 CPPSRCS	+=	gfxOS2Fonts.cpp \
 		gfxOS2Platform.cpp \
 		gfxOS2Surface.cpp \
 		nsUnicodeRange.cpp \
 		gfxFontconfigUtils.cpp \
 		$(NULL)
 CPPSRCS +=	gfxPDFSurface.cpp
-REQUIRES += uconv locale
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 
 ifdef MOZ_PANGO
 CPPSRCS += gfxPangoFonts.cpp
 else
 CPPSRCS += gfxFT2Fonts.cpp
 endif
 
 ifdef MOZ_X11
 CPPSRCS += gfxXlibSurface.cpp
 endif
 
-REQUIRES += locale
 CPPSRCS +=  gfxPlatformGtk.cpp gfxGdkNativeRenderer.cpp
 CPPSRCS +=	gfxPDFSurface.cpp gfxPSSurface.cpp
 CPPSRCS +=	gfxFontconfigUtils.cpp
 CPPSRCS +=	nsUnicodeRange.cpp
 
 ifdef MOZ_X11
 CSRCS = cairo-xlib-utils.c
 endif
@@ -111,28 +109,26 @@ endif
 EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(ZLIB_LIBS) $(XLDFLAGS) $(XLIBS)
 endif
 
 ifdef MOZ_DFB
 CPPSRCS += gfxDirectFBSurface.cpp
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-REQUIRES += locale
 CPPSRCS += gfxQtPlatform.cpp gfxQPainterSurface.cpp
 CPPSRCS += gfxXlibSurface.cpp gfxQtNativeRenderer.cpp
 CPPSRCS +=	gfxFT2Fonts.cpp
 CPPSRCS +=	gfxFontconfigUtils.cpp
 CPPSRCS +=	nsUnicodeRange.cpp
 #CSRCS = cairo-xlib-utils.c
 EXTRA_DSO_LDOPTS += $(ZLIB_LIBS) $(XLDFLAGS) $(XLIBS) $(CAIRO_FT_LIBS)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-REQUIRES += locale
 CPPSRCS	+= 	gfxBeOSSurface.cpp gfxBeOSPlatform.cpp
 CPPSRCS +=	gfxPangoFonts.cpp 
 #CPPSRCS +=	gfxPDFSurface.cpp
 CPPSRCS +=	gfxFontconfigUtils.cpp
 CPPSRCS +=	nsUnicodeRange.cpp
 EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(CAIRO_FT_LIBS) -lfontconfig
 endif
 

--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -65,17 +65,16 @@ CPPSRCS		= \
 		nsCharsetConverterManager.cpp \
 		nsUTF8ConverterService.cpp \
 		nsUTF8ToUnicode.cpp \
 		nsUnicodeToUTF8.cpp \
 		nsScriptableUConv.cpp \
 		$(NULL)
 
 ifdef MOZ_USE_NATIVE_UCONV
-REQUIRES	+= ucnative
 else
 CPPSRCS         += \
 		nsISO88591ToUnicode.cpp \
 		nsCP1252ToUnicode.cpp \
 		nsMacRomanToUnicode.cpp \
 		nsUnicodeToISO88591.cpp \
 		nsUnicodeToCP1252.cpp \
 		nsUnicodeToMacRoman.cpp \

--- a/intl/uconv/tests/Makefile.in
+++ b/intl/uconv/tests/Makefile.in
@@ -43,22 +43,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE          = test_intl_uconv
 XPCSHELL_TESTS	= unit
 
 ifndef MOZ_ENABLE_LIBXUL
 MOZILLA_INTERNAL_API = 1
 
-REQUIRES	= \
-		string \
-		xpcom \
-		uconv \
-		locale \
-		$(NULL)
 
 CPPSRCS		= \
 		TestUConv.cpp \
 		nsconv.cpp \
 		plattest.cpp \
 		$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)

--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -50,23 +50,16 @@ LIBRARY_NAME	= jsd
 FORCE_SHARED_LIB= 1
 ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
 LIBRARY_NAME	= jsd$(MOZ_BITS)$(VERSION_NUMBER)
 endif
 
 # REQUIRES	= java js
 
 ifndef JSD_STANDALONE
-REQUIRES += \
-		  string \
-		  xpcom \
-		  xpconnect \
-		  widget \
-		  dom \
-		  $(NULL)
 endif
 
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(NULL)
 EXPORTS		= jsdebug.h
 

--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@@ -154,17 +154,16 @@ DEFINES += \
   $(NULL)
 
 ENABLE_TRACEABLE_FLAGS = --enable-traceables
 
 endif # ENABLE_JIT
 
 ifdef MOZ_XPCTOOLS
 DEFINES         +=  -DXPC_TOOLS_SUPPORT
-REQUIRES	+= xpctools
 endif
 
 ifdef XPC_IDISPATCH_SUPPORT
 DEFINES		+= -DXPC_IDISPATCH_SUPPORT
 ifdef XPC_COMOBJECT
 DEFINES		+= -DXPC_COMOBJECT
 endif
 

--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -49,17 +49,16 @@ endif
 MODULE		= layout
 XPIDL_MODULE	= layout_base
 GRE_MODULE	= 1
 LIBRARY_NAME	= gkbase_s
 LIBXUL_LIBRARY	= 1
 
 
 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif
 
 XPIDLSRCS	= \
 		nsIStyleSheetService.idl	\
 		$(NULL)
 
 EXPORTS		= \
 		nsBidi.h \

--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -155,19 +155,16 @@ SHARED_LIBRARY_LIBS += \
 		$(DEPTH)/content/xul/templates/src/$(LIB_PREFIX)gkconxultmpl_s.$(LIB_SUFFIX) \
 		$(NULL)
 endif
 
 ifndef MOZ_NO_INSPECTOR_APIS
 LOCAL_INCLUDES  += \
       -I$(srcdir)/../inspector/src \
       $(NULL)
-REQUIRES += \
-      inspector \
-      $(NULL)
 SHARED_LIBRARY_LIBS += ../inspector/src/$(LIB_PREFIX)inspector_s.$(LIB_SUFFIX)
 else
 DEFINES += -DMOZ_NO_INSPECTOR_APIS
 endif
 
 ifdef MOZ_MATHML
 SHARED_LIBRARY_LIBS += \
 		../mathml/$(LIB_PREFIX)gkmathml_s.$(LIB_SUFFIX) \

--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@@ -49,17 +49,16 @@ DIRS		+= test
 endif
 
 MODULE		= layout
 LIBRARY_NAME	= gkforms_s
 LIBXUL_LIBRARY	= 1
 
 
 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif
 
 EXPORTS		= \
 		nsIListControlFrame.h \
 		nsIComboboxControlFrame.h \
 		nsIFormControlFrame.h \
 		nsIRadioControlFrame.h \
 		nsICheckboxControlFrame.h \

--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -46,17 +46,16 @@ DIRS		+= test
 endif
 
 MODULE		= layout
 LIBRARY_NAME	= gkgeneric_s
 LIBXUL_LIBRARY	= 1
 
 
 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif
 
 EXPORTS		= \
 		nsQueryFrame.h \
 		nsFrameList.h \
 		nsHTMLParts.h \
 		nsHTMLReflowMetrics.h \
 		nsHTMLReflowState.h \

--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@@ -43,32 +43,28 @@ VPATH=@srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = inspector
 LIBRARY_NAME = inspector_s
 LIBXUL_LIBRARY = 1
 
 
 ifdef ACCESSIBILITY
-REQUIRES        += accessibility
 endif
 
 CPPSRCS= \
   inDeepTreeWalker.cpp \
   inFlasher.cpp \
   inSearchLoop.cpp \
   inCSSValueSearch.cpp \
   inDOMUtils.cpp \
   inLayoutUtils.cpp \
 	$(NULL)
 
 ifdef MOZ_XUL
-REQUIRES += \
-  xul \
-  $(NULL)
 CPPSRCS += \
   inDOMView.cpp \
   $(NULL)
 endif
 
 FORCE_STATIC_LIB = 1
 # This library is used by other shared libs in a static build
 FORCE_USE_PIC = 1

--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@@ -43,17 +43,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= layout
 LIBRARY_NAME	= gktable_s
 LIBXUL_LIBRARY	= 1
 
 
 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif
 
 EXPORTS		= \
 		nsITableCellLayout.h \
 		nsITableLayout.h \
 		$(NULL)
 
 CPPSRCS		= \

--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@@ -43,20 +43,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= layout
 LIBRARY_NAME	= gkxulbase_s
 LIBXUL_LIBRARY	= 1
 
 
 ifdef MOZ_ENABLE_CANVAS
-REQUIRES        += \
-                cairo \
-                libpixman \
-                $(NULL)
 endif
 
 ifdef MOZ_XUL
 PARALLEL_DIRS = tree/public tree/src grid
 endif
 
 CPPSRCS		= \
 		nsScrollBoxFrame.cpp \

--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@@ -50,17 +50,16 @@ MODULE_NAME	= nsPrefModule
 ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
 LIBRARY_NAME	= xppref$(MOZ_BITS)
 endif
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 
 ifndef MOZ_NO_XPCOM_OBSOLETE
-REQUIRES	+= xpcom_obsolete
 endif
 
 include $(topsrcdir)/config/config.mk
 
 CPPSRCS		= nsPref.cpp \
 			  nsPrefBranch.cpp	\
 			  nsPrefService.cpp	\
 			  nsPrefsFactory.cpp	\

--- a/modules/plugin/base/src/Makefile.in
+++ b/modules/plugin/base/src/Makefile.in
@@ -48,17 +48,16 @@ LIBRARY_NAME	= gkplugin
 EXPORT_LIBRARY = 1
 IS_COMPONENT    = 1
 MODULE_NAME	= nsPluginModule
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 
 ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
-REQUIRES	+= gtkxtbin
 endif
 
 CPPSRCS		= \
 		nsNPAPIPlugin.cpp \
 		nsNPAPIPluginInstance.cpp \
 		nsPluginHost.cpp \
 		nsPluginModule.cpp \
 		nsJSNPRuntime.cpp \

--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -118,17 +118,16 @@ ifdef NECKO_WIFI
 SHARED_LIBRARY_LIBS += \
 		../wifi/src/$(LIB_PREFIX)neckowifi_s.$(LIB_SUFFIX) \
                 $(NULL)
 LOCAL_INCLUDES	+= -I$(srcdir)/../wifi/src
 endif
 
 
 ifdef MOZ_STORAGE
-REQUIRES += storage
 DEFINES += -DNECKO_OFFLINE_CACHE
 endif
 
 EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \

--- a/netwerk/cache/src/Makefile.in
+++ b/netwerk/cache/src/Makefile.in
@@ -75,17 +75,16 @@ CPPSRCS += \
 	$(NULL)
 endif
 
 ifdef MOZ_STORAGE
 CPPSRCS += \
 	nsDiskCacheDeviceSQL.cpp \
 	$(NULL)
 
-REQUIRES += storage
 DEFINES += -DNECKO_OFFLINE_CACHE
 endif
 
 LOCAL_INCLUDES=-I$(srcdir)/../../base/src
 
 include $(topsrcdir)/config/config.mk
 
 

--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -52,17 +52,16 @@ LIBXUL_LIBRARY = 1
 
 ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2))
 ALERTS_SERVICE=1
 DEFINES += -DALERTS_SERVICE
 endif
 
 
 ifdef ALERTS_SERVICE
-REQUIRES	+= alerts
 endif
 
 EXPORTS = nsToolkitCompsCID.h
 
 CPPSRCS = nsToolkitCompsModule.cpp
 
 include $(topsrcdir)/config/config.mk
 
@@ -104,17 +103,16 @@ endif
 ifdef ALERTS_SERVICE_MAC
 SHARED_LIBRARY_LIBS += ../alerts/src/mac/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
 SHARED_LIBRARY_LIBS += ../alerts/src/mac/growl/$(LIB_PREFIX)growl_s.$(LIB_SUFFIX)
 endif
 
 ifdef MOZ_URL_CLASSIFIER
 SHARED_LIBRARY_LIBS += ../url-classifier/src/$(LIB_PREFIX)urlclassifier_s.$(LIB_SUFFIX)
 EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
-REQUIRES += url-classifier
 endif
 
 ifdef MOZ_FEEDS
 SHARED_LIBRARY_LIBS += ../feeds/src/$(LIB_PREFIX)feed_s.$(LIB_SUFFIX)
 endif
 
 SHARED_LIBRARY_LIBS += ../typeaheadfind/src/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX)
 EXTRA_DSO_LIBS = gkgfx

--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -122,20 +122,16 @@ ifdef MOZ_ENABLE_LIBXUL
 include $(srcdir)/libxul-config.mk
 
 EXTRA_DEPS += \
 	$(srcdir)/libxul-config.mk \
 	$(srcdir)/libxul-rules.mk \
 	$(topsrcdir)/intl/unicharutil/util/objs.mk \
 	$(NULL)
 
-REQUIRES += \
-	uconv \
-	unicharutil \
-	$(NULL)
 
 CPPSRCS += \
 	$(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \
 	$(NULL)
 
 GARBAGE	+= \
 	$(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \
 	$(wildcard *.$(OBJ_SUFFIX)) \

--- a/toolkit/mozapps/update/src/updater/Makefile.in
+++ b/toolkit/mozapps/update/src/updater/Makefile.in
@@ -69,17 +69,16 @@ CPPSRCS += \
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32)
 DEFINES += -DUNICODE -D_UNICODE
 ifndef GNU_CC
 RCFLAGS += -I$(srcdir)
 else
 RCFLAGS += --include-dir $(srcdir)
 endif
 
-REQUIRES += string
 endif
 
 ifeq ($(OS_ARCH),WINCE)
 export NO_SHUNT = 1
 USE_STATIC_LIBS = 1
 HAVE_PROGRESSUI = 1
 CPPSRCS += \
 	updater_wince.cpp \
@@ -89,17 +88,16 @@ OS_LIBS += $(call EXPAND_LIBNAME,commctr
 ifdef WINCE_WINDOWS_MOBILE
 OS_LIBS += $(call EXPAND_LIBNAME,aygshell)
 RCINCLUDE = updater_winmo.rc
 else
 RCINCLUDE = updater_wince.rc
 endif
 DEFINES += -DUNICODE -D_UNICODE -DWINCE_SKIP_SHUNT_INCLUDE
 RCFLAGS += -I$(srcdir)
-REQUIRES += string
 LOCAL_INCLUDES += -I$(topsrcdir)/build/wince/shunt/include \
                   -I$(topsrcdir)/build/wince/shunt
 endif
 
 ifneq ($(MOZ_ENABLE_GTK2),)
 HAVE_PROGRESSUI = 1
 CPPSRCS += \
 	progressui_gtk.cpp \

--- a/toolkit/system/gnome/Makefile.in
+++ b/toolkit/system/gnome/Makefile.in
@@ -62,17 +62,16 @@ endif
 
 ifdef MOZ_ENABLE_GIO
 CPPSRCS += \
 	nsGIOService.cpp \
 	$(NULL)
 endif
 
 ifdef MOZ_ENABLE_LIBNOTIFY
-REQUIRES += thebes
 CPPSRCS += \
 	nsAlertsService.cpp \
 	nsAlertsIconListener.cpp \
 	$(NULL)
 endif
 
 EXTRA_DSO_LDOPTS += \
 		$(XPCOM_GLUE_LDOPTS) \

--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -44,25 +44,22 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = xulapp
 LIBRARY_NAME = xulapp_s
 LIBXUL_LIBRARY = 1
 
 
 ifdef MOZ_JPROF
-REQUIRES += jprof
 endif
 
 ifdef NS_TRACE_MALLOC
-REQUIRES += tracemalloc
 endif
 
 ifdef MOZ_CRASHREPORTER
-REQUIRES += crashreporter
 endif
 
 FORCE_STATIC_LIB = 1
 
 XPIDLSRCS = \
 	nsINativeAppSupport.idl \
 	$(NULL)
 

--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -68,22 +68,19 @@ endif
 
 VPATH		:= $(srcdir) $(srcdir)/$(OSDIR)
 
 MODULE = exthandler
 LIBRARY_NAME    = exthandler_s
 LIBXUL_LIBRARY  = 1
 
 ifdef MOZ_PHOENIX
-REQUIRES	+= toolkitcomps
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-REQUIRES		+= windowwatcher \
-	             $(NULL)
 
 CMMSRCS	= nsOSHelperAppService.mm \
 			nsMIMEInfoMac.mm \
 			nsLocalHandlerAppMac.mm \
 			$(NULL)
 else
 OSHELPER	= nsOSHelperAppService.cpp
 endif
@@ -106,17 +103,16 @@ endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 OSHELPER  += nsMIMEInfoWin.cpp
 LOCAL_INCLUDES += -I$(srcdir)/win
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 OSHELPER  += nsMIMEInfoOS2.cpp
-REQUIRES  += widget
 endif
 
 EXPORTS = \
 		$(OSDIR)/nsOSHelperAppService.h \
 			$(NULL)
 
 XPIDLSRCS = \
 	nsCExternalHandlerService.idl	\

--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@@ -48,17 +48,16 @@ EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetMacModule
 XPIDL_MODULE	= widget_cocoa
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 
 ifdef ACCESSIBILITY
-REQUIRES += accessibility
 endif
 
 EXPORTS = \
 		mozView.h \
 		nsChangeObserver.h \
 		$(NULL)
 
 CMMSRCS = \

--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -49,17 +49,16 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetGtk2Module
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 NATIVE_THEME_SUPPORT = 1
 
 
 ifdef MOZ_X11
-REQUIRES += gtkxtbin
 endif
 
 CSRCS		= \
 		mozcontainer.c \
 		keysym2ucs.c \
 		$(NULL)
 
 ifdef ACCESSIBILITY
@@ -103,17 +102,16 @@ endif
 ifdef MOZ_X11
 CPPSRCS += 	nsClipboard.cpp \
 		nsDragService.cpp \
 		$(NULL)
 endif
 
 # build our subdirs, too
 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif
 
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_COMPONENT_LIBS) \
 		-lgkgfx \
                 $(MOZ_STARTUP_NOTIFICATION_LIBS) \

--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -68,17 +68,16 @@ CPPSRCS		= \
 		$(NULL)
 
 ifneq (,$(filter beos os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsBaseClipboard.cpp
 endif
 
 ifneq (,$(filter beos qt gtk2 os2 cocoa photon windows,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsBaseFilePicker.cpp
-REQUIRES += docshell view intl
 endif
 
 ifneq (,$(filter qt gtk2 windows cocoa,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsNativeTheme.cpp
 endif
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../$(MOZ_WIDGET_TOOLKIT) \

--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -65,17 +65,16 @@ CPPSRCS		= \
 		nsCycleCollector.cpp \
 		nsStackWalk.cpp \
 		nsMemoryReporterManager.cpp \
 		$(NULL)
 
 ifdef GC_LEAK_DETECTOR
 CSRCS += nsGarbageCollector.c
 CPPSRCS += nsLeakDetector.cpp
-REQUIRES	+= boehm
 endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS		+= nsMacUtilsImpl.cpp
 endif
 
 EXPORTS		= \
 		nsAgg.h \

--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -60,17 +60,16 @@ ifdef MOZ_ENABLE_LIBXUL
 EXPORT_LIBRARY = 1
 endif
 
 GRE_MODULE	= 1
 MOZILLA_INTERNAL_API = 1
 
 
 ifdef NS_TRACE_MALLOC
-REQUIRES += tracemalloc
 endif
 
 CSRCS		= \
 		$(XPCOM_GLUE_SRC_LCSRCS) \
 		$(NULL)
 
 CPPSRCS		= \
 		$(XPCOM_GLUE_SRC_LCPPSRCS) \

--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -48,17 +48,16 @@ EXTRA_DEPS += $(srcdir)/objs.mk
 DIRS            = standalone
 
 MODULE		= xpcom
 LIBRARY_NAME	= xpcomglue_s
 DIST_INSTALL	= 1
 
 
 ifdef NS_TRACE_MALLOC
-REQUIRES += tracemalloc
 endif
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../build \
 		$(NULL)
 
 CSRCS		= \
 		$(XPCOM_GLUE_SRC_LCSRCS) \

--- a/xpcom/obsolete/Makefile.in
+++ b/xpcom/obsolete/Makefile.in
@@ -57,17 +57,16 @@ DIRS            = component
 CPPSRCS         = \
 		nsFileSpec.cpp \
 		nsFileStream.cpp \
 		nsIFileStream.cpp \
 		nsFileSpecImpl.cpp \
 		$(NULL)
 
 ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
-REQUIRES	+= libreg
 ifndef MOZ_ENABLE_LIBXUL
 CPPSRCS		+= dlldeps-obs.cpp
 endif
 endif
 
 EXPORTS		= \
 		xpcomobsolete.h    \
 		nsFileSpec.h    \

--- a/xpfe/browser/src/Makefile.in
+++ b/xpfe/browser/src/Makefile.in
@@ -44,17 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= browser
 LIBRARY_NAME	= mozbrwsr_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 MODULE_NAME	= nsBrowserModule
 
 ifneq (,$(MOZ_PHOENIX)$(MOZ_XULRUNNER))
-REQUIRES += toolkitcomps
 endif
 
 CPPSRCS		= \
 		nsBrowserInstance.cpp \
 		nsBrowserStatusFilter.cpp \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \