diff --git a/mozilla/layout/build/dlldeps.cpp b/mozilla/layout/build/dlldeps.cpp
index 971f793e751..edfa78a9177 100644
--- a/mozilla/layout/build/dlldeps.cpp
+++ b/mozilla/layout/build/dlldeps.cpp
@@ -23,6 +23,7 @@
 #include "nsIStyleSet.h"
 #include "nsIDocument.h"
 #include "nsHTMLParts.h"
+#include "nsINameSpaceManager.h"
 
 void XXXNeverCalled()
 {
@@ -47,4 +48,6 @@ void XXXNeverCalled()
   NS_NewHTMLFrame(f);
   NS_NewScrollFrame(f);
   NS_NewSimplePageSequenceFrame(f);
+  nsINameSpaceManager* nsm;
+  NS_NewNameSpaceManager(&nsm);
 }
diff --git a/mozilla/layout/build/nsLayoutCID.h b/mozilla/layout/build/nsLayoutCID.h
index 9de71801bf1..0a28c5319ed 100644
--- a/mozilla/layout/build/nsLayoutCID.h
+++ b/mozilla/layout/build/nsLayoutCID.h
@@ -43,6 +43,11 @@
  0xd6008c40, 0x4dad, 0x11d2,                      \
  {0xb3, 0x28, 0x00, 0x80, 0x5f, 0x8a, 0x38, 0x59}}
 
+#define NS_NAMESPACEMANAGER_CID                   \
+{ /* d9783472-8fe9-11d2-9d3c-0060088f9ff7 */      \
+ 0xd9783472, 0x8fe9, 0x11d2,                      \
+ {0x9d, 0x3c, 0x00, 0x60, 0x08, 0x8f, 0x9f, 0xf7}}
+
 /* a6cf90d5-15b3-11d2-932e-00805f8add32 */
 #define NS_FRAME_UTIL_CID \
  { 0xa6cf90d5, 0x15b3, 0x11d2,{0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32}}
diff --git a/mozilla/layout/build/nsLayoutFactory.cpp b/mozilla/layout/build/nsLayoutFactory.cpp
index f6c27ea0a2c..9eb8566175c 100644
--- a/mozilla/layout/build/nsLayoutFactory.cpp
+++ b/mozilla/layout/build/nsLayoutFactory.cpp
@@ -37,6 +37,7 @@
 #include "nsIHTMLStyleSheet.h"
 #include "nsICollection.h"
 #include "nsIDOMRange.h"
+#include "nsINameSpaceManager.h"
 
 
 static NS_DEFINE_IID(kCHTMLDocumentCID, NS_HTMLDOCUMENT_CID);
@@ -52,6 +53,7 @@ static NS_DEFINE_IID(kCRangeCID,     NS_RANGE_CID);
 static NS_DEFINE_CID(kPresShellCID,  NS_PRESSHELL_CID);
 static NS_DEFINE_CID(kTextNodeCID,   NS_TEXTNODE_CID);
 static NS_DEFINE_CID(kSelectionCID,  NS_SELECTION_CID);
+static NS_DEFINE_CID(kNameSpaceManagerCID,  NS_NAMESPACEMANAGER_CID);
 static NS_DEFINE_CID(kFrameUtilCID,  NS_FRAME_UTIL_CID);
 
 
@@ -267,6 +269,11 @@ nsresult nsLayoutFactory::CreateInstance(nsISupports *aOuter,
       return res;
     refCounted = PR_TRUE;
   }
+  else if (mClassID.Equals(kNameSpaceManagerCID)) {
+    if (NS_FAILED(res = NS_NewNameSpaceManager((nsINameSpaceManager**)&inst)))
+      return res;
+    refCounted = PR_TRUE;
+  }
   else if (mClassID.Equals(kFrameUtilCID)) {
     // XXX ibid
     if (NS_FAILED(res = NS_NewFrameUtil((nsIFrameUtil**) &inst)))