diff --git a/accessible/src/html/Makefile.in b/accessible/src/html/Makefile.in
index 4be4095d71b8..765dad527e32 100644
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1
 
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-REQUIRES += editor
 endif
 
 CPPSRCS = \
diff --git a/accessible/src/xforms/Makefile.in b/accessible/src/xforms/Makefile.in
index 47c7b5fc2f25..55551d36d149 100644
--- a/accessible/src/xforms/Makefile.in
+++ b/accessible/src/xforms/Makefile.in
@@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1
 
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-REQUIRES += editor
 endif
 
 CPPSRCS = \
diff --git a/accessible/src/xul/Makefile.in b/accessible/src/xul/Makefile.in
index 4ccbcf52ba07..8afa2906cab8 100644
--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1
 
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-REQUIRES += editor
 endif
 
 CPPSRCS = \
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index d87dbe930d31..65fc2e73a1a1 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -92,10 +92,6 @@ else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
-REQUIRES = \
-	xpcom \
-	string \
-	$(NULL)
 
 CPPSRCS = nsBrowserApp.cpp
 
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
index 59561ccd3fd4..ff3b3af91c71 100644
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -58,7 +58,6 @@ EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_D
 # 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)
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
index 928475afee9b..94c9448b58b3 100644
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@@ -52,9 +52,6 @@ endif
 
 ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
 CPPSRCS = nsWindowsShellService.cpp
-REQUIRES	+= \
-		browsercomps \
-		$(NULL)
 else
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS = nsMacShellService.cpp
diff --git a/build/pymake/pymake/parserdata.py b/build/pymake/pymake/parserdata.py
index 49e43379974e..1fa3fe7581da 100644
--- a/build/pymake/pymake/parserdata.py
+++ b/build/pymake/pymake/parserdata.py
@@ -493,4 +493,5 @@ 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
diff --git a/build/wince/shunt/Makefile.in b/build/wince/shunt/Makefile.in
index 7d42c8ab17c7..aac03ed3a890 100644
--- a/build/wince/shunt/Makefile.in
+++ b/build/wince/shunt/Makefile.in
@@ -72,7 +72,6 @@ EXPORTS_mozce_shunt = \
 DIRS += include/sys
 
 ifdef MOZ_MEMORY
-REQUIRES = jemalloc 
 CFLAGS += -DMOZ_MEMORY
 CXXFLAGS += -DMOZ_MEMORY
 EXPORTS_mozce_shunt += $(topsrcdir)/memory/jemalloc/jemalloc.h
diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
index e9b43a0527f1..d372fe7b6ac2 100644
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -48,7 +48,6 @@ LIBXUL_LIBRARY	= 1
 
 
 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif
 
 EXPORTS		= \
diff --git a/content/xslt/src/base/Makefile.in b/content/xslt/src/base/Makefile.in
index faa322ae823d..643862617005 100644
--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@@ -48,18 +48,6 @@ LIBXUL_LIBRARY = 1
 
 
 ifndef MOZ_XSLT_STANDALONE
-REQUIRES	+= unicharutil \
-		  dom \
-		  content \
-		  layout \
-		  pref \
-		  widget \
-		  necko \
-		  caps \
-		  xpconnect \
-		  js \
-		  htmlparser \
-		  $(NULL)
 endif
 
 CPPSRCS	= txDouble.cpp \
diff --git a/content/xslt/src/xml/Makefile.in b/content/xslt/src/xml/Makefile.in
index 889de50dfec7..98c8f09350fe 100644
--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/xml/Makefile.in
@@ -48,21 +48,7 @@ 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	= \
diff --git a/content/xslt/src/xpath/Makefile.in b/content/xslt/src/xpath/Makefile.in
index 99cab9fc7fb9..acb13a77fa38 100644
--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/xpath/Makefile.in
@@ -48,17 +48,6 @@ LIBXUL_LIBRARY = 1
 
 
 ifndef MOZ_XSLT_STANDALONE
