diff --git a/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp b/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp
index 03d13094a2d..f1419a7f4fe 100644
--- a/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp
+++ b/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp
@@ -160,7 +160,11 @@ nsresult nsGfxFactoryMac::LockFactory(PRBool aLock)
 }  
 
 // return the proper factory to the caller
+#ifdef XP_MAC
+extern "C" NS_GFXNONXP nsresult NSGetFactory_GFXWIN_DLL(const nsCID &aClass, nsIFactory **aFactory)
+#else
 extern "C" NS_GFXNONXP nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
+#endif
 {
   if (nsnull == aFactory) {
     return NS_ERROR_NULL_POINTER;
diff --git a/mozilla/htmlparser/src/nsParserFactory.cpp b/mozilla/htmlparser/src/nsParserFactory.cpp
index 5c4c96d9631..7e58b67061f 100644
--- a/mozilla/htmlparser/src/nsParserFactory.cpp
+++ b/mozilla/htmlparser/src/nsParserFactory.cpp
@@ -143,7 +143,11 @@ nsresult nsParserFactory::LockFactory(PRBool aLock)
 }  
 
 // return the proper factory to the caller
+#ifdef XP_MAC
+extern "C" NS_EXPORT nsresult NSGetFactory_PARSER_DLL(const nsCID &aClass, nsIFactory **aFactory)
+#else
 extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
+#endif
 {
   if (nsnull == aFactory) {
     return NS_ERROR_NULL_POINTER;
@@ -157,4 +161,3 @@ extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFa
 
   return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory);
 }
-
diff --git a/mozilla/parser/htmlparser/src/nsParserFactory.cpp b/mozilla/parser/htmlparser/src/nsParserFactory.cpp
index 5c4c96d9631..7e58b67061f 100644
--- a/mozilla/parser/htmlparser/src/nsParserFactory.cpp
+++ b/mozilla/parser/htmlparser/src/nsParserFactory.cpp
@@ -143,7 +143,11 @@ nsresult nsParserFactory::LockFactory(PRBool aLock)
 }  
 
 // return the proper factory to the caller
+#ifdef XP_MAC
+extern "C" NS_EXPORT nsresult NSGetFactory_PARSER_DLL(const nsCID &aClass, nsIFactory **aFactory)
+#else
 extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
+#endif
 {
   if (nsnull == aFactory) {
     return NS_ERROR_NULL_POINTER;
@@ -157,4 +161,3 @@ extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFa
 
   return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory);
 }
-
diff --git a/mozilla/view/src/nsViewFactory.cpp b/mozilla/view/src/nsViewFactory.cpp
index ea57dc7c6cf..db0edc1c9fa 100644
--- a/mozilla/view/src/nsViewFactory.cpp
+++ b/mozilla/view/src/nsViewFactory.cpp
@@ -150,7 +150,11 @@ nsresult nsViewFactory::LockFactory(PRBool aLock)
 }  
 
 // return the proper factory to the caller
+#ifdef XP_MAC
+extern "C" NS_VIEW nsresult NSGetFactory_VIEW_DLL(const nsCID &aClass, nsIFactory **aFactory)
+#else
 extern "C" NS_VIEW nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
+#endif
 {
   if (nsnull == aFactory) {
     return NS_ERROR_NULL_POINTER;
diff --git a/mozilla/webshell/src/nsDLLFactory.cpp b/mozilla/webshell/src/nsDLLFactory.cpp
index 4bf3eb33953..a329cadb3ea 100644
--- a/mozilla/webshell/src/nsDLLFactory.cpp
+++ b/mozilla/webshell/src/nsDLLFactory.cpp
@@ -27,7 +27,11 @@ static NS_DEFINE_IID(kThrobberCID, NS_THROBBER_CID);
 static NS_DEFINE_IID(kWebShellCID, NS_WEB_SHELL_CID);
 
 extern "C" NS_WEB nsresult
+#ifdef XP_MAC
+NSGetFactory_WEB_DLL(const nsCID& aClass, nsIFactory** aFactory)
+#else
 NSGetFactory(const nsCID& aClass, nsIFactory** aFactory)
+#endif
 {
   nsresult rv = NS_OK;
 
@@ -47,3 +51,4 @@ NSGetFactory(const nsCID& aClass, nsIFactory** aFactory)
 
   return rv;
 }
+