diff --git a/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp b/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp
index bf3440ddfa1..7d128874b97 100644
--- a/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp
+++ b/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp
@@ -37,6 +37,7 @@
 
 #include "nsParserCIID.h"
 
+
 #ifdef XP_PC
 #define WIDGET_DLL "raptorwidget.dll"
 #define GFXWIN_DLL "raptorgfxwin.dll"
@@ -46,6 +47,9 @@
 #define PREF_DLL   "xppref32.dll"
 #define PARSER_DLL "raptorhtmlpars.dll"
 #else
+#ifdef XP_MAC
+#include "nsMacRepository.h"
+#else
 #define WIDGET_DLL "libwidgetunix.so"
 #define GFXWIN_DLL "libgfxunix.so"
 #define VIEW_DLL   "libraptorview.so"
@@ -54,6 +58,7 @@
 #define PREF_DLL   "libpref.so"
 #define PARSER_DLL "libraptorhtmlpars.so"
 #endif
+#endif
 
 // Class ID's
 static NS_DEFINE_IID(kCFileWidgetCID, NS_FILEWIDGET_CID);
@@ -84,6 +89,7 @@ static NS_DEFINE_IID(kThrobberCID, NS_THROBBER_CID);
 static NS_DEFINE_IID(kCPluginHostCID, NS_PLUGIN_HOST_CID);
 static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
 
+
 extern "C" void
 NS_SetupRegistry()
 {
diff --git a/mozilla/xpcom/components/nsRepository.cpp b/mozilla/xpcom/components/nsRepository.cpp
index 44f85e61b2f..44c81f2dcb8 100644
--- a/mozilla/xpcom/components/nsRepository.cpp
+++ b/mozilla/xpcom/components/nsRepository.cpp
@@ -30,6 +30,13 @@
 #include "NSReg.h"
 #endif
 
+#ifdef XP_MAC
+#ifdef MOZ_NGLAYOUT
+#define IMPL_MAC_REPOSITORY
+#include "nsMacRepository.h"
+#endif
+#endif
+
 nsHashtable *NSRepository::factories = NULL;
 PRMonitor *NSRepository::monitor = NULL;
 
diff --git a/mozilla/xpcom/src/nsRepository.cpp b/mozilla/xpcom/src/nsRepository.cpp
index 44f85e61b2f..44c81f2dcb8 100644
--- a/mozilla/xpcom/src/nsRepository.cpp
+++ b/mozilla/xpcom/src/nsRepository.cpp
@@ -30,6 +30,13 @@
 #include "NSReg.h"
 #endif
 
+#ifdef XP_MAC
+#ifdef MOZ_NGLAYOUT
+#define IMPL_MAC_REPOSITORY
+#include "nsMacRepository.h"
+#endif
+#endif
+
 nsHashtable *NSRepository::factories = NULL;
 PRMonitor *NSRepository::monitor = NULL;