-REQUIRES +=	  dom \
-		  content \
-		  widget \
-		  xpconnect \
-		  js \
-		  unicharutil \
-		  layout \
-		  necko \
-		  htmlparser \
-		  pref \
-		  $(NULL)
 endif
 
 CPPSRCS = \
diff --git a/content/xslt/src/xslt/Makefile.in b/content/xslt/src/xslt/Makefile.in
index b7f3d090d892..b406c1e80931 100644
--- a/content/xslt/src/xslt/Makefile.in
+++ b/content/xslt/src/xslt/Makefile.in
@@ -48,31 +48,7 @@ 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 = \
diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in
index 1fa613c24911..38792cb87ce4 100644
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@@ -48,7 +48,6 @@ LIBXUL_LIBRARY = 1
 
 
 ifdef MOZ_STORAGE
-REQUIRES += storage
 endif
 
 CPPSRCS =                  \
diff --git a/embedding/browser/activex/src/plugin/Makefile.in b/embedding/browser/activex/src/plugin/Makefile.in
index 942bfa693b1e..1316635f0307 100644
--- a/embedding/browser/activex/src/plugin/Makefile.in
+++ b/embedding/browser/activex/src/plugin/Makefile.in
@@ -63,10 +63,6 @@ GRE_MODULE	= 1
 
 
 ifdef XPC_IDISPATCH_SUPPORT
-REQUIRES += \
-	caps \
-	string \
-	$(NULL)
 endif
 XPIFILE         = mozactivex.xpi
 
diff --git a/embedding/browser/gtk/src/Makefile.in b/embedding/browser/gtk/src/Makefile.in
index 80b141af6b08..e3b0b6a7b86a 100644
--- a/embedding/browser/gtk/src/Makefile.in
+++ b/embedding/browser/gtk/src/Makefile.in
@@ -51,7 +51,6 @@ DEFINES += -DIMPL_XREAPI
 
 
 ifdef ACCESSIBILITY
-REQUIRES        += accessibility
 endif
 
 CPPSRCS		= \
diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in
index 744bf3b091fc..6607d556589e 100644
--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@@ -51,7 +51,6 @@ LIBXUL_LIBRARY	= 1
 
 
 ifdef MOZ_PHOENIX
-REQUIRES	+= toolkitcomps
 endif
 
 EXPORTS         = \
diff --git a/extensions/pref/autoconfig/src/Makefile.in b/extensions/pref/autoconfig/src/Makefile.in
index 35f94f843547..4a46219e211f 100644
--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -63,7 +63,6 @@ CPPSRCS          = nsReadConfig.cpp    \
                    $(NULL)
 
 ifdef MOZ_LDAP_XPCOM
-REQUIRES         += mozldap 
 DEFINES          += -DMOZ_LDAP_XPCOM
 CPPSRCS          += nsLDAPSyncQuery.cpp
 endif
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index 48b65b183eaf..1fafdabadbcd 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -65,7 +65,6 @@ CPPSRCS = \
         $(NULL)
 
 ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
-REQUIRES += uconv
 endif
 
 EXTRA_DSO_LDOPTS = \
diff --git a/gfx/src/thebes/Makefile.in b/gfx/src/thebes/Makefile.in
index 4de86e1e5d80..8ea2ef9cdf0b 100644
--- a/gfx/src/thebes/Makefile.in
+++ b/gfx/src/thebes/Makefile.in
@@ -55,7 +55,6 @@ LIBXUL_LIBRARY = 1
 
 
 ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
-REQUIRES += uconv
 endif
 
 CPPSRCS		= \
@@ -83,10 +82,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS		+= nsSystemFontsWin.cpp \
 		   $(NULL)
 
-REQUIRES	+= \
-		cairo \
-		qcms \
-		$(NULL)
 
 _OS_LIBS	= usp10
 OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))
