diff --git a/mozilla/extensions/access-builtin/Makefile.in b/mozilla/extensions/access-builtin/Makefile.in
index 98cf2594f4d..4853c1f192e 100644
--- a/mozilla/extensions/access-builtin/Makefile.in
+++ b/mozilla/extensions/access-builtin/Makefile.in
@@ -25,9 +25,9 @@
 # Contributor(s):
 
 DEPTH		= ../..
-topsrcdir	= ../..
-srcdir		= .
-VPATH		= .
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/mozilla/extensions/access-builtin/accessproxy/Makefile.in b/mozilla/extensions/access-builtin/accessproxy/Makefile.in
index ead4d373d88..4a3806a3e65 100644
--- a/mozilla/extensions/access-builtin/accessproxy/Makefile.in
+++ b/mozilla/extensions/access-builtin/accessproxy/Makefile.in
@@ -35,6 +35,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = accessproxy
 XPIDL_MODULE = accessproxy
 LIBRARY_NAME = accessproxy
+REQUIRES = xpcom string docshell dom js widget necko layout uriloader gfx2 locale mozcomps
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 
diff --git a/mozilla/extensions/inspector/base/src/Makefile.in b/mozilla/extensions/inspector/base/src/Makefile.in
index db3836c9b69..273fdbe7f92 100644
--- a/mozilla/extensions/inspector/base/src/Makefile.in
+++ b/mozilla/extensions/inspector/base/src/Makefile.in
@@ -29,6 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE=inspector
 LIBRARY_NAME=inspector_s 
 SHORT_LIBNAME=inspector_s
+REQUIRES=xpcom string dom rdf rdfutil layout js widget locale gfx2 necko docshell view uriloader timer
 
 CPPSRCS=					               \
 	nsDOMDSResource.cpp			       \
diff --git a/mozilla/extensions/inspector/base/src/inCSSValueSearch.cpp b/mozilla/extensions/inspector/base/src/inCSSValueSearch.cpp
index 76baee5b92e..9c0fd4b7d9b 100644
--- a/mozilla/extensions/inspector/base/src/inCSSValueSearch.cpp
+++ b/mozilla/extensions/inspector/base/src/inCSSValueSearch.cpp
@@ -357,4 +357,4 @@ inCSSValueSearch::EqualizeURL(nsAutoString* aURL)
   }
 
   return NS_OK;
-}
\ No newline at end of file
+}
diff --git a/mozilla/extensions/inspector/base/src/inFileSearch.cpp b/mozilla/extensions/inspector/base/src/inFileSearch.cpp
index fc9c1de7a89..16080fe2714 100644
--- a/mozilla/extensions/inspector/base/src/inFileSearch.cpp
+++ b/mozilla/extensions/inspector/base/src/inFileSearch.cpp
@@ -635,4 +635,4 @@ inFileSearch::CountDirectoryDepth(nsIFile* aDir, PRUint32* aDepth)
   }
 
   return NS_OK;
-}
\ No newline at end of file
+}
diff --git a/mozilla/extensions/inspector/base/src/inFlasher.cpp b/mozilla/extensions/inspector/base/src/inFlasher.cpp
index ef8afd3d83e..c64bf6a482c 100644
--- a/mozilla/extensions/inspector/base/src/inFlasher.cpp
+++ b/mozilla/extensions/inspector/base/src/inFlasher.cpp
@@ -179,4 +179,4 @@ inFlasher::GetPresShellFor(nsISupports* aThing)
   docShell->GetPresShell(&presShell);
 
   return presShell;
-}
\ No newline at end of file
+}
diff --git a/mozilla/extensions/inspector/base/src/inSearchItemImage.cpp b/mozilla/extensions/inspector/base/src/inSearchItemImage.cpp
index 65d94d15fff..92254f419a9 100644
--- a/mozilla/extensions/inspector/base/src/inSearchItemImage.cpp
+++ b/mozilla/extensions/inspector/base/src/inSearchItemImage.cpp
@@ -80,4 +80,4 @@ NS_IMETHODIMP
 inSearchItemImage::EditItem()
 {
   return NS_OK;
-}
\ No newline at end of file
+}
diff --git a/mozilla/extensions/inspector/base/src/inSearchLoop.cpp b/mozilla/extensions/inspector/base/src/inSearchLoop.cpp
index 091859f57fa..9206c50810c 100644
--- a/mozilla/extensions/inspector/base/src/inSearchLoop.cpp
+++ b/mozilla/extensions/inspector/base/src/inSearchLoop.cpp
@@ -73,4 +73,4 @@ inSearchLoop::TimerCallback(nsITimer *aTimer, void *aClosure)
 {
   inSearchLoop* loop = (inSearchLoop*) aClosure;
   loop->Step();
-}
\ No newline at end of file
+}
diff --git a/mozilla/extensions/inspector/base/src/nsCSSDecIntHolder.h b/mozilla/extensions/inspector/base/src/nsCSSDecIntHolder.h
index 82de5ff5065..96ec137a03b 100644
--- a/mozilla/extensions/inspector/base/src/nsCSSDecIntHolder.h
+++ b/mozilla/extensions/inspector/base/src/nsCSSDecIntHolder.h
@@ -23,4 +23,4 @@ public:
 	NS_DECL_NSICSSDECINTHOLDER
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/mozilla/extensions/inspector/base/src/nsCSSRuleDataSource.cpp b/mozilla/extensions/inspector/base/src/nsCSSRuleDataSource.cpp
index cddf35d3a00..40d122f13fa 100644
--- a/mozilla/extensions/inspector/base/src/nsCSSRuleDataSource.cpp
+++ b/mozilla/extensions/inspector/base/src/nsCSSRuleDataSource.cpp
@@ -432,4 +432,4 @@ nsCSSRuleDataSource::CreateLiteral(nsString& str, nsIRDFNode **aResult)
   *aResult = literal;
   NS_IF_ADDREF(*aResult);
   return NS_OK;
