diff --git a/mozilla/xpcom/appshell/eventloop/windows/makefile.win b/mozilla/xpcom/appshell/eventloop/windows/makefile.win
index fcc31d9925e..62b14b58068 100644
--- a/mozilla/xpcom/appshell/eventloop/windows/makefile.win
+++ b/mozilla/xpcom/appshell/eventloop/windows/makefile.win
@@ -21,7 +21,9 @@
 
 
 DEPTH=..\..\..\..
-MODULE		= xpcom_eventloop_windows
+MODULE		= xpcom
+REQUIRES=string
+XPIDL_MODULE = xpcom_eventloop_windows
 LIBRARY_NAME	= evntloop
 MODULE_NAME	= nsNativeAppModule
 
diff --git a/mozilla/xpcom/appshell/eventloop/xp/makefile.win b/mozilla/xpcom/appshell/eventloop/xp/makefile.win
index 7cafd778290..e0f44a52f38 100644
--- a/mozilla/xpcom/appshell/eventloop/xp/makefile.win
+++ b/mozilla/xpcom/appshell/eventloop/xp/makefile.win
@@ -20,7 +20,9 @@
 #   Travis Bogard <travis@netscape.com>
 
 DEPTH=..\..\..\..
-MODULE=xpcom_eventloop_xp
+MODULE=xpcom
+REQUIRES=string
+XPIDL_MODULE=xpcom_eventloop_xp
 
 LIBRARY_NAME= xp_eventloop
 
diff --git a/mozilla/xpcom/appshell/nativeApp/makefile.win b/mozilla/xpcom/appshell/nativeApp/makefile.win
index 396521c7b2a..60330e8918c 100644
--- a/mozilla/xpcom/appshell/nativeApp/makefile.win
+++ b/mozilla/xpcom/appshell/nativeApp/makefile.win
@@ -21,12 +21,14 @@
 
 DEPTH=..\..\..
 
-include <$(DEPTH)\config\config.mak>
-
-MODULE=xpcom_nativeapp
+MODULE=xpcom
+REQUIRES=string
+XPIDL_MODULE=xpcom_nativeapp
 LIBRARY_NAME=nativapp
 MODULE_NAME=nsCNativeAppModule
 
+include <$(DEPTH)\config\config.mak>
+
 XPIDLSRCS=						\
 		.\nsCNativeApp.idl	\
 		.\nsINativeApp.idl	\
diff --git a/mozilla/xpcom/base/makefile.win b/mozilla/xpcom/base/makefile.win
index 6b97c8e7600..eb6bd9e52f2 100644
--- a/mozilla/xpcom/base/makefile.win
+++ b/mozilla/xpcom/base/makefile.win
@@ -24,6 +24,7 @@
 DEPTH=..\..
 MODULE = xpcom 
 
+REQUIRES=string
 ################################################################################
 ## exports
 
diff --git a/mozilla/xpcom/build/makefile.win b/mozilla/xpcom/build/makefile.win
index 6c80d07a74d..4868f5d1abf 100644
--- a/mozilla/xpcom/build/makefile.win
+++ b/mozilla/xpcom/build/makefile.win
@@ -23,6 +23,7 @@
 
 DEPTH=..\..
 MODULE = xpcom 
+REQUIRES	= mozreg unicharutil string
 
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/xpcom/components/makefile.win b/mozilla/xpcom/components/makefile.win
index 5d52dcaa0e1..a61917d2031 100644
--- a/mozilla/xpcom/components/makefile.win
+++ b/mozilla/xpcom/components/makefile.win
@@ -22,7 +22,9 @@
 
 
 DEPTH=..\..
-MODULE = xpcom_components
+MODULE = xpcom
+XPIDL_MODULE = xpcom_components
+REQUIRES	= mozreg string
 
 ################################################################################
 ## exports