diff --git a/gfx/thebes/src/Makefile.in b/gfx/thebes/src/Makefile.in
index 00eceaa23fb4..cc4be5b053b7 100644
--- a/gfx/thebes/src/Makefile.in
+++ b/gfx/thebes/src/Makefile.in
@@ -79,7 +79,6 @@ CPPSRCS	+=	gfxOS2Fonts.cpp \
 		gfxFontconfigUtils.cpp \
 		$(NULL)
 CPPSRCS +=	gfxPDFSurface.cpp
-REQUIRES += uconv locale
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@@ -94,7 +93,6 @@ ifdef MOZ_X11
 CPPSRCS += gfxXlibSurface.cpp
 endif
 
-REQUIRES += locale
 CPPSRCS +=  gfxPlatformGtk.cpp gfxGdkNativeRenderer.cpp
 CPPSRCS +=	gfxPDFSurface.cpp gfxPSSurface.cpp
 CPPSRCS +=	gfxFontconfigUtils.cpp
@@ -116,7 +114,6 @@ CPPSRCS += gfxDirectFBSurface.cpp
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-REQUIRES += locale
 CPPSRCS += gfxQtPlatform.cpp gfxQPainterSurface.cpp
 CPPSRCS += gfxXlibSurface.cpp gfxQtNativeRenderer.cpp
 CPPSRCS +=	gfxFT2Fonts.cpp
@@ -127,7 +124,6 @@ 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
diff --git a/intl/uconv/src/Makefile.in b/intl/uconv/src/Makefile.in
index 8ddc98abe412..b6b489aa9ee0 100644
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -70,7 +70,6 @@ CPPSRCS		= \
 		$(NULL)
 
 ifdef MOZ_USE_NATIVE_UCONV
-REQUIRES	+= ucnative
 else
 CPPSRCS         += \
 		nsISO88591ToUnicode.cpp \
diff --git a/intl/uconv/tests/Makefile.in b/intl/uconv/tests/Makefile.in
index 4169f4dd7da4..9c2d704e8348 100644
--- a/intl/uconv/tests/Makefile.in
+++ b/intl/uconv/tests/Makefile.in
@@ -48,12 +48,6 @@ XPCSHELL_TESTS	= unit
 ifndef MOZ_ENABLE_LIBXUL
 MOZILLA_INTERNAL_API = 1
 
-REQUIRES	= \
-		string \
-		xpcom \
-		uconv \
-		locale \
-		$(NULL)
 
 CPPSRCS		= \
 		TestUConv.cpp \
diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in
index 3257106245b5..2522bf78e406 100644
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -55,13 +55,6 @@ endif
 # REQUIRES	= java js
 
 ifndef JSD_STANDALONE
-REQUIRES += \
-		  string \
-		  xpcom \
-		  xpconnect \
-		  widget \
-		  dom \
-		  $(NULL)
 endif
 
 EXTRA_DSO_LDOPTS += \
diff --git a/js/src/xpconnect/src/Makefile.in b/js/src/xpconnect/src/Makefile.in
index cbad487b17d9..2bcbc4e9afad 100644
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@@ -159,7 +159,6 @@ endif # ENABLE_JIT
 
 ifdef MOZ_XPCTOOLS
 DEFINES         +=  -DXPC_TOOLS_SUPPORT
-REQUIRES	+= xpctools
 endif
 
 ifdef XPC_IDISPATCH_SUPPORT
diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in
index 9b481afb7c9d..a7f6e5a8fde5 100644
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -54,7 +54,6 @@ LIBXUL_LIBRARY	= 1
 
 
 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif
 
 XPIDLSRCS	= \
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index b10d5e620c93..0f4b53ff97b4 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -160,9 +160,6 @@ 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
diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in
index 67fe82d1f264..006d2594508c 100644
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@@ -54,7 +54,6 @@ LIBXUL_LIBRARY	= 1
 
 
 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif
 
 EXPORTS		= \
diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in
index 216dcaba36b8..1a8d2c097525 100644
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -51,7 +51,6 @@ LIBXUL_LIBRARY	= 1
 
 
 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif
 
 EXPORTS		= \