-}
\ No newline at end of file
+}
diff --git a/mozilla/extensions/inspector/base/src/nsDOMDataSource.cpp b/mozilla/extensions/inspector/base/src/nsDOMDataSource.cpp
index cf7f1ac78d9..d30309afa38 100644
--- a/mozilla/extensions/inspector/base/src/nsDOMDataSource.cpp
+++ b/mozilla/extensions/inspector/base/src/nsDOMDataSource.cpp
@@ -65,8 +65,8 @@ nsIRDFResource*    kINS_HasChildren;
 ////////////////////////////////////////////////////////////////////////
 
 nsDOMDataSource::nsDOMDataSource() :
-  mObservers(nsnull),
-  mDocument(nsnull)
+  mDocument(nsnull),
+  mObservers(nsnull)
 {
 	NS_INIT_REFCNT();
 
diff --git a/mozilla/extensions/inspector/build/src/Makefile.in b/mozilla/extensions/inspector/build/src/Makefile.in
index c60c178c3bf..b0c0ac7bc46 100644
--- a/mozilla/extensions/inspector/build/src/Makefile.in
+++ b/mozilla/extensions/inspector/build/src/Makefile.in
@@ -30,6 +30,7 @@ MODULE = inspector
 LIBRARY_NAME = inspector
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME = inspector
+REQUIRES = xpcom string layout dom widget js rdf rdfutil locale gfx2 timer necko
 IS_COMPONENT = 1
 
 CPPSRCS 	= \
diff --git a/mozilla/extensions/transformiix/build/Makefile.in b/mozilla/extensions/transformiix/build/Makefile.in
index d7711dedafd..639522a556b 100644
--- a/mozilla/extensions/transformiix/build/Makefile.in
+++ b/mozilla/extensions/transformiix/build/Makefile.in
@@ -30,6 +30,7 @@ MODULE		= transformiix
 LIBRARY_NAME	= transformiix
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= t8iix
+REQUIRES	= xpcom string dom docshell necko layout widget caps webbrwsr js uriloader locale xpconnect gfx2 appshell embedcomponents
 IS_COMPONENT	= 1
 
 
diff --git a/mozilla/extensions/transformiix/source/base/Makefile.in b/mozilla/extensions/transformiix/source/base/Makefile.in
index 8e5ac4d109f..deddf70cd93 100644
--- a/mozilla/extensions/transformiix/source/base/Makefile.in
+++ b/mozilla/extensions/transformiix/source/base/Makefile.in
@@ -26,6 +26,11 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_XSL
+MODULE = transformiix
+REQUIRES = string xpcom
+endif
+
 CPPSRCS	= ArrayList.cpp             \
 	DefaultStringComparator.cpp \
 	Double.cpp \
@@ -48,4 +53,4 @@ else
 endif
 include $(topsrcdir)/config/rules.mk
 
-install:: $(OBJS)
\ No newline at end of file
+install:: $(OBJS)
diff --git a/mozilla/extensions/transformiix/source/net/Makefile.in b/mozilla/extensions/transformiix/source/net/Makefile.in
index 44cac8fc69b..72531c4c66b 100644
--- a/mozilla/extensions/transformiix/source/net/Makefile.in
+++ b/mozilla/extensions/transformiix/source/net/Makefile.in
@@ -26,10 +26,15 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_XSL
+MODULE = transformiix
+REQUIRES = string xpcom necko
+endif
+
 CPPSRCS = URIUtils.cpp
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += -I$(srcdir)/../base
 
-install:: $(OBJS)
\ No newline at end of file
+install:: $(OBJS)
diff --git a/mozilla/extensions/transformiix/source/xml/Makefile.in b/mozilla/extensions/transformiix/source/xml/Makefile.in
index 2fc57f148e9..7c7383f8fd8 100644
--- a/mozilla/extensions/transformiix/source/xml/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xml/Makefile.in
@@ -26,6 +26,11 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_XSL
+MODULE = transformiix
+REQUIRES = string xpcom dom layout widget
+endif
+
 DIRS            = dom parser util
 ifndef MOZ_XSL
 DIRS +=		printer
@@ -37,4 +42,4 @@ include $(topsrcdir)/config/rules.mk
 
 INCLUDES += -I$(srcdir)/../base -I$(srcdir)/dom
 
-install:: $(OBJS)
\ No newline at end of file
+install:: $(OBJS)
diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in
index f029fd5bde0..e8d12b9719c 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in
@@ -26,6 +26,11 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_XSL
+MODULE = transformiix
+REQUIRES = string xpcom dom layout widget necko
+endif
+
 CPPSRCS = MozillaAttr.cpp \
         MozillaCDATASection.cpp \
         MozillaCharacterData.cpp \
diff --git a/mozilla/extensions/transformiix/source/xml/parser/Makefile.in b/mozilla/extensions/transformiix/source/xml/parser/Makefile.in
index 0d0f87464eb..47065ed8baf 100644
--- a/mozilla/extensions/transformiix/source/xml/parser/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xml/parser/Makefile.in
@@ -26,6 +26,11 @@ VPATH           = @srcdir@:@srcdir@/xmltok:@srcdir@/xmlparse
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_XSL
+MODULE = transformiix
+REQUIRES = string xpcom necko dom layout widget webbrwsr
+endif
+
 CSRCS = xmltok.c xmlrole.c xmlparse.c hashtable.c
 CPPSRCS = XMLParser.cpp
 
@@ -34,4 +39,4 @@ include $(topsrcdir)/config/rules.mk
 COMPILE_CFLAGS += -DXML_UNICODE -I$(srcdir)/xmltok
 INCLUDES += -I$(srcdir)/../../base -I$(srcdir)/../../net -I$(srcdir)/../dom -I$(srcdir)/xmlparse
 
-install:: $(OBJS)
\ No newline at end of file
+install:: $(OBJS)
diff --git a/mozilla/extensions/transformiix/source/xml/util/Makefile.in b/mozilla/extensions/transformiix/source/xml/util/Makefile.in
index 974ef1d95ae..7426cd3552c 100644
--- a/mozilla/extensions/transformiix/source/xml/util/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xml/util/Makefile.in
@@ -26,6 +26,11 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_XSL
+MODULE = transformiix
+REQUIRES = string xpcom dom layout widget
+endif
+
 CPPSRCS = DOMHelper.cpp
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/extensions/transformiix/source/xpath/Makefile.in b/mozilla/extensions/transformiix/source/xpath/Makefile.in
index 8586ccc2e91..9b50a25d7c9 100644
--- a/mozilla/extensions/transformiix/source/xpath/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xpath/Makefile.in
@@ -26,6 +26,11 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_XSL
+MODULE = transformiix
+REQUIRES = string xpcom dom layout widget caps
+endif
+
 CPPSRCS = AdditiveExpr.cpp \
         AttributeExpr.cpp \
         AttributeValueTemplate.cpp \
@@ -75,4 +80,4 @@ ifdef MOZ_XSL
 INCLUDES += -I$(srcdir)
 endif
 
-install:: $(OBJS)
\ No newline at end of file
+install:: $(OBJS)
diff --git a/mozilla/extensions/transformiix/source/xslt/Makefile.in b/mozilla/extensions/transformiix/source/xslt/Makefile.in
index c5e75467a72..c696413843a 100644
--- a/mozilla/extensions/transformiix/source/xslt/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xslt/Makefile.in
@@ -28,6 +28,11 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS            = functions util
 
+ifdef MOZ_XSL
+MODULE = transformiix
+REQUIRES = string xpcom dom layout widget necko
+endif
+
 CPPSRCS = Names.cpp \
         Numbering.cpp \
         OutputFormat.cpp \
@@ -43,4 +48,4 @@ INCLUDES += -I$(srcdir) -I$(srcdir)/../base -I$(srcdir)/../net \
   -I$(srcdir)/../xml/printer -I$(srcdir)/../xpath -I$(srcdir)/../xslt/util \
   -I$(srcdir)/../xslt/functions
 
-install:: $(OBJS)
\ No newline at end of file
+install:: $(OBJS)
diff --git a/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in b/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in
index 350e904d37e..7016e17fbf5 100644
--- a/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in
@@ -26,6 +26,11 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_XSL
+MODULE = transformiix
+REQUIRES = string xpcom dom layout widget
+endif
+
 CPPSRCS = CurrentFunctionCall.cpp      \
           DocumentFunctionCall.cpp     \
           ElementAvailableFnCall.cpp   \
diff --git a/mozilla/extensions/transformiix/source/xslt/util/Makefile.in b/mozilla/extensions/transformiix/source/xslt/util/Makefile.in
index dd3028a2661..cfc40120960 100644
--- a/mozilla/extensions/transformiix/source/xslt/util/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xslt/util/Makefile.in
@@ -26,6 +26,11 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_XSL
+MODULE = transformiix
+REQUIRES = string xpcom dom layout widget
+endif
+
 CPPSRCS = NodeSorter.cpp NodeStack.cpp
 
 include $(topsrcdir)/config/rules.mk