diff --git a/mozilla/xpcom/build/dlldeps.cpp b/mozilla/xpcom/build/dlldeps.cpp
index 064ff64e436..95aa4c083e3 100644
--- a/mozilla/xpcom/build/dlldeps.cpp
+++ b/mozilla/xpcom/build/dlldeps.cpp
@@ -41,6 +41,7 @@
 #include "nsInterfaceInfo.h"
 #include "xptcall.h"
 #include "nsIFileSpec.h"
+#include "nsIGenericFactory.h"
 
 extern void xptc_dummy();
 
@@ -79,4 +80,5 @@ void XXXNeverCalled()
     NS_NewFileSpec(NULL);
     xptc_dummy();
     XPTI_GetInterfaceInfoManager();
+    NS_NewGenericFactory(NULL, NULL, NULL);
 }
diff --git a/mozilla/xpcom/build/makefile.win b/mozilla/xpcom/build/makefile.win
index 13a766029a1..8e725e44726 100644
--- a/mozilla/xpcom/build/makefile.win
+++ b/mozilla/xpcom/build/makefile.win
@@ -50,7 +50,7 @@ CPP_OBJS =                             \
 #CPP_OBJS = $(CPP_OBJS) .\$(OBJDIR)\nsConstructorPattern.obj
 !endif
 
-LLIBS =                                \
+OURLIBS =                              \
 	$(LIBNSPR)                     \
 	$(DIST)\lib\plc3.lib           \
         $(DIST)\lib\xpcombase_s.lib    \
@@ -64,6 +64,10 @@ LLIBS =                                \
         $(DIST)\lib\xpcomxptinfo_s.lib \
         $(DIST)\lib\xpcomproxy_s.lib   \
 	$(DIST)\lib\libreg32.lib       \
+	$(NULL)
+
+LLIBS =                                \
+        $(OURLIBS)                     \
         shell32.lib                    \
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
 	$(GLOWDIR)\glowcode.lib        \
diff --git a/mozilla/xpcom/components/nsGenericFactory.cpp b/mozilla/xpcom/components/nsGenericFactory.cpp
index 98d4cb121bc..187fcd17217 100644
--- a/mozilla/xpcom/components/nsGenericFactory.cpp
+++ b/mozilla/xpcom/components/nsGenericFactory.cpp
@@ -87,7 +87,7 @@ NS_METHOD nsGenericFactory::Create(nsISupports* outer, const nsIID& aIID, void*
 	return res;
 }
 
-extern nsresult
+NS_COM nsresult
 NS_NewGenericFactory(nsIGenericFactory* *result,
                      nsIGenericFactory::ConstructorProcPtr constructor,
                      nsIGenericFactory::DestructorProcPtr destructor)
diff --git a/mozilla/xpcom/components/nsIGenericFactory.h b/mozilla/xpcom/components/nsIGenericFactory.h
index 8be75821c29..5093a191bf9 100644
--- a/mozilla/xpcom/components/nsIGenericFactory.h
+++ b/mozilla/xpcom/components/nsIGenericFactory.h
@@ -56,7 +56,7 @@ public:
     NS_IMETHOD SetDestructor(DestructorProcPtr destructor) = 0;
 };
 
-extern nsresult
+extern NS_COM nsresult
 NS_NewGenericFactory(nsIGenericFactory* *result,
                      nsIGenericFactory::ConstructorProcPtr constructor,
                      nsIGenericFactory::DestructorProcPtr destructor = NULL);
diff --git a/mozilla/xpcom/glue/nsGenericFactory.cpp b/mozilla/xpcom/glue/nsGenericFactory.cpp
index 98d4cb121bc..187fcd17217 100644
--- a/mozilla/xpcom/glue/nsGenericFactory.cpp
+++ b/mozilla/xpcom/glue/nsGenericFactory.cpp
@@ -87,7 +87,7 @@ NS_METHOD nsGenericFactory::Create(nsISupports* outer, const nsIID& aIID, void*
 	return res;
 }
 
-extern nsresult
+NS_COM nsresult
 NS_NewGenericFactory(nsIGenericFactory* *result,
                      nsIGenericFactory::ConstructorProcPtr constructor,
                      nsIGenericFactory::DestructorProcPtr destructor)
diff --git a/mozilla/xpcom/glue/nsIGenericFactory.h b/mozilla/xpcom/glue/nsIGenericFactory.h
index 8be75821c29..5093a191bf9 100644
--- a/mozilla/xpcom/glue/nsIGenericFactory.h
+++ b/mozilla/xpcom/glue/nsIGenericFactory.h
@@ -56,7 +56,7 @@ public:
     NS_IMETHOD SetDestructor(DestructorProcPtr destructor) = 0;
 };
 
-extern nsresult
+extern NS_COM nsresult
 NS_NewGenericFactory(nsIGenericFactory* *result,
                      nsIGenericFactory::ConstructorProcPtr constructor,
                      nsIGenericFactory::DestructorProcPtr destructor = NULL);