diff --git a/layout/inspector/src/Makefile.in b/layout/inspector/src/Makefile.in
index 6dc800129947..15bc766cd30c 100644
--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@@ -48,7 +48,6 @@ LIBXUL_LIBRARY = 1
 
 
 ifdef ACCESSIBILITY
-REQUIRES        += accessibility
 endif
 
 CPPSRCS= \
@@ -61,9 +60,6 @@ CPPSRCS= \
 	$(NULL)
 
 ifdef MOZ_XUL
-REQUIRES += \
-  xul \
-  $(NULL)
 CPPSRCS += \
   inDOMView.cpp \
   $(NULL)
diff --git a/layout/tables/Makefile.in b/layout/tables/Makefile.in
index e1917e5224d3..f6bad49b1f16 100644
--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@@ -48,7 +48,6 @@ LIBXUL_LIBRARY	= 1
 
 
 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif
 
 EXPORTS		= \
diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in
index 722e0c735a2b..4db5563ed58e 100644
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@@ -48,10 +48,6 @@ LIBXUL_LIBRARY	= 1
 
 
 ifdef MOZ_ENABLE_CANVAS
-REQUIRES        += \
-                cairo \
-                libpixman \
-                $(NULL)
 endif
 
 ifdef MOZ_XUL
diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
index 4e0c02fe866b..6e7614e3cd55 100644
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@@ -55,7 +55,6 @@ LIBXUL_LIBRARY = 1
 
 
 ifndef MOZ_NO_XPCOM_OBSOLETE
-REQUIRES	+= xpcom_obsolete
 endif
 
 include $(topsrcdir)/config/config.mk
diff --git a/modules/plugin/base/src/Makefile.in b/modules/plugin/base/src/Makefile.in
index dbd9f7777e5e..a296d09417a4 100644
--- a/modules/plugin/base/src/Makefile.in
+++ b/modules/plugin/base/src/Makefile.in
@@ -53,7 +53,6 @@ LIBXUL_LIBRARY = 1
 
 
 ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
-REQUIRES	+= gtkxtbin
 endif
 
 CPPSRCS		= \
diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in
index cb908abf2fdd..0daf53a1cda6 100644
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -123,7 +123,6 @@ endif
 
 
 ifdef MOZ_STORAGE
-REQUIRES += storage
 DEFINES += -DNECKO_OFFLINE_CACHE
 endif
 
diff --git a/netwerk/cache/src/Makefile.in b/netwerk/cache/src/Makefile.in
index 9257bd85e60a..38d9095d516a 100644
--- a/netwerk/cache/src/Makefile.in
+++ b/netwerk/cache/src/Makefile.in
@@ -80,7 +80,6 @@ CPPSRCS += \
 	nsDiskCacheDeviceSQL.cpp \
 	$(NULL)
 
-REQUIRES += storage
 DEFINES += -DNECKO_OFFLINE_CACHE
 endif
 
diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in
index 3d3ca343053d..2e7a82e7a7bc 100644
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -57,7 +57,6 @@ endif
 
 
 ifdef ALERTS_SERVICE
-REQUIRES	+= alerts
 endif
 
 EXPORTS = nsToolkitCompsCID.h
@@ -109,7 +108,6 @@ 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
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index 8ee6a8c0aec4..8f159b4c59b4 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -127,10 +127,6 @@ EXTRA_DEPS += \
 	$(topsrcdir)/intl/unicharutil/util/objs.mk \
 	$(NULL)
 