diff --git a/mozilla/xpcom/ds/makefile.win b/mozilla/xpcom/ds/makefile.win
index cf758569b81..7ffb1c562ee 100644
--- a/mozilla/xpcom/ds/makefile.win
+++ b/mozilla/xpcom/ds/makefile.win
@@ -23,7 +23,7 @@
 
 DEPTH=..\..
 MODULE = xpcom 
-
+REQUIRES=string unicharutil
 ################################################################################
 ## exports
 
diff --git a/mozilla/xpcom/io/makefile.win b/mozilla/xpcom/io/makefile.win
index ad635b83cf4..ae7fa580e22 100644
--- a/mozilla/xpcom/io/makefile.win
+++ b/mozilla/xpcom/io/makefile.win
@@ -21,6 +21,7 @@
 
 DEPTH=..\..
 MODULE = xpcom 
+REQUIRES	= uconv string necko
 
 ################################################################################
 ## exports
diff --git a/mozilla/xpcom/proxy/src/makefile.win b/mozilla/xpcom/proxy/src/makefile.win
index aae27fab15f..cd20ee8fddb 100644
--- a/mozilla/xpcom/proxy/src/makefile.win
+++ b/mozilla/xpcom/proxy/src/makefile.win
@@ -23,6 +23,7 @@ DEPTH=..\..\..
 
 
 LIBRARY_NAME=xpcomproxy_s
+REQUIRES	= string
 
 LINCS =                        \
     -I$(PUBLIC)\xpcom	       \
diff --git a/mozilla/xpcom/proxy/tests/makefile.win b/mozilla/xpcom/proxy/tests/makefile.win
index 772406dc309..9471f1c247b 100644
--- a/mozilla/xpcom/proxy/tests/makefile.win
+++ b/mozilla/xpcom/proxy/tests/makefile.win
@@ -20,6 +20,7 @@
 # Contributor(s): 
 DEPTH=..\..\..
 
+REQUIRES=string xpcom
 MAKE_OBJ_TYPE   = EXE
 PROGRAM = .\$(OBJDIR)\ProxyTest.exe
 
diff --git a/mozilla/xpcom/reflect/xptinfo/src/makefile.win b/mozilla/xpcom/reflect/xptinfo/src/makefile.win
index 58c50090a6f..72960f7831c 100644
--- a/mozilla/xpcom/reflect/xptinfo/src/makefile.win
+++ b/mozilla/xpcom/reflect/xptinfo/src/makefile.win
@@ -22,6 +22,7 @@
 
 DEPTH=..\..\..\..
 MODULE	= 	xpcom
+REQUIRES	= jar
 
 LIBRARY_NAME=xpcomxptinfo_s
 
diff --git a/mozilla/xpcom/sample/makefile.win b/mozilla/xpcom/sample/makefile.win
index ea5e73f921c..c6135188170 100644
--- a/mozilla/xpcom/sample/makefile.win
+++ b/mozilla/xpcom/sample/makefile.win
@@ -21,6 +21,7 @@
 
 DEPTH=..\..
 MODULE=sample
+REQUIRES=xpcom
 
 MAKE_OBJ_TYPE=DLL
 DLLNAME=$(MODULE)
diff --git a/mozilla/xpcom/tests/makefile.win b/mozilla/xpcom/tests/makefile.win
index 8026dbf3f49..ed19ab923de 100644
--- a/mozilla/xpcom/tests/makefile.win
+++ b/mozilla/xpcom/tests/makefile.win
@@ -20,6 +20,7 @@
 # Contributor(s): 
 
 DEPTH=..\..
+REQUIRES=string necko
 include <$(DEPTH)/config/config.mak>
 
 
diff --git a/mozilla/xpcom/threads/makefile.win b/mozilla/xpcom/threads/makefile.win
index f9c082edf1e..3bcfc1c75d9 100644
--- a/mozilla/xpcom/threads/makefile.win
+++ b/mozilla/xpcom/threads/makefile.win
@@ -22,7 +22,8 @@
 
 
 DEPTH=..\..
-MODULE = xpcom_threads
+MODULE = xpcom
+REQUIRES	= string
 
 ################################################################################
 ## exports