-REQUIRES += \
-	uconv \
-	unicharutil \
-	$(NULL)
 
 CPPSRCS += \
 	$(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \
diff --git a/toolkit/mozapps/update/src/updater/Makefile.in b/toolkit/mozapps/update/src/updater/Makefile.in
index 1ed973c0a4dc..b8f49b3b74df 100644
--- a/toolkit/mozapps/update/src/updater/Makefile.in
+++ b/toolkit/mozapps/update/src/updater/Makefile.in
@@ -74,7 +74,6 @@ else
 RCFLAGS += --include-dir $(srcdir)
 endif
 
-REQUIRES += string
 endif
 
 ifeq ($(OS_ARCH),WINCE)
@@ -94,7 +93,6 @@ 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
diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
index ac4c21695d29..ace064741fb5 100644
--- a/toolkit/system/gnome/Makefile.in
+++ b/toolkit/system/gnome/Makefile.in
@@ -67,7 +67,6 @@ CPPSRCS += \
 endif
 
 ifdef MOZ_ENABLE_LIBNOTIFY
-REQUIRES += thebes
 CPPSRCS += \
 	nsAlertsService.cpp \
 	nsAlertsIconListener.cpp \
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 837e5ba00a22..30f6358ee209 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -49,15 +49,12 @@ 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
diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
index 2ce8c8fd57cd..ffd243d1e1ac 100644
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -73,12 +73,9 @@ 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 \
@@ -111,7 +108,6 @@ endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 OSHELPER  += nsMIMEInfoOS2.cpp
-REQUIRES  += widget
 endif
 
 EXPORTS = \
diff --git a/widget/src/cocoa/Makefile.in b/widget/src/cocoa/Makefile.in
index b2e86c14fffb..096cf4236351 100644
--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@@ -53,7 +53,6 @@ LIBXUL_LIBRARY = 1
 
 
 ifdef ACCESSIBILITY
-REQUIRES += accessibility
 endif
 
 EXPORTS = \
diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
index 36d397d7f7f6..3d260d5db888 100644
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -54,7 +54,6 @@ NATIVE_THEME_SUPPORT = 1
 
 
 ifdef MOZ_X11
-REQUIRES += gtkxtbin
 endif
 
 CSRCS		= \
@@ -108,7 +107,6 @@ endif
 
 # build our subdirs, too
 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif
 
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
diff --git a/widget/src/xpwidgets/Makefile.in b/widget/src/xpwidgets/Makefile.in
index ec88c4878533..e1bbb137678f 100644
--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -73,7 +73,6 @@ 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)))
diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in
index 886fbdf240fc..f3cab010719d 100644
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -70,7 +70,6 @@ CPPSRCS		= \
 ifdef GC_LEAK_DETECTOR
 CSRCS += nsGarbageCollector.c
 CPPSRCS += nsLeakDetector.cpp
-REQUIRES	+= boehm
 endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
index d9cbf2df6c7c..1177cf3e06ad 100644
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -65,7 +65,6 @@ MOZILLA_INTERNAL_API = 1
 
 
 ifdef NS_TRACE_MALLOC
-REQUIRES += tracemalloc
 endif
 
 CSRCS		= \
diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in
index cc85eb0dedfe..ba3ef610a458 100644
--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -53,7 +53,6 @@ DIST_INSTALL	= 1
 
 
 ifdef NS_TRACE_MALLOC
-REQUIRES += tracemalloc
 endif
 
 LOCAL_INCLUDES	= \
diff --git a/xpcom/obsolete/Makefile.in b/xpcom/obsolete/Makefile.in
index 25306d0a3f10..d344e7fbd0e4 100644
--- a/xpcom/obsolete/Makefile.in
+++ b/xpcom/obsolete/Makefile.in
@@ -62,7 +62,6 @@ CPPSRCS         = \
 		$(NULL)
 
 ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
-REQUIRES	+= libreg
 ifndef MOZ_ENABLE_LIBXUL
 CPPSRCS		+= dlldeps-obs.cpp
 endif
diff --git a/xpfe/browser/src/Makefile.in b/xpfe/browser/src/Makefile.in
index 5d999090c06b..1db4c0bf1633 100644
--- a/xpfe/browser/src/Makefile.in
+++ b/xpfe/browser/src/Makefile.in
@@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1
 MODULE_NAME	= nsBrowserModule
 
 ifneq (,$(MOZ_PHOENIX)$(MOZ_XULRUNNER))
-REQUIRES += toolkitcomps
 endif
 
 CPPSRCS		= \